e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Change XWarpPointer wrapping. 

SVN revision: 54736
This commit is contained in:
Kim Woelders 2010-11-20 07:30:26 +00:00
parent 2fb4182a04
commit 19b69bb595
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/edge.c
View File

@ -97,7 +97,7 @@ EdgeTimeout(void *data)
Mode.events.py = Mode.events.my;
Mode.events.mx = Mode.events.cx += dx;
Mode.events.my = Mode.events.cy += dy;
EXWarpPointer(WinGetXwin(VROOT), Mode.events.mx, Mode.events.my);
EWarpPointer(VROOT, Mode.events.mx, Mode.events.my);
DeskCurrentMoveAreaBy(dax, day);
Mode.events.px = Mode.events.mx;
Mode.events.py = Mode.events.my;

2
src/ewins.c
View File

@ -1858,7 +1858,7 @@ EwinWarpTo(EWin * ewin, int force)
if (ewin->state.iconified)
return;
EXWarpPointer(EoGetXwin(ewin), EoGetW(ewin) / 2, EoGetH(ewin) / 2);
EWarpPointer(EoGetWin(ewin), EoGetW(ewin) / 2, EoGetH(ewin) / 2);
Mode.mouse_over_ewin = ewin;
}

6
src/ipc.c
View File

@ -1254,12 +1254,12 @@ IPC_Warp(const char *params)
else if (!strncmp(params, "abs", 3))
{
sscanf(params, "%*s %i %i", &x, &y);
EXWarpPointer(WinGetXwin(VROOT), x, y);
EWarpPointer(VROOT, x, y);
}
else if (!strncmp(params, "rel", 3))
{
sscanf(params, "%*s %i %i", &x, &y);
EXWarpPointer(None, x, y);
EWarpPointer(NULL, x, y);
}
else if (!strncmp(params, "scr", 3))
{
@ -1270,7 +1270,7 @@ IPC_Warp(const char *params)
else
{
sscanf(params, "%i %i", &x, &y);
EXWarpPointer(None, x, y);
EWarpPointer(NULL, x, y);
}
}

4
src/menus.c
View File

@ -1507,7 +1507,7 @@ MenusHandleMotion(void)
Conf.shadespeed, 0);
if (((xdist != 0) || (ydist != 0))
&& (Conf.menus.warp))
EXWarpPointer(None, xdist, ydist);
EWarpPointer(NULL, xdist, ydist);
#ifdef USE_XINERAMA
}
#endif
@ -1629,7 +1629,7 @@ _SubmenuCheckSlide(Menu * m, MenuItem * mi, EWin * ewin, EWin * ewin2,
MenusSetEvents(1);
if (Conf.menus.warp)
EXWarpPointer(WinGetXwin(mi->win), mi->text_w / 2, mi->text_h / 2);
EWarpPointer(mi->win, mi->text_w / 2, mi->text_h / 2);
}
static int

6
src/x.c
View File

@ -1138,6 +1138,12 @@ EXWarpPointer(Window xwin, int x, int y)
XWarpPointer(disp, None, xwin, 0, 0, 0, 0, x, y);
}
void
EWarpPointer(Win win, int x, int y)
{
EXWarpPointer(win ? win->xwin : None, x, y);
}
Bool
EXQueryPointer(Window xwin, int *px, int *py, Window * pchild,
unsigned int *pmask)

5
src/xwin.h
View File

@ -222,10 +222,9 @@ int EShapeCheck(Win win);
Pixmap EWindowGetShapePixmap(Win win);
Pixmap EWindowGetShapePixmapInverted(Win win);
void EWarpPointer(Win win, int x, int y);
Bool EQueryPointer(Win win, int *px, int *py,
Window * pchild, unsigned int *pmask);
Bool EXQueryPointer(Window xwin, int *px, int *py,
Window * pchild, unsigned int *pmask);
unsigned int EAllocColor(Colormap cmap, unsigned int argb);
@ -264,6 +263,8 @@ void EXCopyAreaTiled(Drawable src, Pixmap mask, Drawable dst,
int dx, int dy);
void EXWarpPointer(Window xwin, int x, int y);
Bool EXQueryPointer(Window xwin, int *px, int *py,
Window * pchild, unsigned int *pmask);
Pixmap EXCreatePixmapCopy(Pixmap src, unsigned int w,
unsigned int h, unsigned int depth);