JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Eliminate PSC (path separator char) macro.
[spectrwm.git] / spectrwm.c
index e5b2308..49b11f7 100644 (file)
@@ -8,6 +8,7 @@
  * Copyright (c) 2011-2012 Reginald Kennedy <rk@rejii.com>
  * Copyright (c) 2011-2012 Lawrence Teo <lteo@lteo.net>
  * Copyright (c) 2011-2012 Tiago Cunha <tcunha@gmx.com>
+ * Copyright (c) 2012 David Hill <dhill@mindcry.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -121,7 +122,7 @@ static const char   *buildstr = SPECTRWM_VERSION;
 #endif
 #endif
 
-#if defined(__OpenBSD__)
+#ifndef XCB_ICCCM_NUM_WM_HINTS_ELEMENTS
 #define XCB_ICCCM_SIZE_HINT_P_MIN_SIZE         XCB_SIZE_HINT_P_MIN_SIZE
 #define XCB_ICCCM_SIZE_HINT_P_MAX_SIZE         XCB_SIZE_HINT_P_MAX_SIZE
 #define XCB_ICCCM_SIZE_HINT_P_RESIZE_INC       XCB_SIZE_HINT_P_RESIZE_INC
@@ -647,29 +648,90 @@ struct ewmh_hint {
 };
 
 /* function prototypes */
+void    buttonpress(xcb_button_press_event_t *);
+void    clientmessage(xcb_client_message_event_t *);
 int     conf_load(char *, int);
+void    configurenotify(xcb_configure_notify_event_t *);
+void    configurerequest(xcb_configure_request_event_t *);
 void    constrain_window(struct ws_win *, struct swm_region *, int);
+void    destroynotify(xcb_destroy_notify_event_t *);
 void    do_sync(void);
+void    enternotify(xcb_enter_notify_event_t *);
+void    event_error(xcb_generic_error_t *);
 void    event_handle(xcb_generic_event_t *);
+char   *expand_tilde(char *);
+void    expose(xcb_expose_event_t *);
 struct ws_win  *find_window(xcb_window_t);
 int     floating_toggle_win(struct ws_win *);
 void    focus(struct swm_region *, union arg *);
 void    focus_magic(struct ws_win *);
+#ifdef SWM_DEBUG
+void    focusin(xcb_focus_in_event_t *);
+#endif
 xcb_atom_t get_atom_from_string(const char *);
+#ifdef SWM_DEBUG
+char   *get_atom_name(xcb_atom_t);
+char   *get_notify_detail_label(uint8_t);
+char   *get_notify_mode_label(uint8_t);
+#endif
 xcb_screen_t   *get_screen(int);
 char   *get_win_name(xcb_window_t);
 uint32_t getstate(xcb_window_t);
 void    grabbuttons(struct ws_win *, int);
+void    keypress(xcb_key_press_event_t *);
+#ifdef SWM_DEBUG
+void    leavenotify(xcb_leave_notify_event_t *);
+#endif
 void    map_window_raised(xcb_window_t);
+void    mapnotify(xcb_map_notify_event_t *);
+void    mappingnotify(xcb_mapping_notify_event_t *);
+void    maprequest(xcb_map_request_event_t *);
 void    new_region(struct swm_screen *, int, int, int, int);
 int     parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *);
+void    propertynotify(xcb_property_notify_event_t *);
 void    spawn_select(struct swm_region *, union arg *, char *, int *);
+void    screenchange(xcb_randr_screen_change_notify_event_t *);
 void    store_float_geom(struct ws_win *, struct swm_region *);
 void    unmanage_window(struct ws_win *);
+void    unmapnotify(xcb_unmap_notify_event_t *);
 void    update_window(struct ws_win *);
