diff options
| -rw-r--r-- | calmwm.c | 2 | ||||
| -rw-r--r-- | calmwm.h | 4 | ||||
| -rw-r--r-- | client.c | 2 | ||||
| -rw-r--r-- | conf.c | 2 | ||||
| -rw-r--r-- | kbfunc.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/calmwm.c b/calmwm.c index af1effb..f81a2f6 100644 --- a/calmwm.c +++ b/calmwm.c @@ -94,7 +94,7 @@ main(int argc, char **argv) signal(SIGINT, sighdlr) == SIG_ERR || signal(SIGTERM, sighdlr) == SIG_ERR) err(1, "signal"); - + if (parse_config(Conf.conf_file, &Conf) == -1) { warnx("error parsing config file"); if (nflag) diff --git a/calmwm.h b/calmwm.h index 5c4e45c..7c428f6 100644 --- a/calmwm.h +++ b/calmwm.h @@ -335,7 +335,7 @@ struct mwm_hints { unsigned long decorations; #define MWM_INPUT_MODELESS 0 -#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 +#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 #define MWM_INPUT_SYSTEM_MODAL 2 #define MWM_INPUT_FULL_APPLICATION_MODAL 3 long inputMode; @@ -585,7 +585,7 @@ int xu_ewmh_get_net_wm_desktop(struct client_ctx *, long *); void xu_ewmh_set_net_wm_desktop(struct client_ctx *); Atom *xu_ewmh_get_net_wm_state(struct client_ctx *, int *); void xu_ewmh_handle_net_wm_state_msg(struct client_ctx *, - int, Atom , Atom); + int, Atom, Atom); void xu_ewmh_set_net_wm_state(struct client_ctx *); void xu_ewmh_restore_net_wm_state(struct client_ctx *); diff --git a/client.c b/client.c index e66ca28..9ec2935 100644 --- a/client.c +++ b/client.c @@ -637,7 +637,7 @@ void client_wm_hints(struct client_ctx *cc) { XWMHints *wmh; - + if ((wmh = XGetWMHints(X_Dpy, cc->win)) != NULL) { if ((wmh->flags & InputHint) && (wmh->input)) cc->flags |= CLIENT_INPUT; diff --git a/conf.c b/conf.c index ce8e954..7610400 100644 --- a/conf.c +++ b/conf.c @@ -648,7 +648,7 @@ conf_unbind_mouse(struct conf *c, struct bind_ctx *unbind) struct bind_ctx *mb = NULL, *mbnxt; TAILQ_FOREACH_SAFE(mb, &c->mousebindq, entry, mbnxt) { - if ((unbind == NULL) || + if ((unbind == NULL) || ((mb->modmask == unbind->modmask) && (mb->press.button == unbind->press.button))) { TAILQ_REMOVE(&c->mousebindq, mb, entry); diff --git a/kbfunc.c b/kbfunc.c index 70eafd6..2f8d95d 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -668,7 +668,7 @@ kbfunc_menu_exec(void *ctx, struct cargs *cargs) /* lstat(2) in case d_type isn't supported. */ if (lstat(tpath, &sb) == -1) continue; - if (!S_ISREG(sb.st_mode) && + if (!S_ISREG(sb.st_mode) && !S_ISLNK(sb.st_mode)) continue; } |