X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=engines%2Fopenbox%2Fopenbox.c;h=3115df74c477f2c5f7f8a53ab3afbda9b13763da;hb=0a69cfc6d2cf672634e95d5eb2015434dd924abc;hp=80e9e81216d11382eda7f70b67c2d5148bd3fa87;hpb=bb3e654edef54efd6d0c24cbf6014eb4f9468037;p=chaz%2Fopenbox diff --git a/engines/openbox/openbox.c b/engines/openbox/openbox.c index 80e9e812..3115df74 100644 --- a/engines/openbox/openbox.c +++ b/engines/openbox/openbox.c @@ -2,17 +2,19 @@ #include "../../kernel/openbox.h" #include "../../kernel/screen.h" #include "../../kernel/extensions.h" +#include "../../kernel/dispatch.h" #include "../../kernel/themerc.h" #include "../../kernel/frame.h" #include "../../render/render.h" #include "../../render/color.h" #include "../../render/font.h" +#include "../../render/mask.h" #include #include -#define TITLE_HEIGHT (s_winfont_height + s_bevel * 2) #define LABEL_HEIGHT (s_winfont_height) +#define TITLE_HEIGHT (LABEL_HEIGHT + s_bevel * 2) #define HANDLE_Y(f) (f->innersize.top + f->frame.client->area.height + \ f->cbwidth) #define BUTTON_SIZE (LABEL_HEIGHT - 2) @@ -21,6 +23,9 @@ #define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask) #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask) +#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \ + ButtonMotionMask | ExposureMask | \ + EnterWindowMask | LeaveWindowMask) /* style settings - geometry */ int s_bevel; @@ -33,11 +38,18 @@ color_rgb *s_cb_focused_color; color_rgb *s_cb_unfocused_color; color_rgb *s_title_focused_color; color_rgb *s_title_unfocused_color; +color_rgb *s_titlebut_focused_color; +color_rgb *s_titlebut_unfocused_color; /* style settings - fonts */ int s_winfont_height; int s_winfont_shadow; int s_winfont_shadow_offset; ObFont *s_winfont; +/* style settings - masks */ +pixmap_mask *s_max_mask; +pixmap_mask *s_icon_mask; +pixmap_mask *s_desk_mask; +pixmap_mask *s_close_mask; /* global appearances */ Appearance *a_focused_unpressed_max; @@ -118,6 +130,9 @@ static void render_iconify(ObFrame *self); static void render_desk(ObFrame *self); static void render_close(ObFrame *self); +static void frame_mouse_press(const ObEvent *e, ObFrame *self); +static void frame_mouse_release(const ObEvent *e, ObFrame *self); + gboolean startup() { g_quark_from_string("none"); @@ -134,13 +149,16 @@ gboolean startup() g_quark_from_string("icon"); g_quark_from_string("close"); - s_b_color = s_cb_unfocused_color = s_cb_focused_color = NULL; + s_b_color = s_cb_unfocused_color = s_cb_focused_color = + s_title_unfocused_color = s_title_focused_color = + s_titlebut_unfocused_color = s_titlebut_focused_color = NULL; s_winfont = NULL; + s_max_mask = s_icon_mask = s_desk_mask = s_close_mask = NULL; - a_focused_unpressed_max = appearance_new(Surface_Planar, 0);//1); - a_focused_pressed_max = appearance_new(Surface_Planar, 0);//1); - a_unfocused_unpressed_max = appearance_new(Surface_Planar, 0);//1); - a_unfocused_pressed_max = appearance_new(Surface_Planar, 0);//1); + a_focused_unpressed_max = appearance_new(Surface_Planar, 1); + a_focused_pressed_max = appearance_new(Surface_Planar, 1); + a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1); + a_unfocused_pressed_max = appearance_new(Surface_Planar, 1); a_focused_unpressed_close = NULL; a_focused_pressed_close = NULL; a_unfocused_unpressed_close = NULL; @@ -159,22 +177,10 @@ gboolean startup() a_unfocused_title = appearance_new(Surface_Planar, 0); a_focused_label = appearance_new(Surface_Planar, 1); a_unfocused_label = appearance_new(Surface_Planar, 1); - a_icon = appearance_new(Surface_Planar, 0);//1); + a_icon = appearance_new(Surface_Planar, 0);/*1);*/ a_focused_handle = appearance_new(Surface_Planar, 0); a_unfocused_handle = appearance_new(Surface_Planar, 0); - a_focused_label->texture[0].type = Text; - a_focused_label->texture[0].data.text.font = s_winfont; - a_focused_label->texture[0].data.text.shadow = s_winfont_shadow; - a_focused_label->texture[0].data.text.offset = s_winfont_shadow_offset; - a_focused_label->texture[0].data.text.color = s_title_focused_color; - - a_unfocused_label->texture[0].type = Text; - a_unfocused_label->texture[0].data.text.font = s_winfont; - a_unfocused_label->texture[0].data.text.shadow = s_winfont_shadow; - a_unfocused_label->texture[0].data.text.offset = s_winfont_shadow_offset; - a_unfocused_label->texture[0].data.text.color = s_title_unfocused_color; - return load(); } @@ -183,6 +189,17 @@ void shutdown() if (s_b_color != NULL) color_free(s_b_color); if (s_cb_unfocused_color != NULL) color_free(s_cb_unfocused_color); if (s_cb_focused_color != NULL) color_free(s_cb_focused_color); + if (s_title_unfocused_color != NULL) color_free(s_title_unfocused_color); + if (s_title_focused_color != NULL) color_free(s_title_focused_color); + if (s_titlebut_unfocused_color != NULL) + color_free(s_titlebut_unfocused_color); + if (s_titlebut_focused_color != NULL) + color_free(s_titlebut_focused_color); + + if (s_max_mask != NULL) pixmap_mask_free(s_max_mask); + if (s_desk_mask != NULL) pixmap_mask_free(s_desk_mask); + if (s_icon_mask != NULL) pixmap_mask_free(s_icon_mask); + if (s_close_mask != NULL) pixmap_mask_free(s_close_mask); if (s_winfont != NULL) font_close(s_winfont); @@ -228,10 +245,8 @@ void shutdown() static Window createWindow(Window parent, unsigned long mask, XSetWindowAttributes *attrib) { - /* XXX DONT USE THE DEFAULT SHIT */ return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0, - DefaultDepth(ob_display, ob_screen), InputOutput, - DefaultVisual(ob_display, ob_screen), + render_depth, InputOutput, render_visual, mask, attrib); } @@ -256,8 +271,7 @@ Frame *frame_new() self->frame.plate = createWindow(self->frame.window, mask, &attrib); mask = CWEventMask; - attrib.event_mask = (ButtonPressMask | ButtonReleaseMask | - ButtonMotionMask | ExposureMask); + attrib.event_mask = ELEMENT_EVENTMASK; self->title = createWindow(self->frame.window, mask, &attrib); self->label = createWindow(self->title, mask, &attrib); self->max = createWindow(self->title, mask, &attrib); @@ -304,6 +318,11 @@ Frame *frame_new() self->max_press = self->close_press = self->desk_press = self->iconify_press = FALSE; + dispatch_register(Event_X_ButtonPress, (EventHandler)frame_mouse_press, + self); + dispatch_register(Event_X_ButtonRelease, (EventHandler)frame_mouse_release, + self); + return (Frame*)self; } @@ -319,6 +338,9 @@ static void frame_free(ObFrame *self) XDestroyWindow(ob_display, self->frame.window); + dispatch_register(0, (EventHandler)frame_mouse_press, self); + dispatch_register(0, (EventHandler)frame_mouse_release, self); + g_free(self); } @@ -385,7 +407,7 @@ void frame_adjust_shape(ObFrame *self) #endif } -void frame_adjust_size(ObFrame *self) +void frame_adjust_area(ObFrame *self) { if (self->frame.client->decorations & Decor_Border) { self->bwidth = s_bwidth; @@ -439,11 +461,19 @@ void frame_adjust_size(ObFrame *self) XMapWindow(ob_display, self->handle); } else XUnmapWindow(ob_display, self->handle); - - XResizeWindow(ob_display, self->frame.window, self->width, - (self->frame.client->shaded ? TITLE_HEIGHT : - self->innersize.top + self->innersize.bottom + - self->frame.client->area.height)); + + /* find the new coordinates */ + self->frame.area.x = self->frame.client->area.x; + self->frame.area.y = self->frame.client->area.y; + frame_client_gravity((Frame*)self, + &self->frame.area.x, &self->frame.area.y); + /* move and resize the top level frame */ + XMoveResizeWindow(ob_display, self->frame.window, + self->frame.area.x, self->frame.area.y, + self->width, + (self->frame.client->shaded ? TITLE_HEIGHT : + self->innersize.top + self->innersize.bottom + + self->frame.client->area.height)); /* do this in two steps because clients whose gravity is set to 'Static' don't end up getting moved at all with an XMoveResizeWindow */ @@ -471,16 +501,6 @@ void frame_adjust_size(ObFrame *self) frame_adjust_shape(self); } -void frame_adjust_position(ObFrame *self) -{ - self->frame.area.x = self->frame.client->area.x; - self->frame.area.y = self->frame.client->area.y; - frame_client_gravity((Frame*)self, - &self->frame.area.x, &self->frame.area.y); - XMoveWindow(ob_display, self->frame.window, - self->frame.area.x, self->frame.area.y); -} - void frame_adjust_state(ObFrame *self) { render_max(self); @@ -526,8 +546,7 @@ void frame_grab_client(ObFrame *self, Client *client) /* map the client so it maps when the frame does */ XMapWindow(ob_display, client->window); - frame_adjust_size(self); - frame_adjust_position(self); + frame_adjust_area(self); /* set all the windows for the frame in the client_map */ g_hash_table_insert(client_map, (gpointer)self->frame.window, client); @@ -586,26 +605,27 @@ static void layout_title(ObFrame *self) const char *lc; int x; gboolean n, d, i, l, m ,c; + n = d = i = l = m = c = FALSE; /* figure out whats being shown, and the width of the label */ - self->label_width = self->width - s_bevel * 2; + self->label_width = self->width - (s_bevel + 1) * 2; for (lc = themerc_titlebar_layout; *lc != '\0'; ++lc) { switch (*lc) { case 'N': if (!(self->frame.client->decorations & Decor_Icon)) break; n = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel; + self->label_width -= BUTTON_SIZE + s_bevel + 1; break; case 'D': if (!(self->frame.client->decorations & Decor_AllDesktops)) break; d = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel; + self->label_width -= BUTTON_SIZE + s_bevel + 1; break; case 'I': if (!(self->frame.client->decorations & Decor_Iconify)) break; i = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel; + self->label_width -= BUTTON_SIZE + s_bevel + 1; break; case 'L': l = TRUE; @@ -613,19 +633,19 @@ static void layout_title(ObFrame *self) case 'M': if (!(self->frame.client->decorations & Decor_Maximize)) break; m = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel; + self->label_width -= BUTTON_SIZE + s_bevel + 1; break; case 'C': if (!(self->frame.client->decorations & Decor_Close)) break; c = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel; + self->label_width -= BUTTON_SIZE + s_bevel + 1; break; } } if (self->label_width < 1) self->label_width = 1; XResizeWindow(ob_display, self->label, self->label_width, - s_winfont_height); + LABEL_HEIGHT); if (!n) { self->frame.client->decorations &= ~Decor_Icon; @@ -657,7 +677,7 @@ static void layout_title(ObFrame *self) self->close_x = -1; } - x = s_bevel; + x = s_bevel + 1; for (lc = themerc_titlebar_layout; *lc != '\0'; ++lc) { switch (*lc) { case 'N': @@ -665,42 +685,42 @@ static void layout_title(ObFrame *self) self->icon_x = x; XMapWindow(ob_display, self->icon); XMoveWindow(ob_display, self->icon, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel; + x += BUTTON_SIZE + s_bevel + 1; break; case 'D': if (!d) break; self->desk_x = x; XMapWindow(ob_display, self->desk); XMoveWindow(ob_display, self->desk, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel; + x += BUTTON_SIZE + s_bevel + 1; break; case 'I': if (!i) break; self->iconify_x = x; XMapWindow(ob_display, self->iconify); XMoveWindow(ob_display, self->iconify, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel; + x += BUTTON_SIZE + s_bevel + 1; break; case 'L': if (!l) break; self->label_x = x; XMapWindow(ob_display, self->label); XMoveWindow(ob_display, self->label, x, s_bevel); - x += self->label_width + s_bevel; + x += self->label_width + s_bevel + 1; break; case 'M': if (!m) break; self->max_x = x; XMapWindow(ob_display, self->max); XMoveWindow(ob_display, self->max, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel; + x += BUTTON_SIZE + s_bevel + 1; break; case 'C': if (!c) break; self->close_x = x; XMapWindow(ob_display, self->close); XMoveWindow(ob_display, self->close, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel; + x += BUTTON_SIZE + s_bevel + 1; break; } } @@ -708,55 +728,57 @@ static void layout_title(ObFrame *self) static void render(ObFrame *self) { - if (self->frame.client->focused) { - XSetWindowBorder(ob_display, self->frame.plate, - s_cb_focused_color->pixel); + if (client_focused(self->frame.client)) { + XSetWindowBorder(ob_display, self->frame.plate, + s_cb_focused_color->pixel); } else { - XSetWindowBorder(ob_display, self->frame.plate, - s_cb_unfocused_color->pixel); + XSetWindowBorder(ob_display, self->frame.plate, + s_cb_unfocused_color->pixel); } if (self->frame.client->decorations & Decor_Titlebar) { - paint(self->title, (self->frame.client->focused ? - self->a_focused_title : - self->a_unfocused_title), - self->width, TITLE_HEIGHT); - render_label(self); - render_max(self); - render_icon(self); - render_iconify(self); - render_desk(self); - render_close(self); + paint(self->title, (client_focused(self->frame.client) ? + self->a_focused_title : + self->a_unfocused_title), + 0, 0, self->width, TITLE_HEIGHT); + render_label(self); + render_max(self); + render_icon(self); + render_iconify(self); + render_desk(self); + render_close(self); } if (self->frame.client->decorations & Decor_Handle) { - paint(self->handle, (self->frame.client->focused ? - self->a_focused_handle : - self->a_unfocused_handle), - HANDLE_WIDTH(self), s_handle_height); - paint(self->lgrip, (self->frame.client->focused ? - a_focused_grip : - a_unfocused_grip), - GRIP_WIDTH, s_handle_height); - paint(self->rgrip, (self->frame.client->focused ? - a_focused_grip : - a_unfocused_grip), - GRIP_WIDTH, s_handle_height); + paint(self->handle, (client_focused(self->frame.client) ? + self->a_focused_handle : + self->a_unfocused_handle), + GRIP_WIDTH + self->bwidth, 0, + HANDLE_WIDTH(self), s_handle_height); + paint(self->lgrip, (client_focused(self->frame.client) ? + a_focused_grip : + a_unfocused_grip), + 0, 0, GRIP_WIDTH, s_handle_height); + paint(self->rgrip, (client_focused(self->frame.client) ? + a_focused_grip : + a_unfocused_grip), + 0, 0, GRIP_WIDTH, s_handle_height); } } static void render_label(ObFrame *self) { + Appearance *a; + if (self->label_x < 0) return; + a = (client_focused(self->frame.client) ? + self->a_focused_label : self->a_unfocused_label); + /* set the texture's text! */ - self->a_focused_label->texture[0].data.text.string = - self->frame.client->title; + a->texture[0].data.text.string = self->frame.client->title; - paint(self->label, (self->frame.client->focused ? - self->a_focused_label : - self->a_unfocused_label), - self->label_width, LABEL_HEIGHT); + paint(self->label, a, 0, 0, self->label_width, LABEL_HEIGHT); } static void render_icon(ObFrame *self) @@ -764,7 +786,7 @@ static void render_icon(ObFrame *self) if (self->icon_x < 0) return; /* XXX set the texture's icon picture! */ - paint(self->icon, self->a_icon, BUTTON_SIZE, BUTTON_SIZE); + paint(self->icon, self->a_icon, 0, 0, BUTTON_SIZE, BUTTON_SIZE); } static void render_max(ObFrame *self) @@ -774,28 +796,28 @@ static void render_max(ObFrame *self) if (self->max_x < 0) return; - paint(self->max, (self->frame.client->focused ? + paint(self->max, (client_focused(self->frame.client) ? (press ? a_focused_pressed_max : a_focused_unpressed_max) : (press ? a_unfocused_pressed_max : a_unfocused_unpressed_max)), - BUTTON_SIZE, BUTTON_SIZE); + 0, 0, BUTTON_SIZE, BUTTON_SIZE); } static void render_iconify(ObFrame *self) { if (self->iconify_x < 0) return; - paint(self->iconify, (self->frame.client->focused ? + paint(self->iconify, (client_focused(self->frame.client) ? (self->iconify_press ? a_focused_pressed_iconify : a_focused_unpressed_iconify) : (self->iconify_press ? a_unfocused_pressed_iconify : a_unfocused_unpressed_iconify)), - BUTTON_SIZE, BUTTON_SIZE); + 0, 0, BUTTON_SIZE, BUTTON_SIZE); } static void render_desk(ObFrame *self) @@ -805,28 +827,28 @@ static void render_desk(ObFrame *self) if (self->desk_x < 0) return; - paint(self->desk, (self->frame.client->focused ? + paint(self->desk, (client_focused(self->frame.client) ? (press ? a_focused_pressed_desk : a_focused_unpressed_desk) : (press ? a_unfocused_pressed_desk : a_unfocused_unpressed_desk)), - BUTTON_SIZE, BUTTON_SIZE); + 0, 0, BUTTON_SIZE, BUTTON_SIZE); } static void render_close(ObFrame *self) { if (self->close_x < 0) return; - paint(self->close, (self->frame.client->focused ? + paint(self->close, (client_focused(self->frame.client) ? (self->close_press ? a_focused_pressed_close : a_focused_unpressed_close) : (self->close_press ? a_unfocused_pressed_close : a_unfocused_unpressed_close)), - BUTTON_SIZE, BUTTON_SIZE); + 0, 0, BUTTON_SIZE, BUTTON_SIZE); } GQuark get_context(Client *client, Window win) @@ -853,3 +875,39 @@ GQuark get_context(Client *client, Window win) return g_quark_try_string("none"); } + +static void frame_mouse_press(const ObEvent *e, ObFrame *self) +{ + Window win = e->data.x.e->xbutton.window; + if (win == self->max) { + self->max_press = TRUE; + render_max(self); + } else if (win == self->close) { + self->close_press = TRUE; + render_close(self); + } else if (win == self->iconify) { + self->iconify_press = TRUE; + render_iconify(self); + } else if (win == self->desk) { + self->desk_press = TRUE; + render_desk(self); + } +} + +static void frame_mouse_release(const ObEvent *e, ObFrame *self) +{ + Window win = e->data.x.e->xbutton.window; + if (win == self->max) { + self->max_press = FALSE; + render_max(self); + } else if (win == self->close) { + self->close_press = FALSE; + render_close(self); + } else if (win == self->iconify) { + self->iconify_press = FALSE; + render_iconify(self); + } else if (win == self->desk) { + self->desk_press = FALSE; + render_desk(self); + } +}