nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hover theme elements for window titlebar buttons

Browse source
This commit is contained in:
Dana Jansens 2003-07-28 19:21:45 +00:00
parent 950516124f
commit 742106511f
4 changed files with 96 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
openbox/event.c
View file

@ -658,20 +658,57 @@ static void event_handle_client(ObClient *client, XEvent *e)
client_iconify(client, TRUE, TRUE); client_iconify(client, TRUE, TRUE);
frame_adjust_focus(client->frame, FALSE); frame_adjust_focus(client->frame, FALSE);
break; break;
case EnterNotify: case LeaveNotify:
con = frame_context(client, e->xcrossing.window);
switch (con) { switch (con) {
case OB_FRAME_CONTEXT_MAXIMIZE: case OB_FRAME_CONTEXT_MAXIMIZE:
client->frame->max_hover = FALSE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_ALLDESKTOPS: case OB_FRAME_CONTEXT_ALLDESKTOPS:
client->frame->desk_hover = FALSE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_SHADE: case OB_FRAME_CONTEXT_SHADE:
client->frame->shade_hover = FALSE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_ICONIFY: case OB_FRAME_CONTEXT_ICONIFY:
client->frame->iconify_hover = FALSE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_CLOSE: case OB_FRAME_CONTEXT_CLOSE:
g_message("hi"); client->frame->close_hover = FALSE;
frame_adjust_state(client->frame); frame_adjust_state(client->frame);
break; break;
default: default:
break; break;
} }
con = frame_context(client, e->xcrossing.subwindow); break;
case EnterNotify:
con = frame_context(client, e->xcrossing.window);
switch (con) {
case OB_FRAME_CONTEXT_MAXIMIZE:
client->frame->max_hover = TRUE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_ALLDESKTOPS:
client->frame->desk_hover = TRUE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_SHADE:
client->frame->shade_hover = TRUE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_ICONIFY:
client->frame->iconify_hover = TRUE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_CLOSE:
client->frame->close_hover = TRUE;
frame_adjust_state(client->frame);
break;
case OB_FRAME_CONTEXT_FRAME:
if (client_normal(client)) { if (client_normal(client)) {
if (ob_state() == OB_STATE_STARTING) { if (ob_state() == OB_STATE_STARTING) {
/* move it to the top of the focus order */ /* move it to the top of the focus order */
@ -690,6 +727,10 @@ static void event_handle_client(ObClient *client, XEvent *e)
} }
} }
break; break;
default:
break;
}
break;
case ConfigureRequest: case ConfigureRequest:
/* compress these */ /* compress these */
while (XCheckTypedWindowEvent(ob_display, client->window, while (XCheckTypedWindowEvent(ob_display, client->window,

5
openbox/frame.c
View file

@ -9,7 +9,8 @@
#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \ #define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
ButtonPressMask | ButtonReleaseMask) ButtonPressMask | ButtonReleaseMask)
#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \ #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
ButtonMotionMask | ExposureMask) ButtonMotionMask | ExposureMask | \
EnterWindowMask | LeaveWindowMask)
#define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \ #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
f->cbwidth) f->cbwidth)
@ -106,6 +107,8 @@ ObFrame *frame_new()
self->max_press = self->close_press = self->desk_press = self->max_press = self->close_press = self->desk_press =
self->iconify_press = self->shade_press = FALSE; 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; return (ObFrame*)self;
} }

5
openbox/frame.h
View file

@ -95,6 +95,11 @@ struct _ObFrame
gboolean desk_press; gboolean desk_press;
gboolean shade_press; gboolean shade_press;
gboolean iconify_press; gboolean iconify_press;
gboolean max_hover;
gboolean close_hover;
gboolean desk_hover;
gboolean shade_hover;
gboolean iconify_hover;
gboolean focused; gboolean focused;
}; };

40
openbox/framerender.c
View file

@ -38,12 +38,16 @@ void framerender_frame(ObFrame *self)
ob_rr_theme->a_focused_pressed_set_max : ob_rr_theme->a_focused_pressed_set_max :
(self->max_press ? (self->max_press ?
ob_rr_theme->a_focused_pressed_max : ob_rr_theme->a_focused_pressed_max :
ob_rr_theme->a_focused_unpressed_max)) : (self->max_hover ?
ob_rr_theme->a_hover_focused_max :
ob_rr_theme->a_focused_unpressed_max))) :
(self->client->max_vert || self->client->max_horz ? (self->client->max_vert || self->client->max_horz ?
ob_rr_theme->a_unfocused_pressed_set_max : ob_rr_theme->a_unfocused_pressed_set_max :
(self->max_press ? (self->max_press ?
ob_rr_theme->a_unfocused_pressed_max : ob_rr_theme->a_unfocused_pressed_max :
ob_rr_theme->a_unfocused_unpressed_max)))); (self->max_hover ?
ob_rr_theme->a_hover_unfocused_max :
ob_rr_theme->a_unfocused_unpressed_max)))));
n = self->a_icon; n = self->a_icon;
i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ?
(self->focused ? (self->focused ?
@ -52,10 +56,14 @@ void framerender_frame(ObFrame *self)
(self->focused ? (self->focused ?
(self->iconify_press ? (self->iconify_press ?
ob_rr_theme->a_focused_pressed_iconify : ob_rr_theme->a_focused_pressed_iconify :
ob_rr_theme->a_focused_unpressed_iconify) : (self->iconify_hover ?
ob_rr_theme->a_hover_focused_iconify :
ob_rr_theme->a_focused_unpressed_iconify)) :
(self->iconify_press ? (self->iconify_press ?
ob_rr_theme->a_unfocused_pressed_iconify : ob_rr_theme->a_unfocused_pressed_iconify :
ob_rr_theme->a_unfocused_unpressed_iconify))); (self->iconify_hover ?
ob_rr_theme->a_hover_unfocused_iconify :
ob_rr_theme->a_unfocused_unpressed_iconify))));
d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ?
(self->focused ? (self->focused ?
ob_rr_theme->a_disabled_focused_desk : ob_rr_theme->a_disabled_focused_desk :
@ -65,12 +73,16 @@ void framerender_frame(ObFrame *self)
ob_rr_theme->a_focused_pressed_set_desk : ob_rr_theme->a_focused_pressed_set_desk :
(self->desk_press ? (self->desk_press ?
ob_rr_theme->a_focused_pressed_desk : ob_rr_theme->a_focused_pressed_desk :
ob_rr_theme->a_focused_unpressed_desk)) : (self->desk_hover ?
ob_rr_theme->a_hover_focused_desk :
ob_rr_theme->a_focused_unpressed_desk))) :
(self->client->desktop == DESKTOP_ALL ? (self->client->desktop == DESKTOP_ALL ?
ob_rr_theme->a_unfocused_pressed_set_desk : ob_rr_theme->a_unfocused_pressed_set_desk :
(self->desk_press ? (self->desk_press ?
ob_rr_theme->a_unfocused_pressed_desk : ob_rr_theme->a_unfocused_pressed_desk :
ob_rr_theme->a_unfocused_unpressed_desk)))); (self->desk_hover ?
ob_rr_theme->a_hover_unfocused_desk :
ob_rr_theme->a_unfocused_unpressed_desk)))));
s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ?
(self->focused ? (self->focused ?
ob_rr_theme->a_disabled_focused_shade : ob_rr_theme->a_disabled_focused_shade :
@ -80,12 +92,16 @@ void framerender_frame(ObFrame *self)
ob_rr_theme->a_focused_pressed_set_shade : ob_rr_theme->a_focused_pressed_set_shade :
(self->shade_press ? (self->shade_press ?
ob_rr_theme->a_focused_pressed_shade : ob_rr_theme->a_focused_pressed_shade :
ob_rr_theme->a_focused_unpressed_shade)) : (self->shade_hover ?
ob_rr_theme->a_hover_focused_shade :
ob_rr_theme->a_focused_unpressed_shade))) :
(self->client->shaded ? (self->client->shaded ?
ob_rr_theme->a_unfocused_pressed_set_shade : ob_rr_theme->a_unfocused_pressed_set_shade :
(self->shade_press ? (self->shade_press ?
ob_rr_theme->a_unfocused_pressed_shade : ob_rr_theme->a_unfocused_pressed_shade :
ob_rr_theme->a_unfocused_unpressed_shade)))); (self->shade_hover ?
ob_rr_theme->a_hover_unfocused_shade :
ob_rr_theme->a_unfocused_unpressed_shade)))));
c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ?
(self->focused ? (self->focused ?
ob_rr_theme->a_disabled_focused_close : ob_rr_theme->a_disabled_focused_close :
@ -93,10 +109,14 @@ void framerender_frame(ObFrame *self)
(self->focused ? (self->focused ?
(self->close_press ? (self->close_press ?
ob_rr_theme->a_focused_pressed_close : ob_rr_theme->a_focused_pressed_close :
ob_rr_theme->a_focused_unpressed_close) : (self->close_hover ?
ob_rr_theme->a_hover_focused_close :
ob_rr_theme->a_focused_unpressed_close)) :
(self->close_press ? (self->close_press ?
ob_rr_theme->a_unfocused_pressed_close : ob_rr_theme->a_unfocused_pressed_close :
ob_rr_theme->a_unfocused_unpressed_close))); (self->close_hover ?
ob_rr_theme->a_hover_unfocused_close :
ob_rr_theme->a_unfocused_unpressed_close))));
RrPaint(t, self->title, self->width, ob_rr_theme->title_height); RrPaint(t, self->title, self->width, ob_rr_theme->title_height);