frame.c for the Openbox window manager
Copyright (c) 2006 Mikael Magnusson
- Copyright (c) 2003 Ben Jansens
+ Copyright (c) 2003-2007 Dana Jansens
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
#include "moveresize.h"
#include "render/theme.h"
-#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
+#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask | \
+ FocusChangeMask)
#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
ButtonPressMask | ButtonReleaseMask | \
VisibilityChangeMask)
mask |= CWCursor;
attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
- self->tlresize = createWindow(self->title, NULL, mask, &attrib);
+ self->tltresize = createWindow(self->title, NULL, mask, &attrib);
+ self->tllresize = createWindow(self->title, NULL, mask, &attrib);
attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST);
- self->trresize = createWindow(self->title, NULL, mask, &attrib);
+ self->trtresize = createWindow(self->title, NULL, mask, &attrib);
+ self->trrresize = createWindow(self->title, NULL, mask, &attrib);
mask &= ~CWCursor;
self->label = createWindow(self->title, NULL, mask, &attrib);
XResizeWindow(ob_display, self->rgrip,
ob_rr_theme->grip_width, ob_rr_theme->handle_height);
}
- XResizeWindow(ob_display, self->tlresize,
- ob_rr_theme->grip_width, ob_rr_theme->top_grip_height);
- XResizeWindow(ob_display, self->trresize,
- ob_rr_theme->grip_width, ob_rr_theme->top_grip_height);
+ XResizeWindow(ob_display, self->tltresize,
+ ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1);
+ XResizeWindow(ob_display, self->trtresize,
+ ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1);
+ XResizeWindow(ob_display, self->tllresize,
+ ob_rr_theme->paddingx + 1, ob_rr_theme->title_height);
+ XResizeWindow(ob_display, self->trrresize,
+ ob_rr_theme->paddingx + 1, ob_rr_theme->title_height);
/* set up the dynamic appearances */
self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
XMapWindow(ob_display, self->title);
if (self->decorations & OB_FRAME_DECOR_GRIPS) {
- XMoveWindow(ob_display, self->tlresize, 0, 0);
- XMoveWindow(ob_display, self->trresize,
+ XMoveWindow(ob_display, self->tltresize, 0, 0);
+ XMoveWindow(ob_display, self->tllresize, 0, 0);
+ XMoveWindow(ob_display, self->trtresize,
self->width - ob_rr_theme->grip_width, 0);
- XMapWindow(ob_display, self->tlresize);
- XMapWindow(ob_display, self->trresize);
+ XMoveWindow(ob_display, self->trrresize,
+ self->width - ob_rr_theme->paddingx - 1, 0);
+ XMapWindow(ob_display, self->tltresize);
+ XMapWindow(ob_display, self->tllresize);
+ XMapWindow(ob_display, self->trtresize);
+ XMapWindow(ob_display, self->trrresize);
} else {
- XUnmapWindow(ob_display, self->tlresize);
- XUnmapWindow(ob_display, self->trresize);
+ XUnmapWindow(ob_display, self->tltresize);
+ XUnmapWindow(ob_display, self->tllresize);
+ XUnmapWindow(ob_display, self->trtresize);
+ XUnmapWindow(ob_display, self->trrresize);
}
} else
XUnmapWindow(ob_display, self->title);
vals[1] = self->size.right;
vals[2] = self->size.top;
vals[3] = self->size.bottom;
- PROP_SETA32(self->client->window, kde_net_wm_frame_strut,
+ PROP_SETA32(self->client->window, net_frame_extents,
cardinal, vals, 4);
}
req's) the ButtonPress is to catch clicks on the client border */
XSelectInput(ob_display, self->plate, PLATE_EVENTMASK);
+ frame_adjust_area(self, TRUE, TRUE, FALSE);
+
/* map the client so it maps when the frame does */
XMapWindow(ob_display, client->window);
-
- frame_adjust_area(self, TRUE, TRUE, FALSE);
+ /* map the frame so they are in a consistant state together */
+ XMapWindow(ob_display, self->window);
+ /* reflect that we're initially visible */
+ self->visible = TRUE;
/* set all the windows for the frame in the window_map */
g_hash_table_insert(window_map, &self->window, client);
g_hash_table_insert(window_map, &self->handle, client);
g_hash_table_insert(window_map, &self->lgrip, client);
g_hash_table_insert(window_map, &self->rgrip, client);
- g_hash_table_insert(window_map, &self->tlresize, client);
- g_hash_table_insert(window_map, &self->trresize, client);
+ g_hash_table_insert(window_map, &self->tltresize, client);
+ g_hash_table_insert(window_map, &self->tllresize, client);
+ g_hash_table_insert(window_map, &self->trtresize, client);
+ g_hash_table_insert(window_map, &self->trrresize, client);
}
void frame_release_client(ObFrame *self, ObClient *client)
g_hash_table_remove(window_map, &self->handle);
g_hash_table_remove(window_map, &self->lgrip);
g_hash_table_remove(window_map, &self->rgrip);
- g_hash_table_remove(window_map, &self->tlresize);
- g_hash_table_remove(window_map, &self->trresize);
+ g_hash_table_remove(window_map, &self->tltresize);
+ g_hash_table_remove(window_map, &self->tllresize);
+ g_hash_table_remove(window_map, &self->trtresize);
+ g_hash_table_remove(window_map, &self->trrresize);
ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self, TRUE);
if (!n) break;
self->icon_x = x;
XMapWindow(ob_display, self->icon);
- XMoveWindow(ob_display, self->icon, x, ob_rr_theme->paddingx);
+ XMoveWindow(ob_display, self->icon, x, ob_rr_theme->paddingy);
x += ob_rr_theme->button_size + 2 + ob_rr_theme->paddingx + 1;
break;
case 'D':
if (!d) break;
self->desk_x = x;
XMapWindow(ob_display, self->desk);
- XMoveWindow(ob_display, self->desk, x, ob_rr_theme->paddingx + 1);
+ XMoveWindow(ob_display, self->desk, x, ob_rr_theme->paddingy + 1);
x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
break;
case 'S':
if (!s) break;
self->shade_x = x;
XMapWindow(ob_display, self->shade);
- XMoveWindow(ob_display, self->shade, x, ob_rr_theme->paddingx + 1);
+ XMoveWindow(ob_display, self->shade, x, ob_rr_theme->paddingy + 1);
x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
break;
case 'I':
if (!i) break;
self->iconify_x = x;
XMapWindow(ob_display, self->iconify);
- XMoveWindow(ob_display,self->iconify, x, ob_rr_theme->paddingx + 1);
+ XMoveWindow(ob_display,self->iconify, x, ob_rr_theme->paddingy + 1);
x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
break;
case 'L':
if (!l) break;
self->label_x = x;
XMapWindow(ob_display, self->label);
- XMoveWindow(ob_display, self->label, x, ob_rr_theme->paddingx);
+ XMoveWindow(ob_display, self->label, x, ob_rr_theme->paddingy);
x += self->label_width + ob_rr_theme->paddingx + 1;
break;
case 'M':
if (!m) break;
self->max_x = x;
XMapWindow(ob_display, self->max);
- XMoveWindow(ob_display, self->max, x, ob_rr_theme->paddingx + 1);
+ XMoveWindow(ob_display, self->max, x, ob_rr_theme->paddingy + 1);
x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
break;
case 'C':
if (!c) break;
self->close_x = x;
XMapWindow(ob_display, self->close);
- XMoveWindow(ob_display, self->close, x, ob_rr_theme->paddingx + 1);
+ XMoveWindow(ob_display, self->close, x, ob_rr_theme->paddingy + 1);
x += ob_rr_theme->button_size + ob_rr_theme->paddingx + 1;
break;
}
if (win == self->handle) return OB_FRAME_CONTEXT_HANDLE;
if (win == self->lgrip) return OB_FRAME_CONTEXT_BLCORNER;
if (win == self->rgrip) return OB_FRAME_CONTEXT_BRCORNER;
- if (win == self->tlresize) return OB_FRAME_CONTEXT_TLCORNER;
- if (win == self->trresize) return OB_FRAME_CONTEXT_TRCORNER;
+ if (win == self->tltresize) return OB_FRAME_CONTEXT_TLCORNER;
+ if (win == self->tllresize) return OB_FRAME_CONTEXT_TLCORNER;
+ if (win == self->trtresize) return OB_FRAME_CONTEXT_TRCORNER;
+ if (win == self->trrresize) return OB_FRAME_CONTEXT_TRCORNER;
if (win == self->max) return OB_FRAME_CONTEXT_MAXIMIZE;
if (win == self->iconify) return OB_FRAME_CONTEXT_ICONIFY;
if (win == self->close) return OB_FRAME_CONTEXT_CLOSE;