X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=wm-wmii.c;h=e31f07422ec23b37da60e11379532fac9927a29e;hb=6e727b79920302fb99b1905af34a25e745a982ef;hp=f842f19116eec033bb6e08f2ab670fcd9728c17f;hpb=d7962431c1e307cc50a744b23b5aac314f4cda75;p=wmpus diff --git a/wm-wmii.c b/wm-wmii.c index f842f19..e31f074 100644 --- a/wm-wmii.c +++ b/wm-wmii.c @@ -19,6 +19,7 @@ #include "util.h" #include "conf.h" +#include "types.h" #include "sys.h" #include "wm.h" @@ -82,7 +83,6 @@ typedef struct { typedef struct { list_t *tags; // of tag_t tag_t *tag; // focused tag - win_t *root; // root/background window list_t *screens; // display geometry } wm_t; @@ -211,8 +211,8 @@ static void set_mode(win_t *win, layout_t layout) * it as the currently focused window */ static void set_focus(win_t *win) { - if (win == NULL || win == wm->root) { - sys_focus(wm->root); + if (win == NULL) { + sys_focus(NULL); return; } @@ -330,7 +330,7 @@ static void put_win_col(win_t *win, tag_t *tag, dpy_t *dpy, col_t *col) { row_t *row = new0(row_t); row->win = win; - row->state = win->state ?: ST_SHOW; + row->state = win->state; if (col == NULL) { col = new0(col_t); @@ -502,7 +502,7 @@ static void shift_focus(int cols, int rows) if (ncol && COL(ncol) && COL(ncol)->row) set_focus(COL(ncol)->row->win); else - sys_focus(wm->root); + sys_focus(NULL); } } @@ -699,9 +699,9 @@ void wm_update(void) for (list_t *tag = wm ->tags; tag; tag = tag->next) if (tag->data != wm_tag) { tag_foreach_col(TAG(tag), dpy, col, row, win) - sys_show(win, ST_HIDE); + sys_show(win, ST_HIDE); tag_foreach_flt(TAG(tag), dpy, flt, win) - sys_show(win, ST_HIDE); + sys_show(win, ST_HIDE); } /* Set focused window */ @@ -714,7 +714,6 @@ void wm_update(void) *******************************/ int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr) { - if (!win || win == wm_dpy->geom) return 0; //printf("wm_handle_event: %p - %x %c%c%c%c%c\n", win, ev, // mod.up ? '^' : 'v', // mod.alt ? 'a' : '-', @@ -723,7 +722,7 @@ int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr) // mod.win ? 'w' : '-'); /* Mouse events */ - if (EV_MOUSE0 <= ev && ev <= EV_MOUSE7) { + if (win && EV_MOUSE0 <= ev && ev <= EV_MOUSE7) { if (ev == EV_MOUSE1 && !mod.MODKEY && !mod.up) return raise_float(win), 0; if ((ev == EV_MOUSE3 && mod.MODKEY && !mod.up) || @@ -740,32 +739,36 @@ int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr) /* Only handle key-down */ if (mod.up) - return 0; + return mod.MODKEY || ev == EV_ALT; /* Misc */ - if (mod.MODKEY) { #ifdef DEBUG + if (win && mod.MODKEY) { if (ev == EV_F1) return raise_float(win), 1; if (ev == EV_F2) return set_focus(win), 1; if (ev == EV_F3) return sys_show(win, ST_SHOW), 1; if (ev == EV_F4) return sys_show(win, ST_HIDE), 1; if (ev == EV_F7) return sys_show(win, ST_SHADE), 1; + } #endif + if (mod.MODKEY) { if (ev == EV_F5) return wm_update(), 1; if (ev == EV_F6) return print_txt(), 1; if (ev == 'q') return sys_exit(), 1; + } + if (win && mod.MODKEY) { if (ev == 'f') return wm_handle_state(win, win->state, win->state == ST_FULL ? ST_SHOW : ST_FULL); if (ev == 'g') return wm_handle_state(win, win->state, win->state == ST_MAX ? ST_SHOW : ST_MAX); } - if (mod.MODKEY && mod.shift) { + if (win && mod.MODKEY && mod.shift) { if (ev == 'c') return sys_show(win, ST_CLOSE), 1; } /* Floating layer */ if (ev == ' ') { - if (mod.MODKEY && mod.shift) + if (win && mod.MODKEY && mod.shift) return set_layer(win), 1; if (mod.MODKEY) return switch_layer(), 1; @@ -805,24 +808,24 @@ int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr) /* Tag switching */ if (mod.MODKEY && '0' <= ev && ev <= '9') { char name[] = {ev, '\0'}; - if (mod.shift) + if (win && mod.shift) tag_set(win, name); - else + if (!mod.shift) tag_switch(name); wm_update(); } /* Focus change */ - if (ev == EV_ENTER && win->state != ST_SHADE) + if (win && ev == EV_ENTER && win->state != ST_SHADE) return set_focus(win), 1; /* Reset focus after after focus change, * not sure what is causing the focus change in the first place * but preventing that would be a better solution */ if (ev == EV_FOCUS) - sys_focus(wm_focus ?: wm->root); + sys_focus(wm_focus); - return 0; + return mod.MODKEY; } int wm_handle_ptr(win_t *cwin, ptr_t ptr) @@ -880,7 +883,7 @@ int wm_handle_state(win_t *win, state_t prev, state_t next) if (!row && !flt && next == ST_SHOW) return wm_insert(win), 1; - if ((row || flt) && next == ST_HIDE) + if ((row || flt) && (next == ST_HIDE || next == ST_ICON)) return wm_remove(win), 1; if (row) row->state = next; @@ -898,6 +901,10 @@ void wm_insert(win_t *win) printf("wm_insert: %p\n", win); print_txt(); + /* Make sure it's visible */ + if (win->state == ST_HIDE) + return; + /* Check for toolbars */ if (win->type == TYPE_TOOLBAR) return wm_update(); @@ -930,17 +937,16 @@ void wm_remove(win_t *win) print_txt(); } -void wm_init(win_t *root) +void wm_init(void) { - printf("wm_init: %p\n", root); + printf("wm_init\n"); /* Load configuration */ margin = conf_get_int("main.margin", margin); stack = conf_get_int("main.stack", stack); wm = new0(wm_t); - wm->root = root; - wm->screens = list_sort(sys_info(root), 0, sort_win); + wm->screens = list_sort(sys_info(), 0, sort_win); wm->tag = tag_new(wm->screens, "1"); wm->tags = list_insert(NULL, wm->tag); @@ -954,14 +960,14 @@ void wm_init(win_t *root) EV_F7, EV_F8, EV_F9, EV_F10, EV_F11, EV_F12, EV_MOUSE1, EV_MOUSE3}; for (int i = 0; i < countof(ev_e); i++) - sys_watch(root, ev_e[i], MOD()); + sys_watch(NULL, ev_e[i], MOD()); for (int i = 0; i < countof(ev_m); i++) - sys_watch(root, ev_m[i], MOD(.MODKEY=1)); + sys_watch(NULL, ev_m[i], MOD(.MODKEY=1)); for (int i = 0; i < countof(ev_s); i++) - sys_watch(root, ev_s[i], MOD(.MODKEY=1,.shift=1)); + sys_watch(NULL, ev_s[i], MOD(.MODKEY=1,.shift=1)); } -void wm_free(win_t *root) +void wm_free(void) { /* Re-show and free all windows */ while ( wm->tags) { tag_t *tag = wm->tags->data;