X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=fe52b18cb8b4af1b2b4a1821b5dd829a1395caa1;hb=7552391bb7b55cab35fe57f1ddd9f6c0338495a7;hp=605ba368cd43315ad8195e67df1787e38abbe790;hpb=54d1d174474b66c200f26a958bb9a7e6e1ab8978;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index 605ba36..fe52b18 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -93,6 +93,7 @@ #include #include #include +#include #include #include #include @@ -486,7 +487,7 @@ struct swm_screen { /* colors */ struct { - unsigned long color; + uint32_t color; char *name; } c[SWM_S_COLOR_MAX]; @@ -637,6 +638,7 @@ map_window_raised(xcb_window_t win) XCB_CONFIG_WINDOW_STACK_MODE, &val); xcb_map_window(conn, win); + xcb_flush(conn); } xcb_atom_t @@ -1122,9 +1124,10 @@ xrandr_geteventname(XEvent *e) void dumpwins(struct swm_region *r, union arg *args) { - struct ws_win *win; - uint16_t state; - XWindowAttributes wa; + struct ws_win *win; + uint16_t state; + xcb_get_window_attributes_cookie_t c; + xcb_get_window_attributes_reply_t *r; if (r->ws == NULL) { warnx("dumpwins: invalid workspace"); @@ -1132,26 +1135,33 @@ dumpwins(struct swm_region *r, union arg *args) } warnx("=== managed window list ws %02d ===", r->ws->idx); - TAILQ_FOREACH(win, &r->ws->winlist, entry) { state = getstate(win->id); - if (!XGetWindowAttributes(display, win->id, &wa)) - warnx("window: 0x%lx, failed XGetWindowAttributes", + c = xcb_get_window_attributes(conn, win->id); + r = xcb_get_window_attributes_reply(conn, c, NULL); + if (r) { + warnx("window: 0x%x, map_state: %d, state: %u, " + "transient: 0x%x", win->id, wa.map_state, + state, win->transient); + free(r); + } else + warnx("window: 0x%x, failed xcb_get_window_attributes", win->id); - warnx("window: 0x%lx, map_state: %d, state: %u, " - "transient: 0x%lx", win->id, wa.map_state, state, - win->transient); } warnx("===== unmanaged window list ====="); TAILQ_FOREACH(win, &r->ws->unmanagedlist, entry) { state = getstate(win->id); - if (!XGetWindowAttributes(display, win->id, &wa)) + c = xcb_get_window_attributes(conn, win->id); + r xcb_get_window_attributes_reply(conn, c, NULL); + if (r) { + warnx("window: 0x%lx, map_state: %d, state: %u, " + "transient: 0x%lx", win->id, wa.map_state, + state, win->transient); + free(r); + } else warnx("window: 0x%lx, failed XGetWindowAttributes", win->id); - warnx("window: 0x%lx, map_state: %d, state: %u, " - "transient: 0x%lx", win->id, wa.map_state, state, - win->transient); } warnx("================================="); @@ -1502,10 +1512,11 @@ int urgent[SWM_WS_MAX]; void bar_urgent(char *s, size_t sz) { - XWMHints *wmh = NULL; struct ws_win *win; int i, j, num_screens; char b[8]; + xcb_get_property_cookie_t c; + xcb_wm_hints_t hints; for (i = 0; i < workspace_limit; i++) urgent[i] = 0; @@ -1514,13 +1525,12 @@ bar_urgent(char *s, size_t sz) for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) { - wmh = XGetWMHints(display, win->id); - if (wmh == NULL) + c = xcb_get_wm_hints(conn, win->id); + if (xcb_get_wm_hints_reply(conn, c, + &hints, NULL) == 0) continue; - - if (wmh->flags & XUrgencyHint) + if (hints.flags & XCB_WM_HINT_X_URGENCY) urgent[j] = 1; - XFree(wmh); } for (i = 0; i < workspace_limit; i++) { @@ -2040,19 +2050,21 @@ client_msg(struct ws_win *win, xcb_atom_t a) xcb_send_event(conn, False, win->id, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); + xcb_flush(conn); } /* synthetic response to a ConfigureRequest when not making a change */ void config_win(struct ws_win *win, XConfigureRequestEvent *ev) { - XConfigureEvent ce; + xcb_configure_notify_event_t ce; if (win == NULL) return; /* send notification of unchanged state. */ - ce.type = ConfigureNotify; + bzero(&ce, sizeof(ce)); + ce.response_type = XCB_CONFIGURE_NOTIFY; ce.x = X(win); ce.y = Y(win); ce.width = WIDTH(win); @@ -2061,20 +2073,18 @@ config_win(struct ws_win *win, XConfigureRequestEvent *ev) if (ev == NULL) { /* EWMH */ - ce.display = display; ce.event = win->id; ce.window = win->id; ce.border_width = BORDER(win); - ce.above = None; + ce.above_sibling = XCB_WINDOW_NONE; } else { /* normal */ - ce.display = ev->display; ce.event = ev->window; ce.window = ev->window; /* make response appear more WM_SIZE_HINTS-compliant */ if (win->sh_mask) - DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%lx," + DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%x," " sh_mask: %ld, min: %d x %d, max: %d x %d, inc: " "%d x %d\n", win->id, win->sh_mask, SH_MIN_W(win), SH_MIN_H(win), SH_MAX_W(win), SH_MAX_H(win), @@ -2112,14 +2122,16 @@ config_win(struct ws_win *win, XConfigureRequestEvent *ev) ce.x += BORDER(win) - ev->border_width; ce.y += BORDER(win) - ev->border_width; ce.border_width = ev->border_width; - ce.above = ev->above; + ce.above_sibling = ev->above; } - DNPRINTF(SWM_D_MISC, "config_win: ewmh: %s, window: 0x%lx, (x,y) w x h: " + DNPRINTF(SWM_D_MISC, "config_win: ewmh: %s, window: 0x%x, (x,y) w x h: " "(%d,%d) %d x %d, border: %d\n", YESNO(ev == NULL), win->id, ce.x, ce.y, ce.width, ce.height, ce.border_width); - XSendEvent(display, win->id, False, StructureNotifyMask, (XEvent *)&ce); + xcb_send_event(conn, False, win->id, XCB_EVENT_MASK_STRUCTURE_NOTIFY, + (char *)&ce); + xcb_flush(conn); } int @@ -2162,8 +2174,8 @@ unmap_window(struct ws_win *win) set_win_state(win, XCB_WM_STATE_ICONIC); xcb_unmap_window(conn, win->id); - XSetWindowBorder(display, win->id, - win->s->c[SWM_S_COLOR_UNFOCUS].color); + xcb_change_window_attributes(conn, win->id, + XCB_CW_BORDER_PIXEL, &win->s->c[SWM_S_COLOR_UNFOCUS].color); } void @@ -2179,34 +2191,40 @@ unmap_all(void) } void -fake_keypress(struct ws_win *win, int keysym, int modifiers) +fake_keypress(struct ws_win *win, xcb_keysym_t keysym, uint16_t modifiers) { - XKeyEvent event; + xcb_key_press_event_t event; + xcb_key_symbols_t *syms; + xcb_keycode_t *keycode; if (win == NULL) return; - - event.display = display; /* Ignored, but what the hell */ - event.window = win->id; + + syms = xcb_key_symbols_alloc(conn); + keycode = xcb_key_symbols_get_keycode(syms, keysym); + + event.event = win->id; event.root = win->s->root; - event.subwindow = None; - event.time = CurrentTime; - event.x = X(win); - event.y = Y(win); - event.x_root = 1; - event.y_root = 1; + event.child = XCB_WINDOW_NONE; + event.time = XCB_CURRENT_TIME; + event.event_x = X(win); + event.event_y = Y(win); + event.root_x = 1; + event.root_y = 1; event.same_screen = True; - event.keycode = XKeysymToKeycode(display, keysym); + event.detail = *keycode; event.state = modifiers; - event.type = KeyPress; - XSendEvent(event.display, event.window, True, - KeyPressMask, (XEvent *)&event); - - event.type = KeyRelease; - XSendEvent(event.display, event.window, True, - KeyPressMask, (XEvent *)&event); + event.response_type = XCB_KEY_PRESS; + xcb_send_event(conn, win->id, True, + XCB_EVENT_MASK_KEY_PRESS, (char *)&event); + event.response_type = XCB_KEY_RELEASE; + xcb_send_event(conn, win->id, True, + XCB_EVENT_MASK_KEY_RELEASE, (char *)&event); + xcb_flush(conn); + + xcb_key_symbols_free(syms); } void @@ -2229,29 +2247,32 @@ restart(struct swm_region *r, union arg *args) } struct swm_region * -root_to_region(Window root) +root_to_region(xcb_window_t root) { struct swm_region *r = NULL; - Window rr, cr; - int i, x, y, wx, wy, num_screens; - unsigned int mask; + int i, num_screens; + xcb_query_pointer_cookie_t qpc; + xcb_query_pointer_reply_t *qpr; - DNPRINTF(SWM_D_MISC, "root_to_region: window: 0x%lx\n", root); + DNPRINTF(SWM_D_MISC, "root_to_region: window: 0x%x\n", root); num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); for (i = 0; i < num_screens; i++) if (screens[i].root == root) break; - if (XQueryPointer(display, screens[i].root, - &rr, &cr, &x, &y, &wx, &wy, &mask) != False) { + qpc = xcb_query_pointer(conn, screens[i].root); + qpr = xcb_query_pointer_reply(conn, qpc, NULL); + + if (qpr) { DNPRINTF(SWM_D_MISC, "root_to_region: pointer: (%d,%d)\n", - x, y); + qpr->root_x, qpr->root_y); /* choose a region based on pointer location */ TAILQ_FOREACH(r, &screens[i].rl, entry) - if (X(r) <= x && x < MAX_X(r) && - Y(r) <= y && y < MAX_Y(r)) + if (X(r) <= qpr->root_x && qpr->root_x < MAX_X(r) && + Y(r) <= qpr->root_y && qpr->root_y < MAX_Y(r)) break; + free(qpr); } if (r == NULL) @@ -2476,9 +2497,8 @@ unfocus_win(struct ws_win *win) ; grabbuttons(win, 0); - XSetWindowBorder(display, win->id, - win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); - + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL, + &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root, ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, &none); @@ -2540,8 +2560,9 @@ focus_win(struct ws_win *win) /* use larger hammer since the window was killed somehow */ TAILQ_FOREACH(cfw, &win->ws->winlist, entry) if (cfw->ws && cfw->ws->r && cfw->ws->r->s) - XSetWindowBorder(display, cfw->id, - cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); + xcb_change_window_attributes(conn, cfw->id, + XCB_CW_BORDER_PIXEL, + &cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); } win->ws->focus = win; @@ -2555,8 +2576,9 @@ focus_win(struct ws_win *win) xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, win->id, XCB_CURRENT_TIME); grabbuttons(win, 1); - XSetWindowBorder(display, win->id, - win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); + xcb_change_window_attributes(conn, win->id, + XCB_CW_BORDER_PIXEL, + &win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS || win->ws->always_raise) map_window_raised(win->id); @@ -2720,7 +2742,8 @@ cyclescr(struct swm_region *r, union arg *args) /* move mouse to region */ x = X(rr) + 1; y = Y(rr) + 1 + (bar_enabled ? bar_height : 0); - XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y); + xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0, 0, + x, y); a.id = SWM_ARG_ID_FOCUSCUR; focus(rr, &a); @@ -2729,7 +2752,8 @@ cyclescr(struct swm_region *r, union arg *args) /* move to focus window */ x = X(rr->ws->focus) + 1; y = Y(rr->ws->focus) + 1; - XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y); + xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0, + 0, x, y); } } @@ -6281,7 +6305,8 @@ manage_window(xcb_window_t id) const char *errstr; struct pid_e *p; struct quirk *qp; - + uint32_t event_mask; + if ((win = find_window(id)) != NULL) return (win); /* already being managed */ @@ -6500,9 +6525,12 @@ manage_window(xcb_window_t id) update_window(win); } - XSelectInput(display, id, EnterWindowMask | FocusChangeMask | - PropertyChangeMask | StructureNotifyMask); + event_mask = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE | + XCB_EVENT_MASK_PROPERTY_CHANGE | + XCB_EVENT_MASK_STRUCTURE_NOTIFY; + xcb_change_window_attributes(conn, id, XCB_CW_EVENT_MASK, &event_mask); + /* floaters need to be mapped if they are in the current workspace */ if ((win->floating || win->transient) && (ws->idx == r->ws->idx)) map_window_raised(win->id); @@ -6540,6 +6568,7 @@ void unmanage_window(struct ws_win *win) { struct ws_win *parent; + xcb_screen_t *screen; if (win == NULL) return; @@ -6553,8 +6582,10 @@ unmanage_window(struct ws_win *win) } /* focus on root just in case */ - XSetInputFocus(display, PointerRoot, PointerRoot, CurrentTime); - + screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, + screen->root, XCB_CURRENT_TIME); + focus_prev(win); if (win->hints) { @@ -7412,10 +7443,9 @@ void setup_screens(void) { int i, j, k, num_screens; - int errorbase; struct workspace *ws; XGCValues gcv; - + const xcb_query_extension_reply_t *qep; xcb_randr_query_version_cookie_t c; xcb_randr_query_version_reply_t *r; @@ -7426,18 +7456,16 @@ setup_screens(void) "screens"); /* initial Xrandr setup */ - xrandr_support = XRRQueryExtension(display, - &xrandr_eventbase, &errorbase); - if (xrandr_support) { - c = xcb_randr_query_version(conn, True, False); - r = xcb_randr_query_version_reply(conn, c, NULL); - if (r) { - if (r->major_version < 1) - xrandr_support = 0; - free(r); - } else - xrandr_support = 0; + xrandr_support = False; + c = xcb_randr_query_version(conn, True, True); + r = xcb_randr_query_version_reply(conn, c, NULL); + if (r) { + if (r->major_version >= 1) + xrandr_support = True; + free(r); } + qep = xcb_get_extension_data(conn, &xcb_randr_id); + xrandr_eventbase = qep->first_event; /* map physical screens */ for (i = 0; i < num_screens; i++) { @@ -7542,7 +7570,6 @@ main(int argc, char *argv[]) int xfd, i, num_screens; fd_set rd; struct sigaction sact; - xcb_generic_event_t *evt; start_argv = argv; warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr); @@ -7664,7 +7691,7 @@ noconfig: xfd = xcb_get_file_descriptor(conn); while (running) { - while ((evt = xcb_poll_for_event(conn)) == 0) { + while (XPending(display)) { XNextEvent(display, &e); if (running == 0) goto done; @@ -7683,7 +7710,7 @@ noconfig: xrandr_geteventname(&e), e.type); switch (e.type - xrandr_eventbase) { - case RRScreenChangeNotify: + case XCB_RANDR_SCREEN_CHANGE_NOTIFY: screenchange(&e); break; default: @@ -7702,9 +7729,9 @@ noconfig: } /* move pointer to first screen if multi screen */ if (num_screens > 1 || outputs > 1) - XWarpPointer(display, None, rr->s[0].root, - 0, 0, 0, 0, X(rr), - Y(rr) + (bar_enabled ? bar_height : 0)); + xcb_warp_pointer(conn, XCB_WINDOW_NONE, + rr->s[0].root, 0, 0, 0, 0, X(rr), + Y(rr) + (bar_enabled ? bar_height : 0)); a.id = SWM_ARG_ID_FOCUSCUR; focus(rr, &a);