* Copyright (c) 2009 Pierre-Yves Ritschard <pyr@spootnik.org>
* Copyright (c) 2010 Tuukka Kataja <stuge@xor.fi>
* Copyright (c) 2011 Jason L. Wright <jason@thought.net>
- * Copyright (c) 2011-2012 Reginald Kennedy <rk@rejii.com>
+ * Copyright (c) 2011-2013 Reginald Kennedy <rk@rejii.com>
* Copyright (c) 2011-2012 Lawrence Teo <lteo@lteo.net>
* Copyright (c) 2011-2012 Tiago Cunha <tcunha@gmx.com>
- * Copyright (c) 2012 David Hill <dhill@mindcry.org>
+ * Copyright (c) 2012-2013 David Hill <dhill@mindcry.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include <locale.h>
#include <paths.h>
#include <pwd.h>
+#include <regex.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <util.h>
#include <X11/cursorfont.h>
#include <X11/extensions/Xrandr.h>
+#include <X11/Xcursor/Xcursor.h>
#include <X11/Xft/Xft.h>
#include <X11/Xlib-xcb.h>
#include <xcb/xcb_atom.h>
#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_INPUT XCB_WM_HINT_INPUT
#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_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_wm_hints_get_urgency xcb_wm_hints_get_urgency
#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 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 SWM_D_BAR 0x4000
#define SWM_D_INIT 0x8000
-u_int32_t swm_debug = 0
+uint32_t swm_debug = 0
| SWM_D_MISC
| SWM_D_EVENT
| SWM_D_WS
#define DNPRINTF(n,x...)
#endif
+#define SWM_EWMH_ACTION_COUNT_MAX (8)
+#define EWMH_F_FULLSCREEN (0x001)
+#define EWMH_F_ABOVE (0x002)
+#define EWMH_F_HIDDEN (0x004)
+#define EWMH_F_MAXIMIZED_VERT (0x008)
+#define EWMH_F_MAXIMIZED_HORZ (0x010)
+#define EWMH_F_SKIP_PAGER (0x020)
+#define EWMH_F_SKIP_TASKBAR (0x040)
+#define SWM_F_MANUAL (0x080)
+
+#define EWMH_F_MAXIMIZED (EWMH_F_MAXIMIZED_VERT | EWMH_F_MAXIMIZED_HORZ)
+
/* convert 8-bit to 16-bit */
-#define RGB_8_TO_16(col) ((col) << 8) + (col)
+#define RGB_8_TO_16(col) (((col) << 8) + (col))
-#define PIXEL_TO_XRENDERCOLOR(px, xrc) \
+#define PIXEL_TO_XRENDERCOLOR(px, xrc) \
xrc.red = RGB_8_TO_16((px) >> 16 & 0xff); \
xrc.green = RGB_8_TO_16((px) >> 8 & 0xff); \
xrc.blue = RGB_8_TO_16((px) & 0xff); \
#define SWM_FUNCNAME_LEN (32)
#define SWM_KEYS_LEN (255)
#define SWM_QUIRK_LEN (64)
-#define X(r) (r)->g.x
-#define Y(r) (r)->g.y
-#define WIDTH(r) (r)->g.w
-#define HEIGHT(r) (r)->g.h
+#define X(r) ((r)->g.x)
+#define Y(r) ((r)->g.y)
+#define WIDTH(r) ((r)->g.w)
+#define HEIGHT(r) ((r)->g.h)
#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.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.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.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 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.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.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)
-#define WINID(w) ((w) ? (w)->id : 0)
+#define WINID(w) ((w) ? (w)->id : XCB_WINDOW_NONE)
+#define WS_FOCUSED(ws) ((ws)->r && (ws)->r->s->r_focus == (ws)->r)
#define YESNO(x) ((x) ? "yes" : "no")
+#define ICONIC(w) ((w)->ewmh_flags & EWMH_F_HIDDEN)
+#define ABOVE(w) ((w)->ewmh_flags & EWMH_F_ABOVE)
+#define FULLSCREEN(w) ((w)->ewmh_flags & EWMH_F_FULLSCREEN)
+#define MAXIMIZED_VERT(w) ((w)->ewmh_flags & EWMH_F_MAXIMIZED_VERT)
+#define MAXIMIZED_HORZ(w) ((w)->ewmh_flags & EWMH_F_MAXIMIZED_HORZ)
+#define MAXIMIZED(w) (MAXIMIZED_VERT(w) || MAXIMIZED_HORZ(w))
+#define MANUAL(w) ((w)->ewmh_flags & SWM_F_MANUAL)
+#define TRANS(w) ((w)->transient != XCB_WINDOW_NONE)
+#define FLOATING(w) (ABOVE(w) || TRANS(w) || FULLSCREEN(w) || \
+ MAXIMIZED(w))
+
+/* Constrain Window flags */
+#define SWM_CW_RESIZABLE (0x01)
+#define SWM_CW_SOFTBOUNDARY (0x02)
+#define SWM_CW_HARDBOUNDARY (0x04)
+#define SWM_CW_RIGHT (0x10)
+#define SWM_CW_LEFT (0x20)
+#define SWM_CW_BOTTOM (0x40)
+#define SWM_CW_TOP (0x80)
+#define SWM_CW_ALLSIDES (0xf0)
#define SWM_FOCUS_DEFAULT (0)
#define SWM_FOCUS_FOLLOW (1)
#define SWM_FOCUS_MANUAL (2)
+#define SWM_CK_NONE (0)
+#define SWM_CK_ALL (0xf)
+#define SWM_CK_FOCUS (0x1)
+#define SWM_CK_POINTER (0x2)
+#define SWM_CK_FALLBACK (0x4)
+#define SWM_CK_REGION (0x8)
+
+#define SWM_G_ALL (0xf)
+#define SWM_G_SIZE (0x1)
+#define SWM_G_POS (0x2)
+
#define SWM_CONF_DEFAULT (0)
#define SWM_CONF_KEYMAPPING (1)
xcb_atom_t a_state;
xcb_atom_t a_prot;
xcb_atom_t a_delete;
+xcb_atom_t a_net_wm_check;
+xcb_atom_t a_net_supported;
xcb_atom_t a_takefocus;
-xcb_atom_t a_wmname;
-xcb_atom_t a_netwmname;
xcb_atom_t a_utf8_string;
-xcb_atom_t a_string;
-xcb_atom_t a_swm_iconic;
xcb_atom_t a_swm_ws;
volatile sig_atomic_t running = 1;
volatile sig_atomic_t restart_wm = 0;
+xcb_timestamp_t last_event_time = 0;
int outputs = 0;
-/*int last_focus_event = FocusOut;*/
int other_wm;
-int ss_enabled = 0;
int xrandr_support;
int xrandr_eventbase;
unsigned int numlockmask = 0;
xcb_connection_t *conn;
xcb_key_symbols_t *syms;
+int boundary_width = 50;
int cycle_empty = 0;
int cycle_visible = 0;
int term_width = 0;
#define SWM_STACK_TOP (0)
#define SWM_STACK_BOTTOM (1)
-#define SWM_STACK_ABOVE (2)
-#define SWM_STACK_BELOW (3)
+#define SWM_STACK_ABOVE (2)
+#define SWM_STACK_BELOW (3)
/* dialog windows */
double dialog_ratio = 0.6;
#define SWM_BAR_JUSTIFY_CENTER (1)
#define SWM_BAR_JUSTIFY_RIGHT (2)
#define SWM_BAR_OFFSET (4)
-#define SWM_BAR_FONTS "-*-terminus-medium-*-*-*-12-*-*-*-*-*-*-*," \
- "-*-profont-*-*-*-*-12-*-*-*-*-*-*-*," \
- "-*-times-medium-r-*-*-12-*-*-*-*-*-*-*," \
- "-misc-fixed-medium-r-*-*-12-*-*-*-*-*-*-*," \
+#define SWM_BAR_FONTS "-*-terminus-medium-*-*-*-12-*-*-*-*-*-*-*," \
+ "-*-profont-*-*-*-*-12-*-*-*-*-*-*-*," \
+ "-*-times-medium-r-*-*-12-*-*-*-*-*-*-*," \
+ "-misc-fixed-medium-r-*-*-12-*-*-*-*-*-*-*," \
"-*-*-*-r-*-*-*-*-*-*-*-*-*-*"
#ifdef X_HAVE_UTF8_STRING
char *bar_argv[] = { NULL, NULL };
int bar_pipe[2];
-unsigned char bar_ext[SWM_BAR_MAX];
+char bar_ext[SWM_BAR_MAX];
+char bar_ext_buf[SWM_BAR_MAX];
char bar_vertext[SWM_BAR_MAX];
int bar_version = 0;
-sig_atomic_t bar_alarm = 0;
-int bar_delay = 30;
int bar_enabled = 1;
int bar_border_width = 1;
int bar_at_bottom = 0;
-int bar_extra = 1;
-int bar_extra_running = 0;
+int bar_extra = 0;
int bar_verbose = 1;
int bar_height = 0;
int bar_justify = SWM_BAR_JUSTIFY_LEFT;
char *bar_format = NULL;
int stack_enabled = 1;
int clock_enabled = 1;
+int iconic_enabled = 0;
int urgent_enabled = 0;
char *clock_format = NULL;
-int title_name_enabled = 0;
-int title_class_enabled = 0;
+int window_class_enabled = 0;
+int window_instance_enabled = 0;
int window_name_enabled = 0;
int focus_mode = SWM_FOCUS_DEFAULT;
int focus_close = SWM_STACK_BELOW;
int spawn_position = SWM_STACK_TOP;
int disable_border = 0;
int border_width = 1;
+int region_padding = 0;
+int tile_gap = 0;
+int java_workaround = 1;
int verbose_layout = 0;
time_t time_started;
pid_t bar_pid;
char *bar_fonts;
XftColor bar_font_color;
struct passwd *pwd;
+char *startup_exception;
+unsigned int nr_exceptions = 0;
/* layout manager data */
struct swm_geometry {
/* virtual "screens" */
struct swm_region {
TAILQ_ENTRY(swm_region) entry;
+ xcb_window_t id;
struct swm_geometry g;
struct workspace *ws; /* current workspace on this region */
struct workspace *ws_prior; /* prior workspace on this region */
struct ws_win {
TAILQ_ENTRY(ws_win) entry;
+ TAILQ_ENTRY(ws_win) stack_entry;
xcb_window_t id;
xcb_window_t transient;
struct ws_win *focus_child; /* focus on child transient */
struct swm_geometry g; /* current geometry */
struct swm_geometry g_float; /* region coordinates */
int g_floatvalid; /* g_float geometry validity */
- int floatmaxed; /* whether maxed by max_stack */
- int floating;
- int manual;
- int32_t iconic;
+ int mapped;
int bordered;
- unsigned int ewmh_flags;
+ uint32_t ewmh_flags;
int font_size_boundary[SWM_MAX_FONT_STEPS];
int font_steps;
int last_inc;
unsigned long quirks;
struct workspace *ws; /* always valid */
struct swm_screen *s; /* always valid, never changes */
- 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);
+TAILQ_HEAD(ws_win_stack, ws_win);
/* pid goo */
struct pid_e {
struct layout {
void (*l_stack)(struct workspace *, struct swm_geometry *);
void (*l_config)(struct workspace *, int);
- u_int32_t flags;
+ uint32_t flags;
#define SWM_L_FOCUSPREV (1<<0)
#define SWM_L_MAPONFOCUS (1<<1)
void (*l_string)(struct workspace *);
int idx; /* workspace index */
char *name; /* workspace name */
int always_raise; /* raise windows on focus */
+ int bar_enabled; /* bar visibility */
struct layout *cur_layout; /* current layout handlers */
struct ws_win *focus; /* may be NULL */
struct ws_win *focus_prev; /* may be NULL */
+ struct ws_win *focus_pending; /* may be NULL */
struct swm_region *r; /* may be NULL */
struct swm_region *old_r; /* may be NULL */
struct ws_win_list winlist; /* list of windows in ws */
struct ws_win_list unmanagedlist; /* list of dead windows in ws */
+ struct ws_win_stack stack; /* stacking order */
+ int state; /* mapping state */
char stacker[10]; /* display stacker and layout */
/* stacker state */
};
enum {
+ SWM_WS_STATE_HIDDEN,
+ SWM_WS_STATE_MAPPING,
+ SWM_WS_STATE_MAPPED,
+};
+
+enum {
SWM_S_COLOR_BAR,
SWM_S_COLOR_BAR_BORDER,
+ SWM_S_COLOR_BAR_BORDER_UNFOCUS,
SWM_S_COLOR_BAR_FONT,
SWM_S_COLOR_FOCUS,
SWM_S_COLOR_UNFOCUS,
struct swm_region_list orl; /* list of old regions */
xcb_window_t root;
struct workspace ws[SWM_WS_MAX];
+ struct swm_region *r_focus;
/* colors */
struct {
#define SWM_ARG_ID_FOCUSNEXT (0)
#define SWM_ARG_ID_FOCUSPREV (1)
#define SWM_ARG_ID_FOCUSMAIN (2)
-#define SWM_ARG_ID_FOCUSCUR (4)
+#define SWM_ARG_ID_FOCUSURGENT (3)
#define SWM_ARG_ID_SWAPNEXT (10)
#define SWM_ARG_ID_SWAPPREV (11)
#define SWM_ARG_ID_SWAPMAIN (12)
#define SWM_ARG_ID_STACKINIT (31)
#define SWM_ARG_ID_CYCLEWS_UP (40)
#define SWM_ARG_ID_CYCLEWS_DOWN (41)
-#define SWM_ARG_ID_CYCLESC_UP (42)
-#define SWM_ARG_ID_CYCLESC_DOWN (43)
+#define SWM_ARG_ID_CYCLERG_UP (42)
+#define SWM_ARG_ID_CYCLERG_DOWN (43)
#define SWM_ARG_ID_CYCLEWS_UP_ALL (44)
#define SWM_ARG_ID_CYCLEWS_DOWN_ALL (45)
+#define SWM_ARG_ID_CYCLEWS_MOVE_UP (46)
+#define SWM_ARG_ID_CYCLEWS_MOVE_DOWN (47)
#define SWM_ARG_ID_STACKINC (50)
#define SWM_ARG_ID_STACKDEC (51)
#define SWM_ARG_ID_SS_ALL (60)
#define SWM_ARG_ID_MOVEDOWN (101)
#define SWM_ARG_ID_MOVELEFT (102)
#define SWM_ARG_ID_MOVERIGHT (103)
+#define SWM_ARG_ID_RAISE (105)
+#define SWM_ARG_ID_LOWER (106)
+#define SWM_ARG_ID_BAR_TOGGLE (110)
+#define SWM_ARG_ID_BAR_TOGGLE_WS (111)
char **argv;
};
/* quirks */
struct quirk {
TAILQ_ENTRY(quirk) entry;
- char *class;
- char *name;
+ char *class; /* WM_CLASS:class */
+ char *instance; /* WM_CLASS:instance */
+ char *name; /* WM_NAME */
+ regex_t regex_class;
+ regex_t regex_instance;
+ regex_t regex_name;
unsigned long quirk;
#define SWM_Q_FLOAT (1<<0) /* float this window */
#define SWM_Q_TRANSSZ (1<<1) /* transiend window size too small */
#define SWM_Q_XTERM_FONTADJ (1<<3) /* adjust xterm fonts when resizing */
#define SWM_Q_FULLSCREEN (1<<4) /* remove border */
#define SWM_Q_FOCUSPREV (1<<5) /* focus on caller */
+#define SWM_Q_NOFOCUSONMAP (1<<6) /* Don't focus on window when mapped. */
+#define SWM_Q_FOCUSONMAP_SINGLE (1<<7) /* Only focus if single win of type. */
};
TAILQ_HEAD(quirk_list, quirk);
struct quirk_list quirks = TAILQ_HEAD_INITIALIZER(quirks);
*/
enum {
_NET_ACTIVE_WINDOW,
+ _NET_CLIENT_LIST,
_NET_CLOSE_WINDOW,
+ _NET_CURRENT_DESKTOP,
+ _NET_DESKTOP_GEOMETRY,
+ _NET_DESKTOP_NAMES,
+ _NET_DESKTOP_VIEWPORT,
_NET_MOVERESIZE_WINDOW,
+ _NET_NUMBER_OF_DESKTOPS,
+ _NET_RESTACK_WINDOW,
_NET_WM_ACTION_ABOVE,
_NET_WM_ACTION_CLOSE,
_NET_WM_ACTION_FULLSCREEN,
_NET_WM_ACTION_MOVE,
_NET_WM_ACTION_RESIZE,
_NET_WM_ALLOWED_ACTIONS,
+ _NET_WM_DESKTOP,
+ _NET_WM_FULL_PLACEMENT,
_NET_WM_NAME,
_NET_WM_STATE,
_NET_WM_STATE_ABOVE,
_NET_WM_STATE_FULLSCREEN,
_NET_WM_STATE_HIDDEN,
- _NET_WM_STATE_MAXIMIZED_HORZ,
_NET_WM_STATE_MAXIMIZED_VERT,
+ _NET_WM_STATE_MAXIMIZED_HORZ,
_NET_WM_STATE_SKIP_PAGER,
_NET_WM_STATE_SKIP_TASKBAR,
_NET_WM_WINDOW_TYPE,
} ewmh[SWM_EWMH_HINT_MAX] = {
/* must be in same order as in the enum */
{"_NET_ACTIVE_WINDOW", XCB_ATOM_NONE},
+ {"_NET_CLIENT_LIST", XCB_ATOM_NONE},
{"_NET_CLOSE_WINDOW", XCB_ATOM_NONE},
+ {"_NET_CURRENT_DESKTOP", XCB_ATOM_NONE},
+ {"_NET_DESKTOP_GEOMETRY", XCB_ATOM_NONE},
+ {"_NET_DESKTOP_NAMES", XCB_ATOM_NONE},
+ {"_NET_DESKTOP_VIEWPORT", XCB_ATOM_NONE},
{"_NET_MOVERESIZE_WINDOW", XCB_ATOM_NONE},
+ {"_NET_NUMBER_OF_DESKTOPS", XCB_ATOM_NONE},
+ {"_NET_RESTACK_WINDOW", XCB_ATOM_NONE},
{"_NET_WM_ACTION_ABOVE", XCB_ATOM_NONE},
{"_NET_WM_ACTION_CLOSE", XCB_ATOM_NONE},
{"_NET_WM_ACTION_FULLSCREEN", XCB_ATOM_NONE},
{"_NET_WM_ACTION_MOVE", XCB_ATOM_NONE},
{"_NET_WM_ACTION_RESIZE", XCB_ATOM_NONE},
{"_NET_WM_ALLOWED_ACTIONS", XCB_ATOM_NONE},
+ {"_NET_WM_DESKTOP", XCB_ATOM_NONE},
+ {"_NET_WM_FULL_PLACEMENT", XCB_ATOM_NONE},
{"_NET_WM_NAME", XCB_ATOM_NONE},
{"_NET_WM_STATE", XCB_ATOM_NONE},
{"_NET_WM_STATE_ABOVE", XCB_ATOM_NONE},
{"_NET_WM_STATE_FULLSCREEN", XCB_ATOM_NONE},
{"_NET_WM_STATE_HIDDEN", XCB_ATOM_NONE},
- {"_NET_WM_STATE_MAXIMIZED_HORZ", XCB_ATOM_NONE},
{"_NET_WM_STATE_MAXIMIZED_VERT", XCB_ATOM_NONE},
+ {"_NET_WM_STATE_MAXIMIZED_HORZ", XCB_ATOM_NONE},
{"_NET_WM_STATE_SKIP_PAGER", XCB_ATOM_NONE},
{"_NET_WM_STATE_SKIP_TASKBAR", XCB_ATOM_NONE},
{"_NET_WM_WINDOW_TYPE", XCB_ATOM_NONE},
{"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE},
};
+/* EWMH source type */
+enum {
+ EWMH_SOURCE_TYPE_NONE = 0,
+ EWMH_SOURCE_TYPE_NORMAL = 1,
+ EWMH_SOURCE_TYPE_OTHER = 2,
+};
+
+/* Cursors */
+enum {
+ XC_FLEUR,
+ XC_LEFT_PTR,
+ XC_BOTTOM_LEFT_CORNER,
+ XC_BOTTOM_RIGHT_CORNER,
+ XC_SIZING,
+ XC_TOP_LEFT_CORNER,
+ XC_TOP_RIGHT_CORNER,
+ XC_MAX
+};
+
+struct cursors {
+ char *name; /* Name used by Xcursor .*/
+ uint8_t cf_char; /* cursorfont index. */
+ xcb_cursor_t cid;
+} cursors[XC_MAX] = {
+ {"fleur", XC_fleur, XCB_CURSOR_NONE},
+ {"left_ptr", XC_left_ptr, XCB_CURSOR_NONE},
+ {"bottom_left_corner", XC_bottom_left_corner, XCB_CURSOR_NONE},
+ {"bottom_right_corner", XC_bottom_right_corner, XCB_CURSOR_NONE},
+ {"sizing", XC_sizing, XCB_CURSOR_NONE},
+ {"top_left_corner", XC_top_left_corner, XCB_CURSOR_NONE},
+ {"top_right_corner", XC_top_right_corner, XCB_CURSOR_NONE},
+};
+
+#define SWM_SPAWN_OPTIONAL 0x1
+
+/* spawn */
+struct spawn_prog {
+ TAILQ_ENTRY(spawn_prog) entry;
+ char *name;
+ int argc;
+ char **argv;
+ int flags;
+};
+TAILQ_HEAD(spawn_list, spawn_prog);
+struct spawn_list spawns = TAILQ_HEAD_INITIALIZER(spawns);
+
+/* user/key callable function IDs */
+enum keyfuncid {
+ KF_BAR_TOGGLE,
+ KF_BAR_TOGGLE_WS,
+ KF_BUTTON2,
+ KF_CYCLE_LAYOUT,
+ KF_FLIP_LAYOUT,
+ KF_FLOAT_TOGGLE,
+ KF_FOCUS_MAIN,
+ KF_FOCUS_NEXT,
+ KF_FOCUS_PREV,
+ KF_FOCUS_URGENT,
+ KF_MAXIMIZE_TOGGLE,
+ 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_MVRG_1,
+ KF_MVRG_2,
+ KF_MVRG_3,
+ KF_MVRG_4,
+ KF_MVRG_5,
+ KF_MVRG_6,
+ KF_MVRG_7,
+ KF_MVRG_8,
+ KF_MVRG_9,
+ 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_RG_1,
+ KF_RG_2,
+ KF_RG_3,
+ KF_RG_4,
+ KF_RG_5,
+ KF_RG_6,
+ KF_RG_7,
+ KF_RG_8,
+ KF_RG_9,
+ KF_RG_NEXT,
+ KF_RG_PREV,
+ 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_NEXT_MOVE,
+ KF_WS_PREV,
+ KF_WS_PREV_ALL,
+ KF_WS_PREV_MOVE,
+ KF_WS_PRIOR,
+ KF_DUMPWINS, /* MUST BE LAST */
+ KF_INVALID
+};
+
+struct key {
+ RB_ENTRY(key) entry;
+ unsigned int mod;
+ KeySym keysym;
+ enum keyfuncid funcid;
+ char *spawn_name;
+};
+RB_HEAD(key_tree, key);
+
/* function prototypes */
+void adjust_font(struct ws_win *);
+char *argsep(char **);
+void bar_cleanup(struct swm_region *);
+void bar_extra_setup(void);
+void bar_extra_stop(void);
+int bar_extra_update(void);
+void bar_fmt(const char *, char *, struct swm_region *, size_t);
+void bar_fmt_expand(char *, size_t);
+void bar_draw(void);
+void bar_print(struct swm_region *, const char *);
+void bar_print_legacy(struct swm_region *, const char *);
+void bar_replace(char *, char *, struct swm_region *, size_t);
+void bar_replace_pad(char *, int *, size_t);
+char *bar_replace_seq(char *, char *, struct swm_region *, size_t *, size_t);
+void bar_setup(struct swm_region *);
+void bar_toggle(struct swm_region *, union arg *);
+void bar_urgent(char *, size_t);
+void bar_window_class(char *, size_t, struct swm_region *);
+void bar_window_class_instance(char *, size_t, struct swm_region *);
+void bar_window_float(char *, size_t, struct swm_region *);
+void bar_window_instance(char *, size_t, struct swm_region *);
+void bar_window_name(char *, size_t, struct swm_region *);
+void bar_window_state(char *, size_t, struct swm_region *);
+void bar_workspace_name(char *, size_t, struct swm_region *);
void buttonpress(xcb_button_press_event_t *);
void check_conn(void);
+void clear_keys(void);
+int clear_maximized(struct workspace *);
void clientmessage(xcb_client_message_event_t *);
-int conf_load(char *, int);
+void client_msg(struct ws_win *, xcb_atom_t, xcb_timestamp_t);
+int conf_load(const char *, int);
void configurenotify(xcb_configure_notify_event_t *);
void configurerequest(xcb_configure_request_event_t *);
-void constrain_window(struct ws_win *, struct swm_region *, int);
+void config_win(struct ws_win *, xcb_configure_request_event_t *);
+void constrain_window(struct ws_win *, struct swm_geometry *, int *);
+int count_win(struct workspace *, int);
+void cursors_cleanup(void);
+void cursors_load(void);
+void custom_region(const char *);
+void cyclerg(struct swm_region *, union arg *);
+void cyclews(struct swm_region *, union arg *);
+void cycle_layout(struct swm_region *, union arg *);
void destroynotify(xcb_destroy_notify_event_t *);
+void dumpwins(struct swm_region *, union arg *);
+int enable_wm(void);
void enternotify(xcb_enter_notify_event_t *);
void event_drain(uint8_t);
void event_error(xcb_generic_error_t *);
void event_handle(xcb_generic_event_t *);
-char *expand_tilde(char *);
+void ewmh_apply_flags(struct ws_win *, uint32_t);
+void ewmh_autoquirk(struct ws_win *);
+void ewmh_get_desktop_names(void);
+void ewmh_get_wm_state(struct ws_win *);
+void ewmh_update_actions(struct ws_win *);
+void ewmh_update_client_list(void);
+void ewmh_update_current_desktop(void);
+void ewmh_update_desktop_names(void);
+void ewmh_update_desktops(void);
+void ewmh_change_wm_state(struct ws_win *, xcb_atom_t, long);
+void ewmh_update_wm_state(struct ws_win *);
+char *expand_tilde(const char *);
void expose(xcb_expose_event_t *);
+void fake_keypress(struct ws_win *, xcb_keysym_t, uint16_t);
+struct pid_e *find_pid(pid_t);
+struct ws_win *find_unmanaged_window(xcb_window_t);
struct ws_win *find_window(xcb_window_t);
-int floating_toggle_win(struct ws_win *);
+void floating_toggle(struct swm_region *, union arg *);
void focus(struct swm_region *, union arg *);
-void focus_flush(void);
-struct ws_win *get_focus_magic(struct ws_win *);
-struct ws_win *get_focus_prev(struct ws_win *);
-void focus_win(struct ws_win *);
#ifdef SWM_DEBUG
void focusin(xcb_focus_in_event_t *);
+void focusout(xcb_focus_out_event_t *);
#endif
+void focus_flush(void);
+void focus_region(struct swm_region *);
+void focusrg(struct swm_region *, union arg *);
+void focus_win(struct ws_win *);
+void fontset_init(void);
+void free_window(struct ws_win *);
xcb_atom_t get_atom_from_string(const char *);
#ifdef SWM_DEBUG
char *get_atom_name(xcb_atom_t);
+#endif
+struct ws_win *get_focus_magic(struct ws_win *);
+struct ws_win *get_focus_prev(struct ws_win *);
+#ifdef SWM_DEBUG
char *get_notify_detail_label(uint8_t);
char *get_notify_mode_label(uint8_t);
#endif
+struct ws_win *get_pointer_win(xcb_window_t);
+struct ws_win *get_region_focus(struct swm_region *);
+int get_region_index(struct swm_region *);
xcb_screen_t *get_screen(int);
+int get_screen_count(void);
+#ifdef SWM_DEBUG
+char *get_stack_mode_name(uint8_t);
+#endif
+int32_t get_swm_ws(xcb_window_t);
char *get_win_name(xcb_window_t);
-uint32_t getstate(xcb_window_t);
+uint8_t get_win_state(xcb_window_t);
+void get_wm_protocols(struct ws_win *);
+int get_ws_idx(xcb_window_t);
void grabbuttons(struct ws_win *);
+void grabkeys(void);
+void grab_windows(void);
+void iconify(struct swm_region *, union arg *);
+int isxlfd(char *);
void keypress(xcb_key_press_event_t *);
+int key_cmp(struct key *, struct key *);
+void key_insert(unsigned int, KeySym, enum keyfuncid, const char *);
+struct key *key_lookup(unsigned int, KeySym);
+void key_remove(struct key *);
+void key_replace(struct key *, unsigned int, KeySym, enum keyfuncid,
+ const char *);
+void kill_bar_extra_atexit(void);
+void kill_refs(struct ws_win *);
#ifdef SWM_DEBUG
void leavenotify(xcb_leave_notify_event_t *);
#endif
-void load_float_geom(struct ws_win *, struct swm_region *);
-void map_window_raised(xcb_window_t);
+void load_float_geom(struct ws_win *);
+struct ws_win *manage_window(xcb_window_t, int);
+void map_window(struct ws_win *);
void mapnotify(xcb_map_notify_event_t *);
void mappingnotify(xcb_mapping_notify_event_t *);
void maprequest(xcb_map_request_event_t *);
+void maximize_toggle(struct swm_region *, union arg *);
+void motionnotify(xcb_motion_notify_event_t *);
+void move(struct ws_win *, union arg *);
+void move_step(struct swm_region *, union arg *);
+uint32_t name_to_pixel(int, const char *);
+void name_workspace(struct swm_region *, union arg *);
void new_region(struct swm_screen *, int, int, int, int);
+int parsekeys(const char *, unsigned int, unsigned int *, KeySym *);
+int parsequirks(const char *, unsigned long *);
int parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *);
+void pressbutton(struct swm_region *, union arg *);
+void priorws(struct swm_region *, union arg *);
+#ifdef SWM_DEBUG
+void print_win_geom(xcb_window_t);
+#endif
void propertynotify(xcb_property_notify_event_t *);
-void spawn_select(struct swm_region *, union arg *, char *, int *);
+void quirk_free(struct quirk *);
+void quirk_insert(const char *, const char *, const char *,unsigned long);
+void quirk_remove(struct quirk *);
+void quirk_replace(struct quirk *, const char *, const char *, const char *,
+ unsigned long);
+void quit(struct swm_region *, union arg *);
+void raise_toggle(struct swm_region *, union arg *);
+void raise_window(struct ws_win *);
+void region_containment(struct ws_win *, struct swm_region *, int);
+struct swm_region *region_under(struct swm_screen *, int, int);
+void regionize(struct ws_win *, int, int);
+void resize(struct ws_win *, union arg *);
+void resize_step(struct swm_region *, union arg *);
+void restart(struct swm_region *, union arg *);
+struct swm_region *root_to_region(xcb_window_t, int);
void screenchange(xcb_randr_screen_change_notify_event_t *);
+void scan_xrandr(int);
+void search_do_resp(void);
+void search_resp_name_workspace(const char *, size_t);
+void search_resp_search_window(const char *);
+void search_resp_search_workspace(const char *);
+void search_resp_uniconify(const char *, size_t);
+void search_win(struct swm_region *, union arg *);
+void search_win_cleanup(void);
+void search_workspace(struct swm_region *, union arg *);
+void send_to_rg(struct swm_region *, union arg *);
+void send_to_ws(struct swm_region *, union arg *);
+void set_region(struct swm_region *);
+int setautorun(const char *, const char *, int);
+int setconfbinding(const char *, const char *, int);
+int setconfcolor(const char *, const char *, int);
+int setconfmodkey(const char *, const char *, int);
+int setconfquirk(const char *, const char *, int);
+int setconfregion(const char *, const char *, int);
+int setconfspawn(const char *, const char *, int);
+int setconfvalue(const char *, const char *, int);
+void setkeybinding(unsigned int, KeySym, enum keyfuncid, const char *);
+int setkeymapping(const char *, const char *, int);
+int setlayout(const char *, const char *, int);
+void setquirk(const char *, const char *, const char *,unsigned long);
+void setscreencolor(const char *, int, int);
+void setspawn(const char *, const char *, int);
+void setup_ewmh(void);
+void setup_globals(void);
+void setup_keys(void);
+void setup_quirks(void);
+void setup_screens(void);
+void setup_spawn(void);
+void set_child_transient(struct ws_win *, xcb_window_t *);
+void set_win_state(struct ws_win *, uint8_t);
void shutdown_cleanup(void);
-void store_float_geom(struct ws_win *, struct swm_region *);
+void sighdlr(int);
+void socket_setnonblock(int);
+void sort_windows(struct ws_win_list *);
+void spawn(int, union arg *, int);
+void spawn_custom(struct swm_region *, union arg *, const char *);
+int spawn_expand(struct swm_region *, union arg *, const char *, char ***);
+void spawn_insert(const char *, const char *, int);
+struct spawn_prog *spawn_find(const char *);
+void spawn_remove(struct spawn_prog *);
+void spawn_replace(struct spawn_prog *, const char *, const char *, int);
+void spawn_select(struct swm_region *, union arg *, const char *, int *);
+void stack_config(struct swm_region *, union arg *);
+void stack_master(struct workspace *, struct swm_geometry *, int, int);
+void store_float_geom(struct ws_win *);
+char *strdupsafe(const char *);
+void swapwin(struct swm_region *, union arg *);
+void switchws(struct swm_region *, union arg *);
+void teardown_ewmh(void);
+void unescape_selector(char *);
+void unfocus_win(struct ws_win *);
+void uniconify(struct swm_region *, union arg *);
void unmanage_window(struct ws_win *);
void unmapnotify(xcb_unmap_notify_event_t *);
+void unmap_all(void);
+void unmap_window(struct ws_win *);
+void updatenumlockmask(void);
+void update_floater(struct ws_win *);
+void update_modkey(unsigned int);
+void update_win_stacking(struct ws_win *);
void update_window(struct ws_win *);
-/*void visibilitynotify(xcb_visibility_notify_event_t *);*/
+void update_wm_state(struct ws_win *win);
+void validate_spawns(void);
+int validate_win(struct ws_win *);
+int validate_ws(struct workspace *);
+void version(struct swm_region *, union arg *);
+void win_to_ws(struct ws_win *, int, int);
+pid_t window_get_pid(xcb_window_t);
+void wkill(struct swm_region *, union arg *);
+void update_ws_stack(struct workspace *);
+void xft_init(struct swm_region *);
+void _add_startup_exception(const char *, va_list);
+void add_startup_exception(const char *, ...);
+
+RB_PROTOTYPE(key_tree, key, entry, key_cmp);
+RB_GENERATE(key_tree, key, entry, key_cmp);
+struct key_tree keys;
+
+void
+cursors_load(void)
+{
+ xcb_font_t cf = XCB_NONE;
+ int i;
+
+ for (i = 0; i < LENGTH(cursors); ++i) {
+ /* try to load Xcursor first. */
+ cursors[i].cid = XcursorLibraryLoadCursor(display,
+ cursors[i].name);
+
+ /* fallback to cursorfont. */
+ if (cursors[i].cid == XCB_CURSOR_NONE) {
+ if (cf == XCB_NONE) {
+ cf = xcb_generate_id(conn);
+ xcb_open_font(conn, cf, strlen("cursor"),
+ "cursor");
+ }
+
+ cursors[i].cid = xcb_generate_id(conn);
+ xcb_create_glyph_cursor(conn, cursors[i].cid, cf, cf,
+ cursors[i].cf_char, cursors[i].cf_char + 1, 0, 0, 0,
+ 0xffff, 0xffff, 0xffff);
+
+ }
+ }
+
+ if (cf != XCB_NONE)
+ xcb_close_font(conn, cf);
+}
+
+void
+cursors_cleanup(void)
+{
+ int i;
+ for (i = 0; i < LENGTH(cursors); ++i)
+ xcb_free_cursor(conn, cursors[i].cid);
+}
char *
-expand_tilde(char *s)
+expand_tilde(const char *s)
{
struct passwd *ppwd;
- int i, max;
+ int i;
+ long max;
char *user;
const char *sc = s;
char *result;
s = &s[i];
ppwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
+ free(user);
+
if (ppwd == NULL)
result = strdup(sc);
else
return (NULL);
}
+int
+get_screen_count(void)
+{
+ const xcb_setup_t *r;
+
+ if ((r = xcb_get_setup(conn)) == NULL) {
+ DNPRINTF(SWM_D_MISC, "get_screen_count: xcb_get_setup\n");
+ check_conn();
+ }
+
+ return xcb_setup_roots_length(r);
+}
+
+int
+get_region_index(struct swm_region *r)
+{
+ struct swm_region *rr;
+ int ridx = 0;
+
+ if (r == NULL)
+ return -1;
+
+ TAILQ_FOREACH(rr, &r->s->rl, entry) {
+ if (rr == r)
+ break;
+ ++ridx;
+ }
+
+ if (rr == NULL)
+ return -1;
+
+ return ridx;
+}
+
void
focus_flush(void)
{
xcb_flush(conn);
}
-void
-map_window_raised(xcb_window_t win)
-{
- uint32_t val = XCB_STACK_MODE_ABOVE;
-
- xcb_configure_window(conn, win,
- XCB_CONFIG_WINDOW_STACK_MODE, &val);
-
- xcb_map_window(conn, win);
-}
-
xcb_atom_t
get_atom_from_string(const char *str)
{
}
void
-update_iconic(struct ws_win *win, int newv)
-{
- int32_t v = newv;
-
- win->iconic = newv;
-
- if (newv)
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
- a_swm_iconic, XCB_ATOM_INTEGER, 32, 1, &v);
- else
- xcb_delete_property(conn, win->id, a_swm_iconic);
-}
-
-int32_t
-get_iconic(struct ws_win *win)
-{
- int32_t v = 0;
- xcb_get_property_reply_t *pr = NULL;
-
+get_wm_protocols(struct ws_win *win) {
+ int i;
+ xcb_icccm_get_wm_protocols_reply_t wpr;
- pr = xcb_get_property_reply(conn,
- xcb_get_property(conn, 0, win->id, a_swm_iconic,
- XCB_ATOM_INTEGER, 0, 1), NULL);
- if (!pr)
- goto out;
- if (pr->type != XCB_ATOM_INTEGER || pr->format != 32)
- goto out;
- v = *((int32_t *)xcb_get_property_value(pr));
-out:
- if (pr)
- free(pr);
- return (v);
+ if (xcb_icccm_get_wm_protocols_reply(conn,
+ xcb_icccm_get_wm_protocols(conn, win->id, a_prot),
+ &wpr, NULL)) {
+ for (i = 0; i < (int)wpr.atoms_len; i++) {
+ if (wpr.atoms[i] == a_takefocus)
+ win->take_focus = 1;
+ if (wpr.atoms[i] == a_delete)
+ win->can_delete = 1;
+ }
+ xcb_icccm_get_wm_protocols_reply_wipe(&wpr);
+ }
}
void
setup_ewmh(void)
{
- xcb_atom_t sup_list;
+ xcb_window_t root, win;
int i, j, num_screens;
- sup_list = get_atom_from_string("_NET_SUPPORTED");
-
for (i = 0; i < LENGTH(ewmh); i++)
ewmh[i].atom = get_atom_from_string(ewmh[i].name);
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++) {
- /* Support check window will be created by workaround(). */
+ root = screens[i].root;
+
+ /* Set up _NET_SUPPORTING_WM_CHECK. */
+ win = xcb_generate_id(conn);
+ xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, root,
+ 0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT,
+ XCB_COPY_FROM_PARENT, 0, NULL);
+
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root,
+ a_net_wm_check, XCB_ATOM_WINDOW, 32, 1, &win);
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
+ a_net_wm_check, XCB_ATOM_WINDOW, 32, 1, &win);
+
+ /*
+ * Impersonate LG3D non-reparenting WM, written by Sun, to
+ * workaround a Java GUI rendering issue.
+ */
+ if (java_workaround)
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
+ ewmh[_NET_WM_NAME].atom, a_utf8_string,
+ 8, strlen("LG3D"), "LG3D");
+ else
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
+ ewmh[_NET_WM_NAME].atom, a_utf8_string,
+ 8, strlen("spectrwm"), "spectrwm");
/* Report supported atoms */
- xcb_delete_property(conn, screens[i].root, sup_list);
+ xcb_delete_property(conn, root, a_net_supported);
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,
+ xcb_change_property(conn, XCB_PROP_MODE_APPEND, root,
+ a_net_supported, XCB_ATOM_ATOM, 32, 1,
&ewmh[j].atom);
+
}
+
+ ewmh_update_desktops();
+ ewmh_get_desktop_names();
}
void
teardown_ewmh(void)
{
int i, num_screens;
- xcb_atom_t sup_check, sup_list;
xcb_window_t id;
xcb_get_property_cookie_t pc;
xcb_get_property_reply_t *pr;
- sup_check = get_atom_from_string("_NET_SUPPORTING_WM_CHECK");
- sup_list = get_atom_from_string("_NET_SUPPORTED");
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++) {
/* Get the support check window and destroy it */
- pc = xcb_get_property(conn, 0, screens[i].root, sup_check,
+ pc = xcb_get_property(conn, 0, screens[i].root, a_net_wm_check,
XCB_ATOM_WINDOW, 0, 1);
pr = xcb_get_property_reply(conn, pc, NULL);
- if (!pr)
+ if (pr == NULL)
continue;
- if (pr->format == sup_check) {
+ if (pr->format == a_net_wm_check) {
id = *((xcb_window_t *)xcb_get_property_value(pr));
xcb_destroy_window(conn, id);
- xcb_delete_property(conn, screens[i].root, sup_check);
- xcb_delete_property(conn, screens[i].root, sup_list);
+ xcb_delete_property(conn, screens[i].root,
+ a_net_wm_check);
+ xcb_delete_property(conn, screens[i].root,
+ a_net_supported);
}
free(pr);
}
void
ewmh_autoquirk(struct ws_win *win)
{
- uint32_t i, n;
- xcb_atom_t *type;
- xcb_get_property_cookie_t c;
xcb_get_property_reply_t *r;
+ xcb_get_property_cookie_t c;
+ xcb_atom_t *type;
+ int i, n;
c = xcb_get_property(conn, 0, win->id,
ewmh[_NET_WM_WINDOW_TYPE].atom, XCB_ATOM_ATOM, 0, UINT32_MAX);
r = xcb_get_property_reply(conn, c, NULL);
- if (!r)
+ if (r == NULL)
return;
- n = xcb_get_property_value_length(r);
type = xcb_get_property_value(r);
+ n = xcb_get_property_value_length(r) / sizeof(xcb_atom_t);
for (i = 0; i < n; i++) {
if (type[i] == ewmh[_NET_WM_WINDOW_TYPE_NORMAL].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[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;
}
free(r);
}
-#define SWM_EWMH_ACTION_COUNT_MAX (6)
-#define EWMH_F_FULLSCREEN (1<<0)
-#define EWMH_F_ABOVE (1<<1)
-#define EWMH_F_HIDDEN (1<<2)
-#define EWMH_F_SKIP_PAGER (1<<3)
-#define EWMH_F_SKIP_TASKBAR (1<<4)
-#define SWM_F_MANUAL (1<<5)
-
-int
-ewmh_set_win_fullscreen(struct ws_win *win, int fs)
-{
- if (!win->ws->r)
- return (0);
-
- if (!win->floating)
- return (0);
-
- DNPRINTF(SWM_D_MISC, "ewmh_set_win_fullscreen: window: 0x%x, "
- "fullscreen %s\n", win->id, YESNO(fs));
-
- if (fs) {
- if (!win->g_floatvalid)
- store_float_geom(win, win->ws->r);
-
- win->g = win->ws->r->g;
- win->bordered = 0;
- } else {
- load_float_geom(win, win->ws->r);
- }
-
- return (1);
-}
-
void
ewmh_update_actions(struct ws_win *win)
{
actions[n++] = ewmh[_NET_WM_ACTION_CLOSE].atom;
- if (win->floating) {
+ if (ABOVE(win)) {
actions[n++] = ewmh[_NET_WM_ACTION_MOVE].atom;
actions[n++] = ewmh[_NET_WM_ACTION_RESIZE].atom;
actions[n++] = ewmh[_NET_WM_ACTION_ABOVE].atom;
#define _NET_WM_STATE_TOGGLE 2 /* toggle property */
void
-ewmh_update_win_state(struct ws_win *win, xcb_atom_t state, long action)
+ewmh_change_wm_state(struct ws_win *win, xcb_atom_t state, long action)
{
- unsigned int mask = 0;
- unsigned int changed = 0;
- unsigned int orig_flags;
+ uint32_t flag = 0;
+ uint32_t new_flags;
+#ifdef SWM_DEBUG
+ char *name;
+ name = get_atom_name(state);
+ DNPRINTF(SWM_D_PROP, "ewmh_change_wm_state: win %#x, state: %s, "
+ "action: %ld\n", WINID(win), name, action);
+ free(name);
+#endif
if (win == NULL)
- return;
-
- DNPRINTF(SWM_D_PROP, "ewmh_update_win_state: window: 0x%x, state: %ld, "
- "action: %ld\n", win->id, (unsigned long)state, action);
+ goto out;
if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom)
- mask = EWMH_F_FULLSCREEN;
+ flag = EWMH_F_FULLSCREEN;
else if (state == ewmh[_NET_WM_STATE_ABOVE].atom)
- mask = EWMH_F_ABOVE;
+ flag = EWMH_F_ABOVE;
+ else if (state == ewmh[_NET_WM_STATE_HIDDEN].atom)
+ flag = EWMH_F_HIDDEN;
+ else if (state == ewmh[_NET_WM_STATE_MAXIMIZED_VERT].atom ||
+ state == ewmh[_NET_WM_STATE_MAXIMIZED_HORZ].atom)
+ flag = EWMH_F_MAXIMIZED;
else if (state == ewmh[_SWM_WM_STATE_MANUAL].atom)
- mask = SWM_F_MANUAL;
+ flag = SWM_F_MANUAL;
else if (state == ewmh[_NET_WM_STATE_SKIP_PAGER].atom)
- mask = EWMH_F_SKIP_PAGER;
+ flag = EWMH_F_SKIP_PAGER;
else if (state == ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom)
- mask = EWMH_F_SKIP_TASKBAR;
+ flag = EWMH_F_SKIP_TASKBAR;
+
+ /* Disallow unfloating transients. */
+ if (TRANS(win) && flag == EWMH_F_ABOVE)
+ goto out;
- orig_flags = win->ewmh_flags;
+ new_flags = win->ewmh_flags;
switch (action) {
case _NET_WM_STATE_REMOVE:
- win->ewmh_flags &= ~mask;
+ new_flags &= ~flag;
break;
case _NET_WM_STATE_ADD:
- win->ewmh_flags |= mask;
+ new_flags |= flag;
break;
case _NET_WM_STATE_TOGGLE:
- win->ewmh_flags ^= mask;
+ new_flags ^= flag;
break;
}
- changed = (win->ewmh_flags & mask) ^ (orig_flags & mask) ? 1 : 0;
+ ewmh_apply_flags(win, new_flags);
+
+out:
+ DNPRINTF(SWM_D_PROP, "ewmh_change_wm_state: done.\n");
+}
+
+void
+ewmh_apply_flags(struct ws_win *win, uint32_t pending)
+{
+ struct workspace *ws;
+ uint32_t changed;
+
+ changed = win->ewmh_flags ^ pending;
+ if (changed == 0)
+ return;
+
+ DNPRINTF(SWM_D_PROP, "ewmh_apply_flags: pending: %d\n", pending);
+
+ win->ewmh_flags = pending;
+ ws = win->ws;
+
+ if (changed & EWMH_F_HIDDEN) {
+ if (ICONIC(win)) {
+ if (focus_mode != SWM_FOCUS_FOLLOW)
+ ws->focus_pending = get_focus_prev(win);
+
+ unfocus_win(win);
+ unmap_window(win);
+ } else {
+ /* Reload floating geometry in case region changed. */
+ if (FLOATING(win))
+ load_float_geom(win);
+
+ /* The window is no longer iconic, prepare focus. */
+ if (focus_mode != SWM_FOCUS_FOLLOW)
+ ws->focus_pending = get_focus_magic(win);
+ raise_window(win);
+ }
+ }
+
+ if (changed & EWMH_F_ABOVE) {
+ if (ws->cur_layout != &layouts[SWM_MAX_STACK]) {
+ if (ABOVE(win))
+ load_float_geom(win);
+ else if (!MAXIMIZED(win))
+ store_float_geom(win);
+
+ win->ewmh_flags &= ~EWMH_F_MAXIMIZED;
+ changed &= ~EWMH_F_MAXIMIZED;
+ raise_window(win);
+ } else {
+ /* Revert. */
+ win->ewmh_flags ^= EWMH_F_ABOVE & pending;
+ }
+ }
+
+ if (changed & EWMH_F_MAXIMIZED) {
+ /* VERT and/or HORZ changed. */
+ if (ABOVE(win)) {
+ if (!MAXIMIZED(win))
+ load_float_geom(win);
+ else
+ store_float_geom(win);
+ }
+
+ if (MAXIMIZED(win)) {
+ if (focus_mode != SWM_FOCUS_FOLLOW &&
+ ws->cur_layout != &layouts[SWM_MAX_STACK]) {
+ if (WS_FOCUSED(ws))
+ focus_win(win);
+ else
+ ws->focus_pending = win;
+ }
+ }
+ raise_window(win);
+ }
+
+ if (changed & EWMH_F_FULLSCREEN) {
+ if (FULLSCREEN(win)) {
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ if (WS_FOCUSED(ws))
+ focus_win(win);
+ else
+ ws->focus_pending = win;
+ }
+ } else {
+ load_float_geom(win);
+ }
- if (state == ewmh[_NET_WM_STATE_ABOVE].atom) {
- if (changed && !floating_toggle_win(win))
- win->ewmh_flags = orig_flags; /* revert */
- } else if (state == ewmh[_SWM_WM_STATE_MANUAL].atom) {
- if (changed)
- win->manual = (win->ewmh_flags & SWM_F_MANUAL) != 0;
- } else if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom) {
- if (changed && !ewmh_set_win_fullscreen(win,
- win->ewmh_flags & EWMH_F_FULLSCREEN))
- win->ewmh_flags = orig_flags; /* revert */
+ win->ewmh_flags &= ~EWMH_F_MAXIMIZED;
+ raise_window(win);
}
- xcb_delete_property(conn, win->id, ewmh[_NET_WM_STATE].atom);
+ DNPRINTF(SWM_D_PROP, "ewmh_apply_flags: done.\n");
+}
+
+void
+ewmh_update_wm_state(struct ws_win *win) {
+ xcb_atom_t vals[SWM_EWMH_ACTION_COUNT_MAX];
+ int n = 0;
- 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);
- else 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);
- else 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);
- else 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);
- else 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);
+ if (ICONIC(win))
+ vals[n++] = ewmh[_NET_WM_STATE_HIDDEN].atom;
+ if (FULLSCREEN(win))
+ vals[n++] = ewmh[_NET_WM_STATE_FULLSCREEN].atom;
+ if (MAXIMIZED_VERT(win))
+ vals[n++] = ewmh[_NET_WM_STATE_MAXIMIZED_VERT].atom;
+ if (MAXIMIZED_HORZ(win))
+ vals[n++] = ewmh[_NET_WM_STATE_MAXIMIZED_HORZ].atom;
+ if (win->ewmh_flags & EWMH_F_SKIP_PAGER)
+ vals[n++] = ewmh[_NET_WM_STATE_SKIP_PAGER].atom;
+ if (win->ewmh_flags & EWMH_F_SKIP_TASKBAR)
+ vals[n++] = ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom;
+ if (win->ewmh_flags & EWMH_F_ABOVE)
+ vals[n++] = ewmh[_NET_WM_STATE_ABOVE].atom;
+ if (win->ewmh_flags & SWM_F_MANUAL)
+ vals[n++] = ewmh[_SWM_WM_STATE_MANUAL].atom;
+
+ if (n > 0)
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
+ ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, n, vals);
+ else
+ xcb_delete_property(conn, win->id, ewmh[_NET_WM_STATE].atom);
}
void
-ewmh_get_win_state(struct ws_win *win)
+ewmh_get_wm_state(struct ws_win *win)
{
xcb_atom_t *states;
xcb_get_property_cookie_t c;
return;
win->ewmh_flags = 0;
- if (win->floating)
- win->ewmh_flags |= EWMH_F_ABOVE;
- if (win->manual)
- win->ewmh_flags |= SWM_F_MANUAL;
c = xcb_get_property(conn, 0, win->id, ewmh[_NET_WM_STATE].atom,
XCB_ATOM_ATOM, 0, UINT32_MAX);
r = xcb_get_property_reply(conn, c, NULL);
- if (!r)
+ if (r == NULL)
return;
states = xcb_get_property_value(r);
- n = xcb_get_property_value_length(r);
+ n = xcb_get_property_value_length(r) / sizeof(xcb_atom_t);
for (i = 0; i < n; i++)
- ewmh_update_win_state(win, states[i], _NET_WM_STATE_ADD);
+ ewmh_change_wm_state(win, states[i], _NET_WM_STATE_ADD);
free(r);
}
void
dumpwins(struct swm_region *r, union arg *args)
{
- struct ws_win *win;
+ struct ws_win *w;
uint32_t state;
xcb_get_window_attributes_cookie_t c;
xcb_get_window_attributes_reply_t *wa;
(void)args;
if (r->ws == NULL) {
- warnx("dumpwins: invalid workspace");
+ DPRINTF("dumpwins: invalid workspace\n");
return;
}
- warnx("=== managed window list ws %02d ===", r->ws->idx);
- TAILQ_FOREACH(win, &r->ws->winlist, entry) {
- state = getstate(win->id);
- c = xcb_get_window_attributes(conn, win->id);
+ DPRINTF("=== managed window list ws %02d ===\n", r->ws->idx);
+ TAILQ_FOREACH(w, &r->ws->winlist, entry) {
+ state = get_win_state(w->id);
+ c = xcb_get_window_attributes(conn, w->id);
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);
+ DPRINTF("win %#x, map_state: %d, state: %u, "
+ "transient: %#x\n", w->id, wa->map_state,
+ state, w->transient);
free(wa);
} else
- warnx("window: 0x%x, failed xcb_get_window_attributes",
- win->id);
+ DPRINTF("win %#x, failed xcb_get_window_attributes\n",
+ w->id);
+ }
+
+ DPRINTF("=== stacking order (top down) === \n");
+ TAILQ_FOREACH(w, &r->ws->stack, stack_entry) {
+ DPRINTF("win %#x, fs: %s, maximized: %s, above: %s, "
+ "iconic: %s\n", w->id, YESNO(FULLSCREEN(w)),
+ YESNO(MAXIMIZED(w)), YESNO(ABOVE(w)), YESNO(ICONIC(w)));
}
- warnx("===== unmanaged window list =====");
- TAILQ_FOREACH(win, &r->ws->unmanagedlist, entry) {
- state = getstate(win->id);
- c = xcb_get_window_attributes(conn, win->id);
+ DPRINTF("===== unmanaged window list =====\n");
+ TAILQ_FOREACH(w, &r->ws->unmanagedlist, entry) {
+ state = get_win_state(w->id);
+ c = xcb_get_window_attributes(conn, w->id);
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);
+ DPRINTF("win %#x, map_state: %d, state: %u, "
+ "transient: %#x\n", w->id, wa->map_state,
+ state, w->transient);
free(wa);
} else
- warnx("window: 0x%x, failed xcb_get_window_attributes",
- win->id);
+ DPRINTF("win %#x, failed xcb_get_window_attributes\n",
+ w->id);
}
- warnx("=================================");
+ DPRINTF("=================================\n");
}
#else
void
}
uint32_t
-name_to_pixel(const char *colorname)
+name_to_pixel(int sidx, const char *colorname)
{
uint32_t result = 0;
char cname[32] = "#";
xcb_alloc_named_color_reply_t *nr;
uint16_t rr, gg, bb;
- screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
+ screen = get_screen(sidx);
cmap = screen->default_colormap;
/* color is in format rgb://rr/gg/bb */
nr = xcb_alloc_named_color_reply(conn,
xcb_alloc_named_color(conn, cmap, strlen(colorname),
colorname), NULL);
- if (!nr) {
+ if (nr == NULL) {
strlcat(cname, colorname + 2, sizeof cname - 1);
nr = xcb_alloc_named_color_reply(conn,
xcb_alloc_named_color(conn, cmap, strlen(cname),
}
void
-setscreencolor(char *val, int i, int c)
+setscreencolor(const char *val, int i, int c)
{
int num_screens;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
if (i > 0 && i <= num_screens) {
- screens[i - 1].c[c].pixel = name_to_pixel(val);
+ screens[i - 1].c[c].pixel = name_to_pixel(i - 1, val);
free(screens[i - 1].c[c].name);
if ((screens[i - 1].c[c].name = strdup(val)) == NULL)
err(1, "strdup");
} else if (i == -1) {
for (i = 0; i < num_screens; i++) {
- screens[i].c[c].pixel = name_to_pixel(val);
+ screens[i].c[c].pixel = name_to_pixel(0, val);
free(screens[i].c[c].name);
if ((screens[i].c[c].name = strdup(val)) == NULL)
err(1, "strdup");
snprintf(ws->stacker, sizeof ws->stacker,
ws->l_state.vertical_flip ? "[%d>%d]" : "[%d|%d]",
ws->l_state.vertical_mwin, ws->l_state.vertical_stacks);
- if (ws->cur_layout->l_stack == horizontal_stack)
+ else if (ws->cur_layout->l_stack == horizontal_stack)
snprintf(ws->stacker, sizeof ws->stacker,
ws->l_state.horizontal_flip ? "[%dv%d]" : "[%d-%d]",
ws->l_state.horizontal_mwin, ws->l_state.horizontal_stacks);
if (ws->cur_layout->l_stack == vertical_stack)
strlcpy(ws->stacker, ws->l_state.vertical_flip ? "[>]" : "[|]",
sizeof ws->stacker);
- if (ws->cur_layout->l_stack == horizontal_stack)
+ else if (ws->cur_layout->l_stack == horizontal_stack)
strlcpy(ws->stacker, ws->l_state.horizontal_flip ? "[v]" : "[-]",
sizeof ws->stacker);
}
void
-custom_region(char *val)
+custom_region(const char *val)
{
unsigned int x, y, w, h;
int sidx, num_screens;
xcb_screen_t *screen;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
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>");
kill(bar_pid, SIGTERM);
bar_pid = 0;
}
- strlcpy((char *)bar_ext, "", sizeof bar_ext);
+ strlcpy(bar_ext, "", sizeof bar_ext);
bar_extra = 0;
}
void
-bar_class_name(char *s, size_t sz, struct swm_region *r)
+bar_window_class(char *s, size_t sz, struct swm_region *r)
{
if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
return;
}
void
-bar_title_name(char *s, size_t sz, struct swm_region *r)
+bar_window_instance(char *s, size_t sz, struct swm_region *r)
{
if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
return;
}
void
-bar_class_title_name(char *s, size_t sz, struct swm_region *r)
+bar_window_class_instance(char *s, size_t sz, struct swm_region *r)
{
if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
return;
- bar_class_name(s, sz, r);
+ bar_window_class(s, sz, r);
strlcat(s, ":", sz);
- bar_title_name(s, sz, r);
+ bar_window_instance(s, sz, r);
}
void
-bar_window_float(char *s, size_t sz, struct swm_region *r)
+bar_window_state(char *s, size_t sz, struct swm_region *r)
{
if (r == NULL || r ->ws == NULL || r->ws->focus == NULL)
return;
- if (r->ws->focus->floating)
+ if (MAXIMIZED(r->ws->focus))
+ strlcat(s, "(m)", sz);
+ else if (ABOVE(r->ws->focus))
strlcat(s, "(f)", sz);
}
if (r == NULL || r->ws == NULL || r->ws->focus == NULL)
return;
- if ((title = get_win_name(r->ws->focus->id)) == NULL)
- return;
+ title = get_win_name(r->ws->focus->id);
strlcat(s, title, sz);
free(title);
}
-int urgent[SWM_WS_MAX];
void
bar_urgent(char *s, size_t sz)
{
struct ws_win *win;
int i, j, num_screens;
+ int urgent[SWM_WS_MAX];
char b[8];
xcb_get_property_cookie_t c;
xcb_icccm_wm_hints_t hints;
for (i = 0; i < workspace_limit; i++)
urgent[i] = 0;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
for (j = 0; j < workspace_limit; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) {
void
bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz)
{
+ struct ws_win *w;
+
/* if format provided, just copy the buffers */
if (bar_format != NULL) {
strlcpy(fmtnew, fmtexp, sz);
/* only show the workspace name if there's actually one */
if (r != NULL && r->ws != NULL && r->ws->name != NULL)
strlcat(fmtnew, "<+D>", sz);
+
+ /* If enabled, only show the iconic count if there are iconic wins. */
+ if (iconic_enabled && r != NULL && r->ws != NULL)
+ TAILQ_FOREACH(w, &r->ws->winlist, entry)
+ if (ICONIC(w)) {
+ strlcat(fmtnew, "{+M}", sz);
+ break;
+ }
+
strlcat(fmtnew, "+3<", sz);
if (clock_enabled) {
if (urgent_enabled)
strlcat(fmtnew, "* +U*+4<", sz);
- if (title_class_enabled) {
+ if (window_class_enabled) {
strlcat(fmtnew, "+C", sz);
- if (title_name_enabled == 0)
+ if (!window_instance_enabled)
strlcat(fmtnew, "+4<", sz);
}
/* checks needed by the colon and floating strlcat(3) calls below */
if (r != NULL && r->ws != NULL && r->ws->focus != NULL) {
- if (title_name_enabled) {
- if (title_class_enabled)
+ if (window_instance_enabled) {
+ if (window_class_enabled)
strlcat(fmtnew, ":", sz);
strlcat(fmtnew, "+T+4<", sz);
}
if (window_name_enabled) {
- if (r->ws->focus->floating)
+ if (ABOVE(r->ws->focus) || MAXIMIZED(r->ws->focus))
strlcat(fmtnew, "+F ", sz);
strlcat(fmtnew, "+64W ", sz);
}
bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep,
size_t sz)
{
+ struct ws_win *w;
char *ptr;
char tmp[SWM_BAR_MAX];
- int limit, size;
+ int limit, size, count;
size_t len;
/* reset strlcat(3) buffer */
snprintf(tmp, sizeof tmp, "%s", bar_ext);
break;
case 'C':
- bar_class_name(tmp, sizeof tmp, r);
+ bar_window_class(tmp, sizeof tmp, r);
break;
case 'D':
bar_workspace_name(tmp, sizeof tmp, r);
break;
case 'F':
- bar_window_float(tmp, sizeof tmp, r);
+ bar_window_state(tmp, sizeof tmp, r);
break;
case 'I':
snprintf(tmp, sizeof tmp, "%d", r->ws->idx + 1);
break;
+ case 'M':
+ count = 0;
+ TAILQ_FOREACH(w, &r->ws->winlist, entry)
+ if (ICONIC(w))
+ ++count;
+
+ snprintf(tmp, sizeof tmp, "%d", count);
+ break;
case 'N':
snprintf(tmp, sizeof tmp, "%d", r->s->idx + 1);
break;
case 'P':
- bar_class_title_name(tmp, sizeof tmp, r);
+ bar_window_class_instance(tmp, sizeof tmp, r);
break;
case 'S':
snprintf(tmp, sizeof tmp, "%s", r->ws->stacker);
break;
case 'T':
- bar_title_name(tmp, sizeof tmp, r);
+ bar_window_instance(tmp, sizeof tmp, r);
break;
case 'U':
bar_urgent(tmp, sizeof tmp);
#endif
}
+/* Redraws the bar; need to follow with xcb_flush() or focus_flush(). */
void
-bar_fmt_print(void)
+bar_draw(void)
{
char fmtexp[SWM_BAR_MAX], fmtnew[SWM_BAR_MAX];
char fmtrep[SWM_BAR_MAX];
/* expand the format by first passing it through strftime(3) */
bar_fmt_expand(fmtexp, sizeof fmtexp);
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++) {
TAILQ_FOREACH(r, &screens[i].rl, entry) {
if (r->bar == NULL)
continue;
- bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew);
- bar_replace(fmtnew, fmtrep, r, sizeof fmtrep);
+
+ if (bar_enabled && r->ws->bar_enabled)
+ xcb_map_window(conn, r->bar->id);
+ else {
+ xcb_unmap_window(conn, r->bar->id);
+ continue;
+ }
+
+ if (startup_exception)
+ snprintf(fmtrep, sizeof fmtrep, "total "
+ "exceptions: %d, first exception: %s",
+ nr_exceptions,
+ startup_exception);
+ else {
+ bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew);
+ bar_replace(fmtnew, fmtrep, r, sizeof fmtrep);
+ }
if (bar_font_legacy)
bar_print_legacy(r, fmtrep);
else
}
}
-void
-bar_update(void)
+/*
+ * Reads external script output; call when stdin is readable.
+ * Returns 1 if bar_ext was updated; otherwise 0.
+ */
+int
+bar_extra_update(void)
{
- size_t len;
- char *b;
+ size_t len;
+ char b[SWM_BAR_MAX];
+ int changed = 0;
- if (bar_enabled == 0)
- return;
- if (bar_extra && bar_extra_running) {
- /* ignore short reads; it'll correct itself */
- while ((b = fgetln(stdin, &len)) != NULL)
- if (b && b[len - 1] == '\n') {
- b[len - 1] = '\0';
- strlcpy((char *)bar_ext, b, sizeof bar_ext);
+ if (!bar_extra)
+ return changed;
+
+ while (fgets(b, sizeof(b), stdin) != NULL) {
+ if (bar_enabled) {
+ len = strlen(b);
+ if (b[len - 1] == '\n') {
+ /* Remove newline. */
+ b[--len] = '\0';
+
+ /* "Clear" bar_ext. */
+ bar_ext[0] = '\0';
+
+ /* Flush buffered output. */
+ strlcpy(bar_ext, bar_ext_buf, sizeof(bar_ext));
+ bar_ext_buf[0] = '\0';
+
+ /* Append new output to bar. */
+ strlcat(bar_ext, b, sizeof(bar_ext));
+
+ changed = 1;
+ } else {
+ /* Buffer output. */
+ strlcat(bar_ext_buf, b, sizeof(bar_ext_buf));
}
- if (b == NULL && errno != EAGAIN) {
- warn("bar_update: bar_extra failed");
- bar_extra_stop();
}
- } else
- strlcpy((char *)bar_ext, "", sizeof bar_ext);
-
- bar_fmt_print();
- alarm(bar_delay);
-}
+ }
-void
-bar_signal(int sig)
-{
- /* suppress unused warning since var is needed */
- (void)sig;
+ if (errno != EAGAIN) {
+ warn("bar_action failed");
+ bar_extra_stop();
+ changed = 1;
+ }
- bar_alarm = 1;
+ return changed;
}
void
DNPRINTF(SWM_D_BAR, "bar_toggle\n");
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- if (bar_enabled) {
- for (i = 0; i < num_screens; i++)
- TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
- if (tmpr->bar)
- xcb_unmap_window(conn, tmpr->bar->id);
- } else {
- for (i = 0; i < num_screens; i++)
- TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
- if (tmpr->bar)
- map_window_raised(tmpr->bar->id);
+ switch (args->id) {
+ case SWM_ARG_ID_BAR_TOGGLE_WS:
+ /* Only change if master switch is enabled. */
+ if (bar_enabled)
+ r->ws->bar_enabled = !r->ws->bar_enabled;
+ else
+ bar_enabled = r->ws->bar_enabled = 1;
+ break;
+ case SWM_ARG_ID_BAR_TOGGLE:
+ bar_enabled = !bar_enabled;
+ break;
}
- bar_enabled = !bar_enabled;
+ /* update bars as necessary */
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; i++)
+ TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
+ if (tmpr->bar) {
+ if (bar_enabled && tmpr->ws->bar_enabled)
+ xcb_map_window(conn, tmpr->bar->id);
+ else
+ xcb_unmap_window(conn, tmpr->bar->id);
+ }
stack();
/* must be after stack */
- bar_update();
+ bar_draw();
focus_flush();
}
void
-bar_refresh(void)
+bar_extra_setup(void)
{
- struct swm_region *r;
- uint32_t wa[2];
- int i, num_screens;
-
/* do this here because the conf file is in memory */
- if (bar_extra && bar_extra_running == 0 && bar_argv[0]) {
+ if (!bar_extra && bar_argv[0]) {
/* launch external status app */
- bar_extra_running = 1;
+ bar_extra = 1;
if (pipe(bar_pipe) == -1)
err(1, "pipe error");
socket_setnonblock(bar_pipe[0]);
socket_setnonblock(bar_pipe[1]); /* XXX hmmm, really? */
- if (dup2(bar_pipe[0], 0) == -1)
+
+ /* Set stdin to read from the pipe. */
+ if (dup2(bar_pipe[0], STDIN_FILENO) == -1)
err(1, "dup2");
- if (dup2(bar_pipe[1], 1) == -1)
+
+ /* Set stdout to write to the pipe. */
+ if (dup2(bar_pipe[1], STDOUT_FILENO) == -1)
err(1, "dup2");
+
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
err(1, "could not disable SIGPIPE");
switch (bar_pid = fork()) {
close(bar_pipe[1]);
break;
}
+
+ atexit(kill_bar_extra_atexit);
}
+}
- 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 (r->bar == NULL)
- continue;
- wa[0] = screens[i].c[SWM_S_COLOR_BAR].pixel;
- wa[1] = screens[i].c[SWM_S_COLOR_BAR_BORDER].pixel;
- xcb_change_window_attributes(conn, r->bar->id,
- XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
- }
- bar_update();
+void
+kill_bar_extra_atexit(void)
+{
+ if (bar_pid)
+ kill(bar_pid, SIGTERM);
}
int
}
void
-fontset_init()
+fontset_init(void)
{
char *default_string;
char **missing_charsets;
font);
}
- if (!bar_font) {
+ if (bar_font == NULL) {
warnx("unable to load font %s", font);
continue;
} else {
if (!XftColorAllocValue(display, DefaultVisual(display, r->s->idx),
DefaultColormap(display, r->s->idx), &color, &bar_font_color))
- warn("unable to allocate Xft color");
+ warn("Xft error: unable to allocate color.");
bar_height = bar_font->height + 2 * bar_border_width;
WIDTH(r->bar) = WIDTH(r) - 2 * bar_border_width;
HEIGHT(r->bar) = bar_height - 2 * bar_border_width;
+ /* Assume region is unfocused when we create the bar. */
r->bar->id = xcb_generate_id(conn);
wa[0] = r->s->c[SWM_S_COLOR_BAR].pixel;
- wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER].pixel;
- wa[2] = XCB_EVENT_MASK_EXPOSURE;
+ wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER_UNFOCUS].pixel;
+ wa[2] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_POINTER_MOTION |
+ XCB_EVENT_MASK_POINTER_MOTION_HINT;
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),
XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE);
if (bar_enabled)
- map_window_raised(r->bar->id);
+ xcb_map_window(conn, r->bar->id);
- DNPRINTF(SWM_D_BAR, "bar_setup: window: 0x%x, (x,y) w x h: (%d,%d) "
+ DNPRINTF(SWM_D_BAR, "bar_setup: win %#x, (x,y) w x h: (%d,%d) "
"%d x %d\n", WINID(r->bar), X(r->bar), Y(r->bar), WIDTH(r->bar),
HEIGHT(r->bar));
- if (signal(SIGALRM, bar_signal) == SIG_ERR)
- err(1, "could not install bar_signal");
- bar_refresh();
+ bar_extra_setup();
}
void
}
void
-set_win_state(struct ws_win *win, uint16_t state)
+set_win_state(struct ws_win *win, uint8_t state)
{
uint16_t data[2] = { state, XCB_ATOM_NONE };
- DNPRINTF(SWM_D_EVENT, "set_win_state: window: 0x%x\n", win->id);
+ DNPRINTF(SWM_D_EVENT, "set_win_state: win %#x, state: %u\n",
+ win->id, state);
if (win == NULL)
return;
a_state, 32, 2, data);
}
-uint32_t
-getstate(xcb_window_t w)
+uint8_t
+get_win_state(xcb_window_t w)
{
- uint32_t result = 0;
- xcb_get_property_cookie_t c;
xcb_get_property_reply_t *r;
+ xcb_get_property_cookie_t c;
+ uint32_t result = 0;
c = xcb_get_property(conn, 0, w, a_state, a_state, 0L, 2L);
r = xcb_get_property_reply(conn, c, NULL);
-
if (r) {
if (r->type == a_state && r->format == 32 && r->length == 2)
result = *((uint32_t *)xcb_get_property_value(r));
free(r);
}
- DNPRINTF(SWM_D_MISC, "getstate property: win 0x%x state %u\n", w,
+ DNPRINTF(SWM_D_MISC, "get_win_state property: win %#x state %u\n", w,
result);
return (result);
}
"Version: %s Build: %s", SPECTRWM_VERSION, buildstr);
else
strlcpy(bar_vertext, "", sizeof bar_vertext);
- bar_update();
+ bar_draw();
xcb_flush(conn);
}
void
-client_msg(struct ws_win *win, xcb_atom_t a)
+client_msg(struct ws_win *win, xcb_atom_t a, xcb_timestamp_t t)
{
xcb_client_message_event_t ev;
+#ifdef SWM_DEBUG
+ char *name;
+#endif
if (win == NULL)
return;
+#ifdef SWM_DEBUG
+ name = get_atom_name(a);
+ DNPRINTF(SWM_D_EVENT, "client_msg: win %#x, atom: %s(%u), "
+ "time: %#x\n",
+ win->id, name, a, t);
+ free(name);
+#endif
bzero(&ev, sizeof ev);
ev.response_type = XCB_CLIENT_MESSAGE;
ev.type = a_prot;
ev.format = 32;
ev.data.data32[0] = a;
- ev.data.data32[1] = XCB_CURRENT_TIME;
+ ev.data.data32[1] = t;
xcb_send_event(conn, 0, win->id,
XCB_EVENT_MASK_NO_EVENT, (const char *)&ev);
/* make response appear more WM_SIZE_HINTS-compliant */
if (win->sh.flags) {
- DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%x,"
+ DNPRINTF(SWM_D_MISC, "config_win: hints: win %#x,"
" 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),
ce.above_sibling = ev->sibling;
}
- DNPRINTF(SWM_D_MISC, "config_win: ewmh: %s, window: 0x%x, (x,y) w x h: "
+ DNPRINTF(SWM_D_MISC, "config_win: ewmh: %s, win %#x, (x,y) w x h: "
"(%d,%d) %d x %d, border: %d\n", YESNO(ev == NULL), win->id, ce.x,
ce.y, ce.width, ce.height, ce.border_width);
int count = 0;
TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (count_transient == 0 && win->floating)
- continue;
- if (count_transient == 0 && win->transient)
+ if (!count_transient && FLOATING(win))
continue;
- if (win->iconic)
+ if (ICONIC(win))
continue;
count++;
}
}
void
-unmap_window(struct ws_win *win)
+raise_window(struct ws_win *win)
+{
+ struct ws_win *target = NULL;
+ struct swm_region *r;
+ struct workspace *ws;
+
+ if (win == NULL || (r = win->ws->r) == NULL)
+ return;
+ ws = win->ws;
+
+ DNPRINTF(SWM_D_EVENT, "raise_window: win %#x\n", win->id);
+
+ TAILQ_FOREACH(target, &ws->stack, stack_entry) {
+ if (target == win || ICONIC(target))
+ continue;
+ if (ws->cur_layout == &layouts[SWM_MAX_STACK])
+ break;
+ if (TRANS(win) && (win->transient == target->transient ||
+ win->transient == target->id))
+ break;
+ if (FULLSCREEN(win))
+ break;
+ if (FULLSCREEN(target))
+ continue;
+ if (MAXIMIZED(win))
+ break;
+ if (MAXIMIZED(target))
+ continue;
+ if (ABOVE(win) || TRANS(win))
+ break;
+ if (!ABOVE(target) && !TRANS(target))
+ break;
+ }
+
+ if (target != NULL) {
+ /* Change stack position. */
+ TAILQ_REMOVE(&ws->stack, win, stack_entry);
+ TAILQ_INSERT_BEFORE(target, win, stack_entry);
+ update_win_stacking(win);
+ }
+
+#ifdef SWM_DEBUG
+ if (swm_debug & SWM_D_STACK) {
+ DPRINTF("=== stacking order (top down) === \n");
+ TAILQ_FOREACH(target, &r->ws->stack, stack_entry) {
+ DPRINTF("win %#x, fs: %s, maximized: %s, above: %s, "
+ "iconic: %s\n", target->id, YESNO(FULLSCREEN(target)),
+ YESNO(MAXIMIZED(target)), YESNO(ABOVE(target)),
+ YESNO(ICONIC(target)));
+ }
+ }
+#endif
+ DNPRINTF(SWM_D_EVENT, "raise_window: done\n");
+}
+
+void
+update_win_stacking(struct ws_win *win)
{
- DNPRINTF(SWM_D_EVENT, "unmap_window: window: 0x%x\n", win->id);
+ struct ws_win *sibling;
+ struct swm_region *r;
+ uint32_t val[2];
+
+ if (win == NULL || (r = win->ws->r) == NULL)
+ return;
+
+ sibling = TAILQ_NEXT(win, stack_entry);
+ if (sibling != NULL && FLOATING(win) == FLOATING(sibling))
+ val[0] = sibling->id;
+ else
+ val[0] = FLOATING(win) ? r->bar->id : r->id;
+ DNPRINTF(SWM_D_EVENT, "update_win_stacking: %#x, sibling %#x\n",
+ win->id, val[0]);
+
+ val[1] = XCB_STACK_MODE_ABOVE;
+
+ xcb_configure_window(conn, win->id, XCB_CONFIG_WINDOW_SIBLING |
+ XCB_CONFIG_WINDOW_STACK_MODE, val);
+}
+
+void
+map_window(struct ws_win *win)
+{
if (win == NULL)
return;
- /* don't unmap again */
- if (getstate(win->id) == XCB_ICCCM_WM_STATE_ICONIC)
+ DNPRINTF(SWM_D_EVENT, "map_window: win %#x, mapped: %s\n",
+ win->id, YESNO(win->mapped));
+
+ if (win->mapped)
return;
- set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
+ xcb_map_window(conn, win->id);
+ set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
+ win->mapped = 1;
+}
+
+void
+unmap_window(struct ws_win *win)
+{
+ if (win == NULL)
+ return;
+
+ DNPRINTF(SWM_D_EVENT, "unmap_window: win %#x, mapped: %s\n", win->id,
+ YESNO(win->mapped));
+
+ if (!win->mapped)
+ return;
xcb_unmap_window(conn, win->id);
- xcb_change_window_attributes(conn, win->id,
- XCB_CW_BORDER_PIXEL, &win->s->c[SWM_S_COLOR_UNFOCUS].pixel);
+ set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
+ win->mapped = 0;
}
void
struct ws_win *win;
int i, j, num_screens;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
for (j = 0; j < workspace_limit; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
keycode = xcb_key_symbols_get_keycode(syms, keysym);
- DNPRINTF(SWM_D_MISC, "fake_keypress: win 0x%x keycode %u\n",
+ DNPRINTF(SWM_D_MISC, "fake_keypress: win %#x, keycode %u\n",
win->id, *keycode);
bzero(&event, sizeof(event));
quit(NULL, NULL);
}
+struct ws_win *
+get_pointer_win(xcb_window_t root)
+{
+ struct ws_win *win = NULL;
+ xcb_query_pointer_reply_t *r;
+
+ DNPRINTF(SWM_D_EVENT, "get_pointer_win: root: %#x.\n", root);
+
+ r = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, root), NULL);
+ if (r) {
+ win = find_window(r->child);
+ if (win) {
+ DNPRINTF(SWM_D_EVENT, "get_pointer_win: %#x.\n",
+ win->id);
+ } else {
+ DNPRINTF(SWM_D_EVENT, "get_pointer_win: none.\n");
+ }
+ free(r);
+ }
+
+ return win;
+}
+
struct swm_region *
-root_to_region(xcb_window_t root)
+root_to_region(xcb_window_t root, int check)
{
+ struct ws_win *cfw;
struct swm_region *r = NULL;
int i, num_screens;
xcb_query_pointer_reply_t *qpr;
+ xcb_get_input_focus_reply_t *gifr;
- DNPRINTF(SWM_D_MISC, "root_to_region: window: 0x%x\n", root);
+ DNPRINTF(SWM_D_MISC, "root_to_region: win %#x\n", root);
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
if (screens[i].root == root)
break;
- qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn,
- screens[i].root), NULL);
+ if (check & SWM_CK_REGION)
+ r = screens[i].r_focus;
- if (qpr) {
- DNPRINTF(SWM_D_MISC, "root_to_region: pointer: (%d,%d)\n",
- qpr->root_x, qpr->root_y);
- /* choose a region based on pointer location */
- TAILQ_FOREACH(r, &screens[i].rl, entry)
- if (X(r) <= qpr->root_x && qpr->root_x < MAX_X(r) &&
- Y(r) <= qpr->root_y && qpr->root_y < MAX_Y(r))
- break;
- free(qpr);
+ if (r == NULL && check & SWM_CK_FOCUS) {
+ /* Try to find an actively focused window */
+ gifr = xcb_get_input_focus_reply(conn,
+ xcb_get_input_focus(conn), NULL);
+ if (gifr) {
+ cfw = find_window(gifr->focus);
+ if (cfw && cfw->ws->r)
+ r = cfw->ws->r;
+
+ free(gifr);
+ }
}
- if (r == NULL)
+ if (r == NULL && check & SWM_CK_POINTER) {
+ /* No region with an active focus; try to use pointer. */
+ 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", qpr->root_x, qpr->root_y);
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ if (X(r) <= qpr->root_x &&
+ qpr->root_x < MAX_X(r) &&
+ Y(r) <= qpr->root_y &&
+ qpr->root_y < MAX_Y(r))
+ break;
+ free(qpr);
+ }
+ }
+
+ /* Last resort. */
+ if (r == NULL && check & SWM_CK_FALLBACK)
r = TAILQ_FIRST(&screens[i].rl);
+ DNPRINTF(SWM_D_MISC, "root_to_region: idx: %d\n", get_region_index(r));
+
return (r);
}
struct ws_win *win;
int i, j, num_screens;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
for (j = 0; j < workspace_limit; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].unmanagedlist,
int i, j, num_screens;
xcb_query_tree_reply_t *r;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
for (j = 0; j < workspace_limit; j++)
TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
return (win);
r = xcb_query_tree_reply(conn, xcb_query_tree(conn, id), NULL);
- if (!r)
+ if (r == NULL)
return (NULL);
/* if we were looking for the parent return that window instead */
if (win == NULL)
return;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
TAILQ_FOREACH(r, &screens[i].rl, entry)
for (x = 0; x < workspace_limit; x++) {
if (testwin == NULL)
return (0);
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
TAILQ_FOREACH(r, &screens[i].rl, entry)
for (x = 0; x < workspace_limit; x++) {
int i, x, num_screens;
/* validate all ws */
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
TAILQ_FOREACH(r, &screens[i].rl, entry)
for (x = 0; x < workspace_limit; x++) {
{
xcb_window_t none = XCB_WINDOW_NONE;
- DNPRINTF(SWM_D_FOCUS, "unfocus_win: window: 0x%x\n", WINID(win));
+ DNPRINTF(SWM_D_FOCUS, "unfocus_win: win %#x\n", WINID(win));
if (win == NULL)
return;
+
if (win->ws == NULL) {
DNPRINTF(SWM_D_FOCUS, "unfocus_win: NULL ws.\n");
return;
kill_refs(win->ws->focus);
win->ws->focus = NULL;
}
+
if (validate_win(win->ws->focus_prev)) {
kill_refs(win->ws->focus_prev);
win->ws->focus_prev = NULL;
}
xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL,
- &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].pixel);
+ &win->s->c[SWM_S_COLOR_UNFOCUS].pixel);
+
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, &none);
}
void
-unfocus_all(void)
-{
- struct ws_win *win;
- int i, j, num_screens;
-
- DNPRINTF(SWM_D_FOCUS, "unfocus_all\n");
-
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- for (i = 0; i < num_screens; i++)
- for (j = 0; j < workspace_limit; j++)
- TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
- unfocus_win(win);
-}
-
-void
focus_win(struct ws_win *win)
{
- struct ws_win *cfw = NULL;
- xcb_get_input_focus_reply_t *r;
+ struct ws_win *cfw = NULL, *parent = NULL, *w;
+ struct workspace *ws;
+ xcb_get_input_focus_reply_t *gifr;
- DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%x\n", WINID(win));
+ DNPRINTF(SWM_D_FOCUS, "focus_win: win %#x\n", WINID(win));
- if (win == NULL) {
- /* Clear the status-bar. */
- bar_update();
- return;
- }
+ if (win == NULL)
+ goto out;
if (win->ws == NULL)
- return;
+ goto out;
- if (validate_ws(win->ws))
- return;
+ if (!win->mapped)
+ goto out;
+
+ ws = win->ws;
+
+ if (validate_ws(ws))
+ goto out;
if (validate_win(win)) {
kill_refs(win);
- return;
+ goto out;
}
- r = xcb_get_input_focus_reply(conn, xcb_get_input_focus(conn), NULL);
- if (r) {
- cfw = find_window(r->focus);
- if (cfw != win)
- unfocus_win(cfw);
- free(r);
+ gifr = xcb_get_input_focus_reply(conn, xcb_get_input_focus(conn), NULL);
+ if (gifr) {
+ cfw = find_window(gifr->focus);
+ if (cfw != NULL && cfw != win) {
+ if (cfw->ws != ws && cfw->ws->r != NULL) {
+ /* Change border to unfocused color. */
+ xcb_change_window_attributes(conn, cfw->id,
+ XCB_CW_BORDER_PIXEL,
+ &cfw->s->c[SWM_S_COLOR_UNFOCUS].pixel);
+ } else {
+ unfocus_win(cfw);
+ }
+ }
+ free(gifr);
}
- if (win->ws->focus != win) {
- if (win->ws->focus != cfw)
- unfocus_win(win->ws->focus);
- win->ws->focus = win;
+ if (ws->focus != win) {
+ if (ws->focus && ws->focus != cfw)
+ unfocus_win(ws->focus);
+ ws->focus = win;
}
- /* Tell app it can set focus. */
- if (win->take_focus) {
- /* java is special; always tell parent */
- if (win->transient && win->java)
- client_msg(find_window(win->transient), a_takefocus);
- else
- client_msg(win, a_takefocus);
+ /* If this window directs focus to a child window, then clear. */
+ if (win->focus_child)
+ win->focus_child = NULL;
+
+ /* If transient, adjust parent's focus child for focus_magic. */
+ if (TRANS(win)) {
+ parent = find_window(win->transient);
+ if (parent && parent->focus_child != win)
+ parent->focus_child = win;
}
- if (cfw != win && win->ws->r != NULL) {
- if (win->java == 0)
+ if (cfw != win && ws->r != NULL) {
+ /* Set input focus if no input hint, or indicated by hint. */
+ if (!(win->hints.flags & XCB_ICCCM_WM_HINT_INPUT) ||
+ (win->hints.flags & XCB_ICCCM_WM_HINT_INPUT &&
+ win->hints.input))
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
+ win->id, last_event_time);
+ else
xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
- win->id, XCB_CURRENT_TIME);
+ ws->r->id, XCB_CURRENT_TIME);
+
+ /* Tell app it can adjust focus to a specific window. */
+ if (win->take_focus) {
+ /* java is special; always tell parent */
+ if (TRANS(win) && win->java)
+ client_msg(parent, a_takefocus,
+ last_event_time);
+ else
+ client_msg(win, a_takefocus, last_event_time);
+ }
xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL,
- &win->ws->r->s->c[SWM_S_COLOR_FOCUS].pixel);
+ &win->s->c[SWM_S_COLOR_FOCUS].pixel);
+
+ if (ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
+ ws->always_raise) {
+ /* If a parent exists, map it first. */
+ if (parent) {
+ raise_window(parent);
+ map_window(parent);
+
+ /* Map siblings next. */
+ TAILQ_FOREACH(w, &ws->winlist, entry)
+ if (w != win && !ICONIC(w) &&
+ win->transient == parent->id)
+ map_window(w);
+ }
- if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
- win->ws->always_raise)
- map_window_raised(win->id);
+ /* Map focused window. */
+ raise_window(win);
+ map_window(win);
+
+ /* Finally, map children of focus window. */
+ TAILQ_FOREACH(w, &ws->winlist, entry)
+ if (w->transient == win->id && !ICONIC(w))
+ map_window(w);
+ } else if (tile_gap < 0 && !ABOVE(win)) {
+ /*
+ * Windows overlap in the layout.
+ * Raise focused win above all tiled wins.
+ */
+ raise_window(win);
+ map_window(win);
+ }
+
+ set_region(ws->r);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
&win->id);
}
- bar_update();
+out:
+ bar_draw();
+
+ DNPRINTF(SWM_D_FOCUS, "focus_win: done.\n");
}
/* If a child window should have focus instead, return it. */
get_focus_magic(struct ws_win *win)
{
struct ws_win *parent = NULL;
+ struct ws_win *child = NULL;
- DNPRINTF(SWM_D_FOCUS, "get_focus_magic: window: 0x%x\n", WINID(win));
+ DNPRINTF(SWM_D_FOCUS, "get_focus_magic: win %#x\n", WINID(win));
if (win == NULL)
return win;
- if (win->transient) {
+ if (TRANS(win)) {
parent = find_window(win->transient);
- /* If parent prefers focus elsewhere, then do so. */
- if (parent && parent->focus_child) {
- if (validate_win(parent->focus_child) == 0)
- win = parent->focus_child;
+ /* If parent prefers focus elsewhere, then try to do so. */
+ if (parent && (child = parent->focus_child)) {
+ if (validate_win(child) == 0 && child->mapped)
+ win = child;
else
parent->focus_child = NULL;
}
}
- /* If this window prefers focus elsewhere, then do so. */
- if (win->focus_child) {
- if (validate_win(win->focus_child) == 0)
- win = win->focus_child;
+ /* If this window prefers focus elsewhere, then try to do so. */
+ if ((child = win->focus_child)) {
+ if (validate_win(child) == 0 && child->mapped)
+ win = child;
else
win->focus_child = NULL;
}
}
void
-switchws(struct swm_region *r, union arg *args)
+set_region(struct swm_region *r)
+{
+ struct swm_region *rf;
+ int vals[2];
+
+ if (r == NULL)
+ return;
+
+ rf = r->s->r_focus;
+ /* Unfocus old region bar. */
+ if (rf != NULL) {
+ if (rf == r)
+ return;
+
+ xcb_change_window_attributes(conn, rf->bar->id,
+ XCB_CW_BORDER_PIXEL,
+ &r->s->c[SWM_S_COLOR_BAR_BORDER_UNFOCUS].pixel);
+ }
+
+ if (rf != NULL && rf != r && (X(rf) != X(r) || Y(rf) != Y(r) ||
+ WIDTH(rf) != WIDTH(r) || HEIGHT(rf) != HEIGHT(r))) {
+ /* Set _NET_DESKTOP_GEOMETRY. */
+ vals[0] = WIDTH(r);
+ vals[1] = HEIGHT(r);
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, r->s->root,
+ ewmh[_NET_DESKTOP_GEOMETRY].atom, XCB_ATOM_CARDINAL, 32, 2,
+ &vals);
+ }
+
+ /* Set region bar border to focus_color. */
+ xcb_change_window_attributes(conn, r->bar->id,
+ XCB_CW_BORDER_PIXEL, &r->s->c[SWM_S_COLOR_BAR_BORDER].pixel);
+
+ r->s->r_focus = r;
+
+ ewmh_update_current_desktop();
+}
+
+void
+focus_region(struct swm_region *r)
+{
+ struct ws_win *nfw;
+ struct swm_region *old_r;
+
+ if (r == NULL)
+ return;
+
+ old_r = r->s->r_focus;
+ set_region(r);
+
+ nfw = get_region_focus(r);
+ if (nfw) {
+ focus_win(nfw);
+ } else {
+ /* New region is empty; need to manually unfocus win. */
+ if (old_r)
+ unfocus_win(old_r->ws->focus);
+
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->id,
+ XCB_CURRENT_TIME);
+
+ /* Clear bar since empty. */
+ bar_draw();
+ }
+}
+
+void
+switchws(struct swm_region *r, union arg *args)
{
- int wsid = args->id, unmap_old = 0;
struct swm_region *this_r, *other_r;
struct ws_win *win;
struct workspace *new_ws, *old_ws;
- union arg a;
+ xcb_window_t none = XCB_WINDOW_NONE;
+ int wsid = args->id, unmap_old = 0;
if (!(r && r->s))
return;
if (new_ws == old_ws)
return;
+ if ((win = old_ws->focus) != NULL) {
+ xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL,
+ &win->s->c[SWM_S_COLOR_UNFOCUS].pixel);
+
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
+ ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
+ &none);
+ }
+
other_r = new_ws->r;
if (other_r == NULL) {
/* the other workspace is hidden, hide this one */
this_r->ws = new_ws;
new_ws->r = this_r;
- /* this is needed so that we can click on a window after a restart */
- unfocus_all();
+ /* Set focus_pending before stacking, if needed. */
+ if (focus_mode != SWM_FOCUS_FOLLOW && (!new_ws->focus_pending ||
+ validate_win(new_ws->focus_pending))) {
+ new_ws->focus_pending = get_region_focus(new_ws->r);
+ new_ws->focus = new_ws->focus_prev;
+ new_ws->focus_prev = NULL;
+ }
+ new_ws->state = SWM_WS_STATE_MAPPING;
stack();
- a.id = SWM_ARG_ID_FOCUSCUR;
- focus(new_ws->r, &a);
/* unmap old windows */
- if (unmap_old)
+ if (unmap_old) {
TAILQ_FOREACH(win, &old_ws->winlist, entry)
unmap_window(win);
+ old_ws->state = SWM_WS_STATE_HIDDEN;
+ }
+
+ /* if workspaces were swapped, then don't wait to set focus */
+ if (old_ws->r && focus_mode != SWM_FOCUS_FOLLOW) {
+ if (new_ws->focus_pending) {
+ focus_win(new_ws->focus_pending);
+ new_ws->focus_pending = NULL;
+ }
+ }
+
+ /* Clear bar and set focus on region input win if new ws is empty. */
+ if (new_ws->focus_pending == NULL && new_ws->focus == NULL) {
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->id,
+ XCB_CURRENT_TIME);
+ bar_draw();
+ }
+
+ ewmh_update_current_desktop();
focus_flush();
+ new_ws->state = SWM_WS_STATE_MAPPED;
- DNPRINTF(SWM_D_WS, "switchws: done\n");
+ DNPRINTF(SWM_D_WS, "switchws: done.\n");
}
void
union arg a;
struct swm_screen *s = r->s;
int cycle_all = 0;
+ int move = 0;
DNPRINTF(SWM_D_WS, "cyclews: id: %d, screen[%d]:%dx%d+%d+%d, ws: %d\n",
args->id, r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), r->ws->idx);
a.id = r->ws->idx;
+
do {
switch (args->id) {
+ case SWM_ARG_ID_CYCLEWS_MOVE_UP:
+ move = 1;
+ /* FALLTHROUGH */
case SWM_ARG_ID_CYCLEWS_UP_ALL:
cycle_all = 1;
/* FALLTHROUGH */
case SWM_ARG_ID_CYCLEWS_UP:
- if (a.id < workspace_limit - 1)
- a.id++;
- else
- a.id = 0;
+ a.id = (a.id < workspace_limit - 1) ? a.id + 1 : 0;
break;
+ case SWM_ARG_ID_CYCLEWS_MOVE_DOWN:
+ move = 1;
+ /* FALLTHROUGH */
case SWM_ARG_ID_CYCLEWS_DOWN_ALL:
cycle_all = 1;
/* FALLTHROUGH */
case SWM_ARG_ID_CYCLEWS_DOWN:
- if (a.id > 0)
- a.id--;
- else
- a.id = workspace_limit - 1;
+ a.id = (a.id > 0) ? a.id - 1 : workspace_limit - 1;
break;
default:
return;
};
if (!cycle_all &&
- (cycle_empty == 0 && TAILQ_EMPTY(&s->ws[a.id].winlist)))
+ (!cycle_empty && TAILQ_EMPTY(&s->ws[a.id].winlist)))
continue;
- if (cycle_visible == 0 && s->ws[a.id].r != NULL)
+ if (!cycle_visible && s->ws[a.id].r != NULL)
continue;
+ if (move)
+ send_to_ws(r, &a);
+
switchws(r, &a);
} while (a.id != r->ws->idx);
+
+ DNPRINTF(SWM_D_FOCUS, "cyclews: done\n");
}
void
a.id = r->ws_prior->idx;
switchws(r, &a);
+ DNPRINTF(SWM_D_FOCUS, "priorws: done\n");
}
void
-cyclescr(struct swm_region *r, union arg *args)
+focusrg(struct swm_region *r, union arg *args)
{
+ int ridx = args->id, i, num_screens;
struct swm_region *rr = NULL;
- union arg a;
- int i, x, y, num_screens;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
+ /* do nothing if we don't have more than one screen */
+ if (!(num_screens > 1 || outputs > 1))
+ return;
+
+ DNPRINTF(SWM_D_FOCUS, "focusrg: id: %d\n", ridx);
+
+ rr = TAILQ_FIRST(&r->s->rl);
+ for (i = 0; i < ridx && rr != NULL; ++i)
+ rr = TAILQ_NEXT(rr, entry);
+
+ if (rr == NULL)
+ return;
+
+ focus_region(rr);
+ focus_flush();
+ DNPRINTF(SWM_D_FOCUS, "focusrg: done\n");
+}
+
+void
+cyclerg(struct swm_region *r, union arg *args)
+{
+ struct swm_region *rr = NULL;
+ int i, num_screens;
+
+ num_screens = get_screen_count();
/* do nothing if we don't have more than one screen */
if (!(num_screens > 1 || outputs > 1))
return;
i = r->s->idx;
+ DNPRINTF(SWM_D_FOCUS, "cyclerg: id: %d, region: %d\n", args->id, i);
+
switch (args->id) {
- case SWM_ARG_ID_CYCLESC_UP:
+ case SWM_ARG_ID_CYCLERG_UP:
rr = TAILQ_NEXT(r, entry);
if (rr == NULL)
rr = TAILQ_FIRST(&screens[i].rl);
break;
- case SWM_ARG_ID_CYCLESC_DOWN:
+ case SWM_ARG_ID_CYCLERG_DOWN:
rr = TAILQ_PREV(r, swm_region_list, entry);
if (rr == NULL)
rr = TAILQ_LAST(&screens[i].rl, swm_region_list);
if (rr == NULL)
return;
- /* move mouse to region */
- 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);
-
- a.id = SWM_ARG_ID_FOCUSCUR;
- focus(rr, &a);
-
- if (rr->ws->focus) {
- /* move to focus window */
- 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);
- }
+ focus_region(rr);
+ focus_flush();
+ DNPRINTF(SWM_D_FOCUS, "cyclerg: done\n");
}
+/* Sorts transients after parent. */
void
sort_windows(struct ws_win_list *wl)
{
for (win = TAILQ_FIRST(wl); win != TAILQ_END(wl); win = nxt) {
nxt = TAILQ_NEXT(win, entry);
- if (win->transient) {
+ if (TRANS(win)) {
parent = find_window(win->transient);
if (parent == NULL) {
warnx("not possible bug");
TAILQ_INSERT_AFTER(wl, parent, win, entry);
}
}
-
}
void
struct ws_win *cur_focus;
struct ws_win_list *wl;
-
DNPRINTF(SWM_D_WS, "swapwin: id: %d, screen[%d]:%dx%d+%d+%d, ws: %d\n",
args->id, r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), r->ws->idx);
cur_focus = r->ws->focus;
- if (cur_focus == NULL)
+ if (cur_focus == NULL || FULLSCREEN(cur_focus))
return;
+ /* Adjust stacking in floating layer. */
+ if (ABOVE(cur_focus)) {
+ switch (args->id) {
+ case SWM_ARG_ID_SWAPPREV:
+ target = TAILQ_PREV(cur_focus, ws_win_stack,
+ stack_entry);
+ if (target != NULL && FLOATING(target)) {
+ TAILQ_REMOVE(&cur_focus->ws->stack, cur_focus,
+ stack_entry);
+ TAILQ_INSERT_BEFORE(target, cur_focus,
+ stack_entry);
+ update_win_stacking(cur_focus);
+ focus_flush();
+ }
+ break;
+ case SWM_ARG_ID_SWAPNEXT:
+ target = TAILQ_NEXT(cur_focus, stack_entry);
+ if (target != NULL && FLOATING(target)) {
+ TAILQ_REMOVE(&cur_focus->ws->stack, cur_focus,
+ stack_entry);
+ TAILQ_INSERT_AFTER(&cur_focus->ws->stack,
+ target, cur_focus, stack_entry);
+ update_win_stacking(cur_focus);
+ focus_flush();
+ }
+ break;
+ }
+ goto out;
+ }
+
+ if (r->ws->cur_layout == &layouts[SWM_MAX_STACK])
+ return;
+
+ clear_maximized(r->ws);
+
source = cur_focus;
wl = &source->ws->winlist;
switch (args->id) {
case SWM_ARG_ID_SWAPPREV:
- if (source->transient)
+ if (TRANS(source))
source = find_window(source->transient);
target = TAILQ_PREV(source, ws_win_list, entry);
if (target && target->transient)
case SWM_ARG_ID_SWAPNEXT:
target = TAILQ_NEXT(source, entry);
/* move the parent and let the sort handle the move */
- if (source->transient)
+ if (TRANS(source))
source = find_window(source->transient);
TAILQ_REMOVE(wl, source, entry);
if (target == NULL)
}
sort_windows(wl);
+ ewmh_update_client_list();
stack();
-
focus_flush();
+out:
+ DNPRINTF(SWM_D_MOVE, "swapwin: done\n");
}
struct ws_win *
wl = &ws->winlist;
cur_focus = ws->focus;
- DNPRINTF(SWM_D_FOCUS, "get_focus_prev: window: 0x%x, cur_focus: 0x%x\n",
- WINID(win), WINID(cur_focus));
+ DNPRINTF(SWM_D_FOCUS, "get_focus_prev: win %#x, cur_focus: %#x, "
+ "focus_prev: %#x\n", WINID(win), WINID(cur_focus),
+ WINID(ws->focus_prev));
/* pickle, just focus on whatever */
if (cur_focus == NULL) {
/* use prev_focus if valid */
- if (ws->focus_prev && ws->focus_prev != cur_focus &&
- find_window(WINID(ws->focus_prev)))
+ if (ws->focus_prev && find_window(ws->focus_prev->id))
winfocus = ws->focus_prev;
goto done;
}
/* if transient focus on parent */
- if (cur_focus->transient) {
+ if (TRANS(cur_focus)) {
winfocus = find_window(cur_focus->transient);
goto done;
}
if (winfocus == NULL || winfocus == win) {
switch (focus_close) {
case SWM_STACK_BOTTOM:
- winfocus = TAILQ_FIRST(wl);
+ TAILQ_FOREACH(winfocus, wl, entry)
+ if (!ICONIC(winfocus) && winfocus != cur_focus)
+ break;
break;
case SWM_STACK_TOP:
- winfocus = TAILQ_LAST(wl, ws_win_list);
+ TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry)
+ if (!ICONIC(winfocus) && winfocus != cur_focus)
+ break;
break;
case SWM_STACK_ABOVE:
- if ((winfocus = TAILQ_NEXT(cur_focus, entry)) == NULL) {
- if (focus_close_wrap)
- winfocus = TAILQ_FIRST(wl);
- else
- winfocus = TAILQ_PREV(cur_focus,
- ws_win_list, entry);
+ winfocus = TAILQ_NEXT(cur_focus, entry);
+ while (winfocus && ICONIC(winfocus))
+ winfocus = TAILQ_NEXT(winfocus, entry);
+
+ if (winfocus == NULL) {
+ if (focus_close_wrap) {
+ TAILQ_FOREACH(winfocus, wl, entry)
+ if (!ICONIC(winfocus) &&
+ winfocus != cur_focus)
+ break;
+ } else {
+ TAILQ_FOREACH_REVERSE(winfocus, wl,
+ ws_win_list, entry)
+ if (!ICONIC(winfocus) &&
+ winfocus != cur_focus)
+ break;
+ }
}
break;
case SWM_STACK_BELOW:
- if ((winfocus = TAILQ_PREV(cur_focus, ws_win_list,
- entry)) == NULL) {
- if (focus_close_wrap)
- winfocus = TAILQ_LAST(wl, ws_win_list);
- else
- winfocus = TAILQ_NEXT(cur_focus, entry);
+ winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
+ while (winfocus && ICONIC(winfocus))
+ winfocus = TAILQ_PREV(winfocus, ws_win_list,
+ entry);
+
+ if (winfocus == NULL) {
+ if (focus_close_wrap) {
+ TAILQ_FOREACH_REVERSE(winfocus, wl,
+ ws_win_list, entry)
+ if (!ICONIC(winfocus) &&
+ winfocus != cur_focus)
+ break;
+ } else {
+ TAILQ_FOREACH(winfocus, wl, entry)
+ if (!ICONIC(winfocus) &&
+ winfocus != cur_focus)
+ break;
+ }
}
break;
}
}
done:
- if (winfocus == NULL) {
- if (focus_default == SWM_STACK_TOP)
- winfocus = TAILQ_LAST(wl, ws_win_list);
- else
- winfocus = TAILQ_FIRST(wl);
+ if (winfocus == NULL ||
+ (winfocus && (ICONIC(winfocus) || winfocus == cur_focus))) {
+ if (focus_default == SWM_STACK_TOP) {
+ TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry)
+ if (!ICONIC(winfocus) && winfocus != cur_focus)
+ break;
+ } else {
+ TAILQ_FOREACH(winfocus, wl, entry)
+ if (!ICONIC(winfocus) && winfocus != cur_focus)
+ break;
+ }
}
kill_refs(win);
return get_focus_magic(winfocus);
}
+struct ws_win *
+get_region_focus(struct swm_region *r)
+{
+ struct ws_win *winfocus = NULL;
+
+ if (!(r && r->ws))
+ return NULL;
+
+ if (r->ws->focus && !ICONIC(r->ws->focus))
+ winfocus = r->ws->focus;
+ else if (r->ws->focus_prev && !ICONIC(r->ws->focus_prev))
+ winfocus = r->ws->focus_prev;
+ else
+ TAILQ_FOREACH(winfocus, &r->ws->winlist, entry)
+ if (!ICONIC(winfocus))
+ break;
+
+ return get_focus_magic(winfocus);
+}
+
void
focus(struct swm_region *r, union arg *args)
{
- struct ws_win *winfocus = NULL, *head;
- struct ws_win *cur_focus = NULL;
+ struct ws_win *head, *cur_focus = NULL, *winfocus = NULL;
struct ws_win_list *wl = NULL;
struct workspace *ws = NULL;
- int all_iconics;
+ union arg a;
+ int i;
+ xcb_icccm_wm_hints_t hints;
if (!(r && r->ws))
- return;
+ goto out;
DNPRINTF(SWM_D_FOCUS, "focus: id: %d\n", args->id);
- /* treat FOCUS_CUR special */
- if (args->id == SWM_ARG_ID_FOCUSCUR) {
- if (r->ws->focus && r->ws->focus->iconic == 0)
- winfocus = r->ws->focus;
- else if (r->ws->focus_prev && r->ws->focus_prev->iconic == 0)
- winfocus = r->ws->focus_prev;
- else
- TAILQ_FOREACH(winfocus, &r->ws->winlist, entry)
- if (winfocus->iconic == 0)
- break;
-
- focus_win(get_focus_magic(winfocus));
- xcb_flush(conn);
- return;
- }
-
- if ((cur_focus = r->ws->focus) == NULL)
- return;
+ cur_focus = r->ws->focus;
ws = r->ws;
wl = &ws->winlist;
- if (TAILQ_EMPTY(wl))
- return;
- /* make sure there is at least one uniconified window */
- all_iconics = 1;
- TAILQ_FOREACH(winfocus, wl, entry)
- if (winfocus->iconic == 0) {
- all_iconics = 0;
- break;
- }
- if (all_iconics)
- return;
+
+ /* Make sure an uniconified window has focus, if one exists. */
+ if (cur_focus == NULL) {
+ cur_focus = TAILQ_FIRST(wl);
+ while (cur_focus != NULL && ICONIC(cur_focus))
+ cur_focus = TAILQ_NEXT(cur_focus, entry);
+ }
switch (args->id) {
case SWM_ARG_ID_FOCUSPREV:
- head = TAILQ_PREV(cur_focus, ws_win_list, entry);
- if (head == NULL)
- head = TAILQ_LAST(wl, ws_win_list);
- winfocus = head;
- if (WINID(winfocus) == cur_focus->transient) {
- head = TAILQ_PREV(winfocus, ws_win_list, entry);
- if (head == NULL)
- head = TAILQ_LAST(wl, ws_win_list);
- winfocus = head;
- }
+ if (cur_focus == NULL)
+ goto out;
- /* skip iconics */
- if (winfocus && winfocus->iconic) {
- while (winfocus != cur_focus) {
- if (winfocus == NULL)
- winfocus = TAILQ_LAST(wl, ws_win_list);
- if (winfocus->iconic == 0)
- break;
- winfocus = TAILQ_PREV(winfocus, ws_win_list,
- entry);
- }
- }
+ winfocus = cur_focus;
+ do {
+ winfocus = TAILQ_PREV(winfocus, ws_win_list, entry);
+ if (winfocus == NULL)
+ winfocus = TAILQ_LAST(wl, ws_win_list);
+ if (winfocus == cur_focus)
+ break;
+ } while (winfocus != NULL &&
+ (ICONIC(winfocus) || winfocus->id == cur_focus->transient));
break;
-
case SWM_ARG_ID_FOCUSNEXT:
- head = TAILQ_NEXT(cur_focus, entry);
- if (head == NULL)
- head = TAILQ_FIRST(wl);
- winfocus = head;
-
- /* skip iconics */
- if (winfocus && winfocus->iconic) {
- while (winfocus != cur_focus) {
- if (winfocus == NULL)
- winfocus = TAILQ_FIRST(wl);
- if (winfocus->iconic == 0)
- break;
- winfocus = TAILQ_NEXT(winfocus, entry);
- }
- }
- break;
+ if (cur_focus == NULL)
+ goto out;
+ winfocus = cur_focus;
+ do {
+ winfocus = TAILQ_NEXT(winfocus, entry);
+ if (winfocus == NULL)
+ winfocus = TAILQ_FIRST(wl);
+ if (winfocus == cur_focus)
+ break;
+ } while (winfocus != NULL &&
+ (ICONIC(winfocus) || winfocus->id == cur_focus->transient));
+ break;
case SWM_ARG_ID_FOCUSMAIN:
+ if (cur_focus == NULL)
+ goto out;
+
winfocus = TAILQ_FIRST(wl);
if (winfocus == cur_focus)
winfocus = cur_focus->ws->focus_prev;
break;
+ case SWM_ARG_ID_FOCUSURGENT:
+ /* Search forward for the next urgent window. */
+ winfocus = NULL;
+ head = cur_focus;
+
+ for (i = 0; i <= workspace_limit; ++i) {
+ if (head == NULL)
+ head = TAILQ_FIRST(&r->s->ws[(ws->idx + i) %
+ workspace_limit].winlist);
+
+ while (head != NULL &&
+ (head = TAILQ_NEXT(head, entry)) != NULL) {
+ if (head == cur_focus) {
+ winfocus = cur_focus;
+ break;
+ }
+ if (xcb_icccm_get_wm_hints_reply(conn,
+ xcb_icccm_get_wm_hints(conn, head->id),
+ &hints, NULL) != 0 &&
+ xcb_icccm_wm_hints_get_urgency(&hints)) {
+ winfocus = head;
+ break;
+ }
+ }
+
+ if (winfocus != NULL)
+ break;
+ }
+ /* Switch ws if new focus is on a different ws. */
+ if (winfocus != NULL && winfocus->ws != ws) {
+ a.id = winfocus->ws->idx;
+ switchws(r, &a);
+ }
+ break;
default:
- return;
+ goto out;
}
+ if (clear_maximized(ws) > 0)
+ stack();
+
focus_win(get_focus_magic(winfocus));
+ focus_flush();
- xcb_flush(conn);
+out:
+ DNPRINTF(SWM_D_FOCUS, "focus: done\n");
}
void
cycle_layout(struct swm_region *r, union arg *args)
{
struct workspace *ws = r->ws;
- union arg a;
/* suppress unused warning since var is needed */
(void)args;
if (ws->cur_layout->l_stack == NULL)
ws->cur_layout = &layouts[0];
+ clear_maximized(ws);
+
stack();
- bar_update();
+ bar_draw();
- a.id = SWM_ARG_ID_FOCUSCUR;
- focus(r, &a);
+ focus_win(get_region_focus(r));
focus_flush();
}
DNPRINTF(SWM_D_STACK, "stack_config: id: %d workspace: %d\n",
args->id, ws->idx);
+ if (clear_maximized(ws) > 0)
+ stack();
+
if (ws->cur_layout->l_config != NULL)
ws->cur_layout->l_config(ws, args->id);
if (args->id != SWM_ARG_ID_STACKINIT)
stack();
- bar_update();
+ bar_draw();
focus_flush();
}
void
stack(void) {
struct swm_geometry g;
- struct swm_region *r;
+ struct swm_region *r, *r_prev = NULL;
int i, num_screens;
+ uint32_t val[2];
#ifdef SWM_DEBUG
int j;
#endif
DNPRINTF(SWM_D_STACK, "stack: begin\n");
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++) {
#ifdef SWM_DEBUG
j = 0;
#endif
TAILQ_FOREACH(r, &screens[i].rl, entry) {
- DNPRINTF(SWM_D_STACK, "stack: workspace: %d "
- "(screen: %d, region: %d)\n", r->ws->idx, i, j++);
-
- /* start with screen geometry, adjust for bar */
+ /* Adjust stack area for region bar and padding. */
g = r->g;
- g.w -= 2 * border_width;
- g.h -= 2 * border_width;
- if (bar_enabled) {
+ g.x += region_padding;
+ g.y += region_padding;
+ g.w -= 2 * border_width + 2 * region_padding;
+ g.h -= 2 * border_width + 2 * region_padding;
+ if (bar_enabled && r->ws->bar_enabled) {
if (!bar_at_bottom)
g.y += bar_height;
g.h -= bar_height;
}
+
+ DNPRINTF(SWM_D_STACK, "stack: workspace: %d (screen: "
+ "%d, region: %d), (x,y) WxH: (%d,%d) %d x %d\n",
+ r->ws->idx, i, j++, g.x, g.y, g.w, g.h);
+
+ if (r_prev) {
+ /* Stack bar/input relative to prev. region. */
+ val[1] = XCB_STACK_MODE_ABOVE;
+
+ val[0] = r_prev->id;
+ DNPRINTF(SWM_D_STACK, "stack: region input %#x "
+ "relative to %#x.\n", r->id, val[0]);
+ xcb_configure_window(conn, r->id,
+ XCB_CONFIG_WINDOW_SIBLING |
+ XCB_CONFIG_WINDOW_STACK_MODE, val);
+
+ val[0] = r_prev->bar->id;
+ DNPRINTF(SWM_D_STACK, "stack: region bar %#x "
+ "relative to %#x.\n", r->bar->id, val[0]);
+ xcb_configure_window(conn, r->bar->id,
+ XCB_CONFIG_WINDOW_SIBLING |
+ XCB_CONFIG_WINDOW_STACK_MODE, val);
+ }
+
r->ws->cur_layout->l_stack(r->ws, &g);
r->ws->cur_layout->l_string(r->ws);
/* save r so we can track region changes */
r->ws->old_r = r;
+ r_prev = r;
}
}
if (font_adjusted)
}
void
-store_float_geom(struct ws_win *win, struct swm_region *r)
+store_float_geom(struct ws_win *win)
{
- if (win == NULL || r == NULL)
+ if (win == NULL || win->ws->r == NULL)
return;
/* retain window geom and region geom */
win->g_float = win->g;
- win->g_float.x -= X(r);
- win->g_float.y -= Y(r);
+ win->g_float.x -= X(win->ws->r);
+ win->g_float.y -= Y(win->ws->r);
win->g_floatvalid = 1;
- DNPRINTF(SWM_D_MISC, "store_float_geom: window: 0x%x, g: (%d,%d)"
+ DNPRINTF(SWM_D_MISC, "store_float_geom: win %#x, g: (%d,%d)"
" %d x %d, g_float: (%d,%d) %d x %d\n", win->id, X(win), Y(win),
WIDTH(win), HEIGHT(win), win->g_float.x, win->g_float.y,
win->g_float.w, win->g_float.h);
}
void
-load_float_geom(struct ws_win *win, struct swm_region *r)
+load_float_geom(struct ws_win *win)
{
- if (win == NULL || r == NULL)
+ if (win == NULL || win->ws->r == NULL)
return;
if (win->g_floatvalid) {
win->g = win->g_float;
- X(win) += X(r);
- Y(win) += Y(r);
- DNPRINTF(SWM_D_MISC, "load_float_geom: window: 0x%x, g: (%d,%d)"
+ X(win) += X(win->ws->r);
+ Y(win) += Y(win->ws->r);
+ DNPRINTF(SWM_D_MISC, "load_float_geom: win %#x, g: (%d,%d)"
"%d x %d\n", win->id, X(win), Y(win), WIDTH(win),
HEIGHT(win));
} else {
- DNPRINTF(SWM_D_MISC, "load_float_geom: window: 0x%x, g_float "
+ DNPRINTF(SWM_D_MISC, "load_float_geom: win %#x, g_float "
"is not set.\n", win->id);
}
}
void
-stack_floater(struct ws_win *win, struct swm_region *r)
+update_floater(struct ws_win *win)
{
+ struct workspace *ws;
+ struct swm_region *r;
+
if (win == NULL)
return;
- DNPRINTF(SWM_D_MISC, "stack_floater: window: 0x%x\n", win->id);
+ ws = win->ws;
- /*
- * to allow windows to change their size (e.g. mplayer fs) only retrieve
- * geom on ws switches or return from max mode
- */
- if (win->floatmaxed || (r != r->ws->old_r &&
- !(win->ewmh_flags & EWMH_F_FULLSCREEN))) {
- /* update geometry for the new region */
- load_float_geom(win, r);
- }
+ if ((r = ws->r) == NULL)
+ return;
- win->floatmaxed = 0;
+ DNPRINTF(SWM_D_MISC, "update_floater: win %#x\n", win->id);
- /*
- * if set to fullscreen mode, configure window to maximum size.
- */
- if (win->ewmh_flags & EWMH_F_FULLSCREEN) {
+ if (FULLSCREEN(win)) {
+ /* _NET_WM_FULLSCREEN: fullscreen without border. */
if (!win->g_floatvalid)
- store_float_geom(win, win->ws->r);
+ store_float_geom(win);
win->g = r->g;
- }
+ win->bordered = 0;
+ } else if (MAXIMIZED(win)) {
+ /* Maximize: like a single stacked window. */
+ if (!win->g_floatvalid)
+ store_float_geom(win);
- /*
- * remove border on fullscreen floater when in fullscreen mode or when
- * the quirk is present.
- */
- if ((win->ewmh_flags & EWMH_F_FULLSCREEN) ||
- ((win->quirks & SWM_Q_FULLSCREEN) &&
- (WIDTH(win) >= WIDTH(r)) && (HEIGHT(win) >= HEIGHT(r)))) {
- if (win->bordered) {
+ win->g = r->g;
+
+ if (bar_enabled && ws->bar_enabled) {
+ win->bordered = 1;
+ if (!bar_at_bottom)
+ Y(win) += bar_height;
+ HEIGHT(win) -= bar_height;
+ } else if (disable_border) {
win->bordered = 0;
- X(win) += border_width;
- Y(win) += border_width;
+ } else {
+ win->bordered = 1;
}
- } else if (!win->bordered) {
- win->bordered = 1;
- X(win) -= border_width;
- Y(win) -= border_width;
- }
- if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) {
- WIDTH(win) = (double)WIDTH(r) * dialog_ratio;
- HEIGHT(win) = (double)HEIGHT(r) * dialog_ratio;
- }
-
- if (!win->manual && !(win->ewmh_flags & EWMH_F_FULLSCREEN) &&
- !(win->quirks & SWM_Q_ANYWHERE)) {
- /*
- * floaters and transients are auto-centred unless moved,
- * resized or ANYWHERE quirk is set.
- */
- X(win) = X(r) + (WIDTH(r) - WIDTH(win)) / 2 - BORDER(win);
- Y(win) = Y(r) + (HEIGHT(r) - HEIGHT(win)) / 2 - BORDER(win);
+ if (win->bordered) {
+ HEIGHT(win) -= 2 * border_width;
+ WIDTH(win) -= 2 * border_width;
+ }
+ } else {
+ /* Normal floating window. */
+ /* Update geometry if new region. */
+ if (r != ws->old_r)
+ load_float_geom(win);
+
+ if ((win->quirks & SWM_Q_FULLSCREEN) &&
+ WIDTH(win) >= WIDTH(r) && HEIGHT(win) >= HEIGHT(r)) {
+ /* Remove border for FULLSCREEN quirk. */
+ win->bordered = 0;
+ } else if (!MANUAL(win)) {
+ if (TRANS(win) && (win->quirks & SWM_Q_TRANSSZ)) {
+ /* Adjust size on TRANSSZ quirk. */
+ WIDTH(win) = (double)WIDTH(r) * dialog_ratio;
+ HEIGHT(win) = (double)HEIGHT(r) * dialog_ratio;
+ }
- store_float_geom(win, r);
+ if (!(win->quirks & SWM_Q_ANYWHERE)) {
+ /*
+ * Floaters and transients are auto-centred
+ * unless manually moved, resized or ANYWHERE
+ * quirk is set.
+ */
+ X(win) = X(r) + (WIDTH(r) - WIDTH(win)) / 2 -
+ BORDER(win);
+ Y(win) = Y(r) + (HEIGHT(r) - HEIGHT(win)) / 2 -
+ BORDER(win);
+ store_float_geom(win);
+ }
+ }
}
- /* keep window within region bounds */
- constrain_window(win, r, 0);
+ /* Ensure at least 1 pixel of the window is in the region. */
+ region_containment(win, r, SWM_CW_ALLSIDES);
update_window(win);
}
adjust_font(struct ws_win *win)
{
if (!(win->quirks & SWM_Q_XTERM_FONTADJ) ||
- win->floating || win->transient)
+ ABOVE(win) || TRANS(win))
return;
if (win->sh.width_inc && win->last_inc != win->sh.width_inc &&
stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
{
struct swm_geometry win_g, r_g = *g;
- struct ws_win *win, *fs_win = NULL;
+ struct ws_win *win;
int i, j, s, stacks;
int w_inc = 1, h_inc, w_base = 1, h_base;
int hrh, extra = 0, h_slice, last_h = 0;
int split, colno, winno, mwin, msize, mscale;
- int remain, missing, v_slice, reconfigure;
+ int remain, missing, v_slice, reconfigure = 0;
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));
- winno = count_win(ws, 0);
- if (winno == 0 && count_win(ws, 1) == 0)
- return;
+ /* Prepare tiling variables, if needed. */
+ if ((winno = count_win(ws, 0)) > 0) {
+ /* Find first tiled window. */
+ TAILQ_FOREACH(win, &ws->winlist, entry)
+ if (!FLOATING(win) && !ICONIC(win))
+ break;
- TAILQ_FOREACH(win, &ws->winlist, entry)
- if (win->transient == 0 && win->floating == 0
- && win->iconic == 0)
- break;
+ /* Take into account size hints of first tiled window. */
+ if (rot) {
+ w_inc = win->sh.width_inc;
+ w_base = win->sh.base_width;
+ mwin = ws->l_state.horizontal_mwin;
+ mscale = ws->l_state.horizontal_msize;
+ stacks = ws->l_state.horizontal_stacks;
+ SWAPXY(&r_g);
+ } else {
+ w_inc = win->sh.height_inc;
+ w_base = win->sh.base_height;
+ mwin = ws->l_state.vertical_mwin;
+ mscale = ws->l_state.vertical_msize;
+ stacks = ws->l_state.vertical_stacks;
+ }
+ win_g = r_g;
- if (win == NULL)
- goto notiles;
-
- if (rot) {
- w_inc = win->sh.width_inc;
- w_base = win->sh.base_width;
- mwin = ws->l_state.horizontal_mwin;
- mscale = ws->l_state.horizontal_msize;
- stacks = ws->l_state.horizontal_stacks;
- SWAPXY(&r_g);
- } else {
- w_inc = win->sh.height_inc;
- w_base = win->sh.base_height;
- mwin = ws->l_state.vertical_mwin;
- mscale = ws->l_state.vertical_msize;
- stacks = ws->l_state.vertical_stacks;
- }
- win_g = r_g;
+ if (stacks > winno - mwin)
+ stacks = winno - mwin;
+ if (stacks < 1)
+ stacks = 1;
- if (stacks > winno - mwin)
- stacks = winno - mwin;
- if (stacks < 1)
- stacks = 1;
+ h_slice = r_g.h / SWM_H_SLICE;
+ if (mwin && winno > mwin) {
+ v_slice = r_g.w / SWM_V_SLICE;
- h_slice = r_g.h / SWM_H_SLICE;
- if (mwin && winno > mwin) {
- v_slice = r_g.w / SWM_V_SLICE;
+ split = mwin;
+ colno = split;
+ win_g.w = v_slice * mscale;
- split = mwin;
- colno = split;
- win_g.w = v_slice * mscale;
+ if (w_inc > 1 && w_inc < v_slice) {
+ /* Adjust for requested size increment. */
+ remain = (win_g.w - w_base) % w_inc;
+ win_g.w -= remain;
+ }
- if (w_inc > 1 && w_inc < v_slice) {
- /* adjust for window's requested size increment */
- remain = (win_g.w - w_base) % w_inc;
- win_g.w -= remain;
+ msize = win_g.w;
+ if (flip)
+ win_g.x += r_g.w - msize;
+ } else {
+ msize = -2;
+ colno = split = winno / stacks;
+ win_g.w = ((r_g.w - (stacks * 2 * border_width) +
+ 2 * border_width) / stacks);
}
-
- msize = win_g.w;
- if (flip)
- win_g.x += r_g.w - msize;
- } else {
- msize = -2;
- colno = split = winno / stacks;
- win_g.w = ((r_g.w - (stacks * 2 * border_width) +
- 2 * border_width) / stacks);
+ hrh = r_g.h / colno;
+ extra = r_g.h - (colno * hrh);
+ win_g.h = hrh - 2 * border_width;
+ i = j = 0, s = stacks;
}
- hrh = r_g.h / colno;
- extra = r_g.h - (colno * hrh);
- win_g.h = hrh - 2 * border_width;
- /* stack all the tiled windows */
- i = j = 0, s = stacks;
+ /* Update window geometry. */
TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (win->transient != 0 || win->floating != 0)
- continue;
- if (win->iconic != 0)
+ if (ICONIC(win))
continue;
- if (win->ewmh_flags & EWMH_F_FULLSCREEN) {
- fs_win = win;
+ if (FLOATING(win)) {
+ update_floater(win);
continue;
}
+ /* Tiled. */
if (split && i == split) {
colno = (winno - mwin) / stacks;
if (s <= (winno - mwin) % stacks)
colno++;
- split = split + colno;
- hrh = (r_g.h / colno);
+ split += colno;
+ hrh = r_g.h / colno;
extra = r_g.h - (colno * hrh);
- if (flip)
- win_g.x = r_g.x;
- else
- win_g.x += win_g.w + 2 * border_width;
+
+ if (!flip)
+ win_g.x += win_g.w + 2 * border_width +
+ tile_gap;
+
win_g.w = (r_g.w - msize -
- (stacks * 2 * border_width)) / stacks;
+ (stacks * (2 * border_width + tile_gap))) / stacks;
if (s == 1)
win_g.w += (r_g.w - msize -
- (stacks * 2 * border_width)) % stacks;
+ (stacks * (2 * border_width + tile_gap))) %
+ stacks;
+
+ if (flip)
+ win_g.x -= win_g.w + 2 * border_width +
+ tile_gap;
s--;
j = 0;
}
- win_g.h = hrh - 2 * border_width;
- if (rot) {
+
+ win_g.h = hrh - 2 * border_width - tile_gap;
+
+ if (rot) {
h_inc = win->sh.width_inc;
h_base = win->sh.base_width;
} else {
h_inc = win->sh.height_inc;
h_base = win->sh.base_height;
}
+
if (j == colno - 1) {
win_g.h = hrh + extra;
} else if (h_inc > 1 && h_inc < h_slice) {
if (j == 0)
win_g.y = r_g.y;
else
- win_g.y += last_h + 2 * border_width;
+ win_g.y += last_h + 2 * border_width + tile_gap;
- if (disable_border && bar_enabled == 0 && winno == 1){
+ if (disable_border && !(bar_enabled && ws->bar_enabled) &&
+ winno == 1){
bordered = 0;
win_g.w += 2 * border_width;
win_g.h += 2 * border_width;
} else {
bordered = 1;
}
+
if (rot) {
if (X(win) != win_g.y || Y(win) != win_g.x ||
WIDTH(win) != win_g.h || HEIGHT(win) != win_g.w) {
update_window(win);
}
- 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++;
j++;
}
-notiles:
- /* now, stack all the floaters and transients */
- TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (win->transient == 0 && win->floating == 0)
- continue;
- if (win->iconic == 1)
- continue;
- if (win->ewmh_flags & EWMH_F_FULLSCREEN) {
- fs_win = win;
- continue;
- }
+ /* Stack all windows from bottom up. */
+ TAILQ_FOREACH_REVERSE(win, &ws->stack, ws_win_stack, stack_entry)
+ if (!ICONIC(win))
+ update_win_stacking(win);
- stack_floater(win, ws->r);
- map_window_raised(win->id);
- }
+ /* Map all windows from top down. */
+ TAILQ_FOREACH(win, &ws->stack, stack_entry)
+ if (!ICONIC(win))
+ map_window(win);
- if (fs_win) {
- stack_floater(fs_win, ws->r);
- map_window_raised(fs_win->id);
- }
+ DNPRINTF(SWM_D_STACK, "stack_master: done\n");
}
void
max_stack(struct workspace *ws, struct swm_geometry *g)
{
struct swm_geometry gg = *g;
- struct ws_win *win, *wintrans = NULL, *parent = NULL;
- int winno, num_screens;
+ struct ws_win *w, *win = NULL, *parent = NULL;
+ int winno;
DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
if (winno == 0 && count_win(ws, 1) == 0)
return;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (win->transient) {
- wintrans = win;
- parent = find_window(win->transient);
+ /* Figure out which top level window should be visible. */
+ if (ws->focus_pending)
+ win = ws->focus_pending;
+ else if (ws->focus)
+ win = ws->focus;
+ else if (ws->focus_prev)
+ win = ws->focus_prev;
+ else
+ win = TAILQ_FIRST(&ws->winlist);
+
+ DNPRINTF(SWM_D_STACK, "max_stack: focus_pending: %#x, focus: %#x, "
+ "focus_prev: %#x, first: %#x, win: %#x\n", WINID(ws->focus_pending),
+ WINID(ws->focus), WINID(ws->focus_prev),
+ WINID(TAILQ_FIRST(&ws->winlist)), win->id);
+
+ /* Update window geometry. */
+ TAILQ_FOREACH(w, &ws->winlist, entry) {
+ if (ICONIC(w))
+ continue;
+
+ if (TRANS(w)) {
+ update_floater(w);
continue;
}
- if (win->floating && win->floatmaxed == 0 ) {
- /*
- * retain geometry for retrieval on exit from
- * max_stack mode
- */
- store_float_geom(win, ws->r);
- win->floatmaxed = 1;
+ /* Set maximized flag for all maxed windows. */
+ if (!MAXIMIZED(w)) {
+ /* Preserve floating geometry. */
+ if (ABOVE(w))
+ store_float_geom(w);
+
+ ewmh_apply_flags(w, w->ewmh_flags | EWMH_F_MAXIMIZED);
+ ewmh_update_wm_state(w);
}
- /* only reconfigure if necessary */
- if (X(win) != gg.x || Y(win) != gg.y || WIDTH(win) != gg.w ||
- HEIGHT(win) != gg.h) {
- win->g = gg;
- if (bar_enabled){
- win->bordered = 1;
+ /* Only reconfigure if necessary. */
+ if (X(w) != gg.x || Y(w) != gg.y || WIDTH(w) != gg.w ||
+ HEIGHT(w) != gg.h) {
+ w->g = gg;
+ if (bar_enabled && ws->bar_enabled){
+ w->bordered = 1;
} else {
- win->bordered = 0;
- WIDTH(win) += 2 * border_width;
- HEIGHT(win) += 2 * border_width;
+ w->bordered = 0;
+ WIDTH(w) += 2 * border_width;
+ HEIGHT(w) += 2 * border_width;
}
- update_window(win);
+ update_window(w);
}
- /* unmap only if we don't have multi screen */
- if (win != ws->focus)
- if (!(num_screens > 1 || outputs > 1))
- unmap_window(win);
}
- /* put the last transient on top */
- if (wintrans) {
- if (parent)
- map_window_raised(parent->id);
- stack_floater(wintrans, ws->r);
- focus_win(get_focus_magic(wintrans));
+ if (TRANS(win)) {
+ parent = find_window(win->transient);
+ raise_window(parent);
+
+ TAILQ_FOREACH(w, &ws->stack, stack_entry)
+ if (w->transient == parent->id)
+ raise_window(w);
}
+
+ raise_window(win);
+
+ TAILQ_FOREACH(w, &ws->stack, stack_entry)
+ if (w->transient == win->id)
+ raise_window(w);
+
+ /* Map all windows. */
+ TAILQ_FOREACH(w, &ws->stack, stack_entry)
+ if (!ICONIC(w))
+ map_window(w);
}
void
-send_to_ws(struct swm_region *r, union arg *args)
+send_to_rg(struct swm_region *r, union arg *args)
{
- int wsid = args->id;
- struct ws_win *win = NULL, *parent;
- struct workspace *ws, *nws;
- char ws_idx_str[SWM_PROPLEN];
+ int ridx = args->id, i, num_screens;
+ struct swm_region *rr = NULL;
union arg a;
- if (wsid >= workspace_limit)
+ num_screens = get_screen_count();
+ /* do nothing if we don't have more than one screen */
+ if (!(num_screens > 1 || outputs > 1))
return;
+ DNPRINTF(SWM_D_FOCUS, "send_to_rg: id: %d\n", ridx);
+
+ rr = TAILQ_FIRST(&r->s->rl);
+ for (i = 0; i < ridx && rr != NULL; ++i)
+ rr = TAILQ_NEXT(rr, entry);
+
+ if (rr == NULL)
+ return;
+
+ a.id = rr->ws->idx;
+
+ send_to_ws(r, &a);
+}
+
+struct swm_region *
+region_under(struct swm_screen *s, int x, int y)
+{
+ struct swm_region *r = NULL;
+
+ TAILQ_FOREACH(r, &s->rl, entry) {
+ DNPRINTF(SWM_D_MISC, "region_under: ws: %d, region g: (%d,%d) "
+ "%d x %d, coords: (%d,%d)\n", r->ws->idx, X(r), Y(r),
+ WIDTH(r), HEIGHT(r), x, y);
+ if (X(r) <= x && x < MAX_X(r))
+ if (Y(r) <= y && y < MAX_Y(r))
+ return (r);
+ }
+
+ return (NULL);
+}
+
+/* Transfer focused window to target workspace and focus. */
+void
+send_to_ws(struct swm_region *r, union arg *args)
+{
+ int wsid = args->id;
+ struct ws_win *win = NULL;
+
if (r && r->ws && r->ws->focus)
win = r->ws->focus;
else
return;
- if (win == NULL)
+
+ DNPRINTF(SWM_D_MOVE, "send_to_ws: win %#x, ws %d\n", win->id, wsid);
+
+ if (wsid < 0 || wsid >= workspace_limit)
return;
+
if (win->ws->idx == wsid)
return;
- DNPRINTF(SWM_D_MOVE, "send_to_ws: window: 0x%x\n", win->id);
+ win_to_ws(win, wsid, 1);
+
+ /* Set window to be focus on target ws. */
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ win->ws->focus = win;
+ win->ws->focus_pending = NULL;
+ }
+
+ DNPRINTF(SWM_D_STACK, "send_to_ws: focus_pending: %#x, focus: %#x, "
+ "focus_prev: %#x, first: %#x, win: %#x\n",
+ WINID(r->ws->focus_pending), WINID(r->ws->focus),
+ WINID(r->ws->focus_prev), WINID(TAILQ_FIRST(&r->ws->winlist)),
+ win->id);
+
+ ewmh_apply_flags(win, win->ewmh_flags & ~EWMH_F_MAXIMIZED);
+ ewmh_update_wm_state(win);
+
+ /* Restack and set new focus. */
+ if (FLOATING(win))
+ load_float_geom(win);
+
+ stack();
+
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ if (r->ws->focus != NULL) {
+ focus_win(r->ws->focus);
+ } else {
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->id,
+ XCB_CURRENT_TIME);
+ bar_draw();
+ }
+ }
+
+ focus_flush();
+}
+
+void
+win_to_ws(struct ws_win *win, int wsid, int unfocus)
+{
+ struct ws_win *parent;
+ struct workspace *ws, *nws, *pws;
+
+ if (wsid < 0 || wsid >= workspace_limit)
+ return;
+
+ if (win->ws->idx == wsid)
+ return;
ws = win->ws;
nws = &win->s->ws[wsid];
- a.id = SWM_ARG_ID_FOCUSPREV;
- focus(r, &a);
- if (win->transient) {
+ DNPRINTF(SWM_D_MOVE, "win_to_ws: win %#x, ws %d -> %d\n", win->id,
+ ws->idx, wsid);
+
+ /* Cleanup focus on source ws. */
+ if (focus_mode != SWM_FOCUS_FOLLOW &&
+ (ws->focus == win || ws->focus_pending == win))
+ ws->focus_pending = get_focus_prev(win);
+
+ /* Move the parent if this is a transient window. */
+ if (TRANS(win)) {
parent = find_window(win->transient);
if (parent) {
- unmap_window(parent);
+ pws = parent->ws;
+ /* Set new focus in parent's ws if needed. */
+ if (pws->focus == parent) {
+ if (focus_mode != SWM_FOCUS_FOLLOW)
+ pws->focus_pending =
+ get_focus_prev(parent);
+
+ unfocus_win(parent);
+
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ pws->focus = pws->focus_pending;
+ pws->focus_pending = NULL;
+ }
+ }
+
+ /* Don't unmap parent if new ws is visible */
+ if (nws->r == NULL)
+ unmap_window(parent);
+
+ /* Transfer */
TAILQ_REMOVE(&ws->winlist, parent, entry);
+ TAILQ_REMOVE(&ws->stack, parent, stack_entry);
TAILQ_INSERT_TAIL(&nws->winlist, parent, entry);
+ TAILQ_INSERT_TAIL(&nws->stack, parent, stack_entry);
parent->ws = nws;
+
+ DNPRINTF(SWM_D_PROP, "win_to_ws: set property: "
+ "_NET_WM_DESKTOP: %d\n", wsid);
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+ parent->id, ewmh[_NET_WM_DESKTOP].atom,
+ XCB_ATOM_CARDINAL, 32, 1, &wsid);
}
}
- unmap_window(win);
+
+ if (unfocus)
+ unfocus_win(win);
+
+ if (ws->focus_prev == win)
+ ws->focus_prev = NULL;
+
+ if (focus_mode != SWM_FOCUS_FOLLOW && ws->focus_pending != NULL) {
+ ws->focus = ws->focus_pending;
+ ws->focus_pending = NULL;
+ }
+
+ /* Don't unmap if new ws is visible */
+ if (nws->r == NULL)
+ unmap_window(win);
+
+ /* Transfer */
TAILQ_REMOVE(&ws->winlist, win, entry);
+ TAILQ_REMOVE(&ws->stack, win, stack_entry);
TAILQ_INSERT_TAIL(&nws->winlist, win, entry);
- if (TAILQ_EMPTY(&ws->winlist))
- r->ws->focus = NULL;
+ TAILQ_INSERT_TAIL(&nws->stack, win, stack_entry);
win->ws = nws;
- /* Try to update the window's workspace property */
- if (snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) {
- 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,
- a_swm_ws, XCB_ATOM_STRING, 8, strlen(ws_idx_str),
- ws_idx_str);
- }
+ /* Update the window's workspace property: _NET_WM_DESKTOP */
+ DNPRINTF(SWM_D_PROP, "win_to_ws: set property: "
+ "_NET_WM_DESKTOP: %d\n", wsid);
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
+ ewmh[_NET_WM_DESKTOP].atom, XCB_ATOM_CARDINAL, 32, 1, &wsid);
- stack();
- bar_update();
+ ewmh_update_client_list();
- focus_flush();
+ DNPRINTF(SWM_D_MOVE, "win_to_ws: done.\n");
}
void
if (r == NULL || r->ws == NULL)
return;
+ if (r->ws->focus && MAXIMIZED(r->ws->focus))
+ return;
+
r->ws->always_raise = !r->ws->always_raise;
/* bring floaters back to top */
- if (r->ws->always_raise == 0)
+ if (!r->ws->always_raise)
stack();
focus_flush();
void
iconify(struct swm_region *r, union arg *args)
{
- union arg a;
-
+ struct ws_win *w;
/* suppress unused warning since var is needed */
(void)args;
- if (r->ws->focus == NULL)
+ if ((w = r->ws->focus) == NULL)
return;
- unmap_window(r->ws->focus);
- update_iconic(r->ws->focus, 1);
- stack();
- r->ws->focus = NULL;
- a.id = SWM_ARG_ID_FOCUSCUR;
- focus(r, &a);
+ ewmh_apply_flags(w, w->ewmh_flags | EWMH_F_HIDDEN);
+ ewmh_update_wm_state(w);
+
+ stack();
focus_flush();
}
xcb_get_property_reply_t *r;
/* First try _NET_WM_NAME for UTF-8. */
- c = xcb_get_property(conn, 0, win, a_netwmname,
+ c = xcb_get_property(conn, 0, win, ewmh[_NET_WM_NAME].atom,
XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX);
r = xcb_get_property_reply(conn, c, NULL);
-
- if (!r || r->type == XCB_NONE) {
+ if (r && r->type == XCB_NONE) {
free(r);
/* Use WM_NAME instead; no UTF-8. */
c = xcb_get_property(conn, 0, win, XCB_ATOM_WM_NAME,
XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX);
r = xcb_get_property_reply(conn, c, NULL);
-
- if(!r || r->type == XCB_NONE) {
- free(r);
- return NULL;
- }
}
- if (r->length > 0)
+ if (r && r->type != XCB_NONE && r->length > 0)
name = strndup(xcb_get_property_value(r),
xcb_get_property_value_length(r));
+ else
+ name = strdup("");
+
+ if (name == NULL)
+ err(1, "get_win_name: failed to allocate memory.");
free(r);
- return name;
+
+ return (name);
}
void
TAILQ_FOREACH(win, &r->ws->winlist, entry) {
if (win->ws == NULL)
continue; /* should never happen */
- if (win->iconic == 0)
+ if (!ICONIC(win))
continue;
count++;
}
+
+ DNPRINTF(SWM_D_MISC, "uniconify: count: %d\n", count);
+
if (count == 0)
return;
TAILQ_FOREACH(win, &r->ws->winlist, entry) {
if (win->ws == NULL)
continue; /* should never happen */
- if (win->iconic == 0)
+ if (!ICONIC(win))
continue;
name = get_win_name(win->id);
- if (name == NULL)
- continue;
fprintf(lfile, "%s.%u\n", name, win->id);
free(name);
}
i = 1;
TAILQ_FOREACH(win, &r->ws->winlist, entry) {
- if (win->iconic == 1)
+ if (ICONIC(win))
continue;
sw = calloc(1, sizeof(struct search_window));
XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL |
XCB_CW_BORDER_PIXEL, wa);
- map_window_raised(w);
+ xcb_map_window(conn, w);
sw->indicator = w;
TAILQ_INSERT_TAIL(&search_wl, sw, entry);
XftDrawDestroy(draw);
}
- DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w);
+ DNPRINTF(SWM_D_MISC, "search_win: mapped win %#x\n", w);
fprintf(lfile, "%d\n", i);
i++;
}
void
-search_resp_uniconify(char *resp, unsigned long len)
+search_resp_uniconify(const char *resp, size_t len)
{
char *name;
struct ws_win *win;
DNPRINTF(SWM_D_MISC, "search_resp_uniconify: resp: %s\n", resp);
TAILQ_FOREACH(win, &search_r->ws->winlist, entry) {
- if (win->iconic == 0)
+ if (!ICONIC(win))
continue;
name = get_win_name(win->id);
- if (name == NULL)
- continue;
if (asprintf(&s, "%s.%u", name, win->id) == -1) {
free(name);
continue;
free(name);
if (strncmp(s, resp, len) == 0) {
/* XXX this should be a callback to generalize */
- update_iconic(win, 0);
+ ewmh_apply_flags(win, win->ewmh_flags & ~EWMH_F_HIDDEN);
+ ewmh_update_wm_state(win);
+ stack();
free(s);
break;
}
}
void
-search_resp_name_workspace(char *resp, unsigned long len)
+search_resp_name_workspace(const char *resp, size_t len)
{
struct workspace *ws;
"strdup: %s", strerror(errno));
return;
}
+
+ ewmh_update_desktop_names();
+ ewmh_get_desktop_names();
}
}
void
-search_resp_search_workspace(char *resp)
+ewmh_update_desktop_names(void)
+{
+ char *name_list = NULL, *p;
+ int num_screens, i, j, len = 0, tot = 0;
+
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; ++i) {
+ for (j = 0; j < workspace_limit; ++j) {
+ if (screens[i].ws[j].name != NULL)
+ len += strlen(screens[i].ws[j].name);
+ ++len;
+ }
+
+ if((name_list = calloc(sizeof(char *), len)) == NULL)
+ err(1, "update_desktop_names: calloc: failed to "
+ "allocate memory.");
+
+ p = name_list;
+ for (j = 0; j < workspace_limit; ++j) {
+ if (screens[i].ws[j].name != NULL) {
+ len = strlen(screens[i].ws[j].name);
+ memcpy(p, screens[i].ws[j].name, len);
+ } else {
+ len = 0;
+ }
+
+ p += len + 1;
+ tot += len + 1;
+ }
+
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+ screens[i].root, ewmh[_NET_DESKTOP_NAMES].atom,
+ a_utf8_string, 8, tot, name_list);
+
+ free(name_list);
+ name_list = NULL;
+ }
+
+ free(name_list);
+}
+
+void
+ewmh_get_desktop_names(void)
+{
+ char *names = NULL;
+ xcb_get_property_cookie_t c;
+ xcb_get_property_reply_t *r;
+ int num_screens, i, j, n, k;
+
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; ++i) {
+ for (j = 0; j < workspace_limit; ++j) {
+ free(screens[i].ws[j].name);
+ screens[i].ws[j].name = NULL;
+ }
+
+ c = xcb_get_property(conn, 0, screens[i].root,
+ ewmh[_NET_DESKTOP_NAMES].atom,
+ a_utf8_string, 0, UINT32_MAX);
+ r = xcb_get_property_reply(conn, c, NULL);
+ if (r == NULL)
+ continue;
+
+ names = xcb_get_property_value(r);
+ n = xcb_get_property_value_length(r);
+
+ for (j = 0, k = 0; j < n; ++j) {
+ if (*(names + j) != '\0') {
+ screens[i].ws[k].name = strdup(names + j);
+ j += strlen(names + j);
+ }
+ ++k;
+ }
+ free(r);
+ }
+}
+
+void
+ewmh_update_client_list(void)
+{
+ struct ws_win *win;
+ int num_screens, i, j, k = 0, count = 0;
+ xcb_window_t *wins;
+
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; ++i) {
+ for (j = 0; j < workspace_limit; ++j)
+ TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
+ ++count;
+
+ DNPRINTF(SWM_D_PROP, "ewmh_update_client_list: win count: %d\n",
+ count);
+
+ if (count == 0)
+ continue;
+
+ wins = calloc(sizeof(xcb_window_t), count);
+ if (wins == NULL)
+ err(1, "ewmh_update_client_list: calloc: failed to "
+ "allocate memory.");
+
+ for (j = 0, k = 0; j < workspace_limit; ++j)
+ TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
+ wins[k++] = win->id;
+
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+ screens[i].root, ewmh[_NET_CLIENT_LIST].atom,
+ XCB_ATOM_WINDOW, 32, count, wins);
+
+ free(wins);
+ }
+}
+
+void
+ewmh_update_current_desktop(void)
+{
+ int num_screens, i;
+
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; ++i)
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+ screens[i].root, ewmh[_NET_CURRENT_DESKTOP].atom,
+ XCB_ATOM_CARDINAL, 32, 1, &screens[i].r_focus->ws->idx);
+}
+
+void
+ewmh_update_desktops(void)
+{
+ int num_screens, i, j;
+ uint32_t *vals;
+
+ vals = calloc(sizeof(uint32_t), workspace_limit * 2);
+ if (vals == NULL)
+ err(1, "ewmh_update_desktops: calloc: failed to allocate "
+ "memory.");
+
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; i++) {
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+ screens[i].root, ewmh[_NET_NUMBER_OF_DESKTOPS].atom,
+ XCB_ATOM_CARDINAL, 32, 1, &workspace_limit);
+
+ for (j = 0; j < workspace_limit; ++j) {
+ if (screens[i].ws[j].r != NULL) {
+ vals[j * 2] = X(screens[i].ws[j].r);
+ vals[j * 2 + 1] = Y(screens[i].ws[j].r);
+ } else if (screens[i].ws[j].old_r != NULL) {
+ vals[j * 2] = X(screens[i].ws[j].old_r);
+ vals[j * 2 + 1] = Y(screens[i].ws[j].old_r);
+ } else {
+ vals[j * 2] = vals[j * 2 + 1] = 0;
+ }
+ }
+
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+ screens[i].root, ewmh[_NET_DESKTOP_VIEWPORT].atom,
+ XCB_ATOM_CARDINAL, 32, workspace_limit * 2, vals);
+ }
+
+ free(vals);
+}
+
+void
+search_resp_search_workspace(const char *resp)
{
char *p, *q;
int ws_idx;
DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: resp: %s\n", resp);
q = strdup(resp);
- if (!q) {
+ if (q == NULL) {
DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: strdup: %s",
strerror(errno));
return;
}
void
-search_resp_search_window(char *resp)
+search_resp_search_window(const char *resp)
{
char *s;
int idx;
DNPRINTF(SWM_D_MISC, "search_resp_search_window: resp: %s\n", resp);
s = strdup(resp);
- if (!s) {
+ if (s == NULL) {
DNPRINTF(SWM_D_MISC, "search_resp_search_window: strdup: %s",
strerror(errno));
return;
{
ssize_t rbytes;
char *resp;
- unsigned long len;
+ size_t len;
DNPRINTF(SWM_D_MISC, "search_do_resp:\n");
void
wkill(struct swm_region *r, union arg *args)
{
- DNPRINTF(SWM_D_MISC, "wkill: id: %d\n", args->id);
+ DNPRINTF(SWM_D_MISC, "wkill: win %#x, id: %d\n", WINID(r->ws->focus),
+ args->id);
if (r->ws->focus == NULL)
return;
xcb_kill_client(conn, r->ws->focus->id);
else
if (r->ws->focus->can_delete)
- client_msg(r->ws->focus, a_delete);
+ client_msg(r->ws->focus, a_delete, 0);
- xcb_flush(conn);
+ focus_flush();
}
-
int
-floating_toggle_win(struct ws_win *win)
+clear_maximized(struct workspace *ws)
{
- struct swm_region *r;
+ struct ws_win *w;
+ int count = 0;
- if (win == NULL)
- return (0);
+ /* Clear any maximized win(s) on ws, from bottom up. */
+ TAILQ_FOREACH_REVERSE(w, &ws->stack, ws_win_stack, stack_entry)
+ if (MAXIMIZED(w)) {
+ ewmh_apply_flags(w, w->ewmh_flags & ~EWMH_F_MAXIMIZED);
+ ewmh_update_wm_state(w);
+ ++count;
+ }
- if (!win->ws->r)
- return (0);
+ return count;
+}
- r = win->ws->r;
+void
+maximize_toggle(struct swm_region *r, union arg *args)
+{
+ struct ws_win *w = r->ws->focus;
- /* reject floating toggles in max stack mode */
- if (win->ws->cur_layout == &layouts[SWM_MAX_STACK])
- return (0);
+ /* suppress unused warning since var is needed */
+ (void)args;
- if (win->floating) {
- if (!win->floatmaxed) {
- /* retain position for refloat */
- store_float_geom(win, r);
- }
- win->floating = 0;
- } else {
- load_float_geom(win, r);
- win->floating = 1;
- }
+ if (w == NULL)
+ return;
- ewmh_update_actions(win);
+ DNPRINTF(SWM_D_MISC, "maximize_toggle: win %#x\n", w->id);
- return (1);
+ if (FULLSCREEN(w))
+ return;
+
+ if (w->ws->cur_layout == &layouts[SWM_MAX_STACK])
+ return;
+
+ ewmh_apply_flags(w, w->ewmh_flags ^ EWMH_F_MAXIMIZED);
+ ewmh_update_wm_state(w);
+
+ stack();
+
+ if (w == w->ws->focus)
+ focus_win(w);
+
+ focus_flush();
+ DNPRINTF(SWM_D_MISC, "maximize_toggle: done\n");
}
void
floating_toggle(struct swm_region *r, union arg *args)
{
- struct ws_win *win = r->ws->focus;
- union arg a;
+ struct ws_win *w = r->ws->focus;
/* suppress unused warning since var is needed */
(void)args;
- if (win == NULL)
+ if (w == NULL)
+ return;
+
+ DNPRINTF(SWM_D_MISC, "floating_toggle: win %#x\n", w->id);
+
+ if (FULLSCREEN(w) || TRANS(w))
return;
- if (win->ewmh_flags & EWMH_F_FULLSCREEN)
+ if (w->ws->cur_layout == &layouts[SWM_MAX_STACK])
return;
- ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom,
- _NET_WM_STATE_TOGGLE);
+ ewmh_apply_flags(w, w->ewmh_flags ^ EWMH_F_ABOVE);
+ ewmh_update_wm_state(w);
stack();
- if (win == win->ws->focus) {
- a.id = SWM_ARG_ID_FOCUSCUR;
- focus(win->ws->r, &a);
- }
+ if (w == w->ws->focus)
+ focus_win(w);
focus_flush();
+ DNPRINTF(SWM_D_MISC, "floating_toggle: done\n");
}
void
-constrain_window(struct ws_win *win, struct swm_region *r, int resizable)
+region_containment(struct ws_win *win, struct swm_region *r, int opts)
{
- if (MAX_X(win) + BORDER(win) > MAX_X(r)) {
- if (resizable)
- WIDTH(win) = MAX_X(r) - X(win) - BORDER(win);
+ struct swm_geometry g = r->g;
+ int rt, lt, tp, bm, bw;
+
+ bw = (opts & SWM_CW_SOFTBOUNDARY) ? boundary_width : 0;
+
+ /*
+ * Perpendicular distance of each side of the window to the respective
+ * side of the region boundary. Positive values indicate the side of
+ * the window has passed beyond the region boundary.
+ */
+ rt = opts & SWM_CW_RIGHT ? MAX_X(win) + BORDER(win) - MAX_X(r) : bw;
+ lt = opts & SWM_CW_LEFT ? X(r) - X(win) + BORDER(win) : bw;
+ bm = opts & SWM_CW_BOTTOM ? MAX_Y(win) + BORDER(win) - MAX_Y(r) : bw;
+ tp = opts & SWM_CW_TOP ? Y(r) - Y(win) + BORDER(win) : bw;
+
+ DNPRINTF(SWM_D_MISC, "region_containment: win %#x, rt: %d, lt: %d, "
+ "bm: %d, tp: %d, SOFTBOUNDARY: %s, HARDBOUNDARY: %s\n", win->id, rt,
+ lt, bm, tp, YESNO(opts & SWM_CW_SOFTBOUNDARY),
+ YESNO(opts & SWM_CW_HARDBOUNDARY));
+
+ /*
+ * Disable containment if any of the flagged sides went beyond the
+ * containment boundary, or if containment is disabled.
+ */
+ if (!(opts & SWM_CW_HARDBOUNDARY || opts & SWM_CW_SOFTBOUNDARY) ||
+ (bw != 0 && ((rt > bw) || (lt > bw) || (bm > bw) || (tp > bw)))) {
+ /* Make sure window has at least 1 pixel in the region */
+ g.x += 1 - WIDTH(win);
+ g.y += 1 - HEIGHT(win);
+ g.w += 2 * WIDTH(win) - 2;
+ g.h += 2 * HEIGHT(win) - 2;
+ }
+
+ constrain_window(win, &g, &opts);
+}
+
+/* Move or resize a window so that flagged side(s) fit into the supplied box. */
+void
+constrain_window(struct ws_win *win, struct swm_geometry *b, int *opts)
+{
+ DNPRINTF(SWM_D_MISC, "constrain_window: win %#x, (x,y) w x h: "
+ "(%d,%d) %d x %d, box: (x,y) w x h: (%d,%d) %d x %d, rt: %s, "
+ "lt: %s, bt: %s, tp: %s, allow resize: %s\n", win->id, X(win),
+ Y(win), WIDTH(win), HEIGHT(win), b->x, b->y, b->w, b->h,
+ YESNO(*opts & SWM_CW_RIGHT), YESNO(*opts & SWM_CW_LEFT),
+ YESNO(*opts & SWM_CW_BOTTOM), YESNO(*opts & SWM_CW_TOP),
+ YESNO(*opts & SWM_CW_RESIZABLE));
+
+ if ((*opts & SWM_CW_RIGHT) && MAX_X(win) + BORDER(win) > b->x + b->w) {
+ if (*opts & SWM_CW_RESIZABLE)
+ WIDTH(win) = b->x + b->w - X(win) - BORDER(win);
else
- X(win) = MAX_X(r)- WIDTH(win) - BORDER(win);
+ X(win) = b->x + b->w - WIDTH(win) - BORDER(win);
}
- if (X(win) + BORDER(win) < X(r)) {
- if (resizable)
- WIDTH(win) -= X(r) - X(win) - BORDER(win);
+ if ((*opts & SWM_CW_LEFT) && X(win) + BORDER(win) < b->x) {
+ if (*opts & SWM_CW_RESIZABLE)
+ WIDTH(win) -= b->x - X(win) - BORDER(win);
- X(win) = X(r) - BORDER(win);
+ X(win) = b->x - BORDER(win);
}
- if (MAX_Y(win) + BORDER(win) > MAX_Y(r)) {
- if (resizable)
- HEIGHT(win) = MAX_Y(r) - Y(win) - BORDER(win);
+ if ((*opts & SWM_CW_BOTTOM) && MAX_Y(win) + BORDER(win) > b->y + b->h) {
+ if (*opts & SWM_CW_RESIZABLE)
+ HEIGHT(win) = b->y + b->h - Y(win) - BORDER(win);
else
- Y(win) = MAX_Y(r) - HEIGHT(win) - BORDER(win);
+ Y(win) = b->y + b->h - HEIGHT(win) - BORDER(win);
}
- if (Y(win) + BORDER(win) < Y(r)) {
- if (resizable)
- HEIGHT(win) -= Y(r) - Y(win) - BORDER(win);
+ if ((*opts & SWM_CW_TOP) && Y(win) + BORDER(win) < b->y) {
+ if (*opts & SWM_CW_RESIZABLE)
+ HEIGHT(win) -= b->y - Y(win) - BORDER(win);
- Y(win) = Y(r) - BORDER(win);
+ Y(win) = b->y - BORDER(win);
}
- if (resizable) {
+ if (*opts & SWM_CW_RESIZABLE) {
if (WIDTH(win) < 1)
WIDTH(win) = 1;
if (HEIGHT(win) < 1)
wc[3] = HEIGHT(win);
wc[4] = BORDER(win);
- DNPRINTF(SWM_D_EVENT, "update_window: window: 0x%x, (x,y) w x h: "
+ DNPRINTF(SWM_D_EVENT, "update_window: win %#x, (x,y) w x h: "
"(%d,%d) %d x %d, bordered: %s\n", win->id, wc[0], wc[1], wc[2],
wc[3], YESNO(win->bordered));
{
xcb_timestamp_t timestamp = 0;
struct swm_region *r = NULL;
- int resize_step = 0;
struct swm_geometry g;
+ int resize_stp = 0;
int top = 0, left = 0, resizing;
int dx, dy;
- unsigned int shape; /* cursor style */
- xcb_cursor_t cursor;
- xcb_font_t cursor_font;
- xcb_query_pointer_reply_t *xpr;
+ xcb_cursor_t cursor;
+ xcb_query_pointer_reply_t *xpr = NULL;
xcb_generic_event_t *evt;
xcb_motion_notify_event_t *mne;
return;
r = win->ws->r;
- if (win->ewmh_flags & EWMH_F_FULLSCREEN)
+ if (FULLSCREEN(win))
return;
- DNPRINTF(SWM_D_EVENT, "resize: window: 0x%x, floating: %s, "
- "transient: 0x%x\n", win->id, YESNO(win->floating),
- win->transient);
-
- if (!(win->transient != 0 || win->floating != 0))
+ /* In max_stack mode, should only resize transients. */
+ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !TRANS(win))
return;
- /* reject resizes in max mode for floaters (transient ok) */
- if (win->floatmaxed)
+ DNPRINTF(SWM_D_EVENT, "resize: win %#x, floating: %s, "
+ "transient: %#x\n", win->id, YESNO(ABOVE(win)),
+ win->transient);
+
+ if (MAXIMIZED(win))
+ store_float_geom(win);
+ else if (!(TRANS(win) || ABOVE(win)))
return;
- win->manual = 1;
- ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom,
- _NET_WM_STATE_ADD);
+ ewmh_apply_flags(win, (win->ewmh_flags | SWM_F_MANUAL | EWMH_F_ABOVE) &
+ ~EWMH_F_MAXIMIZED);
+ ewmh_update_wm_state(win);
stack();
focus_flush();
+ /* It's possible for win to have been freed during focus_flush(). */
+ if (validate_win(win)) {
+ DNPRINTF(SWM_D_EVENT, "resize: invalid win.\n");
+ goto out;
+ }
+
switch (args->id) {
case SWM_ARG_ID_WIDTHSHRINK:
WIDTH(win) -= SWM_RESIZE_STEPS;
- resize_step = 1;
+ resize_stp = 1;
break;
case SWM_ARG_ID_WIDTHGROW:
WIDTH(win) += SWM_RESIZE_STEPS;
- resize_step = 1;
+ resize_stp = 1;
break;
case SWM_ARG_ID_HEIGHTSHRINK:
HEIGHT(win) -= SWM_RESIZE_STEPS;
- resize_step = 1;
+ resize_stp = 1;
break;
case SWM_ARG_ID_HEIGHTGROW:
HEIGHT(win) += SWM_RESIZE_STEPS;
- resize_step = 1;
+ resize_stp = 1;
break;
default:
break;
}
- if (resize_step) {
- constrain_window(win, r, 1);
+ if (resize_stp) {
+ region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE |
+ SWM_CW_HARDBOUNDARY);
update_window(win);
- store_float_geom(win,r);
+ store_float_geom(win);
return;
}
+ region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE |
+ SWM_CW_SOFTBOUNDARY);
+ update_window(win);
+
/* get cursor offset from window root */
xpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id),
NULL);
- if (!xpr)
+ if (xpr == NULL)
return;
g = win->g;
top = 1;
if (args->id == SWM_ARG_ID_CENTER)
- shape = XC_sizing;
+ cursor = cursors[XC_SIZING].cid;
else if (top)
- shape = (left) ? XC_top_left_corner : XC_top_right_corner;
+ cursor = cursors[left ? XC_TOP_LEFT_CORNER :
+ XC_TOP_RIGHT_CORNER].cid;
else
- shape = (left) ? XC_bottom_left_corner : XC_bottom_right_corner;
-
- 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);
+ cursor = cursors[left ? XC_BOTTOM_LEFT_CORNER :
+ XC_BOTTOM_RIGHT_CORNER].cid;
xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, cursor,
xcb_flush(conn);
resizing = 1;
- while ((evt = xcb_wait_for_event(conn)) && resizing) {
+ while (resizing && (evt = xcb_wait_for_event(conn))) {
switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
case XCB_BUTTON_RELEASE:
DNPRINTF(SWM_D_EVENT, "resize: BUTTON_RELEASE\n");
WIDTH(win) = g.w + dx;
}
- constrain_window(win, r, 1);
-
/* not free, don't sync more than 120 times / second */
if ((mne->time - timestamp) > (1000 / 120) ) {
timestamp = mne->time;
+ regionize(win, mne->root_x, mne->root_y);
+ region_containment(win, r, SWM_CW_ALLSIDES |
+ SWM_CW_RESIZABLE | SWM_CW_HARDBOUNDARY |
+ SWM_CW_SOFTBOUNDARY);
update_window(win);
xcb_flush(conn);
}
break;
+ case XCB_KEY_PRESS:
+ /* Ignore. */
+ xcb_allow_events(conn, XCB_ALLOW_ASYNC_KEYBOARD,
+ ((xcb_key_press_event_t *)evt)->time);
+ xcb_flush(conn);
+ break;
default:
event_handle(evt);
+
+ /* It's possible for win to have been freed above. */
+ if (validate_win(win)) {
+ DNPRINTF(SWM_D_EVENT, "resize: invalid win.\n");
+ goto out;
+ }
break;
}
free(evt);
}
if (timestamp) {
+ region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE |
+ SWM_CW_HARDBOUNDARY | SWM_CW_SOFTBOUNDARY);
update_window(win);
xcb_flush(conn);
}
- store_float_geom(win,r);
-
+ store_float_geom(win);
+out:
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
- xcb_free_cursor(conn, cursor);
- xcb_close_font(conn, cursor_font);
free(xpr);
- DNPRINTF(SWM_D_EVENT, "resize: done\n");
+ DNPRINTF(SWM_D_EVENT, "resize: done.\n");
}
void
return;
resize(win, args);
+ focus_flush();
+}
+
+/* Try to set window region based on supplied coordinates or window center. */
+void
+regionize(struct ws_win *win, int x, int y)
+{
+ struct swm_region *r = NULL;
+
+ r = region_under(win->s, x, y);
+ if (r == NULL)
+ r = region_under(win->s, X(win) + WIDTH(win) / 2,
+ Y(win) + HEIGHT(win) / 2);
+
+ if (r != NULL && r != win->ws->r) {
+ if (clear_maximized(r->ws) > 0)
+ stack();
+
+ win_to_ws(win, r->ws->idx, 0);
+
+ /* Set focus on new ws. */
+ unfocus_win(r->ws->focus);
+ r->ws->focus = win;
+
+ set_region(r);
+ raise_window(win);
+ }
}
#define SWM_MOVE_STEPS (50)
void
move(struct ws_win *win, union arg *args)
{
- xcb_timestamp_t timestamp = 0;
- int move_step = 0, moving;
- struct swm_region *r = NULL;
- xcb_font_t cursor_font;
- xcb_cursor_t cursor;
- xcb_query_pointer_reply_t *qpr;
+ struct swm_region *r;
+ xcb_timestamp_t timestamp = 0;
+ int move_stp = 0, moving, restack = 0;
+ xcb_query_pointer_reply_t *qpr = NULL;
xcb_generic_event_t *evt;
xcb_motion_notify_event_t *mne;
if (win == NULL)
return;
- r = win->ws->r;
- if (win->ewmh_flags & EWMH_F_FULLSCREEN)
+ if ((r = win->ws->r) == NULL)
return;
- DNPRINTF(SWM_D_EVENT, "move: window: 0x%x, floating: %s, transient: "
- "0x%x\n", win->id, YESNO(win->floating), win->transient);
+ if (FULLSCREEN(win))
+ return;
+
+ DNPRINTF(SWM_D_EVENT, "move: win %#x, floating: %s, transient: "
+ "%#x\n", win->id, YESNO(ABOVE(win)), win->transient);
/* in max_stack mode should only move transients */
- if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !win->transient)
+ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !TRANS(win))
return;
- win->manual = 1;
- if (win->floating == 0 && !win->transient) {
- store_float_geom(win, r);
- ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom,
- _NET_WM_STATE_ADD);
+ if (!(ABOVE(win) || TRANS(win)) || MAXIMIZED(win)) {
+ store_float_geom(win);
+ restack = 1;
}
- ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom,
- _NET_WM_STATE_ADD);
- stack();
+ ewmh_apply_flags(win, (win->ewmh_flags | SWM_F_MANUAL | EWMH_F_ABOVE) &
+ ~EWMH_F_MAXIMIZED);
+ ewmh_update_wm_state(win);
+
+ if (restack)
+ stack();
focus_flush();
- move_step = 0;
+ /* It's possible for win to have been freed during focus_flush(). */
+ if (validate_win(win)) {
+ DNPRINTF(SWM_D_EVENT, "move: invalid win.\n");
+ goto out;
+ }
+
+ move_stp = 0;
switch (args->id) {
case SWM_ARG_ID_MOVELEFT:
X(win) -= (SWM_MOVE_STEPS - border_width);
- move_step = 1;
+ move_stp = 1;
break;
case SWM_ARG_ID_MOVERIGHT:
X(win) += (SWM_MOVE_STEPS - border_width);
- move_step = 1;
+ move_stp = 1;
break;
case SWM_ARG_ID_MOVEUP:
Y(win) -= (SWM_MOVE_STEPS - border_width);
- move_step = 1;
+ move_stp = 1;
break;
case SWM_ARG_ID_MOVEDOWN:
Y(win) += (SWM_MOVE_STEPS - border_width);
- move_step = 1;
+ move_stp = 1;
break;
default:
break;
}
- if (move_step) {
- constrain_window(win, r, 0);
+ if (move_stp) {
+ regionize(win, -1, -1);
+ region_containment(win, win->ws->r, SWM_CW_ALLSIDES);
update_window(win);
- store_float_geom(win, r);
+ store_float_geom(win);
return;
}
- 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);
-
xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
- XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME);
+ XCB_WINDOW_NONE, cursors[XC_FLEUR].cid, XCB_CURRENT_TIME);
/* get cursor offset from window root */
qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id),
NULL);
- if (!qpr) {
+ if (qpr == NULL) {
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
- xcb_free_cursor(conn, cursor);
- xcb_close_font(conn, cursor_font);
return;
}
+ regionize(win, qpr->root_x, qpr->root_y);
+ region_containment(win, win->ws->r, SWM_CW_ALLSIDES |
+ SWM_CW_SOFTBOUNDARY);
+ update_window(win);
xcb_flush(conn);
moving = 1;
- while ((evt = xcb_wait_for_event(conn)) && moving) {
+ while (moving && (evt = xcb_wait_for_event(conn))) {
switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
case XCB_BUTTON_RELEASE:
DNPRINTF(SWM_D_EVENT, "move: BUTTON_RELEASE\n");
break;
case XCB_MOTION_NOTIFY:
mne = (xcb_motion_notify_event_t *)evt;
+ DNPRINTF(SWM_D_EVENT, "motion: root: %#x\n", mne->root);
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 ((mne->time - timestamp) > (1000 / 120) ) {
timestamp = mne->time;
- update_window(win);
- xcb_flush(conn);
- }
- break;
- default:
- event_handle(evt);
- break;
- }
- free(evt);
- }
- if (timestamp) {
- update_window(win);
- xcb_flush(conn);
- }
- 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);
- DNPRINTF(SWM_D_EVENT, "move: done\n");
-}
-
-void
-move_step(struct swm_region *r, union arg *args)
-{
- struct ws_win *win = NULL;
-
- if (r && r->ws && r->ws->focus)
- win = r->ws->focus;
- else
- return;
-
- if (!(win->transient != 0 || win->floating != 0))
- return;
-
- move(win, args);
-}
-
-
-/* user/key callable function IDs */
-enum keyfuncid {
- 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
-};
+ regionize(win, mne->root_x, mne->root_y);
+ region_containment(win, win->ws->r,
+ SWM_CW_ALLSIDES | SWM_CW_SOFTBOUNDARY);
+ update_window(win);
+ xcb_flush(conn);
+ }
+ break;
+ case XCB_KEY_PRESS:
+ /* Ignore. */
+ xcb_allow_events(conn, XCB_ALLOW_ASYNC_KEYBOARD,
+ ((xcb_key_press_event_t *)evt)->time);
+ xcb_flush(conn);
+ break;
+ default:
+ event_handle(evt);
+
+ /* It's possible for win to have been freed above. */
+ if (validate_win(win)) {
+ DNPRINTF(SWM_D_EVENT, "move: invalid win.\n");
+ goto out;
+ }
+ break;
+ }
+ free(evt);
+ }
+ if (timestamp) {
+ region_containment(win, win->ws->r, SWM_CW_ALLSIDES |
+ SWM_CW_SOFTBOUNDARY);
+ update_window(win);
+ xcb_flush(conn);
+ }
+ store_float_geom(win);
+
+ /* New region set to fullscreen layout. */
+ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK]) {
+ stack();
+ focus_flush();
+ }
+
+out:
+ free(qpr);
+ xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
+ DNPRINTF(SWM_D_EVENT, "move: done.\n");
+}
+
+void
+move_step(struct swm_region *r, union arg *args)
+{
+ struct ws_win *win = NULL;
+
+ if (r && r->ws && r->ws->focus)
+ win = r->ws->focus;
+ else
+ return;
+
+ if (!TRANS(win) && !ABOVE(win))
+ return;
+
+ move(win, args);
+ focus_flush();
+}
/* key definitions */
struct keyfunc {
union arg args;
} keyfuncs[KF_INVALID + 1] = {
/* name function argument */
- { "bar_toggle", bar_toggle, {0} },
+ { "bar_toggle", bar_toggle, {.id = SWM_ARG_ID_BAR_TOGGLE} },
+ { "bar_toggle_ws", bar_toggle, {.id = SWM_ARG_ID_BAR_TOGGLE_WS} },
{ "button2", pressbutton, {2} },
{ "cycle_layout", cycle_layout, {0} },
{ "flip_layout", stack_config, {.id = SWM_ARG_ID_FLIPLAYOUT} },
{ "focus_main", focus, {.id = SWM_ARG_ID_FOCUSMAIN} },
{ "focus_next", focus, {.id = SWM_ARG_ID_FOCUSNEXT} },
{ "focus_prev", focus, {.id = SWM_ARG_ID_FOCUSPREV} },
+ { "focus_urgent", focus, {.id = SWM_ARG_ID_FOCUSURGENT} },
+ { "maximize_toggle", maximize_toggle,{0} },
{ "height_grow", resize_step, {.id = SWM_ARG_ID_HEIGHTGROW} },
{ "height_shrink", resize_step, {.id = SWM_ARG_ID_HEIGHTSHRINK} },
{ "iconify", iconify, {0} },
{ "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} },
+ { "mvrg_1", send_to_rg, {.id = 0} },
+ { "mvrg_2", send_to_rg, {.id = 1} },
+ { "mvrg_3", send_to_rg, {.id = 2} },
+ { "mvrg_4", send_to_rg, {.id = 3} },
+ { "mvrg_5", send_to_rg, {.id = 4} },
+ { "mvrg_6", send_to_rg, {.id = 5} },
+ { "mvrg_7", send_to_rg, {.id = 6} },
+ { "mvrg_8", send_to_rg, {.id = 7} },
+ { "mvrg_9", send_to_rg, {.id = 8} },
{ "mvws_1", send_to_ws, {.id = 0} },
{ "mvws_2", send_to_ws, {.id = 1} },
{ "mvws_3", send_to_ws, {.id = 2} },
{ "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} },
+ { "rg_1", focusrg, {.id = 0} },
+ { "rg_2", focusrg, {.id = 1} },
+ { "rg_3", focusrg, {.id = 2} },
+ { "rg_4", focusrg, {.id = 3} },
+ { "rg_5", focusrg, {.id = 4} },
+ { "rg_6", focusrg, {.id = 5} },
+ { "rg_7", focusrg, {.id = 6} },
+ { "rg_8", focusrg, {.id = 7} },
+ { "rg_9", focusrg, {.id = 8} },
+ { "rg_next", cyclerg, {.id = SWM_ARG_ID_CYCLERG_UP} },
+ { "rg_prev", cyclerg, {.id = SWM_ARG_ID_CYCLERG_DOWN} },
+ { "screen_next", cyclerg, {.id = SWM_ARG_ID_CYCLERG_UP} },
+ { "screen_prev", cyclerg, {.id = SWM_ARG_ID_CYCLERG_DOWN} },
{ "search_win", search_win, {0} },
{ "search_workspace", search_workspace, {0} },
{ "spawn_custom", NULL, {0} },
{ "ws_22", switchws, {.id = 21} },
{ "ws_next", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP} },
{ "ws_next_all", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP_ALL} },
+ { "ws_next_move", cyclews, {.id = SWM_ARG_ID_CYCLEWS_MOVE_UP} },
{ "ws_prev", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} },
{ "ws_prev_all", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN_ALL} },
+ { "ws_prev_move", cyclews, {.id = SWM_ARG_ID_CYCLEWS_MOVE_DOWN} },
{ "ws_prior", priorws, {0} },
{ "dumpwins", dumpwins, {0} }, /* MUST BE LAST */
{ "invalid key func", NULL, {0} },
};
-struct key {
- RB_ENTRY(key) entry;
- unsigned int mod;
- KeySym keysym;
- enum keyfuncid funcid;
- char *spawn_name;
-};
-RB_HEAD(key_tree, key);
int
key_cmp(struct key *kp1, struct key *kp2)
return (0);
}
-RB_GENERATE(key_tree, key, entry, key_cmp);
-struct key_tree keys;
-
/* mouse */
enum { client_click, root_click };
struct button {
buttons[i].mask = mod;
}
-/* spawn */
-struct spawn_prog {
- TAILQ_ENTRY(spawn_prog) entry;
- char *name;
- int argc;
- char **argv;
-};
-TAILQ_HEAD(spawn_list, spawn_prog);
-struct spawn_list spawns = TAILQ_HEAD_INITIALIZER(spawns);
-
int
-spawn_expand(struct swm_region *r, union arg *args, char *spawn_name,
+spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name,
char ***ret_args)
{
struct spawn_prog *prog = NULL;
- int i;
+ int i, c;
char *ap, **real_args;
/* suppress unused warning since var is needed */
/* find program */
TAILQ_FOREACH(prog, &spawns, entry) {
- if (!strcasecmp(spawn_name, prog->name))
+ if (strcasecmp(spawn_name, prog->name) == 0)
break;
}
if (prog == NULL) {
err(1, "spawn_custom: calloc real_args");
/* expand spawn_args into real_args */
- for (i = 0; i < prog->argc; i++) {
+ for (i = c = 0; i < prog->argc; i++) {
ap = prog->argv[i];
DNPRINTF(SWM_D_SPAWN, "spawn_custom: raw arg: %s\n", ap);
- if (!strcasecmp(ap, "$bar_border")) {
- if ((real_args[i] =
+ if (strcasecmp(ap, "$bar_border") == 0) {
+ if ((real_args[c] =
strdup(r->s->c[SWM_S_COLOR_BAR_BORDER].name))
== NULL)
err(1, "spawn_custom border color");
- } else if (!strcasecmp(ap, "$bar_color")) {
- if ((real_args[i] =
+ } else if (strcasecmp(ap, "$bar_color") == 0) {
+ if ((real_args[c] =
strdup(r->s->c[SWM_S_COLOR_BAR].name))
== NULL)
err(1, "spawn_custom bar color");
- } else if (!strcasecmp(ap, "$bar_font")) {
- if ((real_args[i] = strdup(bar_fonts))
+ } else if (strcasecmp(ap, "$bar_font") == 0) {
+ if ((real_args[c] = strdup(bar_fonts))
== NULL)
err(1, "spawn_custom bar fonts");
- } else if (!strcasecmp(ap, "$bar_font_color")) {
- if ((real_args[i] =
+ } else if (strcasecmp(ap, "$bar_font_color") == 0) {
+ if ((real_args[c] =
strdup(r->s->c[SWM_S_COLOR_BAR_FONT].name))
== NULL)
err(1, "spawn_custom color font");
- } else if (!strcasecmp(ap, "$color_focus")) {
- if ((real_args[i] =
+ } else if (strcasecmp(ap, "$color_focus") == 0) {
+ if ((real_args[c] =
strdup(r->s->c[SWM_S_COLOR_FOCUS].name))
== NULL)
err(1, "spawn_custom color focus");
- } else if (!strcasecmp(ap, "$color_unfocus")) {
- if ((real_args[i] =
+ } else if (strcasecmp(ap, "$color_unfocus") == 0) {
+ if ((real_args[c] =
strdup(r->s->c[SWM_S_COLOR_UNFOCUS].name))
== NULL)
err(1, "spawn_custom color unfocus");
+ } else if (strcasecmp(ap, "$region_index") == 0) {
+ if (asprintf(&real_args[c], "%d",
+ get_region_index(r) + 1) < 1)
+ err(1, "spawn_custom region index");
+ } else if (strcasecmp(ap, "$workspace_index") == 0) {
+ if (asprintf(&real_args[c], "%d", r->ws->idx + 1) < 1)
+ err(1, "spawn_custom workspace index");
+ } else if (strcasecmp(ap, "$dmenu_bottom") == 0) {
+ if (!bar_at_bottom)
+ continue;
+ if ((real_args[c] = strdup("-b")) == NULL)
+ err(1, "spawn_custom workspace index");
} else {
/* no match --> copy as is */
- if ((real_args[i] = strdup(ap)) == NULL)
+ if ((real_args[c] = strdup(ap)) == NULL)
err(1, "spawn_custom strdup(ap)");
}
DNPRINTF(SWM_D_SPAWN, "spawn_custom: cooked arg: %s\n",
- real_args[i]);
+ real_args[c]);
+ ++c;
}
#ifdef SWM_DEBUG
DNPRINTF(SWM_D_SPAWN, "spawn_custom: result: ");
- for (i = 0; i < prog->argc; i++)
- DNPRINTF(SWM_D_SPAWN, "\"%s\" ", real_args[i]);
- DNPRINTF(SWM_D_SPAWN, "\n");
+ for (i = 0; i < c; ++i)
+ DPRINTF("\"%s\" ", real_args[i]);
+ DPRINTF("\n");
#endif
*ret_args = real_args;
- return (prog->argc);
+ return (c);
}
void
-spawn_custom(struct swm_region *r, union arg *args, char *spawn_name)
+spawn_custom(struct swm_region *r, union arg *args, const char *spawn_name)
{
union arg a;
char **real_args;
}
void
-spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid)
+spawn_select(struct swm_region *r, union arg *args, const char *spawn_name,
+ int *pid)
{
union arg a;
char **real_args;
err(1, "cannot fork");
break;
case 0: /* child */
- if (dup2(select_list_pipe[0], 0) == -1)
+ if (dup2(select_list_pipe[0], STDIN_FILENO) == -1)
err(1, "dup2");
- if (dup2(select_resp_pipe[1], 1) == -1)
+ if (dup2(select_resp_pipe[1], STDOUT_FILENO) == -1)
err(1, "dup2");
close(select_list_pipe[1]);
close(select_resp_pipe[0]);
free(real_args);
}
+/* Argument tokenizer. */
+char *
+argsep(char **sp) {
+ int single_quoted = 0, double_quoted = 0;
+ char *arg, *cp, *next;
+
+ if (*sp == NULL)
+ return NULL;
+
+ /* Eat and move characters until end of argument is found. */
+ for (arg = next = cp = *sp; *cp != '\0'; ++cp) {
+ if (!double_quoted && *cp == '\'') {
+ /* Eat single-quote. */
+ single_quoted = !single_quoted;
+ } else if (!single_quoted && *cp == '"') {
+ /* Eat double-quote. */
+ double_quoted = !double_quoted;
+ } else if (!single_quoted && *cp == '\\' && *(cp + 1) == '"') {
+ /* Eat backslash; copy escaped character to arg. */
+ *next++ = *(++cp);
+ } else if (!single_quoted && !double_quoted && *cp == '\\' &&
+ (*(cp + 1) == '\'' || *(cp + 1) == ' ')) {
+ /* Eat backslash; move escaped character. */
+ *next++ = *(++cp);
+ } else if (!single_quoted && !double_quoted &&
+ (*cp == ' ' || *cp == '\t')) {
+ /* Terminate argument. */
+ *next++ = '\0';
+ /* Point sp to beginning of next argument. */
+ *sp = ++cp;
+ break;
+ } else {
+ /* Move regular character. */
+ *next++ = *cp;
+ }
+ }
+
+ /* Terminate argument if end of string. */
+ if (*cp == '\0') {
+ *next = '\0';
+ *sp = NULL;
+ }
+
+ return arg;
+}
+
void
-spawn_insert(char *name, char *args)
+spawn_insert(const char *name, const char *args, int flags)
{
- char *arg, *cp, *ptr;
struct spawn_prog *sp;
+ char *arg, *dup, *ptr;
- DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s\n", name);
+ DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s[%s]\n", name, args);
+
+ if (args == NULL || *args == '\0')
+ return;
if ((sp = calloc(1, sizeof *sp)) == NULL)
err(1, "spawn_insert: calloc");
if ((sp->name = strdup(name)) == NULL)
err(1, "spawn_insert: strdup");
- /* convert the arguments to an argument list */
- if ((ptr = cp = strdup(args)) == NULL)
+ /* Convert the arguments to an argument list. */
+ if ((ptr = dup = strdup(args)) == NULL)
err(1, "spawn_insert: strdup");
- while ((arg = strsep(&ptr, " \t")) != NULL) {
- /* empty field; skip it */
+ while ((arg = argsep(&ptr)) != NULL) {
+ /* Null argument; skip it. */
if (*arg == '\0')
continue;
if ((sp->argv[sp->argc - 1] = strdup(arg)) == NULL)
err(1, "spawn_insert: strdup");
}
- free(cp);
+ free(dup);
+ sp->flags = flags;
+
+ DNPRINTF(SWM_D_SPAWN, "arg %d: [%s]\n", sp->argc, sp->argv[sp->argc-1]);
TAILQ_INSERT_TAIL(&spawns, sp, entry);
DNPRINTF(SWM_D_SPAWN, "spawn_insert: leave\n");
}
DNPRINTF(SWM_D_SPAWN, "spawn_remove: leave\n");
}
-void
-spawn_replace(struct spawn_prog *sp, char *name, char *args)
+struct spawn_prog*
+spawn_find(const char *name)
{
- DNPRINTF(SWM_D_SPAWN, "spawn_replace: %s [%s]\n", sp->name, name);
+ struct spawn_prog *sp;
- spawn_remove(sp);
- spawn_insert(name, args);
+ TAILQ_FOREACH(sp, &spawns, entry)
+ if (strcasecmp(sp->name, name) == 0)
+ return sp;
- DNPRINTF(SWM_D_SPAWN, "spawn_replace: leave\n");
+ return NULL;
}
void
-setspawn(char *name, char *args)
+setspawn(const char *name, const char *args, int flags)
{
struct spawn_prog *sp;
if (name == NULL)
return;
- TAILQ_FOREACH(sp, &spawns, entry) {
- if (!strcmp(sp->name, name)) {
- if (*args == '\0')
- spawn_remove(sp);
- else
- spawn_replace(sp, name, args);
- DNPRINTF(SWM_D_SPAWN, "setspawn: leave\n");
- return;
- }
- }
- if (*args == '\0') {
+ /* Remove any old spawn under the same name. */
+ if ((sp = spawn_find(name)) != NULL)
+ spawn_remove(sp);
+
+ if (*args != '\0')
+ spawn_insert(name, args, flags);
+ else
warnx("error: setspawn: cannot find program: %s", name);
- return;
- }
- spawn_insert(name, args);
DNPRINTF(SWM_D_SPAWN, "setspawn: leave\n");
}
int
-setconfspawn(char *selector, char *value, int flags)
+setconfspawn(const char *selector, const char *value, int flags)
{
- char *args;
+ char *args;
- /* suppress unused warning since var is needed */
- (void)flags;
+ if (selector == NULL || strlen(selector) == 0)
+ return (1);
args = expand_tilde(value);
DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
- setspawn(selector, args);
+ setspawn(selector, args, flags);
free(args);
- DNPRINTF(SWM_D_SPAWN, "setconfspawn: done\n");
+ DNPRINTF(SWM_D_SPAWN, "setconfspawn: done.\n");
return (0);
}
void
+validate_spawns(void)
+{
+ struct spawn_prog *sp;
+ char which[PATH_MAX];
+ size_t i;
+
+ struct key *kp;
+
+ RB_FOREACH(kp, key_tree, &keys) {
+ if (kp->funcid != KF_SPAWN_CUSTOM)
+ continue;
+
+ /* find program */
+ sp = spawn_find(kp->spawn_name);
+ if (sp == NULL || sp->flags & SWM_SPAWN_OPTIONAL)
+ continue;
+
+ /* verify we have the goods */
+ snprintf(which, sizeof which, "which %s", sp->argv[0]);
+ DNPRINTF(SWM_D_CONF, "validate_spawns: which %s\n",
+ sp->argv[0]);
+ for (i = strlen("which "); i < strlen(which); i++)
+ if (which[i] == ' ') {
+ which[i] = '\0';
+ break;
+ }
+ if (system(which) != 0)
+ add_startup_exception("could not find %s",
+ &which[strlen("which ")]);
+ }
+}
+
+void
setup_spawn(void)
{
+ setconfspawn("lock", "xlock", 0);
+
setconfspawn("term", "xterm", 0);
setconfspawn("spawn_term", "xterm", 0);
- setconfspawn("screenshot_all", "screenshot.sh full", 0);
- setconfspawn("screenshot_wind", "screenshot.sh window", 0);
- setconfspawn("lock", "xlock", 0);
- setconfspawn("initscr", "initscreen.sh", 0);
+
setconfspawn("menu", "dmenu_run"
+ " $dmenu_bottom"
" -fn $bar_font"
" -nb $bar_color"
" -nf $bar_font_color"
" -sb $bar_border"
" -sf $bar_color", 0);
+
setconfspawn("search", "dmenu"
+ " $dmenu_bottom"
" -i"
" -fn $bar_font"
" -nb $bar_color"
" -nf $bar_font_color"
" -sb $bar_border"
" -sf $bar_color", 0);
+
setconfspawn("name_workspace", "dmenu"
+ " $dmenu_bottom"
" -p Workspace"
" -fn $bar_font"
" -nb $bar_color"
" -nf $bar_font_color"
" -sb $bar_border"
" -sf $bar_color", 0);
+
+ /* These are not verified for existence, even with a binding set. */
+ setconfspawn("screenshot_all", "screenshot.sh full", SWM_SPAWN_OPTIONAL);
+ setconfspawn("screenshot_wind", "screenshot.sh window", SWM_SPAWN_OPTIONAL);
+ setconfspawn("initscr", "initscreen.sh", SWM_SPAWN_OPTIONAL);
}
/* key bindings */
#define SWM_MODNAME_SIZE 32
-#define SWM_KEY_WS "\n+ \t"
+#define SWM_KEY_WS "\n+ \t"
int
-parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
+parsekeys(const char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
{
- char *cp, *name;
+ char *str, *cp, *name;
KeySym uks;
+
DNPRINTF(SWM_D_KEY, "parsekeys: enter [%s]\n", keystr);
if (mod == NULL || ks == NULL) {
DNPRINTF(SWM_D_KEY, "parsekeys: no mod or key vars\n");
DNPRINTF(SWM_D_KEY, "parsekeys: no keystr\n");
return (1);
}
- cp = keystr;
+
+ if ((cp = str = strdup(keystr)) == NULL)
+ err(1, "parsekeys: strdup");
+
*ks = XCB_NO_SYMBOL;
*mod = 0;
while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) {
cp += (long)strspn(cp, SWM_KEY_WS);
if (strncasecmp(name, "MOD", SWM_MODNAME_SIZE) == 0)
*mod |= currmod;
- else if (!strncasecmp(name, "Mod1", SWM_MODNAME_SIZE))
+ else if (strncasecmp(name, "Mod1", SWM_MODNAME_SIZE) == 0)
*mod |= XCB_MOD_MASK_1;
- else if (!strncasecmp(name, "Mod2", SWM_MODNAME_SIZE))
+ else if (strncasecmp(name, "Mod2", SWM_MODNAME_SIZE) == 0)
*mod += XCB_MOD_MASK_2;
- else if (!strncmp(name, "Mod3", SWM_MODNAME_SIZE))
+ else if (strncmp(name, "Mod3", SWM_MODNAME_SIZE) == 0)
*mod |= XCB_MOD_MASK_3;
- else if (!strncmp(name, "Mod4", SWM_MODNAME_SIZE))
+ else if (strncmp(name, "Mod4", SWM_MODNAME_SIZE) == 0)
*mod |= XCB_MOD_MASK_4;
else if (strncasecmp(name, "SHIFT", SWM_MODNAME_SIZE) == 0)
*mod |= XCB_MOD_MASK_SHIFT;
DNPRINTF(SWM_D_KEY,
"parsekeys: invalid key %s\n",
name);
+ free(str);
return (1);
}
}
}
+
+ free(str);
DNPRINTF(SWM_D_KEY, "parsekeys: leave ok\n");
return (0);
}
char *
-strdupsafe(char *str)
+strdupsafe(const char *str)
{
if (str == NULL)
return (NULL);
}
void
-key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid, char *spawn_name)
+key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid,
+ const char *spawn_name)
{
struct key *kp;
void
key_replace(struct key *kp, unsigned int mod, KeySym ks, enum keyfuncid kfid,
- char *spawn_name)
+ const char *spawn_name)
{
DNPRINTF(SWM_D_KEY, "key_replace: %s [%s]\n", keyfuncs[kp->funcid].name,
spawn_name);
void
setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid,
- char *spawn_name)
+ const char *spawn_name)
{
struct key *kp;
return;
}
if (kfid == KF_INVALID) {
- warnx("error: setkeybinding: cannot find mod/key combination");
+ warnx("bind: Key combination already unbound.");
DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
return;
}
}
int
-setconfbinding(char *selector, char *value, int flags)
+setconfbinding(const char *selector, const char *value, int flags)
{
enum keyfuncid kfid;
unsigned int mod;
/* suppress unused warning since var is needed */
(void)flags;
- DNPRINTF(SWM_D_KEY, "setconfbinding: enter\n");
- if (selector == NULL) {
+ DNPRINTF(SWM_D_KEY, "setconfbinding: enter selector: [%s], "
+ "value: [%s]\n", selector, value);
+ if (selector == NULL || strlen(selector) == 0) {
DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value);
if (parsekeys(value, mod_key, &mod, &ks) == 0) {
kfid = KF_INVALID;
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",
- selector);
+ DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match "
+ "keyfunc\n", selector);
if (parsekeys(value, mod_key, &mod, &ks) == 0) {
setkeybinding(mod, ks, kfid, NULL);
return (0);
}
}
/* search by custom spawn name */
- TAILQ_FOREACH(sp, &spawns, entry) {
- if (strcasecmp(selector, sp->name) == 0) {
- DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n",
- selector);
- if (parsekeys(value, mod_key, &mod, &ks) == 0) {
- setkeybinding(mod, ks, KF_SPAWN_CUSTOM,
- sp->name);
- return (0);
- } else
- return (1);
- }
+ if ((sp = spawn_find(selector)) != NULL) {
+ DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match "
+ "spawn\n", selector);
+ if (parsekeys(value, mod_key, &mod, &ks) == 0) {
+ setkeybinding(mod, ks, KF_SPAWN_CUSTOM,
+ sp->name);
+ return (0);
+ } else
+ return (1);
}
DNPRINTF(SWM_D_KEY, "setconfbinding: no match\n");
return (1);
setup_keys(void)
{
#define MODKEY_SHIFT MODKEY | XCB_MOD_MASK_SHIFT
+ setkeybinding(MODKEY, XK_b, KF_BAR_TOGGLE, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_b, KF_BAR_TOGGLE_WS,NULL);
+ setkeybinding(MODKEY, XK_v, KF_BUTTON2, NULL);
setkeybinding(MODKEY, XK_space, KF_CYCLE_LAYOUT,NULL);
setkeybinding(MODKEY_SHIFT, XK_backslash, KF_FLIP_LAYOUT, NULL);
- setkeybinding(MODKEY_SHIFT, XK_space, KF_STACK_RESET, NULL);
+ setkeybinding(MODKEY, XK_t, KF_FLOAT_TOGGLE,NULL);
+ setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, NULL);
+ setkeybinding(MODKEY, XK_j, KF_FOCUS_NEXT, NULL);
+ setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL);
+ setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Tab, KF_FOCUS_PREV, NULL);
+ setkeybinding(MODKEY, XK_u, KF_FOCUS_URGENT,NULL);
+ setkeybinding(MODKEY, XK_e, KF_MAXIMIZE_TOGGLE,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL);
+ setkeybinding(MODKEY, XK_w, KF_ICONIFY, 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_SHIFT, XK_bracketright,KF_MOVE_DOWN,NULL);
+ setkeybinding(MODKEY, XK_bracketleft, KF_MOVE_LEFT,NULL);
+ setkeybinding(MODKEY, XK_bracketright,KF_MOVE_RIGHT,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_bracketleft, KF_MOVE_UP, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_End, KF_MVRG_1, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Down, KF_MVRG_2, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Next, KF_MVRG_3, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Left, KF_MVRG_4, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Begin, KF_MVRG_5, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Right, KF_MVRG_6, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Home, KF_MVRG_7, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Up, KF_MVRG_8, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Prior, KF_MVRG_9, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_1, KF_MVWS_1, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_2, KF_MVWS_2, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_3, KF_MVWS_3, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_4, KF_MVWS_4, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_5, KF_MVWS_5, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_6, KF_MVWS_6, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_7, KF_MVWS_7, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_8, KF_MVWS_8, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_9, KF_MVWS_9, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_0, KF_MVWS_10, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F1, KF_MVWS_11, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F2, KF_MVWS_12, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F3, KF_MVWS_13, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F4, KF_MVWS_14, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F5, KF_MVWS_15, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F6, KF_MVWS_16, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F7, KF_MVWS_17, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F8, KF_MVWS_18, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F9, KF_MVWS_19, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F10, KF_MVWS_20, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F11, KF_MVWS_21, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F12, KF_MVWS_22, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_slash, KF_NAME_WORKSPACE,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_q, KF_QUIT, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_r, KF_RAISE_TOGGLE,NULL);
+ setkeybinding(MODKEY, XK_q, KF_RESTART, NULL);
+ setkeybinding(MODKEY, XK_KP_End, KF_RG_1, NULL);
+ setkeybinding(MODKEY, XK_KP_Down, KF_RG_2, NULL);
+ setkeybinding(MODKEY, XK_KP_Next, KF_RG_3, NULL);
+ setkeybinding(MODKEY, XK_KP_Left, KF_RG_4, NULL);
+ setkeybinding(MODKEY, XK_KP_Begin, KF_RG_5, NULL);
+ setkeybinding(MODKEY, XK_KP_Right, KF_RG_6, NULL);
+ setkeybinding(MODKEY, XK_KP_Home, KF_RG_7, NULL);
+ setkeybinding(MODKEY, XK_KP_Up, KF_RG_8, NULL);
+ setkeybinding(MODKEY, XK_KP_Prior, KF_RG_9, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Right, KF_RG_NEXT, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Left, KF_RG_PREV, NULL);
+ setkeybinding(MODKEY, XK_f, KF_SEARCH_WIN, NULL);
+ setkeybinding(MODKEY, XK_slash, KF_SEARCH_WORKSPACE,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_i, KF_SPAWN_CUSTOM,"initscr");
+ setkeybinding(MODKEY_SHIFT, XK_Delete, KF_SPAWN_CUSTOM,"lock");
+ setkeybinding(MODKEY, XK_p, KF_SPAWN_CUSTOM,"menu");
+ setkeybinding(MODKEY, XK_s, KF_SPAWN_CUSTOM,"screenshot_all");
+ setkeybinding(MODKEY_SHIFT, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind");
+ setkeybinding(MODKEY_SHIFT, XK_Return, KF_SPAWN_CUSTOM,"term");
setkeybinding(MODKEY_SHIFT, XK_comma, KF_STACK_INC, NULL);
setkeybinding(MODKEY_SHIFT, XK_period, KF_STACK_DEC, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_space, KF_STACK_RESET, 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_SHIFT, XK_j, KF_SWAP_NEXT, NULL);
setkeybinding(MODKEY_SHIFT, XK_k, KF_SWAP_PREV, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Return, KF_SPAWN_CUSTOM,"term");
- setkeybinding(MODKEY, XK_p, KF_SPAWN_CUSTOM,"menu");
- setkeybinding(MODKEY_SHIFT, XK_q, KF_QUIT, NULL);
- setkeybinding(MODKEY, XK_q, KF_RESTART, NULL);
- setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_w, KF_UNICONIFY, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_v, KF_VERSION, NULL);
+ setkeybinding(MODKEY, XK_equal, KF_WIDTH_GROW, NULL);
+ setkeybinding(MODKEY, XK_minus, KF_WIDTH_SHRINK,NULL);
+ setkeybinding(MODKEY, XK_x, KF_WIND_DEL, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_x, KF_WIND_KILL, 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_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_SHIFT, XK_Up, KF_WS_NEXT_MOVE,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Down, KF_WS_PREV_MOVE,NULL);
setkeybinding(MODKEY, XK_a, KF_WS_PRIOR, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Right, KF_SCREEN_NEXT, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Left, KF_SCREEN_PREV, NULL);
- setkeybinding(MODKEY_SHIFT, XK_1, KF_MVWS_1, NULL);
- setkeybinding(MODKEY_SHIFT, XK_2, KF_MVWS_2, NULL);
- setkeybinding(MODKEY_SHIFT, XK_3, KF_MVWS_3, NULL);
- setkeybinding(MODKEY_SHIFT, XK_4, KF_MVWS_4, NULL);
- setkeybinding(MODKEY_SHIFT, XK_5, KF_MVWS_5, NULL);
- setkeybinding(MODKEY_SHIFT, XK_6, KF_MVWS_6, NULL);
- setkeybinding(MODKEY_SHIFT, XK_7, KF_MVWS_7, NULL);
- setkeybinding(MODKEY_SHIFT, XK_8, KF_MVWS_8, NULL);
- setkeybinding(MODKEY_SHIFT, XK_9, KF_MVWS_9, NULL);
- setkeybinding(MODKEY_SHIFT, XK_0, KF_MVWS_10, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F1, KF_MVWS_11, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F2, KF_MVWS_12, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F3, KF_MVWS_13, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F4, KF_MVWS_14, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F5, KF_MVWS_15, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F6, KF_MVWS_16, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F7, KF_MVWS_17, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F8, KF_MVWS_18, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F9, KF_MVWS_19, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F10, KF_MVWS_20, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F11, KF_MVWS_21, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F12, KF_MVWS_22, NULL);
- setkeybinding(MODKEY, XK_b, KF_BAR_TOGGLE, NULL);
- setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Tab, KF_FOCUS_PREV, NULL);
- setkeybinding(MODKEY_SHIFT, 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_SHIFT, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind");
- setkeybinding(MODKEY, XK_t, KF_FLOAT_TOGGLE,NULL);
- setkeybinding(MODKEY_SHIFT, XK_v, KF_VERSION, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Delete, KF_SPAWN_CUSTOM,"lock");
- setkeybinding(MODKEY_SHIFT, XK_i, KF_SPAWN_CUSTOM,"initscr");
- setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL);
- setkeybinding(MODKEY_SHIFT, XK_w, KF_UNICONIFY, NULL);
- setkeybinding(MODKEY_SHIFT, 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_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL);
- setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL);
- setkeybinding(MODKEY, XK_bracketleft, KF_MOVE_LEFT,NULL);
- setkeybinding(MODKEY, XK_bracketright,KF_MOVE_RIGHT,NULL);
- setkeybinding(MODKEY_SHIFT, XK_bracketleft, KF_MOVE_UP, NULL);
- setkeybinding(MODKEY_SHIFT, XK_bracketright,KF_MOVE_DOWN,NULL);
- setkeybinding(MODKEY_SHIFT, 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_SHIFT, XK_d, KF_DUMPWINS, NULL);
#endif
}
int
-setkeymapping(char *selector, char *value, int flags)
+setkeymapping(const char *selector, const char *value, int flags)
{
- char keymapping_file[PATH_MAX];
+ char *keymapping_file;
/* suppress unused warnings since vars are needed */
(void)selector;
(void)flags;
DNPRINTF(SWM_D_KEY, "setkeymapping: enter\n");
- if (value[0] == '~')
- snprintf(keymapping_file, sizeof keymapping_file, "%s/%s",
- pwd->pw_dir, &value[1]);
- else
- strlcpy(keymapping_file, value, sizeof keymapping_file);
+
+ keymapping_file = expand_tilde(value);
+
clear_keys();
/* load new key bindings; if it fails, revert to default bindings */
if (conf_load(keymapping_file, SWM_CONF_KEYMAPPING)) {
clear_keys();
setup_keys();
}
+
+ free(keymapping_file);
+
DNPRINTF(SWM_D_KEY, "setkeymapping: leave\n");
return (0);
}
+ j];
keycode = xcb_key_symbols_get_keycode(syms,
XK_Num_Lock);
- if (kc == *keycode)
- numlockmask = (1 << i);
- free(keycode);
+ if (keycode) {
+ if (kc == *keycode)
+ numlockmask = (1 << i);
+ free(keycode);
+ }
}
}
free(modmap_r);
{
struct key *kp;
int num_screens, k, j;
- unsigned int modifiers[3];
+ unsigned int modifiers[4];
xcb_keycode_t *code;
DNPRINTF(SWM_D_MISC, "grabkeys\n");
modifiers[0] = 0;
modifiers[1] = numlockmask;
- modifiers[2] = numlockmask | XCB_MOD_MASK_LOCK;
+ modifiers[2] = XCB_MOD_MASK_LOCK;
+ modifiers[3] = numlockmask | XCB_MOD_MASK_LOCK;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (k = 0; k < num_screens; k++) {
if (TAILQ_EMPTY(&screens[k].rl))
continue;
xcb_ungrab_key(conn, XCB_GRAB_ANY, screens[k].root,
XCB_MOD_MASK_ANY);
RB_FOREACH(kp, key_tree, &keys) {
+ /* Skip unused ws binds. */
+ if ((int)kp->funcid > KF_WS_1 + workspace_limit - 1 &&
+ kp->funcid <= KF_WS_22)
+ continue;
+
+ /* Skip unused mvws binds. */
+ if ((int)kp->funcid > KF_MVWS_1 + workspace_limit - 1 &&
+ kp->funcid <= KF_MVWS_22)
+ continue;
+
if ((code = xcb_key_symbols_get_keycode(syms,
- kp->keysym)))
+ kp->keysym))) {
for (j = 0; j < LENGTH(modifiers); j++)
xcb_grab_key(conn, 1,
screens[k].root,
kp->mod | modifiers[j],
*code, XCB_GRAB_MODE_SYNC,
- XCB_GRAB_MODE_ASYNC);
+ XCB_GRAB_MODE_SYNC);
free(code);
+ }
}
}
}
void
grabbuttons(struct ws_win *win)
{
- int i;
+ unsigned int modifiers[4];
+ int i, j;
+
+ DNPRINTF(SWM_D_MOUSE, "grabbuttons: win %#x\n", win->id);
+ updatenumlockmask();
- DNPRINTF(SWM_D_MOUSE, "grabbuttons: win 0x%x\n", win->id);
+ modifiers[0] = 0;
+ modifiers[1] = numlockmask;
+ modifiers[2] = XCB_MOD_MASK_LOCK;
+ modifiers[3] = numlockmask | XCB_MOD_MASK_LOCK;
for (i = 0; i < LENGTH(buttons); i++)
if (buttons[i].action == client_click)
- xcb_grab_button(conn, 0, win->id, BUTTONMASK,
- XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
- XCB_WINDOW_NONE, XCB_CURSOR_NONE,
- buttons[i].button, buttons[i].mask);
-
- /* click to focus */
- xcb_grab_button(conn, 0, win->id, BUTTONMASK, XCB_GRAB_MODE_SYNC,
- XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, XCB_CURSOR_NONE,
- XCB_BUTTON_INDEX_1, XCB_BUTTON_MASK_ANY);
+ for (j = 0; j < LENGTH(modifiers); ++j)
+ xcb_grab_button(conn, 0, win->id, BUTTONMASK,
+ XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
+ XCB_WINDOW_NONE, XCB_CURSOR_NONE,
+ buttons[i].button, buttons[i].mask |
+ modifiers[j]);
}
const char *quirkname[] = {
"XTERM_FONTADJ",
"FULLSCREEN",
"FOCUSPREV",
+ "NOFOCUSONMAP",
+ "FOCUSONMAP_SINGLE",
};
/* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */
-#define SWM_Q_WS "\n|+ \t"
+#define SWM_Q_WS "\n|+ \t"
int
-parsequirks(char *qstr, unsigned long *quirk)
+parsequirks(const char *qstr, unsigned long *quirk)
{
- char *cp, *name;
+ char *str, *cp, *name;
int i;
- if (quirk == NULL)
+ if (quirk == NULL || qstr == NULL)
return (1);
- cp = qstr;
+ if ((str = strdup(qstr)) == NULL)
+ err(1, "parsequirks: strdup");
+
+ cp = str;
*quirk = 0;
while ((name = strsep(&cp, SWM_Q_WS)) != NULL) {
if (cp)
cp += (long)strspn(cp, SWM_Q_WS);
for (i = 0; i < LENGTH(quirkname); i++) {
- if (!strncasecmp(name, quirkname[i], SWM_QUIRK_LEN)) {
+ if (strncasecmp(name, quirkname[i],
+ SWM_QUIRK_LEN) == 0) {
DNPRINTF(SWM_D_QUIRK,
"parsequirks: %s\n", name);
if (i == 0) {
*quirk = 0;
+ free(str);
return (0);
}
*quirk |= 1 << (i-1);
if (i >= LENGTH(quirkname)) {
DNPRINTF(SWM_D_QUIRK,
"parsequirks: invalid quirk [%s]\n", name);
+ free(str);
return (1);
}
}
+
+ free(str);
return (0);
}
void
-quirk_insert(const char *class, const char *name, unsigned long quirk)
+quirk_insert(const char *class, const char *instance, const char *name,
+ unsigned long quirk)
{
struct quirk *qp;
+ int failed = 0;
+ char *str;
- DNPRINTF(SWM_D_QUIRK, "quirk_insert: %s:%s [%lu]\n", class, name,
- quirk);
+ DNPRINTF(SWM_D_QUIRK, "quirk_insert: class: %s, instance: %s, name: %s,"
+ " value: %lu\n", class, instance, name, quirk);
if ((qp = malloc(sizeof *qp)) == NULL)
err(1, "quirk_insert: malloc");
+
if ((qp->class = strdup(class)) == NULL)
err(1, "quirk_insert: strdup");
+ if ((qp->instance = strdup(instance)) == NULL)
+ err(1, "quirk_insert: strdup");
if ((qp->name = strdup(name)) == NULL)
err(1, "quirk_insert: strdup");
- qp->quirk = quirk;
- TAILQ_INSERT_TAIL(&quirks, qp, entry);
-
+ if (asprintf(&str, "^%s$", class) == -1)
+ err(1, "quirk_insert: asprintf");
+ if (regcomp(&qp->regex_class, str, REG_EXTENDED | REG_NOSUB)) {
+ add_startup_exception("regex failed to compile quirk 'class' "
+ "field: %s", class);
+ failed = 1;
+ }
+ DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str);
+ free(str);
+
+ if (asprintf(&str, "^%s$", instance) == -1)
+ err(1, "quirk_insert: asprintf");
+ if (regcomp(&qp->regex_instance, str, REG_EXTENDED | REG_NOSUB)) {
+ add_startup_exception("regex failed to compile quirk 'instance'"
+ " field: %s", instance);
+ failed = 1;
+ }
+ DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str);
+ free(str);
+
+ if (asprintf(&str, "^%s$", name) == -1)
+ err(1, "quirk_insert: asprintf");
+ if (regcomp(&qp->regex_name, str, REG_EXTENDED | REG_NOSUB)) {
+ add_startup_exception("regex failed to compile quirk 'name' "
+ "field: %s", name);
+ failed = 1;
+ }
+ DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str);
+ free(str);
+
+ if (failed) {
+ DNPRINTF(SWM_D_QUIRK, "quirk_insert: regex error; skipping.\n");
+ quirk_free(qp);
+ } else {
+ qp->quirk = quirk;
+ TAILQ_INSERT_TAIL(&quirks, qp, entry);
+ }
DNPRINTF(SWM_D_QUIRK, "quirk_insert: leave\n");
}
qp->name, qp->quirk);
TAILQ_REMOVE(&quirks, qp, entry);
+ quirk_free(qp);
+
+ DNPRINTF(SWM_D_QUIRK, "quirk_remove: leave\n");
+}
+
+void
+quirk_free(struct quirk *qp)
+{
+ regfree(&qp->regex_class);
+ regfree(&qp->regex_instance);
+ regfree(&qp->regex_name);
free(qp->class);
+ free(qp->instance);
free(qp->name);
free(qp);
-
- DNPRINTF(SWM_D_QUIRK, "quirk_remove: leave\n");
}
void
-quirk_replace(struct quirk *qp, const char *class, const char *name,
- unsigned long quirk)
+quirk_replace(struct quirk *qp, const char *class, const char *instance,
+ const char *name, unsigned long quirk)
{
- DNPRINTF(SWM_D_QUIRK, "quirk_replace: %s:%s [%lu]\n", qp->class,
- qp->name, qp->quirk);
+ DNPRINTF(SWM_D_QUIRK, "quirk_replace: %s:%s:%s [%lu]\n", qp->class,
+ qp->instance, qp->name, qp->quirk);
quirk_remove(qp);
- quirk_insert(class, name, quirk);
+ quirk_insert(class, instance, name, quirk);
DNPRINTF(SWM_D_QUIRK, "quirk_replace: leave\n");
}
void
-setquirk(const char *class, const char *name, unsigned long quirk)
+setquirk(const char *class, const char *instance, const char *name,
+ unsigned long quirk)
{
struct quirk *qp;
- DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s [%lu]\n", class, name,
- quirk);
+ DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s:%s [%lu]\n", class,
+ instance, name, quirk);
+ /* Remove/replace existing quirk. */
TAILQ_FOREACH(qp, &quirks, entry) {
- if (!strcmp(qp->class, class) && !strcmp(qp->name, name)) {
- if (!quirk)
+ if (strcmp(qp->class, class) == 0 &&
+ strcmp(qp->instance, instance) == 0 &&
+ strcmp(qp->name, name) == 0) {
+ if (quirk == 0)
quirk_remove(qp);
else
- quirk_replace(qp, class, name, quirk);
+ quirk_replace(qp, class, instance, name, quirk);
DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n");
return;
}
}
- if (!quirk) {
- warnx("error: setquirk: cannot find class/name combination");
- return;
- }
- quirk_insert(class, name, quirk);
+ /* Only insert if quirk is not NONE. */
+ if (quirk)
+ quirk_insert(class, instance, name, quirk);
+
DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n");
}
+/* Eat '\' in str used to escape square brackets and colon. */
+void
+unescape_selector(char *str)
+{
+ char *cp;
+
+ for (cp = str; *str != '\0'; ++str, ++cp) {
+ if (*str == '\\' && (*(str + 1) == ':' || *(str + 1) == ']' ||
+ *(str + 1) == '['))
+ ++str;
+
+ *cp = *str;
+ }
+ *cp = '\0';
+}
+
int
-setconfquirk(char *selector, char *value, int flags)
+setconfquirk(const char *selector, const char *value, int flags)
{
- char *cp, *class, *name;
- int retval;
+ char *str, *cp, *class;
+ char *instance = NULL, *name = NULL;
+ int retval, count = 0;
unsigned long qrks;
/* suppress unused warning since var is needed */
(void)flags;
- if (selector == NULL)
+ if (selector == NULL || strlen(selector) == 0)
return (0);
- if ((cp = strchr(selector, ':')) == NULL)
- return (0);
- *cp = '\0';
- class = selector;
- name = cp + 1;
+
+ if ((str = strdup(selector)) == NULL)
+ err(1, "setconfquirk: strdup");
+
+ /* Find non-escaped colon. */
+ class = cp = str;
+ if (*cp == ':') {
+ *cp = '\0';
+ ++count;
+ }
+
+ for (++cp; *cp != '\0'; ++cp) {
+ if (*cp == ':' && *(cp - 1) != '\\') {
+ *cp = '\0';
+ ++count;
+ }
+ }
+
+ unescape_selector(class);
+ if (count) {
+ instance = class + strlen(class) + 1;
+ unescape_selector(instance);
+ } else {
+ instance = ".*";
+ }
+
+ if (count > 1) {
+ name = instance + strlen(instance) + 1;
+ unescape_selector(name);
+ } else {
+ name = ".*";
+ }
+
+ DNPRINTF(SWM_D_CONF, "setconfquirk: class: %s, instance: %s, "
+ "name: %s\n", class, instance, name);
+
if ((retval = parsequirks(value, &qrks)) == 0)
- setquirk(class, name, qrks);
+ setquirk(class, instance, name, qrks);
+
+ free(str);
return (retval);
}
void
setup_quirks(void)
{
- setquirk("MPlayer", "xv", SWM_Q_FLOAT | SWM_Q_FULLSCREEN | SWM_Q_FOCUSPREV);
- setquirk("OpenOffice.org 3.2", "VCLSalFrame", SWM_Q_FLOAT);
- setquirk("Firefox-bin", "firefox-bin", SWM_Q_TRANSSZ);
- setquirk("Firefox", "Dialog", SWM_Q_FLOAT);
- setquirk("Gimp", "gimp", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
- setquirk("XTerm", "xterm", SWM_Q_XTERM_FONTADJ);
- setquirk("xine", "Xine Window", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
- setquirk("Xitk", "Xitk Combo", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
- setquirk("xine", "xine Panel", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
- setquirk("Xitk", "Xine Window", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
- setquirk("xine", "xine Video Fullscreen Window", SWM_Q_FULLSCREEN | SWM_Q_FLOAT);
- setquirk("pcb", "pcb", SWM_Q_FLOAT);
- setquirk("SDL_App", "SDL_App", SWM_Q_FLOAT | SWM_Q_FULLSCREEN);
+ setquirk("MPlayer", "xv", ".*", SWM_Q_FLOAT | SWM_Q_FULLSCREEN | SWM_Q_FOCUSPREV);
+ setquirk("OpenOffice.org 3.2", "VCLSalFrame", ".*", SWM_Q_FLOAT);
+ setquirk("Firefox-bin", "firefox-bin", ".*", SWM_Q_TRANSSZ);
+ setquirk("Firefox", "Dialog", ".*", SWM_Q_FLOAT);
+ setquirk("Gimp", "gimp", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+ setquirk("XTerm", "xterm", ".*", SWM_Q_XTERM_FONTADJ);
+ setquirk("xine", "Xine Window", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+ setquirk("Xitk", "Xitk Combo", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+ setquirk("xine", "xine Panel", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+ setquirk("Xitk", "Xine Window", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE);
+ setquirk("xine", "xine Video Fullscreen Window", ".*", SWM_Q_FULLSCREEN | SWM_Q_FLOAT);
+ setquirk("pcb", "pcb", ".*", SWM_Q_FLOAT);
+ setquirk("SDL_App", "SDL_App", ".*", SWM_Q_FLOAT | SWM_Q_FULLSCREEN);
}
/* conf file stuff */
SWM_S_BAR_BORDER_WIDTH,
SWM_S_BAR_DELAY,
SWM_S_BAR_ENABLED,
+ SWM_S_BAR_ENABLED_WS,
SWM_S_BAR_FONT,
SWM_S_BAR_FORMAT,
SWM_S_BAR_JUSTIFY,
SWM_S_BORDER_WIDTH,
+ SWM_S_BOUNDARY_WIDTH,
SWM_S_CLOCK_ENABLED,
SWM_S_CLOCK_FORMAT,
SWM_S_CYCLE_EMPTY,
SWM_S_FOCUS_CLOSE_WRAP,
SWM_S_FOCUS_DEFAULT,
SWM_S_FOCUS_MODE,
+ SWM_S_ICONIC_ENABLED,
+ SWM_S_REGION_PADDING,
SWM_S_SPAWN_ORDER,
SWM_S_SPAWN_TERM,
SWM_S_SS_APP,
SWM_S_SS_ENABLED,
SWM_S_STACK_ENABLED,
SWM_S_TERM_WIDTH,
- SWM_S_TITLE_CLASS_ENABLED,
- SWM_S_TITLE_NAME_ENABLED,
+ SWM_S_TILE_GAP,
SWM_S_URGENT_ENABLED,
SWM_S_VERBOSE_LAYOUT,
+ SWM_S_WINDOW_CLASS_ENABLED,
+ SWM_S_WINDOW_INSTANCE_ENABLED,
SWM_S_WINDOW_NAME_ENABLED,
- SWM_S_WORKSPACE_LIMIT
+ SWM_S_WORKSPACE_LIMIT,
+ SWM_S_WORKSPACE_NAME,
};
int
-setconfvalue(char *selector, char *value, int flags)
+setconfvalue(const char *selector, const char *value, int flags)
{
- int i;
- char *b;
-
- /* suppress unused warning since var is needed */
- (void)selector;
+ struct workspace *ws;
+ int i, ws_id, num_screens;
+ char *b, *str, s[1024];
switch (flags) {
case SWM_S_BAR_ACTION:
bar_border_width = 0;
break;
case SWM_S_BAR_DELAY:
- bar_delay = atoi(value);
+ /* No longer needed; leave to not break old conf files. */
break;
case SWM_S_BAR_ENABLED:
bar_enabled = atoi(value);
break;
+ case SWM_S_BAR_ENABLED_WS:
+ ws_id = atoi(selector) - 1;
+ if (ws_id < 0 || ws_id >= workspace_limit)
+ errx(1, "setconfvalue: bar_enabled_ws: invalid "
+ "workspace %d.", ws_id + 1);
+
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; i++) {
+ ws = (struct workspace *)&screens[i].ws;
+ ws[ws_id].bar_enabled = atoi(value);
+ }
+ break;
case SWM_S_BAR_FONT:
b = bar_fonts;
if (asprintf(&bar_fonts, "%s,%s", value, bar_fonts) == -1)
if (!bar_font_legacy)
break;
+ if ((str = strdup(value)) == NULL)
+ err(1, "setconfvalue: strdup");
+
/* If there are any non-XLFD entries, switch to Xft mode. */
- while ((b = strsep(&value, ",")) != NULL) {
+ while ((b = strsep(&str, ",")) != NULL) {
if (*b == '\0')
continue;
if (!isxlfd(b)) {
break;
}
}
+
+ free(str);
break;
case SWM_S_BAR_FORMAT:
free(bar_format);
err(1, "setconfvalue: bar_format");
break;
case SWM_S_BAR_JUSTIFY:
- if (!strcmp(value, "left"))
+ if (strcmp(value, "left") == 0)
bar_justify = SWM_BAR_JUSTIFY_LEFT;
- else if (!strcmp(value, "center"))
+ else if (strcmp(value, "center") == 0)
bar_justify = SWM_BAR_JUSTIFY_CENTER;
- else if (!strcmp(value, "right"))
+ else if (strcmp(value, "right") == 0)
bar_justify = SWM_BAR_JUSTIFY_RIGHT;
else
errx(1, "invalid bar_justify");
if (border_width < 0)
border_width = 0;
break;
+ case SWM_S_BOUNDARY_WIDTH:
+ boundary_width = atoi(value);
+ if (boundary_width < 0)
+ boundary_width = 0;
+ break;
case SWM_S_CLOCK_ENABLED:
clock_enabled = atoi(value);
break;
disable_border = atoi(value);
break;
case SWM_S_FOCUS_CLOSE:
- if (!strcmp(value, "first"))
+ if (strcmp(value, "first") == 0)
focus_close = SWM_STACK_BOTTOM;
- else if (!strcmp(value, "last"))
+ else if (strcmp(value, "last") == 0)
focus_close = SWM_STACK_TOP;
- else if (!strcmp(value, "next"))
+ else if (strcmp(value, "next") == 0)
focus_close = SWM_STACK_ABOVE;
- else if (!strcmp(value, "previous"))
+ else if (strcmp(value, "previous") == 0)
focus_close = SWM_STACK_BELOW;
else
errx(1, "focus_close");
focus_close_wrap = atoi(value);
break;
case SWM_S_FOCUS_DEFAULT:
- if (!strcmp(value, "last"))
+ if (strcmp(value, "last") == 0)
focus_default = SWM_STACK_TOP;
- else if (!strcmp(value, "first"))
+ else if (strcmp(value, "first") == 0)
focus_default = SWM_STACK_BOTTOM;
else
errx(1, "focus_default");
break;
case SWM_S_FOCUS_MODE:
- if (!strcmp(value, "default"))
+ if (strcmp(value, "default") == 0)
focus_mode = SWM_FOCUS_DEFAULT;
- else if (!strcmp(value, "follow_cursor"))
+ else if (strcmp(value, "follow") == 0 ||
+ strcmp(value, "follow_cursor") == 0)
focus_mode = SWM_FOCUS_FOLLOW;
- else if (!strcmp(value, "manual"))
+ else if (strcmp(value, "manual") == 0)
focus_mode = SWM_FOCUS_MANUAL;
else
errx(1, "focus_mode");
break;
+ case SWM_S_ICONIC_ENABLED:
+ iconic_enabled = atoi(value);
+ break;
+ case SWM_S_REGION_PADDING:
+ region_padding = atoi(value);
+ if (region_padding < 0)
+ region_padding = 0;
+ break;
case SWM_S_SPAWN_ORDER:
- if (!strcmp(value, "first"))
+ if (strcmp(value, "first") == 0)
spawn_position = SWM_STACK_BOTTOM;
- else if (!strcmp(value, "last"))
+ else if (strcmp(value, "last") == 0)
spawn_position = SWM_STACK_TOP;
- else if (!strcmp(value, "next"))
+ else if (strcmp(value, "next") == 0)
spawn_position = SWM_STACK_ABOVE;
- else if (!strcmp(value, "previous"))
+ else if (strcmp(value, "previous") == 0)
spawn_position = SWM_STACK_BELOW;
else
errx(1, "spawn_position");
setconfspawn("spawn_term", value, 0);
break;
case SWM_S_SS_APP:
+ /* No longer needed; leave to not break old conf files. */
break;
case SWM_S_SS_ENABLED:
- ss_enabled = atoi(value);
+ /* No longer needed; leave to not break old conf files. */
break;
case SWM_S_STACK_ENABLED:
stack_enabled = atoi(value);
if (term_width < 0)
term_width = 0;
break;
- case SWM_S_TITLE_CLASS_ENABLED:
- title_class_enabled = atoi(value);
- break;
- case SWM_S_TITLE_NAME_ENABLED:
- title_name_enabled = atoi(value);
+ case SWM_S_TILE_GAP:
+ tile_gap = atoi(value);
break;
case SWM_S_URGENT_ENABLED:
urgent_enabled = atoi(value);
layouts[i].l_string = plain_stacker;
}
break;
+ case SWM_S_WINDOW_CLASS_ENABLED:
+ window_class_enabled = atoi(value);
+ break;
+ case SWM_S_WINDOW_INSTANCE_ENABLED:
+ window_instance_enabled = atoi(value);
+ break;
case SWM_S_WINDOW_NAME_ENABLED:
window_name_enabled = atoi(value);
break;
workspace_limit = SWM_WS_MAX;
else if (workspace_limit < 1)
workspace_limit = 1;
+
+ ewmh_update_desktops();
+ break;
+ case SWM_S_WORKSPACE_NAME:
+ if (getenv("SWM_STARTED") != NULL)
+ return (0);
+
+ bzero(s, sizeof s);
+ if (sscanf(value, "ws[%d]:%1023c", &ws_id, s) != 2)
+ errx(1, "invalid entry, should be 'ws[<idx>]:name'");
+ ws_id--;
+ if (ws_id < 0 || ws_id >= workspace_limit)
+ errx(1, "setconfvalue: workspace_name: invalid "
+ "workspace %d.", ws_id + 1);
+
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; ++i) {
+ ws = (struct workspace *)&screens[i].ws;
+
+ if (strlen(s) > 0) {
+ free(ws[ws_id].name);
+ if ((ws[ws_id].name = strdup(s)) == NULL)
+ err(1, "setconfvalue: workspace_name.");
+
+ ewmh_update_desktop_names();
+ ewmh_get_desktop_names();
+ }
+ }
break;
default:
return (1);
}
int
-setconfmodkey(char *selector, char *value, int flags)
+setconfmodkey(const char *selector, const char *value, int flags)
{
/* suppress unused warnings since vars are needed */
(void)selector;
(void)flags;
- if (!strncasecmp(value, "Mod1", strlen("Mod1")))
+ if (strncasecmp(value, "Mod1", strlen("Mod1")) == 0)
update_modkey(XCB_MOD_MASK_1);
- else if (!strncasecmp(value, "Mod2", strlen("Mod2")))
+ else if (strncasecmp(value, "Mod2", strlen("Mod2")) == 0)
update_modkey(XCB_MOD_MASK_2);
- else if (!strncasecmp(value, "Mod3", strlen("Mod3")))
+ else if (strncasecmp(value, "Mod3", strlen("Mod3")) == 0)
update_modkey(XCB_MOD_MASK_3);
- else if (!strncasecmp(value, "Mod4", strlen("Mod4")))
+ else if (strncasecmp(value, "Mod4", strlen("Mod4")) == 0)
update_modkey(XCB_MOD_MASK_4);
else
return (1);
}
int
-setconfcolor(char *selector, char *value, int flags)
+setconfcolor(const char *selector, const char *value, int flags)
{
- setscreencolor(value, ((selector == NULL)?-1:atoi(selector)), flags);
+ setscreencolor(value,
+ (selector == NULL || strlen(selector) == 0) ? -1 : atoi(selector),
+ flags);
return (0);
}
int
-setconfregion(char *selector, char *value, int flags)
+setconfregion(const char *selector, const char *value, int flags)
{
/* suppress unused warnings since vars are needed */
(void)selector;
}
int
-setautorun(char *selector, char *value, int flags)
+setautorun(const char *selector, const char *value, int flags)
{
int ws_id;
char s[1024];
- char *ap, *sp = s;
+ char *ap, *sp;
union arg a;
int argc = 0;
pid_t pid;
if (ws_id < 0 || ws_id >= workspace_limit)
errx(1, "autorun: invalid workspace %d", ws_id + 1);
+ sp = expand_tilde((char *)&s);
+
/*
* This is a little intricate
*
err(1, "setautorun: realloc");
a.argv[argc - 1] = ap;
}
+ free(sp);
if ((a.argv = realloc(a.argv, (argc + 1) * sizeof(char *))) == NULL)
err(1, "setautorun: realloc");
}
int
-setlayout(char *selector, char *value, int flags)
+setlayout(const char *selector, const char *value, int flags)
{
int ws_id, i, x, mg, ma, si, ar, f = 0;
int st = SWM_V_STACK, num_screens;
if (ws_id < 0 || ws_id >= workspace_limit)
errx(1, "layout: invalid workspace %d", ws_id + 1);
- if (!strcasecmp(s, "vertical"))
+ if (strcasecmp(s, "vertical") == 0)
st = SWM_V_STACK;
- else if (!strcasecmp(s, "vertical_flip")) {
+ else if (strcasecmp(s, "vertical_flip") == 0) {
st = SWM_V_STACK;
f = 1;
- } else if (!strcasecmp(s, "horizontal"))
+ } else if (strcasecmp(s, "horizontal") == 0)
st = SWM_H_STACK;
- else if (!strcasecmp(s, "horizontal_flip")) {
+ else if (strcasecmp(s, "horizontal_flip") == 0) {
st = SWM_H_STACK;
f = 1;
- } else if (!strcasecmp(s, "fullscreen"))
+ } else if (strcasecmp(s, "fullscreen") == 0)
st = SWM_MAX_STACK;
else
errx(1, "invalid layout entry, should be 'ws[<idx>]:"
"<master_grow>:<master_add>:<stack_inc>:<always_raise>:"
"<type>'");
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++) {
ws = (struct workspace *)&screens[i].ws;
ws[ws_id].cur_layout = &layouts[st];
/* config options */
struct config_option {
char *optname;
- int (*func)(char*, char*, int);
+ int (*func)(const char*, const char*, int);
int funcflags;
};
struct config_option configopt[] = {
- { "bar_enabled", setconfvalue, SWM_S_BAR_ENABLED },
+ { "autorun", setautorun, 0 },
+ { "bar_action", setconfvalue, SWM_S_BAR_ACTION },
{ "bar_at_bottom", setconfvalue, SWM_S_BAR_AT_BOTTOM },
{ "bar_border", setconfcolor, SWM_S_COLOR_BAR_BORDER },
+ { "bar_border_unfocus", setconfcolor, SWM_S_COLOR_BAR_BORDER_UNFOCUS },
{ "bar_border_width", setconfvalue, SWM_S_BAR_BORDER_WIDTH },
{ "bar_color", setconfcolor, SWM_S_COLOR_BAR },
- { "bar_font_color", setconfcolor, SWM_S_COLOR_BAR_FONT },
- { "bar_font", setconfvalue, SWM_S_BAR_FONT },
- { "bar_action", setconfvalue, SWM_S_BAR_ACTION },
{ "bar_delay", setconfvalue, SWM_S_BAR_DELAY },
- { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY },
+ { "bar_enabled", setconfvalue, SWM_S_BAR_ENABLED },
+ { "bar_enabled_ws", setconfvalue, SWM_S_BAR_ENABLED_WS },
+ { "bar_font", setconfvalue, SWM_S_BAR_FONT },
+ { "bar_font_color", setconfcolor, SWM_S_COLOR_BAR_FONT },
{ "bar_format", setconfvalue, SWM_S_BAR_FORMAT },
- { "keyboard_mapping", setkeymapping, 0 },
+ { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY },
{ "bind", setconfbinding, 0 },
- { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED },
+ { "border_width", setconfvalue, SWM_S_BORDER_WIDTH },
+ { "boundary_width", setconfvalue, SWM_S_BOUNDARY_WIDTH },
{ "clock_enabled", setconfvalue, SWM_S_CLOCK_ENABLED },
{ "clock_format", setconfvalue, SWM_S_CLOCK_FORMAT },
{ "color_focus", setconfcolor, SWM_S_COLOR_FOCUS },
{ "color_unfocus", setconfcolor, SWM_S_COLOR_UNFOCUS },
{ "cycle_empty", setconfvalue, SWM_S_CYCLE_EMPTY },
{ "cycle_visible", setconfvalue, SWM_S_CYCLE_VISIBLE },
- { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT },
{ "dialog_ratio", setconfvalue, SWM_S_DIALOG_RATIO },
- { "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT },
+ { "disable_border", setconfvalue, SWM_S_DISABLE_BORDER },
+ { "focus_close", setconfvalue, SWM_S_FOCUS_CLOSE },
+ { "focus_close_wrap", setconfvalue, SWM_S_FOCUS_CLOSE_WRAP },
+ { "focus_default", setconfvalue, SWM_S_FOCUS_DEFAULT },
+ { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE },
+ { "iconic_enabled", setconfvalue, SWM_S_ICONIC_ENABLED },
+ { "keyboard_mapping", setkeymapping, 0 },
+ { "layout", setlayout, 0 },
{ "modkey", setconfmodkey, 0 },
{ "program", setconfspawn, 0 },
{ "quirk", setconfquirk, 0 },
{ "region", setconfregion, 0 },
- { "spawn_term", setconfvalue, SWM_S_SPAWN_TERM },
- { "screenshot_enabled", setconfvalue, SWM_S_SS_ENABLED },
+ { "region_padding", setconfvalue, SWM_S_REGION_PADDING },
{ "screenshot_app", setconfvalue, SWM_S_SS_APP },
- { "window_name_enabled", setconfvalue, SWM_S_WINDOW_NAME_ENABLED },
- { "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED },
- { "term_width", setconfvalue, SWM_S_TERM_WIDTH },
- { "title_class_enabled", setconfvalue, SWM_S_TITLE_CLASS_ENABLED },
- { "title_name_enabled", setconfvalue, SWM_S_TITLE_NAME_ENABLED },
- { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE },
- { "focus_close", setconfvalue, SWM_S_FOCUS_CLOSE },
- { "focus_close_wrap", setconfvalue, SWM_S_FOCUS_CLOSE_WRAP },
- { "focus_default", setconfvalue, SWM_S_FOCUS_DEFAULT },
+ { "screenshot_enabled", setconfvalue, SWM_S_SS_ENABLED },
{ "spawn_position", setconfvalue, SWM_S_SPAWN_ORDER },
- { "disable_border", setconfvalue, SWM_S_DISABLE_BORDER },
- { "border_width", setconfvalue, SWM_S_BORDER_WIDTH },
- { "autorun", setautorun, 0 },
- { "layout", setlayout, 0 },
+ { "spawn_term", setconfvalue, SWM_S_SPAWN_TERM },
+ { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED },
+ { "term_width", setconfvalue, SWM_S_TERM_WIDTH },
+ { "tile_gap", setconfvalue, SWM_S_TILE_GAP },
+ { "title_class_enabled", setconfvalue, SWM_S_WINDOW_CLASS_ENABLED }, /* For backwards compat. */
+ { "title_name_enabled", setconfvalue, SWM_S_WINDOW_INSTANCE_ENABLED }, /* For backwards compat. */
+ { "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED },
+ { "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT },
+ { "window_class_enabled", setconfvalue, SWM_S_WINDOW_CLASS_ENABLED },
+ { "window_instance_enabled", setconfvalue, SWM_S_WINDOW_INSTANCE_ENABLED },
+ { "window_name_enabled", setconfvalue, SWM_S_WINDOW_NAME_ENABLED },
+ { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT },
+ { "name", setconfvalue, SWM_S_WORKSPACE_NAME },
};
+void
+_add_startup_exception(const char *fmt, va_list ap)
+{
+ if (vasprintf(&startup_exception, fmt, ap) == -1)
+ warn("%s: asprintf", __func__);
+}
+
+void
+add_startup_exception(const char *fmt, ...)
+{
+ va_list ap;
+
+ nr_exceptions++;
+
+ if (startup_exception)
+ return;
+
+ /* force bar to be enabled due to exception */
+ bar_enabled = 1;
+
+ va_start(ap, fmt);
+ _add_startup_exception(fmt, ap);
+ va_end(ap);
+}
int
-conf_load(char *filename, int keymapping)
+conf_load(const char *filename, int keymapping)
{
FILE *config;
- char *line, *cp, *optsub, *optval;
+ char *line = NULL, *cp, *ce, *optsub, *optval = NULL;
size_t linelen, lineno = 0;
- int wordlen, i, optidx;
- struct config_option *opt;
+ int wordlen, i, optidx, count;
+ struct config_option *opt = NULL;
DNPRINTF(SWM_D_CONF, "conf_load: begin\n");
warnx("conf_load: no filename");
return (1);
}
+
+ DNPRINTF(SWM_D_CONF, "conf_load: open %s\n", filename);
+
if ((config = fopen(filename, "r")) == NULL) {
warn("conf_load: fopen: %s", filename);
return (1);
}
while (!feof(config)) {
- if ((line = fparseln(config, &linelen, &lineno, NULL, 0))
- == NULL) {
+ if (line)
+ free(line);
+
+ if ((line = fparseln(config, &linelen, &lineno, NULL,
+ FPARSELN_UNESCCOMM | FPARSELN_UNESCCONT)) == NULL) {
if (ferror(config))
err(1, "%s", filename);
else
cp += strspn(cp, " \t\n"); /* eat whitespace */
if (cp[0] == '\0') {
/* empty line */
- free(line);
continue;
}
/* get config option */
wordlen = strcspn(cp, "=[ \t\n");
if (wordlen == 0) {
- warnx("%s: line %zd: no option found",
+ add_startup_exception("%s: line %zd: no option found",
filename, lineno);
- goto out;
+ continue;
}
optidx = -1;
for (i = 0; i < LENGTH(configopt); i++) {
opt = &configopt[i];
- if (!strncasecmp(cp, opt->optname, wordlen) &&
+ if (strncasecmp(cp, opt->optname, wordlen) == 0 &&
(int)strlen(opt->optname) == wordlen) {
optidx = i;
break;
}
}
if (optidx == -1) {
- warnx("%s: line %zd: unknown option %.*s",
- filename, lineno, wordlen, cp);
- goto out;
+ add_startup_exception("%s: line %zd: unknown option "
+ "%.*s", filename, lineno, wordlen, cp);
+ continue;
}
- if (keymapping && strcmp(opt->optname, "bind")) {
- warnx("%s: line %zd: invalid option %.*s",
- filename, lineno, wordlen, cp);
- goto out;
+ if (keymapping && opt && strcmp(opt->optname, "bind")) {
+ add_startup_exception("%s: line %zd: invalid option "
+ "%.*s", filename, lineno, wordlen, cp);
+ continue;
}
cp += wordlen;
cp += strspn(cp, " \t\n"); /* eat whitespace */
+
/* get [selector] if any */
optsub = NULL;
+ count = 0;
if (*cp == '[') {
- cp++;
- wordlen = strcspn(cp, "]");
- if (*cp != ']') {
- if (wordlen == 0) {
- warnx("%s: line %zd: syntax error",
- filename, lineno);
- goto out;
+ ++count;
+ /* Get length of selector. */
+ for (ce = ++cp; *ce != '\0'; ++ce) {
+ /* Find matching (not escaped) bracket. */
+ if (*ce == ']' && *(ce - 1) != '\\') {
+ --count;
+ break;
}
+ }
- if (asprintf(&optsub, "%.*s", wordlen, cp) ==
- -1) {
- warnx("%s: line %zd: unable to allocate"
- "memory for selector", filename,
- lineno);
- goto out;
- }
+ if (count > 0) {
+ add_startup_exception("%s: line %zd: syntax "
+ "error: unterminated selector", filename,
+ lineno);
+ continue;
}
- cp += wordlen;
- cp += strspn(cp, "] \t\n"); /* eat trailing */
+
+ /* ce points at ']'; terminate optsub. */
+ *ce = '\0';
+ optsub = cp;
+ cp = ce + 1;
}
cp += strspn(cp, "= \t\n"); /* eat trailing */
/* get RHS value */
- optval = strdup(cp);
+ optval = cp;
+ if (strlen(optval) == 0) {
+ add_startup_exception("%s: line %zd: must supply value "
+ "to %s", filename, lineno,
+ configopt[optidx].optname);
+ continue;
+ }
/* call function to deal with it all */
if (configopt[optidx].func(optsub, optval,
- configopt[optidx].funcflags) != 0)
- errx(1, "%s: line %zd: invalid data for %s",
- filename, lineno, configopt[optidx].optname);
- free(optval);
- free(optsub);
- free(line);
+ configopt[optidx].funcflags) != 0) {
+ add_startup_exception("%s: line %zd: invalid data for "
+ "%s", filename, lineno, configopt[optidx].optname);
+ continue;
+ }
}
+ if (line)
+ free(line);
fclose(config);
DNPRINTF(SWM_D_CONF, "conf_load: end\n");
return (0);
-
-out:
- free(line);
- fclose(config);
- DNPRINTF(SWM_D_CONF, "conf_load: end with error.\n");
-
- return (1);
}
void
parent->focus_child = win;
else {
DNPRINTF(SWM_D_MISC, "set_child_transient: parent doesn't exist"
- " for 0x%x trans 0x%x\n", win->id, win->transient);
+ " for %#x trans %#x\n", win->id, win->transient);
- r = root_to_region(win->wa->root);
+ r = root_to_region(win->s->root, SWM_CK_ALL);
ws = r->ws;
/* parent doen't exist in our window list */
TAILQ_FOREACH(w, &ws->winlist, entry) {
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);
+ warnx("can't get hints for %#x", w->id);
continue;
}
win->transient = w->id;
*trans = w->id;
DNPRINTF(SWM_D_MISC, "set_child_transient: adjusting "
- "transient to 0x%x\n", win->transient);
+ "transient to %#x\n", win->transient);
break;
}
}
pc = xcb_get_property(conn, 0, win, apid, XCB_ATOM_CARDINAL, 0, 1);
pr = xcb_get_property_reply(conn, pc, NULL);
- if (!pr)
+ if (pr == NULL)
goto tryharder;
if (pr->type != XCB_ATOM_CARDINAL) {
free(pr);
pc = xcb_get_property(conn, 0, win, apid, XCB_ATOM_STRING,
0, SWM_PROPLEN);
pr = xcb_get_property_reply(conn, pc, NULL);
- if (!pr)
+ if (pr == NULL)
return (0);
if (pr->type != apid) {
free(pr);
}
int
-get_ws_idx(xcb_window_t id)
+get_swm_ws(xcb_window_t id)
{
int ws_idx = -1;
char *prop = NULL;
xcb_get_property(conn, 0, id, a_swm_ws,
XCB_ATOM_STRING, 0, SWM_PROPLEN),
NULL);
- if (!gpr)
+ if (gpr == NULL)
return (-1);
if (gpr->type) {
proplen = xcb_get_property_value_length(gpr);
free(gpr);
if (prop) {
- DNPRINTF(SWM_D_PROP, "get_ws_idx: _SWM_WS: %s\n", prop);
+ DNPRINTF(SWM_D_PROP, "get_swm_ws: _SWM_WS: %s\n", prop);
ws_idx = (int)strtonum(prop, 0, workspace_limit - 1, &errstr);
if (errstr) {
- DNPRINTF(SWM_D_PROP, "get_ws_idx: window: #%s: %s",
+ DNPRINTF(SWM_D_PROP, "get_swm_ws: win #%s: %s",
errstr, prop);
}
free(prop);
return ws_idx;
}
+int
+get_ws_idx(xcb_window_t id)
+{
+ xcb_get_property_reply_t *gpr;
+ int ws_idx = -1;
+
+ gpr = xcb_get_property_reply(conn,
+ xcb_get_property(conn, 0, id, ewmh[_NET_WM_DESKTOP].atom,
+ XCB_ATOM_CARDINAL, 0, 1),
+ NULL);
+ if (gpr) {
+ if (gpr->type == XCB_ATOM_CARDINAL && gpr->format == 32)
+ ws_idx = *((int *)xcb_get_property_value(gpr));
+ free(gpr);
+ }
+
+ if (ws_idx == -1)
+ if ((ws_idx = get_swm_ws(id)) != -1)
+ xcb_delete_property(conn, id, a_swm_ws);
+
+ if (ws_idx > workspace_limit - 1 || ws_idx < -1)
+ ws_idx = -1;
+
+ DNPRINTF(SWM_D_PROP, "get_ws_idx: win %#x, ws_idx: %d\n", id, ws_idx);
+
+ return ws_idx;
+}
+
struct ws_win *
-manage_window(xcb_window_t id)
+manage_window(xcb_window_t id, int mapped)
{
- xcb_window_t trans = XCB_WINDOW_NONE;
struct ws_win *win, *ww;
- int ws_idx, border_me = 0;
- char ws_idx_str[SWM_PROPLEN];
struct swm_region *r;
struct pid_e *p;
struct quirk *qp;
- uint32_t event_mask, i;
- xcb_icccm_get_wm_protocols_reply_t wpr;
+ xcb_get_geometry_reply_t *gr;
+ xcb_window_t trans = XCB_WINDOW_NONE;
+ uint32_t i, wa[2], new_flags;
+ int ws_idx;
+ char *class, *instance, *name;
if ((win = find_window(id)) != NULL) {
- DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x already "
+ DNPRINTF(SWM_D_MISC, "manage_window: win %#x already "
"managed; skipping.)\n", id);
return (win); /* Already managed. */
}
/* See if window is on the unmanaged list. */
if ((win = find_unmanaged_window(id)) != NULL) {
- DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x found on "
+ DNPRINTF(SWM_D_MISC, "manage_window: win %#x found on "
"unmanaged list.\n", id);
TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
- if (win->transient)
+ if (TRANS(win))
set_child_transient(win, &trans);
goto out;
} else {
- DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x is new.\n", id);
+ DNPRINTF(SWM_D_MISC, "manage_window: win %#x is new.\n", id);
+ }
+
+ /* Try to get initial window geometry. */
+ gr = xcb_get_geometry_reply(conn, xcb_get_geometry(conn, id), NULL);
+ if (gr == NULL) {
+ DNPRINTF(SWM_D_MISC, "manage_window: get geometry failed.\n");
+ return (NULL);
}
/* Create and initialize ws_win object. */
win->id = id;
- /* Get window geometry. */
- win->wa = xcb_get_geometry_reply(conn,
- xcb_get_geometry(conn, win->id),
- NULL);
-
- /* Figure out which region the window belongs to. */
- r = root_to_region(win->wa->root);
+ /* Figureout which region the window belongs to. */
+ r = root_to_region(gr->root, SWM_CK_ALL);
/* 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;
- win->bordered = 0;
- win->floatmaxed = 0;
- win->ewmh_flags = 0;
+ WIDTH(win) = gr->width;
+ HEIGHT(win) = gr->height;
+ X(win) = gr->x + gr->border_width - border_width;
+ Y(win) = gr->y + gr->border_width - border_width;
+ win->bordered = 1;
+ win->mapped = mapped;
win->s = r->s; /* this never changes */
- store_float_geom(win, r);
+ free(gr);
+
+ /* Select which X events to monitor and set border pixel color. */
+ wa[0] = win->s->c[SWM_S_COLOR_UNFOCUS].pixel;
+ wa[1] = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_PROPERTY_CHANGE |
+ XCB_EVENT_MASK_STRUCTURE_NOTIFY;
+#ifdef SWM_DEBUG
+ wa[1] |= XCB_EVENT_MASK_LEAVE_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE;
+#endif
+
+ xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL |
+ XCB_CW_EVENT_MASK, wa);
/* Get WM_SIZE_HINTS. */
xcb_icccm_get_wm_normal_hints_reply(conn,
set_child_transient(win, &win->transient);
}
- /* Get supported protocols. */
- if (xcb_icccm_get_wm_protocols_reply(conn,
- xcb_icccm_get_wm_protocols(conn, win->id, a_prot),
- &wpr, NULL)) {
- for (i = 0; i < wpr.atoms_len; i++) {
- if (wpr.atoms[i] == a_takefocus)
- win->take_focus = 1;
- if (wpr.atoms[i] == a_delete)
- win->can_delete = 1;
- }
- xcb_icccm_get_wm_protocols_reply_wipe(&wpr);
- }
-
- win->iconic = get_iconic(win);
+ /* Get WM_PROTOCOLS. */
+ get_wm_protocols(win);
/* Figure out which workspace the window belongs to. */
if ((p = find_pid(window_get_pid(win->id))) != NULL) {
free(p);
p = NULL;
} else if ((ws_idx = get_ws_idx(win->id)) != -1 &&
- win->transient == 0) {
+ !TRANS(win)) {
/* _SWM_WS is set; use that. */
win->ws = &r->s->ws[ws_idx];
} else if (trans && (ww = find_window(trans)) != NULL) {
/* Launch transients in the same ws as parent. */
win->ws = ww->ws;
- border_me = 1;
} else {
win->ws = r->ws;
}
- /* Set the _SWM_WS atom so we can remember this after reincarnation. */
- if (snprintf(ws_idx_str, SWM_PROPLEN, "%d", win->ws->idx) <
- SWM_PROPLEN) {
- DNPRINTF(SWM_D_PROP, "manage_window: set _SWM_WS: %s\n",
- ws_idx_str);
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
- a_swm_ws, XCB_ATOM_STRING, 8, strlen(ws_idx_str),
- ws_idx_str);
- }
+ /* Set the _NET_WM_DESKTOP atom. */
+ DNPRINTF(SWM_D_PROP, "manage_window: set _NET_WM_DESKTOP: %d\n",
+ win->ws->idx);
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
+ ewmh[_NET_WM_DESKTOP].atom, XCB_ATOM_CARDINAL, 32, 1, &win->ws->idx);
- /* Handle EWMH */
+ /* WS must already be set for this to work. */
+ store_float_geom(win);
+
+ /* Set initial quirks based on EWMH. */
ewmh_autoquirk(win);
/* Determine initial quirks. */
- if (xcb_icccm_get_wm_class_reply(conn,
+ 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.class_name, win->ch.instance_name);
-
- /* java is retarded so treat it special */
- if (strstr(win->ch.instance_name, "sun-awt")) {
- DNPRINTF(SWM_D_CLASS, "manage_window: java window "
- "detected.\n");
- win->java = 1;
- border_me = 1;
- }
-
- TAILQ_FOREACH(qp, &quirks, entry) {
- if (!strcmp(win->ch.class_name, qp->class) &&
- !strcmp(win->ch.instance_name, qp->name)) {
- DNPRINTF(SWM_D_CLASS, "manage_window: on quirks"
- "list; mask: 0x%lx\n", qp->quirk);
- if (qp->quirk & SWM_Q_FLOAT) {
- win->floating = 1;
- border_me = 1;
- }
- win->quirks = qp->quirk;
- }
- }
+ &win->ch, NULL);
+
+ class = win->ch.class_name ? win->ch.class_name : "";
+ instance = win->ch.instance_name ? win->ch.instance_name : "";
+ name = get_win_name(win->id);
+
+ DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, instance: %s, "
+ "name: %s\n", class, instance, name);
+
+ /* java is retarded so treat it special */
+ if (strstr(instance, "sun-awt")) {
+ DNPRINTF(SWM_D_CLASS, "manage_window: java window detected.\n");
+ win->java = 1;
}
- /* Alter window position if quirky */
- if (win->quirks & SWM_Q_ANYWHERE) {
- win->manual = 1;
- border_me = 1;
+ TAILQ_FOREACH(qp, &quirks, entry) {
+ if (regexec(&qp->regex_class, class, 0, NULL, 0) == 0 &&
+ regexec(&qp->regex_instance, instance, 0, NULL, 0) == 0 &&
+ regexec(&qp->regex_name, name, 0, NULL, 0) == 0) {
+ DNPRINTF(SWM_D_CLASS, "manage_window: matched "
+ "quirk: %s:%s:%s mask: %#lx\n", qp->class,
+ qp->instance, qp->name, qp->quirk);
+ win->quirks = qp->quirk;
+ }
}
+ free(name);
+
/* Reset font sizes (the bruteforce way; no default keybinding). */
if (win->quirks & SWM_Q_XTERM_FONTADJ) {
for (i = 0; i < SWM_MAX_FONT_STEPS; i++)
fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT);
}
- if (border_me) {
- win->bordered = 1;
- X(win) -= border_width;
- Y(win) -= border_width;
- }
-
/* Make sure window is positioned inside its region, if its active. */
- if (win->ws->r)
- constrain_window(win, win->ws->r, 0);
-
- if (win->ws->r || border_me)
+ if (win->ws->r) {
+ region_containment(win, r, SWM_CW_ALLSIDES |
+ SWM_CW_HARDBOUNDARY);
update_window(win);
-
- /* Select which X events to monitor. */
- event_mask = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE |
- XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
-#ifdef SWM_DEBUG
- event_mask |= XCB_EVENT_MASK_LEAVE_WINDOW;
-#endif
-
- xcb_change_window_attributes(conn, win->id, XCB_CW_EVENT_MASK,
- &event_mask);
+ }
out:
/* Figure out where to stack the window in the workspace. */
TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry);
}
- /* Get initial _NET_WM_STATE */
- ewmh_get_win_state(win);
+ ewmh_update_client_list();
+
+ TAILQ_INSERT_TAIL(&win->ws->stack, win, stack_entry);
+
+ /* Get/apply initial _NET_WM_STATE */
+ ewmh_get_wm_state(win);
+
+ /* Apply quirks. */
+ new_flags = win->ewmh_flags;
+
+ if (win->quirks & SWM_Q_FLOAT)
+ new_flags |= EWMH_F_ABOVE;
+
+ if (win->quirks & SWM_Q_ANYWHERE)
+ new_flags |= SWM_F_MANUAL;
+
+ ewmh_apply_flags(win, new_flags);
+ ewmh_update_wm_state(win);
+
/* Set initial _NET_WM_ALLOWED_ACTIONS */
ewmh_update_actions(win);
grabbuttons(win);
- DNPRINTF(SWM_D_MISC, "manage_window: done. window: 0x%x, (x,y) w x h: "
- "(%d,%d) %d x %d, ws: %d, iconic: %s, transient: 0x%x\n", win->id,
+ DNPRINTF(SWM_D_MISC, "manage_window: done. win %#x, (x,y) w x h: "
+ "(%d,%d) %d x %d, ws: %d, iconic: %s, transient: %#x\n", win->id,
X(win), Y(win), WIDTH(win), HEIGHT(win), win->ws->idx,
- YESNO(win->iconic), win->transient);
+ YESNO(ICONIC(win)), win->transient);
return (win);
}
void
free_window(struct ws_win *win)
{
- DNPRINTF(SWM_D_MISC, "free_window: window: 0x%x\n", win->id);
+ DNPRINTF(SWM_D_MISC, "free_window: win %#x\n", win->id);
if (win == NULL)
return;
TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
- 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");
+ DNPRINTF(SWM_D_MISC, "free_window: done.\n");
}
void
if (win == NULL)
return;
- DNPRINTF(SWM_D_MISC, "unmanage_window: window: 0x%x\n", win->id);
+ DNPRINTF(SWM_D_MISC, "unmanage_window: win %#x\n", win->id);
- if (win->transient) {
+ if (TRANS(win)) {
parent = find_window(win->transient);
if (parent)
parent->focus_child = NULL;
}
- focus_win(get_focus_prev(win));
-
+ TAILQ_REMOVE(&win->ws->stack, win, stack_entry);
TAILQ_REMOVE(&win->ws->winlist, win, entry);
TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
+
+ ewmh_update_client_list();
}
void
int i, num_screens;
struct swm_region *r;
- DNPRINTF(SWM_D_EVENT, "expose: window: 0x%x\n", e->window);
+ DNPRINTF(SWM_D_EVENT, "expose: win %#x\n", e->window);
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
TAILQ_FOREACH(r, &screens[i].rl, entry)
if (e->window == WINID(r->bar))
- bar_update();
+ bar_draw();
xcb_flush(conn);
}
void
focusin(xcb_focus_in_event_t *e)
{
- DNPRINTF(SWM_D_EVENT, "focusin: window: 0x%x, mode: %s(%u), "
+ DNPRINTF(SWM_D_EVENT, "focusin: win %#x, mode: %s(%u), "
+ "detail: %s(%u)\n", e->event, get_notify_mode_label(e->mode),
+ e->mode, get_notify_detail_label(e->detail), e->detail);
+}
+
+void
+focusout(xcb_focus_out_event_t *e)
+{
+ DNPRINTF(SWM_D_EVENT, "focusout: win %#x, mode: %s(%u), "
"detail: %s(%u)\n", e->event, get_notify_mode_label(e->mode),
e->mode, get_notify_detail_label(e->detail), e->detail);
}
keysym = xcb_key_press_lookup_keysym(syms, e, 0);
- DNPRINTF(SWM_D_EVENT, "keypress: %u %u\n", e->detail, keysym);
+ DNPRINTF(SWM_D_EVENT, "keypress: keysym: %u, win (x,y): %#x (%d,%d), "
+ "detail: %u, time: %u, root (x,y): %#x (%d,%d), child: %#x, "
+ "state: %u, same_screen: %s\n", keysym, e->event, e->event_x,
+ e->event_y, e->detail, e->time, e->root, e->root_x, e->root_y,
+ e->child, e->state, YESNO(e->same_screen));
if ((kp = key_lookup(CLEANMASK(e->state), keysym)) == NULL)
- return;
+ goto out;
+
+ last_event_time = e->time;
if (kp->funcid == KF_SPAWN_CUSTOM)
- spawn_custom(root_to_region(e->root),
+ spawn_custom(root_to_region(e->root, SWM_CK_ALL),
&(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].func(root_to_region(e->root, SWM_CK_ALL),
&(keyfuncs[kp->funcid].args));
+
+out:
+ /* Unfreeze grab events. */
+ xcb_allow_events(conn, XCB_ALLOW_ASYNC_KEYBOARD, e->time);
+ xcb_flush(conn);
+
+ DNPRINTF(SWM_D_EVENT, "keypress: done.\n");
}
void
buttonpress(xcb_button_press_event_t *e)
{
- struct ws_win *win;
+ struct ws_win *win = NULL;
+ struct swm_region *r, *old_r;
int i;
int handled = 0;
- DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n",
- e->event, e->detail);
+ DNPRINTF(SWM_D_EVENT, "buttonpress: win (x,y): %#x (%d,%d), "
+ "detail: %u, time: %u, root (x,y): %#x (%d,%d), child: %#x, "
+ "state: %u, same_screen: %s\n", e->event, e->event_x, e->event_y,
+ e->detail, e->time, e->root, e->root_x, e->root_y, e->child,
+ e->state, YESNO(e->same_screen));
+
+ if (e->event == e->root) {
+ if (e->child != 0) {
+ win = find_window(e->child);
+ /* Pass ButtonPress to window if it isn't managed. */
+ if (win == NULL)
+ goto out;
+ } else {
+ /* Focus on empty region */
+ /* If no windows on region if its empty. */
+ r = root_to_region(e->root, SWM_CK_POINTER);
+ if (r == NULL) {
+ DNPRINTF(SWM_D_EVENT, "buttonpress: "
+ "NULL region; ignoring.\n");
+ goto out;
+ }
+
+ if (TAILQ_EMPTY(&r->ws->winlist)) {
+ old_r = root_to_region(e->root, SWM_CK_FOCUS);
+ if (old_r && old_r != r)
+ unfocus_win(old_r->ws->focus);
+
+ xcb_set_input_focus(conn,
+ XCB_INPUT_FOCUS_PARENT, e->root, e->time);
+
+ /* Clear bar since empty. */
+ bar_draw();
+
+ handled = 1;
+ goto out;
+ }
+ }
+ } else {
+ win = find_window(e->event);
+ }
+
+ if (win == NULL)
+ goto out;
- if ((win = find_window(e->event)) == NULL)
- return;
+ last_event_time = e->time;
focus_win(get_focus_magic(win));
handled = 1;
}
+out:
if (!handled) {
DNPRINTF(SWM_D_EVENT, "buttonpress: passing to window.\n");
+ /* Replay event to event window */
xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, e->time);
} else {
DNPRINTF(SWM_D_EVENT, "buttonpress: handled.\n");
+ /* Unfreeze grab events. */
+ xcb_allow_events(conn, XCB_ALLOW_SYNC_POINTER, e->time);
}
xcb_flush(conn);
xcb_get_geometry_reply_t *wa;
wa = xcb_get_geometry_reply(conn, xcb_get_geometry(conn, w), NULL);
-
- if (!wa) {
- DNPRINTF(SWM_D_MISC, "print_win_geom: window not found: 0x%x\n",
+ if (wa == NULL) {
+ DNPRINTF(SWM_D_MISC, "print_win_geom: window not found: %#x\n",
w);
return;
}
- DNPRINTF(SWM_D_MISC, "print_win_geom: window: 0x%x, root: 0x%x, "
+ DNPRINTF(SWM_D_MISC, "print_win_geom: win %#x, root: %#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);
if (swm_debug & SWM_D_EVENT) {
print_win_geom(e->window);
- DNPRINTF(SWM_D_EVENT, "configurerequest: window: 0x%x, "
- "parent: 0x%x, new: %s, value_mask: %u { ", e->window,
+ DNPRINTF(SWM_D_EVENT, "configurerequest: win %#x, "
+ "parent: %#x, new: %s, value_mask: %u { ", e->window,
e->parent, YESNO(new), e->value_mask);
if (e->value_mask & XCB_CONFIG_WINDOW_X)
DPRINTF("X: %d ", e->x);
if (e->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH)
DPRINTF("Border: %u ", e->border_width);
if (e->value_mask & XCB_CONFIG_WINDOW_SIBLING)
- DPRINTF("Sibling: 0x%x ", e->sibling);
+ DPRINTF("Sibling: %#x ", e->sibling);
if (e->value_mask & XCB_CONFIG_WINDOW_STACK_MODE)
DPRINTF("StackMode: %s(%u) ",
get_stack_mode_name(e->stack_mode), e->stack_mode);
wc[i++] = e->stack_mode;
}
- if (mask != 0)
+ if (mask != 0) {
xcb_configure_window(conn, e->window, mask, wc);
- } else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) &&
- !(win->ewmh_flags & EWMH_F_FULLSCREEN)) {
+ xcb_flush(conn);
+ }
+ } else if ((!MANUAL(win) || win->quirks & SWM_Q_ANYWHERE) &&
+ !FULLSCREEN(win) && !MAXIMIZED(win)) {
if (win->ws->r)
r = win->ws->r;
else if (win->ws->old_r)
win->g_floatvalid = 1;
- if (win->floating && r) {
+ if (!MAXIMIZED(win) && !FULLSCREEN(win) &&
+ (TRANS(win) || (ABOVE(win) &&
+ win->ws->cur_layout != &layouts[SWM_MAX_STACK]))) {
WIDTH(win) = win->g_float.w;
HEIGHT(win) = win->g_float.h;
- stack_floater(win, win->ws->r);
-
- focus_flush();
+ if (r != NULL) {
+ update_floater(win);
+ focus_flush();
+ } else {
+ config_win(win, e);
+ xcb_flush(conn);
+ }
} else {
config_win(win, e);
xcb_flush(conn);
config_win(win, e);
xcb_flush(conn);
}
+
+ DNPRINTF(SWM_D_EVENT, "configurerequest: done.\n");
}
void
{
struct ws_win *win;
- DNPRINTF(SWM_D_EVENT, "configurenotify: window: 0x%x\n",
- e->window);
+ DNPRINTF(SWM_D_EVENT, "configurenotify: win %#x, event win: %#x, "
+ "(x,y) WxH: (%d,%d) %ux%u, border: %u, above_sibling: %#x, "
+ "override_redirect: %s\n", e->window, e->event, e->x, e->y,
+ e->width, e->height, e->border_width, e->above_sibling,
+ YESNO(e->override_redirect));
win = find_window(e->window);
if (win) {
{
struct ws_win *win;
- DNPRINTF(SWM_D_EVENT, "destroynotify: window: 0x%x\n", e->window);
+ DNPRINTF(SWM_D_EVENT, "destroynotify: win %#x\n", e->window);
if ((win = find_window(e->window)) == NULL) {
if ((win = find_unmanaged_window(e->window)) == NULL)
return;
}
- /* make sure we focus on something */
- win->floating = 0;
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ /* If we were focused, make sure we focus on something else. */
+ if (win == win->ws->focus)
+ win->ws->focus_pending = get_focus_prev(win);
+ }
unmanage_window(win);
- free_window(win);
-
stack();
+ if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) {
+ if (win->ws->focus_pending) {
+ focus_win(win->ws->focus_pending);
+ win->ws->focus_pending = NULL;
+ } else if (win == win->ws->focus) {
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
+ win->ws->r->id, XCB_CURRENT_TIME);
+ }
+ }
+
+ free_window(win);
+
focus_flush();
}
enternotify(xcb_enter_notify_event_t *e)
{
struct ws_win *win;
+ struct swm_region *r;
- DNPRINTF(SWM_D_FOCUS, "enternotify: window: 0x%x, mode: %s(%d), "
- "detail: %s(%d), root: 0x%x, subwindow: 0x%x, same_screen_focus: "
- "%s, state: %d\n", e->event, get_notify_mode_label(e->mode),
- e->mode, get_notify_detail_label(e->detail), e->detail, e->root,
- e->child, YESNO(e->same_screen_focus), e->state);
+ DNPRINTF(SWM_D_FOCUS, "enternotify: time: %u, win (x,y): %#x "
+ "(%d,%d), mode: %s(%d), detail: %s(%d), root (x,y): %#x (%d,%d), "
+ "child: %#x, same_screen_focus: %s, state: %d\n",
+ e->time, e->event, e->event_x, e->event_y,
+ get_notify_mode_label(e->mode), e->mode,
+ get_notify_detail_label(e->detail), e->detail,
+ e->root, e->root_x, e->root_y, e->child,
+ YESNO(e->same_screen_focus), e->state);
if (focus_mode == SWM_FOCUS_MANUAL &&
e->mode == XCB_NOTIFY_MODE_NORMAL) {
return;
}
+ last_event_time = e->time;
+
if ((win = find_window(e->event)) == NULL) {
- DNPRINTF(SWM_D_EVENT, "enternotify: window is NULL; ignoring\n");
- return;
- }
+ if (e->event == e->root) {
+ /* If no windows on pointer region, then focus root. */
+ r = root_to_region(e->root, SWM_CK_POINTER);
+ if (r == NULL) {
+ DNPRINTF(SWM_D_EVENT, "enternotify: "
+ "NULL region; ignoring.\n");
+ return;
+ }
- focus_win(get_focus_magic(win));
+ focus_region(r);
+ } else {
+ DNPRINTF(SWM_D_EVENT, "enternotify: window is NULL; "
+ "ignoring\n");
+ return;
+ }
+ } else {
+ focus_win(get_focus_magic(win));
+ }
xcb_flush(conn);
}
void
leavenotify(xcb_leave_notify_event_t *e)
{
- DNPRINTF(SWM_D_FOCUS, "leavenotify: window: 0x%x, mode: %s(%d), "
- "detail: %s(%d), root: 0x%x, subwindow: 0x%x, same_screen_focus: "
- "%s, state: %d\n", e->event, get_notify_mode_label(e->mode),
- e->mode, get_notify_detail_label(e->detail), e->detail, e->root,
- e->child, YESNO(e->same_screen_focus), e->state);
+ DNPRINTF(SWM_D_FOCUS, "leavenotify: time: %u, win (x,y): %#x "
+ "(%d,%d), mode: %s(%d), detail: %s(%d), root (x,y): %#x (%d,%d), "
+ "child: %#x, same_screen_focus: %s, state: %d\n",
+ e->time, e->event, e->event_x, e->event_y,
+ get_notify_mode_label(e->mode), e->mode,
+ get_notify_detail_label(e->detail), e->detail,
+ e->root, e->root_x, e->root_y, e->child,
+ YESNO(e->same_screen_focus), e->state);
}
#endif
-/* lets us use one switch statement for arbitrary mode/detail combinations */
-#define MERGE_MEMBERS(a,b) (((a & 0xffff) << 16) | (b & 0xffff))
-
void
mapnotify(xcb_map_notify_event_t *e)
{
- struct ws_win *win;
+ struct ws_win *win, *parent = NULL;
+ struct workspace *ws;
- DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%x\n", e->window);
+ DNPRINTF(SWM_D_EVENT, "mapnotify: win %#x\n", e->window);
- if ((win = find_window(e->window)) == NULL)
- win = manage_window(e->window);
+ if ((win = manage_window(e->window, 1)) == NULL)
+ return;
+ ws = win->ws;
+
+ /* Need to know if win was mapped due to ws switch. */
+ if (ws->state == SWM_WS_STATE_MAPPED) {
+ if (ws->focus_pending && TRANS(ws->focus_pending))
+ parent = find_window(win->transient);
+
+ /* If window's parent is maximized, don't clear it. */
+ if ((parent == NULL) || !MAXIMIZED(parent))
+ if (clear_maximized(ws) > 0)
+ stack();
+ }
+ win->mapped = 1;
set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
- /* Focus on window if it is selected. */
- if (win->ws->focus == win)
- focus_win(win);
+ if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) {
+ if (ws->focus_pending == win) {
+ focus_win(win);
+ ws->focus_pending = NULL;
+ focus_flush();
+ }
+ }
xcb_flush(conn);
}
void
mappingnotify(xcb_mapping_notify_event_t *e)
{
+ struct ws_win *w;
+ int i, j, num_screens;
+
xcb_refresh_keyboard_mapping(syms, e);
- if (e->request == XCB_MAPPING_KEYBOARD)
+ if (e->request == XCB_MAPPING_KEYBOARD) {
grabkeys();
+
+ /* Regrab buttons on all managed windows. */
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; i++)
+ for (j = 0; j < workspace_limit; j++)
+ TAILQ_FOREACH(w, &screens[i].ws[j].winlist,
+ entry)
+ grabbuttons(w);
+ }
}
void
maprequest(xcb_map_request_event_t *e)
{
- struct ws_win *win;
+ struct ws_win *win, *w = NULL;
xcb_get_window_attributes_reply_t *war;
- DNPRINTF(SWM_D_EVENT, "maprequest: win 0x%x\n",
+ DNPRINTF(SWM_D_EVENT, "maprequest: win %#x\n",
e->window);
war = xcb_get_window_attributes_reply(conn,
goto out;
}
- win = manage_window(e->window);
+ win = manage_window(e->window,
+ (war->map_state == XCB_MAP_STATE_VIEWABLE));
+ if (win == NULL)
+ goto out;
+
+ /* The new window should get focus; prepare. */
+ if (focus_mode != SWM_FOCUS_FOLLOW &&
+ !(win->quirks & SWM_Q_NOFOCUSONMAP) &&
+ (!(win->hints.flags & XCB_ICCCM_WM_HINT_INPUT) ||
+ (win->hints.flags & XCB_ICCCM_WM_HINT_INPUT &&
+ win->hints.input))) {
+ if (win->quirks & SWM_Q_FOCUSONMAP_SINGLE) {
+ /* See if other wins of same type are already mapped. */
+ TAILQ_FOREACH(w, &win->ws->winlist, entry) {
+ if (w == win || !w->mapped)
+ continue;
+
+ if (w->ch.class_name &&
+ win->ch.class_name &&
+ strcmp(w->ch.class_name,
+ win->ch.class_name) == 0 &&
+ w->ch.instance_name &&
+ win->ch.instance_name &&
+ strcmp(w->ch.instance_name,
+ win->ch.instance_name) == 0)
+ break;
+ }
+ }
+
+ if (w == NULL)
+ win->ws->focus_pending = get_focus_magic(win);
+ }
/* All windows need to be mapped if they are in the current workspace.*/
if (win->ws->r)
stack();
- /* The new window should get focus. */
- win->ws->focus = get_focus_magic(win);
-
/* Ignore EnterNotify to handle the mapnotify without interference. */
if (focus_mode == SWM_FOCUS_DEFAULT)
event_drain(XCB_ENTER_NOTIFY);
DNPRINTF(SWM_D_EVENT, "maprequest: done.\n");
}
+void
+motionnotify(xcb_motion_notify_event_t *e)
+{
+ struct swm_region *r = NULL;
+ int i, num_screens;
+
+ DNPRINTF(SWM_D_FOCUS, "motionnotify: time: %u, win (x,y): %#x "
+ "(%d,%d), detail: %s(%d), root (x,y): %#x (%d,%d), "
+ "child: %#x, same_screen_focus: %s, state: %d\n",
+ e->time, e->event, e->event_x, e->event_y,
+ get_notify_detail_label(e->detail), e->detail,
+ e->root, e->root_x, e->root_y, e->child,
+ YESNO(e->same_screen), e->state);
+
+ last_event_time = e->time;
+
+ if (focus_mode == SWM_FOCUS_MANUAL)
+ return;
+
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; i++)
+ if (screens[i].root == e->root)
+ break;
+
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ if (X(r) <= e->root_x && e->root_x < MAX_X(r) &&
+ Y(r) <= e->root_y && e->root_y < MAX_Y(r))
+ break;
+
+ focus_region(r);
+}
+
#ifdef SWM_DEBUG
char *
get_atom_name(xcb_atom_t atom)
{
char *name = NULL;
-#if 0
+#ifdef SWM_DEBUG_ATOM_NAMES
/*
* This should be disabled during most debugging since
* xcb_get_* causes an xcb_flush.
propertynotify(xcb_property_notify_event_t *e)
{
struct ws_win *win;
+ struct workspace *ws;
#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);
+ DNPRINTF(SWM_D_EVENT, "propertynotify: win %#x, atom: %s(%u), "
+ "time: %#x, state: %u\n", e->window, name, e->atom, e->time,
+ e->state);
free(name);
#endif
- xcb_flush(conn);
-
win = find_window(e->window);
if (win == NULL)
return;
- if (e->state == XCB_PROPERTY_DELETE && e->atom == a_swm_iconic) {
- update_iconic(win, 0);
- map_window_raised(win->id);
- stack();
- focus_win(win);
- xcb_flush(conn);
- return;
- }
+ ws = win->ws;
- switch (e->atom) {
- case XCB_ATOM_WM_CLASS:
- case XCB_ATOM_WM_NAME:
- bar_update();
- break;
- default:
- break;
+ last_event_time = e->time;
+
+ if (e->atom == a_state) {
+ /* State just changed, make sure it gets focused if mapped. */
+ if (e->state == XCB_PROPERTY_NEW_VALUE) {
+ if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(ws)) {
+ if (win->mapped &&
+ ws->focus_pending == win) {
+ focus_win(ws->focus_pending);
+ ws->focus_pending = NULL;
+ }
+ }
+ }
+ } else if (e->atom == XCB_ATOM_WM_CLASS ||
+ e->atom == XCB_ATOM_WM_NAME) {
+ bar_draw();
+ } else if (e->atom == a_prot) {
+ get_wm_protocols(win);
}
+
+ xcb_flush(conn);
}
void
unmapnotify(xcb_unmap_notify_event_t *e)
{
struct ws_win *win;
+ struct workspace *ws;
- DNPRINTF(SWM_D_EVENT, "unmapnotify: window: 0x%x\n", e->window);
+ DNPRINTF(SWM_D_EVENT, "unmapnotify: win %#x\n", e->window);
- /* determine if we need to help unmanage this window */
+ /* If we aren't managing the window, then ignore. */
win = find_window(e->window);
- if (win == NULL)
+ if (win == NULL || win->id != e->window)
return;
- if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL) {
+ /* Do nothing if already withdrawn. */
+ if (!win->mapped && !ICONIC(win))
+ return;
+
+ ws = win->ws;
+ win->mapped = 0;
+
+ /* If win was focused, make sure to focus on something else. */
+ if (win == ws->focus) {
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ ws->focus_pending = get_focus_prev(win);
+ DNPRINTF(SWM_D_EVENT, "unmapnotify: "
+ "focus_pending: %#x\n",
+ WINID(ws->focus_pending));
+ }
+
+ unfocus_win(win);
+ }
+
+ if (ICONIC(win)) {
+ /* Iconify. */
+ set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
+ } else {
+ /* Withdraw. */
+ set_win_state(win, XCB_ICCCM_WM_STATE_WITHDRAWN);
unmanage_window(win);
+ }
+
+ if (ws->r)
stack();
- focus_flush();
+
+ /* Update focus if ws is active. */
+ if (WS_FOCUSED(ws)) {
+ if (focus_mode == SWM_FOCUS_FOLLOW) {
+ focus_win(get_pointer_win(ws->r->s->root));
+ } else if (ws->focus_pending) {
+ focus_win(ws->focus_pending);
+ ws->focus_pending = NULL;
+ } else if (ws->focus == NULL) {
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
+ ws->r->id, XCB_CURRENT_TIME);
+ }
}
-}
-#if 0
-void
-visibilitynotify(xcb_visibility_notify_event_t *e)
-{
- DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%x\n",
- e->window);
+ focus_flush();
}
-#endif
void
clientmessage(xcb_client_message_event_t *e)
{
- struct ws_win *win;
+ struct ws_win *win;
+ struct swm_region *r = NULL;
+ union arg a;
+ uint32_t val[2];
+ int num_screens, i;
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",
+ DNPRINTF(SWM_D_EVENT, "clientmessage: win %#x, atom: %s(%u)\n",
e->window, name, e->type);
free(name);
#endif
- win = find_window(e->window);
+ if (e->type == ewmh[_NET_CURRENT_DESKTOP].atom) {
+ num_screens = get_screen_count();
+ for (i = 0; i < num_screens; i++)
+ if (screens[i].root == e->window) {
+ r = screens[i].r_focus;
+ break;
+ }
+
+ if (r && e->data.data32[0] <
+ (uint32_t)workspace_limit) {
+ a.id = e->data.data32[0];
+ switchws(r, &a);
+ focus_flush();
+ }
+
+ return;
+ }
+
+ win = find_window(e->window);
if (win == NULL) {
if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) {
+ /* Manage the window with maprequest. */
DNPRINTF(SWM_D_EVENT, "clientmessage: request focus on "
"unmanaged window.\n");
mre.window = e->window;
if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) {
DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW\n");
- focus_win(win);
- }
- if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) {
+ if (WS_FOCUSED(win->ws))
+ focus_win(win);
+ else
+ win->ws->focus_pending = win;
+ } else if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) {
DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_CLOSE_WINDOW\n");
if (win->can_delete)
- client_msg(win, a_delete);
+ client_msg(win, a_delete, 0);
else
xcb_kill_client(conn, win->id);
- }
- if (e->type == ewmh[_NET_MOVERESIZE_WINDOW].atom) {
+ } else if (e->type == ewmh[_NET_MOVERESIZE_WINDOW].atom) {
DNPRINTF(SWM_D_EVENT,
"clientmessage: _NET_MOVERESIZE_WINDOW\n");
- if (win->floating) {
+ if (ABOVE(win)) {
if (e->data.data32[0] & (1<<8)) /* x */
X(win) = e->data.data32[1];
if (e->data.data32[0] & (1<<9)) /* y */
HEIGHT(win) = e->data.data32[4];
update_window(win);
- }
- else {
- /* TODO: Change stack sizes */
- /* notify no change was made. */
+ } else {
+ /* Notify no change was made. */
config_win(win, NULL);
+ /* TODO: Change stack sizes */
}
- }
- if (e->type == ewmh[_NET_WM_STATE].atom) {
+ } else if (e->type == ewmh[_NET_RESTACK_WINDOW].atom) {
+ DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_RESTACK_WINDOW\n");
+ val[0] = e->data.data32[1]; /* Sibling window. */
+ val[1] = e->data.data32[2]; /* Stack mode detail. */
+
+ xcb_configure_window(conn, win->id, XCB_CONFIG_WINDOW_SIBLING |
+ XCB_CONFIG_WINDOW_STACK_MODE, val);
+ } else 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]);
+ ewmh_change_wm_state(win, e->data.data32[1], e->data.data32[0]);
if (e->data.data32[2])
- ewmh_update_win_state(win, e->data.data32[2],
+ ewmh_change_wm_state(win, e->data.data32[2],
e->data.data32[0]);
+ ewmh_update_wm_state(win);
stack();
+ } else if (e->type == ewmh[_NET_WM_DESKTOP].atom) {
+ DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_WM_DESKTOP\n");
+ r = win->ws->r;
+
+ win_to_ws(win, e->data.data32[0], 1);
+
+ /* Restack if either the source or destination ws is mapped. */
+ if (r != NULL || win->ws->r != NULL) {
+ if (FLOATING(win))
+ load_float_geom(win);
+
+ stack();
+ }
}
- xcb_flush(conn);
+ focus_flush();
}
void
enable_wm(void)
{
int num_screens, i;
- const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT;
+ const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT |
+ XCB_EVENT_MASK_ENTER_WINDOW;
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 */
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++) {
if ((sc = get_screen(i)) == NULL)
errx(1, "ERROR: can't get screen %d.", i);
- DNPRINTF(SWM_D_INIT, "enable_wm: screen %d, root: 0x%x\n",
+ DNPRINTF(SWM_D_INIT, "enable_wm: screen %d, root: %#x\n",
i, sc->root);
wac = xcb_change_window_attributes_checked(conn, sc->root,
XCB_CW_EVENT_MASK, &val);
free(error);
return 1;
}
+
+ /* click to focus on empty region */
+ xcb_grab_button(conn, 1, sc->root, BUTTONMASK,
+ XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE,
+ XCB_CURSOR_NONE, XCB_BUTTON_INDEX_1, XCB_BUTTON_MASK_ANY);
}
return 0;
void
new_region(struct swm_screen *s, int x, int y, int w, int h)
{
- struct swm_region *r, *n;
+ struct swm_region *r = NULL, *n;
struct workspace *ws = NULL;
int i;
+ uint32_t wa[1];
DNPRINTF(SWM_D_MISC, "new region: screen[%d]:%dx%d+%d+%d\n",
s->idx, w, h, x, y);
while (n) {
r = n;
n = TAILQ_NEXT(r, entry);
- if (X(r) < (x + w) &&
- (X(r) + WIDTH(r)) > x &&
- Y(r) < (y + h) &&
- (Y(r) + HEIGHT(r)) > y) {
+ if (X(r) < (x + w) && (X(r) + WIDTH(r)) > x &&
+ Y(r) < (y + h) && (Y(r) + HEIGHT(r)) > y) {
if (r->ws->r != NULL)
r->ws->old_r = r->ws->r;
r->ws->r = NULL;
bar_cleanup(r);
+ xcb_destroy_window(conn, r->id);
TAILQ_REMOVE(&s->rl, r, entry);
TAILQ_INSERT_TAIL(&s->orl, r, entry);
}
if (ws == NULL)
errx(1, "new_region: no free workspaces");
+ if (ws->state == SWM_WS_STATE_HIDDEN)
+ ws->state = SWM_WS_STATE_MAPPING;
+
X(r) = x;
Y(r) = y;
WIDTH(r) = w;
ws->r = r;
outputs++;
TAILQ_INSERT_TAIL(&s->rl, r, entry);
+
+ /* Invisible region window to detect pointer events on empty regions. */
+ r->id = xcb_generate_id(conn);
+ wa[0] = XCB_EVENT_MASK_POINTER_MOTION |
+ XCB_EVENT_MASK_POINTER_MOTION_HINT;
+
+ xcb_create_window(conn, XCB_COPY_FROM_PARENT, r->id, r->s->root,
+ X(r), Y(r), WIDTH(r), HEIGHT(r), 0, XCB_WINDOW_CLASS_INPUT_ONLY,
+ XCB_COPY_FROM_PARENT, XCB_CW_EVENT_MASK, wa);
+
+ /* Make sure region input is at the bottom. */
+ wa[0] = XCB_STACK_MODE_BELOW;
+ xcb_configure_window(conn, r->id, XCB_CONFIG_WINDOW_STACK_MODE, wa);
+
+ xcb_map_window(conn, r->id);
}
void
int ncrtc = 0;
#endif /* SWM_XRR_HAS_CRTC */
struct swm_region *r;
+ struct ws_win *win;
int num_screens;
xcb_randr_get_screen_resources_current_cookie_t src;
xcb_randr_get_screen_resources_current_reply_t *srr;
xcb_randr_crtc_t *crtc;
xcb_screen_t *screen;
+ DNPRINTF(SWM_D_MISC, "scan_xrandr: screen: %d\n", i);
+
if ((screen = get_screen(i)) == NULL)
errx(1, "ERROR: can't get screen %d.", i);
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
if (i >= num_screens)
errx(1, "scan_xrandr: invalid screen");
while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) {
r->ws->old_r = r->ws->r = NULL;
bar_cleanup(r);
+ xcb_destroy_window(conn, r->id);
TAILQ_REMOVE(&screens[i].rl, r, entry);
TAILQ_INSERT_TAIL(&screens[i].orl, r, entry);
}
new_region(&screens[i], 0, 0,
screen->width_in_pixels,
screen->height_in_pixels);
- return;
+ goto out;
} else
ncrtc = srr->num_crtcs;
free(cir);
}
free(srr);
- } else
+ }
#endif /* SWM_XRR_HAS_CRTC */
- {
+
+ /* If detection failed, create a single region that spans the screen. */
+ if (TAILQ_EMPTY(&screens[i].rl))
new_region(&screens[i], 0, 0, screen->width_in_pixels,
screen->height_in_pixels);
+
+out:
+ /* Cleanup unused previously visible workspaces. */
+ TAILQ_FOREACH(r, &screens[i].orl, entry) {
+ TAILQ_FOREACH(win, &r->ws->winlist, entry)
+ unmap_window(win);
+ r->ws->state = SWM_WS_STATE_HIDDEN;
+
+ /* The screen shouldn't focus on an unused region. */
+ if (screens[i].r_focus == r)
+ screens[i].r_focus = NULL;
}
+
+ DNPRINTF(SWM_D_MISC, "scan_xrandr: done.\n");
}
void
struct swm_region *r;
int i, num_screens;
- DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%x\n", e->root);
+ DNPRINTF(SWM_D_EVENT, "screenchange: root: %#x\n", e->root);
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
/* silly event doesn't include the screen index */
for (i = 0; i < num_screens; i++)
if (screens[i].root == e->root)
print_win_geom(e->root);
#endif
/* add bars to all regions */
- for (i = 0; i < num_screens; i++)
+ for (i = 0; i < num_screens; i++) {
TAILQ_FOREACH(r, &screens[i].rl, entry)
bar_setup(r);
+ }
+
stack();
+
+ /* Make sure a region has focus on each screen. */
+ for (i = 0; i < num_screens; i++) {
+ if (screens[i].r_focus == NULL) {
+ r = TAILQ_FIRST(&screens[i].rl);
+ if (r != NULL)
+ focus_region(r);
+ }
+ }
+
+ bar_draw();
+ focus_flush();
+
+ /* Update workspace state on all regions. */
+ for (i = 0; i < num_screens; i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ r->ws->state = SWM_WS_STATE_MAPPED;
}
void
grab_windows(void)
{
- xcb_window_t *wins = NULL;
- int no;
- int i, j, num_screens;
- uint16_t state, manage;
+ struct swm_region *r = NULL;
+ xcb_window_t *wins = NULL, trans, *cwins = NULL;
+ int i, j, k, n, no, num_screens, manage, mapped;
+ uint8_t state;
xcb_query_tree_cookie_t qtc;
xcb_query_tree_reply_t *qtr;
- xcb_get_window_attributes_cookie_t c;
- xcb_get_window_attributes_reply_t *r;
+ xcb_get_window_attributes_cookie_t gac;
+ xcb_get_window_attributes_reply_t *gar;
xcb_get_property_cookie_t pc;
+ xcb_get_property_reply_t *pr;
DNPRINTF(SWM_D_INIT, "grab_windows: begin\n");
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++) {
qtc = xcb_query_tree(conn, screens[i].root);
qtr = xcb_query_tree_reply(conn, qtc, NULL);
- if (!qtr)
+ if (qtr == NULL)
continue;
wins = xcb_query_tree_children(qtr);
no = xcb_query_tree_children_length(qtr);
+
+ /* Try to sort windows according to _NET_CLIENT_LIST. */
+ pr = xcb_get_property_reply(conn, xcb_get_property(conn, 0,
+ screens[i].root, ewmh[_NET_CLIENT_LIST].atom,
+ XCB_ATOM_WINDOW, 0, UINT32_MAX), NULL);
+ if (pr != NULL) {
+ cwins = xcb_get_property_value(pr);
+ n = xcb_get_property_value_length(pr) /
+ sizeof(xcb_atom_t);
+
+ for (j = 0; j < n; ++j) {
+ for (k = j; k < no; ++k) {
+ if (wins[k] == cwins[j]) {
+ /* Swap wins j and k. */
+ wins[k] = wins[j];
+ wins[j] = cwins[j];
+ }
+ }
+ }
+
+ free(pr);
+ }
+
/* attach windows to a region */
/* normal windows */
+ DNPRINTF(SWM_D_INIT, "grab_windows: grab top level windows.\n");
for (j = 0; j < no; j++) {
- c = xcb_get_window_attributes(conn, wins[j]);
- r = xcb_get_window_attributes_reply(conn, c, NULL);
- if (!r)
+ TAILQ_FOREACH(r, &screens[i].rl, entry) {
+ if (r->id == wins[j]) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: "
+ "skip %#x; region input window.\n",
+ wins[j]);
+ break;
+ } else if (r->bar->id == wins[j]) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: "
+ "skip %#x; region bar.\n",
+ wins[j]);
+ break;
+ }
+ }
+
+ if (r)
continue;
- if (r->override_redirect) {
- free(r);
+
+ gac = xcb_get_window_attributes(conn, wins[j]);
+ gar = xcb_get_window_attributes_reply(conn, gac, NULL);
+ if (gar == NULL) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "doesn't exist.\n", wins[j]);
+ continue;
+ }
+
+ if (gar->override_redirect) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "override_redirect set.\n", wins[j]);
+ free(gar);
continue;
}
pc = xcb_icccm_get_wm_transient_for(conn, wins[j]);
if (xcb_icccm_get_wm_transient_for_reply(conn, pc,
- &wins[j], NULL)) {
- free(r);
+ &trans, NULL)) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "is transient for %#x.\n", wins[j], trans);
+ free(gar);
continue;
}
- state = getstate(wins[j]);
- manage = state == XCB_ICCCM_WM_STATE_ICONIC;
- if (r->map_state == XCB_MAP_STATE_VIEWABLE || manage)
- manage_window(wins[j]);
- free(r);
+ state = get_win_state(wins[j]);
+ manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
+ mapped = gar->map_state == XCB_MAP_STATE_VIEWABLE;
+ if (mapped || manage)
+ manage_window(wins[j], mapped);
+ free(gar);
}
/* transient windows */
+ DNPRINTF(SWM_D_INIT, "grab_windows: grab transient windows.\n");
for (j = 0; j < no; j++) {
- c = xcb_get_window_attributes(conn, wins[j]);
- r = xcb_get_window_attributes_reply(conn, c, NULL);
- if (!r)
+ gac = xcb_get_window_attributes(conn, wins[j]);
+ gar = xcb_get_window_attributes_reply(conn, gac, NULL);
+ if (gar == NULL) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "doesn't exist.\n", wins[j]);
continue;
- if (r->override_redirect) {
- free(r);
+ }
+
+ if (gar->override_redirect) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "override_redirect set.\n", wins[j]);
+ free(gar);
continue;
}
- free(r);
- state = getstate(wins[j]);
- manage = state == XCB_ICCCM_WM_STATE_ICONIC;
+ state = get_win_state(wins[j]);
+ manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
+ mapped = gar->map_state == XCB_MAP_STATE_VIEWABLE;
pc = xcb_icccm_get_wm_transient_for(conn, wins[j]);
if (xcb_icccm_get_wm_transient_for_reply(conn, pc,
- &wins[j], NULL) && manage)
- manage_window(wins[j]);
+ &trans, NULL) && manage)
+ manage_window(wins[j], mapped);
+ free(gar);
}
free(qtr);
}
- DNPRINTF(SWM_D_INIT, "grab_windows: done\n");
+ DNPRINTF(SWM_D_INIT, "grab_windows: done.\n");
}
void
uint32_t gcv[1], wa[1];
const xcb_query_extension_reply_t *qep;
xcb_screen_t *screen;
- xcb_cursor_t cursor;
- xcb_font_t cursor_font;
xcb_randr_query_version_cookie_t c;
xcb_randr_query_version_reply_t *r;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
if ((screens = calloc(num_screens,
sizeof(struct swm_screen))) == NULL)
err(1, "setup_screens: calloc: failed to allocate memory for "
}
}
- 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;
+ wa[0] = cursors[XC_LEFT_PTR].cid;
/* map physical screens */
for (i = 0; i < num_screens; i++) {
DNPRINTF(SWM_D_WS, "setup_screens: init screen: %d\n", i);
screens[i].idx = i;
+ screens[i].r_focus = NULL;
+
TAILQ_INIT(&screens[i].rl);
TAILQ_INIT(&screens[i].orl);
if ((screen = get_screen(i)) == NULL)
setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS);
setscreencolor("rgb:88/88/88", i + 1, SWM_S_COLOR_UNFOCUS);
setscreencolor("rgb:00/80/80", i + 1, SWM_S_COLOR_BAR_BORDER);
+ setscreencolor("rgb:00/40/40", i + 1,
+ SWM_S_COLOR_BAR_BORDER_UNFOCUS);
setscreencolor("black", i + 1, SWM_S_COLOR_BAR);
setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT);
ws = &screens[i].ws[j];
ws->idx = j;
ws->name = NULL;
+ ws->bar_enabled = 1;
ws->focus = NULL;
+ ws->focus_prev = NULL;
+ ws->focus_pending = NULL;
ws->r = NULL;
ws->old_r = NULL;
+ ws->state = SWM_WS_STATE_HIDDEN;
+ TAILQ_INIT(&ws->stack);
TAILQ_INIT(&ws->winlist);
TAILQ_INIT(&ws->unmanagedlist);
xcb_randr_select_input(conn, screens[i].root,
XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE);
}
- xcb_free_cursor(conn, cursor);
- xcb_close_font(conn, cursor_font);
}
void
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_net_supported = get_atom_from_string("_NET_SUPPORTED");
+ a_net_wm_check = get_atom_from_string("_NET_SUPPORTING_WM_CHECK");
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");
a_swm_ws = get_atom_from_string("_SWM_WS");
}
void
-workaround(void)
-{
- int i, num_screens;
- xcb_atom_t netwmcheck;
- xcb_window_t root, win;
-
- /* 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 = xcb_generate_id(conn);
- xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, root,
- 0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT,
- XCB_COPY_FROM_PARENT, 0, NULL);
-
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root,
- netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
- netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win,
- a_netwmname, a_utf8_string, 8, strlen("LG3D"), "LG3D");
- }
-}
-
-void
shutdown_cleanup(void)
{
int i, num_screens;
err(1, "can't disable alarm");
bar_extra_stop();
- bar_extra = 1;
unmap_all();
+ cursors_cleanup();
+
teardown_ewmh();
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; ++i) {
- if (screens[i].bar_gc != 0)
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT,
+ screens[i].root, XCB_CURRENT_TIME);
+
+ if (screens[i].bar_gc != XCB_NONE)
xcb_free_gc(conn, screens[i].bar_gc);
if (!bar_font_legacy)
XftColorFree(display, DefaultVisual(display, i),
{
uint8_t type = XCB_EVENT_RESPONSE_TYPE(evt);
- DNPRINTF(SWM_D_EVENT, "XCB Event: %s(%d)\n",
+ DNPRINTF(SWM_D_EVENT, "XCB Event: %s(%d), seq %u\n",
xcb_event_get_label(XCB_EVENT_RESPONSE_TYPE(evt)),
- XCB_EVENT_RESPONSE_TYPE(evt));
+ XCB_EVENT_RESPONSE_TYPE(evt), evt->sequence);
switch (type) {
#define EVENT(type, callback) case type: callback((void *)evt); return
EVENT(XCB_EXPOSE, expose);
#ifdef SWM_DEBUG
EVENT(XCB_FOCUS_IN, focusin);
+ EVENT(XCB_FOCUS_OUT, focusout);
#endif
- /*EVENT(XCB_FOCUS_OUT, );*/
/*EVENT(XCB_GRAPHICS_EXPOSURE, );*/
/*EVENT(XCB_GRAVITY_NOTIFY, );*/
EVENT(XCB_KEY_PRESS, keypress);
EVENT(XCB_MAP_NOTIFY, mapnotify);
EVENT(XCB_MAP_REQUEST, maprequest);
EVENT(XCB_MAPPING_NOTIFY, mappingnotify);
- /*EVENT(XCB_MOTION_NOTIFY, );*/
+ EVENT(XCB_MOTION_NOTIFY, motionnotify);
/*EVENT(XCB_NO_EXPOSURE, );*/
EVENT(XCB_PROPERTY_NOTIFY, propertynotify);
/*EVENT(XCB_REPARENT_NOTIFY, );*/
/*EVENT(XCB_SELECTION_NOTIFY, );*/
/*EVENT(XCB_SELECTION_REQUEST, );*/
EVENT(XCB_UNMAP_NOTIFY, unmapnotify);
- /*EVENT(XCB_VISIBILITY_NOTIFY, visibilitynotify);*/
+ /*EVENT(XCB_VISIBILITY_NOTIFY, );*/
#undef EVENT
}
if (type - xrandr_eventbase == XCB_RANDR_SCREEN_CHANGE_NOTIFY)
int
main(int argc, char *argv[])
{
- struct swm_region *r, *rr;
- struct ws_win *winfocus = NULL;
- union arg a;
+ struct swm_region *r;
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
- int xfd, i, num_screens;
+ int xfd, i, num_screens, startup = 1;
struct sigaction sact;
xcb_generic_event_t *evt;
struct timeval tv;
fd_set rd;
+ int rd_max;
+ int stdin_ready = 0;
+ int num_readable;
/* suppress unused warning since var is needed */
(void)argc;
start_argv = argv;
warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr);
- if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, ""))
+ if (setlocale(LC_CTYPE, "") == NULL || setlocale(LC_TIME, "") == NULL)
warnx("no locale support");
/* handle some signals */
sact.sa_flags = SA_NOCLDSTOP;
sigaction(SIGCHLD, &sact, NULL);
- if (!(display = XOpenDisplay(0)))
+ if ((display = XOpenDisplay(0)) == NULL)
errx(1, "can not open display");
conn = XGetXCBConnection(display);
free(evt);
}
- if (enable_wm() != 0)
+ if (enable_wm())
errx(1, "another window manager is currently running");
+ /* Load Xcursors and/or cursorfont glyph cursors. */
+ cursors_load();
+
xcb_aux_sync(conn);
setup_globals();
setup_screens();
+ setup_ewmh();
setup_keys();
setup_quirks();
setup_spawn();
if (cfile)
conf_load(cfile, SWM_CONF_DEFAULT);
- setup_ewmh();
- /* set some values to work around bad programs */
- workaround();
- /* grab existing windows (before we build the bars) */
- grab_windows();
+ validate_spawns();
if (getenv("SWM_STARTED") == NULL)
setenv("SWM_STARTED", "YES", 1);
/* setup all bars */
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ num_screens = get_screen_count();
for (i = 0; i < num_screens; i++)
- TAILQ_FOREACH(r, &screens[i].rl, entry) {
- if (winfocus == NULL)
- winfocus = TAILQ_FIRST(&r->ws->winlist);
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
bar_setup(r);
- }
- //unfocus_all();
+ /* Manage existing windows. */
+ grab_windows();
grabkeys();
stack();
+ bar_draw();
xcb_ungrab_server(conn);
xcb_flush(conn);
+ /* Update state of each newly mapped workspace. */
+ for (i = 0; i < num_screens; i++)
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ r->ws->state = SWM_WS_STATE_MAPPED;
+
+ rd_max = xfd > STDIN_FILENO ? xfd : STDIN_FILENO;
+
while (running) {
while ((evt = xcb_poll_for_event(conn))) {
- if (running == 0)
+ if (!running)
goto done;
event_handle(evt);
free(evt);
}
- /* if we are being restarted go focus on first window */
- if (winfocus) {
- rr = winfocus->ws->r;
- if (rr == NULL) {
- /* not a visible window */
- winfocus = NULL;
+ /* If just (re)started, set default focus if needed. */
+ if (startup) {
+ startup = 0;
+
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ r = TAILQ_FIRST(&screens[0].rl);
+ if (r) {
+ focus_region(r);
+ focus_flush();
+ }
continue;
}
- /* 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));
-
- a.id = SWM_ARG_ID_FOCUSCUR;
- focus(rr, &a);
- winfocus = NULL;
- continue;
}
FD_ZERO(&rd);
+
+ if (bar_extra)
+ FD_SET(STDIN_FILENO, &rd);
+
FD_SET(xfd, &rd);
tv.tv_sec = 1;
tv.tv_usec = 0;
- if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1)
- if (errno != EINTR) {
- DNPRINTF(SWM_D_MISC, "select failed");
- }
- if (restart_wm == 1)
+ num_readable = select(rd_max + 1, &rd, NULL, NULL, &tv);
+ if (num_readable == -1 && errno != EINTR) {
+ DNPRINTF(SWM_D_MISC, "select failed");
+ } else if (num_readable > 0 && FD_ISSET(STDIN_FILENO, &rd)) {
+ stdin_ready = 1;
+ }
+
+ if (restart_wm)
restart(NULL, NULL);
- if (search_resp == 1)
+
+ if (search_resp)
search_do_resp();
- if (running == 0)
+
+ if (!running)
goto done;
- if (bar_alarm) {
- bar_alarm = 0;
- bar_update();
+
+ if (stdin_ready) {
+ stdin_ready = 0;
+ bar_extra_update();
}
+
+ bar_draw();
+ xcb_flush(conn);
}
done:
shutdown_cleanup();