-#ifdef SWM_DEBUG
-char   *get_atom_name(xcb_atom_t);
-#endif
+/*void  visibilitynotify(xcb_visibility_notify_event_t *);*/
+
+char *
+expand_tilde(char *s)
+{
+       struct passwd           *pwd;
+       int                     i;
+       char                    user[LOGIN_NAME_MAX];
+       const char              *sc = s;
+       char                    *result;
+
+       if (s == NULL)
+               errx(1, "expand_tilde: NULL string.");
+
+       if (s[0] != '~') {
+               result = strdup(sc);
+               goto out;
+       }
+
+       ++s;
+       for (i = 0; s[i] != '/' && s[i] != '\0'; ++i)
+               user[i] = s[i];
+       user[i] = '\0';
+       s = &s[i];
+
+       pwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
+       if (pwd == NULL)
+               result = strdup(sc);
+       else
+               if (asprintf(&result, "%s%s", pwd->pw_dir, s) == -1)
+                       result = NULL;
+out:
+       if (result == NULL)
+               errx(1, "expand_tilde: failed to allocate memory.");
+
+       return result;
+}
 
 int
 parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb)
@@ -1099,23 +1161,6 @@ dumpwins(struct swm_region *r, union arg *args)
 }
 #endif /* SWM_DEBUG */
 
-void                   event_error(xcb_generic_error_t *);
-void                   expose(xcb_expose_event_t *);
-void                   keypress(xcb_key_press_event_t *);
-void                   buttonpress(xcb_button_press_event_t *);
-void                   configurerequest(xcb_configure_request_event_t *);
-void                   configurenotify(xcb_configure_notify_event_t *);
-void                   destroynotify(xcb_destroy_notify_event_t *);
-void                   enternotify(xcb_enter_notify_event_t *);
-void                   mapnotify(xcb_map_notify_event_t *);
-void                   mappingnotify(xcb_mapping_notify_event_t *);
-void                   maprequest(xcb_map_request_event_t *);
-void                   propertynotify(xcb_property_notify_event_t *);
-void                   unmapnotify(xcb_unmap_notify_event_t *);
-/*void                 visibilitynotify(xcb_visibility_notify_event_t *);*/
-void                   clientmessage(xcb_client_message_event_t *);
-void                   screenchange(xcb_randr_screen_change_notify_event_t *);
-
 void
 sighdlr(int sig)
 {
@@ -1847,7 +1892,7 @@ bar_refresh(void)
 void
 bar_setup(struct swm_region *r)
 {
-       char                    *font, *fontpos;
+       char                    *font, *fontpos, *dup, *search;
        int                     count;
        xcb_screen_t            *screen = get_screen(r->s->idx);
        uint32_t                wa[3];
@@ -1860,7 +1905,10 @@ bar_setup(struct swm_region *r)
                err(1, "bar_setup: calloc: failed to allocate memory.");
 
        if (bar_font == NULL) {
-               while ((font = strsep(&bar_fonts, ",")) != NULL) {
+               if ((dup = strdup(bar_fonts)) == NULL)
+                       errx(1, "insufficient memory.");
+               search = dup;
+               while ((font = strsep(&search, ",")) != NULL) {
                        if (*font == '\0')
                                continue;
 
@@ -1888,6 +1936,7 @@ bar_setup(struct swm_region *r)
                                break;
                        }
                }
+               free(dup);
        }
 
        if (bar_font == NULL)
@@ -4283,7 +4332,6 @@ resize(struct ws_win *win, union arg *args)
        unsigned int            shape; /* cursor style */
        xcb_cursor_t            cursor;
        xcb_font_t              cursor_font;
-       xcb_grab_pointer_cookie_t       gpc;
        xcb_query_pointer_reply_t       *xpr;
        xcb_generic_event_t             *evt;
        xcb_motion_notify_event_t       *mne;
@@ -4367,7 +4415,7 @@ resize(struct ws_win *win, union arg *args)
        xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
            shape, shape + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
 
-       gpc = xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
+       xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
            XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, cursor,
            XCB_CURRENT_TIME),
 
@@ -4476,7 +4524,6 @@ move(struct ws_win *win, union arg *args)
        struct swm_region       *r = NULL;
        xcb_font_t                      cursor_font;
        xcb_cursor_t                    cursor;
-       xcb_grab_pointer_cookie_t       gpc;
        xcb_query_pointer_reply_t       *qpr;
        xcb_generic_event_t             *evt;
        xcb_motion_notify_event_t       *mne;
@@ -4541,7 +4588,7 @@ move(struct ws_win *win, union arg *args)
        xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
                XC_fleur, XC_fleur + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
 
-       gpc = xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
+       xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
            XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
            XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME);
 
