more efficient initfont

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index fa37f49..a8bdcb9 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

-#include <X11/Xatom.h>

 #include <X11/Xlib.h>
 #include <X11/Xlib.h>

+#include <X11/Xatom.h>

 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>


@@ -13,6 +13,7 @@
 #include <draw.h>
 
 #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))
 #include <draw.h>
 
 #define INRECT(x,y,rx,ry,rw,rh) ((x) >= (rx) && (x) < (rx)+(rw) && (y) >= (ry) && (y) < (ry)+(rh))

+#define LINEH                   (dc->font.height + 2)

 #define MIN(a,b)                ((a) < (b) ? (a) : (b))
 #define MAX(a,b)                ((a) > (b) ? (a) : (b))
 #define UTF8_CODEPOINT(c)       (((c) & 0xc0) != 0x80)
 #define MIN(a,b)                ((a) < (b) ? (a) : (b))
 #define MAX(a,b)                ((a) > (b) ? (a) : (b))
 #define UTF8_CODEPOINT(c)       (((c) & 0xc0) != 0x80)


@@ -38,8 +39,9 @@ static void run(void);
 static void setup(void);
 static void usage(void);
 
 static void setup(void);
 static void usage(void);
 

-static char text[4096];
+static char text[BUFSIZ];

 static size_t cursor = 0;
 static size_t cursor = 0;

+static const char *font = NULL;

 static const char *prompt = NULL;
 static const char *normbgcolor = "#cccccc";
 static const char *normfgcolor = "#000000";
 static const char *prompt = NULL;
 static const char *normbgcolor = "#cccccc";
 static const char *normfgcolor = "#000000";


@@ -74,20 +76,18 @@ appenditem(Item *item, Item **list, Item **last) {
 
 void
 calcoffsets(void) {
 
 void
 calcoffsets(void) {

-       unsigned int h, i, n;
+       unsigned int i, n;

 
 

-       h = dc->font.height+2;

        if(lines > 0)
        if(lines > 0)

-               n = lines * h;
+               n = lines * LINEH;

        else
                n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 
        else
                n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
 

-       prev = next = curr;
-       for(i = 0; next; next = next->right)
-               if((i += (lines > 0) ? h : MIN(textw(dc, next->text), mw/3)) > n)
+       for(i = 0, next = curr; next; next = next->right)
+               if((i += (lines > 0) ? LINEH : MIN(textw(dc, next->text), mw/3)) > n)

                        break;
                        break;

-       for(i = 0; prev && prev->left; prev = prev->left)
-               if((i += (lines > 0) ? h : MIN(textw(dc, prev->left->text), mw/3)) > n)
+       for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
+               if((i += (lines > 0) ? LINEH : MIN(textw(dc, prev->left->text), mw/3)) > n)

                        break;
 }
 
                        break;
 }
 


@@ -108,9 +108,8 @@ drawmenu(void) {
 
        dc->x = 0;
        dc->y = 0;
 
        dc->x = 0;
        dc->y = 0;

+       dc->h = LINEH;

        drawrect(dc, 0, 0, mw, mh, BG(dc, normcol));
        drawrect(dc, 0, 0, mw, mh, BG(dc, normcol));

-       dc->h = dc->font.height + 2;
-       dc->y = topbar ? 0 : mh - dc->h;

 
        if(prompt) {
                dc->w = promptw;
 
        if(prompt) {
                dc->w = promptw;


@@ -123,11 +122,10 @@ drawmenu(void) {
                drawrect(dc, curpos, 2, 1, dc->h - 4, FG(dc, normcol));
 
        if(lines > 0) {
                drawrect(dc, curpos, 2, 1, dc->h - 4, FG(dc, normcol));
 
        if(lines > 0) {

-               dc->y = topbar ? dc->h : 0;

                dc->w = mw - dc->x;
                for(item = curr; item != next; item = item->right) {
                dc->w = mw - dc->x;
                for(item = curr; item != next; item = item->right) {

-                       drawtext(dc, item->text, (item == sel) ? selcol : normcol);

                        dc->y += dc->h;
                        dc->y += dc->h;

+                       drawtext(dc, item->text, (item == sel) ? selcol : normcol);

                }
        }
        else if(matches) {
                }
        }
        else if(matches) {


@@ -237,7 +235,7 @@ keypress(XKeyEvent *ev) {
        }
        switch(ksym) {
        default:
        }
        switch(ksym) {
        default:

-               if(!iscntrl((int)*buf))
+               if(isprint(*buf))

                        insert(buf, MIN(strlen(buf), sizeof text - cursor));
                break;
        case XK_BackSpace:
                        insert(buf, MIN(strlen(buf), sizeof text - cursor));
                break;
        case XK_BackSpace:


@@ -451,7 +449,7 @@ setup(void) {
        selcol[ColFG] = getcolor(dc, selfgcolor);
 
        /* menu geometry */
        selcol[ColFG] = getcolor(dc, selfgcolor);
 
        /* menu geometry */

-       mh = (dc->font.height + 2) * (lines + 1);
+       mh = (lines + 1) * LINEH;

 #ifdef XINERAMA
        if((info = XineramaQueryScreens(dc->dpy, &n))) {
                int i, di;
 #ifdef XINERAMA
        if((info = XineramaQueryScreens(dc->dpy, &n))) {
                int i, di;


@@ -504,8 +502,6 @@ main(int argc, char *argv[]) {
        int i;
 
        progname = "dmenu";
        int i;
 
        progname = "dmenu";

-       dc = initdraw();
-

        for(i = 1; i < argc; i++)
                /* single flags */
                if(!strcmp(argv[i], "-v")) {
        for(i = 1; i < argc; i++)
                /* single flags */
                if(!strcmp(argv[i], "-v")) {


@@ -526,7 +522,7 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-p"))
                        prompt = argv[++i];
                else if(!strcmp(argv[i], "-fn"))
                else if(!strcmp(argv[i], "-p"))
                        prompt = argv[++i];
                else if(!strcmp(argv[i], "-fn"))

-                       initfont(dc, argv[++i]);
+                       font = argv[++i];

                else if(!strcmp(argv[i], "-nb"))
                        normbgcolor = argv[++i];
                else if(!strcmp(argv[i], "-nf"))
                else if(!strcmp(argv[i], "-nb"))
                        normbgcolor = argv[++i];
                else if(!strcmp(argv[i], "-nf"))


@@ -538,6 +534,8 @@ main(int argc, char *argv[]) {
                else
                        usage();
 
                else
                        usage();
 

+       dc = initdraw();
+       initfont(dc, font);

        readstdin();
        setup();
        run();
        readstdin();
        setup();
        run();