mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Set the initial ptr position during client init, instead of waiting

Browse Source 
until (maybe) a ptrwarp call. Likewise, explicitly ensure an inbounds ptr
position (same as initial) when saving.
This commit is contained in:
okan 2016-09-30 20:55:54 +00:00
parent 2d8f621b8d
commit 1c54fc079d
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
client.c
View File

@ -75,8 +75,6 @@ client_init(Window win, struct screen_ctx *sc, int active)
cc->stackingorder = 0; cc->stackingorder = 0;
memset(&cc->hint, 0, sizeof(cc->hint)); memset(&cc->hint, 0, sizeof(cc->hint));
memset(&cc->ch, 0, sizeof(cc->ch)); memset(&cc->ch, 0, sizeof(cc->ch));
cc->ptr.x = -1;
cc->ptr.y = -1;
TAILQ_INIT(&cc->nameq); TAILQ_INIT(&cc->nameq);
client_setname(cc); client_setname(cc);
@ -93,6 +91,9 @@ client_init(Window win, struct screen_ctx *sc, int active)
cc->geom.y = wattr.y; cc->geom.y = wattr.y;
cc->geom.w = wattr.width; cc->geom.w = wattr.width;
cc->geom.h = wattr.height; cc->geom.h = wattr.height;
cc->ptr.x = cc->geom.w / 2;
cc->ptr.y = cc->geom.h / 2;
cc->colormap = wattr.colormap; cc->colormap = wattr.colormap;
if (wattr.map_state != IsViewable) { if (wattr.map_state != IsViewable) {
@ -468,18 +469,12 @@ client_config(struct client_ctx *cc)
void void
client_ptrwarp(struct client_ctx *cc) client_ptrwarp(struct client_ctx *cc)
{ {
int x = cc->ptr.x, y = cc->ptr.y;
if (x == -1 || y == -1) {
x = cc->geom.w / 2;
y = cc->geom.h / 2;
}
if (cc->flags & CLIENT_HIDDEN) if (cc->flags & CLIENT_HIDDEN)
client_unhide(cc); client_unhide(cc);
else else
client_raise(cc); client_raise(cc);
xu_ptr_setpos(cc->win, x, y);
xu_ptr_setpos(cc->win, cc->ptr.x, cc->ptr.y);
} }
void void
@ -492,8 +487,8 @@ client_ptrsave(struct client_ctx *cc)
cc->ptr.x = x; cc->ptr.x = x;
cc->ptr.y = y; cc->ptr.y = y;
} else { } else {
cc->ptr.x = -1; cc->ptr.x = cc->geom.w / 2;
cc->ptr.y = -1; cc->ptr.y = cc->geom.h / 2;
} }
} }