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

invisible resizing areas/grips in the top corners of the window

Browse source
This commit is contained in:
Dana Jansens 2003-08-02 06:20:31 +00:00
parent 824bfd9d1f
commit 960a7f0184
5 changed files with 80 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
data/rc3
View file

@ -202,6 +202,22 @@
<action name="focus"/> <action name="focus"/>
</mousebind> </mousebind>
</context> </context>
<context name="tlcorner">
<mousebind button="Left" action="drag">
<action name="resize"/>
</mousebind>
<mousebind button="Left" action="press">
<action name="focus"/>
</mousebind>
</context>
<context name="trcorner">
<mousebind button="Left" action="drag">
<action name="resize"/>
</mousebind>
<mousebind button="Left" action="press">
<action name="focus"/>
</mousebind>
</context>
<context name="client"> <context name="client">
<mousebind button="Left" action="press"> <mousebind button="Left" action="press">
<action name="focus"/> <action name="focus"/>

64
openbox/frame.c
View file

@ -63,7 +63,11 @@ ObFrame *frame_new()
attrib.cursor = ob_cursor(OB_CURSOR_SOUTHWEST); attrib.cursor = ob_cursor(OB_CURSOR_SOUTHWEST);
self->lgrip = createWindow(self->handle, mask, &attrib); self->lgrip = createWindow(self->handle, mask, &attrib);
attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST); attrib.cursor = ob_cursor(OB_CURSOR_SOUTHEAST);
self->rgrip = createWindow(self->handle, mask, &attrib); self->rgrip = createWindow(self->handle, mask, &attrib);
attrib.cursor = ob_cursor(OB_CURSOR_NORTHWEST);
self->tlresize = createWindow(self->title, mask, &attrib);
attrib.cursor = ob_cursor(OB_CURSOR_NORTHEAST);
self->trresize = createWindow(self->title, mask, &attrib);
self->focused = FALSE; self->focused = FALSE;
@ -72,6 +76,8 @@ ObFrame *frame_new()
XMapWindow(ob_display, self->lgrip); XMapWindow(ob_display, self->lgrip);
XMapWindow(ob_display, self->rgrip); XMapWindow(ob_display, self->rgrip);
XMapWindow(ob_display, self->label); XMapWindow(ob_display, self->label);
XMapWindow(ob_display, self->tlresize);
XMapWindow(ob_display, self->trresize);
/* set colors/appearance/sizes for stuff that doesn't change */ /* 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->window, ob_rr_theme->b_color->pixel);
@ -95,6 +101,10 @@ ObFrame *frame_new()
ob_rr_theme->grip_width, ob_rr_theme->handle_height); ob_rr_theme->grip_width, ob_rr_theme->handle_height);
XResizeWindow(ob_display, self->rgrip, XResizeWindow(ob_display, self->rgrip,
ob_rr_theme->grip_width, ob_rr_theme->handle_height); ob_rr_theme->grip_width, ob_rr_theme->handle_height);
XResizeWindow(ob_display, self->tlresize,
ob_rr_theme->grip_width, ob_rr_theme->handle_height);
XResizeWindow(ob_display, self->trresize,
ob_rr_theme->grip_width, ob_rr_theme->handle_height);
/* set up the dynamic appearances */ /* set up the dynamic appearances */
self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title); self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title);
@ -208,12 +218,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized)
g_assert(self->width > 0); g_assert(self->width > 0);
/* set border widths */ /* set border widths */
XSetWindowBorderWidth(ob_display, self->plate, self->cbwidth); XSetWindowBorderWidth(ob_display, self->plate, self->cbwidth);
XSetWindowBorderWidth(ob_display, self->window, self->bwidth); XSetWindowBorderWidth(ob_display, self->window, self->bwidth);
XSetWindowBorderWidth(ob_display, self->title, self->bwidth); XSetWindowBorderWidth(ob_display, self->title, self->bwidth);
XSetWindowBorderWidth(ob_display, self->handle, self->bwidth); XSetWindowBorderWidth(ob_display, self->handle, self->bwidth);
XSetWindowBorderWidth(ob_display, self->lgrip, self->bwidth); XSetWindowBorderWidth(ob_display, self->lgrip, self->bwidth);
XSetWindowBorderWidth(ob_display, self->rgrip, self->bwidth); XSetWindowBorderWidth(ob_display, self->rgrip, self->bwidth);
/* position/size and map/unmap all the windows */ /* position/size and map/unmap all the windows */
@ -233,6 +243,10 @@ void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized)
self->innersize.top += ob_rr_theme->title_height + self->bwidth; self->innersize.top += ob_rr_theme->title_height + self->bwidth;
XMapWindow(ob_display, self->title); XMapWindow(ob_display, self->title);
XMoveWindow(ob_display, self->tlresize, 0, 0);
XMoveWindow(ob_display, self->trresize,
self->width - ob_rr_theme->grip_width, 0);
/* layout the title bar elements */ /* layout the title bar elements */
layout_title(self); layout_title(self);
} else } else
@ -375,6 +389,8 @@ void frame_grab_client(ObFrame *self, ObClient *client)
g_hash_table_insert(window_map, &self->handle, client); g_hash_table_insert(window_map, &self->handle, client);
g_hash_table_insert(window_map, &self->lgrip, client); g_hash_table_insert(window_map, &self->lgrip, client);
g_hash_table_insert(window_map, &self->rgrip, client); g_hash_table_insert(window_map, &self->rgrip, client);
g_hash_table_insert(window_map, &self->tlresize, client);
g_hash_table_insert(window_map, &self->trresize, client);
} }
void frame_release_client(ObFrame *self, ObClient *client) void frame_release_client(ObFrame *self, ObClient *client)
@ -416,6 +432,8 @@ void frame_release_client(ObFrame *self, ObClient *client)
g_hash_table_remove(window_map, &self->handle); g_hash_table_remove(window_map, &self->handle);
g_hash_table_remove(window_map, &self->lgrip); g_hash_table_remove(window_map, &self->lgrip);
g_hash_table_remove(window_map, &self->rgrip); g_hash_table_remove(window_map, &self->rgrip);
g_hash_table_remove(window_map, &self->tlresize);
g_hash_table_remove(window_map, &self->trresize);
frame_free(self); frame_free(self);
} }
@ -555,6 +573,10 @@ ObFrameContext frame_context_from_string(char *name)
return OB_FRAME_CONTEXT_HANDLE; return OB_FRAME_CONTEXT_HANDLE;
else if (!g_ascii_strcasecmp("frame", name)) else if (!g_ascii_strcasecmp("frame", name))
return OB_FRAME_CONTEXT_FRAME; return OB_FRAME_CONTEXT_FRAME;
else if (!g_ascii_strcasecmp("tlcorner", name))
return OB_FRAME_CONTEXT_TLCORNER;
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; return OB_FRAME_CONTEXT_BLCORNER;
else if (!g_ascii_strcasecmp("brcorner", name)) else if (!g_ascii_strcasecmp("brcorner", name))
@ -583,19 +605,21 @@ ObFrameContext frame_context(ObClient *client, Window win)
if (win == client->window) return OB_FRAME_CONTEXT_CLIENT; if (win == client->window) return OB_FRAME_CONTEXT_CLIENT;
self = client->frame; self = client->frame;
if (win == self->window) return OB_FRAME_CONTEXT_FRAME; if (win == self->window) return OB_FRAME_CONTEXT_FRAME;
if (win == self->plate) return OB_FRAME_CONTEXT_CLIENT; if (win == self->plate) return OB_FRAME_CONTEXT_CLIENT;
if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR; if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR; if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->handle) return OB_FRAME_CONTEXT_HANDLE; if (win == self->handle) return OB_FRAME_CONTEXT_HANDLE;
if (win == self->lgrip) return OB_FRAME_CONTEXT_BLCORNER; if (win == self->lgrip) return OB_FRAME_CONTEXT_BLCORNER;
if (win == self->rgrip) return OB_FRAME_CONTEXT_BRCORNER; if (win == self->rgrip) return OB_FRAME_CONTEXT_BRCORNER;
if (win == self->max) return OB_FRAME_CONTEXT_MAXIMIZE; if (win == self->tlresize) return OB_FRAME_CONTEXT_TLCORNER;
if (win == self->iconify)return OB_FRAME_CONTEXT_ICONIFY; if (win == self->trresize) return OB_FRAME_CONTEXT_TRCORNER;
if (win == self->close) return OB_FRAME_CONTEXT_CLOSE; if (win == self->max) return OB_FRAME_CONTEXT_MAXIMIZE;
if (win == self->icon) return OB_FRAME_CONTEXT_ICON; if (win == self->iconify) return OB_FRAME_CONTEXT_ICONIFY;
if (win == self->desk) return OB_FRAME_CONTEXT_ALLDESKTOPS; if (win == self->close) return OB_FRAME_CONTEXT_CLOSE;
if (win == self->shade) return OB_FRAME_CONTEXT_SHADE; if (win == self->icon) return OB_FRAME_CONTEXT_ICON;
if (win == self->desk) return OB_FRAME_CONTEXT_ALLDESKTOPS;
if (win == self->shade) return OB_FRAME_CONTEXT_SHADE;
return OB_FRAME_CONTEXT_NONE; return OB_FRAME_CONTEXT_NONE;
} }

