X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=wm-wmii.c;h=38a37250fea5441fa7518956b9036c13f1a32f25;hb=1aa7113d008e06382a4b5b06bd138ae05f4fda4d;hp=ac1333325dfb656ceedc864148f747594623212b;hpb=79245152446fc0b9e3523135beabbd6783d2026a;p=wmpus diff --git a/wm-wmii.c b/wm-wmii.c index ac13333..38a3725 100644 --- a/wm-wmii.c +++ b/wm-wmii.c @@ -17,18 +17,16 @@ #include #include "util.h" +#include "conf.h" #include "sys.h" #include "wm.h" +/* Configuration */ #ifndef MODKEY #define MODKEY alt #endif -#ifndef MARGIN -#define MARGIN 0 -#endif -#ifndef STACK -#define STACK 25 -#endif +static int MARGIN = 0; +static int STACK = 25; /* Enums */ typedef enum { @@ -49,6 +47,7 @@ struct win_wm { }; typedef struct { win_t *win; // the window int height; // win height in _this_ tag + state_t state; // state of window } row_t; typedef struct { @@ -61,6 +60,7 @@ typedef struct { typedef struct { win_t *win; // the window int x, y, w, h; // position of window (in this tag) + state_t state; // state of window } flt_t; typedef struct { @@ -126,6 +126,12 @@ static struct { int v, h; } move_dir; /******************** * Helper functions * ********************/ +static int sort_win(void *a, void *b) +{ + return ((win_t*)a)->x > ((win_t*)b)->x ? 1 : + ((win_t*)a)->x < ((win_t*)b)->x ? -1 : 0; +} + static win_t *get_focus(void) { if (!wm_tag || !wm_dpy) @@ -590,15 +596,14 @@ static void tag_switch(int name) printf("tag_switch: %d\n", name); tag_t *old = wm_tag; if ((wm_col == NULL || wm_row == NULL) && wm_flt == NULL) { - list_t *ltag = list_find(wm->tags, old); - wm->tags = list_remove(wm->tags, ltag, 1); while (old->dpys) { dpy_t *dpy = old->dpys->data; while (dpy->cols) dpy->cols = list_remove(dpy->cols, dpy->cols, 1); old->dpys = list_remove(old->dpys, old->dpys, 1); } - free(old); + list_t *ltag = list_find(wm->tags, old); + wm->tags = list_remove(wm->tags, ltag, 1); } wm_tag = tag_find(name); } @@ -636,6 +641,7 @@ static void wm_update_cols(dpy_t *dpy) for (list_t *lrow = col->rows; lrow; lrow = lrow->next) { win_t *win = ROW(lrow)->win; win->h = ROW(lrow)->height; + state_t state = st_show; int height = 0; switch (col->mode) { case split: @@ -650,20 +656,24 @@ static void wm_update_cols(dpy_t *dpy) win_t *next = ROW(lrow->next)->win; sys_move(next, x+MARGIN, y+MARGIN+STACK+MARGIN/2, col->width, sy); + sys_show(next, st_show); } - height = win == col->row->win ? sy : STACK; - sys_move(win, x+MARGIN, y+MARGIN, - col->width, height); - y += height + (MARGIN/2); + int isfocus = win == col->row->win; + state = isfocus ? st_show : st_shade; + sys_show(win, state); + sys_move(win, x+MARGIN, y+MARGIN, col->width, sy); + y += (isfocus ? sy : STACK) + (MARGIN/2); break; case max: case tab: sys_move(win, x+MARGIN, 0+MARGIN, col->width, dpy->geom->h-2*MARGIN); - if (focus == win) - sys_raise(win); break; } + ROW(lrow)->state = state; + sys_show(win, state); + if (focus == win) + sys_raise(win); ROW(lrow)->height = win->h; } x += col->width + MARGIN; @@ -677,9 +687,9 @@ void wm_update(void) { /* Show/hide tags */ tag_foreach_col(wm_tag, dpy, col, row, win) - sys_show(win, st_show); + sys_show(win, ROW(row)->state); tag_foreach_flt(wm_tag, dpy, flt, win) - sys_show(win, st_show); + sys_show(win, FLT(flt)->state); for (list_t *tag = wm ->tags; tag; tag = tag->next) if (tag->data != wm_tag) { tag_foreach_col(TAG(tag), dpy, col, row, win) @@ -720,8 +730,8 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr) return set_move(win,ptr,resize), 1; if (move_mode != none && mod.up) return set_move(win,ptr,none), 1; - if (key == key_mouse1 && !mod.up && win->h == STACK) - return wm_update(), 0; + if (key == key_mouse1 && !mod.up && win->state == st_shade) + return set_focus(win), wm_update(), 0; return 0; } @@ -734,8 +744,9 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr) #ifdef DEBUG if (key == key_f1) return raise_float(win), 1; if (key == key_f2) return set_focus(win), 1; - if (key == key_f3) return sys_show(win, st_show), 1; - if (key == key_f4) return sys_show(win, st_hide), 1; + if (key == key_f3) return sys_show(win, st_show), 1; + if (key == key_f4) return sys_show(win, st_hide), 1; + if (key == key_f7) return sys_show(win, st_shade), 1; #endif if (key == key_f5) return wm_update(), 1; if (key == key_f6) return print_txt(), 1; @@ -792,7 +803,7 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr) } /* Focus change */ - if (key == key_enter) + if (key == key_enter && win->state != st_shade) return set_focus(win), 1; if (key_mouse0 <= key && key <= key_mouse7) @@ -886,19 +897,13 @@ void wm_init(win_t *root) { printf("wm_init: %p\n", root); - /* Hack, fix screen order */ - list_t *screens = sys_info(root); - list_t *left = screens; - list_t *right = screens->next; - if (left && right && WIN(left)->x > WIN(right)->x) { - void *tmp = left->data; - left->data = right->data; - right->data = tmp; - } + /* 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 = screens; + wm->screens = list_sort(sys_info(root), 0, sort_win); wm->tag = tag_new(wm->screens, 1); wm->tags = list_insert(NULL, wm->tag); @@ -907,7 +912,8 @@ void wm_init(win_t *root) '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}; Key_t keys_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', - key_f1, key_f2, key_f3, key_f4, key_f5, key_f6, + key_f1, key_f2, key_f3, key_f4, key_f5, key_f6, + key_f7, key_f8, key_f9, key_f10, key_f11, key_f12, key_mouse1, key_mouse3}; for (int i = 0; i < countof(keys_e); i++) sys_watch(root, keys_e[i], MOD());