@@ -5112,12 +5159,17 @@ setspawn(char *name, char *args)
 int
 setconfspawn(char *selector, char *value, int flags)
 {
+       char *args;
+
        /* suppress unused warning since var is needed */
        (void)flags;
 
-       DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, value);
+       args = expand_tilde(value);
+
+       DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
 
-       setspawn(selector, value);
+       setspawn(selector, args);
+       free(args);
 
        DNPRINTF(SWM_D_SPAWN, "setconfspawn: done\n");
        return (0);
@@ -5511,7 +5563,7 @@ updatenumlockmask(void)
                                    + j];
                                keycode = xcb_key_symbols_get_keycode(syms,
                                                XK_Num_Lock);
-                               if (kc == *keycode)  
+                               if (kc == *keycode)
                                        numlockmask = (1 << i);
                                free(keycode);
                        }
@@ -5793,7 +5845,7 @@ setconfvalue(char *selector, char *value, int flags)
        switch (flags) {
        case SWM_S_BAR_ACTION:
                free(bar_argv[0]);
-               if ((bar_argv[0] = strdup(value)) == NULL)
+               if ((bar_argv[0] = expand_tilde(value)) == NULL)
                        err(1, "setconfvalue: bar_action");
                break;
        case SWM_S_BAR_AT_BOTTOM:
@@ -6623,7 +6675,7 @@ manage_window(xcb_window_t id)
                win->ch.class_name = tmpch.class_name;
                win->ch.instance_name = tmpch.instance_name;
 
-               xcb_get_wm_class_reply_wipe(&tmpch);
+               xcb_icccm_get_wm_class_reply_wipe(&tmpch);
 
                DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n",
                    win->ch.class_name, win->ch.instance_name);
@@ -6681,6 +6733,9 @@ manage_window(xcb_window_t id)
 
        event_mask = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE |
            XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
+#ifdef SWM_DEBUG
+       event_mask |= XCB_EVENT_MASK_LEAVE_WINDOW;
+#endif
 
        xcb_change_window_attributes(conn, id, XCB_CW_EVENT_MASK, &event_mask);
 
@@ -6703,7 +6758,7 @@ free_window(struct ws_win *win)
 
        if (win->wa)
                free(win->wa);
-       
+
        kill_refs(win);
 
        /* paint memory */
@@ -6797,6 +6852,16 @@ expose(xcb_expose_event_t *e)
        xcb_flush(conn);
 }
 
+#ifdef SWM_DEBUG
+void
+focusin(xcb_focus_in_event_t *e)
+{
+       DNPRINTF(SWM_D_EVENT, "focusin: window: 0x%x, mode: %s(%u), "
+           "detail: %s(%u)\n", e->event, get_notify_mode_label(e->mode),
+           e->mode, get_notify_detail_label(e->detail), e->detail);
+}
+#endif
+
 void
 keypress(xcb_key_press_event_t *e)
 {
@@ -6987,13 +7052,78 @@ destroynotify(xcb_destroy_notify_event_t *e)
        free_window(win);
 }
 
