#include <pwd.h>
#include <regex.h>
#include <signal.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#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);
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 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 *);
"NOFOCUSONMAP",
"FOCUSONMAP_SINGLE",
"OBEYAPPFOCUSREQ",
+ "IGNOREPID",
+ "IGNORESPAWNWS",
};
/* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */
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);
}
}
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;
/* 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);
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;
+ }
+
+ /* 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:
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;
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;
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);
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;
/* 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();
}