Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Split titlebar properties into a struct with a SW and a Position

This commit is contained in:
Julien Danjou 2008-03-14 16:32:58 +01:00
parent 4311564945
commit 2c43fd6a69
4 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
client.c
View File

@ -140,27 +140,27 @@ client_updatetitlebar(Client *c)
style_t style; style_t style;
area_t geometry; area_t geometry;
if(!c->titlebar) if(!c->titlebar.position)
return; return;
phys_screen = get_phys_screen(c->screen); phys_screen = get_phys_screen(c->screen);
ctx = draw_context_new(globalconf.display, phys_screen, ctx = draw_context_new(globalconf.display, phys_screen,
c->titlebar->geometry.width, c->titlebar.sw->geometry.width,
c->titlebar->geometry.height, c->titlebar.sw->geometry.height,
c->titlebar->drawable); c->titlebar.sw->drawable);
style = globalconf.focus->client == c ? style = globalconf.focus->client == c ?
globalconf.screens[c->screen].styles.focus : globalconf.screens[c->screen].styles.focus :
globalconf.screens[c->screen].styles.normal; globalconf.screens[c->screen].styles.normal;
geometry = c->titlebar->geometry; geometry = c->titlebar.sw->geometry;
geometry.x = geometry.y = 0; geometry.x = geometry.y = 0;
draw_text(ctx, geometry, AlignCenter, 0, draw_text(ctx, geometry, AlignCenter, 0,
c->name, style); c->name, style);
simplewindow_refresh_drawable(c->titlebar, phys_screen); simplewindow_refresh_drawable(c->titlebar.sw, phys_screen);
draw_context_delete(ctx); draw_context_delete(ctx);
} }
@ -203,8 +203,8 @@ client_ban(Client *c)
client_unfocus(c); client_unfocus(c);
XUnmapWindow(globalconf.display, c->win); XUnmapWindow(globalconf.display, c->win);
window_setstate(c->win, IconicState); window_setstate(c->win, IconicState);
if(c->titlebar) if(c->titlebar.position)
XUnmapWindow(globalconf.display, c->titlebar->window); XUnmapWindow(globalconf.display, c->titlebar.sw->window);
} }
/** Give focus to client, or to first client if c is NULL /** Give focus to client, or to first client if c is NULL
@ -248,8 +248,8 @@ client_focus(Client *c, int screen, Bool raise)
if(c->isfloating || curlay->arrange == layout_floating) if(c->isfloating || curlay->arrange == layout_floating)
{ {
XRaiseWindow(globalconf.display, c->win); XRaiseWindow(globalconf.display, c->win);
if(c->titlebar) if(c->titlebar.position)
XRaiseWindow(globalconf.display, c->titlebar->window); XRaiseWindow(globalconf.display, c->titlebar.sw->window);
} }
else else
{ {
@ -259,31 +259,31 @@ client_focus(Client *c, int screen, Bool raise)
for(client = globalconf.clients; client; client = client->next) for(client = globalconf.clients; client; client = client->next)
if(client != c && client_isvisible(client, c->screen) && client->isfloating) if(client != c && client_isvisible(client, c->screen) && client->isfloating)
{ {
if(client->titlebar) if(client->titlebar.position)
{ {
XConfigureWindow(globalconf.display, client->titlebar->window, XConfigureWindow(globalconf.display, client->titlebar.sw->window,
CWSibling | CWStackMode, &wc); CWSibling | CWStackMode, &wc);
wc.sibling = client->titlebar->window; wc.sibling = client->titlebar.sw->window;
} }
XConfigureWindow(globalconf.display, client->win, CWSibling | CWStackMode, &wc); XConfigureWindow(globalconf.display, client->win, CWSibling | CWStackMode, &wc);
wc.sibling = client->win; wc.sibling = client->win;
} }
if(c->titlebar) if(c->titlebar.position)
{ {
XConfigureWindow(globalconf.display, c->titlebar->window, XConfigureWindow(globalconf.display, c->titlebar.sw->window,
CWSibling | CWStackMode, &wc); CWSibling | CWStackMode, &wc);
wc.sibling = c->titlebar->window; wc.sibling = c->titlebar.sw->window;
} }
XConfigureWindow(globalconf.display, c->win, CWSibling | CWStackMode, &wc); XConfigureWindow(globalconf.display, c->win, CWSibling | CWStackMode, &wc);
wc.sibling = c->win; wc.sibling = c->win;
for(client = globalconf.clients; client; client = client->next) for(client = globalconf.clients; client; client = client->next)
if(client != c && IS_TILED(client, c->screen)) if(client != c && IS_TILED(client, c->screen))
{ {
if(client->titlebar) if(client->titlebar.position)
{ {
XConfigureWindow(globalconf.display, client->titlebar->window, XConfigureWindow(globalconf.display, client->titlebar.sw->window,
CWSibling | CWStackMode, &wc); CWSibling | CWStackMode, &wc);
wc.sibling = client->titlebar->window; wc.sibling = client->titlebar.sw->window;
} }
XConfigureWindow(globalconf.display, client->win, CWSibling | CWStackMode, &wc); XConfigureWindow(globalconf.display, client->win, CWSibling | CWStackMode, &wc);
wc.sibling = client->win; wc.sibling = client->win;
@ -347,19 +347,21 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
/* propagates border_width, if size doesn't change */ /* propagates border_width, if size doesn't change */
window_configure(c->win, c->geometry, c->border); window_configure(c->win, c->geometry, c->border);
switch(globalconf.screens[screen].titlebar) c->titlebar.position = globalconf.screens[screen].titlebar_default_position;
switch(c->titlebar.position)
{ {
case Top: case Top:
titlebar_height = 1.5 * MAX(globalconf.screens[c->screen].styles.normal.font->height, titlebar_height = 1.5 * MAX(globalconf.screens[c->screen].styles.normal.font->height,
MAX(globalconf.screens[c->screen].styles.focus.font->height, MAX(globalconf.screens[c->screen].styles.focus.font->height,
globalconf.screens[c->screen].styles.urgent.font->height)), globalconf.screens[c->screen].styles.urgent.font->height)),
c->titlebar = simplewindow_new(globalconf.display, c->titlebar.sw = simplewindow_new(globalconf.display,
phys_screen, phys_screen,
c->geometry.x, c->geometry.x,
c->geometry.y - titlebar_height, c->geometry.y - titlebar_height,
c->geometry.width, c->geometry.width,
titlebar_height, titlebar_height,
0); 0);
break; break;
default: default:
break; break;
@ -468,18 +470,18 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
area_t area_t
client_titlebar_update_position(Client *c, area_t geometry) client_titlebar_update_position(Client *c, area_t geometry)
{ {
if(!c->titlebar) if(!c->titlebar.position)
return geometry;; return geometry;;
simplewindow_move_resize(c->titlebar, simplewindow_move_resize(c->titlebar.sw,
geometry.x, geometry.x,
geometry.y, geometry.y,
geometry.width, geometry.width,
c->titlebar->geometry.height); c->titlebar.sw->geometry.height);
client_updatetitlebar(c); client_updatetitlebar(c);
geometry.y += c->titlebar->geometry.height; geometry.y += c->titlebar.sw->geometry.height;
geometry.height -= c->titlebar->geometry.height; geometry.height -= c->titlebar.sw->geometry.height;
return geometry; return geometry;
} }
@ -577,13 +579,13 @@ client_resize(Client *c, area_t geometry)
if(!c->ismax) if(!c->ismax)
c->f_geometry = geometry; c->f_geometry = geometry;
if(c->titlebar) if(c->titlebar.position)
{ {
simplewindow_move_resize(c->titlebar, simplewindow_move_resize(c->titlebar.sw,
geometry.x, geometry.x,
geometry.y - c->titlebar->geometry.height, geometry.y - c->titlebar.sw->geometry.height,
geometry.width, geometry.width,
c->titlebar->geometry.height); c->titlebar.sw->geometry.height);
client_updatetitlebar(c); client_updatetitlebar(c);
} }
@ -662,8 +664,8 @@ client_unban(Client *c)
{ {
XMapWindow(globalconf.display, c->win); XMapWindow(globalconf.display, c->win);
window_setstate(c->win, NormalState); window_setstate(c->win, NormalState);
if(c->titlebar) if(c->titlebar.position)
XMapWindow(globalconf.display, c->titlebar->window); XMapWindow(globalconf.display, c->titlebar.sw->window);
} }
void void
@ -696,8 +698,8 @@ client_unmanage(Client *c)
XSync(globalconf.display, False); XSync(globalconf.display, False);
XUngrabServer(globalconf.display); XUngrabServer(globalconf.display);
if(c->titlebar) if(c->titlebar.sw)
simplewindow_delete(c->titlebar); simplewindow_delete(c->titlebar.sw);
p_delete(&c); p_delete(&c);
} }

