qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Teach screen_find_xinerama() to apply gap only when told to do so;

Browse Source 
adjust callers.  Needed for an upcoming feature.
This commit is contained in:
okan 2013-12-13 22:39:13 +00:00
parent 5671dd5497
commit 4104232e02
6 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/cwm/calmwm.h
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: calmwm.h,v 1.235 2013/12/13 14:40:52 okan Exp $ * $OpenBSD: calmwm.h,v 1.236 2013/12/13 22:39:13 okan Exp $
*/ */
#ifndef _CALMWM_H_ #ifndef _CALMWM_H_
@ -80,6 +80,9 @@
#define CWM_TILE_HORIZ 0x0001 #define CWM_TILE_HORIZ 0x0001
#define CWM_TILE_VERT 0x0002 #define CWM_TILE_VERT 0x0002
#define CWM_GAP 0x0001
#define CWM_NOGAP 0x0002
union arg { union arg {
char *c; char *c;
int i; int i;
@ -430,7 +433,8 @@ void search_match_text(struct menu_q *, struct menu_q *,
char *); char *);
void search_print_client(struct menu *, int); void search_print_client(struct menu *, int);
struct geom screen_find_xinerama(struct screen_ctx *, int, int); struct geom screen_find_xinerama(struct screen_ctx *,
int, int, int);
struct screen_ctx *screen_fromroot(Window); struct screen_ctx *screen_fromroot(Window);
void screen_init(int); void screen_init(int);
void screen_update_geometry(struct screen_ctx *); void screen_update_geometry(struct screen_ctx *);

14
app/cwm/client.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: client.c,v 1.162 2013/12/13 15:56:44 okan Exp $ * $OpenBSD: client.c,v 1.163 2013/12/13 22:39:13 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -261,7 +261,7 @@ client_maximize(struct client_ctx *cc)
*/ */
xine = screen_find_xinerama(sc, xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2, cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2); cc->geom.y + cc->geom.h / 2, CWM_GAP);
cc->geom = xine; cc->geom = xine;
cc->bwidth = 0; cc->bwidth = 0;
@ -302,7 +302,7 @@ client_vmaximize(struct client_ctx *cc)
xine = screen_find_xinerama(sc, xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2, cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2); cc->geom.y + cc->geom.h / 2, CWM_GAP);
cc->geom.y = xine.y; cc->geom.y = xine.y;
cc->geom.h = xine.h - (cc->bwidth * 2); cc->geom.h = xine.h - (cc->bwidth * 2);
@ -343,7 +343,7 @@ client_hmaximize(struct client_ctx *cc)
xine = screen_find_xinerama(sc, xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2, cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2); cc->geom.y + cc->geom.h / 2, CWM_GAP);
cc->geom.x = xine.x; cc->geom.x = xine.x;
cc->geom.w = xine.w - (cc->bwidth * 2); cc->geom.w = xine.w - (cc->bwidth * 2);
@ -691,7 +691,7 @@ client_placecalc(struct client_ctx *cc)
int xmouse, ymouse; int xmouse, ymouse;
xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse); xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse);
xine = screen_find_xinerama(sc, xmouse, ymouse); xine = screen_find_xinerama(sc, xmouse, ymouse, CWM_GAP);
xine.w += xine.x; xine.w += xine.x;
xine.h += xine.y; xine.h += xine.y;
xmouse = MAX(xmouse, xine.x) - cc->geom.w / 2; xmouse = MAX(xmouse, xine.x) - cc->geom.w / 2;
@ -906,7 +906,7 @@ client_htile(struct client_ctx *cc)
xine = screen_find_xinerama(sc, xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2, cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2); cc->geom.y + cc->geom.h / 2, CWM_GAP);
if (cc->flags & CLIENT_VMAXIMIZED || if (cc->flags & CLIENT_VMAXIMIZED ||
cc->geom.h + (cc->bwidth * 2) >= xine.h) cc->geom.h + (cc->bwidth * 2) >= xine.h)
@ -965,7 +965,7 @@ client_vtile(struct client_ctx *cc)
xine = screen_find_xinerama(sc, xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2, cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2); cc->geom.y + cc->geom.h / 2, CWM_GAP);
if (cc->flags & CLIENT_HMAXIMIZED || if (cc->flags & CLIENT_HMAXIMIZED ||
cc->geom.w + (cc->bwidth * 2) >= xine.w) cc->geom.w + (cc->bwidth * 2) >= xine.w)

