* DEALINGS IN THE SOFTWARE.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <err.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <locale.h>
-#include <unistd.h>
-#include <time.h>
-#include <signal.h>
-#include <string.h>
-#include <util.h>
-#include <pwd.h>
-#include <paths.h>
-#include <ctype.h>
-
+/* kernel includes */
#include <sys/types.h>
#include <sys/time.h>
#include <sys/stat.h>
#include "tree.h"
#endif
+/* /usr/includes */
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <locale.h>
+#include <paths.h>
+#include <pwd.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+#include <util.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
-#include <X11/XKBlib.h>
#include <X11/Xatom.h>
+#include <X11/XKBlib.h>
#include <X11/Xlib-xcb.h>
-#include <xcb/randr.h>
-#include <xcb/xcb_icccm.h>
-#include <xcb/xcb_keysyms.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
#include <X11/extensions/Xrandr.h>
#include <X11/extensions/XTest.h>
+#include <xcb/randr.h>
+#include <xcb/xcb_atom.h>
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_event.h>
+#include <xcb/xcb_icccm.h>
+#include <xcb/xcb_keysyms.h>
+#include <xcb/xtest.h>
+/* local includes */
+#include "version.h"
#ifdef __OSX__
#include <osx.h>
#endif
-#include "version.h"
-
#ifdef SPECTRWM_BUILDSTR
static const char *buildstr = SPECTRWM_BUILDSTR;
#else
#endif
#if defined(__OpenBSD__)
-#define xcb_icccm_wm_hints_t xcb_wm_hints_t
-#define xcb_icccm_get_wm_hints xcb_get_wm_hints
-#define xcb_icccm_get_wm_hints_reply xcb_get_wm_hints_reply
+#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
#define XCB_ICCCM_WM_HINT_X_URGENCY XCB_WM_HINT_X_URGENCY
#define XCB_ICCCM_WM_STATE_ICONIC XCB_WM_STATE_ICONIC
#define XCB_ICCCM_WM_STATE_WITHDRAWN XCB_WM_STATE_WITHDRAWN
#define XCB_ICCCM_WM_STATE_NORMAL XCB_WM_STATE_NORMAL
+#define xcb_icccm_get_text_property_reply_t xcb_get_text_property_reply_t
+#define xcb_icccm_get_text_property_reply_wipe xcb_get_text_property_reply_wipe
+#define xcb_icccm_get_wm_class xcb_get_wm_class
+#define xcb_icccm_get_wm_class_reply xcb_get_wm_class_reply
+#define xcb_icccm_get_wm_class_reply_t xcb_get_wm_class_reply_t
+#define xcb_icccm_get_wm_class_reply_wipe xcb_get_wm_class_reply_wipe
+#define xcb_icccm_get_wm_hints xcb_get_wm_hints
+#define xcb_icccm_get_wm_hints_reply xcb_get_wm_hints_reply
#define xcb_icccm_get_wm_name xcb_get_wm_name
#define xcb_icccm_get_wm_name_reply xcb_get_wm_name_reply
+#define xcb_icccm_get_wm_normal_hints xcb_get_wm_normal_hints
+#define xcb_icccm_get_wm_normal_hints_reply xcb_get_wm_normal_hints_reply
+#define xcb_icccm_get_wm_protocols xcb_get_wm_protocols
+#define xcb_icccm_get_wm_protocols_reply xcb_get_wm_protocols_reply
+#define xcb_icccm_get_wm_protocols_reply_t xcb_get_wm_protocols_reply_t
+#define xcb_icccm_get_wm_protocols_reply_wipe xcb_get_wm_protocols_reply_wipe
#define xcb_icccm_get_wm_transient_for xcb_get_wm_transient_for
#define xcb_icccm_get_wm_transient_for_reply xcb_get_wm_transient_for_reply
+#define xcb_icccm_wm_hints_t xcb_wm_hints_t
#endif
-/*#define SWM_DEBUG*/
+#define SWM_DEBUG
#ifdef SWM_DEBUG
-#define DPRINTF(x...) do { if (swm_debug) fprintf(stderr, x); } while (0)
-#define DNPRINTF(n,x...) do { if (swm_debug & n) fprintf(stderr, x); } while (0)
+#define DPRINTF(x...) do { \
+ if (swm_debug) \
+ fprintf(stderr, x); \
+} while (0)
+#define DNPRINTF(n,x...) do { \
+ if (swm_debug & n) { \
+ fprintf(stderr, "%ld ", (long)(time(NULL) - time_started)); \
+ fprintf(stderr, x); \
+ } \
+} while (0)
#define SWM_D_MISC 0x0001
#define SWM_D_EVENT 0x0002
#define SWM_D_WS 0x0004
#define DNPRINTF(n,x...)
#endif
-#define LENGTH(x) (sizeof x / sizeof x[0])
+#define LENGTH(x) (int)(sizeof x / sizeof x[0])
#define MODKEY Mod1Mask
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define BORDER(w) (w->bordered ? border_width : 0)
#define MAX_X(r) ((r)->g.x + (r)->g.w)
#define MAX_Y(r) ((r)->g.y + (r)->g.h)
-#define SH_MIN(w) (w)->sh_mask & PMinSize
+#define SH_MIN(w) (w)->sh.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE
#define SH_MIN_W(w) (w)->sh.min_width
#define SH_MIN_H(w) (w)->sh.min_height
-#define SH_MAX(w) (w)->sh_mask & PMaxSize
+#define SH_MAX(w) (w)->sh.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE
#define SH_MAX_W(w) (w)->sh.max_width
#define SH_MAX_H(w) (w)->sh.max_height
-#define SH_INC(w) (w)->sh_mask & PResizeInc
+#define SH_INC(w) (w)->sh.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC
#define SH_INC_W(w) (w)->sh.width_inc
#define SH_INC_H(w) (w)->sh.height_inc
#define SWM_MAX_FONT_STEPS (3)
volatile sig_atomic_t running = 1;
volatile sig_atomic_t restart_wm = 0;
int outputs = 0;
-int last_focus_event = FocusOut;
+/*int last_focus_event = FocusOut;*/
int (*xerrorxlib)(Display *, XErrorEvent *);
int other_wm;
int ss_enabled = 0;
unsigned int numlockmask = 0;
Display *display;
xcb_connection_t *conn;
+xcb_key_symbols_t *syms;
int cycle_empty = 0;
int cycle_visible = 0;
TAILQ_ENTRY(search_window) entry;
int idx;
struct ws_win *win;
- GC gc;
+ xcb_gcontext_t gc;
xcb_window_t indicator;
};
TAILQ_HEAD(search_winlist, search_window);
"-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*," \
"-*-*-*-r-*--*-*-*-*-*-*-*-*"
-#ifdef X_HAVE_UTF8_STRING
-#define DRAWSTRING(x...) Xutf8DrawString(x)
-#else
-#define DRAWSTRING(x...) XmbDrawString(x)
-#endif
-
char *bar_argv[] = { NULL, NULL };
int bar_pipe[2];
unsigned char bar_ext[SWM_BAR_MAX];
int disable_border = 0;
int border_width = 1;
int verbose_layout = 0;
+time_t time_started;
pid_t bar_pid;
XFontSet bar_fs;
XFontSetExtents *bar_fs_extents;
int floatmaxed; /* whether maxed by max_stack */
int floating;
int manual;
- int iconic;
+ int32_t iconic;
int bordered;
unsigned int ewmh_flags;
int font_size_boundary[SWM_MAX_FONT_STEPS];
unsigned long quirks;
struct workspace *ws; /* always valid */
struct swm_screen *s; /* always valid, never changes */
- XWindowAttributes wa;
- XSizeHints sh;
- long sh_mask;
- XClassHint ch;
- XWMHints *hints;
+ xcb_get_geometry_reply_t *wa;
+ xcb_size_hints_t sh;
+ xcb_icccm_get_wm_class_reply_t ch;
+ xcb_icccm_wm_hints_t hints;
};
TAILQ_HEAD(ws_win_list, ws_win);
/* pid goo */
struct pid_e {
TAILQ_ENTRY(pid_e) entry;
- long pid;
+ pid_t pid;
int ws;
};
TAILQ_HEAD(pid_list, pid_e);
void plain_stacker(struct workspace *);
void fancy_stacker(struct workspace *);
-struct ws_win *find_window(xcb_window_t);
-
-void grabbuttons(struct ws_win *, int);
-void new_region(struct swm_screen *, int, int, int, int);
-void unmanage_window(struct ws_win *);
-uint16_t getstate(xcb_window_t);
-
-int conf_load(char *, int);
-
struct layout {
void (*l_stack)(struct workspace *, struct swm_geometry *);
void (*l_config)(struct workspace *, int);
char *name;
} c[SWM_S_COLOR_MAX];
- GC bar_gc;
+ xcb_gcontext_t bar_gc;
};
struct swm_screen *screens;
char **argv;
};
-void focus(struct swm_region *, union arg *);
-void focus_magic(struct ws_win *);
-
/* quirks */
struct quirk {
TAILQ_ENTRY(quirk) entry;
{"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE},
};
-void store_float_geom(struct ws_win *, struct swm_region *);
-int floating_toggle_win(struct ws_win *);
-void constrain_window(struct ws_win *, struct swm_region *, int);
-void update_window(struct ws_win *);
-void spawn_select(struct swm_region *, union arg *, char *, int *);
-char *get_win_name(xcb_window_t);
-xcb_atom_t get_atom_from_string(const char *);
-void map_window_raised(xcb_window_t);
-void do_sync(void);
+/* function prototypes */
+int conf_load(char *, int);
+void constrain_window(struct ws_win *, struct swm_region *, int);
+void do_sync(void);
+void event_handle(xcb_generic_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 *);
+xcb_atom_t get_atom_from_string(const char *);
xcb_screen_t *get_screen(int);
+char *get_win_name(xcb_window_t);
+uint16_t getstate(xcb_window_t);
+void grabbuttons(struct ws_win *, int);
+void map_window_raised(xcb_window_t);
+void new_region(struct swm_screen *, int, int, int, int);
+int parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *);
+void spawn_select(struct swm_region *, union arg *, char *, int *);
+void store_float_geom(struct ws_win *, struct swm_region *);
+void unmanage_window(struct ws_win *);
+void update_window(struct ws_win *);
+
+/* function definitions */
+int
+parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb)
+{
+ unsigned int tmpr, tmpg, tmpb;
+
+ if (sscanf(rgb, "rgb:%x/%x/%x", &tmpr, &tmpg, &tmpb) != 3)
+ return (-1);
+
+ *rr = tmpr << 8;
+ *gg = tmpg << 8;
+ *bb = tmpb << 8;
+
+ return (0);
+}
xcb_screen_t *
get_screen(int screen)
uint32_t val = XCB_STACK_MODE_ABOVE;
xcb_configure_window(conn, win,
- XCB_CONFIG_WINDOW_STACK_MODE, &val);
+ XCB_CONFIG_WINDOW_STACK_MODE, &val);
xcb_map_window(conn, win);
- xcb_flush(conn);
}
xcb_atom_t
if (newv)
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
- iprop, XCB_ATOM_INTEGER, 32, 1, &v);
+ iprop, XCB_ATOM_INTEGER, 32, 1, &v);
else
xcb_delete_property(conn, win->id, iprop);
}
-int
+int32_t
get_iconic(struct ws_win *win)
{
- int32_t v = 0, *vtmp;
+ int32_t v = 0;
xcb_atom_t iprop;
- xcb_get_property_cookie_t pc;
xcb_get_property_reply_t *pr = NULL;
iprop = get_atom_from_string("_SWM_ICONIC");
if (iprop == XCB_ATOM_NONE)
goto out;
- pc = xcb_get_property(conn, False, win->id, iprop, XCB_ATOM_INTEGER,
- 0, 1);
- pr = xcb_get_property_reply(conn, pc, NULL);
+ pr = xcb_get_property_reply(conn,
+ xcb_get_property(conn, False, win->id, iprop, XCB_ATOM_INTEGER,
+ 0, 1), NULL);
if (!pr)
goto out;
if (pr->type != XCB_ATOM_INTEGER || pr->format != 32)
goto out;
- vtmp = xcb_get_property_value(pr);
- v = *vtmp;
+ v = *((int32_t *)xcb_get_property_value(pr));
out:
- if (pr != NULL)
+ if (pr)
free(pr);
return (v);
}
xcb_delete_property(conn, screens[i].root, sup_list);
for (j = 0; j < LENGTH(ewmh); j++)
xcb_change_property(conn, XCB_PROP_MODE_APPEND,
- screens[i].root, sup_list, XCB_ATOM_ATOM, 32, 1,
- &ewmh[j].atom);
+ screens[i].root, sup_list, XCB_ATOM_ATOM, 32, 1,
+ &ewmh[j].atom);
}
}
for (i = 0; i < num_screens; i++) {
/* Get the support check window and destroy it */
pc = xcb_get_property(conn, False, screens[i].root, sup_check,
- XCB_ATOM_WINDOW, 0, 1);
+ XCB_ATOM_WINDOW, 0, 1);
pr = xcb_get_property_reply(conn, pc, NULL);
if (pr) {
id = *((xcb_window_t *)xcb_get_property_value(pr));
void
ewmh_autoquirk(struct ws_win *win)
{
- int i;
- unsigned long n;
- xcb_atom_t type;
+ uint32_t i, n;
+ xcb_atom_t *type;
xcb_get_property_cookie_t c;
xcb_get_property_reply_t *r;
c = xcb_get_property(conn, False, win->id,
- ewmh[_NET_WM_WINDOW_TYPE].atom, XCB_ATOM_ATOM, 0, (~0L));
+ ewmh[_NET_WM_WINDOW_TYPE].atom, XCB_ATOM_ATOM, 0, UINT32_MAX);
r = xcb_get_property_reply(conn, c, NULL);
if (!r)
return;
+
n = xcb_get_property_value_length(r);
+ type = xcb_get_property_value(r);
for (i = 0; i < n; i++) {
- type = *((xcb_atom_t *)xcb_get_property_value(r));
- if (type == ewmh[_NET_WM_WINDOW_TYPE_NORMAL].atom)
+ if (type[i] == ewmh[_NET_WM_WINDOW_TYPE_NORMAL].atom)
break;
- if (type == ewmh[_NET_WM_WINDOW_TYPE_DOCK].atom ||
- type == ewmh[_NET_WM_WINDOW_TYPE_TOOLBAR].atom ||
- type == ewmh[_NET_WM_WINDOW_TYPE_UTILITY].atom) {
+ if (type[i] == ewmh[_NET_WM_WINDOW_TYPE_DOCK].atom ||
+ type[i] == ewmh[_NET_WM_WINDOW_TYPE_TOOLBAR].atom ||
+ type[i] == ewmh[_NET_WM_WINDOW_TYPE_UTILITY].atom) {
win->floating = 1;
win->quirks = SWM_Q_FLOAT | SWM_Q_ANYWHERE;
break;
}
- if (type == ewmh[_NET_WM_WINDOW_TYPE_SPLASH].atom ||
- type == ewmh[_NET_WM_WINDOW_TYPE_DIALOG].atom) {
+ if (type[i] == ewmh[_NET_WM_WINDOW_TYPE_SPLASH].atom ||
+ type[i] == ewmh[_NET_WM_WINDOW_TYPE_DIALOG].atom) {
win->floating = 1;
win->quirks = SWM_Q_FLOAT;
break;
}
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
- ewmh[_NET_WM_ALLOWED_ACTIONS].atom, XCB_ATOM_ATOM, 32, 1,
- actions);
+ ewmh[_NET_WM_ALLOWED_ACTIONS].atom, XCB_ATOM_ATOM, 32, 1, actions);
}
#define _NET_WM_STATE_REMOVE 0 /* remove/unset property */
if (win->ewmh_flags & EWMH_F_FULLSCREEN)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
- ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
- &ewmh[_NET_WM_STATE_FULLSCREEN].atom);
+ ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
+ &ewmh[_NET_WM_STATE_FULLSCREEN].atom);
if (win->ewmh_flags & EWMH_F_SKIP_PAGER)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
- ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
- &ewmh[_NET_WM_STATE_SKIP_PAGER].atom);
+ ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
+ &ewmh[_NET_WM_STATE_SKIP_PAGER].atom);
if (win->ewmh_flags & EWMH_F_SKIP_TASKBAR)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
- ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
- &ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom);
+ ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
+ &ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom);
if (win->ewmh_flags & EWMH_F_ABOVE)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
- ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
- &ewmh[_NET_WM_STATE_ABOVE].atom);
+ ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
+ &ewmh[_NET_WM_STATE_ABOVE].atom);
if (win->ewmh_flags & SWM_F_MANUAL)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
- ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
- &ewmh[_SWM_WM_STATE_MANUAL].atom);
+ ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
+ &ewmh[_SWM_WM_STATE_MANUAL].atom);
}
void
win->ewmh_flags |= SWM_F_MANUAL;
c = xcb_get_property(conn, False, win->id, ewmh[_NET_WM_STATE].atom,
- XCB_ATOM_ATOM, 0, (~0L));
+ XCB_ATOM_ATOM, 0, UINT32_MAX);
r = xcb_get_property_reply(conn, c, NULL);
if (!r)
return;
states = xcb_get_property_value(r);
n = xcb_get_property_value_length(r);
- free(r);
-
for (i = 0; i < n; i++)
ewmh_update_win_state(win, states[i], _NET_WM_STATE_ADD);
+
+ free(r);
}
/* events */
#ifdef SWM_DEBUG
-char *
-geteventname(XEvent *e)
-{
- char *name = NULL;
-
- switch (e->type) {
- case KeyPress:
- name = "KeyPress";
- break;
- case KeyRelease:
- name = "KeyRelease";
- break;
- case ButtonPress:
- name = "ButtonPress";
- break;
- case ButtonRelease:
- name = "ButtonRelease";
- break;
- case MotionNotify:
- name = "MotionNotify";
- break;
- case EnterNotify:
- name = "EnterNotify";
- break;
- case LeaveNotify:
- name = "LeaveNotify";
- break;
- case FocusIn:
- name = "FocusIn";
- break;
- case FocusOut:
- name = "FocusOut";
- break;
- case KeymapNotify:
- name = "KeymapNotify";
- break;
- case Expose:
- name = "Expose";
- break;
- case GraphicsExpose:
- name = "GraphicsExpose";
- break;
- case NoExpose:
- name = "NoExpose";
- break;
- case VisibilityNotify:
- name = "VisibilityNotify";
- break;
- case CreateNotify:
- name = "CreateNotify";
- break;
- case DestroyNotify:
- name = "DestroyNotify";
- break;
- case UnmapNotify:
- name = "UnmapNotify";
- break;
- case MapNotify:
- name = "MapNotify";
- break;
- case MapRequest:
- name = "MapRequest";
- break;
- case ReparentNotify:
- name = "ReparentNotify";
- break;
- case ConfigureNotify:
- name = "ConfigureNotify";
- break;
- case ConfigureRequest:
- name = "ConfigureRequest";
- break;
- case GravityNotify:
- name = "GravityNotify";
- break;
- case ResizeRequest:
- name = "ResizeRequest";
- break;
- case CirculateNotify:
- name = "CirculateNotify";
- break;
- case CirculateRequest:
- name = "CirculateRequest";
- break;
- case PropertyNotify:
- name = "PropertyNotify";
- break;
- case SelectionClear:
- name = "SelectionClear";
- break;
- case SelectionRequest:
- name = "SelectionRequest";
- break;
- case SelectionNotify:
- name = "SelectionNotify";
- break;
- case ColormapNotify:
- name = "ColormapNotify";
- break;
- case ClientMessage:
- name = "ClientMessage";
- break;
- case MappingNotify:
- name = "MappingNotify";
- break;
- default:
- name = "Unknown";
- }
-
- return (name);
-}
-
-char *
-xrandr_geteventname(XEvent *e)
-{
- char *name = NULL;
-
- switch(e->type - xrandr_eventbase) {
- case RRScreenChangeNotify:
- name = "RRScreenChangeNotify";
- break;
- default:
- name = "Unknown";
- }
-
- return (name);
-}
-
void
dumpwins(struct swm_region *r, union arg *args)
{
wa = xcb_get_window_attributes_reply(conn, c, NULL);
if (wa) {
warnx("window: 0x%x, map_state: %d, state: %u, "
- "transient: 0x%x", win->id, wa->map_state,
- state, win->transient);
+ "transient: 0x%x", win->id, wa->map_state,
+ state, win->transient);
free(wa);
} else
warnx("window: 0x%x, failed xcb_get_window_attributes",
wa = xcb_get_window_attributes_reply(conn, c, NULL);
if (wa) {
warnx("window: 0x%x, map_state: %d, state: %u, "
- "transient: 0x%x", win->id, wa->map_state,
- state, win->transient);
+ "transient: 0x%x", win->id, wa->map_state,
+ state, win->transient);
free(wa);
} else
warnx("window: 0x%x, failed xcb_get_window_attributes",
}
#endif /* SWM_DEBUG */
-void expose(XEvent *);
-void keypress(XEvent *);
-void buttonpress(XEvent *);
-void configurerequest(XEvent *);
-void configurenotify(XEvent *);
-void destroynotify(XEvent *);
-void enternotify(XEvent *);
-void focusevent(XEvent *);
-void mapnotify(XEvent *);
-void mappingnotify(XEvent *);
-void maprequest(XEvent *);
-void propertynotify(XEvent *);
-void unmapnotify(XEvent *);
-void visibilitynotify(XEvent *);
-void clientmessage(XEvent *);
-
-void (*handler[LASTEvent])(XEvent *) = {
- [Expose] = expose,
- [KeyPress] = keypress,
- [ButtonPress] = buttonpress,
- [ConfigureRequest] = configurerequest,
- [ConfigureNotify] = configurenotify,
- [DestroyNotify] = destroynotify,
- [EnterNotify] = enternotify,
- [FocusIn] = focusevent,
- [FocusOut] = focusevent,
- [MapNotify] = mapnotify,
- [MappingNotify] = mappingnotify,
- [MapRequest] = maprequest,
- [PropertyNotify] = propertynotify,
- [UnmapNotify] = unmapnotify,
- [VisibilityNotify] = visibilitynotify,
- [ClientMessage] = clientmessage,
-};
+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)
}
struct pid_e *
-find_pid(long pid)
+find_pid(pid_t pid)
{
struct pid_e *p = NULL;
- DNPRINTF(SWM_D_MISC, "find_pid: %lu\n", pid);
+ DNPRINTF(SWM_D_MISC, "find_pid: %d\n", pid);
if (pid == 0)
return (NULL);
char cname[32] = "#";
xcb_screen_t *screen;
xcb_colormap_t cmap;
- xcb_alloc_named_color_cookie_t c;
- xcb_alloc_named_color_reply_t *r;
+ xcb_alloc_color_reply_t *cr;
+ xcb_alloc_named_color_reply_t *nr;
+ uint16_t rr, gg, bb;
- /* XXX - does not support rgb:/RR/GG/BB
- * will need to use xcb_alloc_color
- */
screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
cmap = screen->default_colormap;
- c = xcb_alloc_named_color(conn, cmap, strlen(colorname), colorname);
- r = xcb_alloc_named_color_reply(conn, c, NULL);
- if (!r) {
- strlcat(cname, colorname + 2, sizeof cname - 1);
- c = xcb_alloc_named_color(conn, cmap, strlen(cname),
- cname);
- r = xcb_alloc_named_color_reply(conn, c, NULL);
+ /* color is in format rgb://rr/gg/bb */
+ if (strncmp(colorname, "rgb:", 4) == 0) {
+ if (parse_rgb(colorname, &rr, &gg, &bb) == -1)
+ warnx("could not parse rgb %s", colorname);
+ else {
+ cr = xcb_alloc_color_reply(conn,
+ xcb_alloc_color(conn, cmap, rr, gg, bb),
+ NULL);
+ if (cr) {
+ result = cr->pixel;
+ free(cr);
+ } else
+ warnx("color '%s' not found", colorname);
+ }
+ } else {
+ nr = xcb_alloc_named_color_reply(conn,
+ xcb_alloc_named_color(conn, cmap, strlen(colorname),
+ colorname), NULL);
+ if (!nr) {
+ strlcat(cname, colorname + 2, sizeof cname - 1);
+ nr = xcb_alloc_named_color_reply(conn,
+ xcb_alloc_named_color(conn, cmap, strlen(cname),
+ cname), NULL);
+ }
+ if (nr) {
+ result = nr->pixel;
+ free(nr);
+ } else
+ warnx("color '%s' not found", colorname);
}
- if (r) {
- result = r->pixel;
- free(r);
- } else
- warnx("color '%s' not found", colorname);
return (result);
}
{
int x = 0;
size_t len;
+ xcb_rectangle_t rect;
+ uint32_t gcv[1];
XRectangle ibox, lbox;
len = strlen(s);
if (x < SWM_BAR_OFFSET)
x = SWM_BAR_OFFSET;
+ rect.x = 0;
+ rect.y = 0;
+ rect.width = WIDTH(r->bar);
+ rect.height = HEIGHT(r->bar);
+
/* clear back buffer */
- XSetForeground(display, r->s->bar_gc, r->s->c[SWM_S_COLOR_BAR].color);
- XFillRectangle(display, r->bar->buffer, r->s->bar_gc, 0, 0,
- WIDTH(r->bar), HEIGHT(r->bar));
+ gcv[0] = r->s->c[SWM_S_COLOR_BAR].color;
+ xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
+ xcb_poly_fill_rectangle(conn, r->bar->buffer, r->s->bar_gc,
+ sizeof(rect), &rect);
/* draw back buffer */
- XSetForeground(display, r->s->bar_gc,
- r->s->c[SWM_S_COLOR_BAR_FONT].color);
- DRAWSTRING(display, r->bar->buffer, bar_fs, r->s->bar_gc,
- x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 -
- lbox.y, s, len);
+ gcv[0] = r->s->c[SWM_S_COLOR_BAR].color;
+ xcb_change_gc(conn, r->s->bar_gc, XCB_GC_BACKGROUND, gcv);
+ gcv[0] = r->s->c[SWM_S_COLOR_BAR_FONT].color;
+ xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
+ xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, x,
+ (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 -
+ lbox.y, s);
/* blt */
- XCopyArea(display, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0,
- WIDTH(r->bar), HEIGHT(r->bar), 0, 0);
+ xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0,
+ 0, 0, WIDTH(r->bar), HEIGHT(r->bar));
}
void
{
if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
return;
- if (r->ws->focus->ch.res_class != NULL)
- strlcat(s, r->ws->focus->ch.res_class, sz);
+ if (r->ws->focus->ch.class_name != NULL)
+ strlcat(s, r->ws->focus->ch.class_name, sz);
}
void
{
if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
return;
- if (r->ws->focus->ch.res_name != NULL)
- strlcat(s, r->ws->focus->ch.res_name, sz);
+ if (r->ws->focus->ch.instance_name != NULL)
+ strlcat(s, r->ws->focus->ch.instance_name, sz);
}
void
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) {
c = xcb_icccm_get_wm_hints(conn, win->id);
if (xcb_icccm_get_wm_hints_reply(conn, c,
- &hints, NULL) == 0)
+ &hints, NULL) == 0)
continue;
if (hints.flags & XCB_ICCCM_WM_HINT_X_URGENCY)
urgent[j] = 1;
stack();
/* must be after stack */
bar_update();
+
+ xcb_flush(conn);
}
void
wa[0] = screens[i].c[SWM_S_COLOR_BAR].color;
wa[1] = screens[i].c[SWM_S_COLOR_BAR_BORDER].color;
xcb_change_window_attributes(conn, r->bar->id,
- XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
+ XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
}
bar_update();
}
int num_missing_charsets = 0;
int i;
xcb_screen_t *screen = get_screen(r->s->idx);
+ uint32_t wa[3];
if (bar_fs) {
XFreeFontSet(display, bar_fs);
WIDTH(r->bar) = WIDTH(r) - 2 * bar_border_width;
HEIGHT(r->bar) = bar_height - 2 * bar_border_width;
- r->bar->id = XCreateSimpleWindow(display,
- r->s->root, X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar),
- bar_border_width, r->s->c[SWM_S_COLOR_BAR_BORDER].color,
- r->s->c[SWM_S_COLOR_BAR].color);
-
- r->bar->buffer = XCreatePixmap(display, r->bar->id, WIDTH(r->bar),
- HEIGHT(r->bar), screen->root_depth);
+ r->bar->id = xcb_generate_id(conn);
+ wa[0] = r->s->c[SWM_S_COLOR_BAR].color;
+ wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER].color;
+ wa[2] = XCB_EVENT_MASK_EXPOSURE;
+ xcb_create_window(conn, XCB_COPY_FROM_PARENT, r->bar->id, r->s->root,
+ X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar),
+ bar_border_width, XCB_WINDOW_CLASS_INPUT_OUTPUT,
+ XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL
+ | XCB_CW_EVENT_MASK, wa);
+
+ r->bar->buffer = xcb_generate_id(conn);
+ 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);
+ XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE);
if (bar_enabled)
map_window_raised(r->bar->id);
r->bar = NULL;
}
-void
-drain_enter_notify(void)
-{
- int i = 0;
-
- while (xcb_poll_for_event(conn))
- i++;
-
- DNPRINTF(SWM_D_EVENT, "drain_enter_notify: drained: %d\n", i);
-}
-
void
set_win_state(struct ws_win *win, uint16_t state)
{
return;
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, astate,
- astate, 32, 2, data);
+ astate, 32, 2, data);
}
uint16_t
free(r);
}
+ DNPRINTF(SWM_D_MISC, "getstate property: win 0x%x state %u\n", w,
+ result);
return (result);
}
else
strlcpy(bar_vertext, "", sizeof bar_vertext);
bar_update();
+
+ xcb_flush(conn);
}
void
ev.data.data32[1] = XCB_CURRENT_TIME;
xcb_send_event(conn, False, win->id,
- XCB_EVENT_MASK_NO_EVENT, (const char *)&ev);
- xcb_flush(conn);
+ XCB_EVENT_MASK_NO_EVENT, (const char *)&ev);
}
/* synthetic response to a ConfigureRequest when not making a change */
void
-config_win(struct ws_win *win, XConfigureRequestEvent *ev)
+config_win(struct ws_win *win, xcb_configure_request_event_t *ev)
{
xcb_configure_notify_event_t ce;
ce.window = ev->window;
/* make response appear more WM_SIZE_HINTS-compliant */
- if (win->sh_mask)
+ if (win->sh.flags)
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.flags: %u, min: %d x %d, max: %d x %d, inc: "
+ "%d x %d\n", win->id, win->sh.flags, SH_MIN_W(win),
SH_MIN_H(win), SH_MAX_W(win), SH_MAX_H(win),
SH_INC_W(win), SH_INC_H(win));
ce.x += BORDER(win) - ev->border_width;
ce.y += BORDER(win) - ev->border_width;
ce.border_width = ev->border_width;
- ce.above_sibling = ev->above;
+ ce.above_sibling = ev->sibling;
}
DNPRINTF(SWM_D_MISC, "config_win: ewmh: %s, window: 0x%x, (x,y) w x h: "
xcb_send_event(conn, False, win->id, XCB_EVENT_MASK_STRUCTURE_NOTIFY,
(char *)&ce);
- xcb_flush(conn);
}
int
xcb_unmap_window(conn, win->id);
xcb_change_window_attributes(conn, win->id,
- XCB_CW_BORDER_PIXEL, &win->s->c[SWM_S_COLOR_UNFOCUS].color);
+ XCB_CW_BORDER_PIXEL, &win->s->c[SWM_S_COLOR_UNFOCUS].color);
}
void
fake_keypress(struct ws_win *win, xcb_keysym_t keysym, uint16_t modifiers)
{
xcb_key_press_event_t event;
- xcb_key_symbols_t *syms;
xcb_keycode_t *keycode;
if (win == NULL)
return;
- syms = xcb_key_symbols_alloc(conn);
keycode = xcb_key_symbols_get_keycode(syms, keysym);
+ DNPRINTF(SWM_D_MISC, "fake_keypress: win 0x%x keycode %u\n",
+ win->id, *keycode);
+
+ bzero(&event, sizeof(event));
event.event = win->id;
event.root = win->s->root;
event.child = XCB_WINDOW_NONE;
event.response_type = XCB_KEY_PRESS;
xcb_send_event(conn, True, win->id,
- XCB_EVENT_MASK_KEY_PRESS, (char *)&event);
+ XCB_EVENT_MASK_KEY_PRESS, (char *)&event);
event.response_type = XCB_KEY_RELEASE;
xcb_send_event(conn, True, win->id,
- XCB_EVENT_MASK_KEY_RELEASE, (char *)&event);
- xcb_flush(conn);
-
- xcb_key_symbols_free(syms);
+ XCB_EVENT_MASK_KEY_RELEASE, (char *)&event);
}
void
bar_extra_stop();
bar_extra = 1;
unmap_all();
- XCloseDisplay(display);
+
+ xcb_key_symbols_free(syms);
+ xcb_flush(conn);
+ xcb_disconnect(conn);
+
execvp(start_argv[0], start_argv);
warn("execvp failed");
quit(NULL, NULL);
{
struct swm_region *r = NULL;
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%x\n", root);
if (screens[i].root == root)
break;
- qpc = xcb_query_pointer(conn, screens[i].root);
- qpr = xcb_query_pointer_reply(conn, qpc, NULL);
+ qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn,
+ screens[i].root), NULL);
if (qpr) {
DNPRINTF(SWM_D_MISC, "root_to_region: pointer: (%d,%d)\n",
void
unfocus_win(struct ws_win *win)
{
- XEvent cne;
xcb_window_t none = XCB_WINDOW_NONE;
DNPRINTF(SWM_D_FOCUS, "unfocus_win: window: 0x%x\n", WINID(win));
win->ws->focus_prev = NULL;
}
- /* drain all previous unfocus events */
- while (XCheckTypedEvent(display, FocusOut, &cne) == True)
- ;
-
grabbuttons(win, 0);
xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL,
- &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
+ &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);
+ ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, &none);
}
void
void
focus_win(struct ws_win *win)
{
- XEvent cne;
struct ws_win *cfw = NULL;
xcb_get_input_focus_cookie_t c;
xcb_get_input_focus_reply_t *r;
unfocus_win(cfw);
else {
/* use larger hammer since the window was killed somehow */
- TAILQ_FOREACH(cfw, &win->ws->winlist, entry)
+ /* TAILQ_FOREACH(cfw, &win->ws->winlist, entry)
if (cfw->ws && cfw->ws->r && cfw->ws->r->s)
xcb_change_window_attributes(conn, cfw->id,
- XCB_CW_BORDER_PIXEL,
- &cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);
+ XCB_CW_BORDER_PIXEL,
+ &cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);*/
}
win->ws->focus = win;
if (win->ws->r != NULL) {
- /* drain all previous focus events */
- while (XCheckTypedEvent(display, FocusIn, &cne) == True)
- ;
-
if (win->java == 0)
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
- win->id, XCB_CURRENT_TIME);
+ win->id, XCB_CURRENT_TIME);
grabbuttons(win, 1);
xcb_change_window_attributes(conn, win->id,
XCB_CW_BORDER_PIXEL,
map_window_raised(win->id);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
- ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
- &win->id);
+ ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
+ &win->id);
}
bar_update();
TAILQ_FOREACH(win, &old_ws->winlist, entry)
unmap_window(win);
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
+ xcb_flush(conn);
}
void
x = X(rr) + 1;
y = Y(rr) + 1 + (bar_enabled ? bar_height : 0);
xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0, 0,
- x, y);
+ x, y);
a.id = SWM_ARG_ID_FOCUSCUR;
focus(rr, &a);
x = X(rr->ws->focus) + 1;
y = Y(rr->ws->focus) + 1;
xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0,
- 0, x, y);
+ 0, x, y);
}
}
sort_windows(wl);
stack();
+
+ xcb_flush(conn);
}
void
}
focus_magic(winfocus);
+
+ xcb_flush(conn);
}
void
ws->cur_layout = &layouts[0];
stack();
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
+
a.id = SWM_ARG_ID_FOCUSCUR;
+
focus(r, &a);
}
if (font_adjusted)
font_adjusted--;
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
-
DNPRINTF(SWM_D_STACK, "stack: end\n");
}
void
stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
{
- XWindowAttributes wa;
struct swm_geometry win_g, r_g = *g;
struct ws_win *win, *fs_win = NULL;
int i, j, s, stacks;
int split, colno, winno, mwin, msize, mscale;
int remain, missing, v_slice, reconfigure;
int bordered = 1;
+ xcb_get_window_attributes_reply_t *war;
DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d, rot: %s, "
"flip: %s\n", ws->idx, YESNO(rot), YESNO(flip));
update_window(win);
}
- if (XGetWindowAttributes(display, win->id, &wa))
- if (wa.map_state == IsUnmapped)
+ war = xcb_get_window_attributes_reply(conn,
+ xcb_get_window_attributes(conn, win->id),
+ NULL);
+ if (war) {
+ if (war->map_state == XCB_MAP_STATE_UNMAPPED)
map_window_raised(win->id);
+ free(war);
+ }
last_h = win_g.h;
i++;
DNPRINTF(SWM_D_PROP, "send_to_ws: set property: _SWM_WS: %s\n",
ws_idx_str);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
- ws_idx_atom, XCB_ATOM_STRING, 8, strlen(ws_idx_str),
- ws_idx_str);
+ ws_idx_atom, XCB_ATOM_STRING, 8, strlen(ws_idx_str),
+ ws_idx_str);
}
stack();
bar_update();
+
+ xcb_flush(conn);
}
void
pressbutton(struct swm_region *r, union arg *args)
{
- XTestFakeButtonEvent(display, args->id, True, CurrentTime);
- XTestFakeButtonEvent(display, args->id, False, CurrentTime);
+ xcb_test_fake_input(conn, XCB_BUTTON_PRESS, args->id,
+ XCB_CURRENT_TIME, XCB_WINDOW_NONE, 0, 0, 0);
+ xcb_test_fake_input(conn, XCB_BUTTON_RELEASE, args->id,
+ XCB_CURRENT_TIME, XCB_WINDOW_NONE, 0, 0, 0);
}
void
/* bring floaters back to top */
if (r->ws->always_raise == 0)
stack();
+
+ xcb_flush(conn);
}
void
unmap_window(r->ws->focus);
update_iconic(r->ws->focus, 1);
stack();
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
+
r->ws->focus = NULL;
a.id = SWM_ARG_ID_FOCUSCUR;
focus(r, &a);
+
+ xcb_flush(conn);
}
char *
{
char *name = NULL;
xcb_get_property_cookie_t c;
- xcb_get_text_property_reply_t r;
+ xcb_icccm_get_text_property_reply_t r;
c = xcb_icccm_get_wm_name(conn, win);
if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) {
- name = malloc((r.name_len + 1) * sizeof(char *));
- if (!name) {
- xcb_get_text_property_reply_wipe(&r);
- return (NULL);
+ if (r.name_len > 0) {
+ name = malloc(r.name_len + 1);
+ if (!name) {
+ xcb_icccm_get_text_property_reply_wipe(&r);
+ return (NULL);
+ }
+ memcpy(name, r.name, r.name_len);
+ name[r.name_len] = '\0';
}
- memcpy(name, r.name, r.name_len * sizeof(char *));
- name[r.name_len] = '\0';
+ xcb_icccm_get_text_property_reply_wipe(&r);
}
- xcb_get_text_property_reply_wipe(&r);
-
return (name);
}
}
fclose(lfile);
+
+ xcb_flush(conn);
}
void
while ((sw = TAILQ_FIRST(&search_wl)) != NULL) {
xcb_destroy_window(conn, sw->indicator);
- XFreeGC(display, sw->gc);
+ xcb_free_gc(conn, sw->gc);
TAILQ_REMOVE(&search_wl, sw, entry);
free(sw);
}
struct ws_win *win = NULL;
struct search_window *sw = NULL;
xcb_window_t w;
- XGCValues gcv;
+ uint32_t gcv[3], wa[2];
int i;
char s[8];
FILE *lfile;
size_t len;
XRectangle ibox, lbox;
-
DNPRINTF(SWM_D_MISC, "search_win\n");
search_r = r;
XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
- w = XCreateSimpleWindow(display,
- win->id, 0, 0,lbox.width + 4,
- bar_fs_extents->max_logical_extent.height, 1,
- r->s->c[SWM_S_COLOR_UNFOCUS].color,
- r->s->c[SWM_S_COLOR_FOCUS].color);
+ w = xcb_generate_id(conn);
+ wa[0] = r->s->c[SWM_S_COLOR_FOCUS].color;
+ wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].color;
+ xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0,
+ lbox.width + 4, bar_fs_extents->max_logical_extent.height,
+ 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
+ XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
sw->indicator = w;
TAILQ_INSERT_TAIL(&search_wl, sw, entry);
- sw->gc = XCreateGC(display, w, 0, &gcv);
+ sw->gc = xcb_generate_id(conn);
+ gcv[0] = r->s->c[SWM_S_COLOR_BAR].color;
+ gcv[1] = r->s->c[SWM_S_COLOR_FOCUS].color;
+ gcv[2] = 0;
+ xcb_create_gc(conn, sw->gc, w, XCB_GC_FOREGROUND |
+ XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv);
map_window_raised(w);
- XSetForeground(display, sw->gc, r->s->c[SWM_S_COLOR_BAR].color);
- DRAWSTRING(display, w, bar_fs, sw->gc, 2,
+ xcb_image_text_8(conn, len, w, sw->gc, 2,
(bar_fs_extents->max_logical_extent.height -
- lbox.height) / 2 - lbox.y, s, len);
+ lbox.height) / 2 - lbox.y, s);
+
+ DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w);
fprintf(lfile, "%d\n", i);
i++;
}
fclose(lfile);
+
+ xcb_flush(conn);
}
void
else
if (r->ws->focus->can_delete)
client_msg(r->ws->focus, adelete);
+
+ xcb_flush(conn);
}
_NET_WM_STATE_TOGGLE);
stack();
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
if (win == win->ws->focus) {
a.id = SWM_ARG_ID_FOCUSCUR;
focus(win->ws->r, &a);
}
+
+ xcb_flush(conn);
}
void
void
resize(struct ws_win *win, union arg *args)
{
- XEvent ev;
- Time time = 0;
+ xcb_timestamp_t timestamp = 0;
struct swm_region *r = NULL;
int resize_step = 0;
- Window rr, cr;
- int x, y, wx, wy;
- unsigned int mask;
struct swm_geometry g;
- int top = 0, left = 0;
+ int top = 0, left = 0, resizing;
int dx, dy;
- Cursor cursor;
unsigned int shape; /* cursor style */
+ xcb_cursor_t cursor;
+ xcb_font_t cursor_font;
+ xcb_grab_pointer_cookie_t gpc;
+ xcb_grab_pointer_reply_t *gpr;
+ xcb_query_pointer_reply_t *xpr;
+ xcb_generic_event_t *evt;
+ xcb_motion_notify_event_t *mne;
if (win == NULL)
return;
if (win->ewmh_flags & EWMH_F_FULLSCREEN)
return;
- DNPRINTF(SWM_D_MOUSE, "resize: window: 0x%x, floating: %s, "
+ DNPRINTF(SWM_D_EVENT, "resize: window: 0x%x, floating: %s, "
"transient: 0x%x\n", win->id, YESNO(win->floating),
win->transient);
return;
}
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
-
/* get cursor offset from window root */
- if (!XQueryPointer(display, win->id, &rr, &cr, &x, &y, &wx, &wy, &mask))
- return;
+ xpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id),
+ NULL);
+ if (!xpr)
+ return;
g = win->g;
- if (wx < WIDTH(win) / 2)
+ if (xpr->win_x < WIDTH(win) / 2)
left = 1;
- if (wy < HEIGHT(win) / 2)
+ if (xpr->win_y < HEIGHT(win) / 2)
top = 1;
if (args->id == SWM_ARG_ID_CENTER)
else
shape = (left) ? XC_bottom_left_corner : XC_bottom_right_corner;
- cursor = XCreateFontCursor(display, shape);
-
- if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync,
- GrabModeAsync, None, cursor, CurrentTime) != GrabSuccess) {
- XFreeCursor(display, cursor);
+ cursor_font = xcb_generate_id(conn);
+ xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
+
+ cursor = xcb_generate_id(conn);
+ xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
+ shape, shape + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
+
+ gpc = xcb_grab_pointer(conn, False, win->id, MOUSEMASK,
+ XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, cursor,
+ XCB_CURRENT_TIME),
+ gpr = xcb_grab_pointer_reply(conn, gpc, NULL);
+ if (!gpr) {
+ xcb_free_cursor(conn, cursor);
+ xcb_close_font(conn, cursor_font);
+ free(xpr);
return;
}
- do {
+ xcb_flush(conn);
+ resizing = 1;
+ while ((evt = xcb_wait_for_event(conn)) && resizing) {
+ /*
XMaskEvent(display, MOUSEMASK | ExposureMask |
SubstructureRedirectMask, &ev);
- switch (ev.type) {
- case ConfigureRequest:
- case Expose:
- case MapRequest:
- handler[ev.type](&ev);
+ */
+ switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
+ case XCB_BUTTON_RELEASE:
+ DNPRINTF(SWM_D_EVENT, "resize: BUTTON_RELEASE\n");
+ resizing = 0;
break;
- case MotionNotify:
+ case XCB_MOTION_NOTIFY:
+ mne = (xcb_motion_notify_event_t *)evt;
/* cursor offset/delta from start of the operation */
- dx = ev.xmotion.x_root - x;
- dy = ev.xmotion.y_root - y;
+ dx = mne->root_x - xpr->root_x;
+ dy = mne->root_y - xpr->root_y;
/* vertical */
if (top)
constrain_window(win, r, 1);
/* not free, don't sync more than 120 times / second */
- if ((ev.xmotion.time - time) > (1000 / 120) ) {
- time = ev.xmotion.time;
+ if ((mne->time - timestamp) > (1000 / 120) ) {
+ timestamp = mne->time;
do_sync();
update_window(win);
}
break;
+ default:
+ event_handle(evt);
+ break;
}
- } while (ev.type != ButtonRelease);
- if (time) {
+ free(evt);
+ }
+ if (timestamp) {
do_sync();
update_window(win);
}
store_float_geom(win,r);
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
- XFreeCursor(display, cursor);
-
- /* drain events */
- drain_enter_notify();
+ xcb_free_cursor(conn, cursor);
+ xcb_close_font(conn, cursor_font);
+ free(gpr);
+ free(xpr);
+ DNPRINTF(SWM_D_EVENT, "resize: done\n");
}
void
void
move(struct ws_win *win, union arg *args)
{
- XEvent ev;
- Time time = 0;
- int move_step = 0;
+ xcb_timestamp_t timestamp = 0;
+ int move_step = 0, moving;
struct swm_region *r = NULL;
-
- Window rr, cr;
- int x, y, wx, wy;
- unsigned int mask;
+ xcb_font_t cursor_font;
+ xcb_cursor_t cursor;
+ xcb_grab_pointer_cookie_t gpc;
+ xcb_grab_pointer_reply_t *gpr;
+ xcb_query_pointer_reply_t *qpr;
+ xcb_generic_event_t *evt;
+ xcb_motion_notify_event_t *mne;
if (win == NULL)
return;
if (win->ewmh_flags & EWMH_F_FULLSCREEN)
return;
- DNPRINTF(SWM_D_MOUSE, "move: window: 0x%x, floating: %s, transient: "
+ DNPRINTF(SWM_D_EVENT, "move: window: 0x%x, floating: %s, transient: "
"0x%x\n", win->id, YESNO(win->floating), win->transient);
/* in max_stack mode should only move transients */
return;
}
- if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync,
- GrabModeAsync, None, XCreateFontCursor(display, XC_fleur),
- CurrentTime) != GrabSuccess)
+ cursor_font = xcb_generate_id(conn);
+ xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
+
+ cursor = xcb_generate_id(conn);
+ 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, False, win->id, MOUSEMASK,
+ XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
+ XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME);
+ gpr = xcb_grab_pointer_reply(conn, gpc, NULL);
+ if (!gpr) {
+ xcb_free_cursor(conn, cursor);
+ xcb_close_font(conn, cursor_font);
return;
+ }
/* get cursor offset from window root */
- if (!XQueryPointer(display, win->id, &rr, &cr, &x, &y, &wx, &wy, &mask))
- return;
+ qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id),
+ NULL);
+ if (!qpr) {
+ xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
+ xcb_free_cursor(conn, cursor);
+ xcb_close_font(conn, cursor_font);
+ return;
+ }
- do {
- XMaskEvent(display, MOUSEMASK | ExposureMask |
- SubstructureRedirectMask, &ev);
- switch (ev.type) {
- case ConfigureRequest:
- case Expose:
- case MapRequest:
- handler[ev.type](&ev);
+ xcb_flush(conn);
+ moving = 1;
+ while ((evt = xcb_wait_for_event(conn)) && moving) {
+ switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
+ case XCB_BUTTON_RELEASE:
+ DNPRINTF(SWM_D_EVENT, "move: BUTTON_RELEASE\n");
+ moving = 0;
break;
- case MotionNotify:
- X(win) = ev.xmotion.x_root - wx - border_width;
- Y(win) = ev.xmotion.y_root - wy - border_width;
+ case XCB_MOTION_NOTIFY:
+ mne = (xcb_motion_notify_event_t *)evt;
+ X(win) = mne->root_x - qpr->win_x - border_width;
+ Y(win) = mne->root_y - qpr->win_y - border_width;
constrain_window(win, r, 0);
/* not free, don't sync more than 120 times / second */
- if ((ev.xmotion.time - time) > (1000 / 120) ) {
- time = ev.xmotion.time;
+ if ((mne->time - timestamp) > (1000 / 120) ) {
+ timestamp = mne->time;
do_sync();
update_window(win);
}
break;
+ default:
+ event_handle(evt);
+ break;
}
- } while (ev.type != ButtonRelease);
- if (time) {
+ free(evt);
+ }
+ if (timestamp) {
do_sync();
update_window(win);
}
store_float_geom(win, r);
+ free(qpr);
+ xcb_free_cursor(conn, cursor);
+ xcb_close_font(conn, cursor_font);
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
-
- /* drain events */
- drain_enter_notify();
+ DNPRINTF(SWM_D_EVENT, "move: done\n");
}
void
/* user/key callable function IDs */
enum keyfuncid {
- kf_cycle_layout,
- kf_flip_layout,
- kf_stack_reset,
- kf_master_shrink,
- kf_master_grow,
- kf_master_add,
- kf_master_del,
- kf_stack_inc,
- kf_stack_dec,
- kf_swap_main,
- kf_focus_next,
- kf_focus_prev,
- kf_swap_next,
- kf_swap_prev,
- kf_quit,
- kf_restart,
- kf_focus_main,
- kf_ws_1,
- kf_ws_2,
- kf_ws_3,
- kf_ws_4,
- kf_ws_5,
- kf_ws_6,
- kf_ws_7,
- kf_ws_8,
- kf_ws_9,
- kf_ws_10,
- kf_ws_11,
- kf_ws_12,
- kf_ws_13,
- kf_ws_14,
- kf_ws_15,
- kf_ws_16,
- kf_ws_17,
- kf_ws_18,
- kf_ws_19,
- kf_ws_20,
- kf_ws_21,
- kf_ws_22,
- kf_ws_next,
- kf_ws_prev,
- kf_ws_next_all,
- kf_ws_prev_all,
- kf_ws_prior,
- kf_screen_next,
- kf_screen_prev,
- kf_mvws_1,
- kf_mvws_2,
- kf_mvws_3,
- kf_mvws_4,
- kf_mvws_5,
- kf_mvws_6,
- kf_mvws_7,
- kf_mvws_8,
- kf_mvws_9,
- kf_mvws_10,
- kf_mvws_11,
- kf_mvws_12,
- kf_mvws_13,
- kf_mvws_14,
- kf_mvws_15,
- kf_mvws_16,
- kf_mvws_17,
- kf_mvws_18,
- kf_mvws_19,
- kf_mvws_20,
- kf_mvws_21,
- kf_mvws_22,
- kf_bar_toggle,
- kf_wind_kill,
- kf_wind_del,
- kf_float_toggle,
- kf_version,
- kf_spawn_custom,
- kf_iconify,
- kf_uniconify,
- kf_raise_toggle,
- kf_button2,
- kf_width_shrink,
- kf_width_grow,
- kf_height_shrink,
- kf_height_grow,
- kf_move_left,
- kf_move_right,
- kf_move_up,
- kf_move_down,
- kf_name_workspace,
- kf_search_workspace,
- kf_search_win,
- kf_dumpwins, /* MUST BE LAST */
- kf_invalid
+ KF_BAR_TOGGLE,
+ KF_BUTTON2,
+ KF_CYCLE_LAYOUT,
+ KF_FLIP_LAYOUT,
+ KF_FLOAT_TOGGLE,
+ KF_FOCUS_MAIN,
+ KF_FOCUS_NEXT,
+ KF_FOCUS_PREV,
+ KF_HEIGHT_GROW,
+ KF_HEIGHT_SHRINK,
+ KF_ICONIFY,
+ KF_MASTER_SHRINK,
+ KF_MASTER_GROW,
+ KF_MASTER_ADD,
+ KF_MASTER_DEL,
+ KF_MOVE_DOWN,
+ KF_MOVE_LEFT,
+ KF_MOVE_RIGHT,
+ KF_MOVE_UP,
+ KF_MVWS_1,
+ KF_MVWS_2,
+ KF_MVWS_3,
+ KF_MVWS_4,
+ KF_MVWS_5,
+ KF_MVWS_6,
+ KF_MVWS_7,
+ KF_MVWS_8,
+ KF_MVWS_9,
+ KF_MVWS_10,
+ KF_MVWS_11,
+ KF_MVWS_12,
+ KF_MVWS_13,
+ KF_MVWS_14,
+ KF_MVWS_15,
+ KF_MVWS_16,
+ KF_MVWS_17,
+ KF_MVWS_18,
+ KF_MVWS_19,
+ KF_MVWS_20,
+ KF_MVWS_21,
+ KF_MVWS_22,
+ KF_NAME_WORKSPACE,
+ KF_QUIT,
+ KF_RAISE_TOGGLE,
+ KF_RESTART,
+ KF_SCREEN_NEXT,
+ KF_SCREEN_PREV,
+ KF_SEARCH_WIN,
+ KF_SEARCH_WORKSPACE,
+ KF_SPAWN_CUSTOM,
+ KF_STACK_INC,
+ KF_STACK_DEC,
+ KF_STACK_RESET,
+ KF_SWAP_MAIN,
+ KF_SWAP_NEXT,
+ KF_SWAP_PREV,
+ KF_UNICONIFY,
+ KF_VERSION,
+ KF_WIDTH_GROW,
+ KF_WIDTH_SHRINK,
+ KF_WIND_DEL,
+ KF_WIND_KILL,
+ KF_WS_1,
+ KF_WS_2,
+ KF_WS_3,
+ KF_WS_4,
+ KF_WS_5,
+ KF_WS_6,
+ KF_WS_7,
+ KF_WS_8,
+ KF_WS_9,
+ KF_WS_10,
+ KF_WS_11,
+ KF_WS_12,
+ KF_WS_13,
+ KF_WS_14,
+ KF_WS_15,
+ KF_WS_16,
+ KF_WS_17,
+ KF_WS_18,
+ KF_WS_19,
+ KF_WS_20,
+ KF_WS_21,
+ KF_WS_22,
+ KF_WS_NEXT,
+ KF_WS_NEXT_ALL,
+ KF_WS_PREV,
+ KF_WS_PREV_ALL,
+ KF_WS_PRIOR,
+ KF_DUMPWINS, /* MUST BE LAST */
+ KF_INVALID
};
/* key definitions */
-void
-dummykeyfunc(struct swm_region *r, union arg *args)
-{
-};
-
struct keyfunc {
char name[SWM_FUNCNAME_LEN];
void (*func)(struct swm_region *r, union arg *);
union arg args;
-} keyfuncs[kf_invalid + 1] = {
+} keyfuncs[KF_INVALID + 1] = {
/* name function argument */
+ { "bar_toggle", bar_toggle, {0} },
+ { "button2", pressbutton, {2} },
{ "cycle_layout", cycle_layout, {0} },
{ "flip_layout", stack_config, {.id = SWM_ARG_ID_FLIPLAYOUT} },
- { "stack_reset", stack_config, {.id = SWM_ARG_ID_STACKRESET} },
+ { "float_toggle", floating_toggle,{0} },
+ { "focus_main", focus, {.id = SWM_ARG_ID_FOCUSMAIN} },
+ { "focus_next", focus, {.id = SWM_ARG_ID_FOCUSNEXT} },
+ { "focus_prev", focus, {.id = SWM_ARG_ID_FOCUSPREV} },
+ { "height_grow", resize_step, {.id = SWM_ARG_ID_HEIGHTGROW} },
+ { "height_shrink", resize_step, {.id = SWM_ARG_ID_HEIGHTSHRINK} },
+ { "iconify", iconify, {0} },
{ "master_shrink", stack_config, {.id = SWM_ARG_ID_MASTERSHRINK} },
{ "master_grow", stack_config, {.id = SWM_ARG_ID_MASTERGROW} },
{ "master_add", stack_config, {.id = SWM_ARG_ID_MASTERADD} },
{ "master_del", stack_config, {.id = SWM_ARG_ID_MASTERDEL} },
+ { "move_down", move_step, {.id = SWM_ARG_ID_MOVEDOWN} },
+ { "move_left", move_step, {.id = SWM_ARG_ID_MOVELEFT} },
+ { "move_right", move_step, {.id = SWM_ARG_ID_MOVERIGHT} },
+ { "move_up", move_step, {.id = SWM_ARG_ID_MOVEUP} },
+ { "mvws_1", send_to_ws, {.id = 0} },
+ { "mvws_2", send_to_ws, {.id = 1} },
+ { "mvws_3", send_to_ws, {.id = 2} },
+ { "mvws_4", send_to_ws, {.id = 3} },
+ { "mvws_5", send_to_ws, {.id = 4} },
+ { "mvws_6", send_to_ws, {.id = 5} },
+ { "mvws_7", send_to_ws, {.id = 6} },
+ { "mvws_8", send_to_ws, {.id = 7} },
+ { "mvws_9", send_to_ws, {.id = 8} },
+ { "mvws_10", send_to_ws, {.id = 9} },
+ { "mvws_11", send_to_ws, {.id = 10} },
+ { "mvws_12", send_to_ws, {.id = 11} },
+ { "mvws_13", send_to_ws, {.id = 12} },
+ { "mvws_14", send_to_ws, {.id = 13} },
+ { "mvws_15", send_to_ws, {.id = 14} },
+ { "mvws_16", send_to_ws, {.id = 15} },
+ { "mvws_17", send_to_ws, {.id = 16} },
+ { "mvws_18", send_to_ws, {.id = 17} },
+ { "mvws_19", send_to_ws, {.id = 18} },
+ { "mvws_20", send_to_ws, {.id = 19} },
+ { "mvws_21", send_to_ws, {.id = 20} },
+ { "mvws_22", send_to_ws, {.id = 21} },
+ { "name_workspace", name_workspace, {0} },
+ { "quit", quit, {0} },
+ { "raise_toggle", raise_toggle, {0} },
+ { "restart", restart, {0} },
+ { "screen_next", cyclescr, {.id = SWM_ARG_ID_CYCLESC_UP} },
+ { "screen_prev", cyclescr, {.id = SWM_ARG_ID_CYCLESC_DOWN} },
+ { "search_win", search_win, {0} },
+ { "search_workspace", search_workspace, {0} },
+ { "spawn_custom", NULL, {0} },
{ "stack_inc", stack_config, {.id = SWM_ARG_ID_STACKINC} },
{ "stack_dec", stack_config, {.id = SWM_ARG_ID_STACKDEC} },
+ { "stack_reset", stack_config, {.id = SWM_ARG_ID_STACKRESET} },
{ "swap_main", swapwin, {.id = SWM_ARG_ID_SWAPMAIN} },
- { "focus_next", focus, {.id = SWM_ARG_ID_FOCUSNEXT} },
- { "focus_prev", focus, {.id = SWM_ARG_ID_FOCUSPREV} },
{ "swap_next", swapwin, {.id = SWM_ARG_ID_SWAPNEXT} },
{ "swap_prev", swapwin, {.id = SWM_ARG_ID_SWAPPREV} },
- { "quit", quit, {0} },
- { "restart", restart, {0} },
- { "focus_main", focus, {.id = SWM_ARG_ID_FOCUSMAIN} },
+ { "uniconify", uniconify, {0} },
+ { "version", version, {0} },
+ { "width_grow", resize_step, {.id = SWM_ARG_ID_WIDTHGROW} },
+ { "width_shrink", resize_step, {.id = SWM_ARG_ID_WIDTHSHRINK} },
+ { "wind_del", wkill, {.id = SWM_ARG_ID_DELETEWINDOW} },
+ { "wind_kill", wkill, {.id = SWM_ARG_ID_KILLWINDOW} },
{ "ws_1", switchws, {.id = 0} },
{ "ws_2", switchws, {.id = 1} },
{ "ws_3", switchws, {.id = 2} },
{ "ws_21", switchws, {.id = 20} },
{ "ws_22", switchws, {.id = 21} },
{ "ws_next", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP} },
- { "ws_prev", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} },
{ "ws_next_all", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP_ALL} },
+ { "ws_prev", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} },
{ "ws_prev_all", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN_ALL} },
{ "ws_prior", priorws, {0} },
- { "screen_next", cyclescr, {.id = SWM_ARG_ID_CYCLESC_UP} },
- { "screen_prev", cyclescr, {.id = SWM_ARG_ID_CYCLESC_DOWN} },
- { "mvws_1", send_to_ws, {.id = 0} },
- { "mvws_2", send_to_ws, {.id = 1} },
- { "mvws_3", send_to_ws, {.id = 2} },
- { "mvws_4", send_to_ws, {.id = 3} },
- { "mvws_5", send_to_ws, {.id = 4} },
- { "mvws_6", send_to_ws, {.id = 5} },
- { "mvws_7", send_to_ws, {.id = 6} },
- { "mvws_8", send_to_ws, {.id = 7} },
- { "mvws_9", send_to_ws, {.id = 8} },
- { "mvws_10", send_to_ws, {.id = 9} },
- { "mvws_11", send_to_ws, {.id = 10} },
- { "mvws_12", send_to_ws, {.id = 11} },
- { "mvws_13", send_to_ws, {.id = 12} },
- { "mvws_14", send_to_ws, {.id = 13} },
- { "mvws_15", send_to_ws, {.id = 14} },
- { "mvws_16", send_to_ws, {.id = 15} },
- { "mvws_17", send_to_ws, {.id = 16} },
- { "mvws_18", send_to_ws, {.id = 17} },
- { "mvws_19", send_to_ws, {.id = 18} },
- { "mvws_20", send_to_ws, {.id = 19} },
- { "mvws_21", send_to_ws, {.id = 20} },
- { "mvws_22", send_to_ws, {.id = 21} },
- { "bar_toggle", bar_toggle, {0} },
- { "wind_kill", wkill, {.id = SWM_ARG_ID_KILLWINDOW} },
- { "wind_del", wkill, {.id = SWM_ARG_ID_DELETEWINDOW} },
- { "float_toggle", floating_toggle,{0} },
- { "version", version, {0} },
- { "spawn_custom", dummykeyfunc, {0} },
- { "iconify", iconify, {0} },
- { "uniconify", uniconify, {0} },
- { "raise_toggle", raise_toggle, {0} },
- { "button2", pressbutton, {2} },
- { "width_shrink", resize_step, {.id = SWM_ARG_ID_WIDTHSHRINK} },
- { "width_grow", resize_step, {.id = SWM_ARG_ID_WIDTHGROW} },
- { "height_shrink", resize_step, {.id = SWM_ARG_ID_HEIGHTSHRINK} },
- { "height_grow", resize_step, {.id = SWM_ARG_ID_HEIGHTGROW} },
- { "move_left", move_step, {.id = SWM_ARG_ID_MOVELEFT} },
- { "move_right", move_step, {.id = SWM_ARG_ID_MOVERIGHT} },
- { "move_up", move_step, {.id = SWM_ARG_ID_MOVEUP} },
- { "move_down", move_step, {.id = SWM_ARG_ID_MOVEDOWN} },
- { "name_workspace", name_workspace, {0} },
- { "search_workspace", search_workspace, {0} },
- { "search_win", search_win, {0} },
{ "dumpwins", dumpwins, {0} }, /* MUST BE LAST */
{ "invalid key func", NULL, {0} },
};
keyfuncs[kfid].name, spawn_name);
if ((kp = key_lookup(mod, ks)) != NULL) {
- if (kfid == kf_invalid)
+ if (kfid == KF_INVALID)
key_remove(kp);
else
key_replace(kp, mod, ks, kfid, spawn_name);
DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
return;
}
- if (kfid == kf_invalid) {
+ if (kfid == KF_INVALID) {
warnx("error: setkeybinding: cannot find mod/key combination");
DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
return;
if (selector == NULL) {
DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value);
if (parsekeys(value, mod_key, &mod, &ks) == 0) {
- kfid = kf_invalid;
+ kfid = KF_INVALID;
setkeybinding(mod, ks, kfid, NULL);
return (0);
} else
return (1);
}
/* search by key function name */
- for (kfid = 0; kfid < kf_invalid; (kfid)++) {
+ for (kfid = 0; kfid < KF_INVALID; (kfid)++) {
if (strncasecmp(selector, keyfuncs[kfid].name,
SWM_FUNCNAME_LEN) == 0) {
DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n",
DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n",
selector);
if (parsekeys(value, mod_key, &mod, &ks) == 0) {
- setkeybinding(mod, ks, kf_spawn_custom,
+ setkeybinding(mod, ks, KF_SPAWN_CUSTOM,
sp->name);
return (0);
} else
void
setup_keys(void)
{
- setkeybinding(MODKEY, XK_space, kf_cycle_layout,NULL);
- setkeybinding(MODKEY|ShiftMask, XK_backslash, kf_flip_layout, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_space, kf_stack_reset, NULL);
- setkeybinding(MODKEY, XK_h, kf_master_shrink,NULL);
- setkeybinding(MODKEY, XK_l, kf_master_grow, NULL);
- setkeybinding(MODKEY, XK_comma, kf_master_add, NULL);
- setkeybinding(MODKEY, XK_period, kf_master_del, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_comma, kf_stack_inc, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_period, kf_stack_dec, NULL);
- setkeybinding(MODKEY, XK_Return, kf_swap_main, NULL);
- setkeybinding(MODKEY, XK_j, kf_focus_next, NULL);
- setkeybinding(MODKEY, XK_k, kf_focus_prev, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_j, kf_swap_next, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_k, kf_swap_prev, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_Return, kf_spawn_custom,"term");
- setkeybinding(MODKEY, XK_p, kf_spawn_custom,"menu");
- setkeybinding(MODKEY|ShiftMask, XK_q, kf_quit, NULL);
- setkeybinding(MODKEY, XK_q, kf_restart, NULL);
- setkeybinding(MODKEY, XK_m, kf_focus_main, NULL);
- setkeybinding(MODKEY, XK_1, kf_ws_1, NULL);
- setkeybinding(MODKEY, XK_2, kf_ws_2, NULL);
- setkeybinding(MODKEY, XK_3, kf_ws_3, NULL);
- setkeybinding(MODKEY, XK_4, kf_ws_4, NULL);
- setkeybinding(MODKEY, XK_5, kf_ws_5, NULL);
- setkeybinding(MODKEY, XK_6, kf_ws_6, NULL);
- setkeybinding(MODKEY, XK_7, kf_ws_7, NULL);
- setkeybinding(MODKEY, XK_8, kf_ws_8, NULL);
- setkeybinding(MODKEY, XK_9, kf_ws_9, NULL);
- setkeybinding(MODKEY, XK_0, kf_ws_10, NULL);
- setkeybinding(MODKEY, XK_F1, kf_ws_11, NULL);
- setkeybinding(MODKEY, XK_F2, kf_ws_12, NULL);
- setkeybinding(MODKEY, XK_F3, kf_ws_13, NULL);
- setkeybinding(MODKEY, XK_F4, kf_ws_14, NULL);
- setkeybinding(MODKEY, XK_F5, kf_ws_15, NULL);
- setkeybinding(MODKEY, XK_F6, kf_ws_16, NULL);
- setkeybinding(MODKEY, XK_F7, kf_ws_17, NULL);
- setkeybinding(MODKEY, XK_F8, kf_ws_18, NULL);
- setkeybinding(MODKEY, XK_F9, kf_ws_19, NULL);
- setkeybinding(MODKEY, XK_F10, kf_ws_20, NULL);
- setkeybinding(MODKEY, XK_F11, kf_ws_21, NULL);
- setkeybinding(MODKEY, XK_F12, kf_ws_22, NULL);
- setkeybinding(MODKEY, XK_Right, kf_ws_next, NULL);
- setkeybinding(MODKEY, XK_Left, kf_ws_prev, NULL);
- setkeybinding(MODKEY, XK_Up, kf_ws_next_all, NULL);
- setkeybinding(MODKEY, XK_Down, kf_ws_prev_all, NULL);
- setkeybinding(MODKEY, XK_a, kf_ws_prior, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_Right, kf_screen_next, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_Left, kf_screen_prev, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_1, kf_mvws_1, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_2, kf_mvws_2, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_3, kf_mvws_3, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_4, kf_mvws_4, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_5, kf_mvws_5, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_6, kf_mvws_6, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_7, kf_mvws_7, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_8, kf_mvws_8, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_9, kf_mvws_9, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_0, kf_mvws_10, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F1, kf_mvws_11, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F2, kf_mvws_12, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F3, kf_mvws_13, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F4, kf_mvws_14, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F5, kf_mvws_15, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F6, kf_mvws_16, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F7, kf_mvws_17, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F8, kf_mvws_18, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F9, kf_mvws_19, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F10, kf_mvws_20, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F11, kf_mvws_21, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F12, kf_mvws_22, NULL);
- setkeybinding(MODKEY, XK_b, kf_bar_toggle, NULL);
- setkeybinding(MODKEY, XK_Tab, kf_focus_next, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_Tab, kf_focus_prev, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_x, kf_wind_kill, NULL);
- setkeybinding(MODKEY, XK_x, kf_wind_del, NULL);
- setkeybinding(MODKEY, XK_s, kf_spawn_custom,"screenshot_all");
- setkeybinding(MODKEY|ShiftMask, XK_s, kf_spawn_custom,"screenshot_wind");
- setkeybinding(MODKEY, XK_t, kf_float_toggle,NULL);
- setkeybinding(MODKEY|ShiftMask, XK_v, kf_version, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_Delete, kf_spawn_custom,"lock");
- setkeybinding(MODKEY|ShiftMask, XK_i, kf_spawn_custom,"initscr");
- setkeybinding(MODKEY, XK_w, kf_iconify, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_w, kf_uniconify, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_r, kf_raise_toggle,NULL);
- setkeybinding(MODKEY, XK_v, kf_button2, NULL);
- setkeybinding(MODKEY, XK_equal, kf_width_grow, NULL);
- setkeybinding(MODKEY, XK_minus, kf_width_shrink,NULL);
- setkeybinding(MODKEY|ShiftMask, XK_equal, kf_height_grow, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_minus, kf_height_shrink,NULL);
- setkeybinding(MODKEY, XK_bracketleft, kf_move_left, NULL);
- setkeybinding(MODKEY, XK_bracketright,kf_move_right, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_bracketleft, kf_move_up, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_bracketright,kf_move_down, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_slash, kf_name_workspace,NULL);
- setkeybinding(MODKEY, XK_slash, kf_search_workspace,NULL);
- setkeybinding(MODKEY, XK_f, kf_search_win, NULL);
+ setkeybinding(MODKEY, XK_space, KF_CYCLE_LAYOUT,NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_backslash, KF_FLIP_LAYOUT, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_space, KF_STACK_RESET, NULL);
+ setkeybinding(MODKEY, XK_h, KF_MASTER_SHRINK, NULL);
+ setkeybinding(MODKEY, XK_l, KF_MASTER_GROW, NULL);
+ setkeybinding(MODKEY, XK_comma, KF_MASTER_ADD, NULL);
+ setkeybinding(MODKEY, XK_period, KF_MASTER_DEL, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_comma, KF_STACK_INC, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_period, KF_STACK_DEC, NULL);
+ setkeybinding(MODKEY, XK_Return, KF_SWAP_MAIN, NULL);
+ setkeybinding(MODKEY, XK_j, KF_FOCUS_NEXT, NULL);
+ setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_j, KF_SWAP_NEXT, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_k, KF_SWAP_PREV, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_Return, KF_SPAWN_CUSTOM,"term");
+ setkeybinding(MODKEY, XK_p, KF_SPAWN_CUSTOM,"menu");
+ setkeybinding(MODKEY|ShiftMask, XK_q, KF_QUIT, NULL);
+ setkeybinding(MODKEY, XK_q, KF_RESTART, NULL);
+ setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, NULL);
+ setkeybinding(MODKEY, XK_1, KF_WS_1, NULL);
+ setkeybinding(MODKEY, XK_2, KF_WS_2, NULL);
+ setkeybinding(MODKEY, XK_3, KF_WS_3, NULL);
+ setkeybinding(MODKEY, XK_4, KF_WS_4, NULL);
+ setkeybinding(MODKEY, XK_5, KF_WS_5, NULL);
+ setkeybinding(MODKEY, XK_6, KF_WS_6, NULL);
+ setkeybinding(MODKEY, XK_7, KF_WS_7, NULL);
+ setkeybinding(MODKEY, XK_8, KF_WS_8, NULL);
+ setkeybinding(MODKEY, XK_9, KF_WS_9, NULL);
+ setkeybinding(MODKEY, XK_0, KF_WS_10, NULL);
+ setkeybinding(MODKEY, XK_F1, KF_WS_11, NULL);
+ setkeybinding(MODKEY, XK_F2, KF_WS_12, NULL);
+ setkeybinding(MODKEY, XK_F3, KF_WS_13, NULL);
+ setkeybinding(MODKEY, XK_F4, KF_WS_14, NULL);
+ setkeybinding(MODKEY, XK_F5, KF_WS_15, NULL);
+ setkeybinding(MODKEY, XK_F6, KF_WS_16, NULL);
+ setkeybinding(MODKEY, XK_F7, KF_WS_17, NULL);
+ setkeybinding(MODKEY, XK_F8, KF_WS_18, NULL);
+ setkeybinding(MODKEY, XK_F9, KF_WS_19, NULL);
+ setkeybinding(MODKEY, XK_F10, KF_WS_20, NULL);
+ setkeybinding(MODKEY, XK_F11, KF_WS_21, NULL);
+ setkeybinding(MODKEY, XK_F12, KF_WS_22, NULL);
+ setkeybinding(MODKEY, XK_Right, KF_WS_NEXT, NULL);
+ setkeybinding(MODKEY, XK_Left, KF_WS_PREV, NULL);
+ setkeybinding(MODKEY, XK_Up, KF_WS_NEXT_ALL, NULL);
+ setkeybinding(MODKEY, XK_Down, KF_WS_PREV_ALL, NULL);
+ setkeybinding(MODKEY, XK_a, KF_WS_PRIOR, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_Right, KF_SCREEN_NEXT, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_Left, KF_SCREEN_PREV, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_1, KF_MVWS_1, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_2, KF_MVWS_2, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_3, KF_MVWS_3, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_4, KF_MVWS_4, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_5, KF_MVWS_5, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_6, KF_MVWS_6, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_7, KF_MVWS_7, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_8, KF_MVWS_8, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_9, KF_MVWS_9, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_0, KF_MVWS_10, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F1, KF_MVWS_11, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F2, KF_MVWS_12, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F3, KF_MVWS_13, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F4, KF_MVWS_14, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F5, KF_MVWS_15, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F6, KF_MVWS_16, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F7, KF_MVWS_17, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F8, KF_MVWS_18, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F9, KF_MVWS_19, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F10, KF_MVWS_20, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F11, KF_MVWS_21, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_F12, KF_MVWS_22, NULL);
+ setkeybinding(MODKEY, XK_b, KF_BAR_TOGGLE, NULL);
+ setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_Tab, KF_FOCUS_PREV, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_x, KF_WIND_KILL, NULL);
+ setkeybinding(MODKEY, XK_x, KF_WIND_DEL, NULL);
+ setkeybinding(MODKEY, XK_s, KF_SPAWN_CUSTOM,"screenshot_all");
+ setkeybinding(MODKEY|ShiftMask, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind");
+ setkeybinding(MODKEY, XK_t, KF_FLOAT_TOGGLE,NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_v, KF_VERSION, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_Delete, KF_SPAWN_CUSTOM,"lock");
+ setkeybinding(MODKEY|ShiftMask, XK_i, KF_SPAWN_CUSTOM,"initscr");
+ setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_w, KF_UNICONIFY, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_r, KF_RAISE_TOGGLE,NULL);
+ setkeybinding(MODKEY, XK_v, KF_BUTTON2, NULL);
+ setkeybinding(MODKEY, XK_equal, KF_WIDTH_GROW, NULL);
+ setkeybinding(MODKEY, XK_minus, KF_WIDTH_SHRINK,NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_equal, KF_HEIGHT_GROW,NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_minus, KF_HEIGHT_SHRINK,NULL);
+ setkeybinding(MODKEY, XK_bracketleft, KF_MOVE_LEFT,NULL);
+ setkeybinding(MODKEY, XK_bracketright,KF_MOVE_RIGHT,NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_bracketleft, KF_MOVE_UP, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_bracketright,KF_MOVE_DOWN,NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_slash, KF_NAME_WORKSPACE,NULL);
+ setkeybinding(MODKEY, XK_slash, KF_SEARCH_WORKSPACE,NULL);
+ setkeybinding(MODKEY, XK_f, KF_SEARCH_WIN, NULL);
#ifdef SWM_DEBUG
- setkeybinding(MODKEY|ShiftMask, XK_d, kf_dumpwins, NULL);
+ setkeybinding(MODKEY|ShiftMask, XK_d, KF_DUMPWINS, NULL);
#endif
}
void
updatenumlockmask(void)
{
- unsigned int i, j;
- XModifierKeymap *modmap;
+ unsigned int i, j;
+ xcb_get_modifier_mapping_reply_t *modmap_r;
+ xcb_keycode_t *modmap, kc;
DNPRINTF(SWM_D_MISC, "updatenumlockmask\n");
numlockmask = 0;
- modmap = XGetModifierMapping(display);
- for (i = 0; i < 8; i++)
- for (j = 0; j < modmap->max_keypermod; j++)
- if (modmap->modifiermap[i * modmap->max_keypermod + j]
- == XKeysymToKeycode(display, XK_Num_Lock))
- numlockmask = (1 << i);
- XFreeModifiermap(modmap);
+ modmap_r = xcb_get_modifier_mapping_reply(conn,
+ xcb_get_modifier_mapping(conn),
+ NULL);
+ if (modmap_r) {
+ modmap = xcb_get_modifier_mapping_keycodes(modmap_r);
+ for (i = 0; i < 8; i++) {
+ for (j = 0; j < modmap_r->keycodes_per_modifier; j++) {
+ kc = modmap[i * modmap_r->keycodes_per_modifier
+ + j];
+
+ if (kc == *((xcb_keycode_t *)xcb_key_symbols_get_keycode(syms,
+ XK_Num_Lock)))
+ numlockmask = (1 << i);
+ }
+ }
+ free(modmap_r);
+ }
}
void
{
int num_screens;
unsigned int j, k;
- KeyCode code;
+ xcb_keycode_t *code;
unsigned int modifiers[] =
{ 0, LockMask, numlockmask, numlockmask | LockMask };
struct key *kp;
xcb_ungrab_key(conn, XCB_GRAB_ANY, screens[k].root,
XCB_MOD_MASK_ANY);
RB_FOREACH(kp, key_tree, &keys) {
- if ((code = XKeysymToKeycode(display, kp->keysym)))
+ if ((code = xcb_key_symbols_get_keycode(syms,
+ kp->keysym)))
for (j = 0; j < LENGTH(modifiers); j++)
- XGrabKey(display, code,
+ xcb_grab_key(conn, True,
+ screens[k].root,
kp->mod | modifiers[j],
- screens[k].root, True,
- GrabModeAsync, GrabModeAsync);
+ *code, XCB_GRAB_MODE_ASYNC,
+ XCB_GRAB_MODE_ASYNC);
}
}
}
updatenumlockmask();
xcb_ungrab_button(conn, XCB_BUTTON_INDEX_ANY, win->id,
- XCB_BUTTON_MASK_ANY);
+ XCB_BUTTON_MASK_ANY);
if (focused) {
for (i = 0; i < LENGTH(buttons); i++)
if (buttons[i].action == client_click)
for (j = 0; j < LENGTH(modifiers); j++)
xcb_grab_button(conn, False, win->id,
- BUTTONMASK,
- XCB_GRAB_MODE_ASYNC,
- XCB_GRAB_MODE_SYNC,
- XCB_WINDOW_NONE,
- XCB_CURSOR_NONE,
- buttons[i].button,
- buttons[i].mask);
+ BUTTONMASK,
+ XCB_GRAB_MODE_ASYNC,
+ XCB_GRAB_MODE_SYNC,
+ XCB_WINDOW_NONE,
+ XCB_CURSOR_NONE,
+ buttons[i].button,
+ buttons[i].mask);
} else
xcb_grab_button(conn, False, win->id, BUTTONMASK,
- XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_SYNC,
- XCB_WINDOW_NONE, XCB_CURSOR_NONE, XCB_BUTTON_INDEX_ANY,
- XCB_BUTTON_MASK_ANY);
+ XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_SYNC, XCB_WINDOW_NONE,
+ XCB_CURSOR_NONE, XCB_BUTTON_INDEX_ANY, XCB_BUTTON_MASK_ANY);
}
const char *quirkname[] = {
char *ap, *sp = s;
union arg a;
int argc = 0;
- long pid;
+ pid_t pid;
struct pid_e *p;
if (getenv("SWM_STARTED"))
}
void
-set_child_transient(struct ws_win *win, Window *trans)
+set_child_transient(struct ws_win *win, xcb_window_t *trans)
{
struct ws_win *parent, *w;
- XWMHints *wmh = NULL;
struct swm_region *r;
struct workspace *ws;
+ xcb_icccm_wm_hints_t wmh;
parent = find_window(win->transient);
if (parent)
DNPRINTF(SWM_D_MISC, "set_child_transient: parent doesn't exist"
" for 0x%x trans 0x%x\n", win->id, win->transient);
- if (win->hints == NULL) {
- warnx("no hints for 0x%x", win->id);
- return;
- }
-
- r = root_to_region(win->wa.root);
+ r = root_to_region(win->wa->root);
ws = r->ws;
/* parent doen't exist in our window list */
TAILQ_FOREACH(w, &ws->winlist, entry) {
- if (wmh)
- XFree(wmh);
-
- if ((wmh = XGetWMHints(display, w->id)) == NULL) {
+ if (xcb_icccm_get_wm_hints_reply(conn,
+ xcb_icccm_get_wm_hints(conn, w->id),
+ &wmh, NULL) != 1) {
warnx("can't get hints for 0x%x", w->id);
continue;
}
- if (win->hints->window_group != wmh->window_group)
+ if (win->hints.window_group != wmh.window_group)
continue;
w->child_trans = win;
win->transient = w->id;
*trans = w->id;
- DNPRINTF(SWM_D_MISC, "set_child_transient: asjusting "
+ DNPRINTF(SWM_D_MISC, "set_child_transient: adjusting "
"transient to 0x%x\n", win->transient);
break;
}
}
-
- if (wmh)
- XFree(wmh);
}
-long
+pid_t
window_get_pid(xcb_window_t win)
{
- long ret = 0;
+ pid_t ret = 0;
const char *errstr;
xcb_atom_t apid;
xcb_get_property_cookie_t pc;
pr = xcb_get_property_reply(conn, pc, NULL);
if (!pr)
goto tryharder;
- if (pr->type != XCB_ATOM_CARDINAL)
+ if (pr->type != XCB_ATOM_CARDINAL) {
+ free(pr);
goto tryharder;
+ }
- ret = *(long *)xcb_get_property_value(pr);
+ ret = *((pid_t *)xcb_get_property_value(pr));
free(pr);
return (ret);
tryharder:
apid = get_atom_from_string("_SWM_PID");
pc = xcb_get_property(conn, False, win, apid, XCB_ATOM_STRING,
- 0, SWM_PROPLEN);
+ 0, SWM_PROPLEN);
pr = xcb_get_property_reply(conn, pc, NULL);
if (!pr)
return (0);
- if (pr->type != XCB_ATOM_STRING)
+ if (pr->type != XCB_ATOM_STRING) {
free(pr);
return (0);
- ret = strtonum(xcb_get_property_value(pr), 0, UINT_MAX, &errstr);
+ }
+
+ ret = strtonum(xcb_get_property_value(pr), 0, INT_MAX, &errstr);
free(pr);
return (ret);
struct ws_win *
manage_window(xcb_window_t id)
{
- Window trans = 0;
+ xcb_window_t trans = XCB_WINDOW_NONE;
struct workspace *ws;
struct ws_win *win, *ww;
- int format, i, ws_idx, n, border_me = 0;
- unsigned long nitems, bytes;
- Atom ws_idx_atom = 0, type;
- Atom *prot = NULL, *pp;
- unsigned char ws_idx_str[SWM_PROPLEN], *prop = NULL;
+ int i, ws_idx, border_me = 0;
+ xcb_atom_t ws_idx_atom = XCB_ATOM_NONE;
+ char ws_idx_str[SWM_PROPLEN], *prop = NULL;
+ size_t proplen;
struct swm_region *r;
const char *errstr;
struct pid_e *p;
struct quirk *qp;
uint32_t event_mask;
+ xcb_atom_t prot;
+ xcb_get_property_reply_t *gpr;
+ xcb_icccm_get_wm_protocols_reply_t wpr;
if ((win = find_window(id)) != NULL)
return (win); /* already being managed */
p = find_pid(window_get_pid(id));
/* Get all the window data in one shot */
- ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+ ws_idx_atom = get_atom_from_string("_SWM_WS");
if (ws_idx_atom) {
- XGetWindowProperty(display, id, ws_idx_atom, 0, SWM_PROPLEN,
- False, XA_STRING, &type, &format, &nitems, &bytes, &prop);
+ gpr = xcb_get_property_reply(conn,
+ xcb_get_property(conn, False, id, ws_idx_atom,
+ XCB_ATOM_STRING, 0, SWM_PROPLEN),
+ NULL);
+ if (gpr) {
+ proplen = xcb_get_property_value_length(gpr);
+ if (proplen > 0) {
+ prop = malloc(proplen + 1);
+ if (prop) {
+ memcpy(prop,
+ xcb_get_property_value(gpr),
+ proplen);
+ prop[proplen] = '\0';
+ }
+ }
+ free(gpr);
+ }
}
- XGetWindowAttributes(display, id, &win->wa);
- XGetWMNormalHints(display, id, &win->sh, &win->sh_mask);
- win->hints = XGetWMHints(display, id);
- XGetTransientForHint(display, id, &trans);
+ win->wa = xcb_get_geometry_reply(conn,
+ xcb_get_geometry(conn, id),
+ NULL);
+ xcb_icccm_get_wm_normal_hints_reply(conn,
+ xcb_icccm_get_wm_normal_hints(conn, id),
+ &win->sh, NULL);
+ xcb_icccm_get_wm_hints_reply(conn,
+ xcb_icccm_get_wm_hints(conn, id),
+ &win->hints, NULL);
+ xcb_icccm_get_wm_transient_for_reply(conn,
+ xcb_icccm_get_wm_transient_for(conn, id),
+ &trans, NULL);
if (trans) {
win->transient = trans;
set_child_transient(win, &trans);
"transient: 0x%x\n", win->id, win->transient);
}
+ prot = get_atom_from_string("WM_PROTOCOLS");
+
/* get supported protocols */
- if (XGetWMProtocols(display, id, &prot, &n)) {
- for (i = 0, pp = prot; i < n; i++, pp++) {
- if (*pp == takefocus)
+ if (xcb_icccm_get_wm_protocols_reply(conn,
+ xcb_icccm_get_wm_protocols(conn, id, prot),
+ &wpr, NULL)) {
+ for (i = 0; i < wpr.atoms_len; i++) {
+ if (wpr.atoms[i] == takefocus)
win->take_focus = 1;
- if (*pp == adelete)
+ if (wpr.atoms[i] == adelete)
win->can_delete = 1;
}
- if (prot)
- XFree(prot);
+ xcb_icccm_get_wm_protocols_reply_wipe(&wpr);
}
win->iconic = get_iconic(win);
* a workspace (either by spawn() or manually moving), and isn't
* transient, * put it in the same workspace
*/
- r = root_to_region(win->wa.root);
+ r = root_to_region(win->wa->root);
if (p) {
ws = &r->s->ws[p->ws];
TAILQ_REMOVE(&pidlist, p, entry);
p = NULL;
} else if (prop && win->transient == 0) {
DNPRINTF(SWM_D_PROP, "manage_window: get _SWM_WS: %s\n", prop);
- ws_idx = strtonum((const char *)prop, 0, workspace_limit - 1,
+ ws_idx = strtonum(prop, 0, workspace_limit - 1,
&errstr);
if (errstr) {
DNPRINTF(SWM_D_EVENT, "manage_window: window: #%s: %s",
}
/* ignore window border if there is one. */
- WIDTH(win) = win->wa.width;
- HEIGHT(win) = win->wa.height;
- X(win) = win->wa.x + win->wa.border_width;
- Y(win) = win->wa.y + win->wa.border_width;
+ WIDTH(win) = win->wa->width;
+ HEIGHT(win) = win->wa->height;
+ X(win) = win->wa->x + win->wa->border_width;
+ Y(win) = win->wa->y + win->wa->border_width;
win->bordered = 0;
win->g_floatvalid = 0;
win->floatmaxed = 0;
/* Set window properties so we can remember this after reincarnation */
if (ws_idx_atom && prop == NULL &&
- snprintf((char *)ws_idx_str, SWM_PROPLEN, "%d", ws->idx) <
+ snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) <
SWM_PROPLEN) {
DNPRINTF(SWM_D_PROP, "manage_window: set _SWM_WS: %s\n",
ws_idx_str);
- XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
- PropModeReplace, ws_idx_str, strlen((char *)ws_idx_str));
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
+ ws_idx_atom, XCB_ATOM_STRING, 8, strlen(ws_idx_str),
+ ws_idx_str);
}
if (prop)
- XFree(prop);
+ free(prop);
ewmh_autoquirk(win);
- if (XGetClassHint(display, win->id, &win->ch)) {
+ if (xcb_icccm_get_wm_class_reply(conn,
+ xcb_icccm_get_wm_class(conn, win->id),
+ &win->ch, NULL)) {
DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n",
- win->ch.res_class, win->ch.res_name);
+ win->ch.class_name, win->ch.instance_name);
/* java is retarded so treat it special */
- if (strstr(win->ch.res_name, "sun-awt")) {
+ if (strstr(win->ch.instance_name, "sun-awt")) {
win->java = 1;
border_me = 1;
}
TAILQ_FOREACH(qp, &quirks, entry) {
- if (!strcmp(win->ch.res_class, qp->class) &&
- !strcmp(win->ch.res_name, qp->name)) {
+ if (!strcmp(win->ch.class_name, qp->class) &&
+ !strcmp(win->ch.instance_name, qp->name)) {
DNPRINTF(SWM_D_CLASS, "manage_window: found: "
- "class: %s, name: %s\n", win->ch.res_class,
- win->ch.res_name);
+ "class: %s, name: %s\n", win->ch.class_name,
+ win->ch.instance_name);
if (qp->quirk & SWM_Q_FLOAT) {
win->floating = 1;
border_me = 1;
}
event_mask = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE |
- XCB_EVENT_MASK_PROPERTY_CHANGE |
- XCB_EVENT_MASK_STRUCTURE_NOTIFY;
+ XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
xcb_change_window_attributes(conn, id, XCB_CW_EVENT_MASK, &event_mask);
if (win == NULL)
return;
- /* needed for restart wm */
- set_win_state(win, XCB_ICCCM_WM_STATE_WITHDRAWN);
-
TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
- if (win->ch.res_class)
- XFree(win->ch.res_class);
- if (win->ch.res_name)
- XFree(win->ch.res_name);
+ if (win->wa)
+ free(win->wa);
+
+ xcb_icccm_get_wm_class_reply_wipe(&win->ch);
kill_refs(win);
memset(win, 0xff, sizeof *win); /* XXX kill later */
free(win);
+ DNPRINTF(SWM_D_MISC, "free_window: done\n");
}
void
/* focus on root just in case */
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);
+ screen->root, XCB_CURRENT_TIME);
focus_prev(win);
- if (win->hints) {
- XFree(win->hints);
- win->hints = NULL;
- }
-
TAILQ_REMOVE(&win->ws->winlist, win, entry);
TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
}
}
void
-expose(XEvent *e)
+expose(xcb_expose_event_t *e)
{
- DNPRINTF(SWM_D_EVENT, "expose: window: 0x%lx\n", e->xexpose.window);
+ int i, num_screens;
+ struct swm_region *r;
+
+ DNPRINTF(SWM_D_EVENT, "expose: window: 0x%x\n", e->window);
+
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ for (i = 0; i < num_screens; i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ if (e->window == WINID(r->bar))
+ bar_update();
+
+ xcb_flush(conn);
}
void
-keypress(XEvent *e)
+keypress(xcb_key_press_event_t *e)
{
KeySym keysym;
- XKeyEvent *ev = &e->xkey;
struct key *kp;
- struct swm_region *r;
- keysym = XkbKeycodeToKeysym(display, (KeyCode)ev->keycode, 0, 0);
- if ((kp = key_lookup(CLEANMASK(ev->state), keysym)) == NULL)
- return;
- if (keyfuncs[kp->funcid].func == NULL)
+ keysym = XkbKeycodeToKeysym(display, (KeyCode)e->detail, 0, 0);
+
+ DNPRINTF(SWM_D_EVENT, "keypress: %u\n", e->detail);
+
+ if ((kp = key_lookup(CLEANMASK(e->state), keysym)) == NULL)
return;
- r = root_to_region(ev->root);
- if (kp->funcid == kf_spawn_custom)
- spawn_custom(r, &(keyfuncs[kp->funcid].args), kp->spawn_name);
- else
- keyfuncs[kp->funcid].func(r, &(keyfuncs[kp->funcid].args));
+ if (kp->funcid == KF_SPAWN_CUSTOM)
+ spawn_custom(root_to_region(e->root),
+ &(keyfuncs[kp->funcid].args), kp->spawn_name);
+ else if (keyfuncs[kp->funcid].func)
+ keyfuncs[kp->funcid].func(root_to_region(e->root),
+ &(keyfuncs[kp->funcid].args));
}
void
-buttonpress(XEvent *e)
+buttonpress(xcb_button_press_event_t *e)
{
struct ws_win *win;
int i, action;
- XButtonPressedEvent *ev = &e->xbutton;
- if ((win = find_window(ev->window)) == NULL)
+ DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n",
+ e->event, e->detail);
+
+ if ((win = find_window(e->event)) == NULL)
return;
focus_magic(win);
for (i = 0; i < LENGTH(buttons); i++)
if (action == buttons[i].action && buttons[i].func &&
- buttons[i].button == ev->button &&
- CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+ buttons[i].button == e->detail &&
+ CLEANMASK(buttons[i].mask) == CLEANMASK(e->state))
buttons[i].func(win, &buttons[i].args);
+
+ xcb_flush(conn);
}
void
-configurerequest(XEvent *e)
+configurerequest(xcb_configure_request_event_t *e)
{
- XConfigureRequestEvent *ev = &e->xconfigurerequest;
struct ws_win *win;
- int new = 0;
- XWindowChanges wc;
+ int new = 0, i = 0;
+ uint16_t mask = 0;
+ uint32_t wc[7] = {0};
- if ((win = find_window(ev->window)) == NULL)
- if ((win = find_unmanaged_window(ev->window)) == NULL)
+ if ((win = find_window(e->window)) == NULL)
+ if ((win = find_unmanaged_window(e->window)) == NULL)
new = 1;
if (new) {
- bzero(&wc, sizeof wc);
- wc.x = ev->x;
- wc.y = ev->y;
- wc.width = ev->width;
- wc.height = ev->height;
- wc.border_width = ev->border_width;
- wc.sibling = ev->above;
- wc.stack_mode = ev->detail;
-
- DNPRINTF(SWM_D_EVENT, "configurerequest: new window: 0x%lx, "
- "new: %s, (x,y) w x h: (%d,%d) %d x %d\n", ev->window,
- YESNO(new), wc.x, wc.y, wc.width, wc.height);
-
- XConfigureWindow(display, ev->window, ev->value_mask, &wc);
+ if (e->value_mask & XCB_CONFIG_WINDOW_X) {
+ mask |= XCB_CONFIG_WINDOW_X;
+ wc[i++] = e->x;
+ }
+ if (e->value_mask & XCB_CONFIG_WINDOW_Y) {
+ mask |= XCB_CONFIG_WINDOW_Y;
+ wc[i++] = e->y;
+ }
+ if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
+ mask |= XCB_CONFIG_WINDOW_WIDTH;
+ wc[i++] = e->width;
+ }
+ if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
+ mask |= XCB_CONFIG_WINDOW_HEIGHT;
+ wc[i++] = e->height;
+ }
+ if (e->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH) {
+ mask |= XCB_CONFIG_WINDOW_BORDER_WIDTH;
+ wc[i++] = e->border_width;
+ }
+ if (e->value_mask & XCB_CONFIG_WINDOW_SIBLING) {
+ mask |= XCB_CONFIG_WINDOW_SIBLING;
+ wc[i++] = e->sibling;
+ }
+ if (e->value_mask & XCB_CONFIG_WINDOW_STACK_MODE) {
+ mask |= XCB_CONFIG_WINDOW_STACK_MODE;
+ wc[i++] = e->stack_mode;
+ }
+
+ DNPRINTF(SWM_D_EVENT, "configurerequest: new window: 0x%x, "
+ "new: %s, (x,y) w x h: (%d,%d) %d x %d\n", e->window,
+ YESNO(new), wc[0], wc[1], wc[2], wc[3]);
+
+ xcb_configure_window(conn, e->window, mask, wc);
} else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) &&
- !(win->sh_mask & EWMH_F_FULLSCREEN)) {
- win->g_float.x = ev->x - X(win->ws->r);
- win->g_float.y = ev->y - Y(win->ws->r);
- win->g_float.w = ev->width;
- win->g_float.h = ev->height;
+ !(win->ewmh_flags & EWMH_F_FULLSCREEN)) {
+ win->g_float.x = e->x - X(win->ws->r);
+ win->g_float.y = e->y - Y(win->ws->r);
+ win->g_float.w = e->width;
+ win->g_float.h = e->height;
win->g_floatvalid = 1;
if (win->floating) {
win->g.y += Y(win->ws->r);
update_window(win);
} else {
- config_win(win, ev);
+ config_win(win, e);
}
} else {
- config_win(win, ev);
+ config_win(win, e);
}
+
+ xcb_flush(conn);
}
void
-configurenotify(XEvent *e)
+configurenotify(xcb_configure_notify_event_t *e)
{
struct ws_win *win;
- DNPRINTF(SWM_D_EVENT, "configurenotify: window: 0x%lx\n",
- e->xconfigure.window);
+ DNPRINTF(SWM_D_EVENT, "configurenotify: window: 0x%x\n",
+ e->window);
- win = find_window(e->xconfigure.window);
+ win = find_window(e->window);
if (win) {
- XGetWMNormalHints(display, win->id, &win->sh, &win->sh_mask);
+ xcb_icccm_get_wm_normal_hints_reply(conn,
+ xcb_icccm_get_wm_normal_hints(conn, win->id),
+ &win->sh, NULL);
adjust_font(win);
if (font_adjusted)
stack();
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
}
}
void
-destroynotify(XEvent *e)
+destroynotify(xcb_destroy_notify_event_t *e)
{
struct ws_win *win;
- XDestroyWindowEvent *ev = &e->xdestroywindow;
- DNPRINTF(SWM_D_EVENT, "destroynotify: window: 0x%lx\n", ev->window);
+ DNPRINTF(SWM_D_EVENT, "destroynotify: window: 0x%x\n", e->window);
- if ((win = find_window(ev->window)) == NULL) {
- if ((win = find_unmanaged_window(ev->window)) == NULL)
+ if ((win = find_window(e->window)) == NULL) {
+ if ((win = find_unmanaged_window(e->window)) == NULL)
return;
free_window(win);
return;
unmanage_window(win);
stack();
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
free_window(win);
}
void
-enternotify(XEvent *e)
+enternotify(xcb_enter_notify_event_t *e)
{
- XCrossingEvent *ev = &e->xcrossing;
- XEvent cne;
struct ws_win *win;
#if 0
struct ws_win *w;
Window focus_return;
int revert_to_return;
#endif
- DNPRINTF(SWM_D_FOCUS, "enternotify: window: 0x%lx, mode: %d, detail: "
- "%d, root: 0x%lx, subwindow: 0x%lx, same_screen: %s, focus: %s, "
- "state: %d\n", ev->window, ev->mode, ev->detail, ev->root,
- ev->subwindow, YESNO(ev->same_screen), YESNO(ev->focus), ev->state);
+ 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,
+ e->child, YESNO(e->same_screen_focus), e->state);
- if (ev->mode != NotifyNormal) {
+ if (e->mode != XCB_NOTIFY_MODE_NORMAL) {
DNPRINTF(SWM_D_EVENT, "skip enternotify: generated by "
"cursor grab.\n");
return;
break;
}
- if ((win = find_window(ev->window)) == NULL) {
+ if ((win = find_window(e->event)) == NULL) {
DNPRINTF(SWM_D_EVENT, "skip enternotify: window is NULL\n");
return;
}
- /*
- * if we have more enternotifies let them handle it in due time
- */
- if (XCheckTypedEvent(display, EnterNotify, &cne) == True) {
- DNPRINTF(SWM_D_EVENT,
- "ignoring enternotify: got more enternotify\n");
- XPutBackEvent(display, &cne);
- return;
- }
-
focus_magic(win);
+
+ xcb_flush(conn);
}
/* lets us use one switch statement for arbitrary mode/detail combinations */
#define MERGE_MEMBERS(a,b) (((a & 0xffff) << 16) | (b & 0xffff))
void
-focusevent(XEvent *e)
+mapnotify(xcb_map_notify_event_t *e)
{
-#if 0
struct ws_win *win;
- u_int32_t mode_detail;
- XFocusChangeEvent *ev = &e->xfocus;
- DNPRINTF(SWM_D_EVENT, "focusevent: %s window: 0x%lx mode: %d "
- "detail: %d\n", ev->type == FocusIn ? "entering" : "leaving",
- ev->window, ev->mode, ev->detail);
+ DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%x\n", e->window);
- if (last_focus_event == ev->type) {
- DNPRINTF(SWM_D_FOCUS, "ignoring focusevent: bad ordering\n");
- return;
- }
-
- last_focus_event = ev->type;
- mode_detail = MERGE_MEMBERS(ev->mode, ev->detail);
-
- switch (mode_detail) {
- /* synergy client focus operations */
- case MERGE_MEMBERS(NotifyNormal, NotifyNonlinear):
- case MERGE_MEMBERS(NotifyNormal, NotifyNonlinearVirtual):
-
- /* synergy server focus operations */
- case MERGE_MEMBERS(NotifyWhileGrabbed, NotifyNonlinear):
-
- /* Entering applications like rdesktop that mangle the pointer */
- case MERGE_MEMBERS(NotifyNormal, NotifyPointer):
-
- if ((win = find_window(e->xfocus.window)) != NULL && win->ws->r)
- XSetWindowBorder(display, win->id,
- win->ws->r->s->c[ev->type == FocusIn ?
- SWM_S_COLOR_FOCUS : SWM_S_COLOR_UNFOCUS].color);
- break;
- default:
- warnx("ignoring focusevent");
- DNPRINTF(SWM_D_FOCUS, "ignoring focusevent\n");
- break;
- }
-#endif
-}
-
-void
-mapnotify(XEvent *e)
-{
- struct ws_win *win;
- XMapEvent *ev = &e->xmap;
-
- DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%lx\n", ev->window);
-
- win = manage_window(ev->window);
+ win = manage_window(e->window);
if (win)
set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
}
void
-mappingnotify(XEvent *e)
+mappingnotify(xcb_mapping_notify_event_t *e)
{
- XMappingEvent *ev = &e->xmapping;
+ xcb_refresh_keyboard_mapping(syms, e);
- XRefreshKeyboardMapping(ev);
- if (ev->request == MappingKeyboard)
+ if (e->request == XCB_MAPPING_KEYBOARD)
grabkeys();
}
void
-maprequest(XEvent *e)
+maprequest(xcb_map_request_event_t *e)
{
struct ws_win *win;
struct swm_region *r;
- XWindowAttributes wa;
- XMapRequestEvent *ev = &e->xmaprequest;
+ xcb_get_window_attributes_reply_t *war;
- DNPRINTF(SWM_D_EVENT, "maprequest: window: 0x%lx\n",
- e->xmaprequest.window);
+ DNPRINTF(SWM_D_EVENT, "maprequest: window: 0x%x\n",
+ e->window);
- if (!XGetWindowAttributes(display, ev->window, &wa))
+ war = xcb_get_window_attributes_reply(conn,
+ xcb_get_window_attributes(conn, e->window),
+ NULL);
+ if (!war)
return;
- if (wa.override_redirect)
+ if (war->override_redirect) {
+ free(war);
return;
+ }
+ free(war);
- win = manage_window(e->xmaprequest.window);
- if (win == NULL)
+ win = manage_window(e->window);
+ if (win == NULL) {
return; /* can't happen */
+ }
stack();
/* make new win focused */
- r = root_to_region(win->wa.root);
+ r = root_to_region(win->wa->root);
if (win->ws == r->ws)
focus_magic(win);
}
void
-propertynotify(XEvent *e)
+propertynotify(xcb_property_notify_event_t *e)
{
struct ws_win *win;
- XPropertyEvent *ev = &e->xproperty;
#ifdef SWM_DEBUG
- char *name;
- name = XGetAtomName(display, ev->atom);
- DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%lx, atom: %s\n",
- ev->window, name);
- XFree(name);
+ char *name;
+ size_t len;
+ xcb_get_atom_name_reply_t *r;
+
+ r = xcb_get_atom_name_reply(conn,
+ xcb_get_atom_name(conn, e->atom),
+ NULL);
+ if (r) {
+ len = xcb_get_atom_name_name_length(r);
+ if (len > 0) {
+ name = malloc(len + 1);
+ if (name) {
+ memcpy(name, xcb_get_atom_name_name(r), len);
+ name[len] = '\0';
+
+ DNPRINTF(SWM_D_EVENT,
+ "propertynotify: window: 0x%x, atom: %s\n",
+ e->window, name);
+ free(name);
+ }
+ }
+ free(r);
+ }
#endif
- win = find_window(ev->window);
+ win = find_window(e->window);
if (win == NULL)
return;
- if (ev->state == PropertyDelete && ev->atom == a_swm_iconic) {
+ if (e->state == XCB_PROPERTY_DELETE && e->atom == a_swm_iconic) {
update_iconic(win, 0);
map_window_raised(win->id);
stack();
return;
}
- switch (ev->atom) {
+ switch (e->atom) {
#if 0
- case XA_WM_NORMAL_HINTS:
- long mask;
- XGetWMNormalHints(display, win->id, &win->sh, &mask);
+ case XCB_ATOM_WM_NORMAL_HINTS:
+ xcb_icccm_get_wm_normal_hints(conn,
+ xcb_iccom_get_wm_normal_hints(conn, win->id),
+ &win->sh, NULL);
warnx("normal hints: flag 0x%x", win->sh.flags);
- if (win->sh.flags & PMinSize) {
+ if (win->sh.flags & XCB_SIZE_HINT_P_MIN_SIZE) {
WIDTH(win) = win->sh.min_width;
HEIGHT(win) = win->sh.min_height;
warnx("min %d %d", WIDTH(win), HEIGHT(win));
XMoveResizeWindow(display, win->id,
X(win), Y(win), WIDTH(win), HEIGHT(win));
#endif
- case XA_WM_CLASS:
- case XA_WM_NAME:
+ case XCB_ATOM_WM_CLASS:
+ case XCB_ATOM_WM_NAME:
bar_update();
break;
default:
}
void
-unmapnotify(XEvent *e)
+unmapnotify(xcb_unmap_notify_event_t *e)
{
struct ws_win *win;
- DNPRINTF(SWM_D_EVENT, "unmapnotify: window: 0x%lx\n", e->xunmap.window);
+ DNPRINTF(SWM_D_EVENT, "unmapnotify: window: 0x%x\n", e->window);
/* determine if we need to help unmanage this window */
- win = find_window(e->xunmap.window);
+ win = find_window(e->window);
if (win == NULL)
return;
- if (getstate(e->xunmap.window) == XCB_ICCCM_WM_STATE_NORMAL) {
+ if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL) {
unmanage_window(win);
stack();
- /* giant hack for apps that don't destroy transient windows */
- /* eat a bunch of events to prevent remanaging the window */
- XEvent cne;
- while (XCheckWindowEvent(display, e->xunmap.window,
- EnterWindowMask, &cne))
- ;
- while (XCheckWindowEvent(display, e->xunmap.window,
- StructureNotifyMask, &cne))
- ;
- while (XCheckWindowEvent(display, e->xunmap.window,
- SubstructureNotifyMask, &cne))
- ;
/* resend unmap because we ated it */
- XUnmapWindow(display, e->xunmap.window);
+ xcb_unmap_window(conn, e->window);
+ xcb_flush(conn);
}
-
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
}
-void
-visibilitynotify(XEvent *e)
+/*void
+visibilitynotify(xcb_visibility_notify_event_t *e)
{
- int i, num_screens;
- struct swm_region *r;
-
- DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%lx\n",
- e->xvisibility.window);
-
- if (e->xvisibility.state == VisibilityUnobscured) {
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- for (i = 0; i < num_screens; i++)
- TAILQ_FOREACH(r, &screens[i].rl, entry)
- if (e->xvisibility.window == WINID(r->bar))
- bar_update();
- }
-}
+ DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%x\n",
+ e->window);
+}*/
void
-clientmessage(XEvent *e)
+clientmessage(xcb_client_message_event_t *e)
{
- XClientMessageEvent *ev;
- struct ws_win *win;
+ struct ws_win *win;
- ev = &e->xclient;
-
- win = find_window(ev->window);
- if (win == NULL) {
- if (ev->message_type == ewmh[_NET_ACTIVE_WINDOW].atom) {
- DNPRINTF(SWM_D_EVENT, "clientmessage: request focus on "
- "unmanaged window.\n");
- e->xmaprequest.window = ev->window;
- maprequest(e);
- }
+ win = find_window(e->window);
+ if (win == NULL)
return;
}
- DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%lx, type: %ld\n",
- ev->window, ev->message_type);
+ DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%x, type: %u\n",
+ e->window, e->type);
- if (ev->message_type == ewmh[_NET_ACTIVE_WINDOW].atom) {
+ if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) {
DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW\n");
focus_win(win);
}
- if (ev->message_type == ewmh[_NET_CLOSE_WINDOW].atom) {
+ if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) {
DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_CLOSE_WINDOW\n");
if (win->can_delete)
client_msg(win, adelete);
else
xcb_kill_client(conn, win->id);
}
- if (ev->message_type == ewmh[_NET_MOVERESIZE_WINDOW].atom) {
+ if (e->type == ewmh[_NET_MOVERESIZE_WINDOW].atom) {
DNPRINTF(SWM_D_EVENT,
"clientmessage: _NET_MOVERESIZE_WINDOW\n");
if (win->floating) {
- if (ev->data.l[0] & (1<<8)) /* x */
- X(win) = ev->data.l[1];
- if (ev->data.l[0] & (1<<9)) /* y */
- Y(win) = ev->data.l[2];
- if (ev->data.l[0] & (1<<10)) /* width */
- WIDTH(win) = ev->data.l[3];
- if (ev->data.l[0] & (1<<11)) /* height */
- HEIGHT(win) = ev->data.l[4];
+ if (e->data.data32[0] & (1<<8)) /* x */
+ X(win) = e->data.data32[1];
+ if (e->data.data32[0] & (1<<9)) /* y */
+ Y(win) = e->data.data32[2];
+ if (e->data.data32[0] & (1<<10)) /* width */
+ WIDTH(win) = e->data.data32[3];
+ if (e->data.data32[0] & (1<<11)) /* height */
+ HEIGHT(win) = e->data.data32[4];
update_window(win);
}
config_win(win, NULL);
}
}
- if (ev->message_type == ewmh[_NET_WM_STATE].atom) {
+ if (e->type == ewmh[_NET_WM_STATE].atom) {
DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_WM_STATE\n");
- ewmh_update_win_state(win, ev->data.l[1], ev->data.l[0]);
- if (ev->data.l[2])
- ewmh_update_win_state(win, ev->data.l[2],
- ev->data.l[0]);
+ ewmh_update_win_state(win, e->data.data32[1], e->data.data32[0]);
+ if (e->data.data32[2])
+ ewmh_update_win_state(win, e->data.data32[2],
+ e->data.data32[0]);
stack();
}
+
+ xcb_flush(conn);
}
int
#ifdef SWM_XRR_HAS_CRTC
if (xrandr_support) {
src = xcb_randr_get_screen_resources_current(conn,
- screens[i].root);
+ screens[i].root);
srr = xcb_randr_get_screen_resources_current_reply(conn, src,
- NULL);
- if (srr == NULL)
+ NULL);
+ if (srr == NULL) {
new_region(&screens[i], 0, 0,
screen->width_in_pixels,
screen->height_in_pixels);
- else
+ return;
+ } else
ncrtc = srr->num_crtcs;
for (c = 0; c < ncrtc; c++) {
crtc = xcb_randr_get_screen_resources_current_crtcs(srr);
cic = xcb_randr_get_crtc_info(conn, crtc[c],
- XCB_CURRENT_TIME);
+ XCB_CURRENT_TIME);
cir = xcb_randr_get_crtc_info_reply(conn, cic, NULL);
- if (cir && cir->num_outputs == 0)
+ if (cir == NULL)
continue;
+ if (cir->num_outputs == 0) {
+ free(cir);
+ continue;
+ }
- if (cir == NULL || cir->mode == 0)
+ if (cir->mode == 0)
new_region(&screens[i], 0, 0,
screen->width_in_pixels,
screen->height_in_pixels);
else
new_region(&screens[i],
cir->x, cir->y, cir->width, cir->height);
- }
- if (srr)
- free(srr);
- if (cir)
free(cir);
+ }
+ free(srr);
} else
#endif /* SWM_XRR_HAS_CRTC */
{
}
void
-screenchange(XEvent *e)
+screenchange(xcb_randr_screen_change_notify_event_t *e)
{
- XRRScreenChangeNotifyEvent *xe = (XRRScreenChangeNotifyEvent *)e;
struct swm_region *r;
int i, num_screens;
- DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%lx\n", xe->root);
+ DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%x\n", e->root);
- if (!XRRUpdateConfiguration(e))
- return;
+ if (e->rotation & (XCB_RANDR_ROTATION_ROTATE_90
+ | XCB_RANDR_ROTATION_ROTATE_270))
+ xcb_randr_set_screen_size(conn, e->root, e->height,
+ e->width, e->mheight, e->mwidth);
+ else
+ xcb_randr_set_screen_size(conn, e->root, e->width,
+ e->height, e->mwidth, e->mheight);
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
/* silly event doesn't include the screen index */
for (i = 0; i < num_screens; i++)
- if (screens[i].root == xe->root)
+ if (screens[i].root == e->root)
break;
if (i >= num_screens)
errx(1, "screenchange: screen not found");
TAILQ_FOREACH(r, &screens[i].rl, entry)
bar_setup(r);
stack();
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
}
void
}
pc = xcb_icccm_get_wm_transient_for(conn, wins[j]);
- if (xcb_icccm_get_wm_transient_for_reply(conn, pc, &wins[j],
- NULL)) {
+ if (xcb_icccm_get_wm_transient_for_reply(conn, pc,
+ &wins[j], NULL)) {
free(r);
continue;
}
state = getstate(wins[j]);
manage = state == XCB_ICCCM_WM_STATE_ICONIC;
pc = xcb_icccm_get_wm_transient_for(conn, wins[j]);
- if (xcb_icccm_get_wm_transient_for_reply(conn, pc, &wins[j],
- NULL) && manage)
+ if (xcb_icccm_get_wm_transient_for_reply(conn, pc,
+ &wins[j], NULL) && manage)
manage_window(wins[j]);
}
free(qtr);
{
int i, j, k, num_screens;
struct workspace *ws;
- XGCValues gcv;
+ uint32_t gcv[1], wa[1];
const xcb_query_extension_reply_t *qep;
+ xcb_cursor_t cursor;
+ xcb_font_t cursor_font;
xcb_randr_query_version_cookie_t c;
xcb_randr_query_version_reply_t *r;
qep = xcb_get_extension_data(conn, &xcb_randr_id);
xrandr_eventbase = qep->first_event;
+ cursor_font = xcb_generate_id(conn);
+ xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
+
+ cursor = xcb_generate_id(conn);
+ xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
+ XC_left_ptr, XC_left_ptr + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
+ wa[0] = cursor;
+
/* map physical screens */
for (i = 0; i < num_screens; i++) {
DNPRINTF(SWM_D_WS, "setup_screens: init screen: %d\n", i);
setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT);
/* create graphics context on screen */
- gcv.graphics_exposures = 0;
- screens[i].bar_gc = XCreateGC(display, screens[i].root,
- GCGraphicsExposures, &gcv);
+ screens[i].bar_gc = xcb_generate_id(conn);
+ gcv[0] = 0;
+ xcb_create_gc(conn, screens[i].bar_gc, screens[i].root,
+ XCB_GC_GRAPHICS_EXPOSURES, gcv);
/* set default cursor */
- XDefineCursor(display, screens[i].root,
- XCreateFontCursor(display, XC_left_ptr));
+ xcb_change_window_attributes(conn, screens[i].root,
+ XCB_CW_CURSOR, wa);
/* init all workspaces */
/* XXX these should be dynamically allocated too */
if (xrandr_support)
xcb_randr_select_input(conn, screens[i].root,
- XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE);
+ XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE);
}
+ xcb_free_cursor(conn, cursor);
+ xcb_close_font(conn, cursor_font);
}
void
int i, num_screens;
xcb_atom_t netwmcheck, netwmname, utf8_string;
xcb_window_t root, win;
+ uint32_t wa[2];
/* work around sun jdk bugs, code from wmname */
netwmcheck = get_atom_from_string("_NET_SUPPORTING_WM_CHECK");
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
for (i = 0; i < num_screens; i++) {
root = screens[i].root;
- win = XCreateSimpleWindow(display,root, 0, 0, 1, 1, 0,
- screens[i].c[SWM_S_COLOR_UNFOCUS].color,
- screens[i].c[SWM_S_COLOR_UNFOCUS].color);
+
+ win = xcb_generate_id(conn);
+ wa[0] = screens[i].c[SWM_S_COLOR_UNFOCUS].color;
+ wa[1] = screens[i].c[SWM_S_COLOR_UNFOCUS].color;
+ xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, 0, 0, 0, 1,
+ 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
+ XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root,
- netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
+ netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
- netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
+ netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
- netwmname, utf8_string, 8, strlen("LG3D"), "LG3D");
- }
+ netwmname, utf8_string, 8, strlen("LG3D"), "LG3D");
+ }
+}
+
+void
+event_error(xcb_generic_error_t *e)
+{
+ DNPRINTF(SWM_D_EVENT, "event_error: %s(%u) from %s(%u), sequence: %u, "
+ "resource_id: %u, minor_code: %u\n",
+ xcb_event_get_error_label(e->error_code), e->error_code,
+ xcb_event_get_request_label(e->major_code), e->major_code,
+ e->sequence, e->resource_id, e->minor_code);
+}
+
+void
+event_handle(xcb_generic_event_t *evt)
+{
+ uint8_t type = XCB_EVENT_RESPONSE_TYPE(evt);
+
+ DNPRINTF(SWM_D_EVENT, "XCB Event: %s(%d)\n",
+ xcb_event_get_label(XCB_EVENT_RESPONSE_TYPE(evt)),
+ XCB_EVENT_RESPONSE_TYPE(evt));
+
+ switch (type) {
+#define EVENT(type, callback) case type: callback((void *)evt); return
+ EVENT(0, event_error);
+ EVENT(XCB_BUTTON_PRESS, buttonpress);
+ /*EVENT(XCB_BUTTON_RELEASE, buttonpress);*/
+ /*EVENT(XCB_CIRCULATE_NOTIFY, );*/
+ /*EVENT(XCB_CIRCULATE_REQUEST, );*/
+ EVENT(XCB_CLIENT_MESSAGE, clientmessage);
+ /*EVENT(XCB_COLORMAP_NOTIFY, );*/
+ EVENT(XCB_CONFIGURE_NOTIFY, configurenotify);
+ EVENT(XCB_CONFIGURE_REQUEST, configurerequest);
+ /*EVENT(XCB_CREATE_NOTIFY, );*/
+ EVENT(XCB_DESTROY_NOTIFY, destroynotify);
+ EVENT(XCB_ENTER_NOTIFY, enternotify);
+ EVENT(XCB_EXPOSE, expose);
+ /*EVENT(XCB_FOCUS_IN, );*/
+ /*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, );*/
+ EVENT(XCB_MAP_NOTIFY, mapnotify);
+ EVENT(XCB_MAP_REQUEST, maprequest);
+ EVENT(XCB_MAPPING_NOTIFY, mappingnotify);
+ /*EVENT(XCB_MOTION_NOTIFY, );*/
+ /*EVENT(XCB_NO_EXPOSURE, );*/
+ EVENT(XCB_PROPERTY_NOTIFY, propertynotify);
+ /*EVENT(XCB_REPARENT_NOTIFY, );*/
+ /*EVENT(XCB_RESIZE_REQUEST, );*/
+ /*EVENT(XCB_SELECTION_CLEAR, );*/
+ /*EVENT(XCB_SELECTION_NOTIFY, );*/
+ /*EVENT(XCB_SELECTION_REQUEST, );*/
+ EVENT(XCB_UNMAP_NOTIFY, unmapnotify);
+ /*EVENT(XCB_VISIBILITY_NOTIFY, visibilitynotify);*/
+#undef EVENT
+ }
+ if (type - xrandr_eventbase == XCB_RANDR_SCREEN_CHANGE_NOTIFY)
+ screenchange((void *)evt);
}
int
{
struct swm_region *r, *rr;
struct ws_win *winfocus = NULL;
- struct timeval tv;
union arg a;
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
- XEvent e;
int xfd, i, num_screens;
- fd_set rd;
struct sigaction sact;
+ xcb_generic_event_t *evt;
+ struct timeval tv;
+ fd_set rd;
+
+ time_started = time(NULL);
start_argv = argv;
warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr);
if (!(display = XOpenDisplay(0)))
errx(1, "can not open display");
- if (!(conn = XGetXCBConnection(display)))
- errx(1, "can not get XCB connection");
-
- if (active_wm())
- errx(1, "other wm running");
-
/* handle some signals */
bzero(&sact, sizeof(sact));
sigemptyset(&sact.sa_mask);
sact.sa_flags = SA_NOCLDSTOP;
sigaction(SIGCHLD, &sact, NULL);
+ conn = XGetXCBConnection(display);
+ if (xcb_connection_has_error(conn))
+ errx(1, "can not get XCB connection");
+
+ xfd = xcb_get_file_descriptor(conn);
+ syms = xcb_key_symbols_alloc(conn);
+ if (!syms)
+ errx(1, "unable to allocate key symbols");
+
astate = get_atom_from_string("WM_STATE");
aprot = get_atom_from_string("WM_PROTOCOLS");
adelete = get_atom_from_string("WM_DELETE_WINDOW");
if (pwd == NULL)
errx(1, "invalid user: %d", getuid());
+ xcb_grab_server(conn);
+ xcb_aux_sync(conn);
+
+ /* flush all events */
+ while ((evt = xcb_poll_for_event(conn))) {
+ if (XCB_EVENT_RESPONSE_TYPE(evt) == 0)
+ event_handle(evt);
+ free(evt);
+ }
+
+ if (active_wm())
+ errx(1, "other wm running");
+
+ xcb_aux_sync(conn);
+
setup_globals();
setup_screens();
setup_keys();
bar_setup(r);
}
- unfocus_all();
+ //unfocus_all();
grabkeys();
stack();
- if (focus_mode == SWM_FOCUS_DEFAULT)
- drain_enter_notify();
- xfd = xcb_get_file_descriptor(conn);
+ xcb_ungrab_server(conn);
+ xcb_flush(conn);
+
while (running) {
- while (XPending(display)) {
- XNextEvent(display, &e);
+ while ((evt = xcb_poll_for_event(conn))) {
if (running == 0)
goto done;
- if (e.type < LASTEvent) {
- DNPRINTF(SWM_D_EVENTQ ,"XEvent: handled: %s, "
- "window: 0x%lx, type: %s (%d), %d remaining"
- "\n", YESNO(handler[e.type]),
- e.xany.window, geteventname(&e),
- e.type, QLength(display));
-
- if (handler[e.type])
- handler[e.type](&e);
- } else {
- DNPRINTF(SWM_D_EVENTQ, "XRandr Event: window: "
- "0x%lx, type: %s (%d)\n", e.xany.window,
- xrandr_geteventname(&e), e.type);
-
- switch (e.type - xrandr_eventbase) {
- case XCB_RANDR_SCREEN_CHANGE_NOTIFY:
- screenchange(&e);
- break;
- default:
- break;
- }
- }
+ event_handle(evt);
+ free(evt);
}
/* if we are being restarted go focus on first window */
/* move pointer to first screen if multi screen */
if (num_screens > 1 || outputs > 1)
xcb_warp_pointer(conn, XCB_WINDOW_NONE,
- rr->s[0].root, 0, 0, 0, 0, X(rr),
- Y(rr) + (bar_enabled ? bar_height : 0));
+ 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);
bar_extra_stop();
for (i = 0; i < num_screens; ++i)
- if (screens[i].bar_gc != NULL)
- XFreeGC(display, screens[i].bar_gc);
+ if (screens[i].bar_gc != 0)
+ xcb_free_gc(conn, screens[i].bar_gc);
XFreeFontSet(display, bar_fs);
+
+ xcb_key_symbols_free(syms);
xcb_disconnect(conn);
- XCloseDisplay(display);
return (0);
}