kwo pushed a commit to branch master.
http://git.enlightenment.org/e16/e16.git/commit/?id=282cb01ad73f3d5795d1e41381ea03b314f39021
commit 282cb01ad73f3d5795d1e41381ea03b314f39021
Author: Kim Woelders <k...@woelders.dk>
Date: Fri Aug 13 11:03:50 2021 +0200
x.c: Deubug stuff cleanups
---
src/x.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/x.c b/src/x.c
index 80ac4c4f..d4535e6a 100644
--- a/src/x.c
+++ b/src/x.c
@@ -753,7 +753,7 @@ EReparentWindow(Win win, Win parent, int x, int y)
#if 0
Eprintf
- ("%s: %p %#lx: %d %#lx->%#lx %d,%d %dx%d -> %d,%d\n", __func__,
+ ("%s: %p %#x: %d %#x->%#x %d,%d %dx%d -> %d,%d\n", __func__,
win, win->xwin, win->mapped, (win->parent) ? win->parent->xwin : NoXID,
parent->xwin, win->x, win->y, win->w, win->h, x, y);
#endif
@@ -813,7 +813,12 @@ EXGetGeometry(EX_Drawable draw, EX_Window * root_return,
int *x, int *y,
ok = XGetGeometry(disp, draw, &rr, &xx, &yy, &ww, &hh, &bb, &dd);
if (!ok)
- goto done;
+ {
+#if 0 /* Debug */
+ Eprintf("%s win=%#x, error %d\n", __func__, draw, ok);
+#endif
+ return 0;
+ }
if (root_return)
*root_return = rr;
@@ -830,12 +835,7 @@ EXGetGeometry(EX_Drawable draw, EX_Window * root_return,
int *x, int *y,
if (depth)
*depth = dd;
- done:
-#if 0 /* Debug */
- if (!ok)
- Eprintf("%s win=%#x, error %d\n", __func__, (unsigned)win, ok);
-#endif
- return ok;
+ return 1;
}
int
--
