#include <util.h>
#include <X11/cursorfont.h>
#include <X11/extensions/Xrandr.h>
+#include <X11/Xcursor/Xcursor.h>
#include <X11/Xft/Xft.h>
#include <X11/Xlib-xcb.h>
#include <xcb/xcb_atom.h>
#define SWM_FOCUS_MANUAL (2)
#define SWM_CK_NONE 0
-#define SWM_CK_ALL 0x7
+#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_CONF_DEFAULT (0)
#define SWM_CONF_KEYMAPPING (1)
xcb_timestamp_t last_event_time = 0;
int outputs = 0;
int other_wm;
-int ss_enabled = 0;
int xrandr_support;
int xrandr_eventbase;
unsigned int numlockmask = 0;
char *bar_argv[] = { NULL, NULL };
int bar_pipe[2];
-unsigned char bar_ext[SWM_BAR_MAX];
+char bar_ext[SWM_BAR_MAX];
+char bar_ext_buf[SWM_BAR_MAX];
char bar_vertext[SWM_BAR_MAX];
int bar_version = 0;
-sig_atomic_t bar_alarm = 0;
-int bar_delay = 30;
int bar_enabled = 1;
int bar_border_width = 1;
int bar_at_bottom = 0;
-int bar_extra = 1;
-int bar_extra_running = 0;
+int bar_extra = 0;
int bar_verbose = 1;
int bar_height = 0;
int bar_justify = SWM_BAR_JUSTIFY_LEFT;
int spawn_position = SWM_STACK_TOP;
int disable_border = 0;
int border_width = 1;
+int region_padding = 0;
+int tile_gap = 0;
int verbose_layout = 0;
time_t time_started;
pid_t bar_pid;
char *bar_fonts;
XftColor bar_font_color;
struct passwd *pwd;
+char *startup_exception;
+unsigned int nr_exceptions = 0;
/* layout manager data */
struct swm_geometry {
/* virtual "screens" */
struct swm_region {
TAILQ_ENTRY(swm_region) entry;
+ xcb_window_t id;
struct swm_geometry g;
struct workspace *ws; /* current workspace on this region */
struct workspace *ws_prior; /* prior workspace on this region */
int idx; /* workspace index */
char *name; /* workspace name */
int always_raise; /* raise windows on focus */
+ int bar_enabled; /* bar visibility */
struct layout *cur_layout; /* current layout handlers */
struct ws_win *focus; /* may be NULL */
struct ws_win *focus_prev; /* may be NULL */
enum {
SWM_S_COLOR_BAR,
SWM_S_COLOR_BAR_BORDER,
+ SWM_S_COLOR_BAR_BORDER_UNFOCUS,
SWM_S_COLOR_BAR_FONT,
SWM_S_COLOR_FOCUS,
SWM_S_COLOR_UNFOCUS,
struct swm_region_list orl; /* list of old regions */
xcb_window_t root;
struct workspace ws[SWM_WS_MAX];
+ struct swm_region *r_focus;
/* colors */
struct {
#define SWM_ARG_ID_STACKINIT (31)
#define SWM_ARG_ID_CYCLEWS_UP (40)
#define SWM_ARG_ID_CYCLEWS_DOWN (41)
-#define SWM_ARG_ID_CYCLESC_UP (42)
-#define SWM_ARG_ID_CYCLESC_DOWN (43)
+#define SWM_ARG_ID_CYCLERG_UP (42)
+#define SWM_ARG_ID_CYCLERG_DOWN (43)
#define SWM_ARG_ID_CYCLEWS_UP_ALL (44)
#define SWM_ARG_ID_CYCLEWS_DOWN_ALL (45)
#define SWM_ARG_ID_STACKINC (50)
#define SWM_ARG_ID_MOVEDOWN (101)
#define SWM_ARG_ID_MOVELEFT (102)
#define SWM_ARG_ID_MOVERIGHT (103)
+#define SWM_ARG_ID_BAR_TOGGLE (110)
+#define SWM_ARG_ID_BAR_TOGGLE_WS (111)
char **argv;
};
{"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE},
};
+/* Cursors */
+enum {
+ XC_FLEUR,
+ XC_LEFT_PTR,
+ XC_BOTTOM_LEFT_CORNER,
+ XC_BOTTOM_RIGHT_CORNER,
+ XC_SIZING,
+ XC_TOP_LEFT_CORNER,
+ XC_TOP_RIGHT_CORNER,
+ XC_MAX
+};
+
+struct cursors {
+ char *name; /* Name used by Xcursor .*/
+ uint8_t cf_char; /* cursorfont index. */
+ xcb_cursor_t cid;
+} cursors[XC_MAX] = {
+ {"fleur", XC_fleur, XCB_CURSOR_NONE},
+ {"left_ptr", XC_left_ptr, XCB_CURSOR_NONE},
+ {"bottom_left_corner", XC_bottom_left_corner, XCB_CURSOR_NONE},
+ {"bottom_right_corner", XC_bottom_right_corner, XCB_CURSOR_NONE},
+ {"sizing", XC_sizing, XCB_CURSOR_NONE},
+ {"top_left_corner", XC_top_left_corner, XCB_CURSOR_NONE},
+ {"top_right_corner", XC_top_right_corner, XCB_CURSOR_NONE},
+};
+
+/* spawn */
+struct spawn_prog {
+ TAILQ_ENTRY(spawn_prog) entry;
+ char *name;
+ int argc;
+ char **argv;
+};
+TAILQ_HEAD(spawn_list, spawn_prog);
+struct spawn_list spawns = TAILQ_HEAD_INITIALIZER(spawns);
+
+/* user/key callable function IDs */
+enum keyfuncid {
+ KF_BAR_TOGGLE,
+ KF_BAR_TOGGLE_WS,
+ KF_BUTTON2,
+ KF_CYCLE_LAYOUT,
+ KF_FLIP_LAYOUT,
+ KF_FLOAT_TOGGLE,
+ KF_FOCUS_MAIN,
+ KF_FOCUS_NEXT,
+ KF_FOCUS_PREV,
+ KF_HEIGHT_GROW,
+ KF_HEIGHT_SHRINK,
+ KF_ICONIFY,
+ KF_MASTER_SHRINK,
+ KF_MASTER_GROW,
+ KF_MASTER_ADD,
+ KF_MASTER_DEL,
+ KF_MOVE_DOWN,
+ KF_MOVE_LEFT,
+ KF_MOVE_RIGHT,
+ KF_MOVE_UP,
+ KF_MVRG_1,
+ KF_MVRG_2,
+ KF_MVRG_3,
+ KF_MVRG_4,
+ KF_MVRG_5,
+ KF_MVRG_6,
+ KF_MVRG_7,
+ KF_MVRG_8,
+ KF_MVRG_9,
+ KF_MVWS_1,
+ KF_MVWS_2,
+ KF_MVWS_3,
+ KF_MVWS_4,
+ KF_MVWS_5,
+ KF_MVWS_6,
+ KF_MVWS_7,
+ KF_MVWS_8,
+ KF_MVWS_9,
+ KF_MVWS_10,
+ KF_MVWS_11,
+ KF_MVWS_12,
+ KF_MVWS_13,
+ KF_MVWS_14,
+ KF_MVWS_15,
+ KF_MVWS_16,
+ KF_MVWS_17,
+ KF_MVWS_18,
+ KF_MVWS_19,
+ KF_MVWS_20,
+ KF_MVWS_21,
+ KF_MVWS_22,
+ KF_NAME_WORKSPACE,
+ KF_QUIT,
+ KF_RAISE_TOGGLE,
+ KF_RESTART,
+ KF_RG_1,
+ KF_RG_2,
+ KF_RG_3,
+ KF_RG_4,
+ KF_RG_5,
+ KF_RG_6,
+ KF_RG_7,
+ KF_RG_8,
+ KF_RG_9,
+ KF_RG_NEXT,
+ KF_RG_PREV,
+ KF_SCREEN_NEXT,
+ KF_SCREEN_PREV,
+ KF_SEARCH_WIN,
+ KF_SEARCH_WORKSPACE,
+ KF_SPAWN_CUSTOM,
+ KF_STACK_INC,
+ KF_STACK_DEC,
+ KF_STACK_RESET,
+ KF_SWAP_MAIN,
+ KF_SWAP_NEXT,
+ KF_SWAP_PREV,
+ KF_UNICONIFY,
+ KF_VERSION,
+ KF_WIDTH_GROW,
+ KF_WIDTH_SHRINK,
+ KF_WIND_DEL,
+ KF_WIND_KILL,
+ KF_WS_1,
+ KF_WS_2,
+ KF_WS_3,
+ KF_WS_4,
+ KF_WS_5,
+ KF_WS_6,
+ KF_WS_7,
+ KF_WS_8,
+ KF_WS_9,
+ KF_WS_10,
+ KF_WS_11,
+ KF_WS_12,
+ KF_WS_13,
+ KF_WS_14,
+ KF_WS_15,
+ KF_WS_16,
+ KF_WS_17,
+ KF_WS_18,
+ KF_WS_19,
+ KF_WS_20,
+ KF_WS_21,
+ KF_WS_22,
+ KF_WS_NEXT,
+ KF_WS_NEXT_ALL,
+ KF_WS_PREV,
+ KF_WS_PREV_ALL,
+ KF_WS_PRIOR,
+ KF_DUMPWINS, /* MUST BE LAST */
+ KF_INVALID
+};
+
+struct key {
+ RB_ENTRY(key) entry;
+ unsigned int mod;
+ KeySym keysym;
+ enum keyfuncid funcid;
+ char *spawn_name;
+};
+RB_HEAD(key_tree, key);
+
/* function prototypes */
+void adjust_font(struct ws_win *);
+void bar_class_name(char *, size_t, struct swm_region *);
+void bar_class_title_name(char *, size_t, struct swm_region *);
+void bar_cleanup(struct swm_region *);
+void bar_extra_setup(void);
+void bar_extra_stop(void);
+int bar_extra_update(void);
+void bar_fmt(const char *, char *, struct swm_region *, size_t);
+void bar_fmt_expand(char *, size_t);
+void bar_draw(void);
+void bar_print(struct swm_region *, const char *);
+void bar_print_legacy(struct swm_region *, const char *);
+void bar_replace(char *, char *, struct swm_region *, size_t);
+void bar_replace_pad(char *, int *, size_t);
+char * bar_replace_seq(char *, char *, struct swm_region *, size_t *,
+ size_t);
+void bar_setup(struct swm_region *);
+void bar_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_float(char *, size_t, struct swm_region *);
+void bar_window_name(char *, size_t, struct swm_region *);
+void bar_workspace_name(char *, size_t, struct swm_region *);
void buttonpress(xcb_button_press_event_t *);
void check_conn(void);
+void clear_keys(void);
void clientmessage(xcb_client_message_event_t *);
-int conf_load(char *, int);
+void client_msg(struct ws_win *, xcb_atom_t, xcb_timestamp_t);
+int conf_load(const char *, int);
void configurenotify(xcb_configure_notify_event_t *);
void configurerequest(xcb_configure_request_event_t *);
+void config_win(struct ws_win *, xcb_configure_request_event_t *);
void constrain_window(struct ws_win *, struct swm_region *, int);
+int count_win(struct workspace *, int);
+void cursors_cleanup(void);
+void cursors_load(void);
+void custom_region(char *);
+void cyclerg(struct swm_region *, union arg *);
+void cyclews(struct swm_region *, union arg *);
+void cycle_layout(struct swm_region *, union arg *);
void destroynotify(xcb_destroy_notify_event_t *);
+void dumpwins(struct swm_region *, union arg *);
+int enable_wm(void);
void enternotify(xcb_enter_notify_event_t *);
void event_drain(uint8_t);
void event_error(xcb_generic_error_t *);
void event_handle(xcb_generic_event_t *);
-char *expand_tilde(char *);
+void ewmh_autoquirk(struct ws_win *);
+void ewmh_get_win_state(struct ws_win *);
+int ewmh_set_win_fullscreen(struct ws_win *, int);
+void ewmh_update_actions(struct ws_win *);
+void ewmh_update_win_state(struct ws_win *, xcb_atom_t, long);
+char *expand_tilde(const char *);
void expose(xcb_expose_event_t *);
+void fake_keypress(struct ws_win *, xcb_keysym_t, uint16_t);
+struct pid_e *find_pid(pid_t);
+struct ws_win *find_unmanaged_window(xcb_window_t);
struct ws_win *find_window(xcb_window_t);
+void floating_toggle(struct swm_region *, union arg *);
int floating_toggle_win(struct ws_win *);
void focus(struct swm_region *, union arg *);
-void focus_flush(void);
-struct ws_win *get_focus_magic(struct ws_win *);
-struct ws_win *get_focus_prev(struct ws_win *);
-void focus_win(struct ws_win *);
#ifdef SWM_DEBUG
void focusin(xcb_focus_in_event_t *);
+void focusout(xcb_focus_out_event_t *);
#endif
+void focus_flush(void);
+void focus_region(struct swm_region *);
+void focusrg(struct swm_region *, union arg *);
+void focus_win(struct ws_win *);
+void fontset_init(void);
+void free_window(struct ws_win *);
xcb_atom_t get_atom_from_string(const char *);
#ifdef SWM_DEBUG
char *get_atom_name(xcb_atom_t);
+#endif
+struct ws_win *get_focus_magic(struct ws_win *);
+struct ws_win *get_focus_prev(struct ws_win *);
+#ifdef SWM_DEBUG
char *get_notify_detail_label(uint8_t);
char *get_notify_mode_label(uint8_t);
#endif
struct ws_win *get_pointer_win(xcb_window_t);
struct ws_win *get_region_focus(struct swm_region *);
+int get_region_index(struct swm_region *);
xcb_screen_t *get_screen(int);
+#ifdef SWM_DEBUG
+char *get_stack_mode_name(uint8_t);
+#endif
+int32_t get_swm_iconic(struct ws_win *);
char *get_win_name(xcb_window_t);
+int get_ws_idx(xcb_window_t);
uint32_t getstate(xcb_window_t);
void grabbuttons(struct ws_win *);
+void grabkeys(void);
+void grab_windows(void);
+void iconify(struct swm_region *, union arg *);
+int isxlfd(char *);
void keypress(xcb_key_press_event_t *);
+int key_cmp(struct key *, struct key *);
+void key_insert(unsigned int, KeySym, enum keyfuncid, const char *);
+struct key *key_lookup(unsigned int, KeySym);
+void key_remove(struct key *);
+void key_replace(struct key *, unsigned int, KeySym, enum keyfuncid,
+ const char *);
+void kill_bar_extra_atexit(void);
+void kill_refs(struct ws_win *);
#ifdef SWM_DEBUG
void leavenotify(xcb_leave_notify_event_t *);
#endif
void mapnotify(xcb_map_notify_event_t *);
void mappingnotify(xcb_mapping_notify_event_t *);
void maprequest(xcb_map_request_event_t *);
+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(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 parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *);
+void pressbutton(struct swm_region *, union arg *);
+void priorws(struct swm_region *, union arg *);
+#ifdef SWM_DEBUG
+void print_win_geom(xcb_window_t);
+#endif
void propertynotify(xcb_property_notify_event_t *);
-void spawn_select(struct swm_region *, union arg *, char *, int *);
+void quirk_insert(const char *, const char *, unsigned long);
+void quirk_remove(struct quirk *);
+void quirk_replace(struct quirk *, const char *, const char *,
+ unsigned long);
+void quit(struct swm_region *, union arg *);
+void raise_toggle(struct swm_region *, union arg *);
+void resize(struct ws_win *, union arg *);
+void resize_step(struct swm_region *, union arg *);
+void restart(struct swm_region *, union arg *);
+struct swm_region *root_to_region(xcb_window_t, int);
void screenchange(xcb_randr_screen_change_notify_event_t *);
+void scan_xrandr(int);
+void search_do_resp(void);
+void search_resp_name_workspace(const char *, unsigned long);
+void search_resp_search_window(const char *);
+void search_resp_search_workspace(const char *);
+void search_resp_uniconify(const char *, unsigned long);
+void search_win(struct swm_region *, union arg *);
+void search_win_cleanup(void);
+void search_workspace(struct swm_region *, union arg *);
+void send_to_rg(struct swm_region *, union arg *);
+void send_to_ws(struct swm_region *, union arg *);
+void set_region(struct swm_region *);
+int setautorun(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);
+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);
+void setspawn(const char *, const char *);
+void setup_ewmh(void);
+void setup_globals(void);
+void setup_keys(void);
+void setup_quirks(void);
+void setup_screens(void);
+void setup_spawn(void);
+void set_child_transient(struct ws_win *, xcb_window_t *);
+void set_swm_iconic(struct ws_win *, int);
+void set_win_state(struct ws_win *, uint16_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_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 *);
+void spawn_remove(struct spawn_prog *);
+void spawn_replace(struct spawn_prog *, const char *, const char *);
+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 store_float_geom(struct ws_win *, struct swm_region *);
+char * strdupsafe(const char *);
+void swapwin(struct swm_region *, union arg *);
+void switchws(struct swm_region *, union arg *);
+void teardown_ewmh(void);
+void unfocus_win(struct ws_win *);
+void uniconify(struct swm_region *, union arg *);
void unmanage_window(struct ws_win *);
void unmapnotify(xcb_unmap_notify_event_t *);
-void unfocus_win(struct ws_win *);
+void unmap_all(void);
+void unmap_window(struct ws_win *);
+void updatenumlockmask(void);
+void update_modkey(unsigned int);
void update_window(struct ws_win *);
+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 *);
+pid_t window_get_pid(xcb_window_t);
+void wkill(struct swm_region *, union arg *);
+void workaround(void);
+void xft_init(struct swm_region *);
+void _add_startup_exception(const char *, va_list);
+void add_startup_exception(const char *, ...);
+
+RB_PROTOTYPE(key_tree, key, entry, key_cmp);
+RB_GENERATE(key_tree, key, entry, key_cmp);
+struct key_tree keys;
+
+void
+cursors_load(void)
+{
+ xcb_font_t cf = XCB_NONE;
+ int i;
+
+ for (i = 0; i < LENGTH(cursors); ++i) {
+ /* try to load Xcursor first. */
+ cursors[i].cid = XcursorLibraryLoadCursor(display,
+ cursors[i].name);
+
+ /* fallback to cursorfont. */
+ if (cursors[i].cid == XCB_CURSOR_NONE) {
+ if (cf == XCB_NONE) {
+ cf = xcb_generate_id(conn);
+ xcb_open_font(conn, cf, strlen("cursor"),
+ "cursor");
+ }
+
+ cursors[i].cid = xcb_generate_id(conn);
+ xcb_create_glyph_cursor(conn, cursors[i].cid, cf, cf,
+ cursors[i].cf_char, cursors[i].cf_char + 1, 0, 0, 0,
+ 0xffff, 0xffff, 0xffff);
+
+ }
+ }
+
+ if (cf != XCB_NONE)
+ xcb_close_font(conn, cf);
+}
+
+void
+cursors_cleanup(void)
+{
+ int i;
+ for (i = 0; i < LENGTH(cursors); ++i)
+ xcb_free_cursor(conn, cursors[i].cid);
+}
char *
-expand_tilde(char *s)
+expand_tilde(const char *s)
{
struct passwd *ppwd;
- int i, max;
+ int i;
+ long max;
char *user;
const char *sc = s;
char *result;
s = &s[i];
ppwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
+ free(user);
+
if (ppwd == NULL)
result = strdup(sc);
else
return (NULL);
}
+int
+get_region_index(struct swm_region *r)
+{
+ struct swm_region *rr;
+ int ridx = 0;
+
+ if (r == NULL)
+ return -1;
+
+ TAILQ_FOREACH(rr, &r->s->rl, entry) {
+ if (rr == r)
+ break;
+ ++ridx;
+ }
+
+ if (rr == NULL)
+ return -1;
+
+ return ridx;
+}
+
void
focus_flush(void)
{
kill(bar_pid, SIGTERM);
bar_pid = 0;
}
- strlcpy((char *)bar_ext, "", sizeof bar_ext);
+ strlcpy(bar_ext, "", sizeof bar_ext);
bar_extra = 0;
}
#endif
}
+/* Redraws the bar; need to follow with xcb_flush() or focus_flush(). */
void
-bar_fmt_print(void)
+bar_draw(void)
{
char fmtexp[SWM_BAR_MAX], fmtnew[SWM_BAR_MAX];
char fmtrep[SWM_BAR_MAX];
TAILQ_FOREACH(r, &screens[i].rl, entry) {
if (r->bar == NULL)
continue;
- bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew);
- bar_replace(fmtnew, fmtrep, r, sizeof fmtrep);
+
+ if (bar_enabled && r->ws->bar_enabled)
+ xcb_map_window(conn, r->bar->id);
+ else {
+ xcb_unmap_window(conn, r->bar->id);
+ continue;
+ }
+
+ if (startup_exception)
+ snprintf(fmtrep, sizeof fmtrep, "total "
+ "exceptions: %d, first exception: %s",
+ nr_exceptions,
+ startup_exception);
+ else {
+ bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew);
+ bar_replace(fmtnew, fmtrep, r, sizeof fmtrep);
+ }
if (bar_font_legacy)
bar_print_legacy(r, fmtrep);
else
}
}
-void
-bar_update(void)
+/*
+ * Reads external script output; call when stdin is readable.
+ * Returns 1 if bar_ext was updated; otherwise 0.
+ */
+int
+bar_extra_update(void)
{
- size_t len;
- char *b;
+ size_t len;
+ char b[SWM_BAR_MAX];
+ int changed = 0;
- if (!bar_enabled)
- return;
- if (bar_extra && bar_extra_running) {
- /* ignore short reads; it'll correct itself */
- while ((b = fgetln(stdin, &len)) != NULL)
- if (b && b[len - 1] == '\n') {
- b[len - 1] = '\0';
- strlcpy((char *)bar_ext, b, sizeof bar_ext);
+ if (!bar_extra)
+ return changed;
+
+ while (fgets(b, sizeof(b), stdin) != NULL) {
+ if (bar_enabled) {
+ len = strlen(b);
+ if (b[len - 1] == '\n') {
+ /* Remove newline. */
+ b[--len] = '\0';
+
+ /* "Clear" bar_ext. */
+ bar_ext[0] = '\0';
+
+ /* Flush buffered output. */
+ strlcpy(bar_ext, bar_ext_buf, sizeof(bar_ext));
+ bar_ext_buf[0] = '\0';
+
+ /* Append new output to bar. */
+ strlcat(bar_ext, b, sizeof(bar_ext));
+
+ changed = 1;
+ } else {
+ /* Buffer output. */
+ strlcat(bar_ext_buf, b, sizeof(bar_ext_buf));
}
- if (b == NULL && errno != EAGAIN) {
- warn("bar_update: bar_extra failed");
- bar_extra_stop();
}
- } else
- strlcpy((char *)bar_ext, "", sizeof bar_ext);
-
- bar_fmt_print();
- alarm(bar_delay);
-}
+ }
-void
-bar_signal(int sig)
-{
- /* suppress unused warning since var is needed */
- (void)sig;
+ if (errno != EAGAIN) {
+ warn("bar_action failed");
+ bar_extra_stop();
+ changed = 1;
+ }
- bar_alarm = 1;
+ return changed;
}
void
DNPRINTF(SWM_D_BAR, "bar_toggle\n");
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- if (bar_enabled) {
- for (i = 0; i < num_screens; i++)
- TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
- if (tmpr->bar)
- xcb_unmap_window(conn, tmpr->bar->id);
- } else {
- for (i = 0; i < num_screens; i++)
- TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
- if (tmpr->bar)
- xcb_map_window(conn, tmpr->bar->id);
+ switch (args->id) {
+ case SWM_ARG_ID_BAR_TOGGLE_WS:
+ /* Only change if master switch is enabled. */
+ if (bar_enabled)
+ r->ws->bar_enabled = !r->ws->bar_enabled;
+ else
+ bar_enabled = r->ws->bar_enabled = 1;
+ break;
+ case SWM_ARG_ID_BAR_TOGGLE:
+ bar_enabled = !bar_enabled;
+ break;
}
- bar_enabled = !bar_enabled;
+ /* update bars as necessary */
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ for (i = 0; i < num_screens; i++)
+ TAILQ_FOREACH(tmpr, &screens[i].rl, entry)
+ if (tmpr->bar) {
+ if (bar_enabled && tmpr->ws->bar_enabled)
+ xcb_map_window(conn, tmpr->bar->id);
+ else
+ xcb_unmap_window(conn, tmpr->bar->id);
+ }
stack();
/* must be after stack */
- bar_update();
+ bar_draw();
focus_flush();
}
void
-bar_refresh(void)
+bar_extra_setup(void)
{
- struct swm_region *r;
- uint32_t wa[2];
- int i, num_screens;
-
/* do this here because the conf file is in memory */
- if (bar_extra && !bar_extra_running && bar_argv[0]) {
+ if (!bar_extra && bar_argv[0]) {
/* launch external status app */
- bar_extra_running = 1;
+ bar_extra = 1;
if (pipe(bar_pipe) == -1)
err(1, "pipe error");
socket_setnonblock(bar_pipe[0]);
socket_setnonblock(bar_pipe[1]); /* XXX hmmm, really? */
- if (dup2(bar_pipe[0], 0) == -1)
+
+ /* Set stdin to read from the pipe. */
+ if (dup2(bar_pipe[0], STDIN_FILENO) == -1)
err(1, "dup2");
- if (dup2(bar_pipe[1], 1) == -1)
+
+ /* Set stdout to write to the pipe. */
+ if (dup2(bar_pipe[1], STDOUT_FILENO) == -1)
err(1, "dup2");
+
if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
err(1, "could not disable SIGPIPE");
switch (bar_pid = fork()) {
close(bar_pipe[1]);
break;
}
+
+ atexit(kill_bar_extra_atexit);
}
+}
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- for (i = 0; i < num_screens; i++)
- TAILQ_FOREACH(r, &screens[i].rl, entry) {
- if (r->bar == NULL)
- continue;
- wa[0] = screens[i].c[SWM_S_COLOR_BAR].pixel;
- wa[1] = screens[i].c[SWM_S_COLOR_BAR_BORDER].pixel;
- xcb_change_window_attributes(conn, r->bar->id,
- XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
- }
- bar_update();
+void
+kill_bar_extra_atexit(void)
+{
+ if (bar_pid)
+ kill(bar_pid, SIGTERM);
}
int
}
void
-fontset_init()
+fontset_init(void)
{
char *default_string;
char **missing_charsets;
if (!XftColorAllocValue(display, DefaultVisual(display, r->s->idx),
DefaultColormap(display, r->s->idx), &color, &bar_font_color))
- warn("unable to allocate Xft color");
+ warn("Xft error: unable to allocate color.");
bar_height = bar_font->height + 2 * bar_border_width;
WIDTH(r->bar) = WIDTH(r) - 2 * bar_border_width;
HEIGHT(r->bar) = bar_height - 2 * bar_border_width;
+ /* Assume region is unfocused when we create the bar. */
r->bar->id = xcb_generate_id(conn);
wa[0] = r->s->c[SWM_S_COLOR_BAR].pixel;
- wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER].pixel;
+ wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER_UNFOCUS].pixel;
wa[2] = XCB_EVENT_MASK_EXPOSURE;
xcb_create_window(conn, XCB_COPY_FROM_PARENT, r->bar->id, r->s->root,
"%d x %d\n", WINID(r->bar), X(r->bar), Y(r->bar), WIDTH(r->bar),
HEIGHT(r->bar));
- if (signal(SIGALRM, bar_signal) == SIG_ERR)
- err(1, "could not install bar_signal");
- bar_refresh();
+ bar_extra_setup();
}
void
"Version: %s Build: %s", SPECTRWM_VERSION, buildstr);
else
strlcpy(bar_vertext, "", sizeof bar_vertext);
- bar_update();
+ bar_draw();
xcb_flush(conn);
}
} else {
DNPRINTF(SWM_D_EVENT, "get_pointer_win: none.\n");
}
+ free(r);
}
return win;
if (screens[i].root == root)
break;
- if (check & SWM_CK_FOCUS) {
+ if (check & SWM_CK_REGION)
+ r = screens[i].r_focus;
+
+ if (r == NULL && check & SWM_CK_FOCUS) {
/* Try to find an actively focused window */
gifr = xcb_get_input_focus_reply(conn,
xcb_get_input_focus(conn), NULL);
kill_refs(win->ws->focus);
win->ws->focus = NULL;
}
+
if (validate_win(win->ws->focus_prev)) {
kill_refs(win->ws->focus_prev);
win->ws->focus_prev = NULL;
void
focus_win(struct ws_win *win)
{
- struct ws_win *cfw = NULL;
+ struct ws_win *cfw = NULL, *parent = NULL, *w;
+ struct workspace *ws;
xcb_get_input_focus_reply_t *r;
DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%x\n", WINID(win));
if (win->ws == NULL)
goto out;
- if (validate_ws(win->ws))
+ if (!win->mapped)
+ goto out;
+
+ ws = win->ws;
+
+ if (validate_ws(ws))
goto out;
if (validate_win(win)) {
free(r);
}
- if (win->ws->focus != win) {
- if (win->ws->focus && win->ws->focus != cfw)
- unfocus_win(win->ws->focus);
- win->ws->focus = win;
+ if (ws->focus != win) {
+ if (ws->focus && ws->focus != cfw)
+ unfocus_win(ws->focus);
+ ws->focus = win;
}
- if (cfw != win && win->ws->r != NULL) {
+ /* If this window directs focus to a child window, then clear. */
+ if (win->focus_child)
+ win->focus_child = NULL;
+
+ /* If transient, adjust parent's focus child for focus_magic. */
+ if (win->transient) {
+ parent = find_window(win->transient);
+ if (parent && parent->focus_child != win)
+ parent->focus_child = win;
+ }
+
+ if (cfw != win && ws->r != NULL) {
/* Set input focus if no input hint, or indicated by hint. */
if (!(win->hints.flags & XCB_ICCCM_WM_HINT_INPUT) ||
(win->hints.flags & XCB_ICCCM_WM_HINT_INPUT &&
if (win->take_focus) {
/* java is special; always tell parent */
if (win->transient && win->java)
- client_msg(find_window(win->transient),
- a_takefocus, last_event_time);
+ client_msg(parent, a_takefocus,
+ last_event_time);
else
client_msg(win, a_takefocus, last_event_time);
}
xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL,
- &win->ws->r->s->c[SWM_S_COLOR_FOCUS].pixel);
+ &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);
+
+ /* Map siblings next. */
+ TAILQ_FOREACH(w, &ws->winlist, entry)
+ if (w != win && !w->iconic &&
+ w->transient == parent->id)
+ map_window(w);
+ }
- if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
- win->ws->always_raise)
+ /* Map focused window. */
map_window(win);
+ /* Finally, map children of focus window. */
+ TAILQ_FOREACH(w, &ws->winlist, entry)
+ if (w->transient == win->id && !w->iconic)
+ map_window(w);
+ }
+
+ set_region(ws->r);
+
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
&win->id);
}
out:
- bar_update();
+ bar_draw();
DNPRINTF(SWM_D_FOCUS, "focus_win: done.\n");
}
}
void
-switchws(struct swm_region *r, union arg *args)
+set_region(struct swm_region *r)
{
- int wsid = args->id, unmap_old = 0;
- struct swm_region *this_r, *other_r;
- struct ws_win *win;
- struct workspace *new_ws, *old_ws;
+ struct swm_region *rf;
- if (!(r && r->s))
+ if (r == NULL)
return;
- if (wsid >= workspace_limit)
- return;
+ rf = r->s->r_focus;
+ /* Unfocus old region bar. */
+ if (rf) {
+ if (rf == r)
+ return;
- this_r = r;
- old_ws = this_r->ws;
- new_ws = &this_r->s->ws[wsid];
+ xcb_change_window_attributes(conn, rf->bar->id,
+ XCB_CW_BORDER_PIXEL,
+ &r->s->c[SWM_S_COLOR_BAR_BORDER_UNFOCUS].pixel);
+ }
- DNPRINTF(SWM_D_WS, "switchws: screen[%d]:%dx%d+%d+%d: %d -> %d\n",
- r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), old_ws->idx, wsid);
+ /* 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);
- if (new_ws == NULL || old_ws == NULL)
- return;
- if (new_ws == old_ws)
- return;
+ r->s->r_focus = r;
+}
+
+void
+focus_region(struct swm_region *r)
+{
+ struct ws_win *nfw;
+ struct swm_region *old_r;
+
+ if (r == NULL)
+ return;
+
+ old_r = r->s->r_focus;
+ set_region(r);
+
+ nfw = get_region_focus(r);
+ if (nfw) {
+ focus_win(nfw);
+ } else {
+ /* New region is empty; need to manually unfocus win. */
+ if (old_r)
+ unfocus_win(old_r->ws->focus);
+
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->s->root,
+ XCB_CURRENT_TIME);
+
+ /* Clear bar since empty. */
+ bar_draw();
+ }
+}
+
+void
+switchws(struct swm_region *r, union arg *args)
+{
+ int wsid = args->id, unmap_old = 0;
+ struct swm_region *this_r, *other_r;
+ struct ws_win *win;
+ struct workspace *new_ws, *old_ws;
+
+ if (!(r && r->s))
+ return;
+
+ if (wsid >= workspace_limit)
+ return;
+
+ this_r = r;
+ old_ws = this_r->ws;
+ new_ws = &this_r->s->ws[wsid];
+
+ DNPRINTF(SWM_D_WS, "switchws: screen[%d]:%dx%d+%d+%d: %d -> %d\n",
+ r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), old_ws->idx, wsid);
+
+ if (new_ws == NULL || old_ws == NULL)
+ return;
+ if (new_ws == old_ws)
+ return;
unfocus_win(old_ws->focus);
this_r->ws = new_ws;
new_ws->r = this_r;
+ /* Set focus_pending before stacking. */
+ if (focus_mode != SWM_FOCUS_FOLLOW)
+ new_ws->focus_pending = get_region_focus(new_ws->r);
+
stack();
/* unmap old windows */
TAILQ_FOREACH(win, &old_ws->winlist, entry)
unmap_window(win);
- if (focus_mode != SWM_FOCUS_FOLLOW) {
- new_ws->focus_pending = get_region_focus(new_ws->r);
-
- /* if workspaces were swapped, then don't wait to set focus */
- if (old_ws->r) {
- if (new_ws->focus_pending) {
- focus_win(new_ws->focus_pending);
- } else {
- /* Empty region, focus on root. */
- xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
- new_ws->r->s[new_ws->r->s->idx].root,
- XCB_CURRENT_TIME);
- }
+ /* if workspaces were swapped, then don't wait to set focus */
+ if (old_ws->r && focus_mode != SWM_FOCUS_FOLLOW) {
+ if (new_ws->focus_pending) {
+ focus_win(new_ws->focus_pending);
+ } else {
+ /* Empty region, focus on root. */
+ xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
+ new_ws->r->s[new_ws->r->s->idx].root,
+ XCB_CURRENT_TIME);
}
}
/* Clear bar if new ws is empty. */
if (new_ws->focus_pending == NULL)
- bar_update();
+ bar_draw();
focus_flush();
}
void
-cyclescr(struct swm_region *r, union arg *args)
+focusrg(struct swm_region *r, union arg *args)
+{
+ int ridx = args->id, i, num_screens;
+ struct swm_region *rr = NULL;
+
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ /* do nothing if we don't have more than one screen */
+ if (!(num_screens > 1 || outputs > 1))
+ return;
+
+ DNPRINTF(SWM_D_FOCUS, "focusrg: id: %d\n", ridx);
+
+ rr = TAILQ_FIRST(&r->s->rl);
+ for (i = 0; i < ridx; ++i)
+ rr = TAILQ_NEXT(rr, entry);
+
+ if (rr == NULL)
+ return;
+
+ focus_region(rr);
+ focus_flush();
+}
+
+void
+cyclerg(struct swm_region *r, union arg *args)
{
- struct ws_win *nfw;
struct swm_region *rr = NULL;
int i, num_screens;
i = r->s->idx;
switch (args->id) {
- case SWM_ARG_ID_CYCLESC_UP:
+ case SWM_ARG_ID_CYCLERG_UP:
rr = TAILQ_NEXT(r, entry);
if (rr == NULL)
rr = TAILQ_FIRST(&screens[i].rl);
break;
- case SWM_ARG_ID_CYCLESC_DOWN:
+ case SWM_ARG_ID_CYCLERG_DOWN:
rr = TAILQ_PREV(r, swm_region_list, entry);
if (rr == NULL)
rr = TAILQ_LAST(&screens[i].rl, swm_region_list);
if (rr == NULL)
return;
- nfw = get_region_focus(rr);
- if (nfw) {
- focus_win(nfw);
- } else {
- /* New region is empty; unfocus old region and warp pointer. */
- unfocus_win(r->ws->focus);
- xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
- rr->s[i].root, XCB_CURRENT_TIME);
-
- /* Clear bar since empty. */
- bar_update();
- }
-
+ focus_region(rr);
focus_flush();
}
if (winfocus == NULL || winfocus == win) {
switch (focus_close) {
case SWM_STACK_BOTTOM:
- winfocus = TAILQ_FIRST(wl);
+ TAILQ_FOREACH(winfocus, wl, entry)
+ if (!winfocus->iconic && winfocus != cur_focus)
+ break;
break;
case SWM_STACK_TOP:
- winfocus = TAILQ_LAST(wl, ws_win_list);
+ TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry)
+ if (!winfocus->iconic && winfocus != cur_focus)
+ break;
break;
case SWM_STACK_ABOVE:
- if ((winfocus = TAILQ_NEXT(cur_focus, entry)) == NULL) {
- if (focus_close_wrap)
- winfocus = TAILQ_FIRST(wl);
- else
- winfocus = TAILQ_PREV(cur_focus,
- ws_win_list, entry);
+ winfocus = TAILQ_NEXT(cur_focus, entry);
+ while (winfocus && winfocus->iconic)
+ winfocus = TAILQ_NEXT(winfocus, entry);
+
+ if (winfocus == NULL) {
+ if (focus_close_wrap) {
+ TAILQ_FOREACH(winfocus, wl, entry)
+ if (!winfocus->iconic &&
+ winfocus != cur_focus)
+ break;
+ } else {
+ TAILQ_FOREACH_REVERSE(winfocus, wl,
+ ws_win_list, entry)
+ if (!winfocus->iconic &&
+ winfocus != cur_focus)
+ break;
+ }
}
break;
case SWM_STACK_BELOW:
- if ((winfocus = TAILQ_PREV(cur_focus, ws_win_list,
- entry)) == NULL) {
- if (focus_close_wrap)
- winfocus = TAILQ_LAST(wl, ws_win_list);
- else
- winfocus = TAILQ_NEXT(cur_focus, entry);
+ winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry);
+ while (winfocus && winfocus->iconic)
+ winfocus = TAILQ_PREV(winfocus, ws_win_list,
+ entry);
+
+ if (winfocus == NULL) {
+ if (focus_close_wrap) {
+ TAILQ_FOREACH_REVERSE(winfocus, wl,
+ ws_win_list, entry)
+ if (!winfocus->iconic &&
+ winfocus != cur_focus)
+ break;
+ } else {
+ TAILQ_FOREACH(winfocus, wl, entry)
+ if (!winfocus->iconic &&
+ winfocus != cur_focus)
+ break;
+ }
}
break;
}
}
done:
- if (winfocus == NULL) {
- if (focus_default == SWM_STACK_TOP)
- winfocus = TAILQ_LAST(wl, ws_win_list);
- else
- winfocus = TAILQ_FIRST(wl);
+ if (winfocus == NULL ||
+ (winfocus && (winfocus->iconic || winfocus == cur_focus))) {
+ if (focus_default == SWM_STACK_TOP) {
+ TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry)
+ if (!winfocus->iconic && winfocus != cur_focus)
+ break;
+ } else {
+ TAILQ_FOREACH(winfocus, wl, entry)
+ if (!winfocus->iconic && winfocus != cur_focus)
+ break;
+ }
}
kill_refs(win);
focus_win(get_focus_magic(winfocus));
- xcb_flush(conn);
+ focus_flush();
}
void
ws->cur_layout = &layouts[0];
stack();
- bar_update();
+ bar_draw();
focus_win(get_region_focus(r));
if (args->id != SWM_ARG_ID_STACKINIT)
stack();
- bar_update();
+ bar_draw();
focus_flush();
}
DNPRINTF(SWM_D_STACK, "stack: workspace: %d "
"(screen: %d, region: %d)\n", r->ws->idx, i, j++);
- /* start with screen geometry, adjust for bar */
+ /* Adjust stack area for region bar and padding. */
g = r->g;
- g.w -= 2 * border_width;
- g.h -= 2 * border_width;
- if (bar_enabled) {
+ g.x += region_padding;
+ g.y += region_padding;
+ g.w -= 2 * border_width + 2 * region_padding;
+ g.h -= 2 * border_width + 2 * region_padding;
+ if (bar_enabled && r->ws->bar_enabled) {
if (!bar_at_bottom)
g.y += bar_height;
g.h -= bar_height;
/* stack all the tiled windows */
i = j = 0, s = stacks;
TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (win->transient || win->floating)
- continue;
- if (win->iconic)
+ if (win->transient || win->floating || win->iconic)
continue;
if (win->ewmh_flags & EWMH_F_FULLSCREEN) {
if (flip)
win_g.x = r_g.x;
else
- win_g.x += win_g.w + 2 * border_width;
+ win_g.x += win_g.w + 2 * border_width +
+ tile_gap;
win_g.w = (r_g.w - msize -
- (stacks * 2 * border_width)) / stacks;
+ (stacks * (2 * border_width + tile_gap))) / stacks;
if (s == 1)
win_g.w += (r_g.w - msize -
- (stacks * 2 * border_width)) % stacks;
+ (stacks * (2 * border_width + tile_gap))) %
+ stacks;
s--;
j = 0;
}
- win_g.h = hrh - 2 * border_width;
+
+ win_g.h = hrh - 2 * border_width - tile_gap;
+
if (rot) {
h_inc = win->sh.width_inc;
h_base = win->sh.base_width;
h_inc = win->sh.height_inc;
h_base = win->sh.base_height;
}
+
if (j == colno - 1) {
win_g.h = hrh + extra;
} else if (h_inc > 1 && h_inc < h_slice) {
if (j == 0)
win_g.y = r_g.y;
else
- win_g.y += last_h + 2 * border_width;
+ win_g.y += last_h + 2 * border_width + tile_gap;
- if (disable_border && !bar_enabled && winno == 1){
+ if (disable_border && !(bar_enabled && ws->bar_enabled) &&
+ winno == 1){
bordered = 0;
win_g.w += 2 * border_width;
win_g.h += 2 * border_width;
} else {
bordered = 1;
}
+
if (rot) {
if (X(win) != win_g.y || Y(win) != win_g.x ||
WIDTH(win) != win_g.h || HEIGHT(win) != win_g.w) {
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);
max_stack(struct workspace *ws, struct swm_geometry *g)
{
struct swm_geometry gg = *g;
- struct ws_win *win, *wintrans = NULL, *parent = NULL;
- int winno, num_screens;
+ struct ws_win *w, *win = NULL, *parent = NULL;
+ int winno;
DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
if (winno == 0 && count_win(ws, 1) == 0)
return;
- num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
- TAILQ_FOREACH(win, &ws->winlist, entry) {
- if (win->transient) {
- wintrans = win;
- parent = find_window(win->transient);
+ /* Figure out which top level window should be visible. */
+ if (ws->focus_pending)
+ win = ws->focus_pending;
+ else if (ws->focus)
+ win = ws->focus;
+ else
+ 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);
+
+ /* maximize all top level windows */
+ TAILQ_FOREACH(w, &ws->winlist, entry) {
+ if (w->transient || w->iconic)
continue;
- }
- if (win->floating && !win->floatmaxed ) {
+ if (!w->mapped && w != win)
+ map_window(w);
+
+ if (w->floating && !w->floatmaxed) {
/*
* retain geometry for retrieval on exit from
* max_stack mode
*/
- store_float_geom(win, ws->r);
- win->floatmaxed = 1;
+ store_float_geom(w, ws->r);
+ w->floatmaxed = 1;
}
/* only reconfigure if necessary */
- if (X(win) != gg.x || Y(win) != gg.y || WIDTH(win) != gg.w ||
- HEIGHT(win) != gg.h) {
- win->g = gg;
- if (bar_enabled){
- win->bordered = 1;
+ if (X(w) != gg.x || Y(w) != gg.y || WIDTH(w) != gg.w ||
+ HEIGHT(w) != gg.h) {
+ w->g = gg;
+ if (bar_enabled && ws->bar_enabled){
+ w->bordered = 1;
} else {
- win->bordered = 0;
- WIDTH(win) += 2 * border_width;
- HEIGHT(win) += 2 * border_width;
+ w->bordered = 0;
+ WIDTH(w) += 2 * border_width;
+ HEIGHT(w) += 2 * border_width;
}
- update_window(win);
+ update_window(w);
}
- /* unmap only if we don't have multi screen */
- if (win != ws->focus)
- if (!(num_screens > 1 || outputs > 1))
- unmap_window(win);
}
- /* put the last transient on top */
- if (wintrans) {
- if (parent)
- map_window(parent);
- stack_floater(wintrans, ws->r);
- ws->focus = get_focus_magic(wintrans);
+ /* If a parent exists, map/raise it first. */
+ if (parent) {
+ map_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);
+ }
}
+
+ /* Map/raise focused window. */
+ map_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);
+ }
+}
+
+void
+send_to_rg(struct swm_region *r, union arg *args)
+{
+ int ridx = args->id, i, num_screens;
+ struct swm_region *rr = NULL;
+ union arg a;
+
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ /* do nothing if we don't have more than one screen */
+ if (!(num_screens > 1 || outputs > 1))
+ return;
+
+ DNPRINTF(SWM_D_FOCUS, "send_to_rg: id: %d\n", ridx);
+
+ rr = TAILQ_FIRST(&r->s->rl);
+ for (i = 0; i < ridx; ++i)
+ rr = TAILQ_NEXT(rr, entry);
+
+ if (rr == NULL)
+ return;
+
+ a.id = rr->ws->idx;
+
+ send_to_ws(r, &a);
}
void
XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX);
r = xcb_get_property_reply(conn, c, NULL);
- 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) {
+ if (r) {
+ if (r->type == XCB_NONE) {
free(r);
- return NULL;
+ /* 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->length > 0)
- name = strndup(xcb_get_property_value(r),
- xcb_get_property_value_length(r));
+ free(r);
+ }
- free(r);
- return name;
+ return (name);
}
void
}
void
-search_resp_uniconify(char *resp, unsigned long len)
+search_resp_uniconify(const char *resp, unsigned long len)
{
char *name;
struct ws_win *win;
}
void
-search_resp_name_workspace(char *resp, unsigned long len)
+search_resp_name_workspace(const char *resp, unsigned long len)
{
struct workspace *ws;
}
void
-search_resp_search_workspace(char *resp)
+search_resp_search_workspace(const char *resp)
{
char *p, *q;
int ws_idx;
}
void
-search_resp_search_window(char *resp)
+search_resp_search_window(const char *resp)
{
char *s;
int idx;
{
xcb_timestamp_t timestamp = 0;
struct swm_region *r = NULL;
- int resize_step = 0;
+ int resize_stp = 0;
struct swm_geometry g;
int top = 0, left = 0, resizing;
int dx, dy;
- unsigned int shape; /* cursor style */
- xcb_cursor_t cursor;
- xcb_font_t cursor_font;
+ xcb_cursor_t cursor;
xcb_query_pointer_reply_t *xpr;
xcb_generic_event_t *evt;
xcb_motion_notify_event_t *mne;
switch (args->id) {
case SWM_ARG_ID_WIDTHSHRINK:
WIDTH(win) -= SWM_RESIZE_STEPS;
- resize_step = 1;
+ resize_stp = 1;
break;
case SWM_ARG_ID_WIDTHGROW:
WIDTH(win) += SWM_RESIZE_STEPS;
- resize_step = 1;
+ resize_stp = 1;
break;
case SWM_ARG_ID_HEIGHTSHRINK:
HEIGHT(win) -= SWM_RESIZE_STEPS;
- resize_step = 1;
+ resize_stp = 1;
break;
case SWM_ARG_ID_HEIGHTGROW:
HEIGHT(win) += SWM_RESIZE_STEPS;
- resize_step = 1;
+ resize_stp = 1;
break;
default:
break;
}
- if (resize_step) {
+ if (resize_stp) {
constrain_window(win, r, 1);
update_window(win);
store_float_geom(win,r);
top = 1;
if (args->id == SWM_ARG_ID_CENTER)
- shape = XC_sizing;
+ cursor = cursors[XC_SIZING].cid;
else if (top)
- shape = (left) ? XC_top_left_corner : XC_top_right_corner;
+ cursor = cursors[left ? XC_TOP_LEFT_CORNER :
+ XC_TOP_RIGHT_CORNER].cid;
else
- shape = (left) ? XC_bottom_left_corner : XC_bottom_right_corner;
-
- cursor_font = xcb_generate_id(conn);
- xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
-
- cursor = xcb_generate_id(conn);
- xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
- shape, shape + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
+ cursor = cursors[left ? XC_BOTTOM_LEFT_CORNER :
+ XC_BOTTOM_RIGHT_CORNER].cid;
xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, cursor,
store_float_geom(win,r);
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
- xcb_free_cursor(conn, cursor);
- xcb_close_font(conn, cursor_font);
free(xpr);
DNPRINTF(SWM_D_EVENT, "resize: done.\n");
}
move(struct ws_win *win, union arg *args)
{
xcb_timestamp_t timestamp = 0;
- int move_step = 0, moving;
+ int move_stp = 0, moving;
struct swm_region *r = NULL;
- xcb_font_t cursor_font;
- xcb_cursor_t cursor;
xcb_query_pointer_reply_t *qpr;
xcb_generic_event_t *evt;
xcb_motion_notify_event_t *mne;
focus_flush();
- move_step = 0;
+ move_stp = 0;
switch (args->id) {
case SWM_ARG_ID_MOVELEFT:
X(win) -= (SWM_MOVE_STEPS - border_width);
- move_step = 1;
+ move_stp = 1;
break;
case SWM_ARG_ID_MOVERIGHT:
X(win) += (SWM_MOVE_STEPS - border_width);
- move_step = 1;
+ move_stp = 1;
break;
case SWM_ARG_ID_MOVEUP:
Y(win) -= (SWM_MOVE_STEPS - border_width);
- move_step = 1;
+ move_stp = 1;
break;
case SWM_ARG_ID_MOVEDOWN:
Y(win) += (SWM_MOVE_STEPS - border_width);
- move_step = 1;
+ move_stp = 1;
break;
default:
break;
}
- if (move_step) {
+ if (move_stp) {
constrain_window(win, r, 0);
update_window(win);
store_float_geom(win, r);
return;
}
- cursor_font = xcb_generate_id(conn);
- xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
-
- cursor = xcb_generate_id(conn);
- xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
- XC_fleur, XC_fleur + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
-
xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
- XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME);
+ XCB_WINDOW_NONE, cursors[XC_FLEUR].cid, XCB_CURRENT_TIME);
/* get cursor offset from window root */
qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id),
NULL);
if (!qpr) {
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
- xcb_free_cursor(conn, cursor);
- xcb_close_font(conn, cursor_font);
return;
}
}
store_float_geom(win, r);
free(qpr);
- xcb_free_cursor(conn, cursor);
- xcb_close_font(conn, cursor_font);
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
DNPRINTF(SWM_D_EVENT, "move: done.\n");
}
focus_flush();
}
-/* user/key callable function IDs */
-enum keyfuncid {
- KF_BAR_TOGGLE,
- KF_BUTTON2,
- KF_CYCLE_LAYOUT,
- KF_FLIP_LAYOUT,
- KF_FLOAT_TOGGLE,
- KF_FOCUS_MAIN,
- KF_FOCUS_NEXT,
- KF_FOCUS_PREV,
- KF_HEIGHT_GROW,
- KF_HEIGHT_SHRINK,
- KF_ICONIFY,
- KF_MASTER_SHRINK,
- KF_MASTER_GROW,
- KF_MASTER_ADD,
- KF_MASTER_DEL,
- KF_MOVE_DOWN,
- KF_MOVE_LEFT,
- KF_MOVE_RIGHT,
- KF_MOVE_UP,
- KF_MVWS_1,
- KF_MVWS_2,
- KF_MVWS_3,
- KF_MVWS_4,
- KF_MVWS_5,
- KF_MVWS_6,
- KF_MVWS_7,
- KF_MVWS_8,
- KF_MVWS_9,
- KF_MVWS_10,
- KF_MVWS_11,
- KF_MVWS_12,
- KF_MVWS_13,
- KF_MVWS_14,
- KF_MVWS_15,
- KF_MVWS_16,
- KF_MVWS_17,
- KF_MVWS_18,
- KF_MVWS_19,
- KF_MVWS_20,
- KF_MVWS_21,
- KF_MVWS_22,
- KF_NAME_WORKSPACE,
- KF_QUIT,
- KF_RAISE_TOGGLE,
- KF_RESTART,
- KF_SCREEN_NEXT,
- KF_SCREEN_PREV,
- KF_SEARCH_WIN,
- KF_SEARCH_WORKSPACE,
- KF_SPAWN_CUSTOM,
- KF_STACK_INC,
- KF_STACK_DEC,
- KF_STACK_RESET,
- KF_SWAP_MAIN,
- KF_SWAP_NEXT,
- KF_SWAP_PREV,
- KF_UNICONIFY,
- KF_VERSION,
- KF_WIDTH_GROW,
- KF_WIDTH_SHRINK,
- KF_WIND_DEL,
- KF_WIND_KILL,
- KF_WS_1,
- KF_WS_2,
- KF_WS_3,
- KF_WS_4,
- KF_WS_5,
- KF_WS_6,
- KF_WS_7,
- KF_WS_8,
- KF_WS_9,
- KF_WS_10,
- KF_WS_11,
- KF_WS_12,
- KF_WS_13,
- KF_WS_14,
- KF_WS_15,
- KF_WS_16,
- KF_WS_17,
- KF_WS_18,
- KF_WS_19,
- KF_WS_20,
- KF_WS_21,
- KF_WS_22,
- KF_WS_NEXT,
- KF_WS_NEXT_ALL,
- KF_WS_PREV,
- KF_WS_PREV_ALL,
- KF_WS_PRIOR,
- KF_DUMPWINS, /* MUST BE LAST */
- KF_INVALID
-};
-
/* key definitions */
struct keyfunc {
char name[SWM_FUNCNAME_LEN];
union arg args;
} keyfuncs[KF_INVALID + 1] = {
/* name function argument */
- { "bar_toggle", bar_toggle, {0} },
+ { "bar_toggle", bar_toggle, {.id = SWM_ARG_ID_BAR_TOGGLE} },
+ { "bar_toggle_ws", bar_toggle, {.id = SWM_ARG_ID_BAR_TOGGLE_WS} },
{ "button2", pressbutton, {2} },
{ "cycle_layout", cycle_layout, {0} },
{ "flip_layout", stack_config, {.id = SWM_ARG_ID_FLIPLAYOUT} },
{ "move_left", move_step, {.id = SWM_ARG_ID_MOVELEFT} },
{ "move_right", move_step, {.id = SWM_ARG_ID_MOVERIGHT} },
{ "move_up", move_step, {.id = SWM_ARG_ID_MOVEUP} },
+ { "mvrg_1", send_to_rg, {.id = 0} },
+ { "mvrg_2", send_to_rg, {.id = 1} },
+ { "mvrg_3", send_to_rg, {.id = 2} },
+ { "mvrg_4", send_to_rg, {.id = 3} },
+ { "mvrg_5", send_to_rg, {.id = 4} },
+ { "mvrg_6", send_to_rg, {.id = 5} },
+ { "mvrg_7", send_to_rg, {.id = 6} },
+ { "mvrg_8", send_to_rg, {.id = 7} },
+ { "mvrg_9", send_to_rg, {.id = 8} },
{ "mvws_1", send_to_ws, {.id = 0} },
{ "mvws_2", send_to_ws, {.id = 1} },
{ "mvws_3", send_to_ws, {.id = 2} },
{ "quit", quit, {0} },
{ "raise_toggle", raise_toggle, {0} },
{ "restart", restart, {0} },
- { "screen_next", cyclescr, {.id = SWM_ARG_ID_CYCLESC_UP} },
- { "screen_prev", cyclescr, {.id = SWM_ARG_ID_CYCLESC_DOWN} },
+ { "rg_1", focusrg, {.id = 0} },
+ { "rg_2", focusrg, {.id = 1} },
+ { "rg_3", focusrg, {.id = 2} },
+ { "rg_4", focusrg, {.id = 3} },
+ { "rg_5", focusrg, {.id = 4} },
+ { "rg_6", focusrg, {.id = 5} },
+ { "rg_7", focusrg, {.id = 6} },
+ { "rg_8", focusrg, {.id = 7} },
+ { "rg_9", focusrg, {.id = 8} },
+ { "rg_next", cyclerg, {.id = SWM_ARG_ID_CYCLERG_UP} },
+ { "rg_prev", cyclerg, {.id = SWM_ARG_ID_CYCLERG_DOWN} },
+ { "screen_next", cyclerg, {.id = SWM_ARG_ID_CYCLERG_UP} },
+ { "screen_prev", cyclerg, {.id = SWM_ARG_ID_CYCLERG_DOWN} },
{ "search_win", search_win, {0} },
{ "search_workspace", search_workspace, {0} },
{ "spawn_custom", NULL, {0} },
{ "dumpwins", dumpwins, {0} }, /* MUST BE LAST */
{ "invalid key func", NULL, {0} },
};
-struct key {
- RB_ENTRY(key) entry;
- unsigned int mod;
- KeySym keysym;
- enum keyfuncid funcid;
- char *spawn_name;
-};
-RB_HEAD(key_tree, key);
int
key_cmp(struct key *kp1, struct key *kp2)
return (0);
}
-RB_GENERATE(key_tree, key, entry, key_cmp);
-struct key_tree keys;
-
/* mouse */
enum { client_click, root_click };
struct button {
buttons[i].mask = mod;
}
-/* spawn */
-struct spawn_prog {
- TAILQ_ENTRY(spawn_prog) entry;
- char *name;
- int argc;
- char **argv;
-};
-TAILQ_HEAD(spawn_list, spawn_prog);
-struct spawn_list spawns = TAILQ_HEAD_INITIALIZER(spawns);
-
int
-spawn_expand(struct swm_region *r, union arg *args, char *spawn_name,
+spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name,
char ***ret_args)
{
struct spawn_prog *prog = NULL;
strdup(r->s->c[SWM_S_COLOR_UNFOCUS].name))
== NULL)
err(1, "spawn_custom color unfocus");
+ } else if (!strcasecmp(ap, "$region_index")) {
+ if (asprintf(&real_args[i], "%d",
+ get_region_index(r) + 1) < 1)
+ err(1, "spawn_custom region index");
+ } else if (!strcasecmp(ap, "$workspace_index")) {
+ if (asprintf(&real_args[i], "%d", r->ws->idx + 1) < 1)
+ err(1, "spawn_custom workspace index");
} else {
/* no match --> copy as is */
if ((real_args[i] = strdup(ap)) == NULL)
}
void
-spawn_custom(struct swm_region *r, union arg *args, char *spawn_name)
+spawn_custom(struct swm_region *r, union arg *args, const char *spawn_name)
{
union arg a;
char **real_args;
}
void
-spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid)
+spawn_select(struct swm_region *r, union arg *args, const char *spawn_name,
+ int *pid)
{
union arg a;
char **real_args;
err(1, "cannot fork");
break;
case 0: /* child */
- if (dup2(select_list_pipe[0], 0) == -1)
+ if (dup2(select_list_pipe[0], STDIN_FILENO) == -1)
err(1, "dup2");
- if (dup2(select_resp_pipe[1], 1) == -1)
+ if (dup2(select_resp_pipe[1], STDOUT_FILENO) == -1)
err(1, "dup2");
close(select_list_pipe[1]);
close(select_resp_pipe[0]);
}
void
-spawn_insert(char *name, char *args)
+spawn_insert(const char *name, const char *args)
{
char *arg, *cp, *ptr;
struct spawn_prog *sp;
}
void
-spawn_replace(struct spawn_prog *sp, char *name, char *args)
+spawn_replace(struct spawn_prog *sp, const char *name, const char *args)
{
DNPRINTF(SWM_D_SPAWN, "spawn_replace: %s [%s]\n", sp->name, name);
}
void
-setspawn(char *name, char *args)
+setspawn(const char *name, const char *args)
{
struct spawn_prog *sp;
int
setconfspawn(char *selector, char *value, int flags)
{
- char *args;
+ char *args;
+ char which[PATH_MAX];
+ size_t i;
/* suppress unused warning since var is needed */
(void)flags;
DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
+ /* verify we have the goods */
+ snprintf(which, sizeof which, "which %s", value);
+ for (i = strlen("which "); i < strlen(which); i++)
+ if (which[i] == ' ') {
+ which[i] = '\0';
+ break;
+ }
+ if (flags == 0 && system(which) != 0)
+ add_startup_exception("could not find %s",
+ &which[strlen("which ")]);
+
setspawn(selector, args);
free(args);
{
setconfspawn("term", "xterm", 0);
setconfspawn("spawn_term", "xterm", 0);
- setconfspawn("screenshot_all", "screenshot.sh full", 0);
- setconfspawn("screenshot_wind", "screenshot.sh window", 0);
- setconfspawn("lock", "xlock", 0);
- setconfspawn("initscr", "initscreen.sh", 0);
setconfspawn("menu", "dmenu_run"
" -fn $bar_font"
" -nb $bar_color"
" -nf $bar_font_color"
" -sb $bar_border"
" -sf $bar_color", 0);
+
+ /* these are not verified for existence */
+ setconfspawn("lock", "xlock", 1);
+ setconfspawn("screenshot_all", "screenshot.sh full", 1);
+ setconfspawn("screenshot_wind", "screenshot.sh window", 1);
+ setconfspawn("initscr", "initscreen.sh", 1);
+
}
/* key bindings */
}
char *
-strdupsafe(char *str)
+strdupsafe(const char *str)
{
if (str == NULL)
return (NULL);
}
void
-key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid, char *spawn_name)
+key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid,
+ const char *spawn_name)
{
struct key *kp;
void
key_replace(struct key *kp, unsigned int mod, KeySym ks, enum keyfuncid kfid,
- char *spawn_name)
+ const char *spawn_name)
{
DNPRINTF(SWM_D_KEY, "key_replace: %s [%s]\n", keyfuncs[kp->funcid].name,
spawn_name);
void
setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid,
- char *spawn_name)
+ const char *spawn_name)
{
struct key *kp;
return;
}
if (kfid == KF_INVALID) {
- warnx("error: setkeybinding: cannot find mod/key combination");
+ warnx("bind: Key combination already unbound.");
DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n");
return;
}
setup_keys(void)
{
#define MODKEY_SHIFT MODKEY | XCB_MOD_MASK_SHIFT
+ setkeybinding(MODKEY, XK_b, KF_BAR_TOGGLE, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_b, KF_BAR_TOGGLE_WS,NULL);
+ setkeybinding(MODKEY, XK_v, KF_BUTTON2, NULL);
setkeybinding(MODKEY, XK_space, KF_CYCLE_LAYOUT,NULL);
setkeybinding(MODKEY_SHIFT, XK_backslash, KF_FLIP_LAYOUT, NULL);
- setkeybinding(MODKEY_SHIFT, XK_space, KF_STACK_RESET, NULL);
+ setkeybinding(MODKEY, XK_t, KF_FLOAT_TOGGLE,NULL);
+ setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, NULL);
+ setkeybinding(MODKEY, XK_j, KF_FOCUS_NEXT, NULL);
+ setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL);
+ setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Tab, KF_FOCUS_PREV, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL);
+ setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL);
setkeybinding(MODKEY, XK_h, KF_MASTER_SHRINK, NULL);
setkeybinding(MODKEY, XK_l, KF_MASTER_GROW, NULL);
setkeybinding(MODKEY, XK_comma, KF_MASTER_ADD, NULL);
setkeybinding(MODKEY, XK_period, KF_MASTER_DEL, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_bracketright,KF_MOVE_DOWN,NULL);
+ setkeybinding(MODKEY, XK_bracketleft, KF_MOVE_LEFT,NULL);
+ setkeybinding(MODKEY, XK_bracketright,KF_MOVE_RIGHT,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_bracketleft, KF_MOVE_UP, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_End, KF_MVRG_1, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Down, KF_MVRG_2, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Next, KF_MVRG_3, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Left, KF_MVRG_4, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Begin, KF_MVRG_5, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Right, KF_MVRG_6, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Home, KF_MVRG_7, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Up, KF_MVRG_8, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_KP_Prior, KF_MVRG_9, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_1, KF_MVWS_1, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_2, KF_MVWS_2, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_3, KF_MVWS_3, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_4, KF_MVWS_4, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_5, KF_MVWS_5, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_6, KF_MVWS_6, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_7, KF_MVWS_7, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_8, KF_MVWS_8, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_9, KF_MVWS_9, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_0, KF_MVWS_10, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F1, KF_MVWS_11, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F2, KF_MVWS_12, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F3, KF_MVWS_13, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F4, KF_MVWS_14, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F5, KF_MVWS_15, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F6, KF_MVWS_16, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F7, KF_MVWS_17, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F8, KF_MVWS_18, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F9, KF_MVWS_19, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F10, KF_MVWS_20, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F11, KF_MVWS_21, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F12, KF_MVWS_22, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_slash, KF_NAME_WORKSPACE,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_q, KF_QUIT, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_r, KF_RAISE_TOGGLE,NULL);
+ setkeybinding(MODKEY, XK_q, KF_RESTART, NULL);
+ setkeybinding(MODKEY, XK_KP_End, KF_RG_1, NULL);
+ setkeybinding(MODKEY, XK_KP_Down, KF_RG_2, NULL);
+ setkeybinding(MODKEY, XK_KP_Next, KF_RG_3, NULL);
+ setkeybinding(MODKEY, XK_KP_Left, KF_RG_4, NULL);
+ setkeybinding(MODKEY, XK_KP_Begin, KF_RG_5, NULL);
+ setkeybinding(MODKEY, XK_KP_Right, KF_RG_6, NULL);
+ setkeybinding(MODKEY, XK_KP_Home, KF_RG_7, NULL);
+ setkeybinding(MODKEY, XK_KP_Up, KF_RG_8, NULL);
+ setkeybinding(MODKEY, XK_KP_Prior, KF_RG_9, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Right, KF_RG_NEXT, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Left, KF_RG_PREV, NULL);
+ setkeybinding(MODKEY, XK_f, KF_SEARCH_WIN, NULL);
+ setkeybinding(MODKEY, XK_slash, KF_SEARCH_WORKSPACE,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_i, KF_SPAWN_CUSTOM,"initscr");
+ setkeybinding(MODKEY_SHIFT, XK_Delete, KF_SPAWN_CUSTOM,"lock");
+ setkeybinding(MODKEY, XK_p, KF_SPAWN_CUSTOM,"menu");
+ setkeybinding(MODKEY, XK_s, KF_SPAWN_CUSTOM,"screenshot_all");
+ setkeybinding(MODKEY_SHIFT, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind");
+ setkeybinding(MODKEY_SHIFT, XK_Return, KF_SPAWN_CUSTOM,"term");
setkeybinding(MODKEY_SHIFT, XK_comma, KF_STACK_INC, NULL);
setkeybinding(MODKEY_SHIFT, XK_period, KF_STACK_DEC, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_space, KF_STACK_RESET, NULL);
setkeybinding(MODKEY, XK_Return, KF_SWAP_MAIN, NULL);
- setkeybinding(MODKEY, XK_j, KF_FOCUS_NEXT, NULL);
- setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL);
setkeybinding(MODKEY_SHIFT, XK_j, KF_SWAP_NEXT, NULL);
setkeybinding(MODKEY_SHIFT, XK_k, KF_SWAP_PREV, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Return, KF_SPAWN_CUSTOM,"term");
- setkeybinding(MODKEY, XK_p, KF_SPAWN_CUSTOM,"menu");
- setkeybinding(MODKEY_SHIFT, XK_q, KF_QUIT, NULL);
- setkeybinding(MODKEY, XK_q, KF_RESTART, NULL);
- setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_w, KF_UNICONIFY, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_v, KF_VERSION, NULL);
+ setkeybinding(MODKEY, XK_equal, KF_WIDTH_GROW, NULL);
+ setkeybinding(MODKEY, XK_minus, KF_WIDTH_SHRINK,NULL);
+ setkeybinding(MODKEY, XK_x, KF_WIND_DEL, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_x, KF_WIND_KILL, NULL);
setkeybinding(MODKEY, XK_1, KF_WS_1, NULL);
setkeybinding(MODKEY, XK_2, KF_WS_2, NULL);
setkeybinding(MODKEY, XK_3, KF_WS_3, NULL);
setkeybinding(MODKEY, XK_Up, KF_WS_NEXT_ALL, NULL);
setkeybinding(MODKEY, XK_Down, KF_WS_PREV_ALL, NULL);
setkeybinding(MODKEY, XK_a, KF_WS_PRIOR, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Right, KF_SCREEN_NEXT, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Left, KF_SCREEN_PREV, NULL);
- setkeybinding(MODKEY_SHIFT, XK_1, KF_MVWS_1, NULL);
- setkeybinding(MODKEY_SHIFT, XK_2, KF_MVWS_2, NULL);
- setkeybinding(MODKEY_SHIFT, XK_3, KF_MVWS_3, NULL);
- setkeybinding(MODKEY_SHIFT, XK_4, KF_MVWS_4, NULL);
- setkeybinding(MODKEY_SHIFT, XK_5, KF_MVWS_5, NULL);
- setkeybinding(MODKEY_SHIFT, XK_6, KF_MVWS_6, NULL);
- setkeybinding(MODKEY_SHIFT, XK_7, KF_MVWS_7, NULL);
- setkeybinding(MODKEY_SHIFT, XK_8, KF_MVWS_8, NULL);
- setkeybinding(MODKEY_SHIFT, XK_9, KF_MVWS_9, NULL);
- setkeybinding(MODKEY_SHIFT, XK_0, KF_MVWS_10, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F1, KF_MVWS_11, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F2, KF_MVWS_12, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F3, KF_MVWS_13, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F4, KF_MVWS_14, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F5, KF_MVWS_15, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F6, KF_MVWS_16, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F7, KF_MVWS_17, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F8, KF_MVWS_18, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F9, KF_MVWS_19, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F10, KF_MVWS_20, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F11, KF_MVWS_21, NULL);
- setkeybinding(MODKEY_SHIFT, XK_F12, KF_MVWS_22, NULL);
- setkeybinding(MODKEY, XK_b, KF_BAR_TOGGLE, NULL);
- setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Tab, KF_FOCUS_PREV, NULL);
- setkeybinding(MODKEY_SHIFT, XK_x, KF_WIND_KILL, NULL);
- setkeybinding(MODKEY, XK_x, KF_WIND_DEL, NULL);
- setkeybinding(MODKEY, XK_s, KF_SPAWN_CUSTOM,"screenshot_all");
- setkeybinding(MODKEY_SHIFT, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind");
- setkeybinding(MODKEY, XK_t, KF_FLOAT_TOGGLE,NULL);
- setkeybinding(MODKEY_SHIFT, XK_v, KF_VERSION, NULL);
- setkeybinding(MODKEY_SHIFT, XK_Delete, KF_SPAWN_CUSTOM,"lock");
- setkeybinding(MODKEY_SHIFT, XK_i, KF_SPAWN_CUSTOM,"initscr");
- setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL);
- setkeybinding(MODKEY_SHIFT, XK_w, KF_UNICONIFY, NULL);
- setkeybinding(MODKEY_SHIFT, XK_r, KF_RAISE_TOGGLE,NULL);
- setkeybinding(MODKEY, XK_v, KF_BUTTON2, NULL);
- setkeybinding(MODKEY, XK_equal, KF_WIDTH_GROW, NULL);
- setkeybinding(MODKEY, XK_minus, KF_WIDTH_SHRINK,NULL);
- setkeybinding(MODKEY_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL);
- setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL);
- setkeybinding(MODKEY, XK_bracketleft, KF_MOVE_LEFT,NULL);
- setkeybinding(MODKEY, XK_bracketright,KF_MOVE_RIGHT,NULL);
- setkeybinding(MODKEY_SHIFT, XK_bracketleft, KF_MOVE_UP, NULL);
- setkeybinding(MODKEY_SHIFT, XK_bracketright,KF_MOVE_DOWN,NULL);
- setkeybinding(MODKEY_SHIFT, XK_slash, KF_NAME_WORKSPACE,NULL);
- setkeybinding(MODKEY, XK_slash, KF_SEARCH_WORKSPACE,NULL);
- setkeybinding(MODKEY, XK_f, KF_SEARCH_WIN, NULL);
#ifdef SWM_DEBUG
setkeybinding(MODKEY_SHIFT, XK_d, KF_DUMPWINS, NULL);
#endif
{
struct key *kp;
int num_screens, k, j;
- unsigned int modifiers[3];
+ unsigned int modifiers[4];
xcb_keycode_t *code;
DNPRINTF(SWM_D_MISC, "grabkeys\n");
modifiers[0] = 0;
modifiers[1] = numlockmask;
- modifiers[2] = numlockmask | XCB_MOD_MASK_LOCK;
+ modifiers[2] = XCB_MOD_MASK_LOCK;
+ modifiers[3] = numlockmask | XCB_MOD_MASK_LOCK;
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
for (k = 0; k < num_screens; k++) {
screens[k].root,
kp->mod | modifiers[j],
*code, XCB_GRAB_MODE_SYNC,
- XCB_GRAB_MODE_ASYNC);
+ XCB_GRAB_MODE_SYNC);
free(code);
}
}
void
grabbuttons(struct ws_win *win)
{
- int i;
+ unsigned int modifiers[4];
+ int i, j;
DNPRINTF(SWM_D_MOUSE, "grabbuttons: win 0x%x\n", win->id);
+ updatenumlockmask();
+
+ modifiers[0] = 0;
+ modifiers[1] = numlockmask;
+ modifiers[2] = XCB_MOD_MASK_LOCK;
+ modifiers[3] = numlockmask | XCB_MOD_MASK_LOCK;
for (i = 0; i < LENGTH(buttons); i++)
if (buttons[i].action == client_click)
- xcb_grab_button(conn, 0, win->id, BUTTONMASK,
- XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
- XCB_WINDOW_NONE, XCB_CURSOR_NONE,
- buttons[i].button, buttons[i].mask);
+ for (j = 0; j < LENGTH(modifiers); ++j)
+ xcb_grab_button(conn, 0, win->id, BUTTONMASK,
+ XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
+ XCB_WINDOW_NONE, XCB_CURSOR_NONE,
+ buttons[i].button, buttons[i].mask |
+ modifiers[j]);
}
const char *quirkname[] = {
DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s [%lu]\n", class, name,
quirk);
+ /* Remove/replace existing quirk. */
TAILQ_FOREACH(qp, &quirks, entry) {
if (!strcmp(qp->class, class) && !strcmp(qp->name, name)) {
if (!quirk)
return;
}
}
- if (!quirk) {
- warnx("error: setquirk: cannot find class/name combination");
- return;
- }
- quirk_insert(class, name, quirk);
+ /* Only insert if quirk is not NONE. */
+ if (quirk)
+ quirk_insert(class, name, quirk);
+
DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n");
}
SWM_S_BAR_BORDER_WIDTH,
SWM_S_BAR_DELAY,
SWM_S_BAR_ENABLED,
+ SWM_S_BAR_ENABLED_WS,
SWM_S_BAR_FONT,
SWM_S_BAR_FORMAT,
SWM_S_BAR_JUSTIFY,
SWM_S_FOCUS_CLOSE_WRAP,
SWM_S_FOCUS_DEFAULT,
SWM_S_FOCUS_MODE,
+ SWM_S_REGION_PADDING,
SWM_S_SPAWN_ORDER,
SWM_S_SPAWN_TERM,
SWM_S_SS_APP,
SWM_S_SS_ENABLED,
SWM_S_STACK_ENABLED,
SWM_S_TERM_WIDTH,
+ SWM_S_TILE_GAP,
SWM_S_TITLE_CLASS_ENABLED,
SWM_S_TITLE_NAME_ENABLED,
SWM_S_URGENT_ENABLED,
int
setconfvalue(char *selector, char *value, int flags)
{
- int i;
- char *b;
+ struct workspace *ws;
+ int i, ws_id, num_screens;
+ char *b;
/* suppress unused warning since var is needed */
(void)selector;
bar_border_width = 0;
break;
case SWM_S_BAR_DELAY:
- bar_delay = atoi(value);
+ /* No longer needed; leave to not break old conf files. */
break;
case SWM_S_BAR_ENABLED:
bar_enabled = atoi(value);
break;
+ case SWM_S_BAR_ENABLED_WS:
+ ws_id = atoi(selector) - 1;
+ if (ws_id < 0 || ws_id >= workspace_limit)
+ errx(1, "setconfvalue: bar_enabled_ws: invalid "
+ "workspace %d.", ws_id + 1);
+
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ for (i = 0; i < num_screens; i++) {
+ ws = (struct workspace *)&screens[i].ws;
+ ws[ws_id].bar_enabled = atoi(value);
+ }
+ break;
case SWM_S_BAR_FONT:
b = bar_fonts;
if (asprintf(&bar_fonts, "%s,%s", value, bar_fonts) == -1)
else
errx(1, "focus_mode");
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"))
spawn_position = SWM_STACK_BOTTOM;
setconfspawn("spawn_term", value, 0);
break;
case SWM_S_SS_APP:
+ /* No longer needed; leave to not break old conf files. */
break;
case SWM_S_SS_ENABLED:
- ss_enabled = atoi(value);
+ /* No longer needed; leave to not break old conf files. */
break;
case SWM_S_STACK_ENABLED:
stack_enabled = atoi(value);
if (term_width < 0)
term_width = 0;
break;
+ case SWM_S_TILE_GAP:
+ tile_gap = atoi(value);
+ if (tile_gap < 0)
+ tile_gap = 0;
+ break;
case SWM_S_TITLE_CLASS_ENABLED:
title_class_enabled = atoi(value);
break;
{
int ws_id;
char s[1024];
- char *ap, *sp = s;
+ char *ap, *sp;
union arg a;
int argc = 0;
pid_t pid;
if (ws_id < 0 || ws_id >= workspace_limit)
errx(1, "autorun: invalid workspace %d", ws_id + 1);
+ sp = expand_tilde((char *)&s);
+
/*
* This is a little intricate
*
err(1, "setautorun: realloc");
a.argv[argc - 1] = ap;
}
+ free(sp);
if ((a.argv = realloc(a.argv, (argc + 1) * sizeof(char *))) == NULL)
err(1, "setautorun: realloc");
int funcflags;
};
struct config_option configopt[] = {
- { "bar_enabled", setconfvalue, SWM_S_BAR_ENABLED },
+ { "autorun", setautorun, 0 },
+ { "bar_action", setconfvalue, SWM_S_BAR_ACTION },
{ "bar_at_bottom", setconfvalue, SWM_S_BAR_AT_BOTTOM },
{ "bar_border", setconfcolor, SWM_S_COLOR_BAR_BORDER },
+ { "bar_border_unfocus", setconfcolor, SWM_S_COLOR_BAR_BORDER_UNFOCUS },
{ "bar_border_width", setconfvalue, SWM_S_BAR_BORDER_WIDTH },
{ "bar_color", setconfcolor, SWM_S_COLOR_BAR },
- { "bar_font_color", setconfcolor, SWM_S_COLOR_BAR_FONT },
- { "bar_font", setconfvalue, SWM_S_BAR_FONT },
- { "bar_action", setconfvalue, SWM_S_BAR_ACTION },
{ "bar_delay", setconfvalue, SWM_S_BAR_DELAY },
- { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY },
+ { "bar_enabled", setconfvalue, SWM_S_BAR_ENABLED },
+ { "bar_enabled_ws", setconfvalue, SWM_S_BAR_ENABLED_WS },
+ { "bar_font", setconfvalue, SWM_S_BAR_FONT },
+ { "bar_font_color", setconfcolor, SWM_S_COLOR_BAR_FONT },
{ "bar_format", setconfvalue, SWM_S_BAR_FORMAT },
- { "keyboard_mapping", setkeymapping, 0 },
+ { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY },
{ "bind", setconfbinding, 0 },
- { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED },
+ { "border_width", setconfvalue, SWM_S_BORDER_WIDTH },
{ "clock_enabled", setconfvalue, SWM_S_CLOCK_ENABLED },
{ "clock_format", setconfvalue, SWM_S_CLOCK_FORMAT },
{ "color_focus", setconfcolor, SWM_S_COLOR_FOCUS },
{ "color_unfocus", setconfcolor, SWM_S_COLOR_UNFOCUS },
{ "cycle_empty", setconfvalue, SWM_S_CYCLE_EMPTY },
{ "cycle_visible", setconfvalue, SWM_S_CYCLE_VISIBLE },
- { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT },
{ "dialog_ratio", setconfvalue, SWM_S_DIALOG_RATIO },
- { "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT },
+ { "disable_border", setconfvalue, SWM_S_DISABLE_BORDER },
+ { "focus_close", setconfvalue, SWM_S_FOCUS_CLOSE },
+ { "focus_close_wrap", setconfvalue, SWM_S_FOCUS_CLOSE_WRAP },
+ { "focus_default", setconfvalue, SWM_S_FOCUS_DEFAULT },
+ { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE },
+ { "keyboard_mapping", setkeymapping, 0 },
+ { "layout", setlayout, 0 },
{ "modkey", setconfmodkey, 0 },
{ "program", setconfspawn, 0 },
{ "quirk", setconfquirk, 0 },
{ "region", setconfregion, 0 },
- { "spawn_term", setconfvalue, SWM_S_SPAWN_TERM },
- { "screenshot_enabled", setconfvalue, SWM_S_SS_ENABLED },
+ { "region_padding", setconfvalue, SWM_S_REGION_PADDING },
{ "screenshot_app", setconfvalue, SWM_S_SS_APP },
- { "window_name_enabled", setconfvalue, SWM_S_WINDOW_NAME_ENABLED },
- { "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED },
+ { "screenshot_enabled", setconfvalue, SWM_S_SS_ENABLED },
+ { "spawn_position", setconfvalue, SWM_S_SPAWN_ORDER },
+ { "spawn_term", setconfvalue, SWM_S_SPAWN_TERM },
+ { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED },
{ "term_width", setconfvalue, SWM_S_TERM_WIDTH },
+ { "tile_gap", setconfvalue, SWM_S_TILE_GAP },
{ "title_class_enabled", setconfvalue, SWM_S_TITLE_CLASS_ENABLED },
{ "title_name_enabled", setconfvalue, SWM_S_TITLE_NAME_ENABLED },
- { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE },
- { "focus_close", setconfvalue, SWM_S_FOCUS_CLOSE },
- { "focus_close_wrap", setconfvalue, SWM_S_FOCUS_CLOSE_WRAP },
- { "focus_default", setconfvalue, SWM_S_FOCUS_DEFAULT },
- { "spawn_position", setconfvalue, SWM_S_SPAWN_ORDER },
- { "disable_border", setconfvalue, SWM_S_DISABLE_BORDER },
- { "border_width", setconfvalue, SWM_S_BORDER_WIDTH },
- { "autorun", setautorun, 0 },
- { "layout", setlayout, 0 },
+ { "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED },
+ { "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT },
+ { "window_name_enabled", setconfvalue, SWM_S_WINDOW_NAME_ENABLED },
+ { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT },
};
+void
+_add_startup_exception(const char *fmt, va_list ap)
+{
+ if (vasprintf(&startup_exception, fmt, ap) == -1)
+ warn("%s: asprintf", __func__);
+}
+
+void
+add_startup_exception(const char *fmt, ...)
+{
+ va_list ap;
+
+ nr_exceptions++;
+
+ if (startup_exception)
+ return;
+
+ /* force bar to be enabled due to exception */
+ bar_enabled = 1;
+
+ va_start(ap, fmt);
+ _add_startup_exception(fmt, ap);
+ va_end(ap);
+}
+
int
-conf_load(char *filename, int keymapping)
+conf_load(const char *filename, int keymapping)
{
FILE *config;
- char *line, *cp, *optsub, *optval;
+ char *line = NULL, *cp, *optsub, *optval;
size_t linelen, lineno = 0;
int wordlen, i, optidx;
struct config_option *opt = NULL;
}
while (!feof(config)) {
+ if (line)
+ free(line);
+
if ((line = fparseln(config, &linelen, &lineno, NULL, 0))
== NULL) {
if (ferror(config))
cp += strspn(cp, " \t\n"); /* eat whitespace */
if (cp[0] == '\0') {
/* empty line */
- free(line);
continue;
}
/* get config option */
wordlen = strcspn(cp, "=[ \t\n");
if (wordlen == 0) {
- warnx("%s: line %zd: no option found",
+ add_startup_exception("%s: line %zd: no option found",
filename, lineno);
- goto out;
+ continue;
}
optidx = -1;
for (i = 0; i < LENGTH(configopt); i++) {
}
}
if (optidx == -1) {
- warnx("%s: line %zd: unknown option %.*s",
- filename, lineno, wordlen, cp);
- goto out;
+ add_startup_exception("%s: line %zd: unknown option "
+ "%.*s", filename, lineno, wordlen, cp);
+ continue;
}
if (keymapping && opt && strcmp(opt->optname, "bind")) {
- warnx("%s: line %zd: invalid option %.*s",
- filename, lineno, wordlen, cp);
- goto out;
+ add_startup_exception("%s: line %zd: invalid option "
+ "%.*s", filename, lineno, wordlen, cp);
+ continue;
}
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;
if (*cp == '[') {
wordlen = strcspn(cp, "]");
if (*cp != ']') {
if (wordlen == 0) {
- warnx("%s: line %zd: syntax error",
- filename, lineno);
- goto out;
+ add_startup_exception("%s: line %zd: "
+ "syntax error", filename, lineno);
+ goto invalid;
}
if (asprintf(&optsub, "%.*s", wordlen, cp) ==
-1) {
- warnx("%s: line %zd: unable to allocate"
- "memory for selector", filename,
- lineno);
- goto out;
+ add_startup_exception("%s: line %zd: "
+ "unable to allocatememory for "
+ "selector", filename, lineno);
+ goto invalid;
}
}
cp += wordlen;
cp += strspn(cp, "= \t\n"); /* eat trailing */
/* get RHS value */
optval = strdup(cp);
+ if (strlen(optval) == 0) {
+ add_startup_exception("%s: line %zd: must supply value "
+ "to %s", filename, lineno,
+ configopt[optidx].optname);
+ goto invalid;
+ }
/* call function to deal with it all */
if (configopt[optidx].func(optsub, optval,
- configopt[optidx].funcflags) != 0)
- errx(1, "%s: line %zd: invalid data for %s",
- filename, lineno, configopt[optidx].optname);
- free(optval);
- free(optsub);
- free(line);
+ configopt[optidx].funcflags) != 0) {
+ add_startup_exception("%s: line %zd: invalid data for "
+ "%s", filename, lineno, configopt[optidx].optname);
+ goto invalid;
+ }
+invalid:
+ if (optval) {
+ free(optval);
+ optval = NULL;
+ }
+ if (optsub) {
+ free(optsub);
+ optsub = NULL;
+ }
}
+ if (line)
+ free(line);
fclose(config);
DNPRINTF(SWM_D_CONF, "conf_load: end\n");
return (0);
-
-out:
- free(line);
- fclose(config);
- DNPRINTF(SWM_D_CONF, "conf_load: end with error.\n");
-
- return (1);
}
void
for (i = 0; i < num_screens; i++)
TAILQ_FOREACH(r, &screens[i].rl, entry)
if (e->window == WINID(r->bar))
- bar_update();
+ bar_draw();
xcb_flush(conn);
}
keysym = xcb_key_press_lookup_keysym(syms, e, 0);
- DNPRINTF(SWM_D_EVENT, "keypress: %u %u\n", e->detail, keysym);
+ DNPRINTF(SWM_D_EVENT, "keypress: keysym: %u, win (x,y): 0x%x (%d,%d), "
+ "detail: %u, time: %u, root (x,y): 0x%x (%d,%d), child: 0x%x, "
+ "state: %u, same_screen: %s\n", keysym, e->event, e->event_x,
+ e->event_y, e->detail, e->time, e->root, e->root_x, e->root_y,
+ e->child, e->state, YESNO(e->same_screen));
if ((kp = key_lookup(CLEANMASK(e->state), keysym)) == NULL)
- return;
+ goto out;
last_event_time = e->time;
else if (keyfuncs[kp->funcid].func)
keyfuncs[kp->funcid].func(root_to_region(e->root, SWM_CK_ALL),
&(keyfuncs[kp->funcid].args));
+
+out:
+ /* Unfreeze grab events. */
+ xcb_allow_events(conn, XCB_ALLOW_ASYNC_KEYBOARD, e->time);
+ xcb_flush(conn);
+
+ DNPRINTF(SWM_D_EVENT, "keypress: done.\n");
}
void
/* Focus on empty region */
/* If no windows on region if its empty. */
r = root_to_region(e->root, SWM_CK_POINTER);
+ if (r == NULL) {
+ DNPRINTF(SWM_D_EVENT, "buttonpress: "
+ "NULL region; ignoring.\n");
+ goto out;
+ }
+
if (TAILQ_EMPTY(&r->ws->winlist)) {
old_r = root_to_region(e->root, SWM_CK_FOCUS);
if (old_r && old_r != r)
XCB_INPUT_FOCUS_PARENT, e->root, e->time);
/* Clear bar since empty. */
- bar_update();
+ bar_draw();
handled = 1;
goto out;
}
if (win == NULL)
- return;
+ goto out;
last_event_time = e->time;
win->g_floatvalid = 1;
- if (win->floating && r) {
+ if (win->floating && r && (win->transient ||
+ win->ws->cur_layout != &layouts[SWM_MAX_STACK])) {
WIDTH(win) = win->g_float.w;
HEIGHT(win) = win->g_float.h;
- stack_floater(win, win->ws->r);
-
- focus_flush();
+ if (r) {
+ stack_floater(win, r);
+ focus_flush();
+ }
} else {
config_win(win, e);
xcb_flush(conn);
config_win(win, e);
xcb_flush(conn);
}
+
+ DNPRINTF(SWM_D_EVENT, "configurerequest: done.\n");
}
void
enternotify(xcb_enter_notify_event_t *e)
{
struct ws_win *win;
- struct swm_region *old_r, *r;
+ 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), "
if (e->event == e->root) {
/* If no windows on pointer region, then focus root. */
r = root_to_region(e->root, SWM_CK_POINTER);
- if (TAILQ_EMPTY(&r->ws->winlist)) {
- old_r = root_to_region(e->root, SWM_CK_FOCUS);
- if (old_r && old_r != r)
- unfocus_win(old_r->ws->focus);
-
- xcb_set_input_focus(conn,
- XCB_INPUT_FOCUS_PARENT, e->root, e->time);
-
- /* Clear bar since empty. */
- bar_update();
-
- focus_flush();
+ if (r == NULL) {
+ DNPRINTF(SWM_D_EVENT, "enterntoify: "
+ "NULL region; ignoring.\n");
+ return;
}
+
+ focus_region(r);
} else {
DNPRINTF(SWM_D_EVENT, "enternotify: window is NULL; "
"ignoring\n");
+ return;
}
- return;
+ } else {
+ focus_win(get_focus_magic(win));
}
- focus_win(get_focus_magic(win));
-
- xcb_flush(conn);
+ focus_flush();
}
#ifdef SWM_DEBUG
}
#endif
-/* lets us use one switch statement for arbitrary mode/detail combinations */
-#define MERGE_MEMBERS(a,b) (((a & 0xffff) << 16) | (b & 0xffff))
-
void
mapnotify(xcb_map_notify_event_t *e)
{
if (win->ws->focus_pending == win) {
focus_win(win);
win->ws->focus_pending = NULL;
+ focus_flush();
}
}
win = manage_window(e->window,
(war->map_state == XCB_MAP_STATE_VIEWABLE));
+ /* The new window should get focus; prepare. */
+ if (focus_mode != SWM_FOCUS_FOLLOW)
+ win->ws->focus_pending = get_focus_magic(win);
+
/* All windows need to be mapped if they are in the current workspace.*/
if (win->ws->r)
stack();
- /* The new window should get focus. */
- if (focus_mode != SWM_FOCUS_FOLLOW)
- win->ws->focus_pending = get_focus_magic(win);
-
/* Ignore EnterNotify to handle the mapnotify without interference. */
if (focus_mode == SWM_FOCUS_DEFAULT)
event_drain(XCB_ENTER_NOTIFY);
DNPRINTF(SWM_D_EVENT, "maprequest: done.\n");
}
+void
+motionnotify(xcb_motion_notify_event_t *e)
+{
+ struct swm_region *r;
+ 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",
+ e->time, e->event, e->event_x, e->event_y,
+ get_notify_detail_label(e->detail), e->detail,
+ e->root, e->root_x, e->root_y, e->child,
+ YESNO(e->same_screen), e->state);
+
+ last_event_time = e->time;
+
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ for (i = 0; i < num_screens; i++)
+ if (screens[i].root == e->root)
+ break;
+
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
+ if (X(r) <= e->root_x && e->root_x < MAX_X(r) &&
+ Y(r) <= e->root_y && e->root_y < MAX_Y(r))
+ break;
+
+ focus_region(r);
+}
+
#ifdef SWM_DEBUG
char *
get_atom_name(xcb_atom_t atom)
name = get_atom_name(e->atom);
DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%x, atom: %s(%u), "
- "time: %#x\n", e->window, name, e->atom, e->time);
+ "time: %#x, state: %u\n", e->window, name, e->atom, e->time,
+ e->state);
free(name);
#endif
win = find_window(e->window);
}
} else if (e->atom == XCB_ATOM_WM_CLASS ||
e->atom == XCB_ATOM_WM_NAME) {
- bar_update();
+ bar_draw();
}
xcb_flush(conn);
DNPRINTF(SWM_D_EVENT, "unmapnotify: window: 0x%x\n", e->window);
- /* determine if we need to help unmanage this window */
+ /* If we aren't managing the window, then ignore. */
win = find_window(e->window);
- if (win == NULL)
+ if (win == NULL || win->id != e->window)
return;
- win->mapped = 0;
ws = win->ws;
- if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL) {
+ if (getstate(e->window) != XCB_ICCCM_WM_STATE_ICONIC)
set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
- /* If we were focused, make sure we focus on something else. */
- if (win == ws->focus)
- if (focus_mode != SWM_FOCUS_FOLLOW)
+ if (win->mapped) {
+ /* window unmapped itself */
+ /* do unmap/unfocus/restack and unmanage */
+ win->mapped = 0;
+
+ /* If win was focused, make sure to focus on something else. */
+ if (win == ws->focus) {
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
ws->focus_pending = get_focus_prev(win);
+ DNPRINTF(SWM_D_EVENT, "unmapnotify: "
+ "focus_pending: 0x%x\n",
+ WINID(ws->focus_pending));
+ }
+
+ unfocus_win(win);
+ }
- unfocus_win(win);
unmanage_window(win);
- stack();
- DNPRINTF(SWM_D_EVENT, "unmapnotify: focus_pending: 0x%x\n",
- WINID(ws->focus_pending));
+ if (ws->r)
+ stack();
- if (focus_mode != SWM_FOCUS_FOLLOW) {
+ if (focus_mode == SWM_FOCUS_FOLLOW) {
+ if (ws->r)
+ focus_win(get_pointer_win(ws->r->s->root));
+ } else {
if (ws->focus_pending) {
focus_win(ws->focus_pending);
ws->focus_pending = NULL;
}
}
-
- focus_flush();
- } else if (focus_mode == SWM_FOCUS_FOLLOW) {
- if (ws->r) {
- focus_win(get_pointer_win(ws->r->s->root));
- xcb_flush(conn);
- }
}
+
+ if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL)
+ set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
+
+ focus_flush();
}
#if 0
if (win == NULL) {
if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) {
+ /* Manage the window with maprequest. */
DNPRINTF(SWM_D_EVENT, "clientmessage: request focus on "
"unmanaged window.\n");
mre.window = e->window;
stack();
}
- xcb_flush(conn);
+ focus_flush();
}
void
struct swm_region *r, *n;
struct workspace *ws = NULL;
int i;
+ uint32_t wa[1];
DNPRINTF(SWM_D_MISC, "new region: screen[%d]:%dx%d+%d+%d\n",
s->idx, w, h, x, y);
while (n) {
r = n;
n = TAILQ_NEXT(r, entry);
- if (X(r) < (x + w) &&
- (X(r) + WIDTH(r)) > x &&
- Y(r) < (y + h) &&
- (Y(r) + HEIGHT(r)) > y) {
+ if (X(r) < (x + w) && (X(r) + WIDTH(r)) > x &&
+ Y(r) < (y + h) && (Y(r) + HEIGHT(r)) > y) {
if (r->ws->r != NULL)
r->ws->old_r = r->ws->r;
r->ws->r = NULL;
bar_cleanup(r);
+ xcb_destroy_window(conn, r->id);
TAILQ_REMOVE(&s->rl, r, entry);
TAILQ_INSERT_TAIL(&s->orl, r, entry);
}
ws->r = r;
outputs++;
TAILQ_INSERT_TAIL(&s->rl, r, entry);
+
+ /* Invisible region window to detect pointer events on empty regions. */
+ r->id = xcb_generate_id(conn);
+ wa[0] = XCB_EVENT_MASK_POINTER_MOTION |
+ XCB_EVENT_MASK_POINTER_MOTION_HINT;
+
+ xcb_create_window(conn, XCB_COPY_FROM_PARENT, r->id, r->s->root,
+ X(r), Y(r), WIDTH(r), HEIGHT(r), 0, XCB_WINDOW_CLASS_INPUT_ONLY,
+ XCB_COPY_FROM_PARENT, XCB_CW_EVENT_MASK, wa);
+
+ xcb_map_window(conn, r->id);
}
void
xcb_randr_crtc_t *crtc;
xcb_screen_t *screen;
+ DNPRINTF(SWM_D_MISC, "scan_xrandr: screen: %d\n", i);
+
if ((screen = get_screen(i)) == NULL)
errx(1, "ERROR: can't get screen %d.", i);
while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) {
r->ws->old_r = r->ws->r = NULL;
bar_cleanup(r);
+ xcb_destroy_window(conn, r->id);
TAILQ_REMOVE(&screens[i].rl, r, entry);
TAILQ_INSERT_TAIL(&screens[i].orl, r, entry);
+
+ if (r->s->r_focus == r)
+ r->s->r_focus = NULL;
}
outputs = 0;
new_region(&screens[i], 0, 0,
screen->width_in_pixels,
screen->height_in_pixels);
- return;
+ goto out;
} else
ncrtc = srr->num_crtcs;
free(cir);
}
free(srr);
- } else
+ }
#endif /* SWM_XRR_HAS_CRTC */
- {
+
+ /* If detection failed, create a single region that spans the screen. */
+ if (TAILQ_EMPTY(&screens[i].rl))
new_region(&screens[i], 0, 0, screen->width_in_pixels,
screen->height_in_pixels);
- }
+
+out:
+ DNPRINTF(SWM_D_MISC, "scan_xrandr: done.\n");
}
void
print_win_geom(e->root);
#endif
/* add bars to all regions */
- for (i = 0; i < num_screens; i++)
+ for (i = 0; i < num_screens; i++) {
TAILQ_FOREACH(r, &screens[i].rl, entry)
bar_setup(r);
+
+ if (screens[0].r_focus == NULL) {
+ /* Focus on first region. */
+ r = TAILQ_FIRST(&screens[0].rl);
+ if (r)
+ focus_region(r);
+ }
+ }
+
stack();
+ bar_draw();
+ focus_flush();
}
void
grab_windows(void)
{
- xcb_window_t *wins = NULL;
+ struct swm_region *r = NULL;
+ xcb_window_t *wins = NULL, trans;
int no;
int i, j, num_screens;
uint16_t state, manage, mapped;
xcb_query_tree_cookie_t qtc;
xcb_query_tree_reply_t *qtr;
- xcb_get_window_attributes_cookie_t c;
- xcb_get_window_attributes_reply_t *r;
+ xcb_get_window_attributes_cookie_t gac;
+ xcb_get_window_attributes_reply_t *gar;
xcb_get_property_cookie_t pc;
DNPRINTF(SWM_D_INIT, "grab_windows: begin\n");
no = xcb_query_tree_children_length(qtr);
/* attach windows to a region */
/* normal windows */
+ DNPRINTF(SWM_D_INIT, "grab_windows: grab top level windows.\n");
for (j = 0; j < no; j++) {
- c = xcb_get_window_attributes(conn, wins[j]);
- r = xcb_get_window_attributes_reply(conn, c, NULL);
- if (!r)
+ TAILQ_FOREACH(r, &screens[i].rl, entry) {
+ if (r->id == wins[j]) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: "
+ "skip %#x; region input window.\n",
+ wins[j]);
+ break;
+ }
+ }
+
+ if (r)
continue;
- if (r->override_redirect) {
- free(r);
+
+ gac = xcb_get_window_attributes(conn, wins[j]);
+ gar = xcb_get_window_attributes_reply(conn, gac, NULL);
+ if (!gar) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "doesn't exist.\n", wins[j]);
+ continue;
+ }
+
+ if (gar->override_redirect) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "override_redirect set.\n", wins[j]);
+ free(gar);
continue;
}
pc = xcb_icccm_get_wm_transient_for(conn, wins[j]);
if (xcb_icccm_get_wm_transient_for_reply(conn, pc,
- &wins[j], NULL)) {
- free(r);
+ &trans, NULL)) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "is transient for %#x.\n", wins[j], trans);
+ free(gar);
continue;
}
state = getstate(wins[j]);
- manage = state == XCB_ICCCM_WM_STATE_ICONIC;
- mapped = r->map_state != XCB_MAP_STATE_UNMAPPED;
+ manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
+ mapped = gar->map_state != XCB_MAP_STATE_UNMAPPED;
if (mapped || manage)
manage_window(wins[j], mapped);
- free(r);
+ free(gar);
}
/* transient windows */
+ DNPRINTF(SWM_D_INIT, "grab_windows: grab transient windows.\n");
for (j = 0; j < no; j++) {
- c = xcb_get_window_attributes(conn, wins[j]);
- r = xcb_get_window_attributes_reply(conn, c, NULL);
- if (!r)
+ gac = xcb_get_window_attributes(conn, wins[j]);
+ gar = xcb_get_window_attributes_reply(conn, gac, NULL);
+ if (!gar) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "doesn't exist.\n", wins[j]);
continue;
- if (r->override_redirect) {
- free(r);
+ }
+
+ if (gar->override_redirect) {
+ DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+ "override_redirect set.\n", wins[j]);
+ free(gar);
continue;
}
- free(r);
state = getstate(wins[j]);
- manage = state == XCB_ICCCM_WM_STATE_ICONIC;
- mapped = r->map_state != XCB_MAP_STATE_UNMAPPED;
+ manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
+ mapped = gar->map_state != XCB_MAP_STATE_UNMAPPED;
pc = xcb_icccm_get_wm_transient_for(conn, wins[j]);
if (xcb_icccm_get_wm_transient_for_reply(conn, pc,
- &wins[j], NULL) && manage)
+ &trans, NULL) && manage)
manage_window(wins[j], mapped);
+ free(gar);
}
free(qtr);
}
uint32_t gcv[1], wa[1];
const xcb_query_extension_reply_t *qep;
xcb_screen_t *screen;
- xcb_cursor_t cursor;
- xcb_font_t cursor_font;
xcb_randr_query_version_cookie_t c;
xcb_randr_query_version_reply_t *r;
}
}
- cursor_font = xcb_generate_id(conn);
- xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
-
- cursor = xcb_generate_id(conn);
- xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
- XC_left_ptr, XC_left_ptr + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
- wa[0] = cursor;
+ wa[0] = cursors[XC_LEFT_PTR].cid;
/* map physical screens */
for (i = 0; i < num_screens; i++) {
DNPRINTF(SWM_D_WS, "setup_screens: init screen: %d\n", i);
screens[i].idx = i;
+ screens[i].r_focus = NULL;
+
TAILQ_INIT(&screens[i].rl);
TAILQ_INIT(&screens[i].orl);
if ((screen = get_screen(i)) == NULL)
setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS);
setscreencolor("rgb:88/88/88", i + 1, SWM_S_COLOR_UNFOCUS);
setscreencolor("rgb:00/80/80", i + 1, SWM_S_COLOR_BAR_BORDER);
+ setscreencolor("rgb:00/40/40", i + 1,
+ SWM_S_COLOR_BAR_BORDER_UNFOCUS);
setscreencolor("black", i + 1, SWM_S_COLOR_BAR);
setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT);
ws = &screens[i].ws[j];
ws->idx = j;
ws->name = NULL;
+ ws->bar_enabled = 1;
ws->focus = NULL;
ws->focus_prev = NULL;
ws->focus_pending = NULL;
xcb_randr_select_input(conn, screens[i].root,
XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE);
}
- xcb_free_cursor(conn, cursor);
- xcb_close_font(conn, cursor_font);
}
void
err(1, "can't disable alarm");
bar_extra_stop();
- bar_extra = 1;
unmap_all();
+ cursors_cleanup();
+
teardown_ewmh();
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
EVENT(XCB_MAP_NOTIFY, mapnotify);
EVENT(XCB_MAP_REQUEST, maprequest);
EVENT(XCB_MAPPING_NOTIFY, mappingnotify);
- /*EVENT(XCB_MOTION_NOTIFY, );*/
+ EVENT(XCB_MOTION_NOTIFY, motionnotify);
/*EVENT(XCB_NO_EXPOSURE, );*/
EVENT(XCB_PROPERTY_NOTIFY, propertynotify);
/*EVENT(XCB_REPARENT_NOTIFY, );*/
int
main(int argc, char *argv[])
{
- struct swm_region *r, *rr;
- struct ws_win *winfocus = NULL;
+ struct swm_region *r;
char conf[PATH_MAX], *cfile = NULL;
struct stat sb;
- int xfd, i, num_screens;
+ int xfd, i, num_screens, startup = 1;
struct sigaction sact;
xcb_generic_event_t *evt;
struct timeval tv;
fd_set rd;
+ int rd_max;
+ int stdin_ready = 0;
+ int num_readable;
/* suppress unused warning since var is needed */
(void)argc;
if (enable_wm() != 0)
errx(1, "another window manager is currently running");
+ /* Load Xcursors and/or cursorfont glyph cursors. */
+ cursors_load();
+
xcb_aux_sync(conn);
setup_globals();
/* setup all bars */
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
for (i = 0; i < num_screens; i++)
- TAILQ_FOREACH(r, &screens[i].rl, entry) {
- if (winfocus == NULL)
- winfocus = TAILQ_FIRST(&r->ws->winlist);
+ TAILQ_FOREACH(r, &screens[i].rl, entry)
bar_setup(r);
- }
grabkeys();
stack();
+ bar_draw();
xcb_ungrab_server(conn);
xcb_flush(conn);
+ rd_max = xfd > STDIN_FILENO ? xfd : STDIN_FILENO;
+
while (running) {
while ((evt = xcb_poll_for_event(conn))) {
if (!running)
free(evt);
}
- /* if we are being restarted go focus on first window */
- if (winfocus) {
- rr = winfocus->ws->r;
- if (rr == NULL) {
- /* not a visible window */
- winfocus = NULL;
+ /* If just (re)started, set default focus if needed. */
+ if (startup) {
+ startup = 0;
+
+ if (focus_mode != SWM_FOCUS_FOLLOW) {
+ r = TAILQ_FIRST(&screens[0].rl);
+ if (r) {
+ focus_region(r);
+ focus_flush();
+ }
continue;
}
-
- focus_win(get_region_focus(rr));
- focus_flush();
- winfocus = NULL;
- continue;
}
FD_ZERO(&rd);
+
+ if (bar_extra)
+ FD_SET(STDIN_FILENO, &rd);
+
FD_SET(xfd, &rd);
tv.tv_sec = 1;
tv.tv_usec = 0;
- if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1)
- if (errno != EINTR) {
- DNPRINTF(SWM_D_MISC, "select failed");
- }
+ num_readable = select(rd_max + 1, &rd, NULL, NULL, &tv);
+ if (num_readable == -1 && errno != EINTR) {
+ DNPRINTF(SWM_D_MISC, "select failed");
+ } else if (num_readable > 0 && FD_ISSET(STDIN_FILENO, &rd)) {
+ stdin_ready = 1;
+ }
+
if (restart_wm)
restart(NULL, NULL);
+
if (search_resp)
search_do_resp();
+
if (!running)
goto done;
- if (bar_alarm) {
- bar_alarm = 0;
- bar_update();
+
+ if (stdin_ready) {
+ stdin_ready = 0;
+ if (bar_extra_update()) {
+ bar_draw();
+ xcb_flush(conn);
+ }
}
}
done: