Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
edge.c ewins.c focus.c hiwin.c ipc.c pager.c screen.c
tooltips.c x.c xwin.h
Log Message:
Trivial re-wrapping of XQueryPointer().
===================================================================
RCS file: /cvs/e/e16/e/src/edge.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- edge.c 23 Aug 2006 21:04:53 -0000 1.31
+++ edge.c 24 Aug 2006 21:52:28 -0000 1.32
@@ -45,7 +45,7 @@
return;
/* Quit if pointer has left screen */
- if (!EXQueryPointer(None, NULL, NULL, NULL, NULL))
+ if (!EQueryPointer(NULL, NULL, NULL, NULL, NULL))
return;
/* Quit if in fullscreen window */
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -3 -r1.172 -r1.173
--- ewins.c 7 Aug 2006 23:26:36 -0000 1.172
+++ ewins.c 24 Aug 2006 21:52:28 -0000 1.173
@@ -466,7 +466,7 @@
{
Window child;
- EXQueryPointer(EoGetXwin(DesksGetCurrent()), NULL, NULL, &child, NULL);
+ EQueryPointer(EoGetWin(DesksGetCurrent()), NULL, NULL, &child, NULL);
return EwinFindByFrame(child);
}
@@ -480,7 +480,7 @@
Desk *dsk;
dsk = DesktopAt(Mode.events.x, Mode.events.y);
- EXQueryPointer(EoGetXwin(dsk), &px, &py, NULL, NULL);
+ EQueryPointer(EoGetWin(dsk), &px, &py, NULL, NULL);
lst = EwinListGetForDesk(&num, dsk);
for (i = 0; i < num; i++)
@@ -832,7 +832,7 @@
/* the window there */
DeskGoto(dsk);
- EXQueryPointer(VRoot.xwin, &rx, &ry, NULL, NULL);
+ EQueryPointer(NULL, &rx, &ry, NULL, NULL);
Mode.events.x = rx;
Mode.events.y = ry;
ewin->state.placed = 1;
@@ -882,7 +882,7 @@
/* the window there */
DeskGoto(dsk);
- EXQueryPointer(VRoot.xwin, &rx, &ry, NULL, NULL);
+ EQueryPointer(NULL, &rx, &ry, NULL, NULL);
Mode.events.x = rx;
Mode.events.y = ry;
ewin->state.placed = 1;
===================================================================
RCS file: /cvs/e/e16/e/src/focus.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -3 -r1.156 -r1.157
--- focus.c 8 Aug 2006 03:58:42 -0000 1.156
+++ focus.c 24 Aug 2006 21:52:28 -0000 1.157
@@ -430,7 +430,7 @@
ICCCM_Cmap(ewin);
/* Quit if pointer is not on our screen */
- if (!EXQueryPointer(None, NULL, NULL, NULL, NULL))
+ if (!EQueryPointer(NULL, NULL, NULL, NULL, NULL))
{
Mode.focuswin = NULL;
return;
===================================================================
RCS file: /cvs/e/e16/e/src/hiwin.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- hiwin.c 12 Aug 2006 16:16:26 -0000 1.19
+++ hiwin.c 24 Aug 2006 21:52:28 -0000 1.20
@@ -467,7 +467,7 @@
EoMoveResize(phi, xx, yy, ww, hh);
pz->draw(phi);
- on_screen = EXQueryPointer(None, &px, &py, NULL, NULL);
+ on_screen = EQueryPointer(NULL, &px, &py, NULL, NULL);
if (!on_screen ||
(px < x) || (py < y) || (px >= (x + w)) || (py >= (y + h)))
{
===================================================================
RCS file: /cvs/e/e16/e/src/ipc.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -3 -r1.275 -r1.276
--- ipc.c 24 Aug 2006 21:32:28 -0000 1.275
+++ ipc.c 24 Aug 2006 21:52:28 -0000 1.276
@@ -1269,7 +1269,7 @@
x = y = 0;
if (!strcmp(params, "?"))
{
- EXQueryPointer(None, &x, &y, NULL, NULL);
+ EQueryPointer(NULL, &x, &y, NULL, NULL);
IpcPrintf("Pointer location: %d %d\n", x, y);
}
else if (!strncmp(params, "abs", 3))
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -3 -r1.223 -r1.224
--- pager.c 8 Aug 2006 03:58:42 -0000 1.223
+++ pager.c 24 Aug 2006 21:52:28 -0000 1.224
@@ -1110,7 +1110,7 @@
if (!Conf_pagers.enable)
return;
- on_screen = EXQueryPointer(WinGetXwin(p->win), &x, &y, NULL, NULL);
+ on_screen = EQueryPointer(p->win, &x, &y, NULL, NULL);
if (on_screen && x >= 0 && x < p->w && y >= 0 && y < p->h)
ewin = EwinInPagerAt(p, x, y);
===================================================================
RCS file: /cvs/e/e16/e/src/screen.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- screen.c 23 Aug 2006 21:04:53 -0000 1.20
+++ screen.c 24 Aug 2006 21:52:28 -0000 1.21
@@ -241,7 +241,7 @@
{
int pointer_x, pointer_y;
- EXQueryPointer(VRoot.xwin, &pointer_x, &pointer_y, NULL, NULL);
+ EQueryPointer(NULL, &pointer_x, &pointer_y, NULL, NULL);
return ScreenGetGeometry(pointer_x, pointer_y, px, py, pw, ph);
}
@@ -251,7 +251,7 @@
{
int pointer_x, pointer_y;
- EXQueryPointer(VRoot.xwin, &pointer_x, &pointer_y, NULL, NULL);
+ EQueryPointer(NULL, &pointer_x, &pointer_y, NULL, NULL);
return ScreenGetAvailableArea(pointer_x, pointer_y, px, py, pw, ph);
}
===================================================================
RCS file: /cvs/e/e16/e/src/tooltips.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- tooltips.c 13 Aug 2006 09:24:14 -0000 1.109
+++ tooltips.c 24 Aug 2006 21:52:28 -0000 1.110
@@ -767,7 +767,7 @@
/* In the case of multiple screens, check to make sure
* the root window is still where the mouse is... */
- if (!EXQueryPointer(VRoot.xwin, &x, &y, NULL, &mask))
+ if (!EQueryPointer(NULL, &x, &y, NULL, &mask))
return;
/* In case this is a virtual root */
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- x.c 7 Aug 2006 23:26:36 -0000 1.147
+++ x.c 24 Aug 2006 21:52:28 -0000 1.148
@@ -1027,7 +1027,7 @@
XWarpPointer(disp, None, xwin, 0, 0, 0, 0, x, y);
}
-Bool
+static Bool
EXQueryPointer(Window xwin, int *px, int *py, Window * pchild,
unsigned int *pmask)
{
@@ -1049,6 +1049,17 @@
return XQueryPointer(disp, xwin, &root, pchild, &root_x, &root_y, px, py,
pmask);
+}
+
+Bool
+EQueryPointer(Win win, int *px, int *py, Window * pchild, unsigned int *pmask)
+{
+ EXID *xid = win;
+ Window xwin;
+
+ xwin = (xid) ? xid->xwin : VRoot.xwin;
+
+ return EXQueryPointer(xwin, px, py, pchild, pmask);
}
void
===================================================================
RCS file: /cvs/e/e16/e/src/xwin.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- xwin.h 7 Aug 2006 20:47:12 -0000 1.24
+++ xwin.h 24 Aug 2006 21:52:28 -0000 1.25
@@ -141,6 +141,9 @@
int EShapeCheck(Win win);
Pixmap EWindowGetShapePixmap(Win win);
+Bool EQueryPointer(Win win, int *px, int *py,
+ Window * pchild, unsigned int *pmask);
+
void EAllocColor(Colormap colormap, XColor * pxc);
void ESetColor(XColor * pxc, int r, int g, int b);
void EGetColor(const XColor * pxc, int *pr, int *pg, int *pb);
@@ -155,8 +158,6 @@
void EXCopyArea(Drawable src, Drawable dst, int sx, int sy,
unsigned int w, unsigned int h, int dx, int dy);
-Bool EXQueryPointer(Window xwin, int *px, int *py,
- Window * pchild, unsigned int *pmask);
void EXWarpPointer(Window xwin, int x, int y);
#define EXCreatePixmap(win, w, h, d) \
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