5
openbox/frame.h
View file

@ -17,6 +17,8 @@ typedef enum {
OB_FRAME_CONTEXT_FRAME, OB_FRAME_CONTEXT_FRAME,
OB_FRAME_CONTEXT_BLCORNER, OB_FRAME_CONTEXT_BLCORNER,
OB_FRAME_CONTEXT_BRCORNER, OB_FRAME_CONTEXT_BRCORNER,
OB_FRAME_CONTEXT_TLCORNER,
OB_FRAME_CONTEXT_TRCORNER,
OB_FRAME_CONTEXT_MAXIMIZE, OB_FRAME_CONTEXT_MAXIMIZE,
OB_FRAME_CONTEXT_ALLDESKTOPS, OB_FRAME_CONTEXT_ALLDESKTOPS,
OB_FRAME_CONTEXT_SHADE, OB_FRAME_CONTEXT_SHADE,
@ -66,6 +68,9 @@ struct _ObFrame
Window lgrip; Window lgrip;
Window rgrip; Window rgrip;
Window tlresize;
Window trresize;
RrAppearance *a_unfocused_title; RrAppearance *a_unfocused_title;
RrAppearance *a_focused_title; RrAppearance *a_focused_title;
RrAppearance *a_unfocused_label; RrAppearance *a_unfocused_label;

14
openbox/framerender.c
View file

@ -120,6 +120,20 @@ void framerender_frame(ObFrame *self)
RrPaint(t, self->title, self->width, ob_rr_theme->title_height); RrPaint(t, self->title, self->width, ob_rr_theme->title_height);
ob_rr_theme->a_clear->surface.parent = t;
ob_rr_theme->a_clear->surface.parentx = 0;
ob_rr_theme->a_clear->surface.parenty = 0;
RrPaint(ob_rr_theme->a_clear, self->tlresize,
ob_rr_theme->grip_width, ob_rr_theme->handle_height);
ob_rr_theme->a_clear->surface.parentx =
self->width - ob_rr_theme->grip_width;
RrPaint(ob_rr_theme->a_clear, self->trresize,
ob_rr_theme->grip_width, ob_rr_theme->handle_height);
/* set parents for any parent relative guys */ /* set parents for any parent relative guys */
l->surface.parent = t; l->surface.parent = t;
l->surface.parentx = self->label_x; l->surface.parentx = self->label_x;

1
render/theme.h
View file

@ -138,6 +138,7 @@ struct _RrTheme {
RrAppearance *a_menu_item; RrAppearance *a_menu_item;
RrAppearance *a_menu_disabled; RrAppearance *a_menu_disabled;
RrAppearance *a_menu_hilite; RrAppearance *a_menu_hilite;
RrAppearance *a_clear;
RrAppearance *app_hilite_bg; RrAppearance *app_hilite_bg;
RrAppearance *app_unhilite_bg; RrAppearance *app_unhilite_bg;