Fix closing focused window

[wmpus] / wm-wmii.c

diff --git a/wm-wmii.c b/wm-wmii.c
index ef54d6b93ab5e39a37a24ae220d786b870887de0..b5b09806a893752353cb4a0880fdaf79645dca33 100644 (file)
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -277,7 +277,7 @@ static void print_txt(void)
        for (list_t *lrow = col->rows; lrow; lrow = lrow->next) {
                row_t *row = lrow->data;
                win_t *win = row->win;
-               printf("      win: <%-9p [%p>>%p] >%-9p focus=%d%d    - %4dpx \n",
+               printf("      row: <%-9p [%p>>%p] >%-9p focus=%d%d    - %4dpx \n",
                                lrow->prev, lrow, win, lrow->next,
                                col->row == row, wm_focus == win, win->h);
        } }
@@ -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,8 @@ 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;
+       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' : '-',
@@ -740,7 +741,7 @@ 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) {
@@ -756,6 +757,8 @@ int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr)
                if (ev == 'q')   return sys_exit(),     1;
                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 (ev == 'c')   return sys_show(win, ST_CLOSE), 1;
@@ -820,7 +823,7 @@ int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr)
        if (ev == EV_FOCUS)
                sys_focus(wm_focus ?: wm->root);
 
-       return 0;
+       return mod.MODKEY;
 }
 
 int wm_handle_ptr(win_t *cwin, ptr_t ptr)
@@ -872,8 +875,15 @@ int wm_handle_state(win_t *win, state_t prev, state_t next)
        row_t *row = NULL;
        flt_t *flt = NULL;
 
+       printf("wm_handle_state - %p %x -> %x\n", win, prev, next);
+
        search(wm_tag, win, NULL, NULL, &row, &flt);
 
+       if (!row && !flt && next == ST_SHOW)
+               return wm_insert(win), 1;
+       if ((row || flt) && (next == ST_HIDE || next == ST_ICON))
+               return wm_remove(win), 1;
+
        if (row) row->state = next;
        if (flt) flt->state = next;
 
@@ -894,7 +904,6 @@ void wm_insert(win_t *win)
                return wm_update();
 
        /* Initialize window */
-       win->wm = new0(win_wm_t);
        sys_watch(win, EV_ENTER, MOD());
        sys_watch(win, EV_FOCUS, MOD());
 
@@ -917,7 +926,6 @@ void wm_remove(win_t *win)
                return wm_update();
        for (list_t *tag = wm->tags; tag; tag = tag->next)
                cut_win(win, tag->data);
-       free(win->wm);
        set_focus(wm_focus);
        wm_update();
        print_txt();
@@ -941,7 +949,7 @@ void wm_init(win_t *root)
        event_t ev_s[] = {'h', 'j', 'k', 'l', 'c', 'q', ' ',
                '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
                EV_MOUSE1, EV_MOUSE3};
-       event_t ev_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't', 'f', ' ',
+       event_t ev_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't', 'f', 'g', ' ',
                '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
                EV_F1, EV_F2, EV_F3, EV_F4,  EV_F5,  EV_F6,
                EV_F7, EV_F8, EV_F9, EV_F10, EV_F11, EV_F12,
@@ -962,12 +970,10 @@ void wm_free(win_t *root)
        while (dpy->cols) { col_t *col = dpy->cols->data;
        while (col->rows) { row_t *row = col->rows->data;
                sys_show(row->win, ST_SHOW);
-               free(row->win->wm);
        col->rows = list_remove(col->rows, col->rows, 1); }
        dpy->cols = list_remove(dpy->cols, dpy->cols, 1); }
        while (dpy->flts) { flt_t *flt = dpy->flts->data;
                sys_show(flt->win, ST_SHOW);
-               free(flt->win->wm);
        dpy->flts = list_remove(dpy->flts, dpy->flts, 1); }
        tag->dpys = list_remove(tag->dpys, tag->dpys, 1); }
         wm->tags = list_remove( wm->tags,  wm->tags, 1); }