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

Clean get_screen_info and get_display_info. 

Besides making these functions much nicer to use, this fixes a number of
things:

- Clients now don't have to free the returned structures.

- The ScreenInfo allocated by XineramaQueryScreens should be freed with XFree,
  not p_delete.

This patch also introduces an abstract Area type that will be very useful.
This commit is contained in:
Aldo Cortesi 2007-12-23 10:54:59 +11:00 committed by Julien Danjou
parent 51379e065b
commit 5f079ef73e
11 changed files with 187 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
client.c
View File

@ -257,7 +257,7 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
Window trans; Window trans;
Status rettrans; Status rettrans;
XWindowChanges wc; XWindowChanges wc;
ScreenInfo *screen_info; Area area, darea;
Tag *tag; Tag *tag;
c = p_new(Client, 1); c = p_new(Client, 1);
@ -282,36 +282,32 @@ client_manage(Window w, XWindowAttributes *wa, int screen)
if(!client_loadprops(c, screen)) if(!client_loadprops(c, screen))
tag_client_with_rules(c); tag_client_with_rules(c);
screen_info = get_screen_info(screen, NULL, NULL); area = get_screen_area(screen, NULL, NULL);
/* if window request fullscreen mode */ /* if window request fullscreen mode */
if(c->w == screen_info[screen].width && c->h == screen_info[screen].height) if(c->w == area.width && c->h == area.height)
{ {
c->x = screen_info[screen].x_org; c->x = area.x;
c->y = screen_info[screen].y_org; c->y = area.y;
c->border = wa->border_width; c->border = wa->border_width;
} }
else else
{ {
ScreenInfo *display_info = get_display_info(c->phys_screen, darea = get_display_area(c->phys_screen,
globalconf.screens[screen].statusbar, globalconf.screens[screen].statusbar,
&globalconf.screens[screen].padding); &globalconf.screens[screen].padding);
if(c->x + c->w + 2 * c->border > display_info->x_org + display_info->width) if(c->x + c->w + 2 * c->border > darea.x + darea.width)
c->x = c->rx = display_info->x_org + display_info->width - c->w - 2 * c->border; c->x = c->rx = darea.x + darea.width - c->w - 2 * c->border;
if(c->y + c->h + 2 * c->border > display_info->y_org + display_info->height) if(c->y + c->h + 2 * c->border > darea.y + darea.height)
c->y = c->ry = display_info->y_org + display_info->height - c->h - 2 * c->border; c->y = c->ry = darea.y + darea.height - c->h - 2 * c->border;
if(c->x < display_info->x_org) if(c->x < darea.x)
c->x = c->rx = display_info->x_org; c->x = c->rx = darea.x;
if(c->y < display_info->y_org) if(c->y < darea.y)
c->y = c->ry = display_info->y_org; c->y = c->ry = darea.y;
c->border = globalconf.screens[screen].borderpx; c->border = globalconf.screens[screen].borderpx;
p_delete(&display_info);
} }
p_delete(&screen_info);
/* set borders */ /* set borders */
wc.border_width = c->border; wc.border_width = c->border;
@ -368,7 +364,7 @@ client_resize(Client *c, int x, int y, int w, int h,
{ {
double dx, dy, max, min, ratio; double dx, dy, max, min, ratio;
XWindowChanges wc; XWindowChanges wc;
ScreenInfo *si; Area area;
if(sizehints) if(sizehints)
{ {
@ -413,14 +409,13 @@ client_resize(Client *c, int x, int y, int w, int h,
if(w <= 0 || h <= 0) if(w <= 0 || h <= 0)
return; return;
/* offscreen appearance fixes */ /* offscreen appearance fixes */
si = get_display_info(c->phys_screen, area = get_display_area(c->phys_screen,
NULL, NULL,
&globalconf.screens[c->screen].padding); &globalconf.screens[c->screen].padding);
if(x > si->width) if(x > area.width)
x = si->width - w - 2 * c->border; x = area.width - w - 2 * c->border;
if(y > si->height) if(y > area.height)
y = si->height - h - 2 * c->border; y = area.height - h - 2 * c->border;
p_delete(&si);
if(x + w + 2 * c->border < 0) if(x + w + 2 * c->border < 0)
x = 0; x = 0;
if(y + h + 2 * c->border < 0) if(y + h + 2 * c->border < 0)

10
config.h
View File

@ -51,6 +51,16 @@ struct Rule
typedef struct AwesomeConf AwesomeConf; typedef struct AwesomeConf AwesomeConf;
typedef struct Area Area;
struct Area
{
/* Co-ords of upper left corner */
int x;
int y;
int width;
int height;
};
typedef struct Layout Layout; typedef struct Layout Layout;
struct Layout struct Layout
{ {

7
event.c
View File

@ -188,7 +188,7 @@ handle_event_configurenotify(XEvent * e)
{ {
XConfigureEvent *ev = &e->xconfigure; XConfigureEvent *ev = &e->xconfigure;
int screen; int screen;
ScreenInfo *si; Area area;
for(screen = 0; screen < ScreenCount(e->xany.display); screen++) for(screen = 0; screen < ScreenCount(e->xany.display); screen++)
if(ev->window == RootWindow(e->xany.display, screen) if(ev->window == RootWindow(e->xany.display, screen)
@ -199,9 +199,8 @@ handle_event_configurenotify(XEvent * e)
DisplayHeight(e->xany.display, screen) = ev->height; DisplayHeight(e->xany.display, screen) = ev->height;
/* update statusbar */ /* update statusbar */
si = get_screen_info(screen, NULL, &globalconf.screens[screen].padding); area = get_screen_area(screen, NULL, &globalconf.screens[screen].padding);
globalconf.screens[screen].statusbar->width = si[screen].width; globalconf.screens[screen].statusbar->width = area.width;
p_delete(&si);
XResizeWindow(e->xany.display, XResizeWindow(e->xany.display,
globalconf.screens[screen].statusbar->window, globalconf.screens[screen].statusbar->window,

36
layout.c
View File

@ -300,15 +300,13 @@ maximize(int x, int y, int w, int h, int screen)
void void
uicb_client_togglemax(int screen, char *arg __attribute__ ((unused))) uicb_client_togglemax(int screen, char *arg __attribute__ ((unused)))
{ {
ScreenInfo *si = get_screen_info(screen, Area area = get_screen_area(screen,
globalconf.screens[screen].statusbar, globalconf.screens[screen].statusbar,
&globalconf.screens[screen].padding); &globalconf.screens[screen].padding);
maximize(area.x, area.y,
maximize(si[screen].x_org, si[screen].y_org, area.width - 2 * globalconf.screens[screen].borderpx,
si[screen].width - 2 * globalconf.screens[screen].borderpx, area.height - 2 * globalconf.screens[screen].borderpx,
si[screen].height - 2 * globalconf.screens[screen].borderpx,
screen); screen);
p_delete(&si);
} }
/** Toggle vertical maximize for client /** Toggle vertical maximize for client
@ -320,17 +318,16 @@ void
uicb_client_toggleverticalmax(int screen, char *arg __attribute__ ((unused))) uicb_client_toggleverticalmax(int screen, char *arg __attribute__ ((unused)))
{ {
Client *sel = globalconf.focus->client; Client *sel = globalconf.focus->client;
ScreenInfo *si = get_screen_info(screen, Area area = get_screen_area(screen,
globalconf.screens[screen].statusbar, globalconf.screens[screen].statusbar,
&globalconf.screens[screen].padding); &globalconf.screens[screen].padding);
if(sel) if(sel)
maximize(sel->x, maximize(sel->x,
si[screen].y_org, area.y,
sel->w, sel->w,
si[screen].height - 2 * globalconf.screens[screen].borderpx, area.height - 2 * globalconf.screens[screen].borderpx,
screen); screen);
p_delete(&si);
} }
@ -343,17 +340,16 @@ void
uicb_client_togglehorizontalmax(int screen, char *arg __attribute__ ((unused))) uicb_client_togglehorizontalmax(int screen, char *arg __attribute__ ((unused)))
{ {
Client *sel = globalconf.focus->client; Client *sel = globalconf.focus->client;
ScreenInfo *si = get_screen_info(screen, Area area = get_screen_area(screen,
globalconf.screens[screen].statusbar, globalconf.screens[screen].statusbar,
&globalconf.screens[screen].padding); &globalconf.screens[screen].padding);
if(sel) if(sel)
maximize(si[screen].x_org, maximize(area.x,
sel->y, sel->y,
si[screen].height - 2 * globalconf.screens[screen].borderpx, area.height - 2 * globalconf.screens[screen].borderpx,
sel->h, sel->h,
screen); screen);
p_delete(&si);
} }
/** Zoom client /** Zoom client

17
layouts/fibonacci.c
View File

@ -31,14 +31,14 @@ layout_fibonacci(int screen, int shape)
{ {
int n = 0, i = 0, nx, ny, nw, nh; int n = 0, i = 0, nx, ny, nw, nh;
Client *c; Client *c;
ScreenInfo *si = get_screen_info(screen, Area area = get_screen_area(screen,
globalconf.screens[screen].statusbar, globalconf.screens[screen].statusbar,
&globalconf.screens[screen].padding); &globalconf.screens[screen].padding);
nx = si[screen].x_org; nx = area.x;
ny = si[screen].y_org; ny = area.y;
nw = si[screen].width; nw = area.width;
nh = si[screen].height; nh = area.height;
for(c = globalconf.clients; c; c = c->next) for(c = globalconf.clients; c; c = c->next)
if(IS_TILED(c, screen)) if(IS_TILED(c, screen))
@ -80,13 +80,12 @@ layout_fibonacci(int screen, int shape)
nx -= nw; nx -= nw;
} }
if(i == 0) if(i == 0)
ny = si[screen].y_org; ny = area.y;
i++; i++;
} }
client_resize(c, nx, ny, nw - 2 * c->border, nh - 2 * c->border, client_resize(c, nx, ny, nw - 2 * c->border, nh - 2 * c->border,
globalconf.screens[screen].resize_hints, False); globalconf.screens[screen].resize_hints, False);
} }
p_delete(&si);
} }
void void

11
layouts/max.c
View File

@ -30,13 +30,14 @@ void
layout_max(int screen) layout_max(int screen)
{ {
Client *c; Client *c;
ScreenInfo *si = get_screen_info(screen, globalconf.screens[screen].statusbar, &globalconf.screens[screen].padding); Area area = get_screen_area(screen,
globalconf.screens[screen].statusbar,
&globalconf.screens[screen].padding);
for(c = globalconf.clients; c; c = c->next) for(c = globalconf.clients; c; c = c->next)
if(IS_TILED(c, screen)) if(IS_TILED(c, screen))
client_resize(c, si[screen].x_org, si[screen].y_org, client_resize(c, area.x, area.y,
si[screen].width - 2 * c->border, area.width - 2 * c->border,
si[screen].height - 2 * c->border, globalconf.screens[screen].resize_hints, False); area.height - 2 * c->border, globalconf.screens[screen].resize_hints, False);
p_delete(&si);
} }
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80

15
layouts/tile.c
View File

@ -99,20 +99,22 @@ _tile(int screen, const Bool right)
unsigned int mw = 0, mh = 0; unsigned int mw = 0, mh = 0;
int n, i, masterwin = 0, otherwin = 0; int n, i, masterwin = 0, otherwin = 0;
int real_ncol = 1, win_by_col = 1, current_col = 0; int real_ncol = 1, win_by_col = 1, current_col = 0;
ScreenInfo *screens_info = NULL; Area area;
Client *c; Client *c;
Tag *curtag = get_current_tag(screen); Tag *curtag = get_current_tag(screen);
screens_info = get_screen_info(screen, globalconf.screens[screen].statusbar, &globalconf.screens[screen].padding); area = get_screen_area(screen,
globalconf.screens[screen].statusbar,
&globalconf.screens[screen].padding);
for(n = 0, c = globalconf.clients; c; c = c->next) for(n = 0, c = globalconf.clients; c; c = c->next)
if(IS_TILED(c, screen)) if(IS_TILED(c, screen))
n++; n++;
wah = screens_info[screen].height; wah = area.height;
waw = screens_info[screen].width; waw = area.width;
wax = screens_info[screen].x_org; wax = area.x;
way = screens_info[screen].y_org; way = area.y;
masterwin = MIN(n, curtag->nmaster); masterwin = MIN(n, curtag->nmaster);
@ -171,7 +173,6 @@ _tile(int screen, const Bool right)
} }
i++; i++;
} }
p_delete(&screens_info);
} }
void void

25
mouse.c
View File

@ -42,7 +42,7 @@ uicb_client_movemouse(int screen, char *arg __attribute__ ((unused)))
unsigned int dui; unsigned int dui;
Window dummy; Window dummy;
XEvent ev; XEvent ev;
ScreenInfo *si; Area area;
Client *c = globalconf.focus->client; Client *c = globalconf.focus->client;
if(!c) if(!c)
@ -54,9 +54,9 @@ uicb_client_movemouse(int screen, char *arg __attribute__ ((unused)))
else else
restack(screen); restack(screen);
si = get_screen_info(c->screen, area = get_screen_area(c->screen,
globalconf.screens[screen].statusbar, globalconf.screens[screen].statusbar,
&globalconf.screens[screen].padding); &globalconf.screens[screen].padding);
ocx = nx = c->x; ocx = nx = c->x;
ocy = ny = c->y; ocy = ny = c->y;
@ -75,7 +75,6 @@ uicb_client_movemouse(int screen, char *arg __attribute__ ((unused)))
{ {
case ButtonRelease: case ButtonRelease:
XUngrabPointer(c->display, CurrentTime); XUngrabPointer(c->display, CurrentTime);
p_delete(&si);
return; return;
case ConfigureRequest: case ConfigureRequest:
handle_event_configurerequest(&ev); handle_event_configurerequest(&ev);
@ -90,14 +89,14 @@ uicb_client_movemouse(int screen, char *arg __attribute__ ((unused)))
XSync(c->display, False); XSync(c->display, False);
nx = ocx + (ev.xmotion.x - x1); nx = ocx + (ev.xmotion.x - x1);
ny = ocy + (ev.xmotion.y - y1); ny = ocy + (ev.xmotion.y - y1);
if(abs(nx) < globalconf.screens[screen].snap + si[c->screen].x_org && nx > si[c->screen].x_org) if(abs(nx) < globalconf.screens[screen].snap + area.x && nx > area.x)
nx = si[c->screen].x_org; nx = area.x;
else if(abs((si[c->screen].x_org + si[c->screen].width) - (nx + c->w + 2 * c->border)) < globalconf.screens[screen].snap) else if(abs((area.x + area.width) - (nx + c->w + 2 * c->border)) < globalconf.screens[screen].snap)
nx = si[c->screen].x_org + si[c->screen].width - c->w - 2 * c->border; nx = area.x + area.width - c->w - 2 * c->border;
if(abs(ny) < globalconf.screens[screen].snap + si[c->screen].y_org && ny > si[c->screen].y_org) if(abs(ny) < globalconf.screens[screen].snap + area.y && ny > area.y)
ny = si[c->screen].y_org; ny = area.y;
else if(abs((si[c->screen].y_org + si[c->screen].height) - (ny + c->h + 2 * c->border)) < globalconf.screens[screen].snap) else if(abs((area.y + area.height) - (ny + c->h + 2 * c->border)) < globalconf.screens[screen].snap)
ny = si[c->screen].y_org + si[c->screen].height - c->h - 2 * c->border; ny = area.y + area.height - c->h - 2 * c->border;
client_resize(c, nx, ny, c->w, c->h, False, False); client_resize(c, nx, ny, c->w, c->h, False, False);
break; break;
} }

168
screen.c
View File

@ -31,85 +31,88 @@ extern AwesomeConf globalconf;
/** Get screens info /** Get screens info
* \param screen Screen number * \param screen Screen number
* \param statusbar statusbar * \param statusbar statusbar
* \return ScreenInfo struct array with all screens info * \return Area
* \param padding Padding * \param padding Padding
*/ */
ScreenInfo * Area
get_screen_info(int screen, Statusbar *statusbar, Padding *padding) get_screen_area(int screen, Statusbar *statusbar, Padding *padding)
{ {
int i, screen_number = 0; int screen_number = 0;
ScreenInfo *si; ScreenInfo *si;
Area area;
if(XineramaIsActive(globalconf.display)) if(XineramaIsActive(globalconf.display)){
si = XineramaQueryScreens(globalconf.display, &screen_number); si = XineramaQueryScreens(globalconf.display, &screen_number);
else if (screen_number < screen)
eprint("Info request for unknown screen.");
area.x = si[screen].x_org;
area.y = si[screen].y_org;
area.width = si[screen].width;
area.height = si[screen].height;
XFree(si);
} else
{ {
/* emulate Xinerama info but only fill the screen we want */ /* emulate Xinerama info but only fill the screen we want */
si = p_new(ScreenInfo, screen + 1); area.x = 0;
si[screen].width = DisplayWidth(globalconf.display, screen); area.y = 0;
si[screen].height = DisplayHeight(globalconf.display, screen); area.width = DisplayWidth(globalconf.display, screen);
si[screen].x_org = 0; area.height = DisplayHeight(globalconf.display, screen);
si[screen].y_org = 0;
screen_number = screen + 1;
} }
/* make padding corrections */ /* make padding corrections */
if(padding) if(padding)
{ {
si[screen].x_org += padding->left; area.x += padding->left;
si[screen].y_org += padding->top; area.y += padding->top;
si[screen].width -= padding->left + padding->right; area.width -= padding->left + padding->right;
si[screen].height -= padding->top + padding->bottom; area.height -= padding->top + padding->bottom;
} }
if(statusbar) if (statusbar)
for(i = 0; i < screen_number; i++) switch(statusbar->position)
switch(statusbar->position) {
{ case BarTop:
case BarTop: area.y += statusbar->height;
si[i].y_org += statusbar->height; case BarBot:
case BarBot: area.height -= statusbar->height;
si[i].height -= statusbar->height; break;
break; case BarLeft:
case BarLeft: area.x += statusbar->height;
si[i].x_org += statusbar->height; case BarRight:
case BarRight: area.width -= statusbar->height;
si[i].width -= statusbar->height; break;
break; }
}
return si; return area;
} }
/** Get display info /** Get display info
* \param screen Screen number * \param screen Screen number
* \param statusbar the statusbar * \param statusbar the statusbar
* \param padding Padding * \param padding Padding
* \return ScreenInfo struct pointer with all display info * \return Area
*/ */
ScreenInfo * Area
get_display_info(int screen, Statusbar *statusbar, Padding *padding) get_display_area(int screen, Statusbar *statusbar, Padding *padding)
{ {
ScreenInfo *si; Area area;
si = p_new(ScreenInfo, 1); area.x = 0;
area.y = statusbar && statusbar->position == BarTop ? statusbar->height : 0;
area.width = DisplayWidth(globalconf.display, screen);
area.height = DisplayHeight(globalconf.display, screen) -
(statusbar &&
(statusbar->position == BarTop || statusbar->position == BarBot) ? statusbar->height : 0);
si->x_org = 0; /* make padding corrections */
si->y_org = statusbar && statusbar->position == BarTop ? statusbar->height : 0; if(padding)
si->width = DisplayWidth(globalconf.display, screen); {
si->height = DisplayHeight(globalconf.display, screen) - area.x += padding->left;
(statusbar && (statusbar->position == BarTop || statusbar->position == BarBot) ? statusbar->height : 0); area.y += padding->top;
area.width -= padding->left + padding->right;
/* make padding corrections */ area.height -= padding->top + padding->bottom;
if(padding) }
{ return area;
si[screen].x_org+=padding->left;
si[screen].y_org+=padding->top;
si[screen].width-=padding->left+padding->right;
si[screen].height-=padding->top+padding->bottom;
}
return si;
} }
/** Return the Xinerama screen number where the coordinates belongs to /** Return the Xinerama screen number where the coordinates belongs to
@ -120,24 +123,20 @@ get_display_info(int screen, Statusbar *statusbar, Padding *padding)
int int
get_screen_bycoord(int x, int y) get_screen_bycoord(int x, int y)
{ {
ScreenInfo *si;
int i; int i;
Area area;
/* don't waste our time */ /* don't waste our time */
if(!XineramaIsActive(globalconf.display)) if(!XineramaIsActive(globalconf.display))
return DefaultScreen(globalconf.display); return DefaultScreen(globalconf.display);
si = get_screen_info(0, NULL, NULL);
for(i = 0; i < get_screen_count(); i++) for(i = 0; i < get_screen_count(); i++){
if((x < 0 || (x >= si[i].x_org && x < si[i].x_org + si[i].width)) area = get_screen_area(i, NULL, NULL);
&& (y < 0 || (y >= si[i].y_org && y < si[i].y_org + si[i].height))) if((x < 0 || (x >= area.x && x < area.x + area.width))
{ && (y < 0 || (y >= area.y && y < area.y + area.height)))
p_delete(&si);
return i; return i;
} }
p_delete(&si);
return DefaultScreen(globalconf.display); return DefaultScreen(globalconf.display);
} }
@ -181,6 +180,7 @@ move_client_to_screen(Client *c, int new_screen, Bool doresize)
{ {
Tag *tag; Tag *tag;
int old_screen = c->screen; int old_screen = c->screen;
Area from, to;
for(tag = globalconf.screens[old_screen].tags; tag; tag = tag->next) for(tag = globalconf.screens[old_screen].tags; tag; tag = tag->next)
untag_client(c, tag, old_screen); untag_client(c, tag, old_screen);
@ -192,28 +192,23 @@ move_client_to_screen(Client *c, int new_screen, Bool doresize)
if(doresize && old_screen != c->screen) if(doresize && old_screen != c->screen)
{ {
ScreenInfo *si, *si_old; to = get_screen_area(c->screen, NULL, NULL);
from = get_screen_area(old_screen, NULL, NULL);
si = get_screen_info(c->screen, NULL, NULL);
si_old = get_screen_info(old_screen, NULL, NULL);
/* compute new coords in new screen */ /* compute new coords in new screen */
c->rx = (c->rx - si_old[old_screen].x_org) + si[c->screen].x_org; c->rx = (c->rx - from.x) + to.x;
c->ry = (c->ry - si_old[old_screen].y_org) + si[c->screen].y_org; c->ry = (c->ry - from.y) + to.y;
/* check that new coords are still in the screen */ /* check that new coords are still in the screen */
if(c->rw > si[c->screen].width) if(c->rw > to.width)
c->rw = si[c->screen].width; c->rw = to.width;
if(c->rh > si[c->screen].height) if(c->rh > to.height)
c->rh = si[c->screen].height; c->rh = to.height;
if(c->rx + c->rw >= si[c->screen].x_org + si[c->screen].width) if(c->rx + c->rw >= to.x + to.width)
c->rx = si[c->screen].x_org + si[c->screen].width - c->rw - 2 * c->border; c->rx = to.x + to.width - c->rw - 2 * c->border;
if(c->ry + c->rh >= si[c->screen].y_org + si[c->screen].height) if(c->ry + c->rh >= to.y + to.height)
c->ry = si[c->screen].y_org + si[c->screen].height - c->rh - 2 * c->border; c->ry = to.y + to.height - c->rh - 2 * c->border;
client_resize(c, c->rx, c->ry, c->rw, c->rh, True, False); client_resize(c, c->rx, c->ry, c->rw, c->rh, True, False);
p_delete(&si);
p_delete(&si_old);
} }
focus(c, True, c->screen); focus(c, True, c->screen);
@ -231,12 +226,17 @@ move_mouse_pointer_to_screen(int screen)
{ {
if(XineramaIsActive(globalconf.display)) if(XineramaIsActive(globalconf.display))
{ {
ScreenInfo *si = get_screen_info(screen, NULL, NULL); Area area = get_screen_area(screen, NULL, NULL);
XWarpPointer(globalconf.display, None, DefaultRootWindow(globalconf.display), 0, 0, 0, 0, si[screen].x_org, si[screen].y_org); XWarpPointer(globalconf.display,
p_delete(&si); None,
DefaultRootWindow(globalconf.display),
0, 0, 0, 0, area.x, area.y);
} }
else else
XWarpPointer(globalconf.display, None, RootWindow(globalconf.display, screen), 0, 0, 0, 0, 0, 0); XWarpPointer(globalconf.display,
None,
RootWindow(globalconf.display, screen),
0, 0, 0, 0, 0, 0);
} }

4
screen.h
View File

@ -28,8 +28,8 @@
typedef XineramaScreenInfo ScreenInfo; typedef XineramaScreenInfo ScreenInfo;
ScreenInfo * get_screen_info(int, Statusbar *, Padding *); Area get_screen_area(int, Statusbar *, Padding *);
ScreenInfo * get_display_info(int, Statusbar *, Padding *); Area get_display_area(int, Statusbar *, Padding *);
int get_screen_bycoord(int, int); int get_screen_bycoord(int, int);
int get_screen_count(void); int get_screen_count(void);
int get_phys_screen(int); int get_phys_screen(int);

33
statusbar.c
View File

@ -110,19 +110,17 @@ statusbar_init(int screen)
{ {
XSetWindowAttributes wa; XSetWindowAttributes wa;
int phys_screen = get_phys_screen(screen); int phys_screen = get_phys_screen(screen);
ScreenInfo *si = get_screen_info(screen, Area area = get_screen_area(screen,
NULL, NULL,
&globalconf.screens[screen].padding); &globalconf.screens[screen].padding);
Statusbar *statusbar = globalconf.screens[screen].statusbar; Statusbar *statusbar = globalconf.screens[screen].statusbar;
statusbar->height = globalconf.screens[screen].font->height * 1.5; statusbar->height = globalconf.screens[screen].font->height * 1.5;
if(statusbar->position == BarRight || statusbar->position == BarLeft) if(statusbar->position == BarRight || statusbar->position == BarLeft)
statusbar->width = si[screen].height; statusbar->width = area.height;
else else
statusbar->width = si[screen].width; statusbar->width = area.width;
p_delete(&si);
statusbar->screen = screen; statusbar->screen = screen;
@ -181,9 +179,9 @@ statusbar_update_position(int screen)
{ {
XEvent ev; XEvent ev;
Statusbar *statusbar = globalconf.screens[screen].statusbar; Statusbar *statusbar = globalconf.screens[screen].statusbar;
ScreenInfo *si = get_screen_info(statusbar->screen, Area area = get_screen_area(statusbar->screen,
NULL, NULL,
&globalconf.screens[screen].padding); &globalconf.screens[screen].padding);
XMapRaised(globalconf.display, statusbar->window); XMapRaised(globalconf.display, statusbar->window);
switch (statusbar->position) switch (statusbar->position)
@ -191,28 +189,25 @@ statusbar_update_position(int screen)
default: default:
XMoveWindow(globalconf.display, XMoveWindow(globalconf.display,
statusbar->window, statusbar->window,
si[statusbar->screen].x_org, area.x,
si[statusbar->screen].y_org); area.y);
break; break;
case BarRight: case BarRight:
XMoveWindow(globalconf.display, XMoveWindow(globalconf.display,
statusbar->window, statusbar->window,
si[statusbar->screen].x_org + area.x + (area.width - statusbar->height),
(si[statusbar->screen].width - area.y);
statusbar->height),
si[statusbar->screen].y_org);
break; break;
case BarBot: case BarBot:
XMoveWindow(globalconf.display, XMoveWindow(globalconf.display,
statusbar->window, statusbar->window,
si[statusbar->screen].x_org, area.x,
si[statusbar->screen].height - statusbar->height); area.height - statusbar->height);
break; break;
case BarOff: case BarOff:
XUnmapWindow(globalconf.display, statusbar->window); XUnmapWindow(globalconf.display, statusbar->window);
break; break;
} }
p_delete(&si);
XSync(globalconf.display, False); XSync(globalconf.display, False);
while(XCheckMaskEvent(globalconf.display, EnterWindowMask, &ev)); while(XCheckMaskEvent(globalconf.display, EnterWindowMask, &ev));
} }