diff --git a/calmwm.c b/calmwm.c index 58cb768..237071b 100644 --- a/calmwm.c +++ b/calmwm.c @@ -129,8 +129,6 @@ dpy_init(const char *dpyname) { int i; - XSetErrorHandler(x_errorhandler); - if ((X_Dpy = XOpenDisplay(dpyname)) == NULL) errx(1, "unable to open display \"%s\"", XDisplayName(dpyname)); @@ -146,7 +144,6 @@ dpy_init(const char *dpyname) static void x_setup(void) { - struct screen_ctx *sc; struct keybinding *kb; int i; @@ -156,11 +153,8 @@ x_setup(void) Cursor_question = XCreateFontCursor(X_Dpy, XC_question_arrow); Cursor_resize = XCreateFontCursor(X_Dpy, XC_bottom_right_corner); - for (i = 0; i < ScreenCount(X_Dpy); i++) { - sc = xcalloc(1, sizeof(*sc)); - screen_init(sc, i); - TAILQ_INSERT_TAIL(&Screenq, sc, entry); - } + for (i = 0; i < ScreenCount(X_Dpy); i++) + screen_init(i); /* * XXX key grabs weren't done before, since Screenq was empty, diff --git a/calmwm.h b/calmwm.h index c5b6b82..ce56458 100644 --- a/calmwm.h +++ b/calmwm.h @@ -228,7 +228,7 @@ TAILQ_HEAD(autostartcmd_q, autostartcmd); struct screen_ctx { TAILQ_ENTRY(screen_ctx) entry; - u_int which; + int which; Visual *visual; Colormap colormap; Window rootwin; @@ -376,7 +376,6 @@ void group_client_delete(struct client_ctx *); void group_cycle(struct screen_ctx *, int); void group_hidetoggle(struct screen_ctx *, int); void group_init(struct screen_ctx *); -void group_make_autogroup(struct conf *, char *, int); void group_make_autostart(struct conf *, char *, int); void group_menu(XButtonEvent *); void group_movetogroup(struct client_ctx *, int); @@ -400,7 +399,7 @@ void search_print_client(struct menu *, int); struct geom screen_find_xinerama(struct screen_ctx *, int, int); struct screen_ctx *screen_fromroot(Window); -void screen_init(struct screen_ctx *, u_int); +void screen_init(int); void screen_update_geometry(struct screen_ctx *); void screen_updatestackingorder(struct screen_ctx *); @@ -461,6 +460,7 @@ void menuq_clear(struct menu_q *); int parse_config(const char *, struct conf *); +void conf_autogroup(struct conf *, int, char *); void conf_bindname(struct conf *, char *, char *); void conf_clear(struct conf *); void conf_client(struct client_ctx *); @@ -471,6 +471,7 @@ void conf_gap(struct conf *, struct screen_ctx *); void conf_grab(struct conf *, struct keybinding *); void conf_grab_mouse(struct client_ctx *); void conf_init(struct conf *); +void conf_ignore(struct conf *, char *); void conf_mousebind(struct conf *, char *, char *); void conf_ungrab(struct conf *, struct keybinding *); @@ -491,7 +492,7 @@ void xu_configure(struct client_ctx *); void xu_getatoms(void); unsigned long xu_getcolor(struct screen_ctx *, char *); int xu_getprop(Window, Atom, Atom, long, u_char **); -int xu_getstate(struct client_ctx *, int *); +int xu_get_wm_state(Window, int *); int xu_getstrprop(Window, Atom, char **); void xu_key_grab(Window, int, int); void xu_key_ungrab(Window, int, int); @@ -501,7 +502,7 @@ int xu_ptr_regrab(int, Cursor); void xu_ptr_setpos(Window, int, int); void xu_ptr_ungrab(void); void xu_sendmsg(Window, Atom, long); -void xu_setstate(struct client_ctx *, int); +void xu_set_wm_state(Window win, int); void xu_xorcolor(XRenderColor, XRenderColor, XRenderColor *); diff --git a/client.c b/client.c index b3bce5d..c485b07 100644 --- a/client.c +++ b/client.c @@ -101,17 +101,18 @@ client_new(Window win, struct screen_ctx *sc, int mapped) if (wattr.map_state != IsViewable) { client_placecalc(cc); + client_move(cc); if ((wmhints = XGetWMHints(X_Dpy, cc->win)) != NULL) { - if (wmhints->flags & StateHint) - xu_setstate(cc, wmhints->initial_state); - + if (wmhints->flags & StateHint) { + cc->state = wmhints->initial_state; + xu_set_wm_state(cc->win, cc->state); + } XFree(wmhints); } - client_move(cc); } client_draw_border(cc); - if (xu_getstate(cc, &state) < 0) + if (xu_get_wm_state(cc->win, &state) < 0) state = NormalState; XSelectInput(X_Dpy, cc->win, ColormapChangeMask | EnterWindowMask | @@ -125,7 +126,6 @@ client_new(Window win, struct screen_ctx *sc, int mapped) xu_configure(cc); (state == IconicState) ? client_hide(cc) : client_unhide(cc); - xu_setstate(cc, cc->state); TAILQ_INSERT_TAIL(&sc->mruq, cc, mru_entry); TAILQ_INSERT_TAIL(&Clientq, cc, entry); @@ -152,7 +152,8 @@ client_delete(struct client_ctx *cc) group_client_delete(cc); XGrabServer(X_Dpy); - xu_setstate(cc, WithdrawnState); + cc->state = WithdrawnState; + xu_set_wm_state(cc->win, cc->state); XRemoveFromSaveSet(X_Dpy, cc->win); XSync(X_Dpy, False); @@ -448,12 +449,12 @@ client_ptrsave(struct client_ctx *cc) void client_hide(struct client_ctx *cc) { - /* XXX - add wm_state stuff */ XUnmapWindow(X_Dpy, cc->win); cc->active = 0; cc->flags |= CLIENT_HIDDEN; - xu_setstate(cc, IconicState); + cc->state = IconicState; + xu_set_wm_state(cc->win, cc->state); if (cc == client_current()) client_none(cc->sc); @@ -465,7 +466,8 @@ client_unhide(struct client_ctx *cc) XMapRaised(X_Dpy, cc->win); cc->flags &= ~CLIENT_HIDDEN; - xu_setstate(cc, NormalState); + cc->state = NormalState; + xu_set_wm_state(cc->win, cc->state); client_draw_border(cc); } diff --git a/conf.c b/conf.c index 54e3885..c1ae8c3 100644 --- a/conf.c +++ b/conf.c @@ -39,7 +39,6 @@ void conf_cmd_add(struct conf *c, char *image, char *label) { /* "term" and "lock" have special meanings. */ - if (strcmp(label, "term") == 0) (void)strlcpy(c->termpath, image, sizeof(c->termpath)); else if (strcmp(label, "lock") == 0) @@ -52,6 +51,39 @@ conf_cmd_add(struct conf *c, char *image, char *label) } } +void +conf_autogroup(struct conf *c, int no, char *val) +{ + struct autogroupwin *aw; + char *p; + + aw = xcalloc(1, sizeof(*aw)); + + if ((p = strchr(val, ',')) == NULL) { + aw->name = NULL; + aw->class = xstrdup(val); + } else { + *(p++) = '\0'; + aw->name = xstrdup(val); + aw->class = xstrdup(p); + } + aw->num = no; + + TAILQ_INSERT_TAIL(&c->autogroupq, aw, entry); +} + +void +conf_ignore(struct conf *c, char *val) +{ + struct winmatch *wm; + + wm = xcalloc(1, sizeof(*wm)); + + (void)strlcpy(wm->title, val, sizeof(wm->title)); + + TAILQ_INSERT_TAIL(&c->ignoreq, wm, entry); +} + void conf_gap(struct conf *c, struct screen_ctx *sc) { diff --git a/group.c b/group.c index 3163a7a..ded6c78 100644 --- a/group.c +++ b/group.c @@ -99,8 +99,7 @@ group_show(struct screen_ctx *sc, struct group_ctx *gc) { struct client_ctx *cc; Window *winlist; - u_int i; - int lastempty = -1; + int i, lastempty = -1; gc->highstack = 0; TAILQ_FOREACH(cc, &gc->clients, group_entry) { @@ -164,27 +163,6 @@ group_init(struct screen_ctx *sc) group_setactive(sc, 1); } -void -group_make_autogroup(struct conf *conf, char *val, int no) -{ - struct autogroupwin *aw; - char *p; - - aw = xcalloc(1, sizeof(*aw)); - - if ((p = strchr(val, ',')) == NULL) { - aw->name = NULL; - aw->class = xstrdup(val); - } else { - *(p++) = '\0'; - aw->name = xstrdup(val); - aw->class = xstrdup(p); - } - aw->num = no; - - TAILQ_INSERT_TAIL(&conf->autogroupq, aw, entry); -} - void group_make_autostart(struct conf *conf, char *cmd, int no) { @@ -384,6 +362,7 @@ group_menu(XButtonEvent *e) int i; sc = screen_fromroot(e->root); + TAILQ_INIT(&menuq); for (i = 0; i < CALMWM_NGROUPS; i++) { @@ -407,15 +386,11 @@ group_menu(XButtonEvent *e) return; mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL); + if (mi != NULL && mi->ctx != NULL) { + gc = (struct group_ctx *)mi->ctx; + (gc->hidden) ? group_show(sc, gc) : group_hide(sc, gc); + } - if (mi == NULL || mi->ctx == NULL) - goto cleanup; - - gc = (struct group_ctx *)mi->ctx; - - (gc->hidden) ? group_show(sc, gc) : group_hide(sc, gc); - -cleanup: menuq_clear(&menuq); } diff --git a/kbfunc.c b/kbfunc.c index d202058..930fb24 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -411,6 +411,7 @@ kbfunc_ssh(struct client_ctx *cc, union arg *arg) } TAILQ_INIT(&menuq); + lbuf = NULL; while ((buf = fgetln(fp, &len))) { if (buf[len - 1] == '\n') diff --git a/menu.c b/menu.c index 90652d6..b467ffb 100644 --- a/menu.c +++ b/menu.c @@ -74,6 +74,7 @@ static void menu_draw_entry(struct screen_ctx *, struct menu_ctx *, struct menu_q *, int, int); static int menu_calc_entry(struct screen_ctx *, struct menu_ctx *, int, int); +static struct menu *menu_complete_path(struct menu_ctx *); static int menu_keycode(XKeyEvent *, enum ctltype *, char *); @@ -208,6 +209,7 @@ menu_complete_path(struct menu_ctx *mc) mr = xcalloc(1, sizeof(*mr)); TAILQ_INIT(&menuq); + if ((mi = menu_filter(mc->sc, &menuq, mc->searchstr, NULL, CWM_MENU_DUMMY, search_match_path_any, NULL)) != NULL) { mr->abort = mi->abort; diff --git a/mousefunc.c b/mousefunc.c index d604a34..dcf1073 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -227,6 +227,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg) old_cc = client_current(); TAILQ_INIT(&menuq); + TAILQ_FOREACH(cc, &Clientq, entry) if (cc->flags & CLIENT_HIDDEN) { wname = (cc->label) ? cc->label : cc->name; @@ -250,8 +251,9 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg) if (old_cc != NULL) client_ptrsave(old_cc); client_ptrwarp(cc); - } else - menuq_clear(&menuq); + } + + menuq_clear(&menuq); } void @@ -263,6 +265,7 @@ mousefunc_menu_cmd(struct client_ctx *cc, void *arg) struct cmd *cmd; TAILQ_INIT(&menuq); + TAILQ_FOREACH(cmd, &Conf.cmdq, entry) { mi = xcalloc(1, sizeof(*mi)); (void)strlcpy(mi->text, cmd->label, sizeof(mi->text)); @@ -275,6 +278,6 @@ mousefunc_menu_cmd(struct client_ctx *cc, void *arg) mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL); if (mi != NULL) u_spawn(((struct cmd *)mi->ctx)->image); - else - menuq_clear(&menuq); + + menuq_clear(&menuq); } diff --git a/parse.y b/parse.y index c57fbfe..7829dbf 100644 --- a/parse.y +++ b/parse.y @@ -139,7 +139,7 @@ main : FONTNAME STRING { YYERROR; } - group_make_autogroup(conf, $3, $2); + conf_autogroup(conf, $2, $3); free($3); } | AUTOSTART NUMBER STRING { @@ -153,12 +153,7 @@ main : FONTNAME STRING { free($3); } | IGNORE STRING { - struct winmatch *wm; - - wm = xcalloc(1, sizeof(*wm)); - (void)strlcpy(wm->title, $2, sizeof(wm->title)); - TAILQ_INSERT_TAIL(&conf->ignoreq, wm, entry); - + conf_ignore(conf, $2); free($2); } | BIND STRING string { diff --git a/screen.c b/screen.c index f63032e..e856336 100644 --- a/screen.c +++ b/screen.c @@ -31,13 +31,16 @@ #include "calmwm.h" void -screen_init(struct screen_ctx *sc, u_int which) +screen_init(int which) { + struct screen_ctx *sc; Window *wins, w0, w1; XWindowAttributes winattr; XSetWindowAttributes rootattr; u_int nwins, i; + sc = xcalloc(1, sizeof(*sc)); + sc->which = which; sc->visual = DefaultVisual(X_Dpy, sc->which); sc->colormap = DefaultColormap(X_Dpy, sc->which); @@ -47,16 +50,14 @@ screen_init(struct screen_ctx *sc, u_int which) xu_ewmh_net_supported_wm_check(sc); conf_gap(&Conf, sc); + conf_color(&Conf, sc); + conf_font(&Conf, sc); screen_update_geometry(sc); - conf_color(&Conf, sc); - - group_init(sc); - conf_font(&Conf, sc); - TAILQ_INIT(&sc->mruq); + group_init(sc); menu_init(sc); rootattr.cursor = Cursor_normal; @@ -84,6 +85,8 @@ screen_init(struct screen_ctx *sc, u_int which) if (HasRandr) XRRSelectInput(X_Dpy, sc->rootwin, RRScreenChangeNotifyMask); + TAILQ_INSERT_TAIL(&Screenq, sc, entry); + XSync(X_Dpy, False); } diff --git a/search.c b/search.c index d419d70..1884ef8 100644 --- a/search.c +++ b/search.c @@ -38,6 +38,8 @@ static void search_match_path(struct menu_q *, struct menu_q *, char *, int); +static void search_match_path_exec(struct menu_q *, struct menu_q *, + char *); static int strsubmatch(char *, char *, int); /* @@ -192,7 +194,7 @@ search_match_path(struct menu_q *menuq, struct menu_q *resultq, char *search, in globfree(&g); } -void +static void search_match_path_exec(struct menu_q *menuq, struct menu_q *resultq, char *search) { return (search_match_path(menuq, resultq, search, PATH_EXEC)); diff --git a/xevents.c b/xevents.c index b1ebdba..da7542b 100644 --- a/xevents.c +++ b/xevents.c @@ -362,7 +362,7 @@ xev_handle_randr(XEvent *ee) i = XRRRootToScreen(X_Dpy, rev->root); TAILQ_FOREACH(sc, &Screenq, entry) { - if (sc->which == (u_int)i) { + if (sc->which == i) { XRRUpdateConfiguration(ee); screen_update_geometry(sc); } diff --git a/xutil.c b/xutil.c index cb8b3fc..f8bd200 100644 --- a/xutil.c +++ b/xutil.c @@ -72,13 +72,13 @@ xu_btn_ungrab(Window win, int mask, u_int btn) } void -xu_ptr_getpos(Window rootwin, int *x, int *y) +xu_ptr_getpos(Window win, int *x, int *y) { Window w0, w1; int tmp0, tmp1; u_int tmp2; - XQueryPointer(X_Dpy, rootwin, &w0, &w1, &tmp0, &tmp1, x, y, &tmp2); + XQueryPointer(X_Dpy, win, &w0, &w1, &tmp0, &tmp1, x, y, &tmp2); } void @@ -203,11 +203,11 @@ xu_getstrprop(Window win, Atom atm, char **text) { } int -xu_getstate(struct client_ctx *cc, int *state) +xu_get_wm_state(Window win, int *state) { long *p = NULL; - if (xu_getprop(cc->win, cwmh[WM_STATE].atom, cwmh[WM_STATE].atom, 2L, + if (xu_getprop(win, cwmh[WM_STATE].atom, cwmh[WM_STATE].atom, 2L, (u_char **)&p) <= 0) return (-1); @@ -218,15 +218,14 @@ xu_getstate(struct client_ctx *cc, int *state) } void -xu_setstate(struct client_ctx *cc, int state) +xu_set_wm_state(Window win, int state) { long dat[2]; dat[0] = state; dat[1] = None; - cc->state = state; - XChangeProperty(X_Dpy, cc->win, + XChangeProperty(X_Dpy, win, cwmh[WM_STATE].atom, cwmh[WM_STATE].atom, 32, PropModeReplace, (unsigned char *)dat, 2); } @@ -292,7 +291,7 @@ xu_ewmh_net_supported_wm_check(struct screen_ctx *sc) XChangeProperty(X_Dpy, w, ewmh[_NET_SUPPORTING_WM_CHECK].atom, XA_WINDOW, 32, PropModeReplace, (unsigned char *)&w, 1); XChangeProperty(X_Dpy, w, ewmh[_NET_WM_NAME].atom, - XA_WM_NAME, 8, PropModeReplace, (unsigned char *)WMNAME, + cwmh[UTF8_STRING].atom, 8, PropModeReplace, (unsigned char *)WMNAME, strlen(WMNAME)); }