3
config.c
View File

@ -319,7 +319,8 @@ config_parse_screen(cfg_t *cfg, int screen)
virtscreen->floating_placement = virtscreen->floating_placement =
name_func_lookup(cfg_getstr(cfg_general, "floating_placement"), name_func_lookup(cfg_getstr(cfg_general, "floating_placement"),
FloatingPlacementList); FloatingPlacementList);
virtscreen->titlebar = position_get_from_str(cfg_getstr(cfg_general, "titlebar")); virtscreen->titlebar_default_position =
position_get_from_str(cfg_getstr(cfg_general, "titlebar"));
virtscreen->mwfact_lower_limit = cfg_getfloat(cfg_general, "mwfact_lower_limit"); virtscreen->mwfact_lower_limit = cfg_getfloat(cfg_general, "mwfact_lower_limit");
virtscreen->mwfact_upper_limit = cfg_getfloat(cfg_general, "mwfact_upper_limit"); virtscreen->mwfact_upper_limit = cfg_getfloat(cfg_general, "mwfact_upper_limit");

4
event.c
View File

@ -302,9 +302,9 @@ event_handle_expose(XEvent *e)
} }
for(c = globalconf.clients; c; c = c->next) for(c = globalconf.clients; c; c = c->next)
if(c->titlebar && c->titlebar->window == ev->window) if(c->titlebar.position && c->titlebar.sw->window == ev->window)
{ {
simplewindow_refresh_drawable(c->titlebar, get_phys_screen(c->screen)); simplewindow_refresh_drawable(c->titlebar.sw, get_phys_screen(c->screen));
return; return;
} }
} }

8
structs.h
View File

@ -191,7 +191,11 @@ struct Client
/** True if the client is a new one */ /** True if the client is a new one */
Bool newcomer; Bool newcomer;
/** Titlebar */ /** Titlebar */
SimpleWindow *titlebar; struct
{
SimpleWindow *sw;
Position position;
} titlebar;
}; };
typedef struct client_node_t client_node_t; typedef struct client_node_t client_node_t;
@ -253,7 +257,7 @@ typedef area_t (FloatingPlacement)(area_t, int, int);
typedef struct typedef struct
{ {
/** Titlebar position */ /** Titlebar position */
Position titlebar; Position titlebar_default_position;
/** Number of pixels to snap windows */ /** Number of pixels to snap windows */
int snap; int snap;
/** Border size */ /** Border size */