4
app/cwm/kbfunc.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: kbfunc.c,v 1.83 2013/12/13 21:51:56 okan Exp $ * $OpenBSD: kbfunc.c,v 1.84 2013/12/13 22:39:13 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -102,7 +102,7 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg)
xine = screen_find_xinerama(sc, xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2, cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2); cc->geom.y + cc->geom.h / 2, CWM_GAP);
cc->geom.x += client_snapcalc(cc->geom.x, cc->geom.x += client_snapcalc(cc->geom.x,
cc->geom.x + cc->geom.w + (cc->bwidth * 2), cc->geom.x + cc->geom.w + (cc->bwidth * 2),
xine.x, xine.x + xine.w, sc->snapdist); xine.x, xine.x + xine.w, sc->snapdist);

4
app/cwm/menu.c
View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: menu.c,v 1.68 2013/12/02 20:01:19 okan Exp $ * $OpenBSD: menu.c,v 1.69 2013/12/13 22:39:13 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -380,7 +380,7 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
mc->num++; mc->num++;
} }
xine = screen_find_xinerama(sc, mc->x, mc->y); xine = screen_find_xinerama(sc, mc->x, mc->y, CWM_GAP);
xine.w += xine.x; xine.w += xine.x;
xine.h += xine.y; xine.h += xine.y;

4
app/cwm/mousefunc.c
View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: mousefunc.c,v 1.63 2013/12/13 21:51:56 okan Exp $ * $OpenBSD: mousefunc.c,v 1.64 2013/12/13 22:39:13 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -148,7 +148,7 @@ mousefunc_client_move(struct client_ctx *cc, void *arg)
xine = screen_find_xinerama(sc, xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2, cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2); cc->geom.y + cc->geom.h / 2, CWM_GAP);
cc->geom.x += client_snapcalc(cc->geom.x, cc->geom.x += client_snapcalc(cc->geom.x,
cc->geom.x + cc->geom.w + (cc->bwidth * 2), cc->geom.x + cc->geom.w + (cc->bwidth * 2),
xine.x, xine.x + xine.w, sc->snapdist); xine.x, xine.x + xine.w, sc->snapdist);

18
app/cwm/screen.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: screen.c,v 1.52 2013/06/17 17:11:10 okan Exp $ * $OpenBSD: screen.c,v 1.53 2013/12/13 22:39:13 okan Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -126,7 +126,7 @@ screen_updatestackingorder(struct screen_ctx *sc)
* Find which xinerama screen the coordinates (x,y) is on. * Find which xinerama screen the coordinates (x,y) is on.
*/ */
struct geom struct geom
screen_find_xinerama(struct screen_ctx *sc, int x, int y) screen_find_xinerama(struct screen_ctx *sc, int x, int y, int flags)
{ {
XineramaScreenInfo *info; XineramaScreenInfo *info;
struct geom geom; struct geom geom;
@ -141,13 +141,19 @@ screen_find_xinerama(struct screen_ctx *sc, int x, int y)
info = &sc->xinerama[i]; info = &sc->xinerama[i];
if (x >= info->x_org && x < info->x_org + info->width && if (x >= info->x_org && x < info->x_org + info->width &&
y >= info->y_org && y < info->y_org + info->height) { y >= info->y_org && y < info->y_org + info->height) {
geom.x = info->x_org + sc->gap.left; geom.x = info->x_org;
geom.y = info->y_org + sc->gap.top; geom.y = info->y_org;
geom.w = info->width - (sc->gap.left + sc->gap.right); geom.w = info->width;
geom.h = info->height - (sc->gap.top + sc->gap.bottom); geom.h = info->height;
break; break;
} }
} }
if (flags & CWM_GAP) {
geom.x += sc->gap.left;
geom.y += sc->gap.top;
geom.w -= (sc->gap.left + sc->gap.right);
geom.h -= (sc->gap.top + sc->gap.bottom);
}
return (geom); return (geom);
} }