* 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/extensions/Xrandr.h>
#include <X11/Xlib-xcb.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>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xrandr.h>
-#include <X11/extensions/XTest.h>
+#include <xcb/randr.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
#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 SWM_D_EVENTQ 0x1000
#define SWM_D_CONF 0x2000
#define SWM_D_BAR 0x4000
+#define SWM_D_INIT 0x8000
u_int32_t swm_debug = 0
| SWM_D_MISC
| SWM_D_EVENTQ
| SWM_D_CONF
| SWM_D_BAR
+ | SWM_D_INIT
;
#else
#define DPRINTF(x...)
#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)
#endif
char **start_argv;
-xcb_atom_t astate;
-xcb_atom_t aprot;
-xcb_atom_t adelete;
-xcb_atom_t takefocus;
+xcb_atom_t a_state;
+xcb_atom_t a_prot;
+xcb_atom_t a_delete;
+xcb_atom_t a_takefocus;
xcb_atom_t a_wmname;
xcb_atom_t a_netwmname;
xcb_atom_t a_utf8_string;
volatile sig_atomic_t running = 1;
volatile sig_atomic_t restart_wm = 0;
int outputs = 0;
-int last_focus_event = FocusOut;
-int (*xerrorxlib)(Display *, XErrorEvent *);
+/*int last_focus_event = FocusOut;*/
int other_wm;
int ss_enabled = 0;
int xrandr_support;
int xrandr_eventbase;
unsigned int numlockmask = 0;
+
Display *display;
xcb_connection_t *conn;
xcb_key_symbols_t *syms;
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;
+xcb_font_t bar_fs;
+int32_t bar_fs_height;
char *bar_fonts;
struct passwd *pwd;
-#define SWM_MENU_FN (2)
-#define SWM_MENU_NB (4)
-#define SWM_MENU_NF (6)
-#define SWM_MENU_SB (8)
-#define SWM_MENU_SF (10)
-
/* layout manager data */
struct swm_geometry {
int x;
/* 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 **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 */
+xcb_char2b_t *char2b(const char *);
+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);
-int parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *);
-void event_handle(xcb_generic_event_t *);
+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 */
+xcb_char2b_t *
+char2b(const char *str)
+{
+ xcb_char2b_t *s;
+ size_t i, len;
+
+ len = strlen(str);
+ s = malloc(len * sizeof(xcb_char2b_t));
+ if (!s)
+ return (NULL);
+
+ for (i = 0; i < len; i++) {
+ s[i].byte1 = '\0';
+ s[i].byte2 = str[i];
+ }
+
+ return (s);
+}
int
parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb)
XCB_CONFIG_WINDOW_STACK_MODE, &val);
xcb_map_window(conn, win);
- xcb_flush(conn);
}
xcb_atom_t
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
for (i = 0; i < num_screens; i++) {
/* Support check window will be created by workaround(). */
-
+
/* Report supported atoms */
xcb_delete_property(conn, screens[i].root, sup_list);
for (j = 0; j < LENGTH(ewmh); j++)
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;
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;
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 visibilitynotify(xcb_visibility_notify_event_t *);*/
void clientmessage(xcb_client_message_event_t *);
void screenchange(xcb_randr_screen_change_notify_event_t *);
}
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);
void
custom_region(char *val)
{
- unsigned int sidx, x, y, w, h;
- int num_screens;
+ unsigned int x, y, w, h;
+ int sidx, num_screens;
xcb_screen_t *screen;
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- if (sscanf(val, "screen[%u]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5)
+ if (sscanf(val, "screen[%d]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5)
errx(1, "invalid custom region, "
"should be 'screen[<n>]:<n>x<n>+<n>+<n>");
if (sidx < 1 || sidx > num_screens)
void
bar_print(struct swm_region *r, const char *s)
{
- int x = 0;
- size_t len;
- xcb_rectangle_t rect;
- uint32_t gcv[1];
- XRectangle ibox, lbox;
+ size_t len;
+ xcb_rectangle_t rect;
+ uint32_t gcv[1];
+ xcb_char2b_t *c2b;
+ xcb_query_text_extents_reply_t *ter;
+ int32_t x, width;
len = strlen(s);
- XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
-
+ c2b = char2b(s);
+ if (!c2b)
+ return;
+ ter = xcb_query_text_extents_reply(conn,
+ xcb_query_text_extents(conn, bar_fs, len, c2b),
+ NULL);
+ if (!ter) {
+ free(c2b);
+ return;
+ }
+ width = ter->overall_width;
+
+ free(ter);
+ free(c2b);
+
switch (bar_justify) {
case SWM_BAR_JUSTIFY_LEFT:
x = SWM_BAR_OFFSET;
break;
case SWM_BAR_JUSTIFY_CENTER:
- x = (WIDTH(r) - lbox.width) / 2;
+ x = (WIDTH(r) - width) / 2;
break;
case SWM_BAR_JUSTIFY_RIGHT:
- x = WIDTH(r) - lbox.width - SWM_BAR_OFFSET;
+ x = WIDTH(r) - width - SWM_BAR_OFFSET;
break;
}
if (x < SWM_BAR_OFFSET)
x = SWM_BAR_OFFSET;
-
+
rect.x = 0;
rect.y = 0;
rect.width = WIDTH(r->bar);
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);
+ gcv[0] = bar_fs;
+ xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FONT, 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);
+ bar_fs_height, s);
/* blt */
xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0,
bar_replace_pad(char *tmp, int *limit, size_t sz)
{
/* special case; no limit given, pad one space, instead */
- if (*limit == sz - 1)
+ if (*limit == (int)sz - 1)
*limit = 1;
snprintf(tmp, sz, "%*s", *limit, " ");
}
size = 0;
if (sscanf(fmt, "%d%n", &limit, &size) != 1)
limit = sizeof tmp - 1;
- if (limit <= 0 || limit >= sizeof tmp)
+ if (limit <= 0 || limit >= (int)sizeof tmp)
limit = sizeof tmp - 1;
/* there is nothing to replace (ie EOL) */
len = strlen(tmp);
ptr = tmp;
- if (len < limit)
+ if ((int)len < limit)
limit = len;
while (limit-- > 0) {
if (*offrep >= sz - 1)
stack();
/* must be after stack */
bar_update();
+
+ xcb_flush(conn);
}
void
void
bar_setup(struct swm_region *r)
{
- char *default_string;
- char **missing_charsets;
- int num_missing_charsets = 0;
- int i;
+ char *bar_font;
xcb_screen_t *screen = get_screen(r->s->idx);
- uint32_t wa[2];
+ uint32_t wa[3];
+ xcb_generic_error_t *error;
+ xcb_void_cookie_t voc;
+ xcb_query_font_reply_t *bar_fs_info;
if (bar_fs) {
- XFreeFontSet(display, bar_fs);
- bar_fs = NULL;
+ xcb_close_font(conn, bar_fs);
+ bar_fs = 0;
}
if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL)
err(1, "bar_setup: calloc: failed to allocate memory.");
- DNPRINTF(SWM_D_BAR, "bar_setup: loading bar_fonts: %s\n", bar_fonts);
-
- bar_fs = XCreateFontSet(display, bar_fonts, &missing_charsets,
- &num_missing_charsets, &default_string);
-
- if (num_missing_charsets > 0) {
- warnx("Unable to load charset(s):");
-
- for (i = 0; i < num_missing_charsets; ++i)
- warnx("%s", missing_charsets[i]);
+ bar_fs = xcb_generate_id(conn);
+ while ((bar_font = strsep(&bar_fonts, " ,")) != NULL) {
+ if (*bar_font == '\0')
+ continue;
- XFreeStringList(missing_charsets);
+ DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", bar_font);
+ voc = xcb_open_font_checked(conn, bar_fs, strlen(bar_font),
+ bar_font);
- if (strcmp(default_string, ""))
- warnx("Glyphs from those sets will be replaced "
- "by '%s'.", default_string);
- else
- warnx("Glyphs from those sets won't be drawn.");
+ if ((error = xcb_request_check(conn, voc))) {
+ DNPRINTF(SWM_D_INIT,
+ "bar_setup: unable to open font: %s\n",
+ bar_font);
+ free(error);
+ warnx("unable to load font %s", bar_font);
+ } else {
+ DNPRINTF(SWM_D_INIT,
+ "bar_setup: successfully opened font: %s\n",
+ bar_font);
+ break;
+ }
}
- if (bar_fs == NULL)
- errx(1, "Error creating font set structure.");
-
- bar_fs_extents = XExtentsOfFontSet(bar_fs);
+ bar_fs_info = xcb_query_font_reply(conn,
+ xcb_query_font(conn, bar_fs),
+ NULL);
+ if (!bar_fs_info)
+ errx(1, "unable to get font information for font %s\n",
+ bar_font);
+ bar_fs_height = bar_fs_info->font_ascent + bar_fs_info->font_descent;
+ free(bar_fs_info);
- bar_height = bar_fs_extents->max_logical_extent.height +
- 2 * bar_border_width;
+ bar_height = bar_fs_height + 4 * bar_border_width;
if (bar_height < 1)
bar_height = 1;
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;
+ DNPRINTF(SWM_D_BAR, "bar_setup: create_window: (x,y) w x h: (%d,%d) "
+ "%d x %d\n", X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar));
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, wa);
+ 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,
if (win == NULL)
return;
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, astate,
- astate, 32, 2, data);
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, a_state,
+ a_state, 32, 2, data);
}
uint16_t
xcb_get_property_cookie_t c;
xcb_get_property_reply_t *r;
- c = xcb_get_property(conn, False, w, astate, astate, 0L, 2L);
+ c = xcb_get_property(conn, False, w, a_state, a_state, 0L, 2L);
r = xcb_get_property_reply(conn, c, NULL);
if (r) {
else
strlcpy(bar_vertext, "", sizeof bar_vertext);
bar_update();
+
+ xcb_flush(conn);
}
void
bzero(&ev, sizeof ev);
ev.response_type = XCB_CLIENT_MESSAGE;
ev.window = win->id;
- ev.type = aprot;
+ ev.type = a_prot;
ev.format = 32;
ev.data.data32[0] = a;
ev.data.data32[1] = XCB_CURRENT_TIME;
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, (const char *)&event);
event.response_type = XCB_KEY_RELEASE;
xcb_send_event(conn, True, win->id,
- XCB_EVENT_MASK_KEY_RELEASE, (char *)&event);
+ XCB_EVENT_MASK_KEY_RELEASE, (const char *)&event);
}
void
struct swm_region *
root_to_region(xcb_window_t root)
{
- struct swm_region *r = NULL;
- int i, num_screens;
+ struct swm_region *r = NULL;
+ int i, num_screens;
xcb_query_pointer_reply_t *qpr;
DNPRINTF(SWM_D_MISC, "root_to_region: window: 0x%x\n", root);
{
struct ws_win *win;
int i, j, num_screens;
- xcb_query_tree_cookie_t c;
xcb_query_tree_reply_t *r;
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
if (id == win->id)
return (win);
- c = xcb_query_tree(conn, id);
- r = xcb_query_tree_reply(conn, c, NULL);
+ r = xcb_query_tree_reply(conn, xcb_query_tree(conn, id), NULL);
if (!r)
return (NULL);
DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]);
- if (display)
- close(xcb_get_file_descriptor(conn));
+ close(xcb_get_file_descriptor(conn));
setenv("LD_PRELOAD", SWM_LIB, 1);
focus_win(struct ws_win *win)
{
struct ws_win *cfw = NULL;
- xcb_get_input_focus_cookie_t c;
xcb_get_input_focus_reply_t *r;
xcb_window_t cur_focus = XCB_WINDOW_NONE;
return;
}
- c = xcb_get_input_focus(conn);
- r = xcb_get_input_focus_reply(conn, c, NULL);
+ r = xcb_get_input_focus_reply(conn, xcb_get_input_focus(conn), NULL);
if (r) {
cur_focus = r->focus;
free(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);
+ &cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);*/
}
win->ws->focus = win;
bar_update();
}
+void
+event_drain(uint8_t rt)
+{
+ xcb_generic_event_t *evt;
+
+ xcb_flush(conn);
+ while ((evt = xcb_poll_for_event(conn))) {
+ if (XCB_EVENT_RESPONSE_TYPE(evt) != rt)
+ event_handle(evt);
+
+ free(evt);
+ }
+}
+
void
switchws(struct swm_region *r, union arg *args)
{
if (unmap_old)
TAILQ_FOREACH(win, &old_ws->winlist, entry)
unmap_window(win);
+
+ if (focus_mode == SWM_FOCUS_DEFAULT)
+ event_drain(XCB_ENTER_NOTIFY);
+ else
+ xcb_flush(conn);
}
void
sort_windows(wl);
stack();
+
+ xcb_flush(conn);
}
void
}
focus_magic(winfocus);
+
+ xcb_flush(conn);
}
void
ws->cur_layout = &layouts[0];
stack();
+ bar_update();
- a.id = SWM_ARG_ID_FOCUSCUR;
+ if (focus_mode == SWM_FOCUS_DEFAULT)
+ event_drain(XCB_ENTER_NOTIFY);
+ a.id = SWM_ARG_ID_FOCUSCUR;
focus(r, &a);
}
if (font_adjusted)
font_adjusted--;
+ if (focus_mode == SWM_FOCUS_DEFAULT)
+ event_drain(XCB_ENTER_NOTIFY);
+
DNPRINTF(SWM_D_STACK, "stack: end\n");
}
stack();
bar_update();
+
+ xcb_flush(conn);
}
void
/* bring floaters back to top */
if (r->ws->always_raise == 0)
stack();
+
+ xcb_flush(conn);
}
void
r->ws->focus = NULL;
a.id = SWM_ARG_ID_FOCUSCUR;
focus(r, &a);
+
+ xcb_flush(conn);
}
char *
}
fclose(lfile);
+
+ xcb_flush(conn);
}
void
struct ws_win *win = NULL;
struct search_window *sw = NULL;
xcb_window_t w;
- uint32_t gcv[3], wa[2];
- int i;
+ uint32_t gcv[4], wa[2];
+ int i, width;
char s[8];
FILE *lfile;
size_t len;
- XRectangle ibox, lbox;
+ xcb_char2b_t *c2b;
+ xcb_query_text_extents_reply_t *ter;
+
DNPRINTF(SWM_D_MISC, "search_win\n");
search_r = r;
snprintf(s, sizeof s, "%d", i);
len = strlen(s);
- XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
+ c2b = char2b(s);
+ if (!c2b) {
+ warn("search_win: char2b malloc");
+ free(sw);
+ fclose(lfile);
+ search_win_cleanup();
+ return;
+ }
+ ter = xcb_query_text_extents_reply(conn,
+ xcb_query_text_extents(conn, bar_fs,
+ len, c2b),
+ NULL);
+ if (!ter) {
+ warn("search_win: query text failed");
+ free(c2b);
+ free(sw);
+ fclose(lfile);
+ search_win_cleanup();
+ return;
+ }
+ width = ter->overall_width;
+ free(ter);
+ free(c2b);
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,
+ width + 4, bar_fs_height + 4,
1, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
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;
+ gcv[2] = bar_fs;
+ gcv[3] = 0;
xcb_create_gc(conn, sw->gc, w, XCB_GC_FOREGROUND |
- XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv);
+ XCB_GC_BACKGROUND | XCB_GC_FONT | XCB_GC_GRAPHICS_EXPOSURES,
+ gcv);
map_window_raised(w);
- xcb_image_text_8(conn, len, w, sw->gc, 2,
- (bar_fs_extents->max_logical_extent.height -
- lbox.height) / 2 - lbox.y, s);
+ xcb_image_text_8(conn, len, w, sw->gc, 2, bar_fs_height, s);
DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w);
}
fclose(lfile);
+
+ xcb_flush(conn);
}
void
p = strchr(q, ':');
if (p != NULL)
*p = '\0';
- ws_idx = strtonum(q, 1, workspace_limit, &errstr);
+ ws_idx = (int)strtonum(q, 1, workspace_limit, &errstr);
if (errstr) {
DNPRINTF(SWM_D_MISC, "workspace idx is %s: %s",
errstr, q);
return;
}
- idx = strtonum(s, 1, INT_MAX, &errstr);
+ idx = (int)strtonum(s, 1, INT_MAX, &errstr);
if (errstr) {
DNPRINTF(SWM_D_MISC, "window idx is %s: %s",
errstr, s);
xcb_kill_client(conn, r->ws->focus->id);
else
if (r->ws->focus->can_delete)
- client_msg(r->ws->focus, adelete);
+ client_msg(r->ws->focus, a_delete);
+
+ xcb_flush(conn);
}
a.id = SWM_ARG_ID_FOCUSCUR;
focus(win->ws->r, &a);
}
+
+ xcb_flush(conn);
+ event_drain(XCB_ENTER_NOTIFY);
}
void
void
resize(struct ws_win *win, union arg *args)
{
- xcb_timestamp_t time = 0;
+ xcb_timestamp_t timestamp = 0;
struct swm_region *r = NULL;
int resize_step = 0;
struct swm_geometry g;
- int top = 0, left = 0, buttonrelease;
+ int top = 0, left = 0, resizing;
int dx, dy;
unsigned int shape; /* cursor style */
xcb_cursor_t cursor;
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;
}
- buttonrelease = 0;
- while ((evt = xcb_poll_for_event(conn)) && buttonrelease != 1) {
- /*
- XMaskEvent(display, MOUSEMASK | ExposureMask |
- SubstructureRedirectMask, &ev);
- */
+ xcb_flush(conn);
+ resizing = 1;
+ while ((evt = xcb_wait_for_event(conn)) && resizing) {
switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
case XCB_BUTTON_RELEASE:
- buttonrelease = 1;
+ DNPRINTF(SWM_D_EVENT, "resize: BUTTON_RELEASE\n");
+ resizing = 0;
break;
case XCB_MOTION_NOTIFY:
mne = (xcb_motion_notify_event_t *)evt;
constrain_window(win, r, 1);
/* not free, don't sync more than 120 times / second */
- if ((mne->time - time) > (1000 / 120) ) {
- time = mne->time;
+ if ((mne->time - timestamp) > (1000 / 120) ) {
+ timestamp = mne->time;
do_sync();
update_window(win);
}
}
free(evt);
}
- if (time) {
+ if (timestamp) {
do_sync();
update_window(win);
}
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)
{
- xcb_timestamp_t time = 0;
- int move_step = 0, buttonrelease;
+ xcb_timestamp_t timestamp = 0;
+ int move_step = 0, moving;
struct swm_region *r = NULL;
xcb_font_t cursor_font;
xcb_cursor_t cursor;
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;
}
- buttonrelease = 0;
- while ((evt = xcb_poll_for_event(conn)) && buttonrelease != 1) {
- /*
- XMaskEvent(display, MOUSEMASK | ExposureMask |
- SubstructureRedirectMask, &ev);
- */
+ xcb_flush(conn);
+ moving = 1;
+ while ((evt = xcb_wait_for_event(conn)) && moving) {
switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
case XCB_BUTTON_RELEASE:
- buttonrelease = 1;
+ DNPRINTF(SWM_D_EVENT, "move: BUTTON_RELEASE\n");
+ moving = 0;
break;
case XCB_MOTION_NOTIFY:
mne = (xcb_motion_notify_event_t *)evt;
constrain_window(win, r, 0);
/* not free, don't sync more than 120 times / second */
- if ((mne->time - time) > (1000 / 120) ) {
- time = mne->time;
+ if ((mne->time - timestamp) > (1000 / 120) ) {
+ timestamp = mne->time;
do_sync();
update_window(win);
}
}
free(evt);
}
- if (time) {
+ if (timestamp) {
do_sync();
update_window(win);
}
xcb_free_cursor(conn, cursor);
xcb_close_font(conn, cursor_font);
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
+ 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} },
};
DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s\n", name);
if ((sp = calloc(1, sizeof *sp)) == NULL)
- err(1, "spawn_insert: malloc");
+ err(1, "spawn_insert: calloc");
if ((sp->name = strdup(name)) == NULL)
err(1, "spawn_insert: strdup");
return (1);
}
cp = keystr;
- *ks = NoSymbol;
+ *ks = XCB_NO_SYMBOL;
*mod = 0;
while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) {
DNPRINTF(SWM_D_KEY, "parsekeys: key [%s]\n", name);
else {
*ks = XStringToKeysym(name);
XConvertCase(*ks, ks, &uks);
- if (ks == NoSymbol) {
+ if (ks == XCB_NO_SYMBOL) {
DNPRINTF(SWM_D_KEY,
"parsekeys: invalid key %s\n",
name);
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
grabkeys(void)
{
- int num_screens;
- unsigned int j, k;
+ int num_screens, k;
+ unsigned int j;
xcb_keycode_t *code;
unsigned int modifiers[] =
{ 0, LockMask, numlockmask, numlockmask | LockMask };
if (asprintf(&bar_fonts, "%s,%s", value, bar_fonts) == -1)
err(1, "setconfvalue: asprintf: failed to allocate "
"memory for bar_fonts.");
-
free(b);
break;
case SWM_S_BAR_FORMAT:
char *ap, *sp = s;
union arg a;
int argc = 0;
- long pid;
+ pid_t pid;
struct pid_e *p;
if (getenv("SWM_STARTED"))
for (i = 0; i < LENGTH(configopt); i++) {
opt = &configopt[i];
if (!strncasecmp(cp, opt->optname, wordlen) &&
- strlen(opt->optname) == wordlen) {
+ (int)strlen(opt->optname) == wordlen) {
optind = i;
break;
}
}
}
-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);
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 = (pid_t)strtonum(xcb_get_property_value(pr), 0, INT_MAX, &errstr);
free(pr);
return (ret);
xcb_window_t trans = XCB_WINDOW_NONE;
struct workspace *ws;
struct ws_win *win, *ww;
- int i, ws_idx, border_me = 0;
+ int 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;
const char *errstr;
struct pid_e *p;
struct quirk *qp;
- uint32_t event_mask;
+ uint32_t event_mask, i;
xcb_atom_t prot;
xcb_get_property_reply_t *gpr;
xcb_icccm_get_wm_protocols_reply_t wpr;
xcb_icccm_get_wm_protocols(conn, id, prot),
&wpr, NULL)) {
for (i = 0; i < wpr.atoms_len; i++) {
- if (wpr.atoms[i] == takefocus)
+ if (wpr.atoms[i] == a_takefocus)
win->take_focus = 1;
- if (wpr.atoms[i] == adelete)
+ if (wpr.atoms[i] == a_delete)
win->can_delete = 1;
}
xcb_icccm_get_wm_protocols_reply_wipe(&wpr);
p = NULL;
} else if (prop && win->transient == 0) {
DNPRINTF(SWM_D_PROP, "manage_window: get _SWM_WS: %s\n", prop);
- ws_idx = strtonum(prop, 0, workspace_limit - 1,
+ ws_idx = (int)strtonum(prop, 0, workspace_limit - 1,
&errstr);
if (errstr) {
DNPRINTF(SWM_D_EVENT, "manage_window: window: #%s: %s",
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->wa)
if (win->java) {
focus_win(win->child_trans);
if (win->child_trans->take_focus)
- client_msg(win, takefocus);
+ client_msg(win, a_takefocus);
} else {
/* make sure transient hasn't disappeared */
if (validate_win(win->child_trans) == 0) {
focus_win(win->child_trans);
if (win->child_trans->take_focus)
- client_msg(win->child_trans, takefocus);
+ client_msg(win->child_trans,
+ a_takefocus);
} else {
win->child_trans = NULL;
focus_win(win);
if (win->take_focus)
- client_msg(win, takefocus);
+ client_msg(win, a_takefocus);
}
}
} else {
/* regular focus */
focus_win(win);
if (win->take_focus)
- client_msg(win, takefocus);
+ client_msg(win, a_takefocus);
}
}
void
expose(xcb_expose_event_t *e)
{
+ 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(xcb_key_press_event_t *e)
{
- KeySym keysym;
+ xcb_keysym_t keysym;
struct key *kp;
- struct swm_region *r;
- keysym = XkbKeycodeToKeysym(display, (KeyCode)e->detail, 0, 0);
+ keysym = xcb_key_press_lookup_keysym(syms, e, 0);
- DNPRINTF(SWM_D_EVENT, "keypress: %u\n", e->detail);
+ DNPRINTF(SWM_D_EVENT, "keypress: %u %u\n", e->detail, keysym);
if ((kp = key_lookup(CLEANMASK(e->state), keysym)) == NULL)
return;
- if (keyfuncs[kp->funcid].func == NULL)
- return;
- r = root_to_region(e->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(xcb_button_press_event_t *e)
{
struct ws_win *win;
- int i, action;
+ int i;
+ unsigned int action;
- DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x\n", e->event);
+ DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n",
+ e->event, e->detail);
if ((win = find_window(e->event)) == NULL)
return;
buttons[i].button == e->detail &&
CLEANMASK(buttons[i].mask) == CLEANMASK(e->state))
buttons[i].func(win, &buttons[i].args);
+
+ xcb_flush(conn);
}
+#ifdef SWM_DEBUG
+void
+print_win_geom(xcb_window_t w)
+{
+ xcb_get_geometry_reply_t *wa;
+
+
+ wa = xcb_get_geometry_reply(conn, xcb_get_geometry(conn, w), NULL);
+
+ DNPRINTF(SWM_D_MISC, "print_win_geom: window: 0x%x, root: 0x%x, "
+ "depth: %u, (x,y) w x h: (%d,%d) %d x %d, border: %d\n",
+ w, wa->root, wa->depth, wa->x, wa->y, wa->width, wa->height,
+ wa->border_width);
+
+ free(wa);
+}
+#endif
+
void
configurerequest(xcb_configure_request_event_t *e)
{
if ((win = find_window(e->window)) == NULL)
if ((win = find_unmanaged_window(e->window)) == NULL)
new = 1;
-
+#ifdef SWM_DEBUG
+ print_win_geom(e->window);
+#endif
if (new) {
+ DNPRINTF(SWM_D_EVENT, "configurerequest: new window: 0x%x, "
+ "value_mask: 0x%x", e->window, e->value_mask);
if (e->value_mask & XCB_CONFIG_WINDOW_X) {
mask |= XCB_CONFIG_WINDOW_X;
wc[i++] = e->x;
+ DPRINTF(", X: %d", e->x);
}
if (e->value_mask & XCB_CONFIG_WINDOW_Y) {
mask |= XCB_CONFIG_WINDOW_Y;
wc[i++] = e->y;
+ DPRINTF(", Y: %d", e->y);
}
if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
mask |= XCB_CONFIG_WINDOW_WIDTH;
wc[i++] = e->width;
+ DPRINTF(", W: %u", e->width);
}
if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
mask |= XCB_CONFIG_WINDOW_HEIGHT;
wc[i++] = e->height;
+ DPRINTF(", H: %u", e->height);
}
if (e->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH) {
mask |= XCB_CONFIG_WINDOW_BORDER_WIDTH;
wc[i++] = e->border_width;
+ DPRINTF(", Border: %u", e->border_width);
}
if (e->value_mask & XCB_CONFIG_WINDOW_SIBLING) {
mask |= XCB_CONFIG_WINDOW_SIBLING;
wc[i++] = e->sibling;
+ DPRINTF(", Sibling: 0x%x", e->sibling);
}
if (e->value_mask & XCB_CONFIG_WINDOW_STACK_MODE) {
mask |= XCB_CONFIG_WINDOW_STACK_MODE;
wc[i++] = e->stack_mode;
+ DPRINTF(", StackMode: %u", 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]);
+ if (mask != 0)
+ xcb_configure_window(conn, e->window, mask, wc);
- xcb_configure_window(conn, e->window, mask, wc);
+ DPRINTF(", Sent: %s\n", YESNO((mask != 0)));
} else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) &&
!(win->ewmh_flags & EWMH_F_FULLSCREEN)) {
win->g_float.x = e->x - X(win->ws->r);
} else {
config_win(win, e);
}
+
+ xcb_flush(conn);
}
void
enternotify(xcb_enter_notify_event_t *e)
{
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%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,
case SWM_FOCUS_FOLLOW:
break;
case SWM_FOCUS_SYNERGY:
-#if 0
- /*
- * all these checks need to be in this order because the
- * XCheckTypedWindowEvent relies on weeding out the previous events
- *
- * making this code an option would enable a follow mouse for focus
- * feature
- */
-
- /*
- * state is set when we are switching workspaces and focus is set when
- * the window or a subwindow already has focus (occurs during restart).
- *
- * Only honor the focus flag if last_focus_event is not FocusOut,
- * this allows spectrwm to continue to control focus when another
- * program is also playing with it.
- */
- if (ev->state || (ev->focus && last_focus_event != FocusOut)) {
- DNPRINTF(SWM_D_EVENT, "ignoring enternotify: focus\n");
- return;
- }
-
- /*
- * happens when a window is created or destroyed and the border
- * crosses the mouse pointer and when switching ws
- *
- * we need the subwindow test to see if we came from root in order
- * to give focus to floaters
- */
- if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual &&
- ev->subwindow == 0) {
- DNPRINTF(SWM_D_EVENT, "ignoring enternotify: NotifyVirtual\n");
- return;
- }
-
- /* this window already has focus */
- if (ev->mode == NotifyNormal && ev->detail == NotifyInferior) {
- DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win has focus\n");
- return;
- }
-
- /* this window is being deleted or moved to another ws */
- if (XCheckTypedWindowEvent(display, ev->window, ConfigureNotify,
- &cne) == True) {
- DNPRINTF(SWM_D_EVENT, "ignoring enternotify: configurenotify\n");
- XPutBackEvent(display, &cne);
- return;
- }
-
- if ((win = find_window(ev->window)) == NULL) {
- DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win == NULL\n");
- return;
- }
-
- /*
- * In fullstack kill all enters unless they come from a different ws
- * (i.e. another region) or focus has been grabbed externally.
- */
- if (win->ws->cur_layout->flags & SWM_L_FOCUSPREV &&
- last_focus_event != FocusOut) {
- XGetInputFocus(display, &focus_return, &revert_to_return);
- if ((w = find_window(focus_return)) == NULL ||
- w->ws == win->ws) {
- DNPRINTF(SWM_D_EVENT, "ignoring event: fullstack\n");
- return;
- }
- }
-#endif
break;
}
}
focus_magic(win);
+
+ xcb_flush(conn);
}
/* lets us use one switch statement for arbitrary mode/detail combinations */
focus_magic(win);
}
-void
-propertynotify(xcb_property_notify_event_t *e)
-{
- struct ws_win *win;
#ifdef SWM_DEBUG
+char *
+get_atom_name(xcb_atom_t atom)
+{
char *name;
size_t len;
xcb_get_atom_name_reply_t *r;
+ xcb_map_request_event_t mre;
r = xcb_get_atom_name_reply(conn,
- xcb_get_atom_name(conn, e->atom),
+ xcb_get_atom_name(conn, atom),
NULL);
if (r) {
len = xcb_get_atom_name_name_length(r);
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);
+ return name;
}
}
free(r);
}
+
+ return NULL;
+}
+#endif
+
+void
+propertynotify(xcb_property_notify_event_t *e)
+{
+ struct ws_win *win;
+#ifdef SWM_DEBUG
+ char *name;
+
+ name = get_atom_name(e->atom);
+ DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%x, atom: %s(%u)\n",
+ e->window, name, e->atom);
+ free(name);
#endif
win = find_window(e->window);
}
switch (e->atom) {
-#if 0
- 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 & 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 XCB_ATOM_WM_CLASS:
case XCB_ATOM_WM_NAME:
bar_update();
/* resend unmap because we ated it */
xcb_unmap_window(conn, e->window);
+ xcb_flush(conn);
}
}
-void
+/*void
visibilitynotify(xcb_visibility_notify_event_t *e)
{
- int i, num_screens;
- struct swm_region *r;
-
DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%x\n",
e->window);
-
- if (e->state == XCB_VISIBILITY_UNOBSCURED) {
- 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();
- }
-}
+}*/
void
clientmessage(xcb_client_message_event_t *e)
{
struct ws_win *win;
+ xcb_map_request_event_t mre;
+#ifdef SWM_DEBUG
+ char *name;
+ name = get_atom_name(e->type);
+ DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%x, atom: %s(%u)\n",
+ e->window, name, e->type);
+ free(name);
+#endif
win = find_window(e->window);
- if (win == NULL)
+
+ if (win == NULL) {
+ if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) {
+ DNPRINTF(SWM_D_EVENT, "clientmessage: request focus on "
+ "unmanaged window.\n");
+ mre.window = e->window;
+ maprequest(&mre);
+ }
return;
}
- DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%x, type: %u\n",
- e->window, e->response_type);
-
- if (e->response_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 (e->response_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);
+ client_msg(win, a_delete);
else
xcb_kill_client(conn, win->id);
}
- if (e->response_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) {
config_win(win, NULL);
}
}
- if (e->response_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, e->data.data32[1], e->data.data32[0]);
if (e->data.data32[2])
stack();
}
-}
-int
-xerror_start(Display *d, XErrorEvent *ee)
-{
- other_wm = 1;
- return (-1);
-}
-
-int
-xerror(Display *d, XErrorEvent *ee)
-{
- /* warnx("error: %p %p", display, ee); */
- return (-1);
+ xcb_flush(conn);
}
int
-active_wm(void)
+enable_wm(void)
{
- other_wm = 0;
- xerrorxlib = XSetErrorHandler(xerror_start);
+ int num_screens, i;
+ const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT;
+ xcb_screen_t *sc;
+ xcb_void_cookie_t wac;
+ xcb_generic_error_t *error;
/* this causes an error if some other window manager is running */
- XSelectInput(display, DefaultRootWindow(display),
- SubstructureRedirectMask);
- do_sync();
- if (other_wm)
- return (1);
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ for (i = 0; i < num_screens; i++) {
+ sc = get_screen(i);
+ DNPRINTF(SWM_D_INIT, "enable_wm: screen %d, root: 0x%x\n",
+ i, sc->root);
+ wac = xcb_change_window_attributes_checked(conn, sc->root,
+ XCB_CW_EVENT_MASK, &val);
+ if ((error = xcb_request_check(conn, wac))) {
+ DNPRINTF(SWM_D_INIT, "enable_wm: error_code: %u\n",
+ error->error_code);
+ free(error);
+ return 1;
+ }
+ }
- XSetErrorHandler(xerror);
- do_sync();
- return (0);
+ return 0;
}
void
DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%x\n", e->root);
- 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++)
/* brute force for now, just re-enumerate the regions */
scan_xrandr(i);
+#ifdef SWM_DEBUG
+ print_win_geom(e->root);
+#endif
/* add bars to all regions */
for (i = 0; i < num_screens; i++)
TAILQ_FOREACH(r, &screens[i].rl, entry)
screens[i].idx = i;
TAILQ_INIT(&screens[i].rl);
TAILQ_INIT(&screens[i].orl);
- screens[i].root = RootWindow(display, i);
+ screens[i].root = get_screen(i)->root;
/* set default colors */
setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS);
if ((clock_format = strdup("%a %b %d %R %Z %Y")) == NULL)
err(1, "setup_globals: strdup: failed to allocate memory.");
+
+ if ((syms = xcb_key_symbols_alloc(conn)) == NULL)
+ errx(1, "unable to allocate key symbols");
+
+ a_state = get_atom_from_string("WM_STATE");
+ a_prot = get_atom_from_string("WM_PROTOCOLS");
+ a_delete = get_atom_from_string("WM_DELETE_WINDOW");
+ a_takefocus = get_atom_from_string("WM_TAKE_FOCUS");
+ a_wmname = get_atom_from_string("WM_NAME");
+ a_netwmname = get_atom_from_string("_NET_WM_NAME");
+ a_utf8_string = get_atom_from_string("UTF8_STRING");
+ a_string = get_atom_from_string("STRING");
+ a_swm_iconic = get_atom_from_string("_SWM_ICONIC");
}
void
void
event_error(xcb_generic_error_t *e)
{
- DNPRINTF(SWM_D_EVENT, "event_error: %s: response_type:%u error_code:%u "
- "sequence:%u resource_id:%u minor_code:%u major_code:%u\n",
- xcb_event_get_error_label(e->error_code), e->response_type,
- e->error_code, e->sequence, e->resource_id, e->minor_code,
- e->major_code
- );
+ 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);
+ /*EVENT(XCB_VISIBILITY_NOTIFY, visibilitynotify);*/
#undef EVENT
}
if (type - xrandr_eventbase == XCB_RANDR_SCREEN_CHANGE_NOTIFY)
{
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;
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 (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "") ||
- !XSupportsLocale())
+ if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, ""))
warnx("no locale support");
- if (!X_HAVE_UTF8_STRING)
- warnx("no UTF-8 support");
-
- if (!(display = XOpenDisplay(0)))
- errx(1, "can not open display");
-
/* handle some signals */
bzero(&sact, sizeof(sact));
sigemptyset(&sact.sa_mask);
sact.sa_flags = SA_NOCLDSTOP;
sigaction(SIGCHLD, &sact, NULL);
- conn = XGetXCBConnection(display);
+ if (!(display = XOpenDisplay(0)))
+ errx(1, "can not open display");
+
+ conn = XGetXCBConnection(display);
if (xcb_connection_has_error(conn))
errx(1, "can not get XCB connection");
+ xcb_prefetch_extension_data(conn, &xcb_randr_id);
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");
- takefocus = get_atom_from_string("WM_TAKE_FOCUS");
- a_wmname = get_atom_from_string("WM_NAME");
- a_netwmname = get_atom_from_string("_NET_WM_NAME");
- a_utf8_string = get_atom_from_string("UTF8_STRING");
- a_string = get_atom_from_string("STRING");
- a_swm_iconic = get_atom_from_string("_SWM_ICONIC");
/* look for local and global conf file */
pwd = getpwuid(getuid());
/* flush all events */
while ((evt = xcb_poll_for_event(conn))) {
- uint8_t type = XCB_EVENT_RESPONSE_TYPE(evt);
- if (type == 0)
+ if (XCB_EVENT_RESPONSE_TYPE(evt) == 0)
event_handle(evt);
free(evt);
}
- if (active_wm())
- errx(1, "other wm running");
+ if (enable_wm() != 0)
+ errx(1, "another window manager is currently running");
xcb_aux_sync(conn);
while (running) {
while ((evt = xcb_poll_for_event(conn))) {
- DNPRINTF(SWM_D_EVENT, "XCB Event: %s (%d)\n",
- xcb_event_get_label(XCB_EVENT_RESPONSE_TYPE(evt)),
- XCB_EVENT_RESPONSE_TYPE(evt));
if (running == 0)
goto done;
event_handle(evt);
for (i = 0; i < num_screens; ++i)
if (screens[i].bar_gc != 0)
xcb_free_gc(conn, screens[i].bar_gc);
+#if 0
XFreeFontSet(display, bar_fs);
-
+#endif
xcb_key_symbols_free(syms);
+ xcb_flush(conn);
xcb_disconnect(conn);
return (0);