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

fix potential bug with movemouse

This commit is contained in:
Julien Danjou 2007-09-17 23:54:12 +02:00
parent f0c623789c
commit 79b140bc61
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
event.c
View File

@ -52,7 +52,7 @@ getclient(Window w)
} }
static void static void
movemouse(Client * c, awesome_config *awesomeconf) movemouse(Client * c, int screen, awesome_config *awesomeconf)
{ {
int x1, y1, ocx, ocy, di, nx, ny; int x1, y1, ocx, ocy, di, nx, ny;
unsigned int dui; unsigned int dui;
@ -60,7 +60,7 @@ movemouse(Client * c, awesome_config *awesomeconf)
XEvent ev; XEvent ev;
ScreenInfo *si; ScreenInfo *si;
si = get_display_info(c->display, c->screen, awesomeconf->statusbar); si = get_display_info(c->display, c->screen, awesomeconf[screen].statusbar);
ocx = nx = c->x; ocx = nx = c->x;
ocy = ny = c->y; ocy = ny = c->y;
@ -85,13 +85,13 @@ movemouse(Client * c, awesome_config *awesomeconf)
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(si->x_org + nx) < awesomeconf->snap) if(abs(si->x_org + nx) < awesomeconf[screen].snap)
nx = si->x_org; nx = si->x_org;
else if(abs((si->x_org + si->width) - (nx + c->w + 2 * c->border)) < awesomeconf->snap) else if(abs((si->x_org + si->width) - (nx + c->w + 2 * c->border)) < awesomeconf[screen].snap)
nx = si->x_org + si->width - c->w - 2 * c->border; nx = si->x_org + si->width - c->w - 2 * c->border;
if(abs(si->y_org - ny) < awesomeconf->snap) if(abs(si->y_org - ny) < awesomeconf[screen].snap)
ny = si->y_org; ny = si->y_org;
else if(abs((si->y_org + si->height) - (ny + c->h + 2 * c->border)) < awesomeconf->snap) else if(abs((si->y_org + si->height) - (ny + c->h + 2 * c->border)) < awesomeconf[screen].snap)
ny = si->y_org + si->height - c->h - 2 * c->border; ny = si->y_org + si->height - c->h - 2 * c->border;
resize(c, nx, ny, c->w, c->h, False); resize(c, nx, ny, c->w, c->h, False);
break; break;
@ -190,7 +190,7 @@ handle_event_buttonpress(XEvent * e, awesome_config *awesomeconf)
uicb_togglefloating(e->xany.display, &dc[c->screen], &awesomeconf[c->screen], NULL); uicb_togglefloating(e->xany.display, &dc[c->screen], &awesomeconf[c->screen], NULL);
else else
restack(e->xany.display, &dc[c->screen], &awesomeconf[c->screen]); restack(e->xany.display, &dc[c->screen], &awesomeconf[c->screen]);
movemouse(c, &awesomeconf[c->screen]); movemouse(c, screen, awesomeconf);
} }
else if(ev->button == Button2) else if(ev->button == Button2)
{ {