/*
- * Copyright (C) 2011 Andy Spencer <andy753421@gmail.com>
+ * Copyright (c) 2011, Andy Spencer <andy753421@gmail.com>
*
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
*/
#include <stdio.h>
} }
for (list_t *lflt = dpy->flts; lflt; lflt = lflt->next) {
flt_t *flt = lflt->data;
- printf(" flt: <%-9p [%p->%p] >%-9p focus=%d%d - %d,%d %dx%d \n",
- lflt->prev, lflt, lflt->data, lflt->next,
+ win_t *win = flt->win;
+ printf(" flt: <%-9p [%p>>%p] >%-9p focus=%d%d - %d,%d %dx%d \n",
+ lflt->prev, lflt, win, lflt->next,
dpy->flt == flt, wm_focus == flt->win,
flt->x, flt->y, flt->h, flt->w);
} } }
list_t *ldpy, *lcol, *lrow, *lflt;
layer_t layer = searchl(tag, win, &ldpy, &lcol, &lrow, &lflt);
- dpy_t *dpy = DPY(ldpy);
if (layer == tiling) {
- col_t *col = COL(lcol);
+ dpy_t *dpy = DPY(ldpy);
+ col_t *col = COL(lcol);
col->row = lrow->prev ? lrow->prev->data :
lrow->next ? lrow->next->data : NULL;
- col->rows = list_remove(col->rows, lrow);
+ col->rows = list_remove(col->rows, lrow, 1);
if (col->rows == NULL && (lcol->next || lcol->prev)) {
dpy->col = lcol->prev ? lcol->prev->data :
lcol->next ? lcol->next->data : NULL;
- dpy->cols = list_remove(dpy->cols, lcol);
+ dpy->cols = list_remove(dpy->cols, lcol, 1);
}
}
if (layer == floating) {
- dpy->flts = list_remove(dpy->flts, lflt);
+ dpy_t *dpy = DPY(ldpy);
+ dpy->flts = list_remove(dpy->flts, lflt, 1);
dpy->flt = dpy->flts ? list_last(dpy->flts)->data : NULL;
if (!dpy->flt && dpy->col && dpy->col->row)
dpy->layer = tiling;
break;
if (cur) {
flt_t *flt = cur->data;
- wm_dpy->flts = list_remove(wm_dpy->flts, cur);
+ wm_dpy->flts = list_remove(wm_dpy->flts, cur, 0);
wm_dpy->flts = list_append(wm_dpy->flts, flt);
+ sys_raise(win);
}
- sys_raise(win);
}
/* Toggle between floating and tiling layers */
static void tag_switch(int name)
{
printf("tag_switch: %d\n", name);
- if ((wm_col == NULL || wm_row == NULL) && wm_flt == NULL)
- wm->tags = list_remove(wm->tags,
- list_find(wm->tags, wm_tag));
+ 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);
+ }
wm_tag = tag_find(name);
}
COL(lcol)->width *= (float)mx / tx;
/* Scale each column vertically */
+ win_t *focus = get_focus();
for (list_t *lcol = dpy->cols; lcol; lcol = lcol->next) {
col_t *col = lcol->data;
int nrows = list_length(col->rows);
case tab:
sys_move(win, x+MARGIN, 0+MARGIN,
col->width, dpy->geom->h-2*MARGIN);
- if (col->row->win == win)
+ if (focus == win)
sys_raise(win);
break;
}
#endif
if (key == key_f5) return wm_update(), 1;
if (key == key_f6) return print_txt(), 1;
+ if (key == 'q') return sys_exit(), 1;
}
/* Floating layer */
win->wm = new0(win_wm_t);
sys_watch(win, key_enter, MOD());
sys_watch(win, key_focus, MOD());
- sys_watch(win, key_mouse1, MOD());
/* Add to screen */
put_win(win, wm_tag, wm_dpy->layer);
print_txt();
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();
}
+
void wm_init(win_t *root)
{
printf("wm_init: %p\n", root);
wm->tags = list_insert(NULL, wm->tag);
Key_t keys_e[] = {key_enter, key_focus};
- Key_t keys_s[] = {'h', 'j', 'k', 'l', ' ',
+ Key_t keys_s[] = {'h', 'j', 'k', 'l', 'q', ' ',
'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',