Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: E.h aclass.c buttons.c eimage.c eimage.h eobj.c ewins.c focus.c gnome.c hints.c hiwin.c slideout.c warp.c x.c xwin.h Log Message: Window handling function api rename/rewrap continued. =================================================================== RCS file: /cvs/e/e16/e/src/E.h,v retrieving revision 1.550 retrieving revision 1.551 diff -u -3 -r1.550 -r1.551 --- E.h 23 Apr 2006 08:42:16 -0000 1.550 +++ E.h 23 Apr 2006 22:11:26 -0000 1.551 @@ -731,7 +731,7 @@ int GrabPointerSet(Window win, unsigned int csr, int confine); void GrabPointerRelease(void); void GrabButtonSet(unsigned int button, unsigned int modifiers, - Window window, unsigned int event_mask, + Window win, unsigned int event_mask, unsigned int csr, int confine); void GrabButtonRelease(unsigned int button, unsigned int modifiers, Window win); =================================================================== RCS file: /cvs/e/e16/e/src/aclass.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- aclass.c 21 Apr 2006 22:52:58 -0000 1.32 +++ aclass.c 23 Apr 2006 22:11:26 -0000 1.33 @@ -1490,7 +1490,7 @@ if (mod == AnyModifier) { - GrabButtonSet(button, mod, EoGetWin(ewin), mask, ECSR_PGRAB, 1); + GrabButtonSet(button, mod, EoGetXwin(ewin), mask, ECSR_PGRAB, 1); } else { @@ -1499,7 +1499,7 @@ for (i = 0; i < 8; i++) { GrabButtonSet(button, mod | Mode.masks.mod_combos[i], - EoGetWin(ewin), mask, ECSR_PGRAB, 1); + EoGetXwin(ewin), mask, ECSR_PGRAB, 1); } } } @@ -1540,7 +1540,7 @@ if (mod == AnyModifier) { - GrabButtonRelease(button, mod, EoGetWin(ewin)); + GrabButtonRelease(button, mod, EoGetXwin(ewin)); } else { @@ -1549,7 +1549,7 @@ for (i = 0; i < 8; i++) { GrabButtonRelease(button, mod | Mode.masks.mod_combos[i], - EoGetWin(ewin)); + EoGetXwin(ewin)); } } } =================================================================== RCS file: /cvs/e/e16/e/src/buttons.c,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- buttons.c 21 Apr 2006 22:52:58 -0000 1.89 +++ buttons.c 23 Apr 2006 22:11:26 -0000 1.90 @@ -447,7 +447,7 @@ if (ButtonIsFixed(b)) return; - GrabPointerSet(EoGetWin(b), ECSR_GRAB, 0); + GrabPointerSet(EoGetXwin(b), ECSR_GRAB, 0); Mode.mode = MODE_BUTTONDRAG; Mode_buttons.move_pending = 1; Mode_buttons.start_x = Mode.events.x; @@ -527,7 +527,7 @@ { Mode_buttons.button = b; - GrabPointerSet(EoGetWin(b), ECSR_GRAB, 0); + GrabPointerSet(EoGetXwin(b), ECSR_GRAB, 0); if (b->inside_win) { =================================================================== RCS file: /cvs/e/e16/e/src/eimage.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- eimage.c 10 Apr 2006 18:25:46 -0000 1.3 +++ eimage.c 23 Apr 2006 22:11:26 -0000 1.4 @@ -418,7 +418,7 @@ int w, h; w = h = 0; - EGetGeometry(draw, NULL, NULL, NULL, &w, &h, NULL, NULL); + EXGetGeometry(draw, NULL, NULL, NULL, &w, &h, NULL, NULL); if (w <= 0 || h <= 0) return; imlib_context_set_drawable(draw); =================================================================== RCS file: /cvs/e/e16/e/src/eimage.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- eimage.h 29 Mar 2006 22:56:29 -0000 1.2 +++ eimage.h 23 Apr 2006 22:11:26 -0000 1.3 @@ -93,4 +93,6 @@ int sx, int sy, int sw, int sh, int dx, int dy, int dw, int dh, int scale); +void EDrawableDumpImage(Drawable draw, const char *txt); + #endif /* _EIMAGE_H_ */ =================================================================== RCS file: /cvs/e/e16/e/src/eobj.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -3 -r1.71 -r1.72 --- eobj.c 22 Apr 2006 13:57:54 -0000 1.71 +++ eobj.c 23 Apr 2006 22:11:26 -0000 1.72 @@ -380,11 +380,7 @@ #if USE_COMPOSITE if (eo->type == EOBJ_TYPE_EWIN) { - if (EventDebug(250)) - EDrawableDumpImage(eo->win, "Win1"); ECompMgrMoveResizeFix(eo, x, y, w, h); - if (EventDebug(250)) - EDrawableDumpImage(eo->win, "Win2"); } else #endif =================================================================== RCS file: /cvs/e/e16/e/src/ewins.c,v retrieving revision 1.156 retrieving revision 1.157 diff -u -3 -r1.156 -r1.157 --- ewins.c 21 Apr 2006 22:52:58 -0000 1.156 +++ ewins.c 23 Apr 2006 22:11:26 -0000 1.157 @@ -1965,7 +1965,7 @@ if (ev->type == ButtonPress) { - GrabPointerSet(EoGetWin(ewin), ECSR_GRAB, 0); + GrabPointerSet(EoGetXwin(ewin), ECSR_GRAB, 0); FocusToEWin(ewin, FOCUS_CLICK); } else if (ev->type == ButtonRelease) =================================================================== RCS file: /cvs/e/e16/e/src/focus.c,v retrieving revision 1.145 retrieving revision 1.146 diff -u -3 -r1.145 -r1.146 --- focus.c 21 Apr 2006 22:52:58 -0000 1.145 +++ focus.c 23 Apr 2006 22:11:26 -0000 1.146 @@ -217,7 +217,7 @@ { if (!ewin->state.click_grab_isset) { - GrabButtonSet(AnyButton, AnyModifier, _EwinGetContainerWin(ewin), + GrabButtonSet(AnyButton, AnyModifier, _EwinGetContainerXwin(ewin), ButtonPressMask, ECSR_PGRAB, 1); if (EventDebug(EDBUG_TYPE_GRABS)) Eprintf("FocusEwinSetGrabs: %#lx set %s\n", @@ -230,7 +230,7 @@ if (ewin->state.click_grab_isset) { GrabButtonRelease(AnyButton, AnyModifier, - _EwinGetContainerWin(ewin)); + _EwinGetContainerXwin(ewin)); if (EventDebug(EDBUG_TYPE_GRABS)) Eprintf("FocusEwinSetGrabs: %#lx unset %s\n", _EwinGetClientXwin(ewin), EwinGetName(ewin)); =================================================================== RCS file: /cvs/e/e16/e/src/gnome.c,v retrieving revision 1.63 retrieving revision 1.64 diff -u -3 -r1.63 -r1.64 --- gnome.c 18 Feb 2006 09:50:16 -0000 1.63 +++ gnome.c 23 Apr 2006 22:11:26 -0000 1.64 @@ -740,7 +740,8 @@ unsigned int val; atom_set = XInternAtom(disp, "_WIN_DESKTOP_BUTTON_PROXY", False); - Mode.button_proxy_win = ECreateWindow(VRoot.win, -80, -80, 24, 24, 0); + Mode.button_proxy_win = + XCreateSimpleWindow(disp, VRoot.win, -80, -80, 24, 24, 0, 0, 0); val = Mode.button_proxy_win; ecore_x_window_prop_card32_set(VRoot.win, atom_set, &val, 1); ecore_x_window_prop_card32_set(Mode.button_proxy_win, atom_set, &val, 1); =================================================================== RCS file: /cvs/e/e16/e/src/hints.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -3 -r1.64 -r1.65 --- hints.c 18 Apr 2006 23:45:34 -0000 1.64 +++ hints.c 23 Apr 2006 22:11:26 -0000 1.65 @@ -60,7 +60,7 @@ ENL_WIN_DATA = XInternAtom(disp, "ENL_WIN_DATA", False); ENL_WIN_BORDER = XInternAtom(disp, "ENL_WIN_BORDER", False); - win = ECreateWindow(VRoot.win, -200, -200, 5, 5, 0); + win = XCreateSimpleWindow(disp, VRoot.win, -200, -200, 5, 5, 0, 0, 0); ICCCM_Init(); MWM_SetInfo(); =================================================================== RCS file: /cvs/e/e16/e/src/hiwin.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- hiwin.c 18 Apr 2006 16:26:51 -0000 1.12 +++ hiwin.c 23 Apr 2006 22:11:26 -0000 1.13 @@ -458,7 +458,7 @@ EoMoveResize(phi, x - w / 2, y - h / 2, w, h); } - GrabPointerSet(EoGetWin(phi), ECSR_ACT_MOVE, confine); + GrabPointerSet(EoGetXwin(phi), ECSR_ACT_MOVE, confine); pz->fini(phi, 1); } =================================================================== RCS file: /cvs/e/e16/e/src/slideout.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- slideout.c 21 Apr 2006 22:52:59 -0000 1.53 +++ slideout.c 23 Apr 2006 22:11:26 -0000 1.54 @@ -233,7 +233,7 @@ s->ref_count++; s->context_ewin = ewin; - GrabPointerSet(EoGetWin(s), ECSR_ROOT, 0); + GrabPointerSet(EoGetXwin(s), ECSR_ROOT, 0); Mode_slideouts.active = s; } @@ -379,7 +379,7 @@ break; case LeaveNotify: if (ev->xcrossing.mode != NotifyUngrab) - GrabPointerSet(EoGetWin(s), ECSR_ROOT, 0); + GrabPointerSet(EoGetXwin(s), ECSR_ROOT, 0); break; } } =================================================================== RCS file: /cvs/e/e16/e/src/warp.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- warp.c 22 Apr 2006 22:00:02 -0000 1.90 +++ warp.c 23 Apr 2006 22:11:26 -0000 1.91 @@ -164,8 +164,8 @@ * Grab the keyboard. The grab is automatically released when * WarpFocusHide unmaps warpFocusWindow. */ - GrabKeyboardSet(EoGetWin(fw)); - GrabPointerSet(EoGetWin(fw), None, 0); + GrabKeyboardSet(EoGetXwin(fw)); + GrabPointerSet(EoGetXwin(fw), None, 0); TooltipsEnable(0); } =================================================================== RCS file: /cvs/e/e16/e/src/x.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -3 -r1.124 -r1.125 --- x.c 18 Apr 2006 17:53:15 -0000 1.124 +++ x.c 23 Apr 2006 22:11:26 -0000 1.125 @@ -901,7 +901,7 @@ if (grab) EGrabServer(); - ok = EGetGeometry(draw, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + ok = EXGetGeometry(draw, NULL, NULL, NULL, NULL, NULL, NULL, NULL); if (grab && !ok) EUngrabServer(); =================================================================== RCS file: /cvs/e/e16/e/src/xwin.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- xwin.h 17 Apr 2006 21:55:34 -0000 1.12 +++ xwin.h 23 Apr 2006 22:11:26 -0000 1.13 @@ -115,6 +115,8 @@ void ECopyArea(Drawable src, Drawable dst, int sx, int sy, unsigned int w, unsigned int h, int dx, int dy); +#define EXGetGeometry EGetGeometry + GC EXCreateGC(Drawable draw, unsigned long mask, XGCValues * val); int EXFreeGC(GC gc); ------------------------------------------------------- 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