diff options
author | okan <okan> | 2009-01-15 00:32:35 +0000 |
---|---|---|
committer | okan <okan> | 2009-01-15 00:32:35 +0000 |
commit | 49e218cf53abe04f6ab07ef29687c9e0ece46a89 (patch) | |
tree | aab8f23d9d3b44f03719f26a501e4606c9f3aa71 /client.c | |
parent | 7e110f379be217bbf6a5476acb8043c1ff73a8e6 (diff) | |
download | cwm-49e218cf53abe04f6ab07ef29687c9e0ece46a89.tar.gz cwm-49e218cf53abe04f6ab07ef29687c9e0ece46a89.tar.xz cwm-49e218cf53abe04f6ab07ef29687c9e0ece46a89.zip |
- add missing prototypes.
- properly name, place and static private functions. - move function which finds the xinerama screen for a coordinate to a more appropriate place while altering its semantics to match others. - tiny bit of style. ok oga@
Diffstat (limited to 'client.c')
-rw-r--r-- | client.c | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/client.c b/client.c index 6e2ef24..4fac5ae 100644 --- a/client.c +++ b/client.c @@ -21,12 +21,9 @@ #include "headers.h" #include "calmwm.h" -int _inwindowbounds(struct client_ctx *, int, int); -XineramaScreenInfo *client_find_xinerama_screen(int , int , - struct screen_ctx *); +static int _client_inbound(struct client_ctx *, int, int); static char emptystring[] = ""; - struct client_ctx *_curcc = NULL; void @@ -339,9 +336,9 @@ client_maximize(struct client_ctx *cc) * that's probably more fair than if just the origin of * a window is poking over a boundary */ - xine = client_find_xinerama_screen(cc->geom.x + - cc->geom.width / 2, cc->geom.y + - cc->geom.height / 2, CCTOSC(cc)); + xine = screen_find_xinerama(CCTOSC(cc), + cc->geom.x + cc->geom.width / 2, + cc->geom.y + cc->geom.height / 2); if (xine == NULL) goto calc; x_org = xine->x_org; @@ -373,9 +370,9 @@ client_vertmaximize(struct client_ctx *cc) cc->savegeom = cc->geom; if (HasXinerama) { XineramaScreenInfo *xine; - xine = client_find_xinerama_screen(cc->geom.x + - cc->geom.width / 2, cc->geom.y + - cc->geom.height / 2, CCTOSC(cc)); + xine = screen_find_xinerama(CCTOSC(cc), + cc->geom.x + cc->geom.width / 2, + cc->geom.y + cc->geom.height / 2); if (xine == NULL) goto calc; y_org = xine->y_org; @@ -457,7 +454,7 @@ client_ptrsave(struct client_ctx *cc) int x, y; xu_ptr_getpos(cc->pwin, &x, &y); - if (_inwindowbounds(cc, x, y)) { + if (_client_inbound(cc, x, y)) { cc->ptr.x = x; cc->ptr.y = y; } @@ -728,7 +725,7 @@ client_placecalc(struct client_ctx *cc) xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse); if (HasXinerama) { - info = client_find_xinerama_screen(xmouse, ymouse, sc); + info = screen_find_xinerama(sc, xmouse, ymouse); if (info == NULL) goto noxine; xorig = info->x_org; @@ -846,27 +843,9 @@ client_freehints(struct client_ctx *cc) xfree(cc->app_cliarg); } -int -_inwindowbounds(struct client_ctx *cc, int x, int y) +static int +_client_inbound(struct client_ctx *cc, int x, int y) { return (x < cc->geom.width && x >= 0 && y < cc->geom.height && y >= 0); } - -/* - * Find which xinerama screen the coordinates (x,y) is on. - */ -XineramaScreenInfo * -client_find_xinerama_screen(int x, int y, struct screen_ctx *sc) -{ - XineramaScreenInfo *info; - int i; - - for (i = 0; i < sc->xinerama_no; i++) { - info = &sc->xinerama[i]; - if (x > info->x_org && x < info->x_org + info->width && - y > info->y_org && y < info->y_org + info->height) - return (info); - } - return (NULL); -} |