cleaned up
This commit is contained in:
parent
4508fd2c4e
commit
9f3b0c6ea8
8
dinput.c
8
dinput.c
|
@ -25,7 +25,7 @@ static void cleanup(void);
|
||||||
static void drawcursor(void);
|
static void drawcursor(void);
|
||||||
static void drawinput(void);
|
static void drawinput(void);
|
||||||
static Bool grabkeyboard(void);
|
static Bool grabkeyboard(void);
|
||||||
static void kpress(XKeyEvent * e);
|
static void kpress(XKeyEvent *e);
|
||||||
static void run(void);
|
static void run(void);
|
||||||
static void setup(Bool topbar);
|
static void setup(Bool topbar);
|
||||||
|
|
||||||
|
@ -100,7 +100,7 @@ grabkeyboard(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
kpress(XKeyEvent * e) {
|
kpress(XKeyEvent *e) {
|
||||||
char buf[sizeof text];
|
char buf[sizeof text];
|
||||||
int num;
|
int num;
|
||||||
unsigned int i, len;
|
unsigned int i, len;
|
||||||
|
@ -140,6 +140,7 @@ kpress(XKeyEvent * e) {
|
||||||
ksym = XK_BackSpace;
|
ksym = XK_BackSpace;
|
||||||
break;
|
break;
|
||||||
case XK_j:
|
case XK_j:
|
||||||
|
case XK_m:
|
||||||
ksym = XK_Return;
|
ksym = XK_Return;
|
||||||
break;
|
break;
|
||||||
case XK_k:
|
case XK_k:
|
||||||
|
@ -274,12 +275,11 @@ setup(Bool topbar) {
|
||||||
selcol[ColBG] = getcolor(&dc, selbgcolor);
|
selcol[ColBG] = getcolor(&dc, selbgcolor);
|
||||||
selcol[ColFG] = getcolor(&dc, selfgcolor);
|
selcol[ColFG] = getcolor(&dc, selfgcolor);
|
||||||
initfont(&dc, font);
|
initfont(&dc, font);
|
||||||
fprintf(stderr, "dc.font.xfont: %u\n", (size_t)dc.font.xfont);
|
|
||||||
|
|
||||||
/* input window */
|
/* input window */
|
||||||
wa.override_redirect = True;
|
wa.override_redirect = True;
|
||||||
wa.background_pixmap = ParentRelative;
|
wa.background_pixmap = ParentRelative;
|
||||||
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
|
wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
||||||
|
|
||||||
/* input window geometry */
|
/* input window geometry */
|
||||||
mh = dc.font.height + 2;
|
mh = dc.font.height + 2;
|
||||||
|
|
11
dmenu.c
11
dmenu.c
|
@ -39,7 +39,7 @@ static void drawmenu(void);
|
||||||
static void drawmenuh(void);
|
static void drawmenuh(void);
|
||||||
static void drawmenuv(void);
|
static void drawmenuv(void);
|
||||||
static Bool grabkeyboard(void);
|
static Bool grabkeyboard(void);
|
||||||
static void kpress(XKeyEvent * e);
|
static void kpress(XKeyEvent *e);
|
||||||
static void match(char *pattern);
|
static void match(char *pattern);
|
||||||
static void readstdin(void);
|
static void readstdin(void);
|
||||||
static void run(void);
|
static void run(void);
|
||||||
|
@ -191,7 +191,7 @@ drawmenuh(void) {
|
||||||
dc.w = spaceitem;
|
dc.w = spaceitem;
|
||||||
drawtext(&dc, curr->left ? "<" : NULL, normcol);
|
drawtext(&dc, curr->left ? "<" : NULL, normcol);
|
||||||
dc.x += dc.w;
|
dc.x += dc.w;
|
||||||
for(i = curr; i != next; i=i->right) {
|
for(i = curr; i != next; i = i->right) {
|
||||||
dc.w = MIN(textw(&dc, i->text), mw / 3);
|
dc.w = MIN(textw(&dc, i->text), mw / 3);
|
||||||
drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
|
drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
|
||||||
dc.x += dc.w;
|
dc.x += dc.w;
|
||||||
|
@ -208,7 +208,7 @@ drawmenuv(void) {
|
||||||
dc.w = mw - dc.x;
|
dc.w = mw - dc.x;
|
||||||
dc.h = dc.font.height + 2;
|
dc.h = dc.font.height + 2;
|
||||||
dc.y = dc.h;
|
dc.y = dc.h;
|
||||||
for(i = curr; i != next; i=i->right) {
|
for(i = curr; i != next; i = i->right) {
|
||||||
drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
|
drawtext(&dc, i->text, (sel == i) ? selcol : normcol);
|
||||||
dc.y += dc.h;
|
dc.y += dc.h;
|
||||||
}
|
}
|
||||||
|
@ -230,7 +230,7 @@ grabkeyboard(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
kpress(XKeyEvent * e) {
|
kpress(XKeyEvent *e) {
|
||||||
char buf[sizeof text];
|
char buf[sizeof text];
|
||||||
int num;
|
int num;
|
||||||
unsigned int i, len;
|
unsigned int i, len;
|
||||||
|
@ -273,6 +273,7 @@ kpress(XKeyEvent * e) {
|
||||||
ksym = XK_Tab;
|
ksym = XK_Tab;
|
||||||
break;
|
break;
|
||||||
case XK_j:
|
case XK_j:
|
||||||
|
case XK_m:
|
||||||
ksym = XK_Return;
|
ksym = XK_Return;
|
||||||
break;
|
break;
|
||||||
case XK_n:
|
case XK_n:
|
||||||
|
@ -501,7 +502,7 @@ setup(Bool topbar) {
|
||||||
/* menu window */
|
/* menu window */
|
||||||
wa.override_redirect = True;
|
wa.override_redirect = True;
|
||||||
wa.background_pixmap = ParentRelative;
|
wa.background_pixmap = ParentRelative;
|
||||||
wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask;
|
wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
|
||||||
|
|
||||||
/* menu window geometry */
|
/* menu window geometry */
|
||||||
mh = (dc.font.height + 2) * (lines + 1);
|
mh = (dc.font.height + 2) * (lines + 1);
|
||||||
|
|
Loading…
Reference in New Issue