summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4e518d2)
This hopefully makes things a little cleaner because it avoids having a
global wm_update function and gives the wm a little more control.
However, it now needs some special code to handle toolbars.
else if (type == UnmapNotify) {
if ((win = win_find(dpy,xe->xunmap.window,0)) &&
win->state != ST_HIDE) {
else if (type == UnmapNotify) {
if ((win = win_find(dpy,xe->xunmap.window,0)) &&
win->state != ST_HIDE) {
- if (!strut_del(root, win))
- wm_remove(win);
- else
- wm_update();
+ strut_del(root, win);
+ wm_remove(win);
win->state = ST_HIDE;
}
}
win->state = ST_HIDE;
}
}
if (win_prop(win, NET_STATE) == atoms[NET_FULL])
win->state = ST_FULL;
XSelectInput(win->sys->dpy, win->sys->xid, PropertyChangeMask);
if (win_prop(win, NET_STATE) == atoms[NET_FULL])
win->state = ST_FULL;
XSelectInput(win->sys->dpy, win->sys->xid, PropertyChangeMask);
- if (!strut_add(root, win))
- wm_insert(win);
- else
- wm_update();
+ if (strut_add(root, win))
+ win->type = TYPE_TOOLBAR;
+ wm_insert(win);
}
sys_show(win, win->state);
}
}
sys_show(win, win->state);
}
&par, &xid, &kids, &nkids)) {
for(int i = 0; i < nkids; i++) {
win_t *win = win_find(root->sys->dpy, kids[i], 1);
&par, &xid, &kids, &nkids)) {
for(int i = 0; i < nkids; i++) {
win_t *win = win_find(root->sys->dpy, kids[i], 1);
- if (win && win_viewable(win) && !strut_add(root,win))
+ if (win && win_viewable(win)) {
+ if (strut_add(root,win))
+ win->type = TYPE_TOOLBAR;
- wm_update(); // For struts
typedef enum {
TYPE_NORMAL,
TYPE_DIALOG,
typedef enum {
TYPE_NORMAL,
TYPE_DIALOG,
} type_t;
/* Basic window type */
} type_t;
/* Basic window type */
static layer_t move_layer;
static struct { int v, h; } move_dir;
static layer_t move_layer;
static struct { int v, h; } move_dir;
+/* Prototypes */
+void wm_update(void);
+
/********************
* Helper functions *
********************/
/********************
* Helper functions *
********************/
-/*******************************
- * Window management functions *
- *******************************/
+/* Refresh the window layout */
void wm_update(void)
{
/* Updates window sizes */
void wm_update(void)
{
/* Updates window sizes */
+/*******************************
+ * Window management functions *
+ *******************************/
int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr)
{
if (!win || win == wm_dpy->geom) return 0;
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_insert: %p\n", win);
print_txt();
printf("wm_insert: %p\n", win);
print_txt();
+ /* Check for toolbars */
+ if (win->type == TYPE_TOOLBAR)
+ return wm_update();
+
/* Initialize window */
win->wm = new0(win_wm_t);
sys_watch(win, EV_ENTER, MOD());
/* Initialize window */
win->wm = new0(win_wm_t);
sys_watch(win, EV_ENTER, MOD());
{
printf("wm_remove: %p\n", win);
print_txt();
{
printf("wm_remove: %p\n", win);
print_txt();
+ if (win->type == TYPE_TOOLBAR)
+ return wm_update();
for (list_t *tag = wm->tags; tag; tag = tag->next)
cut_win(win, tag->data);
free(win->wm);
for (list_t *tag = wm->tags; tag; tag = tag->next)
cut_win(win, tag->data);
free(win->wm);
* The window provided to these function is generally the
* window with the keyboard or mouse focus. */
* The window provided to these function is generally the
* window with the keyboard or mouse focus. */
-/* Refresh the window layout */
-void wm_update(void);
-
/* Called for each watched event */
int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr);
/* Called for each watched event */
int wm_handle_event(win_t *win, event_t ev, mod_t mod, ptr_t ptr);