]> code.delx.au - spectrwm/blobdiff - spectrwm.c
Fix check_conn.
[spectrwm] / spectrwm.c
index e86f14b80fe3e5e3c667ad9ea11b1d27662c3bdb..753bbf039a21153f5f5ee8a837ea986e39140666 100644 (file)
@@ -649,6 +649,7 @@ struct ewmh_hint {
 
 /* function prototypes */
 void    buttonpress(xcb_button_press_event_t *);
+void    check_conn(void);
 void    clientmessage(xcb_client_message_event_t *);
 int     conf_load(char *, int);
 void    configurenotify(xcb_configure_notify_event_t *);
@@ -659,6 +660,7 @@ 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 *);
@@ -696,6 +698,49 @@ void        unmapnotify(xcb_unmap_notify_event_t *);
 void    update_window(struct ws_win *);
 /*void  visibilitynotify(xcb_visibility_notify_event_t *);*/
 
+char *
+expand_tilde(char *s)
+{
+       struct passwd           *ppwd;
+       int                     i, max;
+       char                    *user;
+       const char              *sc = s;
+       char                    *result;
+
+       if (s == NULL)
+               errx(1, "expand_tilde: NULL string.");
+
+       if (s[0] != '~') {
+               result = strdup(sc);
+               goto out;
+       }
+
+       ++s;
+
+       if ((max = sysconf(_SC_LOGIN_NAME_MAX)) == -1)
+               errx(1, "expand_tilde: sysconf");
+
+       if ((user = calloc(1, max + 1)) == NULL)
+               errx(1, "expand_tilde: calloc");
+
+       for (i = 0; s[i] != '/' && s[i] != '\0'; ++i)
+               user[i] = s[i];
+       user[i] = '\0';
+       s = &s[i];
+
+       ppwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
+       if (ppwd == NULL)
+               result = strdup(sc);
+       else
+               if (asprintf(&result, "%s%s", ppwd->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)
 {
@@ -714,12 +759,18 @@ parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb)
 xcb_screen_t *
 get_screen(int screen)
 {
-       xcb_screen_iterator_t i;
+       const xcb_setup_t       *r;
+       xcb_screen_iterator_t   iter;
 
-       i = xcb_setup_roots_iterator(xcb_get_setup(conn));
-       for (; i.rem; --screen, xcb_screen_next(&i))
+       if ((r = xcb_get_setup(conn)) == NULL) {
+               DNPRINTF(SWM_D_MISC, "get_screen: xcb_get_setup\n");
+               check_conn();
+       }
+
+       iter = xcb_setup_roots_iterator(r);
+       for (; iter.rem; --screen, xcb_screen_next(&iter))
                if (screen == 0)
-                       return (i.data);
+                       return (iter.data);
 
        return (NULL);
 }
@@ -1303,7 +1354,9 @@ custom_region(char *val)
                    sidx, num_screens);
        sidx--;
 
-       screen = get_screen(sidx);
+       if ((screen = get_screen(sidx)) == NULL)
+               errx(1, "ERROR: can't get screen %d.", sidx);
+
        if (w < 1 || h < 1)
                errx(1, "region %ux%u+%u+%u too small", w, h, x, y);
 
@@ -1857,10 +1910,13 @@ bar_setup(struct swm_region *r)
 {
        char                    *font, *fontpos, *dup, *search;
        int                     count;
-       xcb_screen_t            *screen = get_screen(r->s->idx);
+       xcb_screen_t            *screen;
        uint32_t                wa[3];
        XRenderColor            color;
 
+       if ((screen = get_screen(r->s->idx)) == NULL)
+               errx(1, "ERROR: can't get screen %d.", r->s->idx);
+
        if (r->bar != NULL)
                return;
 
@@ -1936,8 +1992,9 @@ bar_setup(struct swm_region *r)
        xcb_create_pixmap(conn, screen->root_depth, r->bar->buffer, r->bar->id,
            WIDTH(r->bar), HEIGHT(r->bar));
 
-       xcb_randr_select_input(conn, r->bar->id,
-           XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE);
+       if (xrandr_support)
+               xcb_randr_select_input(conn, r->bar->id,
+                   XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE);
 
        if (bar_enabled)
                map_window_raised(r->bar->id);
@@ -5122,12 +5179,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);
 
-       setspawn(selector, value);
+       DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
+
+       setspawn(selector, args);
+       free(args);
 
        DNPRINTF(SWM_D_SPAWN, "setconfspawn: done\n");
        return (0);
@@ -5718,7 +5780,7 @@ setconfquirk(char *selector, char *value, int flags)
 {
        char                    *cp, *class, *name;
        int                     retval;
-       unsigned long           quirks;
+       unsigned long           qrks;
 
        /* suppress unused warning since var is needed */
        (void)flags;
@@ -5730,8 +5792,8 @@ setconfquirk(char *selector, char *value, int flags)
        *cp = '\0';
        class = selector;
        name = cp + 1;
-       if ((retval = parsequirks(value, &quirks)) == 0)
-               setquirk(class, name, quirks);
+       if ((retval = parsequirks(value, &qrks)) == 0)
+               setquirk(class, name, qrks);
        return (retval);
 }
 
@@ -5803,7 +5865,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:
@@ -6463,7 +6525,6 @@ manage_window(xcb_window_t id)
        struct quirk            *qp;
        uint32_t                event_mask, i;
        xcb_icccm_get_wm_protocols_reply_t      wpr;
-       xcb_icccm_get_wm_class_reply_t          tmpch;
 
        if ((win = find_window(id)) != NULL)
                return (win);   /* already being managed */
@@ -6629,12 +6690,7 @@ manage_window(xcb_window_t id)
 
        if (xcb_icccm_get_wm_class_reply(conn,
            xcb_icccm_get_wm_class(conn, win->id),
-           &tmpch, NULL)) {
-               win->ch.class_name = tmpch.class_name;
-               win->ch.instance_name = tmpch.instance_name;
-
-               xcb_icccm_get_wm_class_reply_wipe(&tmpch);
-
+           &win->ch, NULL)) {
                DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n",
                    win->ch.class_name, win->ch.instance_name);
 
