#include "frame.h"
+#include "client.h"
#include "openbox.h"
#include "extensions.h"
+#include "config.h"
#include "framerender.h"
#include "render/theme.h"
#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
ButtonPressMask | ButtonReleaseMask)
#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
- ButtonMotionMask | ExposureMask)
+ ButtonMotionMask | ExposureMask | \
+ EnterWindowMask | LeaveWindowMask)
-static void layout_title(Frame *self);
+#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
+ f->cbwidth_y)
-void frame_startup()
-{
- RECT_SET(theme_a_focused_pressed_desk->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_pressed_set_desk->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_unpressed_desk->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_pressed_desk->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_pressed_set_desk->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_unpressed_desk->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_pressed_shade->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_pressed_set_shade->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_unpressed_shade->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_pressed_shade->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_pressed_set_shade->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_unpressed_shade->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_pressed_iconify->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_unpressed_iconify->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_pressed_iconify->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_unpressed_iconify->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_unpressed_iconify->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_pressed_max->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_pressed_set_max->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_unpressed_max->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_pressed_max->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_pressed_set_max->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_unpressed_max->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_pressed_close->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_focused_unpressed_close->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_pressed_close->area, 0, 0,
- theme_button_size, theme_button_size);
- RECT_SET(theme_a_unfocused_unpressed_close->area, 0, 0,
- theme_button_size, theme_button_size);
-
- RECT_SET(theme_a_focused_grip->area, 0, 0,
- theme_grip_width, theme_handle_height);
- RECT_SET(theme_a_unfocused_grip->area, 0, 0,
- theme_grip_width, theme_handle_height);
-}
-
-void frame_shutdown()
-{
-}
+static void layout_title(ObFrame *self);
static Window createWindow(Window parent, unsigned long mask,
XSetWindowAttributes *attrib)
{
return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
- render_depth, InputOutput, render_visual,
- mask, attrib);
+ RrDepth(ob_rr_inst), InputOutput,
+ RrVisual(ob_rr_inst), mask, attrib);
}
-Frame *frame_new()
+ObFrame *frame_new()
{
XSetWindowAttributes attrib;
unsigned long mask;
- Frame *self;
+ ObFrame *self;
- self = g_new(Frame, 1);
+ self = g_new(ObFrame, 1);
self->visible = FALSE;
+ self->decorations = 0;
/* create all of the decor windows */
mask = CWOverrideRedirect | CWEventMask;
attrib.event_mask = FRAME_EVENTMASK;
attrib.override_redirect = TRUE;
- self->window = createWindow(ob_root, mask, &attrib);
+ self->window = createWindow(RootWindow(ob_display, ob_screen),
+ mask, &attrib);
mask = 0;
self->plate = createWindow(self->window, mask, &attrib);
mask = CWEventMask;
attrib.event_mask = ELEMENT_EVENTMASK;
self->title = createWindow(self->window, mask, &attrib);
+
+ mask |= CWCursor;
+ attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
+ self->tlresize = createWindow(self->title, mask, &attrib);
+ attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST);
+ self->trresize = createWindow(self->title, mask, &attrib);
+
+ mask &= ~CWCursor;
self->label = createWindow(self->title, mask, &attrib);
self->max = createWindow(self->title, mask, &attrib);
self->close = createWindow(self->title, mask, &attrib);
self->icon = createWindow(self->title, mask, &attrib);
self->iconify = createWindow(self->title, mask, &attrib);
self->handle = createWindow(self->window, mask, &attrib);
+
mask |= CWCursor;
- attrib.cursor = ob_cursors.ll_angle;
+ attrib.cursor = ob_cursor(OB_CURSOR_SOUTHWEST);
self->lgrip = createWindow(self->handle, mask, &attrib);
- attrib.cursor = ob_cursors.lr_angle;
- self->rgrip = createWindow(self->handle, mask, &attrib);
+ attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
+ self->rgrip = createWindow(self->handle, mask, &attrib);
+
+ self->focused = FALSE;
/* the other stuff is shown based on decor settings */
XMapWindow(ob_display, self->plate);
XMapWindow(ob_display, self->lgrip);
XMapWindow(ob_display, self->rgrip);
XMapWindow(ob_display, self->label);
+ XMapWindow(ob_display, self->tlresize);
+ XMapWindow(ob_display, self->trresize);
/* set colors/appearance/sizes for stuff that doesn't change */
- XSetWindowBorder(ob_display, self->window, theme_b_color->pixel);
- XSetWindowBorder(ob_display, self->label, theme_b_color->pixel);
- XSetWindowBorder(ob_display, self->rgrip, theme_b_color->pixel);
- XSetWindowBorder(ob_display, self->lgrip, theme_b_color->pixel);
-
- XResizeWindow(ob_display, self->max, theme_button_size, theme_button_size);
+ XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
+ XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
+ XSetWindowBorder(ob_display, self->handle, ob_rr_theme->b_color->pixel);
+ XSetWindowBorder(ob_display, self->rgrip, ob_rr_theme->b_color->pixel);
+ XSetWindowBorder(ob_display, self->lgrip, ob_rr_theme->b_color->pixel);
+
+ XResizeWindow(ob_display, self->max,
+ ob_rr_theme->button_size, ob_rr_theme->button_size);
XResizeWindow(ob_display, self->iconify,
- theme_button_size, theme_button_size);
+ ob_rr_theme->button_size, ob_rr_theme->button_size);
XResizeWindow(ob_display, self->icon,
- theme_button_size, theme_button_size);
+ ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2);
XResizeWindow(ob_display, self->close,
- theme_button_size, theme_button_size);
+ ob_rr_theme->button_size, ob_rr_theme->button_size);
XResizeWindow(ob_display, self->desk,
- theme_button_size, theme_button_size);
+ ob_rr_theme->button_size, ob_rr_theme->button_size);
XResizeWindow(ob_display, self->shade,
- theme_button_size, theme_button_size);
+ ob_rr_theme->button_size, ob_rr_theme->button_size);
XResizeWindow(ob_display, self->lgrip,
- theme_grip_width, theme_handle_height);
+ ob_rr_theme->grip_width, ob_rr_theme->handle_height);
XResizeWindow(ob_display, self->rgrip,
- theme_grip_width, theme_handle_height);
+ ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+ XResizeWindow(ob_display, self->tlresize,
+ ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+ XResizeWindow(ob_display, self->trresize,
+ ob_rr_theme->grip_width, ob_rr_theme->handle_height);
/* set up the dynamic appearances */
- self->a_unfocused_title = appearance_copy(theme_a_unfocused_title);
- self->a_focused_title = appearance_copy(theme_a_focused_title);
- self->a_unfocused_label = appearance_copy(theme_a_unfocused_label);
- self->a_focused_label = appearance_copy(theme_a_focused_label);
- self->a_unfocused_handle = appearance_copy(theme_a_unfocused_handle);
- self->a_focused_handle = appearance_copy(theme_a_focused_handle);
- self->a_icon = appearance_copy(theme_a_icon);
+ self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
+ self->a_focused_title = RrAppearanceCopy(ob_rr_theme->a_focused_title);
+ self->a_unfocused_label = RrAppearanceCopy(ob_rr_theme->a_unfocused_label);
+ self->a_focused_label = RrAppearanceCopy(ob_rr_theme->a_focused_label);
+ self->a_unfocused_handle =
+ RrAppearanceCopy(ob_rr_theme->a_unfocused_handle);
+ self->a_focused_handle = RrAppearanceCopy(ob_rr_theme->a_focused_handle);
+ self->a_icon = RrAppearanceCopy(ob_rr_theme->a_icon);
self->max_press = self->close_press = self->desk_press =
self->iconify_press = self->shade_press = FALSE;
+ self->max_hover = self->close_hover = self->desk_hover =
+ self->iconify_hover = self->shade_hover = FALSE;
- return (Frame*)self;
+ return (ObFrame*)self;
}
-static void frame_free(Frame *self)
+static void frame_free(ObFrame *self)
{
- appearance_free(self->a_unfocused_title);
- appearance_free(self->a_focused_title);
- appearance_free(self->a_unfocused_label);
- appearance_free(self->a_focused_label);
- appearance_free(self->a_unfocused_handle);
- appearance_free(self->a_focused_handle);
- appearance_free(self->a_icon);
+ RrAppearanceFree(self->a_unfocused_title);
+ RrAppearanceFree(self->a_focused_title);
+ RrAppearanceFree(self->a_unfocused_label);
+ RrAppearanceFree(self->a_focused_label);
+ RrAppearanceFree(self->a_unfocused_handle);
+ RrAppearanceFree(self->a_focused_handle);
+ RrAppearanceFree(self->a_icon);
XDestroyWindow(ob_display, self->window);
g_free(self);
}
-void frame_show(Frame *self)
+void frame_show(ObFrame *self)
{
if (!self->visible) {
self->visible = TRUE;
}
}
-void frame_hide(Frame *self)
+void frame_hide(ObFrame *self)
{
if (self->visible) {
self->visible = FALSE;
}
}
-void frame_adjust_shape(Frame *self)
+void frame_adjust_shape(ObFrame *self)
{
#ifdef SHAPE
int num;
ShapeBounding, ShapeSet);
num = 0;
- if (self->client->decorations & Decor_Titlebar) {
- xrect[0].x = -theme_bevel;
- xrect[0].y = -theme_bevel;
- xrect[0].width = self->width + self->bwidth * 2;
- xrect[0].height = theme_title_height +
+ if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
+ xrect[0].x = -ob_rr_theme->bwidth;
+ xrect[0].y = -ob_rr_theme->bwidth;
+ xrect[0].width = self->width + self->rbwidth * 2;
+ xrect[0].height = ob_rr_theme->title_height +
self->bwidth * 2;
++num;
}
- if (self->client->decorations & Decor_Handle) {
- xrect[1].x = -theme_bevel;
+ if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+ xrect[1].x = -ob_rr_theme->bwidth;
xrect[1].y = FRAME_HANDLE_Y(self);
- xrect[1].width = self->width + self->bwidth * 2;
- xrect[1].height = theme_handle_height +
+ xrect[1].width = self->width + self->rbwidth * 2;
+ xrect[1].height = ob_rr_theme->handle_height +
self->bwidth * 2;
++num;
}
#endif
}
-void frame_adjust_area(Frame *self, gboolean moved, gboolean resized)
+void frame_adjust_area(ObFrame *self, gboolean moved,
+ gboolean resized, gboolean fake)
{
if (resized) {
- if (self->client->decorations & Decor_Border) {
- self->bwidth = theme_bwidth;
- self->cbwidth = theme_cbwidth;
+ self->decorations = self->client->decorations;
+
+ if (self->decorations & OB_FRAME_DECOR_BORDER) {
+ self->bwidth = ob_rr_theme->bwidth;
+ self->cbwidth_x = self->cbwidth_y = ob_rr_theme->cbwidth;
} else {
- self->bwidth = self->cbwidth = 0;
+ self->bwidth = self->cbwidth_x = self->cbwidth_y = 0;
}
- STRUT_SET(self->innersize, self->cbwidth, self->cbwidth,
- self->cbwidth, self->cbwidth);
- self->width = self->client->area.width + self->cbwidth * 2;
- g_assert(self->width > 0);
+ self->rbwidth = self->bwidth;
+
+ if (self->client->max_vert && self->client->max_horz)
+ self->decorations &= ~OB_FRAME_DECOR_HANDLE;
+
+ if (self->client->max_horz)
+ self->bwidth = self->cbwidth_x = 0;
+
+ STRUT_SET(self->innersize,
+ self->cbwidth_x,
+ self->cbwidth_y,
+ self->cbwidth_x,
+ self->cbwidth_y);
+ self->width = self->client->area.width + self->cbwidth_x * 2 -
+ (self->client->max_horz ? self->rbwidth * 2 : 0);
+ self->width = MAX(self->width, 1); /* no lower than 1 */
/* set border widths */
- XSetWindowBorderWidth(ob_display, self->plate, self->cbwidth);
- XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
- XSetWindowBorderWidth(ob_display, self->title, self->bwidth);
- XSetWindowBorderWidth(ob_display, self->handle, self->bwidth);
- XSetWindowBorderWidth(ob_display, self->lgrip, self->bwidth);
- XSetWindowBorderWidth(ob_display, self->rgrip, self->bwidth);
-
- /* position/size and map/unmap all the windows */
+ if (!fake) {
+ XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
+ XSetWindowBorderWidth(ob_display, self->title, self->rbwidth);
+ XSetWindowBorderWidth(ob_display, self->handle, self->rbwidth);
+ XSetWindowBorderWidth(ob_display, self->lgrip, self->rbwidth);
+ XSetWindowBorderWidth(ob_display, self->rgrip, self->rbwidth);
+ }
+ if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
+ self->innersize.top += ob_rr_theme->title_height + self->rbwidth +
+ (self->rbwidth - self->bwidth);
+ if (self->decorations & OB_FRAME_DECOR_HANDLE)
+ self->innersize.bottom += ob_rr_theme->handle_height +
+ self->rbwidth + (self->rbwidth - self->bwidth);
+
/* they all default off, they're turned on in layout_title */
self->icon_x = -1;
self->desk_x = -1;
self->max_x = -1;
self->close_x = -1;
- if (self->client->decorations & Decor_Titlebar) {
- XMoveResizeWindow(ob_display, self->title,
- -self->bwidth, -self->bwidth,
- self->width, theme_title_height);
- self->innersize.top += theme_title_height + self->bwidth;
- XMapWindow(ob_display, self->title);
+ /* position/size and map/unmap all the windows */
+
+ if (!fake) {
+ if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
+ XMoveResizeWindow(ob_display, self->title,
+ -self->bwidth, -self->bwidth,
+ self->width, ob_rr_theme->title_height);
+ XMapWindow(ob_display, self->title);
+
+ XMoveWindow(ob_display, self->tlresize, 0, 0);
+ XMoveWindow(ob_display, self->trresize,
+ self->width - ob_rr_theme->grip_width, 0);
- RECT_SET(self->a_focused_title->area, 0, 0,
- self->width, theme_title_height);
- RECT_SET(self->a_unfocused_title->area, 0, 0,
- self->width, theme_title_height);
+ } else
+ XUnmapWindow(ob_display, self->title);
+ }
+ if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
/* layout the title bar elements */
layout_title(self);
- } else
- XUnmapWindow(ob_display, self->title);
-
- if (self->client->decorations & Decor_Handle) {
- XMoveResizeWindow(ob_display, self->handle,
- -self->bwidth, FRAME_HANDLE_Y(self),
- self->width, theme_handle_height);
- XMoveWindow(ob_display, self->lgrip,
- -self->bwidth, -self->bwidth);
- XMoveWindow(ob_display, self->rgrip,
- -self->bwidth + self->width -
- theme_grip_width, -self->bwidth);
- self->innersize.bottom += theme_handle_height +
- self->bwidth;
- XMapWindow(ob_display, self->handle);
-
- if (theme_a_focused_grip->surface.data.planar.grad ==
- Background_ParentRelative)
- RECT_SET(self->a_focused_handle->area, 0, 0,
- self->width, theme_handle_height);
- else
- RECT_SET(self->a_focused_handle->area,
- theme_grip_width + self->bwidth, 0,
- self->width - (theme_grip_width + self->bwidth) * 2,
- theme_handle_height);
- if (theme_a_unfocused_grip->surface.data.planar.grad ==
- Background_ParentRelative)
- RECT_SET(self->a_unfocused_handle->area, 0, 0,
- self->width, theme_handle_height);
- else
- RECT_SET(self->a_unfocused_handle->area,
- theme_grip_width + self->bwidth, 0,
- self->width - (theme_grip_width + self->bwidth) * 2,
- theme_handle_height);
-
- } else
- XUnmapWindow(ob_display, self->handle);
- }
- if (resized) {
- /* move and resize the plate */
- XMoveResizeWindow(ob_display, self->plate,
- self->innersize.left - self->cbwidth,
- self->innersize.top - self->cbwidth,
- self->client->area.width,
- self->client->area.height);
- /* when the client has StaticGravity, it likes to move around. */
- XMoveWindow(ob_display, self->client->window, 0, 0);
- }
+ if (!fake) {
+ if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+ XMoveResizeWindow(ob_display, self->handle,
+ -self->bwidth, FRAME_HANDLE_Y(self),
+ self->width, ob_rr_theme->handle_height);
+ XMapWindow(ob_display, self->handle);
+
+ if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+ XMoveWindow(ob_display, self->lgrip,
+ -self->rbwidth, -self->rbwidth);
+ XMoveWindow(ob_display, self->rgrip,
+ -self->rbwidth + self->width -
+ ob_rr_theme->grip_width, -self->rbwidth);
+ XMapWindow(ob_display, self->lgrip);
+ XMapWindow(ob_display, self->rgrip);
+ } else {
+ XUnmapWindow(ob_display, self->lgrip);
+ XUnmapWindow(ob_display, self->rgrip);
+ }
+
+ /* XXX make a subwindow with these dimentions?
+ ob_rr_theme->grip_width + self->bwidth, 0,
+ self->width - (ob_rr_theme->grip_width + self->bwidth) * 2,
+ ob_rr_theme->handle_height);
+ */
+ } else
+ XUnmapWindow(ob_display, self->handle);
+
+ /* move and resize the plate */
+ XMoveResizeWindow(ob_display, self->plate,
+ self->innersize.left - self->cbwidth_x,
+ self->innersize.top - self->cbwidth_y,
+ self->client->area.width + self->cbwidth_x * 2,
+ self->client->area.height + self->cbwidth_y * 2);
+ /* when the client has StaticGravity, it likes to move around. */
+ XMoveWindow(ob_display, self->client->window,
+ self->cbwidth_x, self->cbwidth_y);
+ }
- if (resized) {
STRUT_SET(self->size,
self->innersize.left + self->bwidth,
self->innersize.top + self->bwidth,
RECT_SET_SIZE(self->area,
self->client->area.width +
self->size.left + self->size.right,
- (self->client->shaded ? theme_title_height + self->bwidth*2:
+ (self->client->shaded ?
+ ob_rr_theme->title_height + self->bwidth*2:
self->client->area.height +
self->size.top + self->size.bottom));
frame_client_gravity. */
self->area.x = self->client->area.x;
self->area.y = self->client->area.y;
- frame_client_gravity((Frame*)self,
- &self->area.x, &self->area.y);
+ frame_client_gravity(self, &self->area.x, &self->area.y);
}
- /* move and resize the top level frame.
- shading can change without being moved or resized */
- XMoveResizeWindow(ob_display, self->window,
- self->area.x, self->area.y,
- self->width,
- self->area.height - self->bwidth * 2);
+ if (!fake) {
+ /* move and resize the top level frame.
+ shading can change without being moved or resized */
+ XMoveResizeWindow(ob_display, self->window,
+ self->area.x, self->area.y,
+ self->area.width - self->bwidth * 2,
+ self->area.height - self->bwidth * 2);
- if (resized) {
- framerender_frame(self);
+ if (resized) {
+ framerender_frame(self);
- frame_adjust_shape(self);
+ frame_adjust_shape(self);
+ }
}
}
-void frame_adjust_state(Frame *self)
+void frame_adjust_state(ObFrame *self)
{
framerender_frame(self);
}
-void frame_adjust_focus(Frame *self)
+void frame_adjust_focus(ObFrame *self, gboolean hilite)
{
+ self->focused = hilite;
framerender_frame(self);
}
-void frame_adjust_title(Frame *self)
+void frame_adjust_title(ObFrame *self)
{
framerender_frame(self);
}
-void frame_adjust_icon(Frame *self)
+void frame_adjust_icon(ObFrame *self)
{
framerender_frame(self);
}
-void frame_grab_client(Frame *self, Client *client)
+void frame_grab_client(ObFrame *self, ObClient *client)
{
self->client = client;
member set the root window, and one set to the client, but both get
handled and need to be ignored.
*/
- if (ob_state == State_Starting)
+ if (ob_state() == OB_STATE_STARTING)
client->ignore_unmaps += 2;
/* select the event mask on the client's parent (to receive config/map
/* map the client so it maps when the frame does */
XMapWindow(ob_display, client->window);
- frame_adjust_area(self, TRUE, TRUE);
-
- /* set all the windows for the frame in the client_map */
- g_hash_table_insert(client_map, &self->window, client);
- g_hash_table_insert(client_map, &self->plate, client);
- g_hash_table_insert(client_map, &self->title, client);
- g_hash_table_insert(client_map, &self->label, client);
- g_hash_table_insert(client_map, &self->max, client);
- g_hash_table_insert(client_map, &self->close, client);
- g_hash_table_insert(client_map, &self->desk, client);
- g_hash_table_insert(client_map, &self->shade, client);
- g_hash_table_insert(client_map, &self->icon, client);
- g_hash_table_insert(client_map, &self->iconify, client);
- g_hash_table_insert(client_map, &self->handle, client);
- g_hash_table_insert(client_map, &self->lgrip, client);
- g_hash_table_insert(client_map, &self->rgrip, client);
+ frame_adjust_area(self, TRUE, TRUE, FALSE);
+
+ /* 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->plate, client);
+ g_hash_table_insert(window_map, &self->title, client);
+ g_hash_table_insert(window_map, &self->label, client);
+ g_hash_table_insert(window_map, &self->max, client);
+ g_hash_table_insert(window_map, &self->close, client);
+ g_hash_table_insert(window_map, &self->desk, client);
+ g_hash_table_insert(window_map, &self->shade, client);
+ g_hash_table_insert(window_map, &self->icon, client);
+ g_hash_table_insert(window_map, &self->iconify, 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);
}
-void frame_release_client(Frame *self, Client *client)
+void frame_release_client(ObFrame *self, ObClient *client)
{
XEvent ev;
if (XCheckTypedWindowEvent(ob_display, client->window,
ReparentNotify, &ev)) {
XPutBackEvent(ob_display, &ev);
+
/* re-map the window since the unmanaging process unmaps it */
- XMapWindow(ob_display, client->window);
+
+ /* XXX ... um no it doesnt it unmaps its parent, the window itself
+ retains its mapped state, no?! XXX
+ XMapWindow(ob_display, client->window); */
} else {
/* according to the ICCCM - if the client doesn't reparent itself,
then we will reparent the window to root for them */
- XReparentWindow(ob_display, client->window, ob_root,
+ XReparentWindow(ob_display, client->window,
+ RootWindow(ob_display, ob_screen),
client->area.x,
client->area.y);
}
- /* remove all the windows for the frame from the client_map */
- g_hash_table_remove(client_map, &self->window);
- g_hash_table_remove(client_map, &self->plate);
- g_hash_table_remove(client_map, &self->title);
- g_hash_table_remove(client_map, &self->label);
- g_hash_table_remove(client_map, &self->max);
- g_hash_table_remove(client_map, &self->close);
- g_hash_table_remove(client_map, &self->desk);
- g_hash_table_remove(client_map, &self->shade);
- g_hash_table_remove(client_map, &self->icon);
- g_hash_table_remove(client_map, &self->iconify);
- g_hash_table_remove(client_map, &self->handle);
- g_hash_table_remove(client_map, &self->lgrip);
- g_hash_table_remove(client_map, &self->rgrip);
+ /* remove all the windows for the frame from the window_map */
+ g_hash_table_remove(window_map, &self->window);
+ g_hash_table_remove(window_map, &self->plate);
+ g_hash_table_remove(window_map, &self->title);
+ g_hash_table_remove(window_map, &self->label);
+ g_hash_table_remove(window_map, &self->max);
+ g_hash_table_remove(window_map, &self->close);
+ g_hash_table_remove(window_map, &self->desk);
+ g_hash_table_remove(window_map, &self->shade);
+ g_hash_table_remove(window_map, &self->icon);
+ g_hash_table_remove(window_map, &self->iconify);
+ 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);
frame_free(self);
}
-static void layout_title(Frame *self)
+static void layout_title(ObFrame *self)
{
char *lc;
int x;
n = d = i = l = m = c = s = FALSE;
/* figure out whats being shown, and the width of the label */
- self->label_width = self->width - (theme_bevel + 1) * 2;
- for (lc = theme_title_layout; *lc != '\0'; ++lc) {
+ self->label_width = self->width - (ob_rr_theme->bevel + 1) * 2;
+ for (lc = config_title_layout; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
- if (!(self->client->decorations & Decor_Icon)) break;
if (n) { *lc = ' '; break; } /* rm duplicates */
n = TRUE;
- self->label_width -= theme_button_size + theme_bevel + 1;
+ self->label_width -= (ob_rr_theme->button_size + 2 +
+ ob_rr_theme->bevel + 1);
break;
case 'D':
- if (!(self->client->decorations & Decor_AllDesktops)) break;
if (d) { *lc = ' '; break; } /* rm duplicates */
d = TRUE;
- self->label_width -= theme_button_size + theme_bevel + 1;
+ self->label_width -= (ob_rr_theme->button_size +
+ ob_rr_theme->bevel + 1);
break;
case 'S':
- if (!(self->client->decorations & Decor_Shade)) break;
if (s) { *lc = ' '; break; } /* rm duplicates */
s = TRUE;
- self->label_width -= theme_button_size + theme_bevel + 1;
+ self->label_width -= (ob_rr_theme->button_size +
+ ob_rr_theme->bevel + 1);
break;
case 'I':
- if (!(self->client->decorations & Decor_Iconify)) break;
if (i) { *lc = ' '; break; } /* rm duplicates */
i = TRUE;
- self->label_width -= theme_button_size + theme_bevel + 1;
+ self->label_width -= (ob_rr_theme->button_size +
+ ob_rr_theme->bevel + 1);
break;
case 'L':
if (l) { *lc = ' '; break; } /* rm duplicates */
l = TRUE;
break;
case 'M':
- if (!(self->client->decorations & Decor_Maximize)) break;
if (m) { *lc = ' '; break; } /* rm duplicates */
m = TRUE;
- self->label_width -= theme_button_size + theme_bevel + 1;
+ self->label_width -= (ob_rr_theme->button_size +
+ ob_rr_theme->bevel + 1);
break;
case 'C':
- if (!(self->client->decorations & Decor_Close)) break;
if (c) { *lc = ' '; break; } /* rm duplicates */
c = TRUE;
- self->label_width -= theme_button_size + theme_bevel + 1;
+ self->label_width -= (ob_rr_theme->button_size +
+ ob_rr_theme->bevel + 1);
break;
}
}
if (self->label_width < 1) self->label_width = 1;
XResizeWindow(ob_display, self->label, self->label_width,
- theme_label_height);
+ ob_rr_theme->label_height);
if (!n) XUnmapWindow(ob_display, self->icon);
if (!d) XUnmapWindow(ob_display, self->desk);
if (!m) XUnmapWindow(ob_display, self->max);
if (!c) XUnmapWindow(ob_display, self->close);
- x = theme_bevel + 1;
- for (lc = theme_title_layout; *lc != '\0'; ++lc) {
+ x = ob_rr_theme->bevel + 1;
+ for (lc = config_title_layout; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (!n) break;
self->icon_x = x;
- RECT_SET(self->a_icon->area, 0, 0,
- theme_button_size, theme_button_size);
XMapWindow(ob_display, self->icon);
- XMoveWindow(ob_display, self->icon, x, theme_bevel + 1);
- x += theme_button_size + theme_bevel + 1;
+ XMoveWindow(ob_display, self->icon, x, ob_rr_theme->bevel);
+ x += ob_rr_theme->button_size + 2 + ob_rr_theme->bevel + 1;
break;
case 'D':
if (!d) break;
self->desk_x = x;
XMapWindow(ob_display, self->desk);
- XMoveWindow(ob_display, self->desk, x, theme_bevel + 1);
- x += theme_button_size + theme_bevel + 1;
+ XMoveWindow(ob_display, self->desk, x, ob_rr_theme->bevel + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
break;
case 'S':
if (!s) break;
self->shade_x = x;
XMapWindow(ob_display, self->shade);
- XMoveWindow(ob_display, self->shade, x, theme_bevel + 1);
- x += theme_button_size + theme_bevel + 1;
+ XMoveWindow(ob_display, self->shade, x, ob_rr_theme->bevel + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
break;
case 'I':
if (!i) break;
self->iconify_x = x;
XMapWindow(ob_display, self->iconify);
- XMoveWindow(ob_display, self->iconify, x, theme_bevel + 1);
- x += theme_button_size + theme_bevel + 1;
+ XMoveWindow(ob_display, self->iconify, x, ob_rr_theme->bevel + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
break;
case 'L':
if (!l) break;
self->label_x = x;
XMapWindow(ob_display, self->label);
- XMoveWindow(ob_display, self->label, x, theme_bevel);
- x += self->label_width + theme_bevel + 1;
+ XMoveWindow(ob_display, self->label, x, ob_rr_theme->bevel);
+ x += self->label_width + ob_rr_theme->bevel + 1;
break;
case 'M':
if (!m) break;
self->max_x = x;
XMapWindow(ob_display, self->max);
- XMoveWindow(ob_display, self->max, x, theme_bevel + 1);
- x += theme_button_size + theme_bevel + 1;
+ XMoveWindow(ob_display, self->max, x, ob_rr_theme->bevel + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
break;
case 'C':
if (!c) break;
self->close_x = x;
XMapWindow(ob_display, self->close);
- XMoveWindow(ob_display, self->close, x, theme_bevel + 1);
- x += theme_button_size + theme_bevel + 1;
+ XMoveWindow(ob_display, self->close, x, ob_rr_theme->bevel + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
break;
}
}
-
- RECT_SET(self->a_focused_label->area, 0, 0,
- self->label_width, theme_label_height);
- RECT_SET(self->a_unfocused_label->area, 0, 0,
- self->label_width, theme_label_height);
}
-Context frame_context_from_string(char *name)
+ObFrameContext frame_context_from_string(char *name)
{
if (!g_ascii_strcasecmp("root", name))
- return Context_Root;
+ return OB_FRAME_CONTEXT_ROOT;
else if (!g_ascii_strcasecmp("client", name))
- return Context_Client;
+ return OB_FRAME_CONTEXT_CLIENT;
else if (!g_ascii_strcasecmp("titlebar", name))
- return Context_Titlebar;
+ return OB_FRAME_CONTEXT_TITLEBAR;
else if (!g_ascii_strcasecmp("handle", name))
- return Context_Handle;
+ return OB_FRAME_CONTEXT_HANDLE;
else if (!g_ascii_strcasecmp("frame", name))
- return Context_Frame;
- else if (!g_ascii_strcasecmp("blcorner", name))
- return Context_BLCorner;
+ return OB_FRAME_CONTEXT_FRAME;
else if (!g_ascii_strcasecmp("tlcorner", name))
- return Context_TLCorner;
- else if (!g_ascii_strcasecmp("brcorner", name))
- return Context_BRCorner;
+ return OB_FRAME_CONTEXT_TLCORNER;
else if (!g_ascii_strcasecmp("trcorner", name))
- return Context_TRCorner;
+ return OB_FRAME_CONTEXT_TRCORNER;
+ else if (!g_ascii_strcasecmp("blcorner", name))
+ return OB_FRAME_CONTEXT_BLCORNER;
+ else if (!g_ascii_strcasecmp("brcorner", name))
+ return OB_FRAME_CONTEXT_BRCORNER;
else if (!g_ascii_strcasecmp("maximize", name))
- return Context_Maximize;
+ return OB_FRAME_CONTEXT_MAXIMIZE;
else if (!g_ascii_strcasecmp("alldesktops", name))
- return Context_AllDesktops;
+ return OB_FRAME_CONTEXT_ALLDESKTOPS;
else if (!g_ascii_strcasecmp("shade", name))
- return Context_Shade;
+ return OB_FRAME_CONTEXT_SHADE;
else if (!g_ascii_strcasecmp("iconify", name))
- return Context_Iconify;
+ return OB_FRAME_CONTEXT_ICONIFY;
else if (!g_ascii_strcasecmp("icon", name))
- return Context_Icon;
+ return OB_FRAME_CONTEXT_ICON;
else if (!g_ascii_strcasecmp("close", name))
- return Context_Close;
- return Context_None;
+ return OB_FRAME_CONTEXT_CLOSE;
+ return OB_FRAME_CONTEXT_NONE;
}
-Context frame_context(Client *client, Window win)
+ObFrameContext frame_context(ObClient *client, Window win)
{
- Frame *self;
+ ObFrame *self;
- if (win == ob_root) return Context_Root;
- if (client == NULL) return Context_None;
- if (win == client->window) return Context_Client;
+ if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT;
+ if (client == NULL) return OB_FRAME_CONTEXT_NONE;
+ if (win == client->window) return OB_FRAME_CONTEXT_CLIENT;
self = client->frame;
- if (win == self->window) return Context_Frame;
- if (win == self->plate) return Context_Client;
- if (win == self->title) return Context_Titlebar;
- if (win == self->label) return Context_Titlebar;
- if (win == self->handle) return Context_Handle;
- if (win == self->lgrip) return Context_BLCorner;
- if (win == self->rgrip) return Context_BRCorner;
- if (win == self->max) return Context_Maximize;
- if (win == self->iconify)return Context_Iconify;
- if (win == self->close) return Context_Close;
- if (win == self->icon) return Context_Icon;
- if (win == self->desk) return Context_AllDesktops;
- if (win == self->shade) return Context_Shade;
-
- return Context_None;
+ if (win == self->window) return OB_FRAME_CONTEXT_FRAME;
+ if (win == self->plate) return OB_FRAME_CONTEXT_CLIENT;
+ if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR;
+ if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR;
+ 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->max) return OB_FRAME_CONTEXT_MAXIMIZE;
+ if (win == self->iconify) return OB_FRAME_CONTEXT_ICONIFY;
+ if (win == self->close) return OB_FRAME_CONTEXT_CLOSE;
+ if (win == self->icon) return OB_FRAME_CONTEXT_ICON;
+ if (win == self->desk) return OB_FRAME_CONTEXT_ALLDESKTOPS;
+ if (win == self->shade) return OB_FRAME_CONTEXT_SHADE;
+
+ return OB_FRAME_CONTEXT_NONE;
}
-void frame_client_gravity(Frame *self, int *x, int *y)
+void frame_client_gravity(ObFrame *self, int *x, int *y)
{
/* horizontal */
switch (self->client->gravity) {
}
}
-void frame_frame_gravity(Frame *self, int *x, int *y)
+void frame_frame_gravity(ObFrame *self, int *x, int *y)
{
/* horizontal */
switch (self->client->gravity) {
switch (self->client->gravity) {
default:
case NorthWestGravity:
- case WestGravity:
- case SouthWestGravity:
- break;
case NorthGravity:
+ case NorthEastGravity:
+ break;
+ case WestGravity:
case CenterGravity:
- case SouthGravity:
+ case EastGravity:
*y += (self->size.top + self->size.bottom) / 2;
break;
- case NorthEastGravity:
- case EastGravity:
+ case SouthWestGravity:
+ case SouthGravity:
case SouthEastGravity:
*y += self->size.top + self->size.bottom;
break;
projects / chaz / openbox / blobdiff