/*
- * Copyright (c) 2009-2012 Marco Peereboom <marco@peereboom.us>
+ * Copyright (c) 2009-2015 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2009-2011 Ryan McBride <mcbride@countersiege.com>
* Copyright (c) 2009 Darrin Chandler <dwchandler@stilyagin.com>
* 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-2013 Reginald Kennedy <rk@rejii.com>
+ * Copyright (c) 2011-2015 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-2013 David Hill <dhill@mindcry.org>
+ * Copyright (c) 2012-2015 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 <ctype.h>
#include <err.h>
#include <errno.h>
+#include <poll.h>
#include <fcntl.h>
#include <locale.h>
#include <paths.h>
#include <pwd.h>
+#include <regex.h>
#include <signal.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
static const char *buildstr = SPECTRWM_VERSION;
#endif
-#if !defined(__CYGWIN__) /* cygwin chokes on xrandr stuff */
+#if !defined(__CYGWIN__) /* cygwin chokes on randr stuff */
# if RANDR_MAJOR < 1
-# error XRandR versions less than 1.0 are not supported
+# error RandR versions less than 1.0 are not supported
#endif
# if RANDR_MAJOR >= 1
#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 : 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_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_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_utf8_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 other_wm;
-int xrandr_support;
-int xrandr_eventbase;
+bool randr_support;
+int randr_eventbase;
unsigned int numlockmask = 0;
Display *display;
xcb_key_symbols_t *syms;
int boundary_width = 50;
-int cycle_empty = 0;
-int cycle_visible = 0;
+bool cycle_empty = false;
+bool cycle_visible = false;
int term_width = 0;
int font_adjusted = 0;
unsigned int mod_key = MODKEY;
+bool warp_pointer = false;
+unsigned int mouse_button_move = XCB_BUTTON_INDEX_1;
+unsigned int mouse_button_resize = XCB_BUTTON_INDEX_3;
/* dmenu search */
struct swm_region *search_r;
#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_ext[SWM_BAR_MAX];
char bar_ext_buf[SWM_BAR_MAX];
char bar_vertext[SWM_BAR_MAX];
-int bar_version = 0;
-int bar_enabled = 1;
+bool bar_version = false;
+bool bar_enabled = true;
int bar_border_width = 1;
-int bar_at_bottom = 0;
-int bar_extra = 0;
-int bar_verbose = 1;
+bool bar_at_bottom = false;
+bool bar_extra = false;
int bar_height = 0;
int bar_justify = SWM_BAR_JUSTIFY_LEFT;
char *bar_format = NULL;
-int stack_enabled = 1;
-int clock_enabled = 1;
-int urgent_enabled = 0;
+bool stack_enabled = true;
+bool clock_enabled = true;
+bool iconic_enabled = false;
+bool maximize_hide_bar = false;
+bool urgent_enabled = false;
+bool urgent_collapse = false;
char *clock_format = NULL;
-int title_name_enabled = 0;
-int title_class_enabled = 0;
-int window_name_enabled = 0;
+bool window_class_enabled = false;
+bool window_instance_enabled = false;
+bool window_name_enabled = false;
int focus_mode = SWM_FOCUS_DEFAULT;
int focus_close = SWM_STACK_BELOW;
-int focus_close_wrap = 1;
+bool focus_close_wrap = true;
int focus_default = SWM_STACK_TOP;
int spawn_position = SWM_STACK_TOP;
-int disable_border = 0;
+bool disable_border = false;
int border_width = 1;
int region_padding = 0;
int tile_gap = 0;
-int verbose_layout = 0;
+bool java_workaround = true;
+bool verbose_layout = false;
+#ifdef SWM_DEBUG
time_t time_started;
+#endif
pid_t bar_pid;
XFontSet bar_fs;
XFontSetExtents *bar_fs_extents;
XftFont *bar_font;
-int bar_font_legacy = 1;
+bool bar_font_legacy = true;
char *bar_fonts;
XftColor bar_font_color;
+XftColor search_font_color;
struct passwd *pwd;
char *startup_exception;
unsigned int nr_exceptions = 0;
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 mapped;
- int32_t iconic;
- int bordered;
- unsigned int ewmh_flags;
+ bool g_floatvalid; /* g_float geometry validity */
+ bool mapped;
+ bool bordered;
+ uint32_t ewmh_flags;
int font_size_boundary[SWM_MAX_FONT_STEPS];
int font_steps;
int last_inc;
- int can_delete;
- int take_focus;
- int java;
- unsigned long quirks;
+ bool can_delete;
+ bool take_focus;
+ bool java;
+ uint32_t 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 *);
struct workspace {
int idx; /* workspace index */
char *name; /* workspace name */
- int always_raise; /* raise windows on focus */
- int bar_enabled; /* bar visibility */
+ bool always_raise; /* raise windows on focus */
+ bool 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 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 */
int horizontal_msize;
int horizontal_mwin;
int horizontal_stacks;
- int horizontal_flip;
+ bool horizontal_flip;
int vertical_msize;
int vertical_mwin;
int vertical_stacks;
- int vertical_flip;
+ bool vertical_flip;
} l_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_FOCUS_MAXIMIZED,
SWM_S_COLOR_UNFOCUS,
+ SWM_S_COLOR_UNFOCUS_MAXIMIZED,
SWM_S_COLOR_MAX
};
struct {
uint32_t pixel;
char *name;
+ int manual;
} c[SWM_S_COLOR_MAX];
xcb_gcontext_t bar_gc;
#define SWM_ARG_ID_FLIPLAYOUT (24)
#define SWM_ARG_ID_STACKRESET (30)
#define SWM_ARG_ID_STACKINIT (31)
+#define SWM_ARG_ID_STACKBALANCE (32)
#define SWM_ARG_ID_CYCLEWS_UP (40)
#define SWM_ARG_ID_CYCLEWS_DOWN (41)
#define SWM_ARG_ID_CYCLERG_UP (42)
#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;
- unsigned long quirk;
+ 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;
+ uint32_t quirk;
+ int ws; /* Initial workspace. */
#define SWM_Q_FLOAT (1<<0) /* float this window */
#define SWM_Q_TRANSSZ (1<<1) /* transiend window size too small */
#define SWM_Q_ANYWHERE (1<<2) /* don't position this window */
#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. */
+#define SWM_Q_OBEYAPPFOCUSREQ (1<<8) /* Focus when applications ask. */
+#define SWM_Q_IGNOREPID (1<<9) /* Ignore PID when determining ws. */
+#define SWM_Q_IGNORESPAWNWS (1<<10) /* Ignore _SWM_WS when managing win. */
+#define SWM_Q_NOFOCUSCYCLE (1<<11) /* Remove from normal focus cycle. */
};
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,
{"top_right_corner", XC_top_right_corner, XCB_CURSOR_NONE},
};
-#define SWM_SPAWN_OPTIONAL 0x1
+#define SWM_SPAWN_OPTIONAL 0x1
/* spawn */
struct spawn_prog {
KF_FOCUS_NEXT,
KF_FOCUS_PREV,
KF_FOCUS_URGENT,
+ KF_MAXIMIZE_TOGGLE,
KF_HEIGHT_GROW,
KF_HEIGHT_SHRINK,
KF_ICONIFY,
KF_STACK_INC,
KF_STACK_DEC,
KF_STACK_RESET,
+ KF_STACK_BALANCE,
KF_SWAP_MAIN,
KF_SWAP_NEXT,
KF_SWAP_PREV,
/* function prototypes */
void adjust_font(struct ws_win *);
-void bar_class_name(char *, size_t, struct swm_region *);
-void bar_class_title_name(char *, size_t, struct swm_region *);
+char *argsep(char **);
void bar_cleanup(struct swm_region *);
void bar_extra_setup(void);
void bar_extra_stop(void);
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_title_name(char *, size_t, 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 center_pointer(struct swm_region *);
void check_conn(void);
void clear_keys(void);
+int clear_maximized(struct workspace *);
void clientmessage(xcb_client_message_event_t *);
void client_msg(struct ws_win *, xcb_atom_t, xcb_timestamp_t);
int conf_load(const char *, int);
void configurerequest(xcb_configure_request_event_t *);
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);
+int count_win(struct workspace *, bool);
void cursors_cleanup(void);
void cursors_load(void);
-void custom_region(char *);
+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 event_drain(uint8_t);
void event_error(xcb_generic_error_t *);
void event_handle(xcb_generic_event_t *);
+void ewmh_apply_flags(struct ws_win *, uint32_t);
void ewmh_autoquirk(struct ws_win *);
-void ewmh_get_win_state(struct ws_win *);
-int ewmh_set_win_fullscreen(struct ws_win *, int);
+void ewmh_get_desktop_names(void);
+void ewmh_get_wm_state(struct ws_win *);
void ewmh_update_actions(struct ws_win *);
-void ewmh_update_win_state(struct ws_win *, xcb_atom_t, long);
+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 ws_win *find_unmanaged_window(xcb_window_t);
struct ws_win *find_window(xcb_window_t);
void floating_toggle(struct swm_region *, union arg *);
-int floating_toggle_win(struct ws_win *);
void focus(struct swm_region *, union arg *);
#ifdef SWM_DEBUG
void focusin(xcb_focus_in_event_t *);
struct ws_win *get_region_focus(struct swm_region *);
int get_region_index(struct swm_region *);
xcb_screen_t *get_screen(int);
-xcb_window_t get_sibling(struct ws_win *, int);
int get_screen_count(void);
#ifdef SWM_DEBUG
+char *get_source_type_label(uint32_t);
char *get_stack_mode_name(uint8_t);
#endif
-int32_t get_swm_iconic(struct ws_win *);
+int32_t get_swm_ws(xcb_window_t);
+bool get_urgent(struct ws_win *);
char *get_win_name(xcb_window_t);
-int get_ws_idx(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(struct ws_win *);
void grabbuttons(struct ws_win *);
void grabkeys(void);
void grab_windows(void);
void iconify(struct swm_region *, union arg *);
-int isxlfd(char *);
+bool 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 *);
void leavenotify(xcb_leave_notify_event_t *);
#endif
void load_float_geom(struct ws_win *);
-struct ws_win *manage_window(xcb_window_t, uint16_t);
-void map_window(struct ws_win *, xcb_window_t);
+void lower_window(struct ws_win *);
+struct ws_win *manage_window(xcb_window_t, int, bool);
+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(char *, unsigned int, unsigned int *, KeySym *);
-int parsequirks(char *, unsigned long *);
+int parsekeys(const char *, unsigned int, unsigned int *, KeySym *);
+int parsequirks(const char *, uint32_t *, int *);
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 *);
void print_win_geom(xcb_window_t);
#endif
void propertynotify(xcb_property_notify_event_t *);
-void quirk_insert(const char *, const char *, unsigned long);
+void quirk_free(struct quirk *);
+void quirk_insert(const char *, const char *, const char *, uint32_t, int);
void quirk_remove(struct quirk *);
-void quirk_replace(struct quirk *, const char *, const char *,
- unsigned long);
+void quirk_replace(struct quirk *, const char *, const char *, const char *,
+ uint32_t, int);
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 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 scan_randr(int);
void search_do_resp(void);
void search_resp_name_workspace(const char *, size_t);
void search_resp_search_window(const char *);
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(char *, char *, int);
-int setconfbinding(char *, char *, int);
-int setconfcolor(char *, char *, int);
-int setconfmodkey(char *, char *, int);
-int setconfquirk(char *, char *, int);
-int setconfregion(char *, char *, int);
-int setconfspawn(char *, char *, int);
-int setconfvalue(char *, char *, int);
+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 setconfmousebuttonmove(const char *, const char *, int);
+int setconfmousebuttonresize(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(char *, char *, int);
-int setlayout(char *, char *, int);
-void setquirk(const char *, const char *, unsigned long);
-void setscreencolor(char *, int, int);
+int setkeymapping(const char *, const char *, int);
+int setlayout(const char *, const char *, int);
+void setquirk(const char *, const char *, const char *, uint32_t, int);
+void setscreencolor(const char *, int, int);
void setspawn(const char *, const char *, int);
void setup_ewmh(void);
void setup_globals(void);
void setup_screens(void);
void setup_spawn(void);
void set_child_transient(struct ws_win *, xcb_window_t *);
-void set_swm_iconic(struct ws_win *, int);
-void set_win_state(struct ws_win *, uint16_t);
+void set_win_state(struct ws_win *, uint8_t);
void shutdown_cleanup(void);
void sighdlr(int);
void socket_setnonblock(int);
void sort_windows(struct ws_win_list *);
-void spawn(int, union arg *, int);
+void spawn(int, union arg *, bool);
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);
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_floater(struct ws_win *, struct swm_region *);
-void stack_master(struct workspace *, struct swm_geometry *, int, int);
+void stack_master(struct workspace *, struct swm_geometry *, int, bool);
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 unmap_all(void);
void unmap_window(struct ws_win *);
void updatenumlockmask(void);
+void update_floater(struct ws_win *);
void update_modkey(unsigned int);
+unsigned char update_mousebutton(unsigned char, unsigned int);
+void update_win_stacking(struct ws_win *);
void update_window(struct ws_win *);
+void update_window_color(struct ws_win *);
+void update_wm_state(struct ws_win *win);
void validate_spawns(void);
int validate_win(struct ws_win *);
int validate_ws(struct workspace *);
-/*void visibilitynotify(xcb_visibility_notify_event_t *);*/
void version(struct swm_region *, union arg *);
-void win_to_ws(struct ws_win *, int, int);
+void win_to_ws(struct ws_win *, int, bool);
pid_t window_get_pid(xcb_window_t);
void wkill(struct swm_region *, union arg *);
-void workaround(void);
+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 *, ...);
}
void
-set_swm_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_swm_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 = true;
+ if (wpr.atoms[i] == a_delete)
+ win->can_delete = true;
+ }
+ 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 = 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 = 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->g = win->ws->r->g;
- win->bordered = 0;
- } else {
- load_float_geom(win);
- }
-
- 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;
+ }
+ }
+
+ update_window_color(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
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;
+ if (i < 0 || i >= get_screen_count())
+ return;
- num_screens = get_screen_count();
- if (i > 0 && i <= num_screens) {
- 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(0, val);
- free(screens[i].c[c].name);
- if ((screens[i].c[c].name = strdup(val)) == NULL)
- err(1, "strdup");
- }
- } else
- errx(1, "invalid screen index: %d out of bounds (maximum %d)",
- i, num_screens);
+ screens[i].c[c].pixel = name_to_pixel(i, val);
+ free(screens[i].c[c].name);
+ if ((screens[i].c[c].name = strdup(val)) == NULL)
+ err(1, "strdup");
}
void
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;
bar_pid = 0;
}
strlcpy(bar_ext, "", sizeof bar_ext);
- bar_extra = 0;
+ bar_extra = false;
}
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);
}
+bool
+get_urgent(struct ws_win *win)
+{
+ xcb_icccm_wm_hints_t hints;
+ xcb_get_property_cookie_t c;
+ bool urgent = false;
+
+ if (win) {
+ c = xcb_icccm_get_wm_hints(conn, win->id);
+ if (xcb_icccm_get_wm_hints_reply(conn, c, &hints, NULL))
+ urgent = xcb_icccm_wm_hints_get_urgency(&hints);
+ }
+
+ return urgent;
+}
+
void
bar_urgent(char *s, size_t sz)
{
struct ws_win *win;
int i, j, num_screens;
- int urgent[SWM_WS_MAX];
+ bool 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;
+ urgent[i] = false;
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) {
- c = xcb_icccm_get_wm_hints(conn, win->id);
- if (xcb_icccm_get_wm_hints_reply(conn, c,
- &hints, NULL) == 0)
- continue;
- if (hints.flags & XCB_ICCCM_WM_HINT_X_URGENCY)
- urgent[j] = 1;
- }
+ TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
+ if (get_urgent(win))
+ urgent[j] = true;
for (i = 0; i < workspace_limit; i++) {
- if (urgent[i])
+ if (urgent[i]) {
snprintf(b, sizeof b, "%d ", i + 1);
- else
- snprintf(b, sizeof b, "- ");
- strlcat(s, b, sz);
+ strlcat(s, b, sz);
+ } else if (!urgent_collapse) {
+ strlcat(s, "- ", sz);
+ }
}
}
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)
+ 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);
{
size_t len;
char b[SWM_BAR_MAX];
- int changed = 0;
+ bool changed = false;
if (!bar_extra)
return changed;
/* Append new output to bar. */
strlcat(bar_ext, b, sizeof(bar_ext));
- changed = 1;
+ changed = true;
} else {
/* Buffer output. */
strlcat(bar_ext_buf, b, sizeof(bar_ext_buf));
if (errno != EAGAIN) {
warn("bar_action failed");
bar_extra_stop();
- changed = 1;
+ changed = true;
}
return changed;
if (bar_enabled)
r->ws->bar_enabled = !r->ws->bar_enabled;
else
- bar_enabled = r->ws->bar_enabled = 1;
+ bar_enabled = r->ws->bar_enabled = true;
break;
case SWM_ARG_ID_BAR_TOGGLE:
bar_enabled = !bar_enabled;
/* do this here because the conf file is in memory */
if (!bar_extra && bar_argv[0]) {
/* launch external status app */
- bar_extra = 1;
+ bar_extra = true;
if (pipe(bar_pipe) == -1)
err(1, "pipe error");
socket_setnonblock(bar_pipe[0]);
kill(bar_pid, SIGTERM);
}
-int
+bool
isxlfd(char *s)
{
int count = 0;
font);
}
- if (!bar_font) {
+ if (bar_font == NULL) {
warnx("unable to load font %s", font);
continue;
} else {
DefaultColormap(display, r->s->idx), &color, &bar_font_color))
warn("Xft error: unable to allocate color.");
+ PIXEL_TO_XRENDERCOLOR(r->s->c[SWM_S_COLOR_BAR].pixel, color);
+
+ if (!XftColorAllocValue(display, DefaultVisual(display, r->s->idx),
+ DefaultColormap(display, r->s->idx), &color, &search_font_color))
+ warn("Xft error: unable to allocate color.");
+
bar_height = bar_font->height + 2 * bar_border_width;
if (bar_height < 1)
XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL
| XCB_CW_EVENT_MASK, wa);
+ /* Stack bar window above region window to start. */
+ wa[0] = r->id;
+ wa[1] = XCB_STACK_MODE_ABOVE;
+
+ xcb_configure_window(conn, r->bar->id, XCB_CONFIG_WINDOW_SIBLING |
+ XCB_CONFIG_WINDOW_STACK_MODE, wa);
+
r->bar->buffer = xcb_generate_id(conn);
xcb_create_pixmap(conn, screen->root_depth, r->bar->buffer, r->bar->id,
WIDTH(r->bar), HEIGHT(r->bar));
- if (xrandr_support)
+ if (randr_support)
xcb_randr_select_input(conn, r->bar->id,
XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE);
if (bar_enabled)
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));
}
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, state: %u\n",
+ DNPRINTF(SWM_D_EVENT, "set_win_state: win %#x, state: %u\n",
win->id, state);
if (win == NULL)
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);
}
return;
#ifdef SWM_DEBUG
name = get_atom_name(a);
- DNPRINTF(SWM_D_EVENT, "client_msg: window: 0x%x, atom: %s(%u), "
+ DNPRINTF(SWM_D_EVENT, "client_msg: win %#x, atom: %s(%u), "
"time: %#x\n",
win->id, name, a, t);
free(name);
/* 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_win(struct workspace *ws, int count_transient)
+count_win(struct workspace *ws, bool count_transient)
{
struct ws_win *win;
int count = 0;
TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (!count_transient && win->floating)
- continue;
- if (!count_transient && win->transient)
+ if (!count_transient && FLOATING(win))
continue;
- if (win->iconic)
+ if (ICONIC(win))
continue;
count++;
}
}
void
-map_window(struct ws_win *win, xcb_window_t sibling)
+lower_window(struct ws_win *win)
{
- uint16_t mode = XCB_CONFIG_WINDOW_STACK_MODE;
- uint32_t val[2];
- int i = 0;
+ struct ws_win *target = NULL;
+ struct workspace *ws;
+
+ if (win == NULL)
+ return;
+
+ ws = win->ws;
- /* If sibling is specified, stack right above it. */
- if (sibling != XCB_WINDOW_NONE) {
- mode |= XCB_CONFIG_WINDOW_SIBLING;
- val[i++] = sibling;
+ DNPRINTF(SWM_D_EVENT, "lower_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)) {
+ if (win->transient == target->transient)
+ continue;
+ if (win->transient == target->id)
+ break;
+ }
+ if (FULLSCREEN(target))
+ continue;
+ if (FULLSCREEN(win))
+ break;
+ if (MAXIMIZED(target))
+ continue;
+ if (MAXIMIZED(win))
+ break;
+ if (ABOVE(target) || TRANS(target))
+ continue;
+ if (ABOVE(win) || TRANS(win))
+ break;
+ }
+
+ /* Change stack position. */
+ TAILQ_REMOVE(&ws->stack, win, stack_entry);
+ if (target)
+ TAILQ_INSERT_BEFORE(target, win, stack_entry);
+ else
+ TAILQ_INSERT_TAIL(&ws->stack, 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, &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, "lower_window: done\n");
+}
- val[i] = XCB_STACK_MODE_ABOVE;
+void
+raise_window(struct ws_win *win)
+{
+ struct ws_win *target = NULL;
+ struct workspace *ws;
if (win == 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) ||
+ (win->ws->focus == win && ws->always_raise))
+ break;
+ if (!ABOVE(target) && !TRANS(target))
+ break;
+ }
+
+ TAILQ_REMOVE(&ws->stack, win, stack_entry);
+ if (target)
+ TAILQ_INSERT_BEFORE(target, win, stack_entry);
+ else
+ TAILQ_INSERT_TAIL(&ws->stack, 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, &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)
+{
+ 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) ||
+ (win->ws->always_raise && win->ws->focus == win)))
+ val[0] = sibling->id;
+ else if (FLOATING(win) || (win->ws->always_raise &&
+ win->ws->focus == win))
+ val[0] = r->bar->id;
+ else
+ val[0] = r->id;
+
+ DNPRINTF(SWM_D_EVENT, "update_win_stacking: %#x, sibling %#x\n",
+ win->id, val[0]);
- DNPRINTF(SWM_D_EVENT, "map_window: win 0x%x, mapped: %s, "
- "sibling: 0x%x\n", win->id, YESNO(win->mapped), sibling);
+ val[1] = XCB_STACK_MODE_ABOVE;
- xcb_configure_window(conn, win->id, mode, val);
+ 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;
+
+ DNPRINTF(SWM_D_EVENT, "map_window: win %#x, mapped: %s\n",
+ win->id, YESNO(win->mapped));
if (win->mapped)
return;
xcb_map_window(conn, win->id);
set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
- win->mapped = 1;
+ win->mapped = true;
}
void
if (win == NULL)
return;
- DNPRINTF(SWM_D_EVENT, "unmap_window: win 0x%x, mapped: %s\n", win->id,
+ DNPRINTF(SWM_D_EVENT, "unmap_window: win %#x, mapped: %s\n", win->id,
YESNO(win->mapped));
if (!win->mapped)
xcb_unmap_window(conn, win->id);
set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
- win->mapped = 0;
+ win->mapped = false;
}
void
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));
struct ws_win *win = NULL;
xcb_query_pointer_reply_t *r;
- DNPRINTF(SWM_D_EVENT, "get_pointer_win: root: 0x%x.\n", root);
+ 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: 0x%x.\n",
+ DNPRINTF(SWM_D_EVENT, "get_pointer_win: %#x.\n",
win->id);
} else {
DNPRINTF(SWM_D_EVENT, "get_pointer_win: none.\n");
return win;
}
-struct swm_region *
+void
+center_pointer(struct swm_region *r)
+{
+ struct ws_win *win;
+
+ if (!warp_pointer || r == NULL)
+ return;
+
+ win = r->ws->focus;
+
+ DNPRINTF(SWM_D_EVENT, "center_pointer: win %#x.\n", WINID(win));
+
+ if (win && win->mapped)
+ xcb_warp_pointer(conn, XCB_NONE, win->id, 0, 0, 0, 0,
+ WIDTH(win) / 2, HEIGHT(win) / 2);
+ else
+ xcb_warp_pointer(conn, XCB_NONE, r->id, 0, 0, 0, 0,
+ WIDTH(r) / 2, HEIGHT(r) / 2);
+}
+
+struct swm_region *
root_to_region(xcb_window_t root, int check)
{
struct ws_win *cfw;
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 = get_screen_count();
for (i = 0; i < num_screens; i++)
/* 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);
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 */
}
void
-spawn(int ws_idx, union arg *args, int close_fd)
+spawn(int ws_idx, union arg *args, bool close_fd)
{
int fd;
char *ret = NULL;
return (1);
}
-xcb_window_t
-get_sibling(struct ws_win *win, int mode)
-{
- struct ws_win *w = win;
-
- switch (mode) {
- case SWM_STACK_TOP:
- TAILQ_FOREACH_REVERSE(w, &w->ws->winlist, ws_win_list, entry)
- if (w != win && !w->floating && !w->iconic)
- break;
- break;
- case SWM_STACK_ABOVE:
- do {
- w = TAILQ_NEXT(w, entry);
- } while (w != NULL && (w == win || w->floating || w->iconic));
- break;
- case SWM_STACK_BELOW:
- do {
- w = TAILQ_PREV(w, ws_win_list, entry);
- } while (w != NULL && (w == win || w->floating || w->iconic));
- break;
- case SWM_STACK_BOTTOM:
- TAILQ_FOREACH(w, &w->ws->winlist, entry)
- if (w != win && !w->floating && !w->iconic)
- break;
- break;
- default:
- w = NULL;
- }
-
- if (w == NULL)
- return (win->ws->r->id);
- else
- return (w->id);
-}
-
void
unfocus_win(struct ws_win *win)
{
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;
}
if (win->ws->focus == win) {
- if (tile_gap < 0 && !win->floating)
- map_window(win, get_sibling(win, SWM_STACK_BELOW));
win->ws->focus = NULL;
win->ws->focus_prev = win;
}
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);
+ update_window_color(win);
+
+ /* Raise window to "top unfocused position." */
+ if (win->ws->always_raise)
+ raise_window(win);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, &none);
void
focus_win(struct ws_win *win)
{
- struct ws_win *cfw = NULL, *parent = NULL, *w;
+ struct ws_win *cfw = NULL, *parent = NULL, *w, *tmpw;
struct workspace *ws;
- xcb_get_input_focus_reply_t *r;
-
- DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%x\n", WINID(win));
-
- if (win == NULL)
- goto out;
+ xcb_get_input_focus_reply_t *gifr;
- if (win->ws == NULL)
- goto out;
+ DNPRINTF(SWM_D_FOCUS, "focus_win: win %#x\n", WINID(win));
- if (!win->mapped)
+ if (win == NULL || win->ws == NULL || !win->mapped)
goto out;
ws = win->ws;
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[(MAXIMIZED(cfw) ?
+ SWM_S_COLOR_UNFOCUS_MAXIMIZED :
+ SWM_S_COLOR_UNFOCUS)].pixel);
+ } else {
+ unfocus_win(cfw);
+ }
+ }
+ free(gifr);
}
if (ws->focus != win) {
win->focus_child = NULL;
/* If transient, adjust parent's focus child for focus_magic. */
- if (win->transient) {
+ if (TRANS(win)) {
parent = find_window(win->transient);
if (parent && parent->focus_child != win)
parent->focus_child = win;
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,
+ 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 (win->transient && win->java)
+ 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,
- &ws->r->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) {
- map_window(parent, XCB_WINDOW_NONE);
+ raise_window(parent);
+ map_window(parent);
/* Map siblings next. */
- TAILQ_FOREACH(w, &ws->winlist, entry)
- if (w != win && !w->iconic &&
- w->transient == parent->id)
- map_window(w, XCB_WINDOW_NONE);
+ TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry,
+ tmpw)
+ if (w != win && !ICONIC(w) &&
+ w->transient == parent->id) {
+ raise_window(w);
+ map_window(w);
+ }
}
/* Map focused window. */
- map_window(win, XCB_WINDOW_NONE);
-
- /* Finally, map children of focus window. */
- TAILQ_FOREACH(w, &ws->winlist, entry)
- if (w->transient == win->id && !w->iconic)
- map_window(w, XCB_WINDOW_NONE);
- } else if (tile_gap < 0 && !win->floating) {
+ raise_window(win);
+ map_window(win);
+
+ /* Stack any children of focus window. */
+ TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw)
+ if (w->transient == win->id && !ICONIC(w)) {
+ raise_window(w);
+ map_window(w);
+ }
+ } else if (tile_gap < 0 && !ABOVE(win)) {
/*
* Windows overlap in the layout.
* Raise focused win above all tiled wins.
*/
- if (tile_gap < 0 && !win->floating)
- map_window(win,
- get_sibling(win, SWM_STACK_TOP));
+ raise_window(win);
+ map_window(win);
}
set_region(ws->r);
&win->id);
}
+ if (cfw != win)
+ /* Update window border even if workspace is hidden. */
+ update_window_color(win);
+
out:
bar_draw();
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 try to do so. */
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) {
+ if (rf != NULL) {
if (rf == r)
return;
&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
struct ws_win *win;
struct workspace *new_ws, *old_ws;
xcb_window_t none = XCB_WINDOW_NONE;
- int wsid = args->id, unmap_old = 0;
+ int wsid = args->id;
+ bool unmap_old = false;
if (!(r && r->s))
return;
return;
if ((win = old_ws->focus) != NULL) {
- xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL,
- &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].pixel);
+ update_window_color(win);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
if (other_r == NULL) {
/* the other workspace is hidden, hide this one */
old_ws->r = NULL;
- unmap_old = 1;
+ unmap_old = true;
} else {
/* the other ws is visible in another region, exchange them */
other_r->ws_prior = new_ws;
new_ws->focus_prev = NULL;
}
+ new_ws->state = SWM_WS_STATE_MAPPING;
stack();
/* 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) {
bar_draw();
}
+ ewmh_update_current_desktop();
+
+ center_pointer(r);
focus_flush();
+ new_ws->state = SWM_WS_STATE_MAPPED;
DNPRINTF(SWM_D_WS, "switchws: done.\n");
}
{
union arg a;
struct swm_screen *s = r->s;
- int cycle_all = 0;
- int move = 0;
+ bool cycle_all = false, mv = false;
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);
do {
switch (args->id) {
case SWM_ARG_ID_CYCLEWS_MOVE_UP:
- move = 1;
+ mv = true;
/* FALLTHROUGH */
case SWM_ARG_ID_CYCLEWS_UP_ALL:
- cycle_all = 1;
+ cycle_all = true;
/* FALLTHROUGH */
case SWM_ARG_ID_CYCLEWS_UP:
a.id = (a.id < workspace_limit - 1) ? a.id + 1 : 0;
break;
case SWM_ARG_ID_CYCLEWS_MOVE_DOWN:
- move = 1;
+ mv = true;
/* FALLTHROUGH */
case SWM_ARG_ID_CYCLEWS_DOWN_ALL:
- cycle_all = 1;
+ cycle_all = true;
/* FALLTHROUGH */
case SWM_ARG_ID_CYCLEWS_DOWN:
a.id = (a.id > 0) ? a.id - 1 : workspace_limit - 1;
if (!cycle_visible && s->ws[a.id].r != NULL)
continue;
- if (move)
+ if (mv)
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
return;
focus_region(rr);
+ center_pointer(rr);
focus_flush();
+ DNPRINTF(SWM_D_FOCUS, "focusrg: done\n");
}
void
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_CYCLERG_UP:
rr = TAILQ_NEXT(r, entry);
return;
focus_region(rr);
+ center_pointer(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
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();
-
+ center_pointer(r);
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;
}
switch (focus_close) {
case SWM_STACK_BOTTOM:
TAILQ_FOREACH(winfocus, wl, entry)
- if (!winfocus->iconic && winfocus != cur_focus)
+ if (!ICONIC(winfocus) && winfocus != cur_focus)
break;
break;
case SWM_STACK_TOP:
TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry)
- if (!winfocus->iconic && winfocus != cur_focus)
+ if (!ICONIC(winfocus) && winfocus != cur_focus)
break;
break;
case SWM_STACK_ABOVE:
winfocus = TAILQ_NEXT(cur_focus, entry);
- while (winfocus && winfocus->iconic)
+ while (winfocus && ICONIC(winfocus))
winfocus = TAILQ_NEXT(winfocus, entry);
if (winfocus == NULL) {
if (focus_close_wrap) {
TAILQ_FOREACH(winfocus, wl, entry)
- if (!winfocus->iconic &&
+ if (!ICONIC(winfocus) &&
winfocus != cur_focus)
break;
} else {
TAILQ_FOREACH_REVERSE(winfocus, wl,
ws_win_list, entry)
- if (!winfocus->iconic &&
+ if (!ICONIC(winfocus) &&
winfocus != cur_focus)
break;
}
break;
case SWM_STACK_BELOW:
winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
- while (winfocus && winfocus->iconic)
+ while (winfocus && ICONIC(winfocus))
winfocus = TAILQ_PREV(winfocus, ws_win_list,
entry);
if (focus_close_wrap) {
TAILQ_FOREACH_REVERSE(winfocus, wl,
ws_win_list, entry)
- if (!winfocus->iconic &&
+ if (!ICONIC(winfocus) &&
winfocus != cur_focus)
break;
} else {
TAILQ_FOREACH(winfocus, wl, entry)
- if (!winfocus->iconic &&
+ if (!ICONIC(winfocus) &&
winfocus != cur_focus)
break;
}
}
done:
if (winfocus == NULL ||
- (winfocus && (winfocus->iconic || winfocus == cur_focus))) {
+ (winfocus && (ICONIC(winfocus) || winfocus == cur_focus))) {
if (focus_default == SWM_STACK_TOP) {
TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry)
- if (!winfocus->iconic && winfocus != cur_focus)
+ if (!ICONIC(winfocus) && winfocus != cur_focus)
break;
} else {
TAILQ_FOREACH(winfocus, wl, entry)
- if (!winfocus->iconic && winfocus != cur_focus)
+ if (!ICONIC(winfocus) && winfocus != cur_focus)
break;
}
}
if (!(r && r->ws))
return NULL;
- if (r->ws->focus && !r->ws->focus->iconic)
+ if (r->ws->focus && !ICONIC(r->ws->focus))
winfocus = r->ws->focus;
- else if (r->ws->focus_prev && !r->ws->focus_prev->iconic)
+ 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 (!winfocus->iconic)
+ if (!ICONIC(winfocus))
break;
return get_focus_magic(winfocus);
struct workspace *ws = NULL;
union arg a;
int i;
- xcb_icccm_wm_hints_t hints;
if (!(r && r->ws))
goto out;
- DNPRINTF(SWM_D_FOCUS, "focus: id: %d\n", args->id);
-
cur_focus = r->ws->focus;
ws = r->ws;
wl = &ws->winlist;
+ DNPRINTF(SWM_D_FOCUS, "focus: id: %d, cur_focus: %#x\n", args->id,
+ WINID(cur_focus));
+
/* Make sure an uniconified window has focus, if one exists. */
if (cur_focus == NULL) {
cur_focus = TAILQ_FIRST(wl);
- while (cur_focus != NULL && cur_focus->iconic)
+ while (cur_focus != NULL && ICONIC(cur_focus))
cur_focus = TAILQ_NEXT(cur_focus, entry);
+
+ DNPRINTF(SWM_D_FOCUS, "focus: new cur_focus: %#x\n",
+ WINID(cur_focus));
}
switch (args->id) {
winfocus = TAILQ_LAST(wl, ws_win_list);
if (winfocus == cur_focus)
break;
- } while (winfocus != NULL &&
- (winfocus->iconic || winfocus->id == cur_focus->transient));
+ } while (winfocus && (ICONIC(winfocus) ||
+ winfocus->id == cur_focus->transient ||
+ (cur_focus->transient != XCB_WINDOW_NONE &&
+ winfocus->transient == cur_focus->transient) ||
+ (winfocus->quirks & SWM_Q_NOFOCUSCYCLE)));
break;
case SWM_ARG_ID_FOCUSNEXT:
if (cur_focus == NULL)
winfocus = TAILQ_FIRST(wl);
if (winfocus == cur_focus)
break;
- } while (winfocus != NULL &&
- (winfocus->iconic || winfocus->id == cur_focus->transient));
+ } while (winfocus && (ICONIC(winfocus) ||
+ winfocus->id == cur_focus->transient ||
+ (cur_focus->transient != XCB_WINDOW_NONE &&
+ winfocus->transient == cur_focus->transient) ||
+ (winfocus->quirks & SWM_Q_NOFOCUSCYCLE)));
break;
case SWM_ARG_ID_FOCUSMAIN:
if (cur_focus == NULL)
head = TAILQ_FIRST(&r->s->ws[(ws->idx + i) %
workspace_limit].winlist);
- while (head != NULL &&
- (head = TAILQ_NEXT(head, entry)) != NULL) {
+ while (head) {
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)) {
+ if (i > 0) {
+ winfocus = cur_focus;
+ break;
+ }
+ } else if (get_urgent(head)) {
winfocus = head;
break;
}
+
+ head = TAILQ_NEXT(head, entry);
}
- if (winfocus != NULL)
+ if (winfocus)
break;
}
/* Switch ws if new focus is on a different ws. */
- if (winfocus != NULL && winfocus->ws != ws) {
+ if (winfocus && winfocus->ws != ws) {
a.id = winfocus->ws->idx;
switchws(r, &a);
}
goto out;
}
+ if (clear_maximized(ws) > 0)
+ stack();
+
focus_win(get_focus_magic(winfocus));
+ center_pointer(r);
focus_flush();
out:
if (ws->cur_layout->l_stack == NULL)
ws->cur_layout = &layouts[0];
+ clear_maximized(ws);
+
stack();
bar_draw();
focus_win(get_region_focus(r));
+ center_pointer(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);
stack();
bar_draw();
+ center_pointer(r);
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
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++);
-
/* Adjust stack area for region bar and padding. */
g = r->g;
g.x += region_padding;
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)
win->g_float = win->g;
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)"
+ win->g_floatvalid = true;
+ 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);
win->g = win->g_float;
X(win) += X(win->ws->r);
Y(win) += Y(win->ws->r);
- DNPRINTF(SWM_D_MISC, "load_float_geom: window: 0x%x, g: (%d,%d)"
+ 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);
- }
+ 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) {
+ win->bordered = true;
+
+ if (FULLSCREEN(win)) {
+ /* _NET_WM_FULLSCREEN: fullscreen without border. */
if (!win->g_floatvalid)
store_float_geom(win);
win->g = r->g;
- }
+ win->bordered = false;
+ } 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->bordered = 0;
- X(win) += border_width;
- Y(win) += border_width;
- }
- } else if (!win->bordered) {
- win->bordered = 1;
- X(win) -= border_width;
- Y(win) -= border_width;
- }
+ win->g = r->g;
- if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) {
- WIDTH(win) = (double)WIDTH(r) * dialog_ratio;
- HEIGHT(win) = (double)HEIGHT(r) * dialog_ratio;
- }
+ if (bar_enabled && ws->bar_enabled && !maximize_hide_bar) {
+ if (!bar_at_bottom)
+ Y(win) += bar_height;
+ HEIGHT(win) -= bar_height;
+ } else if (disable_border) {
+ win->bordered = false;
+ }
- 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 = false;
+ } 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);
+ 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);
+ }
+ }
}
/* Ensure at least 1 pixel of the window is in the region. */
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 &&
tmp = (g)->h; (g)->h = (g)->w; (g)->w = tmp; \
} while (0)
void
-stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
+stack_master(struct workspace *ws, struct swm_geometry *g, int rot, bool 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 = 0;
- int bordered = 1;
+ int remain, missing, v_slice;
+ bool bordered = true, reconfigure = false;
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;
-
- TAILQ_FOREACH(win, &ws->winlist, entry)
- if (!win->transient && !win->floating && !win->iconic)
- break;
-
- 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;
-
- h_slice = r_g.h / SWM_H_SLICE;
- if (mwin && winno > mwin) {
- v_slice = r_g.w / SWM_V_SLICE;
+ /* Prepare tiling variables, if needed. */
+ if ((winno = count_win(ws, false)) > 0) {
+ /* Find first tiled window. */
+ TAILQ_FOREACH(win, &ws->winlist, entry)
+ if (!FLOATING(win) && !ICONIC(win))
+ break;
- split = mwin;
- colno = split;
- win_g.w = v_slice * mscale;
+ /* 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 (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;
+
+ 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 || win->floating || win->iconic)
+ 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)
win_g.y += last_h + 2 * border_width + tile_gap;
if (disable_border && !(bar_enabled && ws->bar_enabled) &&
- winno == 1){
- bordered = 0;
+ winno == 1) {
+ bordered = false;
win_g.w += 2 * border_width;
win_g.h += 2 * border_width;
} else {
- bordered = 1;
+ bordered = true;
}
if (rot) {
if (X(win) != win_g.y || Y(win) != win_g.x ||
WIDTH(win) != win_g.h || HEIGHT(win) != win_g.w) {
- reconfigure = 1;
+ reconfigure = true;
X(win) = win_g.y;
Y(win) = win_g.x;
WIDTH(win) = win_g.h;
} else {
if (X(win) != win_g.x || Y(win) != win_g.y ||
WIDTH(win) != win_g.w || HEIGHT(win) != win_g.h) {
- reconfigure = 1;
+ reconfigure = true;
X(win) = win_g.x;
Y(win) = win_g.y;
WIDTH(win) = win_g.w;
}
if (bordered != win->bordered) {
- reconfigure = 1;
+ reconfigure = true;
win->bordered = bordered;
}
update_window(win);
}
- map_window(win, get_sibling(win, SWM_STACK_BELOW));
-
last_h = win_g.h;
i++;
j++;
}
- /* Map/raise focused tiled window to top if windows could overlap. */
- if (tile_gap < 0 && ws->focus != NULL && !ws->focus->floating)
- map_window(ws->focus, get_sibling(ws->focus, SWM_STACK_TOP));
-
-notiles:
- /* now, stack all the floaters and transients */
- TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (!win->transient && !win->floating)
- continue;
- if (win->iconic)
- 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(win, XCB_WINDOW_NONE);
- }
+ /* Map all windows from top down. */
+ TAILQ_FOREACH(win, &ws->stack, stack_entry)
+ if (!ICONIC(win))
+ map_window(win);
- /* Make sure fs_win is stacked last so it's on top. */
- if (fs_win) {
- stack_floater(fs_win, ws->r);
- map_window(fs_win, XCB_WINDOW_NONE);
- }
+ DNPRINTF(SWM_D_STACK, "stack_master: done\n");
}
void
ws->l_state.vertical_mwin = 1;
ws->l_state.vertical_stacks = 1;
break;
+ case SWM_ARG_ID_STACKBALANCE:
+ ws->l_state.vertical_msize = SWM_V_SLICE / (ws->l_state.vertical_stacks + 1);
+ break;
case SWM_ARG_ID_MASTERSHRINK:
if (ws->l_state.vertical_msize > 1)
ws->l_state.vertical_msize--;
ws->l_state.horizontal_msize = SWM_H_SLICE / 2;
ws->l_state.horizontal_stacks = 1;
break;
+ case SWM_ARG_ID_STACKBALANCE:
+ ws->l_state.horizontal_msize = SWM_H_SLICE / (ws->l_state.horizontal_stacks + 1);
+ break;
case SWM_ARG_ID_MASTERSHRINK:
if (ws->l_state.horizontal_msize > 1)
ws->l_state.horizontal_msize--;
max_stack(struct workspace *ws, struct swm_geometry *g)
{
struct swm_geometry gg = *g;
- struct ws_win *w, *win = NULL, *parent = NULL;
+ struct ws_win *w, *win = NULL, *parent = NULL, *tmpw;
int winno;
DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
if (ws == NULL)
return;
- winno = count_win(ws, 0);
- if (winno == 0 && count_win(ws, 1) == 0)
+ winno = count_win(ws, false);
+ if (winno == 0 && count_win(ws, true) == 0)
return;
/* Figure out which top level window should be visible. */
else
win = TAILQ_FIRST(&ws->winlist);
- if (win->transient)
- parent = find_window(win->transient);
-
- DNPRINTF(SWM_D_STACK, "max_stack: win: 0x%x\n", win->id);
+ 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);
- /* maximize all top level windows */
+ /* Update window geometry. */
TAILQ_FOREACH(w, &ws->winlist, entry) {
- if (w->transient || w->iconic)
+ if (ICONIC(w))
+ continue;
+
+ if (TRANS(w)) {
+ update_floater(w);
continue;
+ }
- if (!w->mapped && w != win)
- map_window(w, XCB_WINDOW_NONE);
+ /* Set maximized flag for all maxed windows. */
+ if (!MAXIMIZED(w)) {
+ /* Preserve floating geometry. */
+ if (ABOVE(w))
+ store_float_geom(w);
- if (w->floating && !w->floatmaxed) {
- /*
- * retain geometry for retrieval on exit from
- * max_stack mode
- */
- store_float_geom(w);
- w->floatmaxed = 1;
+ ewmh_apply_flags(w, w->ewmh_flags | EWMH_F_MAXIMIZED);
+ ewmh_update_wm_state(w);
}
- /* only reconfigure if necessary */
+ /* 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 {
- w->bordered = 0;
+
+ if (disable_border && !(bar_enabled && ws->bar_enabled)) {
+ w->bordered = false;
WIDTH(w) += 2 * border_width;
HEIGHT(w) += 2 * border_width;
+ } else {
+ w->bordered = true;
}
update_window(w);
}
}
- /* If a parent exists, map/raise it first. */
- if (parent) {
- map_window(parent, XCB_WINDOW_NONE);
+ /* If transient, stack parent and its children. */
+ if (TRANS(win) && (parent = find_window(win->transient))) {
+ raise_window(parent);
- /* Map siblings next. */
- TAILQ_FOREACH(w, &ws->winlist, entry)
- if (w != win && !w->iconic &&
- w->transient == parent->id) {
- stack_floater(w, ws->r);
- map_window(w, XCB_WINDOW_NONE);
- }
+ TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw)
+ if (w->transient == parent->id)
+ raise_window(w);
}
- /* Map/raise focused window. */
- map_window(win, XCB_WINDOW_NONE);
+ /* Make sure focus window is on top. */
+ raise_window(win);
- /* Finally, map/raise children of focus window. */
- TAILQ_FOREACH(w, &ws->winlist, entry)
- if (w->transient == win->id && !w->iconic) {
- stack_floater(w, ws->r);
- map_window(w, XCB_WINDOW_NONE);
- }
+ /* Stack any children of focus window. */
+ TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw)
+ 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
return (NULL);
}
+/* Transfer focused window to target workspace and focus. */
void
send_to_ws(struct swm_region *r, union arg *args)
{
else
return;
- DNPRINTF(SWM_D_MOVE, "send_to_ws: win 0x%x, ws %d\n", win->id, wsid);
+ 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;
+
+ win_to_ws(win, wsid, true);
+
+ /* Set new focus on target ws. */
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ win->ws->focus_prev = win->ws->focus;
+ win->ws->focus = win;
+ win->ws->focus_pending = NULL;
+
+ if (win->ws->focus_prev)
+ update_window_color(win->ws->focus_prev);
+ }
+
+ 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);
- win_to_ws(win, wsid, 1);
+ ewmh_apply_flags(win, win->ewmh_flags & ~EWMH_F_MAXIMIZED);
+ ewmh_update_wm_state(win);
+
+ /* Restack and set new focus on current ws. */
+ if (FLOATING(win))
+ load_float_geom(win);
- /* Restack and set new focus. */
stack();
if (focus_mode != SWM_FOCUS_FOLLOW) {
- if (r->ws->focus_pending) {
- focus_win(r->ws->focus_pending);
- r->ws->focus_pending = NULL;
+ if (r->ws->focus != NULL) {
+ focus_win(r->ws->focus);
} else {
- xcb_set_input_focus(conn,
- XCB_INPUT_FOCUS_PARENT, r->id,
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->id,
XCB_CURRENT_TIME);
+ bar_draw();
}
}
+ center_pointer(r);
focus_flush();
}
void
-win_to_ws(struct ws_win *win, int wsid, int unfocus)
+win_to_ws(struct ws_win *win, int wsid, bool unfocus)
{
struct ws_win *parent;
struct workspace *ws, *nws, *pws;
- char ws_idx_str[SWM_PROPLEN];
- if (wsid >= workspace_limit)
+ if (wsid < 0 || wsid >= workspace_limit)
return;
if (win->ws->idx == wsid)
ws = win->ws;
nws = &win->s->ws[wsid];
- DNPRINTF(SWM_D_MOVE, "win_to_ws: win 0x%x, ws %d -> %d\n", win->id,
+ DNPRINTF(SWM_D_MOVE, "win_to_ws: win %#x, ws %d -> %d\n", win->id,
ws->idx, wsid);
- /* Update the window's workspace property: _SWM_WS */
- if (snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) {
- if (focus_mode != SWM_FOCUS_FOLLOW)
- ws->focus_pending = get_focus_prev(win);
+ /* 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 (win->transient) {
- parent = find_window(win->transient);
- if (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;
- }
+ /* Move the parent if this is a transient window. */
+ if (TRANS(win)) {
+ parent = find_window(win->transient);
+ if (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);
+ /* Don't unmap parent if new ws is visible */
+ if (nws->r == NULL)
+ unmap_window(parent);
- /* Transfer */
- TAILQ_REMOVE(&ws->winlist, parent, entry);
- TAILQ_INSERT_TAIL(&nws->winlist, parent, entry);
- parent->ws = nws;
+ /* 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: _SWM_WS: %s\n", ws_idx_str);
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
- parent->id, a_swm_ws, XCB_ATOM_STRING, 8,
- strlen(ws_idx_str), ws_idx_str);
- }
+ 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);
}
+ }
- if (unfocus)
- unfocus_win(win);
+ if (unfocus)
+ unfocus_win(win);
- /* Don't unmap if new ws is visible */
- if (nws->r == NULL)
- unmap_window(win);
+ if (ws->focus_prev == win)
+ ws->focus_prev = NULL;
- /* Transfer */
- TAILQ_REMOVE(&ws->winlist, win, entry);
- TAILQ_INSERT_TAIL(&nws->winlist, win, entry);
- win->ws = nws;
+ if (focus_mode != SWM_FOCUS_FOLLOW && ws->focus_pending != NULL) {
+ ws->focus = ws->focus_pending;
+ ws->focus_pending = NULL;
+ }
- /* Set focus on new ws. */
- unfocus_win(nws->focus);
- nws->focus = win;
+ /* Don't unmap if new ws is visible */
+ if (nws->r == NULL)
+ unmap_window(win);
- DNPRINTF(SWM_D_PROP, "win_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);
- }
+ /* Transfer */
+ TAILQ_REMOVE(&ws->winlist, win, entry);
+ TAILQ_REMOVE(&ws->stack, win, stack_entry);
+ TAILQ_INSERT_TAIL(&nws->winlist, win, entry);
+ TAILQ_INSERT_TAIL(&nws->stack, win, stack_entry);
+ win->ws = nws;
+
+ /* 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);
+
+ ewmh_update_client_list();
DNPRINTF(SWM_D_MOVE, "win_to_ws: done.\n");
}
void
raise_toggle(struct swm_region *r, union arg *args)
{
- /* suppress unused warning since var is needed */
+ /* Suppress warning. */
(void)args;
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)
- stack();
+ /* Update focused win stacking order based on new always_raise value. */
+ raise_window(r->ws->focus);
focus_flush();
}
void
iconify(struct swm_region *r, union arg *args)
{
- /* suppress unused warning since var is needed */
+ struct ws_win *w;
+
+ /* Suppress warning. */
(void)args;
- if (r->ws->focus == NULL)
+ if ((w = r->ws->focus) == NULL)
return;
- set_swm_iconic(r->ws->focus, 1);
+ ewmh_apply_flags(w, w->ewmh_flags | EWMH_F_HIDDEN);
+ ewmh_update_wm_state(w);
- xcb_flush(conn);
+ stack();
+
+ focus_flush();
}
char *
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) {
- if (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)
- return (NULL);
- if (r->type == XCB_NONE) {
- free(r);
- return (NULL);
- }
- }
- if (r->length > 0)
- name = strndup(xcb_get_property_value(r),
- xcb_get_property_value_length(r));
-
+ 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 && 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);
}
TAILQ_FOREACH(win, &r->ws->winlist, entry) {
if (win->ws == NULL)
continue; /* should never happen */
- if (!win->iconic)
+ 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)
+ if (!ICONIC(win))
continue;
name = get_win_name(win->id);
- if (name == NULL)
- continue;
fprintf(lfile, "%s.%u\n", name, win->id);
free(name);
}
struct ws_win *win = NULL;
struct search_window *sw = NULL;
xcb_window_t w;
- uint32_t wa[2];
+ uint32_t wa[3];
+ xcb_screen_t *screen;
int i, width, height;
char s[8];
FILE *lfile;
if ((lfile = fdopen(select_list_pipe[1], "w")) == NULL)
return;
+ if ((screen = get_screen(r->s->idx)) == NULL)
+ errx(1, "ERROR: can't get screen %d.", r->s->idx);
+
TAILQ_INIT(&search_wl);
i = 1;
TAILQ_FOREACH(win, &r->ws->winlist, entry) {
- if (win->iconic)
+ if (ICONIC(win))
continue;
sw = calloc(1, sizeof(struct search_window));
w = xcb_generate_id(conn);
wa[0] = r->s->c[SWM_S_COLOR_FOCUS].pixel;
wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].pixel;
+ wa[2] = screen->default_colormap;
if (bar_font_legacy) {
XmbTextExtents(bar_fs, s, len, &l_ibox, &l_lbox);
height = bar_font->height + 4;
}
- xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0,
+ xcb_create_window(conn, screen->root_depth, w, win->id, 0, 0,
width, height, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT,
- XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL |
- XCB_CW_BORDER_PIXEL, wa);
+ screen->root_visual, XCB_CW_BACK_PIXEL |
+ XCB_CW_BORDER_PIXEL | XCB_CW_COLORMAP, wa);
xcb_map_window(conn, w);
DefaultVisual(display, r->s->idx),
DefaultColormap(display, r->s->idx));
- XftDrawStringUtf8(draw, &bar_font_color, bar_font, 2,
+ XftDrawStringUtf8(draw, &search_font_color, bar_font, 2,
(HEIGHT(r->bar) + bar_font->height) / 2 -
bar_font->descent, (FcChar8 *)s, len);
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++;
DNPRINTF(SWM_D_MISC, "search_resp_uniconify: resp: %s\n", resp);
TAILQ_FOREACH(win, &search_r->ws->winlist, entry) {
- if (!win->iconic)
+ 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 */
- set_swm_iconic(win, 0);
+ ewmh_apply_flags(win, win->ewmh_flags & ~EWMH_F_HIDDEN);
+ ewmh_update_wm_state(win);
+ stack();
free(s);
break;
}
"strdup: %s", strerror(errno));
return;
}
+
+ ewmh_update_desktop_names();
+ ewmh_get_desktop_names();
}
}
void
-search_resp_search_workspace(const char *resp)
+ewmh_update_desktop_names(void)
{
- char *p, *q;
- int ws_idx;
- const char *errstr;
- union arg a;
+ char *name_list = NULL, *p;
+ int num_screens, i, j, len = 0, tot = 0;
- DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: resp: %s\n", resp);
+ 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;
+ }
- q = strdup(resp);
- if (!q) {
- DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: strdup: %s",
- strerror(errno));
- return;
- }
- p = strchr(q, ':');
+ if((name_list = calloc(len, sizeof(char))) == 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(count, sizeof(xcb_window_t));
+ 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(workspace_limit * 2, sizeof(uint32_t));
+ 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;
+ const char *errstr;
+ union arg a;
+
+ DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: resp: %s\n", resp);
+
+ q = strdup(resp);
+ if (q == NULL) {
+ DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: strdup: %s",
+ strerror(errno));
+ return;
+ }
+ p = strchr(q, ':');
if (p != NULL)
*p = '\0';
ws_idx = (int)strtonum(q, 1, workspace_limit, &errstr);
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;
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;
}
int
-floating_toggle_win(struct ws_win *win)
+clear_maximized(struct workspace *ws)
{
- if (win == NULL)
- return (0);
+ struct ws_win *w;
+ int count = 0;
- if (!win->ws->r)
- 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;
+ }
- /* reject floating toggles in max stack mode */
- if (win->ws->cur_layout == &layouts[SWM_MAX_STACK])
- return (0);
+ return count;
+}
- if (win->floating) {
- if (!win->floatmaxed) {
- /* retain position for refloat */
- store_float_geom(win);
- }
- win->floating = 0;
- } else {
- load_float_geom(win);
- win->floating = 1;
- }
+void
+maximize_toggle(struct swm_region *r, union arg *args)
+{
+ struct ws_win *w = r->ws->focus;
- ewmh_update_actions(win);
+ /* suppress unused warning since var is needed */
+ (void)args;
- return (1);
+ if (w == NULL)
+ return;
+
+ DNPRINTF(SWM_D_MISC, "maximize_toggle: win %#x\n", w->id);
+
+ 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);
+
+ center_pointer(r);
+ 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;
+ 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)
- focus_win(win);
+ if (w == w->ws->focus)
+ focus_win(w);
+ center_pointer(r);
focus_flush();
+ DNPRINTF(SWM_D_MISC, "floating_toggle: done\n");
}
void
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 0x%x, rt: %d, lt: %d, "
+ 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));
void
constrain_window(struct ws_win *win, struct swm_geometry *b, int *opts)
{
- DNPRINTF(SWM_D_MISC, "constrain_window: window: 0x%x, (x,y) w x h: "
+ 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,
}
}
+void
+update_window_color(struct ws_win *win)
+{
+ uint32_t *pixel;
+
+ if (WS_FOCUSED(win->ws) && win->ws->focus == win)
+ pixel = MAXIMIZED(win) ?
+ &win->s->c[SWM_S_COLOR_FOCUS_MAXIMIZED].pixel :
+ &win->s->c[SWM_S_COLOR_FOCUS].pixel;
+ else
+ pixel = MAXIMIZED(win) ?
+ &win->s->c[SWM_S_COLOR_UNFOCUS_MAXIMIZED].pixel :
+ &win->s->c[SWM_S_COLOR_UNFOCUS].pixel;
+
+ xcb_change_window_attributes(conn, win->id,
+ XCB_CW_BORDER_PIXEL, pixel);
+}
+
void
update_window(struct ws_win *win)
{
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_stp = 0;
struct swm_geometry g;
- int top = 0, left = 0, resizing;
+ int resize_stp = 0;
+ int top = 0, left = 0;
int dx, dy;
xcb_cursor_t cursor;
xcb_query_pointer_reply_t *xpr = NULL;
xcb_generic_event_t *evt;
xcb_motion_notify_event_t *mne;
+ bool resizing;
if (win == NULL)
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 && !win->floating)
+ /* 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();
/* 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;
XCB_CURRENT_TIME),
xcb_flush(conn);
- resizing = 1;
+ resizing = true;
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");
- resizing = 0;
+ resizing = false;
break;
case XCB_MOTION_NOTIFY:
mne = (xcb_motion_notify_event_t *)evt;
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);
return;
resize(win, args);
+ center_pointer(r);
focus_flush();
}
r = region_under(win->s, X(win) + WIDTH(win) / 2,
Y(win) + HEIGHT(win) / 2);
- if (r && r != win->ws->r) {
- win_to_ws(win, r->ws->idx, 0);
+ if (r != NULL && r != win->ws->r) {
+ if (clear_maximized(r->ws) > 0)
+ stack();
+
+ win_to_ws(win, r->ws->idx, false);
+
+ /* Set focus on new ws. */
+ unfocus_win(r->ws->focus);
+ r->ws->focus = win;
+
set_region(r);
+ raise_window(win);
}
}
void
move(struct ws_win *win, union arg *args)
{
- xcb_timestamp_t timestamp = 0;
- int move_stp = 0, moving;
+ struct swm_region *r;
+ xcb_timestamp_t timestamp = 0;
+ int move_stp = 0;
xcb_query_pointer_reply_t *qpr = NULL;
xcb_generic_event_t *evt;
xcb_motion_notify_event_t *mne;
+ bool moving, restack = false;
if (win == NULL)
return;
- if (win->ewmh_flags & EWMH_F_FULLSCREEN)
+ if ((r = win->ws->r) == NULL)
+ return;
+
+ if (FULLSCREEN(win))
return;
- DNPRINTF(SWM_D_EVENT, "move: window: 0x%x, floating: %s, transient: "
- "0x%x\n", win->id, YESNO(win->floating), win->transient);
+ 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;
- if (!win->manual) {
- win->manual = 1;
- ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom,
- _NET_WM_STATE_ADD);
+ if (!(ABOVE(win) || TRANS(win)) || MAXIMIZED(win)) {
+ store_float_geom(win);
+ restack = true;
}
- /* When a stacked win is moved, float it and restack. */
- if (!win->floating && !win->transient) {
- store_float_geom(win);
- ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].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);
+
+ if (restack)
stack();
- }
focus_flush();
/* 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);
return;
}
SWM_CW_SOFTBOUNDARY);
update_window(win);
xcb_flush(conn);
- moving = 1;
+ moving = true;
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");
- moving = 0;
+ moving = false;
break;
case XCB_MOTION_NOTIFY:
mne = (xcb_motion_notify_event_t *)evt;
- DNPRINTF(SWM_D_EVENT, "motion: root: 0x%x\n", mne->root);
+ 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;
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);
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);
else
return;
- if (!win->transient && !win->floating)
+ if (!TRANS(win) && !ABOVE(win))
return;
move(win, args);
+ center_pointer(r);
focus_flush();
}
{ "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} },
{ "stack_inc", stack_config, {.id = SWM_ARG_ID_STACKINC} },
{ "stack_dec", stack_config, {.id = SWM_ARG_ID_STACKDEC} },
{ "stack_reset", stack_config, {.id = SWM_ARG_ID_STACKRESET} },
+ { "stack_balance", stack_config, {.id = SWM_ARG_ID_STACKBALANCE} },
{ "swap_main", swapwin, {.id = SWM_ARG_ID_SWAPMAIN} },
{ "swap_next", swapwin, {.id = SWM_ARG_ID_SWAPNEXT} },
{ "swap_prev", swapwin, {.id = SWM_ARG_ID_SWAPPREV} },
buttons[i].mask = mod;
}
+unsigned char
+update_mousebutton(unsigned char type, unsigned int but)
+{
+ int i;
+
+ switch (type) {
+ case 0:
+ mouse_button_move = but;
+ break;
+ case 1:
+ mouse_button_resize = but;
+ break;
+ }
+
+ for (i = 0; i < LENGTH(buttons); i++) {
+ if (buttons[i].func == move)
+ buttons[i].button = mouse_button_move;
+
+ if (buttons[i].func == resize)
+ buttons[i].button = mouse_button_resize;
+ }
+
+ return(1);
+}
+
int
spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name,
char ***ret_args)
/* find program */
TAILQ_FOREACH(prog, &spawns, entry) {
- if (!strcasecmp(spawn_name, prog->name))
+ if (strcasecmp(spawn_name, prog->name) == 0)
break;
}
if (prog == NULL) {
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 (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")) {
+ } 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")) {
+ } 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")) {
+ } 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")) {
+ } 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")) {
+ } else if (strcasecmp(ap, "$color_focus_maximized") == 0) {
+ if ((real_args[c] =
+ strdup(r->s->c[SWM_S_COLOR_FOCUS_MAXIMIZED].name))
+ == NULL)
+ err(1, "spawn_custom color focus maximized");
+ } 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")) {
+ } else if (strcasecmp(ap, "$color_unfocus_maximized") == 0) {
+ if ((real_args[c] =
+ strdup(r->s->c[SWM_S_COLOR_UNFOCUS_MAXIMIZED].name))
+ == NULL)
+ err(1, "spawn_custom color unfocus maximized");
+ } 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")) {
+ } 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")) {
+ } else if (strcasecmp(ap, "$dmenu_bottom") == 0) {
if (!bar_at_bottom)
continue;
if ((real_args[c] = strdup("-b")) == NULL)
return;
a.argv = real_args;
if (fork() == 0)
- spawn(r->ws->idx, &a, 1);
+ spawn(r->ws->idx, &a, true);
for (i = 0; i < spawn_argc; i++)
free(real_args[i]);
err(1, "dup2");
close(select_list_pipe[1]);
close(select_resp_pipe[0]);
- spawn(r->ws->idx, &a, 0);
+ spawn(r->ws->idx, &a, false);
break;
default: /* parent */
close(select_list_pipe[0]);
free(real_args);
}
+/* Argument tokenizer. */
+char *
+argsep(char **sp) {
+ char *arg, *cp, *next;
+ bool single_quoted = false, double_quoted = false;
+
+ 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(const char *name, const char *args, int flags)
{
- char *arg, *cp, *ptr;
struct spawn_prog *sp;
+ char *arg, *cp, *ptr;
+
+ DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s[%s]\n", name, args);
- DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s\n", name);
+ 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 */
+ /* Convert the arguments to an argument list. */
if ((ptr = cp = 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;
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");
}
struct spawn_prog *sp;
TAILQ_FOREACH(sp, &spawns, entry)
- if (!strcasecmp(sp->name, name))
+ if (strcasecmp(sp->name, name) == 0)
return sp;
return NULL;
}
int
-setconfspawn(char *selector, char *value, int flags)
+setconfspawn(const char *selector, const char *value, int flags)
{
char *args;
+ if (selector == NULL || strlen(selector) == 0)
+ return (1);
+
args = expand_tilde(value);
DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
/* 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 (strncmp(name, "Mod5", SWM_MODNAME_SIZE) == 0)
+ *mod |= XCB_MOD_MASK_5;
else if (strncasecmp(name, "SHIFT", SWM_MODNAME_SIZE) == 0)
*mod |= XCB_MOD_MASK_SHIFT;
else if (strncasecmp(name, "CONTROL", SWM_MODNAME_SIZE) == 0)
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);
}
}
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;
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_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_SHIFT, XK_h, KF_STACK_BALANCE, NULL);
setkeybinding(MODKEY, XK_Return, KF_SWAP_MAIN, NULL);
setkeybinding(MODKEY_SHIFT, XK_j, KF_SWAP_NEXT, NULL);
setkeybinding(MODKEY_SHIFT, XK_k, KF_SWAP_PREV, NULL);
}
int
-setkeymapping(char *selector, char *value, int flags)
+setkeymapping(const char *selector, const char *value, int flags)
{
char *keymapping_file;
+ 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);
unsigned int modifiers[4];
int i, j;
- DNPRINTF(SWM_D_MOUSE, "grabbuttons: win 0x%x\n", win->id);
+ DNPRINTF(SWM_D_MOUSE, "grabbuttons: win %#x\n", win->id);
updatenumlockmask();
modifiers[0] = 0;
"FOCUSPREV",
"NOFOCUSONMAP",
"FOCUSONMAP_SINGLE",
+ "OBEYAPPFOCUSREQ",
+ "IGNOREPID",
+ "IGNORESPAWNWS",
+ "NOFOCUSCYCLE",
};
-/* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */
-#define SWM_Q_WS "\n|+ \t"
+/* SWM_Q_DELIM: retain '|' for back compat for now (2009-08-11) */
+#define SWM_Q_DELIM "\n|+ \t"
int
-parsequirks(char *qstr, unsigned long *quirk)
+parsequirks(const char *qstr, uint32_t *quirk, int *ws)
{
- 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) {
+ while ((name = strsep(&cp, SWM_Q_DELIM)) != NULL) {
if (cp)
- cp += (long)strspn(cp, SWM_Q_WS);
+ cp += (long)strspn(cp, SWM_Q_DELIM);
+
+ if (sscanf(name, "WS[%d]", ws) == 1) {
+ if (*ws > 0)
+ *ws -= 1;
+ continue;
+ }
+
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,
+ uint32_t quirk, int ws)
{
struct quirk *qp;
+ char *str;
+ bool failed = false;
- 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: %u, ws: %d\n", class, instance, name, quirk, ws);
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 = true;
+ }
+ 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 = true;
+ }
+ 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 = true;
+ }
+ 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;
+ qp->ws = ws;
+ TAILQ_INSERT_TAIL(&quirks, qp, entry);
+ }
DNPRINTF(SWM_D_QUIRK, "quirk_insert: leave\n");
}
void
quirk_remove(struct quirk *qp)
{
- DNPRINTF(SWM_D_QUIRK, "quirk_remove: %s:%s [%lu]\n", qp->class,
+ DNPRINTF(SWM_D_QUIRK, "quirk_remove: %s:%s [%u]\n", qp->class,
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, uint32_t quirk, int ws)
{
- 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 [%u], ws: %d\n", qp->class,
+ qp->instance, qp->name, qp->quirk, qp->ws);
quirk_remove(qp);
- quirk_insert(class, name, quirk);
+ quirk_insert(class, instance, name, quirk, ws);
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,
+ uint32_t quirk, int ws)
{
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 [%u], ws: %d\n", class,
+ instance, name, quirk, ws);
/* 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 && ws == -1)
quirk_remove(qp);
else
- quirk_replace(qp, class, name, quirk);
+ quirk_replace(qp, class, instance, name, quirk,
+ ws);
DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n");
return;
}
}
- /* Only insert if quirk is not NONE. */
- if (quirk)
- quirk_insert(class, name, quirk);
+ /* Only insert if quirk is not NONE or forced ws is set. */
+ if (quirk || ws != -1)
+ quirk_insert(class, instance, name, quirk, ws);
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;
- unsigned long qrks;
+ char *str, *cp, *class;
+ char *instance = NULL, *name = NULL;
+ int retval, count = 0, ws = -1;
+ uint32_t 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 ((retval = parsequirks(value, &qrks)) == 0)
- setquirk(class, name, qrks);
+
+ 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, &ws)) == 0)
+ setquirk(class, instance, name, qrks, ws);
+
+ 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, -1);
+ setquirk("OpenOffice.org 3.2", "VCLSalFrame", ".*",
+ SWM_Q_FLOAT, -1);
+ setquirk("Firefox-bin", "firefox-bin", ".*",
+ SWM_Q_TRANSSZ, -1);
+ setquirk("Firefox", "Dialog", ".*",
+ SWM_Q_FLOAT, -1);
+ setquirk("Gimp", "gimp", ".*",
+ SWM_Q_FLOAT | SWM_Q_ANYWHERE, -1);
+ setquirk("XTerm", "xterm", ".*",
+ SWM_Q_XTERM_FONTADJ, -1);
+ setquirk("xine", "Xine Window", ".*",
+ SWM_Q_FLOAT | SWM_Q_ANYWHERE, -1);
+ setquirk("Xitk", "Xitk Combo", ".*",
+ SWM_Q_FLOAT | SWM_Q_ANYWHERE, -1);
+ setquirk("xine", "xine Panel", ".*",
+ SWM_Q_FLOAT | SWM_Q_ANYWHERE, -1);
+ setquirk("Xitk", "Xine Window", ".*",
+ SWM_Q_FLOAT | SWM_Q_ANYWHERE, -1);
+ setquirk("xine", "xine Video Fullscreen Window", ".*",
+ SWM_Q_FULLSCREEN | SWM_Q_FLOAT, -1);
+ setquirk("pcb", "pcb", ".*",
+ SWM_Q_FLOAT, -1);
+ setquirk("SDL_App", "SDL_App", ".*",
+ SWM_Q_FLOAT | SWM_Q_FULLSCREEN, -1);
}
/* conf file stuff */
SWM_S_FOCUS_CLOSE_WRAP,
SWM_S_FOCUS_DEFAULT,
SWM_S_FOCUS_MODE,
+ SWM_S_ICONIC_ENABLED,
+ SWM_S_JAVA_WORKAROUND,
+ SWM_S_MAXIMIZE_HIDE_BAR,
SWM_S_REGION_PADDING,
SWM_S_SPAWN_ORDER,
SWM_S_SPAWN_TERM,
SWM_S_STACK_ENABLED,
SWM_S_TERM_WIDTH,
SWM_S_TILE_GAP,
- SWM_S_TITLE_CLASS_ENABLED,
- SWM_S_TITLE_NAME_ENABLED,
+ SWM_S_URGENT_COLLAPSE,
SWM_S_URGENT_ENABLED,
SWM_S_VERBOSE_LAYOUT,
+ SWM_S_WARP_POINTER,
+ 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)
{
struct workspace *ws;
int i, ws_id, num_screens;
- char *b;
-
- /* suppress unused warning since var is needed */
- (void)selector;
+ char *b, *str, s[1024];
switch (flags) {
case SWM_S_BAR_ACTION:
err(1, "setconfvalue: bar_action");
break;
case SWM_S_BAR_AT_BOTTOM:
- bar_at_bottom = atoi(value);
+ bar_at_bottom = (atoi(value) != 0);
break;
case SWM_S_BAR_BORDER_WIDTH:
bar_border_width = atoi(value);
/* No longer needed; leave to not break old conf files. */
break;
case SWM_S_BAR_ENABLED:
- bar_enabled = atoi(value);
+ bar_enabled = (atoi(value) != 0);
break;
case SWM_S_BAR_ENABLED_WS:
ws_id = atoi(selector) - 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);
+ ws[ws_id].bar_enabled = (atoi(value) != 0);
}
break;
case SWM_S_BAR_FONT:
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)) {
- bar_font_legacy = 0;
+ bar_font_legacy = false;
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");
boundary_width = 0;
break;
case SWM_S_CLOCK_ENABLED:
- clock_enabled = atoi(value);
+ clock_enabled = (atoi(value) != 0);
break;
case SWM_S_CLOCK_FORMAT:
#ifndef SWM_DENY_CLOCK_FORMAT
#endif
break;
case SWM_S_CYCLE_EMPTY:
- cycle_empty = atoi(value);
+ cycle_empty = (atoi(value) != 0);
break;
case SWM_S_CYCLE_VISIBLE:
- cycle_visible = atoi(value);
+ cycle_visible = (atoi(value) != 0);
break;
case SWM_S_DIALOG_RATIO:
dialog_ratio = atof(value);
dialog_ratio = .6;
break;
case SWM_S_DISABLE_BORDER:
- disable_border = atoi(value);
+ disable_border = (atoi(value) != 0);
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");
break;
case SWM_S_FOCUS_CLOSE_WRAP:
- focus_close_wrap = atoi(value);
+ focus_close_wrap = (atoi(value) != 0);
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") ||
- !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) != 0);
+ break;
+ case SWM_S_JAVA_WORKAROUND:
+ java_workaround = (atoi(value) != 0);
+ break;
+ case SWM_S_MAXIMIZE_HIDE_BAR:
+ maximize_hide_bar = 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");
/* No longer needed; leave to not break old conf files. */
break;
case SWM_S_STACK_ENABLED:
- stack_enabled = atoi(value);
+ stack_enabled = (atoi(value) != 0);
break;
case SWM_S_TERM_WIDTH:
term_width = atoi(value);
case SWM_S_TILE_GAP:
tile_gap = atoi(value);
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_URGENT_COLLAPSE:
+ urgent_collapse = (atoi(value) != 0);
break;
case SWM_S_URGENT_ENABLED:
- urgent_enabled = atoi(value);
+ urgent_enabled = (atoi(value) != 0);
break;
case SWM_S_VERBOSE_LAYOUT:
- verbose_layout = atoi(value);
+ verbose_layout = (atoi(value) != 0);
for (i = 0; layouts[i].l_stack != NULL; i++) {
if (verbose_layout)
layouts[i].l_string = fancy_stacker;
layouts[i].l_string = plain_stacker;
}
break;
+ case SWM_S_WARP_POINTER:
+ warp_pointer = (atoi(value) != 0);
+ break;
+ case SWM_S_WINDOW_CLASS_ENABLED:
+ window_class_enabled = (atoi(value) != 0);
+ break;
+ case SWM_S_WINDOW_INSTANCE_ENABLED:
+ window_instance_enabled = (atoi(value) != 0);
+ break;
case SWM_S_WINDOW_NAME_ENABLED:
- window_name_enabled = atoi(value);
+ window_name_enabled = (atoi(value) != 0);
break;
case SWM_S_WORKSPACE_LIMIT:
workspace_limit = atoi(value);
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 if (strncasecmp(value, "Mod5", strlen("Mod5")) == 0)
+ update_modkey(XCB_MOD_MASK_5);
else
return (1);
return (0);
}
int
-setconfcolor(char *selector, char *value, int flags)
+setconfmousebuttonmove(const char *selector, const char *value, int flags)
{
- setscreencolor(value, ((selector == NULL)?-1:atoi(selector)), flags);
+ /* suppress unused warnings since vars are needed */
+ (void)selector;
+ (void)flags;
+
+ if (strncasecmp(value, "But1", strlen("But1")) == 0) {
+ if (!update_mousebutton(0, XCB_BUTTON_INDEX_1))
+ return (1);
+ } else if (strncasecmp(value, "But2", strlen("But2")) == 0) {
+ if (!update_mousebutton(0, XCB_BUTTON_INDEX_2))
+ return (1);
+ } else if (strncasecmp(value, "But3", strlen("But3")) == 0) {
+ if (!update_mousebutton(0, XCB_BUTTON_INDEX_3))
+ return (1);
+ } else
+ return (1);
+ return (0);
+}
+
+int
+setconfmousebuttonresize(const char *selector, const char *value, int flags)
+{
+ /* suppress unused warnings since vars are needed */
+ (void)selector;
+ (void)flags;
+
+ if (strncasecmp(value, "But1", strlen("But1")) == 0) {
+ if (!update_mousebutton(1, XCB_BUTTON_INDEX_1))
+ return (1);
+ } else if (strncasecmp(value, "But2", strlen("But2")) == 0) {
+ if (!update_mousebutton(1, XCB_BUTTON_INDEX_2))
+ return (1);
+ } else if (strncasecmp(value, "But3", strlen("But3")) == 0) {
+ if (!update_mousebutton(1, XCB_BUTTON_INDEX_3))
+ return (1);
+ } else
+ return (1);
+ return (0);
+}
+
+int
+setconfcolor(const char *selector, const char *value, int flags)
+{
+ int first, last, i = 0, num_screens;
+
+ num_screens = get_screen_count();
+
+ /* conf screen indices begin at 1; treat vals <= 0 as 'all screens.' */
+ if (selector == NULL || strlen(selector) == 0 ||
+ (last = atoi(selector) - 1) < 0) {
+ first = 0;
+ last = num_screens - 1;
+ } else {
+ first = last;
+ }
+
+ if (last >= num_screens) {
+ add_startup_exception("invalid screen index: %d out of bounds "
+ "(maximum %d)", last + 1, num_screens);
+ return (1);
+ }
+
+ for (i = first; i <= last; ++i) {
+ setscreencolor(value, i, flags);
+
+ /*
+ * When setting focus/unfocus colors, we need to also
+ * set maximize colors to match if they haven't been customized.
+ */
+ if (flags == SWM_S_COLOR_FOCUS &&
+ !screens[i].c[SWM_S_COLOR_FOCUS_MAXIMIZED].manual)
+ setscreencolor(value, i, SWM_S_COLOR_FOCUS_MAXIMIZED);
+ else if (flags == SWM_S_COLOR_UNFOCUS &&
+ !screens[i].c[SWM_S_COLOR_UNFOCUS_MAXIMIZED].manual)
+ setscreencolor(value, i, SWM_S_COLOR_UNFOCUS_MAXIMIZED);
+
+ screens[i].c[flags].manual = 1;
+ }
+
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];
a.argv[argc] = NULL;
if ((pid = fork()) == 0) {
- spawn(ws_id, &a, 1);
+ spawn(ws_id, &a, true);
/* NOTREACHED */
_exit(1);
}
}
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;
+ struct workspace *ws;
+ int ws_id, i, x, mg, ma, si, ar;
int st = SWM_V_STACK, num_screens;
char s[1024];
- struct workspace *ws;
+ bool f = false;
/* suppress unused warnings since vars are needed */
(void)selector;
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"))
+ f = true;
+ } 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"))
+ f = true;
+ } else if (strcasecmp(s, "fullscreen") == 0)
st = SWM_MAX_STACK;
else
errx(1, "invalid layout entry, should be 'ws[<idx>]:"
ws = (struct workspace *)&screens[i].ws;
ws[ws_id].cur_layout = &layouts[st];
- ws[ws_id].always_raise = ar;
+ ws[ws_id].always_raise = (ar != 0);
if (st == SWM_MAX_STACK)
continue;
ws[ws_id].cur_layout->l_config(&ws[ws_id],
mg >= 0 ? SWM_ARG_ID_MASTERGROW :
SWM_ARG_ID_MASTERSHRINK);
- stack();
}
/* master add */
for (x = 0; x < abs(ma); x++) {
ws[ws_id].cur_layout->l_config(&ws[ws_id],
ma >= 0 ? SWM_ARG_ID_MASTERADD :
SWM_ARG_ID_MASTERDEL);
- stack();
}
/* stack inc */
for (x = 0; x < abs(si); x++) {
ws[ws_id].cur_layout->l_config(&ws[ws_id],
si >= 0 ? SWM_ARG_ID_STACKINC :
SWM_ARG_ID_STACKDEC);
- stack();
}
/* Apply flip */
if (f) {
ws[ws_id].cur_layout->l_config(&ws[ws_id],
SWM_ARG_ID_FLIPLAYOUT);
- stack();
}
}
- focus_flush();
-
return (0);
}
/* 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[] = {
{ "clock_enabled", setconfvalue, SWM_S_CLOCK_ENABLED },
{ "clock_format", setconfvalue, SWM_S_CLOCK_FORMAT },
{ "color_focus", setconfcolor, SWM_S_COLOR_FOCUS },
+ { "color_focus_maximized", setconfcolor, SWM_S_COLOR_FOCUS_MAXIMIZED },
{ "color_unfocus", setconfcolor, SWM_S_COLOR_UNFOCUS },
+ { "color_unfocus_maximized", setconfcolor, SWM_S_COLOR_UNFOCUS_MAXIMIZED },
{ "cycle_empty", setconfvalue, SWM_S_CYCLE_EMPTY },
{ "cycle_visible", setconfvalue, SWM_S_CYCLE_VISIBLE },
{ "dialog_ratio", setconfvalue, SWM_S_DIALOG_RATIO },
{ "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 },
+ { "java_workaround", setconfvalue, SWM_S_JAVA_WORKAROUND },
+ { "maximize_hide_bar", setconfvalue, SWM_S_MAXIMIZE_HIDE_BAR },
{ "keyboard_mapping", setkeymapping, 0 },
{ "layout", setlayout, 0 },
{ "modkey", setconfmodkey, 0 },
+ { "move_button", setconfmousebuttonmove, 0 },
+ { "resize_button", setconfmousebuttonresize, 0 },
{ "program", setconfspawn, 0 },
{ "quirk", setconfquirk, 0 },
{ "region", setconfregion, 0 },
{ "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_TITLE_CLASS_ENABLED },
- { "title_name_enabled", setconfvalue, SWM_S_TITLE_NAME_ENABLED },
+ { "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_collapse", setconfvalue, SWM_S_URGENT_COLLAPSE },
{ "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED },
{ "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT },
+ { "warp_pointer", setconfvalue, SWM_S_WARP_POINTER },
+ { "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
return;
/* force bar to be enabled due to exception */
- bar_enabled = 1;
+ bar_enabled = true;
va_start(ap, fmt);
_add_startup_exception(fmt, ap);
conf_load(const char *filename, int keymapping)
{
FILE *config;
- char *line = NULL, *cp, *optsub, *optval = NULL;
+ char *line = NULL, *cp, *ce, *optsub, *optval = NULL;
size_t linelen, lineno = 0;
- int wordlen, i, optidx;
+ int wordlen, i, optidx, count;
struct config_option *opt = NULL;
DNPRINTF(SWM_D_CONF, "conf_load: begin\n");
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;
cp += wordlen;
cp += strspn(cp, " \t\n"); /* eat whitespace */
- /* from here on out we call goto invalid to continue */
-
/* get [selector] if any */
optsub = NULL;
+ count = 0;
if (*cp == '[') {
- cp++;
- wordlen = strcspn(cp, "]");
- if (*cp != ']') {
- if (wordlen == 0) {
- add_startup_exception("%s: line %zd: "
- "syntax error", filename, lineno);
- goto invalid;
+ ++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) {
- add_startup_exception("%s: line %zd: "
- "unable to allocatememory for "
- "selector", filename, lineno);
- goto invalid;
- }
+ 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);
- goto invalid;
+ continue;
}
/* call function to deal with it all */
if (configopt[optidx].func(optsub, optval,
configopt[optidx].funcflags) != 0) {
add_startup_exception("%s: line %zd: invalid data for "
"%s", filename, lineno, configopt[optidx].optname);
- goto invalid;
- }
-invalid:
- if (optval) {
- free(optval);
- optval = NULL;
- }
- if (optsub) {
- free(optsub);
- optsub = NULL;
+ continue;
}
}
if (line)
free(line);
fclose(config);
+
+ if (mouse_button_move == mouse_button_resize) {
+ add_startup_exception("%s: move and resize mouse buttons match",
+ filename);
+ }
+
DNPRINTF(SWM_D_CONF, "conf_load: end\n");
return (0);
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, SWM_CK_ALL);
+ 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(struct ws_win *win)
+{
+ xcb_get_property_reply_t *gpr;
+ int ws_idx = -1;
+
+ if (win == NULL)
+ return -1;
+
+ gpr = xcb_get_property_reply(conn,
+ xcb_get_property(conn, 0, win->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 && !(win->quirks & SWM_Q_IGNORESPAWNWS))
+ ws_idx = get_swm_ws(win->id);
+
+ 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", win->id,
+ ws_idx);
+
+ return ws_idx;
+}
+
struct ws_win *
-manage_window(xcb_window_t id, uint16_t mapped)
+manage_window(xcb_window_t id, int spawn_pos, bool mapped)
{
- xcb_window_t trans = XCB_WINDOW_NONE;
struct ws_win *win, *ww;
- int ws_idx;
- char ws_idx_str[SWM_PROPLEN];
struct swm_region *r;
struct pid_e *p;
struct quirk *qp;
- uint32_t i, wa[2];
- 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, force_ws = -1;
+ 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, SWM_CK_ALL);
+ /* 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 - border_width;
- Y(win) = win->wa->y + win->wa->border_width - border_width;
- win->bordered = 1;
+ 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 = true;
win->mapped = mapped;
- win->floatmaxed = 0;
- win->ewmh_flags = 0;
win->s = r->s; /* this never changes */
+ 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,
xcb_icccm_get_wm_normal_hints(conn, win->id),
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;
+ /* Get WM_PROTOCOLS. */
+ get_wm_protocols(win);
+
+ /* Set initial quirks based on EWMH. */
+ ewmh_autoquirk(win);
+
+ /* Determine initial quirks. */
+ xcb_icccm_get_wm_class_reply(conn,
+ xcb_icccm_get_wm_class(conn, win->id),
+ &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 = true;
+ }
+
+ 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: %#x, ws: %d\n", qp->class,
+ qp->instance, qp->name, qp->quirk, qp->ws);
+ win->quirks = qp->quirk;
+ if (qp->ws >= 0 && qp->ws < workspace_limit)
+ force_ws = qp->ws;
}
- xcb_icccm_get_wm_protocols_reply_wipe(&wpr);
}
- win->iconic = get_swm_iconic(win);
+ 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_Subtract, XCB_MOD_MASK_SHIFT);
+ for (i = 0; i < SWM_MAX_FONT_STEPS; i++)
+ fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT);
+ }
/* Figure out which workspace the window belongs to. */
- if ((p = find_pid(window_get_pid(win->id))) != NULL) {
+ if (!(win->quirks & SWM_Q_IGNOREPID) &&
+ (p = find_pid(window_get_pid(win->id))) != NULL) {
win->ws = &r->s->ws[p->ws];
TAILQ_REMOVE(&pidlist, p, entry);
free(p);
p = NULL;
- } else if ((ws_idx = get_ws_idx(win->id)) != -1 &&
- !win->transient) {
+ } else if ((ws_idx = get_ws_idx(win)) != -1 &&
+ !TRANS(win)) {
/* _SWM_WS is set; use that. */
win->ws = &r->s->ws[ws_idx];
} else if (trans && (ww = find_window(trans)) != NULL) {
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);
- }
-
- /* WS must already be set for this to work. */
- store_float_geom(win);
-
- /* Handle EWMH */
- ewmh_autoquirk(win);
+ if (force_ws != -1)
+ win->ws = &r->s->ws[force_ws];
- /* Determine initial quirks. */
- if (xcb_icccm_get_wm_class_reply(conn,
- xcb_icccm_get_wm_class(conn, win->id),
- &win->ch, NULL)) {
- DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n",
- win->ch.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;
- }
-
- 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;
- win->quirks = qp->quirk;
- }
- }
- }
+ /* 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);
- /* Alter window position if quirky */
- if (win->quirks & SWM_Q_ANYWHERE)
- win->manual = 1;
+ /* Remove any _SWM_WS now that we set _NET_WM_DESKTOP. */
+ xcb_delete_property(conn, win->id, a_swm_ws);
- /* 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_Subtract, XCB_MOD_MASK_SHIFT);
- for (i = 0; i < SWM_MAX_FONT_STEPS; i++)
- fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT);
- }
+ /* WS must already be set for this to work. */
+ store_float_geom(win);
/* Make sure window is positioned inside its region, if its active. */
if (win->ws->r) {
update_window(win);
}
- /* 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);
-
out:
- /* Figure out where to stack the window in the workspace. */
+ /* Figure out where to insert the window in the workspace list. */
if (trans && (ww = find_window(trans)))
TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry);
- else if (win->ws->focus && spawn_position == SWM_STACK_ABOVE)
+ else if (win->ws->focus && spawn_pos == SWM_STACK_ABOVE)
TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win,
entry);
- else if (win->ws->focus && spawn_position == SWM_STACK_BELOW)
+ else if (win->ws->focus && spawn_pos == SWM_STACK_BELOW)
TAILQ_INSERT_BEFORE(win->ws->focus, win, entry);
- else switch (spawn_position) {
+ else switch (spawn_pos) {
default:
case SWM_STACK_TOP:
case SWM_STACK_ABOVE:
TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry);
}
- /* Get initial _NET_WM_STATE */
- ewmh_get_win_state(win);
+ ewmh_update_client_list();
+
+ TAILQ_INSERT_HEAD(&win->ws->stack, win, stack_entry);
+ lower_window(win);
+
+ /* 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);
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;
}
+ 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 = get_screen_count();
for (i = 0; i < num_screens; i++)
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: window: 0x%x, mode: %s(%u), "
+ 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: keysym: %u, win (x,y): 0x%x (%d,%d), "
- "detail: %u, time: %u, root (x,y): 0x%x (%d,%d), child: 0x%x, "
+ 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));
struct ws_win *win = NULL;
struct swm_region *r, *old_r;
int i;
- int handled = 0;
+ bool handled = false;
- DNPRINTF(SWM_D_EVENT, "buttonpress: win (x,y): 0x%x (%d,%d), "
- "detail: %u, time: %u, root (x,y): 0x%x (%d,%d), child: 0x%x, "
+ 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));
/* Clear bar since empty. */
bar_draw();
- handled = 1;
+ handled = true;
goto out;
}
}
buttons[i].button == e->detail &&
CLEANMASK(buttons[i].mask) == CLEANMASK(e->state)) {
buttons[i].func(win, &buttons[i].args);
- handled = 1;
+ handled = true;
}
out:
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);
{
struct ws_win *win;
struct swm_region *r = NULL;
- int new = 0, i = 0;
- uint16_t mask = 0;
+ int i = 0;
uint32_t wc[7] = {0};
+ uint16_t mask = 0;
+ bool new = false;
if ((win = find_window(e->window)) == NULL)
if ((win = find_unmanaged_window(e->window)) == NULL)
- new = 1;
+ new = true;
#ifdef SWM_DEBUG
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);
xcb_configure_window(conn, e->window, mask, wc);
xcb_flush(conn);
}
- } else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) &&
- !(win->ewmh_flags & EWMH_F_FULLSCREEN)) {
+ } 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)
if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT)
win->g_float.h = e->height;
- win->g_floatvalid = 1;
+ win->g_floatvalid = true;
- if (win->floating && r && (win->transient ||
- win->ws->cur_layout != &layouts[SWM_MAX_STACK])) {
+ 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;
- if (r) {
- stack_floater(win, r);
+ if (r != NULL) {
+ update_floater(win);
focus_flush();
+ } else {
+ config_win(win, e);
+ xcb_flush(conn);
}
} else {
config_win(win, e);
{
struct ws_win *win;
- DNPRINTF(SWM_D_EVENT, "configurenotify: win 0x%x, event win: 0x%x, "
- "(x,y) WxH: (%d,%d) %ux%u, border: %u, above_sibling: 0x%x, "
+ 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));
{
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)
struct ws_win *win;
struct swm_region *r;
- DNPRINTF(SWM_D_FOCUS, "enternotify: time: %u, win (x,y): 0x%x "
- "(%d,%d), mode: %s(%d), detail: %s(%d), root (x,y): 0x%x (%d,%d), "
- "child: 0x%x, same_screen_focus: %s, state: %d\n",
+ 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,
return;
}
+ if (focus_mode != SWM_FOCUS_FOLLOW &&
+ e->mode == XCB_NOTIFY_MODE_UNGRAB) {
+ DNPRINTF(SWM_D_EVENT, "enternotify: ungrab; ignoring.\n");
+ return;
+ }
+
last_event_time = e->time;
if ((win = find_window(e->event)) == NULL) {
return;
}
} else {
+ if (e->mode == XCB_NOTIFY_MODE_NORMAL &&
+ e->detail == XCB_NOTIFY_DETAIL_INFERIOR) {
+ DNPRINTF(SWM_D_EVENT, "enternotify: entering from "
+ "inferior; ignoring\n");
+ return;
+ }
+
focus_win(get_focus_magic(win));
}
void
leavenotify(xcb_leave_notify_event_t *e)
{
- DNPRINTF(SWM_D_FOCUS, "leavenotify: time: %u, win (x,y): 0x%x "
- "(%d,%d), mode: %s(%d), detail: %s(%d), root (x,y): 0x%x (%d,%d), "
- "child: 0x%x, same_screen_focus: %s, state: %d\n",
+ 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,
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, 1);
+ if ((win = manage_window(e->window, spawn_position, true)) == NULL)
+ return;
+ ws = win->ws;
- win->mapped = 1;
+ /* 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 = true;
set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) {
- if (win->ws->focus_pending == win) {
+ if (ws->focus_pending == win) {
focus_win(win);
- win->ws->focus_pending = NULL;
+ ws->focus_pending = NULL;
+ center_pointer(win->ws->r);
focus_flush();
}
}
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
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, spawn_position,
(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->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->ch.class_name &&
win->ch.class_name &&
- !strcmp(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))
+ strcmp(w->ch.instance_name,
+ win->ch.instance_name) == 0)
break;
}
}
void
motionnotify(xcb_motion_notify_event_t *e)
{
- struct swm_region *r;
+ struct swm_region *r = NULL;
int i, num_screens;
- DNPRINTF(SWM_D_FOCUS, "motionnotify: time: %u, win (x,y): 0x%x "
- "(%d,%d), detail: %s(%d), root (x,y): 0x%x (%d,%d), "
- "child: 0x%x, same_screen_focus: %s, state: %d\n",
+ 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,
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.
char *name;
name = get_atom_name(e->atom);
- DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%x, atom: %s(%u), "
+ 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);
last_event_time = e->time;
- if (e->atom == a_swm_iconic) {
- if (e->state == XCB_PROPERTY_NEW_VALUE) {
- if (focus_mode != SWM_FOCUS_FOLLOW)
- ws->focus_pending = get_focus_prev(win);
-
- unfocus_win(win);
- unmap_window(win);
-
- if (ws->r) {
- stack();
-
- if (focus_mode != SWM_FOCUS_FOLLOW &&
- WS_FOCUSED(ws)) {
- if (ws->focus_pending) {
- focus_win(ws->focus_pending);
- ws->focus_pending = NULL;
- } else {
- xcb_set_input_focus(conn,
- XCB_INPUT_FOCUS_PARENT,
- ws->r->id,
- XCB_CURRENT_TIME);
- }
- }
-
- focus_flush();
- }
- } else if (e->state == XCB_PROPERTY_DELETE) {
- /* The window is no longer iconic, restack ws. */
- if (focus_mode != SWM_FOCUS_FOLLOW)
- ws->focus_pending = get_focus_magic(win);
-
- stack();
-
- /* Flush EnterNotify for mapnotify, if needed. */
- focus_flush();
- }
- } else if (e->atom == a_state) {
+ 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)) {
} 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);
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);
/* If we aren't managing the window, then ignore. */
win = find_window(e->window);
if (win == NULL || win->id != e->window)
return;
- ws = win->ws;
-
- if (getstate(e->window) != XCB_ICCCM_WM_STATE_ICONIC)
- set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
-
- if (win->mapped) {
- /* window unmapped itself */
- /* do unmap/unfocus/restack and unmanage */
- win->mapped = 0;
+ /* Do nothing if already withdrawn. */
+ if (!win->mapped && !ICONIC(win))
+ return;
- /* 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: 0x%x\n",
- WINID(ws->focus_pending));
- }
+ ws = win->ws;
+ win->mapped = false;
- unfocus_win(win);
+ /* 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();
+ if (ws->r)
+ stack();
- 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);
- }
+ /* 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 (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL)
- set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
-
+ center_pointer(ws->r);
focus_flush();
}
-#if 0
-void
-visibilitynotify(xcb_visibility_notify_event_t *e)
+#ifdef SWM_DEBUG
+char *
+get_source_type_label(uint32_t type)
{
- DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%x\n",
- e->window);
+ char *label;
+
+ switch (type) {
+ case EWMH_SOURCE_TYPE_NONE:
+ label = "None";
+ break;
+ case EWMH_SOURCE_TYPE_NORMAL:
+ label = "Normal";
+ break;
+ case EWMH_SOURCE_TYPE_OTHER:
+ label = "Other";
+ break;
+ default:
+ label = "Invalid";
+ }
+
+ return label;
}
#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. */
}
if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) {
- DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW\n");
- if (WS_FOCUSED(win->ws))
- focus_win(win);
- else
- win->ws->focus_pending = win;
- }
- if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) {
+ DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW, "
+ "source_type: %s(%d)\n",
+ get_source_type_label(e->data.data32[0]),
+ e->data.data32[0]);
+
+ /*
+ * Allow focus changes that are a result of direct user
+ * action and from applications that use the old EWMH spec.
+ */
+ if (e->data.data32[0] != EWMH_SOURCE_TYPE_NORMAL ||
+ win->quirks & SWM_Q_OBEYAPPFOCUSREQ) {
+ 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, 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], true);
+
+ /* 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();
+ }
}
focus_flush();
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);
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];
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;
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
-scan_xrandr(int i)
+scan_randr(int idx)
{
#ifdef SWM_XRR_HAS_CRTC
int c;
xcb_randr_crtc_t *crtc;
xcb_screen_t *screen;
- DNPRINTF(SWM_D_MISC, "scan_xrandr: screen: %d\n", i);
+ DNPRINTF(SWM_D_MISC, "scan_randr: screen: %d\n", idx);
- if ((screen = get_screen(i)) == NULL)
- errx(1, "ERROR: can't get screen %d.", i);
+ if ((screen = get_screen(idx)) == NULL)
+ errx(1, "ERROR: can't get screen %d.", idx);
num_screens = get_screen_count();
- if (i >= num_screens)
- errx(1, "scan_xrandr: invalid screen");
+ if (idx >= num_screens)
+ errx(1, "scan_randr: invalid screen");
/* remove any old regions */
- while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) {
+ while ((r = TAILQ_FIRST(&screens[idx].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);
+ TAILQ_REMOVE(&screens[idx].rl, r, entry);
+ TAILQ_INSERT_TAIL(&screens[idx].orl, r, entry);
}
outputs = 0;
/* map virtual screens onto physical screens */
#ifdef SWM_XRR_HAS_CRTC
- if (xrandr_support) {
+ if (randr_support) {
src = xcb_randr_get_screen_resources_current(conn,
- screens[i].root);
+ screens[idx].root);
srr = xcb_randr_get_screen_resources_current_reply(conn, src,
NULL);
if (srr == NULL) {
- new_region(&screens[i], 0, 0,
+ new_region(&screens[idx], 0, 0,
screen->width_in_pixels,
screen->height_in_pixels);
goto out;
}
if (cir->mode == 0)
- new_region(&screens[i], 0, 0,
+ new_region(&screens[idx], 0, 0,
screen->width_in_pixels,
screen->height_in_pixels);
else
- new_region(&screens[i],
+ new_region(&screens[idx],
cir->x, cir->y, cir->width, cir->height);
free(cir);
}
#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,
+ if (TAILQ_EMPTY(&screens[idx].rl))
+ new_region(&screens[idx], 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(r, &screens[idx].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;
+ if (screens[idx].r_focus == r)
+ screens[idx].r_focus = NULL;
}
- DNPRINTF(SWM_D_MISC, "scan_xrandr: done.\n");
+ DNPRINTF(SWM_D_MISC, "scan_randr: 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 = get_screen_count();
/* silly event doesn't include the screen index */
errx(1, "screenchange: screen not found");
/* brute force for now, just re-enumerate the regions */
- scan_xrandr(i);
+ scan_randr(i);
#ifdef SWM_DEBUG
print_win_geom(e->root);
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)
{
struct swm_region *r = NULL;
- xcb_window_t *wins = NULL, trans;
- int no;
- int i, j, num_screens;
- uint16_t state, manage, mapped;
+ xcb_window_t *wins = NULL, trans, *cwins = NULL;
+ int i, j, k, n, no, num_screens;
+ uint8_t state;
+ bool manage, mapped;
xcb_query_tree_cookie_t qtc;
xcb_query_tree_reply_t *qtr;
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 = 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");
"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;
}
}
gac = xcb_get_window_attributes(conn, wins[j]);
gar = xcb_get_window_attributes_reply(conn, gac, NULL);
- if (!gar) {
+ if (gar == NULL) {
DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
"doesn't exist.\n", wins[j]);
continue;
continue;
}
- state = getstate(wins[j]);
+ state = get_win_state(wins[j]);
manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
- mapped = gar->map_state != XCB_MAP_STATE_UNMAPPED;
+ mapped = gar->map_state == XCB_MAP_STATE_VIEWABLE;
if (mapped || manage)
- manage_window(wins[j], mapped);
+ manage_window(wins[j], SWM_STACK_TOP, mapped);
free(gar);
}
/* transient windows */
for (j = 0; j < no; j++) {
gac = xcb_get_window_attributes(conn, wins[j]);
gar = xcb_get_window_attributes_reply(conn, gac, NULL);
- if (!gar) {
+ if (gar == NULL) {
DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
"doesn't exist.\n", wins[j]);
continue;
continue;
}
- state = getstate(wins[j]);
+ state = get_win_state(wins[j]);
manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
- mapped = gar->map_state != XCB_MAP_STATE_UNMAPPED;
+ 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,
&trans, NULL) && manage)
- manage_window(wins[j], mapped);
+ manage_window(wins[j], SWM_STACK_TOP, mapped);
free(gar);
}
free(qtr);
err(1, "setup_screens: calloc: failed to allocate memory for "
"screens");
- /* initial Xrandr setup */
- xrandr_support = 0;
+ /* Initial RandR setup. */
+ randr_support = false;
qep = xcb_get_extension_data(conn, &xcb_randr_id);
if (qep->present) {
c = xcb_randr_query_version(conn, 1, 1);
r = xcb_randr_query_version_reply(conn, c, NULL);
if (r) {
if (r->major_version >= 1) {
- xrandr_support = 1;
- xrandr_eventbase = qep->first_event;
+ randr_support = true;
+ randr_eventbase = qep->first_event;
}
free(r);
}
screens[i].root = screen->root;
/* set default colors */
- 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,
+ setscreencolor("red", i, SWM_S_COLOR_FOCUS);
+ setscreencolor("rgb:88/88/88", i, SWM_S_COLOR_UNFOCUS);
+ setscreencolor("rgb:00/80/80", i, SWM_S_COLOR_BAR_BORDER);
+ setscreencolor("rgb:00/40/40", i,
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);
+ setscreencolor("black", i, SWM_S_COLOR_BAR);
+ setscreencolor("rgb:a0/a0/a0", i, SWM_S_COLOR_BAR_FONT);
+ setscreencolor("red", i, SWM_S_COLOR_FOCUS_MAXIMIZED);
+ setscreencolor("rgb:88/88/88", i,
+ SWM_S_COLOR_UNFOCUS_MAXIMIZED);
/* create graphics context on screen */
screens[i].bar_gc = xcb_generate_id(conn);
ws = &screens[i].ws[j];
ws->idx = j;
ws->name = NULL;
- ws->bar_enabled = 1;
+ ws->bar_enabled = true;
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);
ws->cur_layout->l_string(ws);
}
- scan_xrandr(i);
+ scan_randr(i);
- if (xrandr_support)
+ if (randr_support)
xcb_randr_select_input(conn, screens[i].root,
XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE);
}
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_utf8_string = get_atom_from_string("UTF8_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 = get_screen_count();
- 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,
- ewmh[_NET_WM_NAME].atom, a_utf8_string, 8, strlen("LG3D"),
- "LG3D");
- }
-}
-
void
shutdown_cleanup(void)
{
- int i, num_screens;
+ int i, num_screens;
/* disable alarm because the following code may not be interrupted */
alarm(0);
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)
+ if (!bar_font_legacy) {
XftColorFree(display, DefaultVisual(display, i),
DefaultColormap(display, i), &bar_font_color);
+ XftColorFree(display, DefaultVisual(display, i),
+ DefaultColormap(display, i), &search_font_color);
+ }
}
if (bar_font_legacy)
void
event_handle(xcb_generic_event_t *evt)
{
- uint8_t type = XCB_EVENT_RESPONSE_TYPE(evt);
+ uint8_t type = XCB_EVENT_RESPONSE_TYPE(evt);
DNPRINTF(SWM_D_EVENT, "XCB Event: %s(%d), seq %u\n",
xcb_event_get_label(XCB_EVENT_RESPONSE_TYPE(evt)),
/*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)
+ if (type - randr_eventbase == XCB_RANDR_SCREEN_CHANGE_NOTIFY)
screenchange((void *)evt);
}
struct swm_region *r;
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
- int xfd, i, num_screens, startup = 1;
+ int xfd, i, num_screens;
struct sigaction sact;
xcb_generic_event_t *evt;
- struct timeval tv;
- fd_set rd;
- int rd_max;
- int stdin_ready = 0;
int num_readable;
+ struct pollfd pfd[2];
+ bool stdin_ready = false, startup = true;
/* suppress unused warning since var is needed */
(void)argc;
+#ifdef SWM_DEBUG
time_started = time(NULL);
+#endif
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. */
setup_globals();
setup_screens();
+ setup_ewmh();
setup_keys();
setup_quirks();
setup_spawn();
validate_spawns();
- setup_ewmh();
- /* set some values to work around bad programs */
- workaround();
- /* grab existing windows (before we build the bars) */
- grab_windows();
-
if (getenv("SWM_STARTED") == NULL)
setenv("SWM_STARTED", "YES", 1);
TAILQ_FOREACH(r, &screens[i].rl, entry)
bar_setup(r);
+ /* Manage existing windows. */
+ grab_windows();
+
grabkeys();
stack();
bar_draw();
xcb_ungrab_server(conn);
xcb_flush(conn);
- rd_max = xfd > STDIN_FILENO ? xfd : STDIN_FILENO;
+ /* 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;
+
+ memset(&pfd, 0, sizeof(pfd));
+ pfd[0].fd = xfd;
+ pfd[0].events = POLLIN;
+ pfd[1].fd = STDIN_FILENO;
+ pfd[1].events = POLLIN;
while (running) {
while ((evt = xcb_poll_for_event(conn))) {
/* If just (re)started, set default focus if needed. */
if (startup) {
- startup = 0;
+ startup = false;
if (focus_mode != SWM_FOCUS_FOLLOW) {
r = TAILQ_FIRST(&screens[0].rl);
}
}
- FD_ZERO(&rd);
-
- if (bar_extra)
- FD_SET(STDIN_FILENO, &rd);
-
- FD_SET(xfd, &rd);
- tv.tv_sec = 1;
- tv.tv_usec = 0;
- 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;
+ num_readable = poll(pfd, bar_extra ? 2 : 1, 1000);
+ if (num_readable == -1) {
+ DNPRINTF(SWM_D_MISC, "poll failed: %s", strerror(errno));
+ } else if (num_readable > 0 && bar_extra && pfd[1].revents & POLLIN) {
+ stdin_ready = true;
}
if (restart_wm)
goto done;
if (stdin_ready) {
- stdin_ready = 0;
+ stdin_ready = false;
bar_extra_update();
}