diff --git a/config.def.h b/config.def.h index 369ceec..f3d2683 100644 --- a/config.def.h +++ b/config.def.h @@ -34,15 +34,7 @@ static char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "", "", "", "", "", "", "", "", "" }; - -/* launcher commands (They must be NULL terminated) */ -static const char* bhev[] = { "firefox", "bhev.ru", NULL }; - -static const Launcher launchers[] = { - /* command name to display */ - { bhev, "" }, -}; +static const char *tags[] = { "", "", "", "", "", "", "", "", "", "?" }; static const Rule rules[] = { /* xprop(1): diff --git a/config.h b/config.h index 369ceec..f3d2683 100644 --- a/config.h +++ b/config.h @@ -34,15 +34,7 @@ static char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "", "", "", "", "", "", "", "", "" }; - -/* launcher commands (They must be NULL terminated) */ -static const char* bhev[] = { "firefox", "bhev.ru", NULL }; - -static const Launcher launchers[] = { - /* command name to display */ - { bhev, "" }, -}; +static const char *tags[] = { "", "", "", "", "", "", "", "", "", "?" }; static const Rule rules[] = { /* xprop(1): diff --git a/drw.o b/drw.o index c76a0b4..8cf20fe 100644 Binary files a/drw.o and b/drw.o differ diff --git a/dwm b/dwm index c35435b..9e30820 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.c b/dwm.c index af86efd..13faf69 100644 --- a/dwm.c +++ b/dwm.c @@ -162,11 +162,6 @@ typedef struct { int monitor; } Rule; -typedef struct { - const char** command; - const char* name; -} Launcher; - /* function declarations */ static void applyrules(Client *c); static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact); @@ -475,35 +470,17 @@ buttonpress(XEvent *e) if (i < LENGTH(tags)) { click = ClkTagBar; arg.ui = 1 << i; - goto execute_handler; } else if (ev->x < x + TEXTW(selmon->ltsymbol)) { click = ClkLtSymbol; - goto execute_handler; + } else if (ev->x > selmon->ww - TEXTW(selmon->ltsymbol)) { + click = ClkStatusText; } - - x += TEXTW(selmon->ltsymbol); - - for(i = 0; i < LENGTH(launchers); i++) { - x += TEXTW(launchers[i].name); - - if (ev->x < x) { - Arg a; - a.v = launchers[i].command; - spawn(&a); - return; - } - } - - click = ClkStatusText; } else if ((c = wintoclient(ev->window))) { focus(c); restack(selmon); XAllowEvents(dpy, ReplayPointer, CurrentTime); click = ClkClientWin; } - -execute_handler: - for (i = 0; i < LENGTH(buttons); i++) if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) @@ -1014,13 +991,6 @@ drawbar(Monitor *m) drw_setscheme(drw, scheme[SchemeNorm]); x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); - for (i = 0; i < LENGTH(launchers); i++) - { - w = TEXTW(launchers[i].name); - drw_text(drw, x, 0, w, bh, lrpad / 2, launchers[i].name, urg & 1 << i); - x += w; - } - if ((w = m->ww - tw - x) > bh) { drw_setscheme(drw, scheme[SchemeNorm]); drw_rect(drw, x, 0, w - 2 * hpb, bh, 1, 1); diff --git a/dwm.o b/dwm.o index fe01282..c43f75e 100644 Binary files a/dwm.o and b/dwm.o differ diff --git a/util.o b/util.o index a9972e1..551e000 100644 Binary files a/util.o and b/util.o differ