#include "../../kernel/screen.h"
#include "../../kernel/extensions.h"
#include "../../kernel/dispatch.h"
-#include "../../kernel/themerc.h"
+#include "../../kernel/config.h"
#include "../../kernel/frame.h"
#include "../../render/render.h"
#include "../../render/color.h"
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);
#endif
}
-void frame_adjust_size(ObFrame *self)
+void frame_adjust_area(ObFrame *self)
{
if (self->frame.client->decorations & Decor_Border) {
self->bwidth = s_bwidth;
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));
-
- /* do this in two steps because clients whose gravity is set to
- 'Static' don't end up getting moved at all with an XMoveResizeWindow */
- XMoveWindow(ob_display, self->frame.plate,
- self->innersize.left - self->cbwidth,
- self->innersize.top - self->cbwidth);
- XResizeWindow(ob_display, self->frame.plate,
- self->frame.client->area.width,
- 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));
+
+ /* move and resize the plate */
+ XMoveResizeWindow(ob_display, self->frame.plate,
+ self->innersize.left - self->cbwidth,
+ self->innersize.top - self->cbwidth,
+ self->frame.client->area.width,
+ self->frame.client->area.height);
+ /* when the client has StaticGravity, it likes to move around. */
+ XMoveWindow(ob_display, self->frame.client->window, 0, 0);
STRUT_SET(self->frame.size,
self->innersize.left + self->bwidth,
self->frame.size.top + self->frame.size.bottom);
render(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);
+ frame_adjust_shape(self);
}
void frame_adjust_state(ObFrame *self)
/* 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);
const char *lc;
int x;
gboolean n, d, i, l, m ,c;
+ ConfigValue layout;
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);
+ }
+
/* figure out whats being shown, and the width of the label */
self->label_width = self->width - (s_bevel + 1) * 2;
- for (lc = themerc_titlebar_layout; *lc != '\0'; ++lc) {
+ for (lc = layout.string; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (!(self->frame.client->decorations & Decor_Icon)) break;
}
x = s_bevel + 1;
- for (lc = themerc_titlebar_layout; *lc != '\0'; ++lc) {
+ for (lc = layout.string; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (!n) break;