+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ frame.c for the Openbox window manager
+ Copyright (c) 2003 Ben 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "frame.h"
#include "client.h"
#include "openbox.h"
#include "config.h"
#include "framerender.h"
#include "mainloop.h"
+#include "moveresize.h"
#include "render/theme.h"
#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
f->cbwidth_y)
static void layout_title(ObFrame *self);
+static void flash_done(gpointer data);
+static gboolean flash_timeout(gpointer data);
+
+static void set_theme_statics(ObFrame *self);
+static void free_theme_statics(ObFrame *self);
static Window createWindow(Window parent, unsigned long mask,
XSetWindowAttributes *attrib)
XMapWindow(ob_display, self->rgrip);
XMapWindow(ob_display, self->label);
+ 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;
+
+ set_theme_statics(self);
+
+ return (ObFrame*)self;
+}
+
+static void set_theme_statics(ObFrame *self)
+{
/* set colors/appearance/sizes for stuff that doesn't change */
XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
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 (ObFrame*)self;
}
-static void frame_free(ObFrame *self)
+static void free_theme_statics(ObFrame *self)
{
RrAppearanceFree(self->a_unfocused_title);
RrAppearanceFree(self->a_focused_title);
RrAppearanceFree(self->a_unfocused_handle);
RrAppearanceFree(self->a_focused_handle);
RrAppearanceFree(self->a_icon);
+}
+
+static void frame_free(ObFrame *self)
+{
+ free_theme_statics(self);
XDestroyWindow(ob_display, self->window);
}
}
+void frame_adjust_theme(ObFrame *self)
+{
+ free_theme_statics(self);
+ set_theme_statics(self);
+}
+
void frame_adjust_shape(ObFrame *self)
{
#ifdef SHAPE
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)
+ if (self->decorations & OB_FRAME_DECOR_HANDLE &&
+ ob_rr_theme->show_handle)
self->innersize.bottom += ob_rr_theme->handle_height +
self->rbwidth + (self->rbwidth - self->bwidth);
layout_title(self);
if (!fake) {
- if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+ if (self->decorations & OB_FRAME_DECOR_HANDLE &&
+ ob_rr_theme->show_handle)
+ {
XMoveResizeWindow(ob_display, self->handle,
-self->bwidth, FRAME_HANDLE_Y(self),
self->width, ob_rr_theme->handle_height);
g_hash_table_remove(window_map, &self->tlresize);
g_hash_table_remove(window_map, &self->trresize);
+ ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self);
+
frame_free(self);
}
n = d = i = l = m = c = s = FALSE;
/* figure out whats being shown, and the width of the label */
- self->label_width = self->width - (ob_rr_theme->bevel + 1) * 2;
+ self->label_width = self->width - (ob_rr_theme->padding + 1) * 2;
for (lc = config_title_layout; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (n) { *lc = ' '; break; } /* rm duplicates */
n = TRUE;
self->label_width -= (ob_rr_theme->button_size + 2 +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'D':
if (d) { *lc = ' '; break; } /* rm duplicates */
d = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'S':
if (s) { *lc = ' '; break; } /* rm duplicates */
s = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'I':
if (i) { *lc = ' '; break; } /* rm duplicates */
i = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'L':
if (l) { *lc = ' '; break; } /* rm duplicates */
if (m) { *lc = ' '; break; } /* rm duplicates */
m = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'C':
if (c) { *lc = ' '; break; } /* rm duplicates */
c = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
}
}
if (!m) XUnmapWindow(ob_display, self->max);
if (!c) XUnmapWindow(ob_display, self->close);
- x = ob_rr_theme->bevel + 1;
+ x = ob_rr_theme->padding + 1;
for (lc = config_title_layout; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (!n) break;
self->icon_x = x;
XMapWindow(ob_display, self->icon);
- XMoveWindow(ob_display, self->icon, x, ob_rr_theme->bevel);
- x += ob_rr_theme->button_size + 2 + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->icon, x, ob_rr_theme->padding);
+ x += ob_rr_theme->button_size + 2 + ob_rr_theme->padding + 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->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->desk, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 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->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->shade, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 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->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display,self->iconify, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 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->bevel);
- x += self->label_width + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->label, x, ob_rr_theme->padding);
+ x += self->label_width + ob_rr_theme->padding + 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->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->max, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 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->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->close, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 1;
break;
}
}
}
-ObFrameContext frame_context_from_string(char *name)
+ObFrameContext frame_context_from_string(const gchar *name)
{
- if (!g_ascii_strcasecmp("desktop", name))
+ if (!g_ascii_strcasecmp("Desktop", name))
return OB_FRAME_CONTEXT_DESKTOP;
- else if (!g_ascii_strcasecmp("client", name))
+ else if (!g_ascii_strcasecmp("Client", name))
return OB_FRAME_CONTEXT_CLIENT;
- else if (!g_ascii_strcasecmp("titlebar", name))
+ else if (!g_ascii_strcasecmp("Titlebar", name))
return OB_FRAME_CONTEXT_TITLEBAR;
- else if (!g_ascii_strcasecmp("handle", name))
+ else if (!g_ascii_strcasecmp("Handle", name))
return OB_FRAME_CONTEXT_HANDLE;
- else if (!g_ascii_strcasecmp("frame", name))
+ else if (!g_ascii_strcasecmp("Frame", name))
return OB_FRAME_CONTEXT_FRAME;
- else if (!g_ascii_strcasecmp("tlcorner", name))
+ else if (!g_ascii_strcasecmp("TLCorner", name))
return OB_FRAME_CONTEXT_TLCORNER;
- else if (!g_ascii_strcasecmp("trcorner", name))
+ else if (!g_ascii_strcasecmp("TRCorner", name))
return OB_FRAME_CONTEXT_TRCORNER;
- else if (!g_ascii_strcasecmp("blcorner", name))
+ else if (!g_ascii_strcasecmp("BLCorner", name))
return OB_FRAME_CONTEXT_BLCORNER;
- else if (!g_ascii_strcasecmp("brcorner", name))
+ else if (!g_ascii_strcasecmp("BRCorner", name))
return OB_FRAME_CONTEXT_BRCORNER;
- else if (!g_ascii_strcasecmp("maximize", name))
+ else if (!g_ascii_strcasecmp("Maximize", name))
return OB_FRAME_CONTEXT_MAXIMIZE;
- else if (!g_ascii_strcasecmp("alldesktops", name))
+ else if (!g_ascii_strcasecmp("AllDesktops", name))
return OB_FRAME_CONTEXT_ALLDESKTOPS;
- else if (!g_ascii_strcasecmp("shade", name))
+ else if (!g_ascii_strcasecmp("Shade", name))
return OB_FRAME_CONTEXT_SHADE;
- else if (!g_ascii_strcasecmp("iconify", name))
+ else if (!g_ascii_strcasecmp("Iconify", name))
return OB_FRAME_CONTEXT_ICONIFY;
- else if (!g_ascii_strcasecmp("icon", name))
+ else if (!g_ascii_strcasecmp("Icon", name))
return OB_FRAME_CONTEXT_ICON;
- else if (!g_ascii_strcasecmp("close", name))
+ else if (!g_ascii_strcasecmp("Close", name))
return OB_FRAME_CONTEXT_CLOSE;
+ else if (!g_ascii_strcasecmp("MoveResize", name))
+ return OB_FRAME_CONTEXT_MOVE_RESIZE;
return OB_FRAME_CONTEXT_NONE;
}
{
ObFrame *self;
+ if (moveresize_in_progress)
+ return OB_FRAME_CONTEXT_MOVE_RESIZE;
+
if (win == RootWindow(ob_display, ob_screen))
return OB_FRAME_CONTEXT_DESKTOP;
if (client == NULL) return OB_FRAME_CONTEXT_NONE;
static void flash_done(gpointer data)
{
ObFrame *self = data;
- self->flashing = FALSE;
if (self->focused != self->flash_on)
frame_adjust_focus(self, self->focused);
{
ObFrame *self = data;
GTimeVal now;
- gboolean focused;
-
- g_message("flash");
g_get_current_time(&now);
if (now.tv_sec > self->flash_end.tv_sec ||
(now.tv_sec == self->flash_end.tv_sec &&
- now.tv_usec >= self->flash_end.tv_usec)) {
- g_message("done flashing");
+ now.tv_usec >= self->flash_end.tv_usec))
+ self->flashing = FALSE;
+
+ if (!self->flashing)
return FALSE; /* we are done */
- }
self->flash_on = !self->flash_on;
- g_message("on %d", self->flash_on);
{
+ gboolean focused;
+
focused = self->focused; /* save the focused flag */
frame_adjust_focus(self, self->flash_on);
self->focused = focused;
return TRUE; /* go again */
}
-void frame_flash(ObFrame *self)
+void frame_flash_start(ObFrame *self)
{
self->flash_on = self->focused;
if (!self->flashing)
ob_main_loop_timeout_add(ob_main_loop,
- G_USEC_PER_SEC / 2,
+ G_USEC_PER_SEC * 0.75,
flash_timeout,
self,
flash_done);
g_get_current_time(&self->flash_end);
- g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 4);
+ g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);
self->flashing = TRUE;
}
+
+void frame_flash_stop(ObFrame *self)
+{
+ self->flashing = FALSE;
+}
projects / chaz / openbox / blobdiff