kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=265815a28251ea5765a8cbc59f22e982d904c55d
commit 265815a28251ea5765a8cbc59f22e982d904c55d Author: Kim Woelders <[email protected]> Date: Fri Dec 27 23:15:02 2013 +0100 Rename EDrawableCheck to EXDrawableOk and remove unused parameter. --- src/desktops.c | 2 +- src/hints.c | 2 +- src/x.c | 14 ++------------ src/xwin.h | 2 +- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/desktops.c b/src/desktops.c index 5315273..79b62b8 100644 --- a/src/desktops.c +++ b/src/desktops.c @@ -2066,7 +2066,7 @@ DeskPropertyChange(Desk * dsk, XEvent * ev) if (pmap == Mode.root.ext_pmap) return; Mode.root.ext_pmap = pmap; - Mode.root.ext_pmap_valid = EDrawableCheck(pmap, 0); + Mode.root.ext_pmap_valid = EXDrawableOk(pmap); DesksBackgroundRefresh(NULL, DESK_BG_REFRESH); } else if (ev->xproperty.atom == E_XROOTCOLOR_PIXEL) diff --git a/src/hints.c b/src/hints.c index c24b565..57c1df9 100644 --- a/src/hints.c +++ b/src/hints.c @@ -88,7 +88,7 @@ HintsInit(void) } Mode.root.ext_pmap = HintsGetRootPixmap(VROOT); - Mode.root.ext_pmap_valid = EDrawableCheck(Mode.root.ext_pmap, 0); + Mode.root.ext_pmap_valid = EXDrawableOk(Mode.root.ext_pmap); } /* diff --git a/src/x.c b/src/x.c index 4e097f4..88d0d4a 100644 --- a/src/x.c +++ b/src/x.c @@ -1213,22 +1213,12 @@ EQueryPointer(Win win, int *px, int *py, Window * pchild, unsigned int *pmask) } int -EDrawableCheck(Drawable draw, int grab) +EXDrawableOk(Drawable draw) { - int ok; - if (draw == None) return 0; - if (grab) - EGrabServer(); - - ok = EXGetGeometry(draw, NULL, NULL, NULL, NULL, NULL, NULL, NULL); - - if (grab && !ok) - EUngrabServer(); - - return ok; + return EXGetGeometry(draw, NULL, NULL, NULL, NULL, NULL, NULL, NULL); } KeyCode diff --git a/src/xwin.h b/src/xwin.h index 41406c5..5fb1942 100644 --- a/src/xwin.h +++ b/src/xwin.h @@ -188,7 +188,7 @@ int ETranslateCoordinates(Win src_w, Win dst_w, int *dest_x_return, int *dest_y_return, Window * child_return); -int EDrawableCheck(Drawable draw, int grab); +int EXDrawableOk(Drawable draw); void ESelectInput(Win win, unsigned int event_mask); void ESelectInputChange(Win win, unsigned int set, --