@@ -6717,6 +6773,8 @@ free_window(struct ws_win *win)
        if (win->wa)
                free(win->wa);
 
+       xcb_icccm_get_wm_class_reply_wipe(&win->ch);
+
        kill_refs(win);
 
        /* paint memory */
@@ -7113,7 +7171,6 @@ enternotify(xcb_enter_notify_event_t *e)
 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),
@@ -7350,6 +7407,39 @@ clientmessage(xcb_client_message_event_t *e)
        xcb_flush(conn);
 }
 
+void
+check_conn(void)
+{
+       int      errcode = xcb_connection_has_error(conn);
+       char    *s;
+#ifdef XCB_CONN_ERROR
+       switch (errcode) {
+       case XCB_CONN_ERROR:
+               s = "Socket error, pipe error or other stream error.";
+               break;
+       case XCB_CONN_CLOSED_EXT_NOTSUPPORTED:
+               s = "Extension not supported.";
+               break;
+       case XCB_CONN_CLOSED_MEM_INSUFFICIENT:
+               s = "Insufficient memory.";
+               break;
+       case XCB_CONN_CLOSED_REQ_LEN_EXCEED:
+               s = "Request length was exceeded.";
+               break;
+       case XCB_CONN_CLOSED_PARSE_ERR:
+               s = "Error parsing display string.";
+               break;
+       default:
+               s = "Unknown error.";
+       }
+       if (errcode)
+               errx(errcode, "X CONNECTION ERROR: %s", s);
+#else
+       if (errcode)
+               errx(errcode, "X CONNECTION ERROR");
+#endif
+}
+
 int
 enable_wm(void)
 {
@@ -7362,7 +7452,8 @@ enable_wm(void)
        /* this causes an error if some other window manager is running */
        num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
        for (i = 0; i < num_screens; i++) {
-               sc = get_screen(i);
+               if ((sc = get_screen(i)) == NULL)
+                       errx(1, "ERROR: can't get screen %d.", i);
                DNPRINTF(SWM_D_INIT, "enable_wm: screen %d, root: 0x%x\n",
                    i, sc->root);
                wac = xcb_change_window_attributes_checked(conn, sc->root,
@@ -7467,7 +7558,10 @@ scan_xrandr(int i)
        xcb_randr_get_crtc_info_cookie_t                cic;
        xcb_randr_get_crtc_info_reply_t                 *cir = NULL;
        xcb_randr_crtc_t                                *crtc;
-       xcb_screen_t                                    *screen = get_screen(i);
+       xcb_screen_t                                    *screen;
+
+       if ((screen = get_screen(i)) == NULL)
+               errx(1, "ERROR: can't get screen %d.", i);
 
        num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
        if (i >= num_screens)
@@ -7635,6 +7729,7 @@ setup_screens(void)
        struct workspace        *ws;
        uint32_t                gcv[1], wa[1];
        const xcb_query_extension_reply_t *qep;
+       xcb_screen_t                            *screen;
        xcb_cursor_t                            cursor;
        xcb_font_t                              cursor_font;
        xcb_randr_query_version_cookie_t        c;
@@ -7648,15 +7743,18 @@ setup_screens(void)
 
        /* initial Xrandr setup */
        xrandr_support = 0;
-       c = xcb_randr_query_version(conn, 1, 1);
-       r = xcb_randr_query_version_reply(conn, c, NULL);
-       if (r) {
-               if (r->major_version >= 1)
-                       xrandr_support = 1;
-               free(r);
-       }
        qep = xcb_get_extension_data(conn, &xcb_randr_id);
-       xrandr_eventbase = qep->first_event;
+       if (qep->present) {
+               c = xcb_randr_query_version(conn, 1, 1);
+               r = xcb_randr_query_version_reply(conn, c, NULL);
+               if (r) {
+                       if (r->major_version >= 1) {
+                               xrandr_support = 1;
+                               xrandr_eventbase = qep->first_event;
+                       }
+                       free(r);
+               }
+       }
 
        cursor_font = xcb_generate_id(conn);
        xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
@@ -7672,7 +7770,9 @@ setup_screens(void)
                screens[i].idx = i;
                TAILQ_INIT(&screens[i].rl);
                TAILQ_INIT(&screens[i].orl);
-               screens[i].root = get_screen(i)->root;
+               if ((screen = get_screen(i)) == NULL)
+                       errx(1, "ERROR: can't get screen %d.", i);
+               screens[i].root = screen->root;
 
                /* set default colors */
                setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS);