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 menus.c pager.c screen.c
tooltips.c warp.c x.c xwin.h zoom.c
Log Message:
Window handling function api rename/rewrap continued.
===================================================================
RCS file: /cvs/e/e16/e/src/edge.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- edge.c 16 Apr 2006 13:27:37 -0000 1.28
+++ edge.c 23 Apr 2006 23:18:23 -0000 1.29
@@ -45,7 +45,7 @@
return;
/* Quit if pointer has left screen */
- if (!EQueryPointer(None, NULL, NULL, NULL, NULL))
+ if (!EXQueryPointer(None, NULL, NULL, NULL, NULL))
return;
/* Quit if in fullscreen window */
@@ -96,7 +96,7 @@
Mode.events.py = Mode.events.y;
Mode.events.x += dx;
Mode.events.y += dy;
- EWarpPointer(VRoot.win, Mode.events.x, Mode.events.y);
+ EXWarpPointer(VRoot.win, Mode.events.x, Mode.events.y);
DeskCurrentMoveAreaBy(dax, day);
Mode.events.px = Mode.events.x;
Mode.events.py = Mode.events.y;
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -3 -r1.158 -r1.159
--- ewins.c 23 Apr 2006 22:14:32 -0000 1.158
+++ ewins.c 23 Apr 2006 23:18:23 -0000 1.159
@@ -463,7 +463,7 @@
{
Window child;
- EQueryPointer(EoGetWin(DesksGetCurrent()), NULL, NULL, &child, NULL);
+ EXQueryPointer(EoGetXwin(DesksGetCurrent()), NULL, NULL, &child, NULL);
return EwinFindByFrame(child);
}
@@ -477,7 +477,7 @@
Desk *dsk;
dsk = DesktopAt(Mode.events.x, Mode.events.y);
- EQueryPointer(EoGetWin(dsk), &px, &py, NULL, NULL);
+ EXQueryPointer(EoGetXwin(dsk), &px, &py, NULL, NULL);
lst = EwinListGetForDesk(&num, dsk);
for (i = 0; i < num; i++)
@@ -830,7 +830,7 @@
/* the window there */
DeskGoto(dsk);
- EQueryPointer(VRoot.win, &rx, &ry, NULL, NULL);
+ EXQueryPointer(VRoot.win, &rx, &ry, NULL, NULL);
Mode.events.x = rx;
Mode.events.y = ry;
ewin->state.placed = 1;
@@ -880,7 +880,7 @@
/* the window there */
DeskGoto(dsk);
- EQueryPointer(VRoot.win, &rx, &ry, NULL, NULL);
+ EXQueryPointer(VRoot.win, &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.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- focus.c 23 Apr 2006 22:11:26 -0000 1.146
+++ focus.c 23 Apr 2006 23:18:23 -0000 1.147
@@ -400,7 +400,7 @@
do_warp = 1;
if (do_warp && ewin != Mode.mouse_over_ewin)
{
- EWarpPointer(EoGetWin(ewin), EoGetW(ewin) / 2, EoGetH(ewin) / 2);
+ EXWarpPointer(EoGetXwin(ewin), EoGetW(ewin) / 2, EoGetH(ewin) / 2);
Mode.mouse_over_ewin = ewin;
}
@@ -430,7 +430,7 @@
ICCCM_Cmap(ewin);
/* Quit if pointer is not on our screen */
- if (!EQueryPointer(None, NULL, NULL, NULL, NULL))
+ if (!EXQueryPointer(None, NULL, NULL, NULL, NULL))
{
Mode.focuswin = NULL;
return;
===================================================================
RCS file: /cvs/e/e16/e/src/hiwin.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- hiwin.c 23 Apr 2006 22:11:26 -0000 1.13
+++ hiwin.c 23 Apr 2006 23:18:23 -0000 1.14
@@ -443,7 +443,7 @@
EoMoveResize(phi, xx, yy, ww, hh);
pz->draw(phi);
- on_screen = EQueryPointer(None, &px, &py, NULL, NULL);
+ on_screen = EXQueryPointer(None, &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.265
retrieving revision 1.266
diff -u -3 -r1.265 -r1.266
--- ipc.c 22 Apr 2006 22:00:02 -0000 1.265
+++ ipc.c 23 Apr 2006 23:18:23 -0000 1.266
@@ -1136,31 +1136,31 @@
x = y = 0;
if (!strcmp(params, "?"))
{
- EQueryPointer(None, &x, &y, NULL, NULL);
+ EXQueryPointer(None, &x, &y, NULL, NULL);
IpcPrintf("Pointer location: %d %d\n", x, y);
}
else if (!strncmp(params, "abs", 3))
{
sscanf(params, "%*s %i %i", &x, &y);
- EWarpPointer(VRoot.win, x, y);
+ EXWarpPointer(VRoot.win, x, y);
}
else if (!strncmp(params, "rel", 3))
{
sscanf(params, "%*s %i %i", &x, &y);
- EWarpPointer(None, x, y);
+ EXWarpPointer(None, x, y);
}
else if (!strncmp(params, "scr", 3))
{
x = (VRoot.scr + 1) % ScreenCount(disp);
sscanf(params, "%*s %i", &x);
if (x >= 0 && x < ScreenCount(disp))
- EWarpPointer(RootWindow(disp, x), DisplayWidth(disp, x) / 2,
- DisplayHeight(disp, x) / 2);
+ EXWarpPointer(RootWindow(disp, x), DisplayWidth(disp, x) / 2,
+ DisplayHeight(disp, x) / 2);
}
else
{
sscanf(params, "%i %i", &x, &y);
- EWarpPointer(None, x, y);
+ EXWarpPointer(None, x, y);
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -3 -r1.239 -r1.240
--- menus.c 22 Apr 2006 22:00:02 -0000 1.239
+++ menus.c 23 Apr 2006 23:18:23 -0000 1.240
@@ -1413,7 +1413,7 @@
Conf.shadespeed);
if (((xdist != 0) || (ydist != 0))
&& (Conf.menus.warp))
- EWarpPointer(None, xdist, ydist);
+ EXWarpPointer(None, xdist, ydist);
#ifdef HAS_XINERAMA
}
#endif
@@ -1573,7 +1573,7 @@
MenusSetEvents(1);
if (Conf.menus.warp)
- EWarpPointer(mi->win, mi->text_w / 2, mi->text_h / 2);
+ EXWarpPointer(mi->win, mi->text_w / 2, mi->text_h / 2);
}
}
===================================================================
RCS file: /cvs/e/e16/e/src/pager.c,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -3 -r1.208 -r1.209
--- pager.c 22 Apr 2006 12:11:12 -0000 1.208
+++ pager.c 23 Apr 2006 23:18:23 -0000 1.209
@@ -1107,7 +1107,7 @@
if (!Conf_pagers.enable)
return;
- on_screen = EQueryPointer(p->win, &x, &y, NULL, NULL);
+ on_screen = EXQueryPointer(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.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- screen.c 23 Apr 2006 08:14:03 -0000 1.17
+++ screen.c 23 Apr 2006 23:18:23 -0000 1.18
@@ -242,7 +242,7 @@
{
int pointer_x, pointer_y;
- EQueryPointer(VRoot.win, &pointer_x, &pointer_y, NULL, NULL);
+ EXQueryPointer(VRoot.win, &pointer_x, &pointer_y, NULL, NULL);
return ScreenGetGeometry(pointer_x, pointer_y, px, py, pw, ph);
}
@@ -252,7 +252,7 @@
{
int pointer_x, pointer_y;
- EQueryPointer(VRoot.win, &pointer_x, &pointer_y, NULL, NULL);
+ EXQueryPointer(VRoot.win, &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.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- tooltips.c 21 Apr 2006 22:52:59 -0000 1.99
+++ tooltips.c 23 Apr 2006 23:18:23 -0000 1.100
@@ -748,7 +748,7 @@
/* In the case of multiple screens, check to make sure
* the root window is still where the mouse is... */
- if (!EQueryPointer(VRoot.win, &x, &y, NULL, &mask))
+ if (!EXQueryPointer(VRoot.win, &x, &y, NULL, &mask))
return;
/* In case this is a virtual root */
===================================================================
RCS file: /cvs/e/e16/e/src/warp.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- warp.c 23 Apr 2006 22:11:26 -0000 1.91
+++ warp.c 23 Apr 2006 23:18:23 -0000 1.92
@@ -339,7 +339,7 @@
if (Conf.focus.warp_on_next)
if (ewin != Mode.mouse_over_ewin && !ewin->state.iconified)
{
- EWarpPointer(EoGetWin(ewin), EoGetW(ewin) / 2, EoGetH(ewin) / 2);
+ EXWarpPointer(EoGetXwin(ewin), EoGetW(ewin) / 2, EoGetH(ewin) / 2);
Mode.mouse_over_ewin = ewin;
}
if (Conf.warplist.warpfocused)
@@ -385,7 +385,7 @@
if (Conf.warplist.warp_on_select)
if (ewin != Mode.mouse_over_ewin)
{
- EWarpPointer(EoGetWin(ewin), EoGetW(ewin) / 2, EoGetH(ewin) / 2);
+ EXWarpPointer(EoGetXwin(ewin), EoGetW(ewin) / 2, EoGetH(ewin) / 2);
Mode.mouse_over_ewin = ewin;
}
FocusToEWin(ewin, FOCUS_SET);
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- x.c 23 Apr 2006 22:11:26 -0000 1.125
+++ x.c 23 Apr 2006 23:18:23 -0000 1.126
@@ -852,21 +852,19 @@
}
void
-EWarpPointer(Window win, int x, int y)
+EXWarpPointer(Window xwin, int x, int y)
{
- XWarpPointer(disp, None, win, 0, 0, 0, 0, x, y);
+ XWarpPointer(disp, None, xwin, 0, 0, 0, 0, x, y);
}
Bool
-EQueryPointer(Window win, int *px, int *py, Window * pchild,
- unsigned int *pmask)
+EXQueryPointer(Window xwin, int *px, int *py, Window * pchild,
+ unsigned int *pmask)
{
Window root, child;
int root_x, root_y;
unsigned int mask;
- if (win == None)
- win = VRoot.win;
if (!px)
px = &root_x;
if (!py)
@@ -876,7 +874,7 @@
if (!pmask)
pmask = &mask;
- return XQueryPointer(disp, win, &root, pchild, &root_x, &root_y, px, py,
+ return XQueryPointer(disp, xwin, &root, pchild, &root_x, &root_y, px, py,
pmask);
}
===================================================================
RCS file: /cvs/e/e16/e/src/xwin.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- xwin.h 23 Apr 2006 22:11:26 -0000 1.13
+++ xwin.h 23 Apr 2006 23:18:23 -0000 1.14
@@ -78,9 +78,6 @@
int *dest_x_return,
int *dest_y_return,
Window * child_return);
-void EWarpPointer(Window win, int x, int y);
-Bool EQueryPointer(Window win, int *px, int *py, Window *
pchild,
- unsigned int *pmask);
int EDrawableCheck(Drawable draw, int grab);
#define ESelectInput(win, mask) XSelectInput(disp, win, mask)
@@ -116,6 +113,10 @@
unsigned int w, unsigned int h, int dx, int dy);
#define EXGetGeometry EGetGeometry
+
+void EXWarpPointer(Window xwin, int x, int y);
+Bool EXQueryPointer(Window xwin, int *px, int *py,
+ Window * pchild, unsigned int *pmask);
GC EXCreateGC(Drawable draw, unsigned long mask,
XGCValues * val);
===================================================================
RCS file: /cvs/e/e16/e/src/zoom.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- zoom.c 7 Jan 2006 07:20:58 -0000 1.34
+++ zoom.c 23 Apr 2006 23:18:23 -0000 1.35
@@ -218,8 +218,8 @@
if (zoom_mask_4)
EDestroyWindow(zoom_mask_4);
SwitchRes(0, 0, 0, 0, 0);
- EWarpPointer(_EwinGetClientWin(ewin), ewin->client.w / 2,
- ewin->client.h / 2);
+ EXWarpPointer(_EwinGetClientXwin(ewin), ewin->client.w / 2,
+ ewin->client.h / 2);
ESync();
zoom_last_ewin = NULL;
}
@@ -250,8 +250,8 @@
EwinBorderGetSize(ewin, &bl, &br, &bt, &bb);
EwinMove(ewin, -bl + x1, -bt + y1);
FocusToEWin(ewin, FOCUS_SET);
- EWarpPointer(_EwinGetClientWin(ewin), ewin->client.w / 2,
- ewin->client.h / 2);
+ EXWarpPointer(_EwinGetClientXwin(ewin), ewin->client.w / 2,
+ ewin->client.h / 2);
#if 0 /* Doesn't work as intended */
XGrabPointer(disp, _EwinGetClientXwin(ewin), True,
ButtonPressMask | ButtonReleaseMask |
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