+#ifdef SWM_DEBUG
+char *
+get_notify_detail_label(uint8_t detail)
+{
+       char *label;
+
+       switch (detail) {
+       case XCB_NOTIFY_DETAIL_ANCESTOR:
+               label = "Ancestor";
+               break;
+       case XCB_NOTIFY_DETAIL_VIRTUAL:
+               label = "Virtual";
+               break;
+       case XCB_NOTIFY_DETAIL_INFERIOR:
+               label = "Inferior";
+               break;
+       case XCB_NOTIFY_DETAIL_NONLINEAR:
+               label = "Nonlinear";
+               break;
+       case XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL:
+               label = "NonlinearVirtual";
+               break;
+       case XCB_NOTIFY_DETAIL_POINTER:
+               label = "Pointer";
+               break;
+       case XCB_NOTIFY_DETAIL_POINTER_ROOT:
+               label = "PointerRoot";
+               break;
+       case XCB_NOTIFY_DETAIL_NONE:
+               label = "None";
+               break;
+       default:
+               label = "Unknown";
+       }
+
+       return label;
+}
+
+char *
+get_notify_mode_label(uint8_t mode)
+{
+       char *label;
+
+       switch (mode) {
+       case XCB_NOTIFY_MODE_NORMAL:
+               label = "Normal";
+               break;
+       case XCB_NOTIFY_MODE_GRAB:
+               label = "Grab";
+               break;
+       case XCB_NOTIFY_MODE_UNGRAB:
+               label = "Ungrab";
+               break;
+       case XCB_NOTIFY_MODE_WHILE_GRABBED:
+               label = "WhileGrabbed";
+               break;
+       default:
+               label = "Unknown";
+       }
+
+       return label;
+}
+#endif
+
 void
 enternotify(xcb_enter_notify_event_t *e)
 {
        struct ws_win           *win;
-       DNPRINTF(SWM_D_FOCUS, "enternotify: window: 0x%x, mode: %d, detail: "
-           "%d, root: 0x%x, subwindow: 0x%x, same_screen_focus: %s, "
-           "state: %d\n", e->event, e->mode, e->detail, e->root,
+       DNPRINTF(SWM_D_FOCUS, "enternotify: window: 0x%x, mode: %s(%d), "
+           "detail: %s(%d), root: 0x%x, subwindow: 0x%x, same_screen_focus: "
+           "%s, state: %d\n", e->event, get_notify_mode_label(e->mode),
+           e->mode, get_notify_detail_label(e->detail), e->detail, e->root,
            e->child, YESNO(e->same_screen_focus), e->state);
 
        if (e->mode != XCB_NOTIFY_MODE_NORMAL) {
@@ -7021,6 +7151,19 @@ enternotify(xcb_enter_notify_event_t *e)
        xcb_flush(conn);
 }
 
+#ifdef SWM_DEBUG
+void
+leavenotify(xcb_leave_notify_event_t *e)
+{
+       struct ws_win           *win;
+       DNPRINTF(SWM_D_FOCUS, "leavenotify: window: 0x%x, mode: %s(%d), "
+           "detail: %s(%d), root: 0x%x, subwindow: 0x%x, same_screen_focus: "
+           "%s, state: %d\n", e->event, get_notify_mode_label(e->mode),
+           e->mode, get_notify_detail_label(e->detail), e->detail, e->root,
+           e->child, YESNO(e->same_screen_focus), e->state);
+}
+#endif
+
 /* lets us use one switch statement for arbitrary mode/detail combinations */
 #define MERGE_MEMBERS(a,b)     (((a & 0xffff) << 16) | (b & 0xffff))
 
@@ -7709,14 +7852,18 @@ event_handle(xcb_generic_event_t *evt)
        EVENT(XCB_DESTROY_NOTIFY, destroynotify);
        EVENT(XCB_ENTER_NOTIFY, enternotify);
        EVENT(XCB_EXPOSE, expose);
-       /*EVENT(XCB_FOCUS_IN, );*/
+#ifdef SWM_DEBUG
+       EVENT(XCB_FOCUS_IN, focusin);
+#endif
        /*EVENT(XCB_FOCUS_OUT, );*/
        /*EVENT(XCB_GRAPHICS_EXPOSURE, );*/
        /*EVENT(XCB_GRAVITY_NOTIFY, );*/
        EVENT(XCB_KEY_PRESS, keypress);
        /*EVENT(XCB_KEY_RELEASE, keypress);*/
        /*EVENT(XCB_KEYMAP_NOTIFY, );*/
-       /*EVENT(XCB_LEAVE_NOTIFY, );*/
+#ifdef SWM_DEBUG
+       EVENT(XCB_LEAVE_NOTIFY, leavenotify);
+#endif
        EVENT(XCB_MAP_NOTIFY, mapnotify);
        EVENT(XCB_MAP_REQUEST, maprequest);
        EVENT(XCB_MAPPING_NOTIFY, mappingnotify);