#include "obtheme.h"
#include "obrender.h"
#include "obengine.h"
-#include "../../kernel/openbox.h"
-#include "../../kernel/extensions.h"
-#include "../../kernel/dispatch.h"
-#include "../../kernel/config.h"
-
+#include "kernel/openbox.h"
+#include "kernel/extensions.h"
+#include "kernel/dispatch.h"
+#include "kernel/engine.h"
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+# include <sys/types.h>
+#endif
#include <X11/Xlib.h>
#include <glib.h>
#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
-#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask)
+#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
+ ButtonPressMask | ButtonReleaseMask)
#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
ButtonMotionMask | ExposureMask)
/* style settings - geometry */
-int s_bevel;
-int s_handle_height;
-int s_bwidth;
-int s_cbwidth;
+int ob_s_bevel;
+int ob_s_handle_height;
+int ob_s_bwidth;
+int ob_s_cbwidth;
/* style settings - colors */
-color_rgb *s_b_color;
-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;
+color_rgb *ob_s_b_color;
+color_rgb *ob_s_cb_focused_color;
+color_rgb *ob_s_cb_unfocused_color;
+color_rgb *ob_s_title_focused_color;
+color_rgb *ob_s_title_unfocused_color;
+color_rgb *ob_s_titlebut_focused_color;
+color_rgb *ob_s_titlebut_unfocused_color;
/* style settings - fonts */
-int s_winfont_height;
-int s_winfont_shadow;
-int s_winfont_shadow_offset;
-ObFont *s_winfont;
+int ob_s_winfont_height;
+ObFont *ob_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;
+pixmap_mask *ob_s_max_set_mask;
+pixmap_mask *ob_s_max_unset_mask;
+pixmap_mask *ob_s_iconify_mask;
+pixmap_mask *ob_s_desk_set_mask;
+pixmap_mask *ob_s_desk_unset_mask;
+pixmap_mask *ob_s_shade_set_mask;
+pixmap_mask *ob_s_shade_unset_mask;
+pixmap_mask *ob_s_close_mask;
/* global appearances */
-Appearance *a_focused_unpressed_max;
-Appearance *a_focused_pressed_max;
-Appearance *a_unfocused_unpressed_max;
-Appearance *a_unfocused_pressed_max;
-Appearance *a_focused_unpressed_close;
-Appearance *a_focused_pressed_close;
-Appearance *a_unfocused_unpressed_close;
-Appearance *a_unfocused_pressed_close;
-Appearance *a_focused_unpressed_desk;
-Appearance *a_focused_pressed_desk;
-Appearance *a_unfocused_unpressed_desk;
-Appearance *a_unfocused_pressed_desk;
-Appearance *a_focused_unpressed_iconify;
-Appearance *a_focused_pressed_iconify;
-Appearance *a_unfocused_unpressed_iconify;
-Appearance *a_unfocused_pressed_iconify;
-Appearance *a_focused_grip;
-Appearance *a_unfocused_grip;
-Appearance *a_focused_title;
-Appearance *a_unfocused_title;
-Appearance *a_focused_label;
-Appearance *a_unfocused_label;
-Appearance *a_icon; /* always parentrelative, so no focused/unfocused */
-Appearance *a_focused_handle;
-Appearance *a_unfocused_handle;
+Appearance *ob_a_focused_unpressed_max;
+Appearance *ob_a_focused_pressed_max;
+Appearance *ob_a_focused_pressed_set_max;
+Appearance *ob_a_unfocused_unpressed_max;
+Appearance *ob_a_unfocused_pressed_max;
+Appearance *ob_a_unfocused_pressed_set_max;
+Appearance *ob_a_focused_unpressed_close;
+Appearance *ob_a_focused_pressed_close;
+Appearance *ob_a_unfocused_unpressed_close;
+Appearance *ob_a_unfocused_pressed_close;
+Appearance *ob_a_focused_unpressed_desk;
+Appearance *ob_a_focused_pressed_desk;
+Appearance *ob_a_focused_pressed_set_desk;
+Appearance *ob_a_unfocused_unpressed_desk;
+Appearance *ob_a_unfocused_pressed_desk;
+Appearance *ob_a_unfocused_pressed_set_desk;
+Appearance *ob_a_focused_unpressed_shade;
+Appearance *ob_a_focused_pressed_shade;
+Appearance *ob_a_focused_pressed_set_shade;
+Appearance *ob_a_unfocused_unpressed_shade;
+Appearance *ob_a_unfocused_pressed_shade;
+Appearance *ob_a_unfocused_pressed_set_shade;
+Appearance *ob_a_focused_unpressed_iconify;
+Appearance *ob_a_focused_pressed_iconify;
+Appearance *ob_a_unfocused_unpressed_iconify;
+Appearance *ob_a_unfocused_pressed_iconify;
+Appearance *ob_a_focused_grip;
+Appearance *ob_a_unfocused_grip;
+Appearance *ob_a_focused_title;
+Appearance *ob_a_unfocused_title;
+Appearance *ob_a_focused_label;
+Appearance *ob_a_unfocused_label;
+Appearance *ob_a_icon; /* always parentrelative, so no focused/unfocused */
+Appearance *ob_a_focused_handle;
+Appearance *ob_a_unfocused_handle;
static void layout_title(ObFrame *self);
-static void frame_mouse_press(const ObEvent *e, ObFrame *self);
-static void frame_mouse_release(const ObEvent *e, ObFrame *self);
+static void mouse_event(const ObEvent *e, ObFrame *self);
gboolean startup()
{
- g_quark_from_string("none");
- g_quark_from_string("root");
- g_quark_from_string("client");
- g_quark_from_string("titlebar");
- g_quark_from_string("handle");
- g_quark_from_string("frame");
- g_quark_from_string("blcorner");
- g_quark_from_string("brcorner");
- g_quark_from_string("maximize");
- g_quark_from_string("alldesktops");
- g_quark_from_string("iconify");
- g_quark_from_string("icon");
- g_quark_from_string("close");
-
- 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, 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;
- a_unfocused_pressed_close = NULL;
- a_focused_unpressed_desk = NULL;
- a_focused_pressed_desk = NULL;
- a_unfocused_unpressed_desk = NULL;
- a_unfocused_pressed_desk = NULL;
- a_focused_unpressed_iconify = NULL;
- a_focused_pressed_iconify = NULL;
- a_unfocused_unpressed_iconify = NULL;
- a_unfocused_pressed_iconify = NULL;
- a_focused_grip = appearance_new(Surface_Planar, 0);
- a_unfocused_grip = appearance_new(Surface_Planar, 0);
- a_focused_title = appearance_new(Surface_Planar, 0);
- 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, 1);
- a_focused_handle = appearance_new(Surface_Planar, 0);
- a_unfocused_handle = appearance_new(Surface_Planar, 0);
-
- if (load()) {
- RECT_SET(a_focused_pressed_desk->area, 0, 0,
+ char *path;
+
+ /* create the ~/.openbox/themes/openbox dir */
+ path = g_build_filename(g_get_home_dir(), ".openbox", "themes", "openbox",
+ NULL);
+ mkdir(path, (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IWGRP | S_IXGRP |
+ S_IROTH | S_IWOTH | S_IXOTH));
+ g_free(path);
+
+ ob_s_b_color = ob_s_cb_unfocused_color = ob_s_cb_focused_color =
+ ob_s_title_unfocused_color = ob_s_title_focused_color =
+ ob_s_titlebut_unfocused_color = ob_s_titlebut_focused_color = NULL;
+ ob_s_winfont = NULL;
+ ob_s_max_set_mask = ob_s_max_unset_mask = NULL;
+ ob_s_desk_set_mask = ob_s_desk_unset_mask = NULL;
+ ob_s_shade_set_mask = ob_s_shade_unset_mask = NULL;
+ ob_s_iconify_mask = ob_s_close_mask = NULL;
+
+ ob_a_focused_unpressed_max = appearance_new(Surface_Planar, 1);
+ ob_a_focused_pressed_max = appearance_new(Surface_Planar, 1);
+ ob_a_focused_pressed_set_max = appearance_new(Surface_Planar, 1);
+ ob_a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1);
+ ob_a_unfocused_pressed_max = appearance_new(Surface_Planar, 1);
+ ob_a_unfocused_pressed_set_max = appearance_new(Surface_Planar, 1);
+ ob_a_focused_unpressed_close = NULL;
+ ob_a_focused_pressed_close = NULL;
+ ob_a_unfocused_unpressed_close = NULL;
+ ob_a_unfocused_pressed_close = NULL;
+ ob_a_focused_unpressed_desk = NULL;
+ ob_a_focused_pressed_desk = NULL;
+ ob_a_focused_pressed_set_desk = NULL;
+ ob_a_unfocused_unpressed_desk = NULL;
+ ob_a_unfocused_pressed_desk = NULL;
+ ob_a_unfocused_pressed_set_desk = NULL;
+ ob_a_focused_unpressed_shade = NULL;
+ ob_a_focused_pressed_shade = NULL;
+ ob_a_focused_pressed_set_shade = NULL;
+ ob_a_unfocused_unpressed_shade = NULL;
+ ob_a_unfocused_pressed_shade = NULL;
+ ob_a_unfocused_pressed_set_shade = NULL;
+ ob_a_focused_unpressed_iconify = NULL;
+ ob_a_focused_pressed_iconify = NULL;
+ ob_a_unfocused_unpressed_iconify = NULL;
+ ob_a_unfocused_pressed_iconify = NULL;
+ ob_a_focused_grip = appearance_new(Surface_Planar, 0);
+ ob_a_unfocused_grip = appearance_new(Surface_Planar, 0);
+ ob_a_focused_title = appearance_new(Surface_Planar, 0);
+ ob_a_unfocused_title = appearance_new(Surface_Planar, 0);
+ ob_a_focused_label = appearance_new(Surface_Planar, 1);
+ ob_a_unfocused_label = appearance_new(Surface_Planar, 1);
+ ob_a_icon = appearance_new(Surface_Planar, 1);
+ ob_a_focused_handle = appearance_new(Surface_Planar, 0);
+ ob_a_unfocused_handle = appearance_new(Surface_Planar, 0);
+
+ if (obtheme_load()) {
+ RECT_SET(ob_a_focused_pressed_desk->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_focused_pressed_set_desk->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_focused_unpressed_desk->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_unfocused_pressed_desk->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_unfocused_pressed_set_desk->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_unfocused_unpressed_desk->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_focused_unpressed_desk->area, 0, 0,
+ RECT_SET(ob_a_focused_pressed_shade->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_pressed_desk->area, 0, 0,
+ RECT_SET(ob_a_focused_pressed_set_shade->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_unpressed_desk->area, 0, 0,
+ RECT_SET(ob_a_focused_unpressed_shade->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_focused_pressed_iconify->area, 0, 0,
+ RECT_SET(ob_a_unfocused_pressed_shade->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_focused_unpressed_iconify->area, 0, 0,
+ RECT_SET(ob_a_unfocused_pressed_set_shade->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_pressed_iconify->area, 0, 0,
+ RECT_SET(ob_a_unfocused_unpressed_shade->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_unpressed_iconify->area, 0, 0,
+ RECT_SET(ob_a_focused_pressed_iconify->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_unpressed_iconify->area, 0, 0,
+ RECT_SET(ob_a_focused_unpressed_iconify->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_focused_pressed_max->area, 0, 0,
+ RECT_SET(ob_a_unfocused_pressed_iconify->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_focused_unpressed_max->area, 0, 0,
+ RECT_SET(ob_a_unfocused_unpressed_iconify->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_pressed_max->area, 0, 0,
+ RECT_SET(ob_a_unfocused_unpressed_iconify->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_unpressed_max->area, 0, 0,
+ RECT_SET(ob_a_focused_pressed_max->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_focused_pressed_close->area, 0, 0,
+ RECT_SET(ob_a_focused_pressed_set_max->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_focused_unpressed_close->area, 0, 0,
+ RECT_SET(ob_a_focused_unpressed_max->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_pressed_close->area, 0, 0,
+ RECT_SET(ob_a_unfocused_pressed_max->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_unfocused_unpressed_close->area, 0, 0,
+ RECT_SET(ob_a_unfocused_pressed_set_max->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_unfocused_unpressed_max->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_focused_pressed_close->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_focused_unpressed_close->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_unfocused_pressed_close->area, 0, 0,
+ BUTTON_SIZE, BUTTON_SIZE);
+ RECT_SET(ob_a_unfocused_unpressed_close->area, 0, 0,
BUTTON_SIZE, BUTTON_SIZE);
- RECT_SET(a_focused_grip->area, 0, 0, GRIP_WIDTH, s_handle_height);
- RECT_SET(a_unfocused_grip->area, 0, 0, GRIP_WIDTH, s_handle_height);
+ RECT_SET(ob_a_focused_grip->area, 0, 0,
+ GRIP_WIDTH, ob_s_handle_height);
+ RECT_SET(ob_a_unfocused_grip->area, 0, 0,
+ GRIP_WIDTH, ob_s_handle_height);
return TRUE;
} else
return FALSE;
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);
-
- appearance_free(a_focused_unpressed_max);
- appearance_free(a_focused_pressed_max);
- appearance_free(a_unfocused_unpressed_max);
- appearance_free(a_unfocused_pressed_max);
- if (a_focused_unpressed_close != NULL)
- appearance_free(a_focused_unpressed_close);
- if (a_focused_pressed_close != NULL)
- appearance_free(a_focused_pressed_close);
- if (a_unfocused_unpressed_close != NULL)
- appearance_free(a_unfocused_unpressed_close);
- if (a_unfocused_pressed_close != NULL)
- appearance_free(a_unfocused_pressed_close);
- if (a_focused_unpressed_desk != NULL)
- appearance_free(a_focused_unpressed_desk);
- if (a_focused_pressed_desk != NULL)
- appearance_free(a_focused_pressed_desk);
- if (a_unfocused_unpressed_desk != NULL)
- appearance_free(a_unfocused_unpressed_desk);
- if (a_unfocused_pressed_desk != NULL)
- appearance_free(a_unfocused_pressed_desk);
- if (a_focused_unpressed_iconify != NULL)
- appearance_free(a_focused_unpressed_iconify);
- if (a_focused_pressed_iconify != NULL)
- appearance_free(a_focused_pressed_iconify);
- if (a_unfocused_unpressed_iconify != NULL)
- appearance_free(a_unfocused_unpressed_iconify);
- if (a_unfocused_pressed_iconify != NULL)
- appearance_free(a_unfocused_pressed_iconify);
- appearance_free(a_focused_grip);
- appearance_free(a_unfocused_grip);
- appearance_free(a_focused_title);
- appearance_free(a_unfocused_title);
- appearance_free(a_focused_label);
- appearance_free(a_unfocused_label);
- appearance_free(a_icon);
- appearance_free(a_focused_handle);
- appearance_free(a_unfocused_handle);
+ if (ob_s_b_color != NULL) color_free(ob_s_b_color);
+ if (ob_s_cb_unfocused_color != NULL) color_free(ob_s_cb_unfocused_color);
+ if (ob_s_cb_focused_color != NULL) color_free(ob_s_cb_focused_color);
+ if (ob_s_title_unfocused_color != NULL) color_free(ob_s_title_unfocused_color);
+ if (ob_s_title_focused_color != NULL) color_free(ob_s_title_focused_color);
+ if (ob_s_titlebut_unfocused_color != NULL)
+ color_free(ob_s_titlebut_unfocused_color);
+ if (ob_s_titlebut_focused_color != NULL)
+ color_free(ob_s_titlebut_focused_color);
+
+ if (ob_s_max_set_mask != NULL)
+ pixmap_mask_free(ob_s_max_set_mask);
+ if (ob_s_max_unset_mask != NULL)
+ pixmap_mask_free(ob_s_max_unset_mask);
+ if (ob_s_desk_set_mask != NULL)
+ pixmap_mask_free(ob_s_desk_set_mask);
+ if (ob_s_desk_unset_mask != NULL)
+ pixmap_mask_free(ob_s_desk_unset_mask);
+ if (ob_s_shade_set_mask != NULL)
+ pixmap_mask_free(ob_s_shade_set_mask);
+ if (ob_s_shade_unset_mask != NULL)
+ pixmap_mask_free(ob_s_shade_unset_mask);
+ if (ob_s_iconify_mask != NULL)
+ pixmap_mask_free(ob_s_iconify_mask);
+ if (ob_s_close_mask != NULL)
+ pixmap_mask_free(ob_s_close_mask);
+
+ if (ob_s_winfont != NULL) font_close(ob_s_winfont);
+
+ appearance_free(ob_a_focused_unpressed_max);
+ appearance_free(ob_a_focused_pressed_max);
+ appearance_free(ob_a_focused_pressed_set_max);
+ appearance_free(ob_a_unfocused_unpressed_max);
+ appearance_free(ob_a_unfocused_pressed_max);
+ appearance_free(ob_a_unfocused_pressed_set_max);
+ if (ob_a_focused_unpressed_close != NULL)
+ appearance_free(ob_a_focused_unpressed_close);
+ if (ob_a_focused_pressed_close != NULL)
+ appearance_free(ob_a_focused_pressed_close);
+ if (ob_a_unfocused_unpressed_close != NULL)
+ appearance_free(ob_a_unfocused_unpressed_close);
+ if (ob_a_unfocused_pressed_close != NULL)
+ appearance_free(ob_a_unfocused_pressed_close);
+ if (ob_a_focused_unpressed_desk != NULL)
+ appearance_free(ob_a_focused_unpressed_desk);
+ if (ob_a_focused_pressed_desk != NULL)
+ appearance_free(ob_a_focused_pressed_desk);
+ if (ob_a_unfocused_unpressed_desk != NULL)
+ appearance_free(ob_a_unfocused_unpressed_desk);
+ if (ob_a_unfocused_pressed_desk != NULL)
+ appearance_free(ob_a_unfocused_pressed_desk);
+ if (ob_a_focused_unpressed_shade != NULL)
+ appearance_free(ob_a_focused_unpressed_shade);
+ if (ob_a_focused_pressed_shade != NULL)
+ appearance_free(ob_a_focused_pressed_shade);
+ if (ob_a_unfocused_unpressed_shade != NULL)
+ appearance_free(ob_a_unfocused_unpressed_shade);
+ if (ob_a_unfocused_pressed_shade != NULL)
+ appearance_free(ob_a_unfocused_pressed_shade);
+ if (ob_a_focused_unpressed_iconify != NULL)
+ appearance_free(ob_a_focused_unpressed_iconify);
+ if (ob_a_focused_pressed_iconify != NULL)
+ appearance_free(ob_a_focused_pressed_iconify);
+ if (ob_a_unfocused_unpressed_iconify != NULL)
+ appearance_free(ob_a_unfocused_unpressed_iconify);
+ if (ob_a_unfocused_pressed_iconify != NULL)
+ appearance_free(ob_a_unfocused_pressed_iconify);
+ appearance_free(ob_a_focused_grip);
+ appearance_free(ob_a_unfocused_grip);
+ appearance_free(ob_a_focused_title);
+ appearance_free(ob_a_unfocused_title);
+ appearance_free(ob_a_focused_label);
+ appearance_free(ob_a_unfocused_label);
+ appearance_free(ob_a_icon);
+ appearance_free(ob_a_focused_handle);
+ appearance_free(ob_a_unfocused_handle);
}
static Window createWindow(Window parent, unsigned long mask,
self->max = createWindow(self->title, mask, &attrib);
self->close = createWindow(self->title, mask, &attrib);
self->desk = createWindow(self->title, mask, &attrib);
+ self->shade = createWindow(self->title, mask, &attrib);
self->icon = createWindow(self->title, mask, &attrib);
self->iconify = createWindow(self->title, mask, &attrib);
self->handle = createWindow(self->frame.window, mask, &attrib);
XMapWindow(ob_display, self->label);
/* set colors/appearance/sizes for stuff that doesn't change */
- XSetWindowBorder(ob_display, self->frame.window, s_b_color->pixel);
- XSetWindowBorder(ob_display, self->label, s_b_color->pixel);
- XSetWindowBorder(ob_display, self->rgrip, s_b_color->pixel);
- XSetWindowBorder(ob_display, self->lgrip, s_b_color->pixel);
+ XSetWindowBorder(ob_display, self->frame.window, ob_s_b_color->pixel);
+ XSetWindowBorder(ob_display, self->label, ob_s_b_color->pixel);
+ XSetWindowBorder(ob_display, self->rgrip, ob_s_b_color->pixel);
+ XSetWindowBorder(ob_display, self->lgrip, ob_s_b_color->pixel);
XResizeWindow(ob_display, self->max, BUTTON_SIZE, BUTTON_SIZE);
XResizeWindow(ob_display, self->iconify, BUTTON_SIZE, BUTTON_SIZE);
XResizeWindow(ob_display, self->icon, BUTTON_SIZE, BUTTON_SIZE);
XResizeWindow(ob_display, self->close, BUTTON_SIZE, BUTTON_SIZE);
XResizeWindow(ob_display, self->desk, BUTTON_SIZE, BUTTON_SIZE);
- XResizeWindow(ob_display, self->lgrip, GRIP_WIDTH, s_handle_height);
- XResizeWindow(ob_display, self->rgrip, GRIP_WIDTH, s_handle_height);
+ XResizeWindow(ob_display, self->shade, BUTTON_SIZE, BUTTON_SIZE);
+ XResizeWindow(ob_display, self->lgrip, GRIP_WIDTH, ob_s_handle_height);
+ XResizeWindow(ob_display, self->rgrip, GRIP_WIDTH, ob_s_handle_height);
/* set up the dynamic appearances */
- self->a_unfocused_title = appearance_copy(a_unfocused_title);
- self->a_focused_title = appearance_copy(a_focused_title);
- self->a_unfocused_label = appearance_copy(a_unfocused_label);
- self->a_focused_label = appearance_copy(a_focused_label);
- self->a_unfocused_handle = appearance_copy(a_unfocused_handle);
- self->a_focused_handle = appearance_copy(a_focused_handle);
- self->a_icon = appearance_copy(a_icon);
+ self->a_unfocused_title = appearance_copy(ob_a_unfocused_title);
+ self->a_focused_title = appearance_copy(ob_a_focused_title);
+ self->a_unfocused_label = appearance_copy(ob_a_unfocused_label);
+ self->a_focused_label = appearance_copy(ob_a_focused_label);
+ self->a_unfocused_handle = appearance_copy(ob_a_unfocused_handle);
+ self->a_focused_handle = appearance_copy(ob_a_focused_handle);
+ self->a_icon = appearance_copy(ob_a_icon);
self->max_press = self->close_press = self->desk_press =
- self->iconify_press = FALSE;
+ self->iconify_press = self->shade_press = FALSE;
- dispatch_register(Event_X_ButtonPress, (EventHandler)frame_mouse_press,
- self);
- dispatch_register(Event_X_ButtonRelease, (EventHandler)frame_mouse_release,
- self);
+ dispatch_register(Event_X_ButtonPress | Event_X_ButtonRelease,
+ (EventHandler)mouse_event, self);
return (Frame*)self;
}
XDestroyWindow(ob_display, self->frame.window);
- dispatch_register(0, (EventHandler)frame_mouse_press, self);
- dispatch_register(0, (EventHandler)frame_mouse_release, self);
+ dispatch_register(0, (EventHandler)mouse_event, self);
g_free(self);
}
num = 0;
if (self->frame.client->decorations & Decor_Titlebar) {
- xrect[0].x = -s_bevel;
- xrect[0].y = -s_bevel;
+ xrect[0].x = -ob_s_bevel;
+ xrect[0].y = -ob_s_bevel;
xrect[0].width = self->width + self->bwidth * 2;
xrect[0].height = TITLE_HEIGHT +
self->bwidth * 2;
}
if (self->frame.client->decorations & Decor_Handle) {
- xrect[1].x = -s_bevel;
+ xrect[1].x = -ob_s_bevel;
xrect[1].y = HANDLE_Y(self);
xrect[1].width = self->width + self->bwidth * 2;
- xrect[1].height = s_handle_height +
+ xrect[1].height = ob_s_handle_height +
self->bwidth * 2;
++num;
}
{
if (resized) {
if (self->frame.client->decorations & Decor_Border) {
- self->bwidth = s_bwidth;
- self->cbwidth = s_cbwidth;
+ self->bwidth = ob_s_bwidth;
+ self->cbwidth = ob_s_cbwidth;
} else {
self->bwidth = self->cbwidth = 0;
}
/* they all default off, they're turned on in layout_title */
self->icon_x = -1;
self->desk_x = -1;
- self->icon_x = -1;
+ self->shade_x = -1;
+ self->iconify_x = -1;
self->label_x = -1;
self->max_x = -1;
self->close_x = -1;
/* layout the title bar elements */
layout_title(self);
- } else {
+ } else
XUnmapWindow(ob_display, self->title);
- /* make all the titlebar stuff not render */
- self->frame.client->decorations &= ~(Decor_Icon | Decor_Iconify |
- Decor_Maximize | Decor_Close |
- Decor_AllDesktops);
- }
if (self->frame.client->decorations & Decor_Handle) {
XMoveResizeWindow(ob_display, self->handle,
-self->bwidth, HANDLE_Y(self),
- self->width, s_handle_height);
+ self->width, ob_s_handle_height);
XMoveWindow(ob_display, self->lgrip,
-self->bwidth, -self->bwidth);
XMoveWindow(ob_display, self->rgrip,
-self->bwidth + self->width -
GRIP_WIDTH, -self->bwidth);
- self->innersize.bottom += s_handle_height +
+ self->innersize.bottom += ob_s_handle_height +
self->bwidth;
XMapWindow(ob_display, self->handle);
- if (self->a_focused_handle->surface.data.planar.grad ==
+ if (ob_a_focused_grip->surface.data.planar.grad ==
Background_ParentRelative)
RECT_SET(self->a_focused_handle->area, 0, 0,
- self->width, s_handle_height);
+ self->width, ob_s_handle_height);
else
RECT_SET(self->a_focused_handle->area,
GRIP_WIDTH + self->bwidth, 0,
self->width - (GRIP_WIDTH + self->bwidth) * 2,
- s_handle_height);
- if (self->a_unfocused_handle->surface.data.planar.grad ==
+ ob_s_handle_height);
+ if (ob_a_unfocused_grip->surface.data.planar.grad ==
Background_ParentRelative)
RECT_SET(self->a_unfocused_handle->area, 0, 0,
- self->width, s_handle_height);
+ self->width, ob_s_handle_height);
else
RECT_SET(self->a_unfocused_handle->area,
GRIP_WIDTH + self->bwidth, 0,
self->width - (GRIP_WIDTH + self->bwidth) * 2,
- s_handle_height);
+ ob_s_handle_height);
} else
XUnmapWindow(ob_display, self->handle);
self->frame.area.height - self->bwidth * 2);
if (resized) {
- render_frame(self);
+ obrender_frame(self);
frame_adjust_shape(self);
}
void frame_adjust_state(ObFrame *self)
{
- render_frame(self);
+ obrender_frame(self);
}
void frame_adjust_focus(ObFrame *self)
{
- render_frame(self);
+ obrender_frame(self);
}
void frame_adjust_title(ObFrame *self)
{
- render_frame(self);
+ obrender_frame(self);
}
void frame_adjust_icon(ObFrame *self)
{
- render_frame(self);
+ obrender_frame(self);
}
void frame_grab_client(ObFrame *self, Client *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_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);
{
char *lc;
int x;
- gboolean n, d, i, l, m ,c;
- ConfigValue layout;
+ gboolean n, d, i, l, m, c, s;
- n = d = i = l = m = c = FALSE;
-
- if (!config_get("titlebar.layout", Config_String, &layout)) {
- layout.string = "NDLIMC";
- config_set("titlebar.layout", Config_String, layout);
- }
+ n = d = i = l = m = c = s = FALSE;
/* figure out whats being shown, and the width of the label */
- self->label_width = self->width - (s_bevel + 1) * 2;
- for (lc = layout.string; *lc != '\0'; ++lc) {
+ self->label_width = self->width - (ob_s_bevel + 1) * 2;
+ for (lc = engine_layout; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (!(self->frame.client->decorations & Decor_Icon)) break;
if (n) { *lc = ' '; break; } /* rm duplicates */
n = TRUE;
- self->label_width -= BUTTON_SIZE + s_bevel + 1;
+ self->label_width -= BUTTON_SIZE + ob_s_bevel + 1;
break;
case 'D':
if (!(self->frame.client->decorations & Decor_AllDesktops)) break;
if (d) { *lc = ' '; break; } /* rm duplicates */
d = TRUE;
- self->label_width -= BUTTON_SIZE + s_bevel + 1;
+ self->label_width -= BUTTON_SIZE + ob_s_bevel + 1;
+ break;
+ case 'S':
+ if (!(self->frame.client->decorations & Decor_Shade)) break;
+ if (s) { *lc = ' '; break; } /* rm duplicates */
+ s = TRUE;
+ self->label_width -= BUTTON_SIZE + ob_s_bevel + 1;
break;
case 'I':
if (!(self->frame.client->decorations & Decor_Iconify)) break;
if (i) { *lc = ' '; break; } /* rm duplicates */
i = TRUE;
- self->label_width -= BUTTON_SIZE + s_bevel + 1;
+ self->label_width -= BUTTON_SIZE + ob_s_bevel + 1;
break;
case 'L':
if (l) { *lc = ' '; break; } /* rm duplicates */
if (!(self->frame.client->decorations & Decor_Maximize)) break;
if (m) { *lc = ' '; break; } /* rm duplicates */
m = TRUE;
- self->label_width -= BUTTON_SIZE + s_bevel + 1;
+ self->label_width -= BUTTON_SIZE + ob_s_bevel + 1;
break;
case 'C':
if (!(self->frame.client->decorations & Decor_Close)) break;
if (c) { *lc = ' '; break; } /* rm duplicates */
c = TRUE;
- self->label_width -= BUTTON_SIZE + s_bevel + 1;
+ self->label_width -= BUTTON_SIZE + ob_s_bevel + 1;
break;
}
}
if (!n) XUnmapWindow(ob_display, self->icon);
if (!d) XUnmapWindow(ob_display, self->desk);
+ if (!s) XUnmapWindow(ob_display, self->shade);
if (!i) XUnmapWindow(ob_display, self->iconify);
if (!l) XUnmapWindow(ob_display, self->label);
if (!m) XUnmapWindow(ob_display, self->max);
if (!c) XUnmapWindow(ob_display, self->close);
- x = s_bevel + 1;
- for (lc = layout.string; *lc != '\0'; ++lc) {
+ x = ob_s_bevel + 1;
+ for (lc = engine_layout; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (!n) break;
self->icon_x = x;
RECT_SET(self->a_icon->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE);
XMapWindow(ob_display, self->icon);
- XMoveWindow(ob_display, self->icon, x, s_bevel + 1);
- x += BUTTON_SIZE + s_bevel + 1;
+ XMoveWindow(ob_display, self->icon, x, ob_s_bevel + 1);
+ x += BUTTON_SIZE + ob_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 + 1;
+ XMoveWindow(ob_display, self->desk, x, ob_s_bevel + 1);
+ x += BUTTON_SIZE + ob_s_bevel + 1;
+ break;
+ case 'S':
+ if (!s) break;
+ self->shade_x = x;
+ XMapWindow(ob_display, self->shade);
+ XMoveWindow(ob_display, self->shade, x, ob_s_bevel + 1);
+ x += BUTTON_SIZE + ob_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 + 1;
+ XMoveWindow(ob_display, self->iconify, x, ob_s_bevel + 1);
+ x += BUTTON_SIZE + ob_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 + 1;
+ XMoveWindow(ob_display, self->label, x, ob_s_bevel);
+ x += self->label_width + ob_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 + 1;
+ XMoveWindow(ob_display, self->max, x, ob_s_bevel + 1);
+ x += BUTTON_SIZE + ob_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 + 1;
+ XMoveWindow(ob_display, self->close, x, ob_s_bevel + 1);
+ x += BUTTON_SIZE + ob_s_bevel + 1;
break;
}
}
self->label_width, LABEL_HEIGHT);
}
-static void frame_mouse_press(const ObEvent *e, ObFrame *self)
+static void mouse_event(const ObEvent *e, ObFrame *self)
{
- Window win = e->data.x.e->xbutton.window;
+ Window win;
+ gboolean press = e->type == Event_X_ButtonPress;
+
+ win = e->data.x.e->xbutton.window;
if (win == self->max) {
- self->max_press = TRUE;
- render_frame(self);
+ self->max_press = press;
+ obrender_frame(self);
} else if (win == self->close) {
- self->close_press = TRUE;
- render_frame(self);
+ self->close_press = press;
+ obrender_frame(self);
} else if (win == self->iconify) {
- self->iconify_press = TRUE;
- render_frame(self);
+ self->iconify_press = press;
+ obrender_frame(self);
} else if (win == self->desk) {
- self->desk_press = TRUE;
- render_frame(self);
+ self->desk_press = press;
+ obrender_frame(self);
+ } else if (win == self->shade) {
+ self->shade_press = press;
+ obrender_frame(self);
}
}
-static void frame_mouse_release(const ObEvent *e, ObFrame *self)
+Context get_context(Client *client, Window win)
{
- Window win = e->data.x.e->xbutton.window;
- if (win == self->max) {
- self->max_press = FALSE;
- render_frame(self);
- } else if (win == self->close) {
- self->close_press = FALSE;
- render_frame(self);
- } else if (win == self->iconify) {
- self->iconify_press = FALSE;
- render_frame(self);
- } else if (win == self->desk) {
- self->desk_press = FALSE;
- render_frame(self);
- }
+ ObFrame *self;
+
+ if (win == ob_root) return Context_Root;
+ if (client == NULL) return Context_None;
+ if (win == client->window) return Context_Client;
+
+ self = (ObFrame*) client->frame;
+ if (win == self->frame.window) return Context_Frame;
+ if (win == self->frame.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;
}
projects / chaz / openbox / blobdiff