#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
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;
/* dmenu search */
struct swm_region *search_r;
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 iconic_enabled = 0;
-int urgent_enabled = 0;
+bool stack_enabled = true;
+bool clock_enabled = true;
+bool iconic_enabled = false;
+bool urgent_enabled = false;
+bool urgent_collapse = false;
char *clock_format = NULL;
-int window_class_enabled = 0;
-int window_instance_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 java_workaround = 1;
-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 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 mapped;
- int bordered;
+ 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_size_hints_t sh;
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 */
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;
};
regex_t regex_class;
regex_t regex_instance;
regex_t regex_name;
- unsigned long quirk;
+ 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_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. */
};
TAILQ_HEAD(quirk_list, quirk);
struct quirk_list quirks = TAILQ_HEAD_INITIALIZER(quirks);
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 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(const char *);
char *get_win_name(xcb_window_t);
uint8_t get_win_state(xcb_window_t);
void get_wm_protocols(struct ws_win *);
-int get_ws_idx(xcb_window_t);
+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, int);
+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 name_workspace(struct swm_region *, union arg *);
void new_region(struct swm_screen *, int, int, int, int);
int parsekeys(const char *, unsigned int, unsigned int *, KeySym *);
-int parsequirks(const char *, unsigned long *);
+int 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 *);
#endif
void propertynotify(xcb_property_notify_event_t *);
void quirk_free(struct quirk *);
-void quirk_insert(const char *, const char *, const char *,unsigned long);
+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 *, const char *,
- unsigned long);
+ 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 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 setkeybinding(unsigned int, KeySym, enum keyfuncid, const char *);
int setkeymapping(const char *, const char *, int);
int setlayout(const char *, const char *, int);
-void setquirk(const char *, const char *, const char *,unsigned long);
+void 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 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_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 *);
int validate_win(struct ws_win *);
int validate_ws(struct workspace *);
void version(struct swm_region *, union arg *);
-void win_to_ws(struct ws_win *, int, int);
+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 update_ws_stack(struct workspace *);
&wpr, NULL)) {
for (i = 0; i < (int)wpr.atoms_len; i++) {
if (wpr.atoms[i] == a_takefocus)
- win->take_focus = 1;
+ win->take_focus = true;
if (wpr.atoms[i] == a_delete)
- win->can_delete = 1;
+ win->can_delete = true;
}
xcb_icccm_get_wm_protocols_reply_wipe(&wpr);
}
bar_pid = 0;
}
strlcpy(bar_ext, "", sizeof bar_ext);
- bar_extra = 0;
+ bar_extra = false;
}
void
{
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++)
&hints, NULL) == 0)
continue;
if (hints.flags & XCB_ICCCM_WM_HINT_X_URGENCY)
- urgent[j] = 1;
+ 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);
+ }
}
}
{
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;
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);
}
int
-count_win(struct workspace *ws, int count_transient)
+count_win(struct workspace *ws, bool count_transient)
{
struct ws_win *win;
int count = 0;
xcb_map_window(conn, win->id);
set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
- win->mapped = 1;
+ win->mapped = true;
}
void
xcb_unmap_window(conn, win->id);
set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
- win->mapped = 0;
+ win->mapped = false;
}
void
return win;
}
+void
+center_pointer(struct swm_region *r)
+{
+ struct ws_win *win;
+
+ if (!warp_pointer || r == NULL)
+ return;
+
+ win = r->ws->focus;
+ 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)
{
}
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;
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 *gifr;
map_window(parent);
/* Map siblings next. */
- TAILQ_FOREACH(w, &ws->winlist, entry)
+ TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry,
+ tmpw)
if (w != win && !ICONIC(w) &&
- win->transient == parent->id)
+ w->transient == parent->id) {
+ raise_window(w);
map_window(w);
+ }
}
/* Map focused window. */
raise_window(win);
map_window(win);
- /* Finally, map children of focus window. */
- TAILQ_FOREACH(w, &ws->winlist, entry)
- if (w->transient == win->id && !ICONIC(w))
+ /* 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.
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;
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;
ewmh_update_current_desktop();
+ center_pointer(r);
focus_flush();
new_ws->state = SWM_WS_STATE_MAPPED;
{
union arg a;
struct swm_screen *s = r->s;
- int cycle_all = 0;
- int mv = 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:
- mv = 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:
- mv = 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;
return;
focus_region(rr);
+ center_pointer(rr);
focus_flush();
DNPRINTF(SWM_D_FOCUS, "focusrg: done\n");
}
return;
focus_region(rr);
+ center_pointer(rr);
focus_flush();
DNPRINTF(SWM_D_FOCUS, "cyclerg: done\n");
}
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 && 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 &&
- (ICONIC(winfocus) || 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)));
break;
case SWM_ARG_ID_FOCUSNEXT:
if (cur_focus == NULL)
winfocus = TAILQ_FIRST(wl);
if (winfocus == cur_focus)
break;
- } while (winfocus != NULL &&
- (ICONIC(winfocus) || 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)));
break;
case SWM_ARG_ID_FOCUSMAIN:
if (cur_focus == NULL)
stack();
focus_win(get_focus_magic(winfocus));
+ center_pointer(r);
focus_flush();
out:
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;
+ 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,
DNPRINTF(SWM_D_MISC, "update_floater: win %#x\n", win->id);
- win->bordered = 1;
+ win->bordered = true;
if (FULLSCREEN(win)) {
/* _NET_WM_FULLSCREEN: fullscreen without border. */
store_float_geom(win);
win->g = r->g;
- win->bordered = 0;
+ win->bordered = false;
} else if (MAXIMIZED(win)) {
/* Maximize: like a single stacked window. */
if (!win->g_floatvalid)
Y(win) += bar_height;
HEIGHT(win) -= bar_height;
} else if (disable_border) {
- win->bordered = 0;
+ win->bordered = false;
}
if (win->bordered) {
if ((win->quirks & SWM_Q_FULLSCREEN) &&
WIDTH(win) >= WIDTH(r) && HEIGHT(win) >= HEIGHT(r)) {
/* Remove border for FULLSCREEN quirk. */
- win->bordered = 0;
+ win->bordered = false;
} else if (!MANUAL(win)) {
if (TRANS(win) && (win->quirks & SWM_Q_TRANSSZ)) {
/* Adjust size on TRANSSZ quirk. */
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;
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));
/* Prepare tiling variables, if needed. */
- if ((winno = count_win(ws, 0)) > 0) {
+ if ((winno = count_win(ws, false)) > 0) {
/* Find first tiled window. */
TAILQ_FOREACH(win, &ws->winlist, entry)
if (!FLOATING(win) && !ICONIC(win))
if (disable_border && !(bar_enabled && ws->bar_enabled) &&
winno == 1){
- bordered = 0;
+ 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;
}
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. */
HEIGHT(w) != gg.h) {
w->g = gg;
if (bar_enabled && ws->bar_enabled){
- w->bordered = 1;
+ w->bordered = true;
} else {
- w->bordered = 0;
+ w->bordered = false;
WIDTH(w) += 2 * border_width;
HEIGHT(w) += 2 * border_width;
}
}
}
- if (TRANS(win)) {
- parent = find_window(win->transient);
+ /* If transient, stack parent and its children. */
+ if (TRANS(win) && (parent = find_window(win->transient))) {
raise_window(parent);
- TAILQ_FOREACH(w, &ws->stack, stack_entry)
+ TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw)
if (w->transient == parent->id)
raise_window(w);
}
+ /* Make sure focus window is on top. */
raise_window(win);
- TAILQ_FOREACH(w, &ws->stack, stack_entry)
+ /* Stack any children of focus window. */
+ TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw)
if (w->transient == win->id)
raise_window(w);
if (win->ws->idx == wsid)
return;
- win_to_ws(win, wsid, 1);
+ win_to_ws(win, wsid, true);
/* Set new focus on target ws. */
if (focus_mode != SWM_FOCUS_FOLLOW) {
}
}
+ 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;
if (w == w->ws->focus)
focus_win(w);
+ center_pointer(r);
focus_flush();
DNPRINTF(SWM_D_MISC, "floating_toggle: done\n");
}
struct swm_region *r = NULL;
struct swm_geometry g;
int resize_stp = 0;
- int top = 0, left = 0, resizing;
+ 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;
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;
if (clear_maximized(r->ws) > 0)
stack();
- win_to_ws(win, r->ws->idx, 0);
+ win_to_ws(win, r->ws->idx, false);
/* Set focus on new ws. */
unfocus_win(r->ws->focus);
{
struct swm_region *r;
xcb_timestamp_t timestamp = 0;
- int move_stp = 0, moving, restack = 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 (!(ABOVE(win) || TRANS(win)) || MAXIMIZED(win)) {
store_float_geom(win);
- restack = 1;
+ restack = true;
}
ewmh_apply_flags(win, (win->ewmh_flags | SWM_F_MANUAL | EWMH_F_ABOVE) &
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;
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]);
/* Argument tokenizer. */
char *
argsep(char **sp) {
- int single_quoted = 0, double_quoted = 0;
char *arg, *cp, *next;
+ bool single_quoted = false, double_quoted = false;
if (*sp == NULL)
return NULL;
"NOFOCUSONMAP",
"FOCUSONMAP_SINGLE",
"OBEYAPPFOCUSREQ",
+ "IGNOREPID",
+ "IGNORESPAWNWS",
};
-/* 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(const char *qstr, unsigned long *quirk)
+parsequirks(const char *qstr, uint32_t *quirk, int *ws)
{
char *str, *cp, *name;
int i;
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) == 0) {
void
quirk_insert(const char *class, const char *instance, const char *name,
- unsigned long quirk)
+ uint32_t quirk, int ws)
{
struct quirk *qp;
- int failed = 0;
char *str;
+ bool failed = false;
DNPRINTF(SWM_D_QUIRK, "quirk_insert: class: %s, instance: %s, name: %s,"
- " value: %lu\n", class, instance, name, quirk);
+ " value: %u, ws: %d\n", class, instance, name, quirk, ws);
if ((qp = malloc(sizeof *qp)) == NULL)
err(1, "quirk_insert: malloc");
if (regcomp(&qp->regex_class, str, REG_EXTENDED | REG_NOSUB)) {
add_startup_exception("regex failed to compile quirk 'class' "
"field: %s", class);
- failed = 1;
+ failed = true;
}
DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str);
free(str);
if (regcomp(&qp->regex_instance, str, REG_EXTENDED | REG_NOSUB)) {
add_startup_exception("regex failed to compile quirk 'instance'"
" field: %s", instance);
- failed = 1;
+ failed = true;
}
DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str);
free(str);
if (regcomp(&qp->regex_name, str, REG_EXTENDED | REG_NOSUB)) {
add_startup_exception("regex failed to compile quirk 'name' "
"field: %s", name);
- failed = 1;
+ failed = true;
}
DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str);
free(str);
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);
void
quirk_replace(struct quirk *qp, const char *class, const char *instance,
- const char *name, unsigned long quirk)
+ const char *name, uint32_t quirk, int ws)
{
- DNPRINTF(SWM_D_QUIRK, "quirk_replace: %s:%s:%s [%lu]\n", qp->class,
- qp->instance, 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, instance, name, quirk);
+ quirk_insert(class, instance, name, quirk, ws);
DNPRINTF(SWM_D_QUIRK, "quirk_replace: leave\n");
}
void
setquirk(const char *class, const char *instance, const char *name,
- unsigned long quirk)
+ uint32_t quirk, int ws)
{
struct quirk *qp;
- DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s:%s [%lu]\n", class,
- instance, 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) == 0 &&
strcmp(qp->instance, instance) == 0 &&
strcmp(qp->name, name) == 0) {
- if (quirk == 0)
+ if (quirk == 0 && ws == -1)
quirk_remove(qp);
else
- quirk_replace(qp, class, instance, 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, instance, 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");
}
{
char *str, *cp, *class;
char *instance = NULL, *name = NULL;
- int retval, count = 0;
- unsigned long qrks;
+ int retval, count = 0, ws = -1;
+ uint32_t qrks;
/* suppress unused warning since var is needed */
(void)flags;
DNPRINTF(SWM_D_CONF, "setconfquirk: class: %s, instance: %s, "
"name: %s\n", class, instance, name);
- if ((retval = parsequirks(value, &qrks)) == 0)
- setquirk(class, instance, name, qrks);
+ 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_DEFAULT,
SWM_S_FOCUS_MODE,
SWM_S_ICONIC_ENABLED,
+ SWM_S_JAVA_WORKAROUND,
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_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,
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 (*b == '\0')
continue;
if (!isxlfd(b)) {
- bar_font_legacy = 0;
+ bar_font_legacy = false;
break;
}
}
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") == 0)
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") == 0)
errx(1, "focus_mode");
break;
case SWM_S_ICONIC_ENABLED:
- iconic_enabled = atoi(value);
+ iconic_enabled = (atoi(value) != 0);
+ break;
+ case SWM_S_JAVA_WORKAROUND:
+ java_workaround = (atoi(value) != 0);
break;
case SWM_S_REGION_PADDING:
region_padding = atoi(value);
/* 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_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);
+ window_class_enabled = (atoi(value) != 0);
break;
case SWM_S_WINDOW_INSTANCE_ENABLED:
- window_instance_enabled = atoi(value);
+ 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);
a.argv[argc] = NULL;
if ((pid = fork()) == 0) {
- spawn(ws_id, &a, 1);
+ spawn(ws_id, &a, true);
/* NOTREACHED */
_exit(1);
}
int
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;
st = SWM_V_STACK;
else if (strcasecmp(s, "vertical_flip") == 0) {
st = SWM_V_STACK;
- f = 1;
+ f = true;
} else if (strcasecmp(s, "horizontal") == 0)
st = SWM_H_STACK;
else if (strcasecmp(s, "horizontal_flip") == 0) {
st = SWM_H_STACK;
- f = 1;
+ f = true;
} else if (strcasecmp(s, "fullscreen") == 0)
st = SWM_MAX_STACK;
else
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);
}
{ "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 },
{ "keyboard_mapping", setkeymapping, 0 },
{ "layout", setlayout, 0 },
{ "modkey", setconfmodkey, 0 },
{ "tile_gap", setconfvalue, SWM_S_TILE_GAP },
{ "title_class_enabled", setconfvalue, SWM_S_WINDOW_CLASS_ENABLED }, /* For backwards compat. */
{ "title_name_enabled", setconfvalue, SWM_S_WINDOW_INSTANCE_ENABLED }, /* For backwards compat. */
+ { "urgent_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 },
return;
/* force bar to be enabled due to exception */
- bar_enabled = 1;
+ bar_enabled = true;
va_start(ap, fmt);
_add_startup_exception(fmt, ap);
}
int
-get_ws_idx(xcb_window_t id)
+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, id, ewmh[_NET_WM_DESKTOP].atom,
+ xcb_get_property(conn, 0, win->id, ewmh[_NET_WM_DESKTOP].atom,
XCB_ATOM_CARDINAL, 0, 1),
NULL);
if (gpr) {
free(gpr);
}
- if (ws_idx == -1)
- if ((ws_idx = get_swm_ws(id)) != -1)
- xcb_delete_property(conn, id, a_swm_ws);
+ if (ws_idx == -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", id, ws_idx);
+ 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, int mapped)
+manage_window(xcb_window_t id, int spawn_pos, bool mapped)
{
struct ws_win *win, *ww;
struct swm_region *r;
xcb_get_geometry_reply_t *gr;
xcb_window_t trans = XCB_WINDOW_NONE;
uint32_t i, wa[2], new_flags;
- int ws_idx;
+ int ws_idx, force_ws = -1;
char *class, *instance, *name;
if ((win = find_window(id)) != NULL) {
HEIGHT(win) = gr->height;
X(win) = gr->x + gr->border_width - border_width;
Y(win) = gr->y + gr->border_width - border_width;
- win->bordered = 1;
+ win->bordered = true;
win->mapped = mapped;
win->s = r->s; /* this never changes */
/* Get WM_PROTOCOLS. */
get_wm_protocols(win);
- /* Figure out which workspace the window belongs to. */
- if ((p = find_pid(window_get_pid(win->id))) != NULL) {
- 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 &&
- !TRANS(win)) {
- /* _SWM_WS is set; use that. */
- win->ws = &r->s->ws[ws_idx];
- } else if (trans && (ww = find_window(trans)) != NULL) {
- /* Launch transients in the same ws as parent. */
- win->ws = ww->ws;
- } else {
- win->ws = r->ws;
- }
-
- /* 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);
-
- /* WS must already be set for this to work. */
- store_float_geom(win);
-
/* Set initial quirks based on EWMH. */
ewmh_autoquirk(win);
/* java is retarded so treat it special */
if (strstr(instance, "sun-awt")) {
DNPRINTF(SWM_D_CLASS, "manage_window: java window detected.\n");
- win->java = 1;
+ win->java = true;
}
TAILQ_FOREACH(qp, &quirks, entry) {
regexec(&qp->regex_instance, instance, 0, NULL, 0) == 0 &&
regexec(&qp->regex_name, name, 0, NULL, 0) == 0) {
DNPRINTF(SWM_D_CLASS, "manage_window: matched "
- "quirk: %s:%s:%s mask: %#lx\n", qp->class,
- qp->instance, qp->name, qp->quirk);
+ "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;
}
}
fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT);
}
+ /* Figure out which workspace the window belongs to. */
+ 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)) != -1 &&
+ !TRANS(win)) {
+ /* _SWM_WS is set; use that. */
+ win->ws = &r->s->ws[ws_idx];
+ } else if (trans && (ww = find_window(trans)) != NULL) {
+ /* Launch transients in the same ws as parent. */
+ win->ws = ww->ws;
+ } else {
+ win->ws = r->ws;
+ }
+
+ if (force_ws != -1)
+ win->ws = &r->s->ws[force_ws];
+
+ /* 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);
+
+ /* Remove any _SWM_WS now that we set _NET_WM_DESKTOP. */
+ xcb_delete_property(conn, win->id, a_swm_ws);
+
+ /* 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) {
region_containment(win, r, SWM_CW_ALLSIDES |
/* Figure out where to stack the window in the workspace. */
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:
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): %#x (%d,%d), "
"detail: %u, time: %u, root (x,y): %#x (%d,%d), child: %#x, "
/* 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:
{
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) {
if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT)
win->g_float.h = e->height;
- win->g_floatvalid = 1;
+ win->g_floatvalid = true;
if (!MAXIMIZED(win) && !FULLSCREEN(win) &&
(TRANS(win) || (ABOVE(win) &&
DNPRINTF(SWM_D_EVENT, "mapnotify: win %#x\n", e->window);
- if ((win = manage_window(e->window, 1)) == NULL)
+ if ((win = manage_window(e->window, spawn_position, true)) == NULL)
return;
ws = win->ws;
stack();
}
- win->mapped = 1;
+ win->mapped = true;
set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) {
if (ws->focus_pending == win) {
focus_win(win);
ws->focus_pending = NULL;
+ center_pointer(win->ws->r);
focus_flush();
}
}
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;
return;
ws = win->ws;
- win->mapped = 0;
+ win->mapped = false;
/* If win was focused, make sure to focus on something else. */
if (win == ws->focus) {
}
}
+ center_pointer(ws->r);
focus_flush();
}
DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_WM_DESKTOP\n");
r = win->ws->r;
- win_to_ws(win, e->data.data32[0], 1);
+ 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) {
}
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
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);
{
struct swm_region *r = NULL;
xcb_window_t *wins = NULL, trans, *cwins = NULL;
- int i, j, k, n, no, num_screens, manage, mapped;
+ 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;
manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
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 */
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);
}
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->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);
}
void
shutdown_cleanup(void)
{
- int i, num_screens;
+ int i, num_screens;
/* disable alarm because the following code may not be interrupted */
alarm(0);
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_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;
+ 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 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);
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;
+ stdin_ready = true;
}
if (restart_wm)
goto done;
if (stdin_ready) {
- stdin_ready = 0;
+ stdin_ready = false;
bar_extra_update();
}