From 32eed4b5a28ec5c0073e3af42b3eb1f6f71fd60e Mon Sep 17 00:00:00 2001 From: Kim Woelders Date: Mon, 7 Aug 2006 20:20:16 +0000 Subject: [PATCH] Rename some macros (_Ewin...) for consistency. SVN revision: 24442 --- src/borders.c | 4 +- src/ewin-ops.c | 68 +++++++++++++++--------------- src/ewins.c | 106 +++++++++++++++++++++++------------------------ src/ewins.h | 8 ++-- src/ewmh.c | 40 +++++++++--------- src/finders.c | 10 ++--- src/focus.c | 24 +++++------ src/gnome.c | 26 ++++++------ src/hints.c | 12 +++--- src/icccm.c | 74 ++++++++++++++++----------------- src/ipc.c | 18 ++++---- src/menus-misc.c | 8 ++-- src/mwm.c | 2 +- src/pager.c | 10 ++--- src/session.c | 2 +- src/snaps.c | 15 ++++--- src/stacking.c | 4 +- src/zoom.c | 8 ++-- 18 files changed, 217 insertions(+), 222 deletions(-) diff --git a/src/borders.c b/src/borders.c index 7bcb8340..6a5ef5cd 100644 --- a/src/borders.c +++ b/src/borders.c @@ -78,7 +78,7 @@ BorderWinpartITclassApply(EWin * ewin, int i, int force) #if 0 /* Debug */ Eprintf("BorderWpITApply: %#lx %#lx %2d %d %s\n", - _EwinGetClientXwin(ewin), EoGetWin(ewin), i, force, + EwinGetClientXwin(ewin), EoGetWin(ewin), i, force, EwinGetName(ewin)); #endif @@ -161,7 +161,7 @@ EwinBorderDraw(EWin * ewin, int do_shape, int do_paint) #if 0 /* Debug */ Eprintf("EwinBorderDraw %#lx %s d=%d s=%d p=%d\n", - _EwinGetClientXwin(ewin), EoGetName(ewin), EoGetDeskNum(ewin), + EwinGetClientXwin(ewin), EoGetName(ewin), EoGetDeskNum(ewin), do_shape, do_paint); #endif diff --git a/src/ewin-ops.c b/src/ewin-ops.c index 5dea0b92..64cd1c13 100644 --- a/src/ewin-ops.c +++ b/src/ewin-ops.c @@ -308,7 +308,7 @@ doEwinMoveResize(EWin * ewin, Desk * dsk, int x, int y, int w, int h, int flags) if (EventDebug(EDBUG_TYPE_MOVERESIZE)) Eprintf("doEwinMoveResize(%d,%d) %#lx f=%x d=%d %d+%d %d*%d %s\n", - call_depth, Mode.mode, _EwinGetClientXwin(ewin), flags, + call_depth, Mode.mode, EwinGetClientXwin(ewin), flags, (dsk) ? (int)dsk->num : -1, x, y, w, h, EwinGetName(ewin)); pdesk = (ewin->o.stacked >= 0) ? EoGetDesk(ewin) : NULL; @@ -472,7 +472,7 @@ doEwinMoveResize(EWin * ewin, Desk * dsk, int x, int y, int w, int h, int flags) EMoveResizeWindow(ewin->win_container, -30, -30, 1, 1); #endif - EMoveResizeWindow(_EwinGetClientWin(ewin), 0, 0, ewin->client.w, + EMoveResizeWindow(EwinGetClientWin(ewin), 0, 0, ewin->client.w, ewin->client.h); EwinBorderCalcSizes(ewin, 0); @@ -850,13 +850,13 @@ EwinInstantShade(EWin * ewin, int force) default: case 0: att.win_gravity = EastGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); EwinBorderMinShadeSize(ewin, &b, &d); w = b; break; case 1: att.win_gravity = WestGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); EwinBorderMinShadeSize(ewin, &b, &d); if (!Mode.wm.startup) x = x + w - b; @@ -864,13 +864,13 @@ EwinInstantShade(EWin * ewin, int force) break; case 2: att.win_gravity = SouthGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); EwinBorderMinShadeSize(ewin, &b, &d); h = d; break; case 3: att.win_gravity = SouthGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); EwinBorderMinShadeSize(ewin, &b, &d); if (!Mode.wm.startup) y = y + h - d; @@ -905,26 +905,26 @@ EwinInstantUnShade(EWin * ewin) default: case 0: att.win_gravity = EastGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); w = ewin->client.w + ewin->border->border.left + ewin->border->border.right; break; case 1: att.win_gravity = WestGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); w = ewin->client.w + ewin->border->border.left + ewin->border->border.right; x = x + EoGetW(ewin) - w; break; case 2: att.win_gravity = SouthGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); h = ewin->client.h + ewin->border->border.top + ewin->border->border.bottom; break; case 3: att.win_gravity = SouthGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); h = ewin->client.h + ewin->border->border.top + ewin->border->border.bottom; y = y + EoGetH(ewin) - h; @@ -933,7 +933,7 @@ EwinInstantUnShade(EWin * ewin) /* Reset gravity */ att.win_gravity = NorthWestGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); ewin->state.shaded = 0; EwinMoveResize(ewin, x, y, ewin->client.w, ewin->client.h); @@ -942,7 +942,7 @@ EwinInstantUnShade(EWin * ewin) #define _EWIN_ADJUST_SHAPE(ewin, xo, yo) \ do { \ EShapeCombineShape(ewin->win_container, ShapeBounding, xo, yo, \ - _EwinGetClientWin(ewin), ShapeBounding, ShapeSet); \ + EwinGetClientWin(ewin), ShapeBounding, ShapeSet); \ ewin->update.shape = 1; \ } while (0) @@ -980,7 +980,7 @@ EwinShade(EWin * ewin) default: case 0: att.win_gravity = EastGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); EwinBorderMinShadeSize(ewin, &b, &c); a = w; if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU)) @@ -1011,7 +1011,7 @@ EwinShade(EWin * ewin) break; case 1: att.win_gravity = WestGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); EwinBorderMinShadeSize(ewin, &b, &c); a = w; c = x + w; @@ -1044,7 +1044,7 @@ EwinShade(EWin * ewin) break; case 2: att.win_gravity = SouthGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); EwinBorderMinShadeSize(ewin, &c, &b); a = h; if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU)) @@ -1075,7 +1075,7 @@ EwinShade(EWin * ewin) break; case 3: att.win_gravity = SouthGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); EwinBorderMinShadeSize(ewin, &c, &b); a = h; c = y + h; @@ -1154,17 +1154,17 @@ EwinUnShade(EWin * ewin) default: case 0: att.win_gravity = EastGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); a = ewin->border->border.left + ewin->border->border.right; b = ewin->client.w + a; ewin->state.shaded = 0; EMoveResizeWindow(ewin->win_container, ewin->border->border.left, ewin->border->border.top, 1, ewin->client.h); - EWindowSync(_EwinGetClientWin(ewin)); /* Gravity - recache */ - EMoveResizeWindow(_EwinGetClientWin(ewin), -ewin->client.w, 0, + EWindowSync(EwinGetClientWin(ewin)); /* Gravity - recache */ + EMoveResizeWindow(EwinGetClientWin(ewin), -ewin->client.w, 0, ewin->client.w, ewin->client.h); - EMapWindow(_EwinGetClientWin(ewin)); + EMapWindow(EwinGetClientWin(ewin)); EMapWindow(ewin->win_container); if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU)) { @@ -1191,7 +1191,7 @@ EwinUnShade(EWin * ewin) break; case 1: att.win_gravity = WestGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); a = ewin->border->border.left + ewin->border->border.right; b = ewin->client.w + a; c = x + w; /* NB! w != a is possible */ @@ -1199,10 +1199,10 @@ EwinUnShade(EWin * ewin) EMoveResizeWindow(ewin->win_container, ewin->border->border.left, ewin->border->border.top, 1, ewin->client.h); - EWindowSync(_EwinGetClientWin(ewin)); /* Gravity - recache */ - EMoveResizeWindow(_EwinGetClientWin(ewin), 0, 0, ewin->client.w, + EWindowSync(EwinGetClientWin(ewin)); /* Gravity - recache */ + EMoveResizeWindow(EwinGetClientWin(ewin), 0, 0, ewin->client.w, ewin->client.h); - EMapWindow(_EwinGetClientWin(ewin)); + EMapWindow(EwinGetClientWin(ewin)); EMapWindow(ewin->win_container); if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU)) { @@ -1230,17 +1230,17 @@ EwinUnShade(EWin * ewin) break; case 2: att.win_gravity = SouthGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); a = ewin->border->border.top + ewin->border->border.bottom; b = ewin->client.h + a; ewin->state.shaded = 0; EMoveResizeWindow(ewin->win_container, ewin->border->border.left, ewin->border->border.top, ewin->client.w, 1); - EWindowSync(_EwinGetClientWin(ewin)); /* Gravity - recache */ - EMoveResizeWindow(_EwinGetClientWin(ewin), 0, 1 - ewin->client.h, + EWindowSync(EwinGetClientWin(ewin)); /* Gravity - recache */ + EMoveResizeWindow(EwinGetClientWin(ewin), 0, 1 - ewin->client.h, ewin->client.w, ewin->client.h); - EMapWindow(_EwinGetClientWin(ewin)); + EMapWindow(EwinGetClientWin(ewin)); EMapWindow(ewin->win_container); if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU)) { @@ -1267,7 +1267,7 @@ EwinUnShade(EWin * ewin) break; case 3: att.win_gravity = SouthGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); a = ewin->border->border.top + ewin->border->border.bottom; b = ewin->client.h + a; c = y + h; /* NB! h != a is possible */ @@ -1275,10 +1275,10 @@ EwinUnShade(EWin * ewin) EMoveResizeWindow(ewin->win_container, ewin->border->border.left, ewin->border->border.top, ewin->client.w, 1); - EWindowSync(_EwinGetClientWin(ewin)); /* Gravity - recache */ - EMoveResizeWindow(_EwinGetClientWin(ewin), 0, 1 - ewin->client.h, + EWindowSync(EwinGetClientWin(ewin)); /* Gravity - recache */ + EMoveResizeWindow(EwinGetClientWin(ewin), 0, 1 - ewin->client.h, ewin->client.w, ewin->client.h); - EMapWindow(_EwinGetClientWin(ewin)); + EMapWindow(EwinGetClientWin(ewin)); EMapWindow(ewin->win_container); if ((Conf.animate_shading) || (ewin->type == EWIN_TYPE_MENU)) { @@ -1308,9 +1308,9 @@ EwinUnShade(EWin * ewin) /* Reset gravity */ att.win_gravity = NorthWestGravity; - EChangeWindowAttributes(_EwinGetClientWin(ewin), CWWinGravity, &att); + EChangeWindowAttributes(EwinGetClientWin(ewin), CWWinGravity, &att); - EMoveResizeWindow(_EwinGetClientWin(ewin), 0, 0, ewin->client.w, + EMoveResizeWindow(EwinGetClientWin(ewin), 0, 0, ewin->client.w, ewin->client.h); EMoveResizeWindow(ewin->win_container, ewin->border->border.left, ewin->border->border.top, ewin->client.w, ewin->client.h); diff --git a/src/ewins.c b/src/ewins.c index c213c510..e3181de1 100644 --- a/src/ewins.c +++ b/src/ewins.c @@ -67,7 +67,7 @@ EwinEventsConfigure(EWin * ewin, int mode) emask = (mode) ? ~((long)0) : ~(EnterWindowMask | LeaveWindowMask); ESelectInput(EoGetWin(ewin), EWIN_TOP_EVENT_MASK & emask); - ESelectInput(_EwinGetClientWin(ewin), ewin->client.event_mask & emask); + ESelectInput(EwinGetClientWin(ewin), ewin->client.event_mask & emask); EwinBorderEventsConfigure(ewin, mode); } @@ -148,7 +148,7 @@ EwinGetAttributes(EWin * ewin, Win win, Window xwin) if (EventDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap get attr %#lx: %4d+%4d %4dx%4d: %s\n", - _EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, + EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); return 0; @@ -158,7 +158,7 @@ static void EwinGetHints(EWin * ewin) { if (EventDebug(EDBUG_TYPE_EWINS)) - Eprintf("EwinGetHints %#lx\n", _EwinGetClientXwin(ewin)); + Eprintf("EwinGetHints %#lx\n", EwinGetClientXwin(ewin)); ICCCM_GetTitle(ewin, 0); if (EwinIsInternal(ewin)) @@ -197,7 +197,7 @@ EwinManage(EWin * ewin) frame = ECreateObjectWindow(VRoot.win, ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, 0, 1, - _EwinGetClientWin(ewin), &argb); + EwinGetClientWin(ewin), &argb); ewin->o.argb = argb; ewin->win_container = ECreateWindow(frame, 0, 0, ewin->client.w, ewin->client.h, 0); @@ -212,7 +212,7 @@ EwinManage(EWin * ewin) EwinHandleEventsToplevel, ewin); EventCallbackRegister(ewin->win_container, 0, EwinHandleEventsContainer, ewin); - EventCallbackRegister(_EwinGetClientWin(ewin), 0, + EventCallbackRegister(EwinGetClientWin(ewin), 0, EwinHandleEventsClient, ewin); } @@ -230,20 +230,20 @@ EwinManage(EWin * ewin) if (EventDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinManage %#lx frame=%#lx cont=%#lx st=%d\n", - _EwinGetClientXwin(ewin), EoGetXwin(ewin), - _EwinGetContainerXwin(ewin), ewin->state.state); + EwinGetClientXwin(ewin), EoGetXwin(ewin), + EwinGetContainerXwin(ewin), ewin->state.state); if (!EwinIsInternal(ewin)) { - XShapeSelectInput(disp, _EwinGetClientXwin(ewin), ShapeNotifyMask); - ESetWindowBorderWidth(_EwinGetClientWin(ewin), 0); + XShapeSelectInput(disp, EwinGetClientXwin(ewin), ShapeNotifyMask); + ESetWindowBorderWidth(EwinGetClientWin(ewin), 0); ewin->client.bw = 0; } ICCCM_AdoptStart(ewin); /* We must reparent after getting original window position */ - EReparentWindow(_EwinGetClientWin(ewin), ewin->win_container, 0, 0); + EReparentWindow(EwinGetClientWin(ewin), ewin->win_container, 0, 0); EwinUpdateShapeInfo(ewin); @@ -314,7 +314,7 @@ EwinConfigure(EWin * ewin) HintsSetClientList(); if (EventDebug(EDBUG_TYPE_EWINS)) - Eprintf("EwinConfigure %#lx st=%d: %s\n", _EwinGetClientXwin(ewin), + Eprintf("EwinConfigure %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); } @@ -334,16 +334,16 @@ EwinDestroy(EWin * ewin) return; if (EventDebug(EDBUG_TYPE_EWINS)) - Eprintf("EwinDestroy %#lx st=%d: %s\n", _EwinGetClientXwin(ewin), + Eprintf("EwinDestroy %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); EventCallbackUnregister(EoGetWin(ewin), 0, EwinHandleEventsToplevel, ewin); EventCallbackUnregister(ewin->win_container, 0, EwinHandleEventsContainer, ewin); - EventCallbackUnregister(_EwinGetClientWin(ewin), 0, EwinHandleEventsClient, + EventCallbackUnregister(EwinGetClientWin(ewin), 0, EwinHandleEventsClient, ewin); if (!EwinIsInternal(ewin)) - EUnregisterWindow(_EwinGetClientWin(ewin)); + EUnregisterWindow(EwinGetClientWin(ewin)); SnapshotEwinUnmatch(ewin); @@ -515,7 +515,7 @@ GetContextEwin(void) done: #if 0 - Eprintf("GetContextEwin %#lx %s\n", _EwinGetClientXwin(ewin), + Eprintf("GetContextEwin %#lx %s\n", EwinGetClientXwin(ewin), EwinGetName(ewin)); #endif return ewin; @@ -527,7 +527,7 @@ SetContextEwin(EWin * ewin) if (ewin && ewin->type == EWIN_TYPE_MENU) return; #if 0 - Eprintf("SetContextEwin %#lx %s\n", _EwinGetClientXwin(ewin), + Eprintf("SetContextEwin %#lx %s\n", EwinGetClientXwin(ewin), EwinGetName(ewin)); #endif Mode.context_ewin = ewin; @@ -601,13 +601,12 @@ void EwinUpdateShapeInfo(EWin * ewin) { EGrabServer(); - ewin->state.shaped = - EShapeCopy(ewin->win_container, _EwinGetClientWin(ewin)); + ewin->state.shaped = EShapeCopy(ewin->win_container, EwinGetClientWin(ewin)); EUngrabServer(); if (EventDebug(EX_EVENT_SHAPE_NOTIFY)) Eprintf("EwinUpdateShapeInfo %#lx cont=%#lx shaped=%d\n", - _EwinGetClientXwin(ewin), _EwinGetContainerXwin(ewin), + EwinGetClientXwin(ewin), EwinGetContainerXwin(ewin), ewin->state.shaped); } @@ -625,7 +624,7 @@ EwinPropagateShapes(EWin * ewin) if (EventDebug(EX_EVENT_SHAPE_NOTIFY)) Eprintf("EwinPropagateShapes %#lx frame=%#lx shaped=%d\n", - _EwinGetClientXwin(ewin), EoGetXwin(ewin), ewin->state.shaped); + EwinGetClientXwin(ewin), EoGetXwin(ewin), ewin->state.shaped); EoShapeUpdate(ewin, 1); ewin->update.shape = 0; @@ -710,7 +709,7 @@ AddToFamily(EWin * ewin, Window xwin) /* Don't treat this as a normal transient */ ewin->icccm.transient = -1; } - else if (ewin->icccm.transient_for == _EwinGetClientXwin(ewin)) + else if (ewin->icccm.transient_for == EwinGetClientXwin(ewin)) { /* Some apps actually do this. Why? */ ewin->icccm.transient = 0; @@ -1008,24 +1007,23 @@ EwinWithdraw(EWin * ewin, Win to) /* Only external clients should go here */ if (EventDebug(EDBUG_TYPE_EWINS)) - Eprintf("EwinWithdraw %#lx st=%d: %s\n", _EwinGetClientXwin(ewin), + Eprintf("EwinWithdraw %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); EGrabServer(); - ESelectInput(_EwinGetClientWin(ewin), NoEventMask); - XShapeSelectInput(disp, _EwinGetClientXwin(ewin), NoEventMask); + ESelectInput(EwinGetClientWin(ewin), NoEventMask); + XShapeSelectInput(disp, EwinGetClientXwin(ewin), NoEventMask); - if (EXWindowGetParent(_EwinGetClientXwin(ewin)) == - _EwinGetContainerXwin(ewin)) + if (EXWindowGetParent(EwinGetClientXwin(ewin)) == EwinGetContainerXwin(ewin)) { /* Park the client window on the new root */ x = ewin->client.x; y = ewin->client.y; - ETranslateCoordinates(_EwinGetClientWin(ewin), VRoot.win, + ETranslateCoordinates(EwinGetClientWin(ewin), VRoot.win, -ewin->border->border.left, -ewin->border->border.top, &x, &y, &win); - EReparentWindow(_EwinGetClientWin(ewin), to, x, y); + EReparentWindow(EwinGetClientWin(ewin), to, x, y); HintsDelWindowHints(ewin); } ICCCM_Withdraw(ewin); @@ -1046,9 +1044,8 @@ EwinEventMapRequest(EWin * ewin, Window win) else { Eprintf("AddToFamily: Already managing %s %#lx\n", "A", - _EwinGetClientXwin(ewin)); - EReparentWindow(_EwinGetClientWin(ewin), ewin->win_container, 0, - 0); + EwinGetClientXwin(ewin)); + EReparentWindow(EwinGetClientWin(ewin), ewin->win_container, 0, 0); } } else @@ -1060,9 +1057,8 @@ EwinEventMapRequest(EWin * ewin, Window win) if (ewin) { Eprintf("AddToFamily: Already managing %s %#lx\n", "B", - _EwinGetClientXwin(ewin)); - EReparentWindow(_EwinGetClientWin(ewin), ewin->win_container, 0, - 0); + EwinGetClientXwin(ewin)); + EReparentWindow(EwinGetClientWin(ewin), ewin->win_container, 0, 0); EwinShow(ewin); } else @@ -1074,7 +1070,7 @@ static void EwinEventDestroy(EWin * ewin) { if (EventDebug(EDBUG_TYPE_EWINS)) - Eprintf("EwinEventDestroy %#lx st=%d: %s\n", _EwinGetClientXwin(ewin), + Eprintf("EwinEventDestroy %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); EwinDestroy(ewin); @@ -1091,12 +1087,12 @@ EwinEventReparent(EWin * ewin) if (EoIsGone(ewin)) parent = None; else - parent = EXWindowGetParent(_EwinGetClientXwin(ewin)); + parent = EXWindowGetParent(EwinGetClientXwin(ewin)); if (EventDebug(EDBUG_TYPE_EWINS)) Eprintf("EwinEventReparent %#lx st=%d parent=%#lx: %s\n", - _EwinGetClientXwin(ewin), ewin->state.state, parent, + EwinGetClientXwin(ewin), ewin->state.state, parent, EwinGetName(ewin)); - if (parent != _EwinGetContainerXwin(ewin)) + if (parent != EwinGetContainerXwin(ewin)) EwinDestroy(ewin); EUngrabServer(); @@ -1110,7 +1106,7 @@ EwinEventMap(EWin * ewin) ewin->state.state = EWIN_STATE_MAPPED; if (EventDebug(EDBUG_TYPE_EWINS)) - Eprintf("EwinEventMap %#lx st=%d: %s\n", _EwinGetClientXwin(ewin), + Eprintf("EwinEventMap %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); /* If first time we may want to focus it (unless during startup) */ @@ -1126,7 +1122,7 @@ static void EwinEventUnmap(EWin * ewin) { if (EventDebug(EDBUG_TYPE_EWINS)) - Eprintf("EwinEventUnmap %#lx st=%d: %s\n", _EwinGetClientXwin(ewin), + Eprintf("EwinEventUnmap %#lx st=%d: %s\n", EwinGetClientXwin(ewin), ewin->state.state, EwinGetName(ewin)); if (ewin->state.state == EWIN_STATE_WITHDRAWN) @@ -1138,7 +1134,7 @@ EwinEventUnmap(EWin * ewin) ewin->state.state = EWIN_STATE_ICONIC; EwinUnmap1(ewin); - EWindowSetMapped(_EwinGetClientWin(ewin), 0); + EWindowSetMapped(EwinGetClientWin(ewin), 0); EoUnmap(ewin); EwinUnmap2(ewin); @@ -1296,7 +1292,7 @@ EwinEventShapeChange(EWin * ewin, XEvent * ev) #define se ((XShapeEvent *)ev) if (EventDebug(EX_EVENT_SHAPE_NOTIFY)) Eprintf("EwinEventShapeChange %#lx %s: state.shaped=%d ev->shaped=%d\n", - _EwinGetClientXwin(ewin), EoGetName(ewin), ewin->state.shaped, + EwinGetClientXwin(ewin), EoGetName(ewin), ewin->state.shaped, se->shaped); if (!se->shaped && !ewin->state.shaped) return; @@ -1333,7 +1329,7 @@ EwinRaise(EWin * ewin) if (EventDebug(EDBUG_TYPE_RAISELOWER)) Eprintf("EwinRaise(%d) %#lx %s n=%d\n", call_depth, - _EwinGetClientXwin(ewin), EwinGetName(ewin), num); + EwinGetClientXwin(ewin), EwinGetName(ewin), num); if (num == 0) /* Quit if stacking is unchanged */ goto done; @@ -1366,7 +1362,7 @@ EwinLower(EWin * ewin) if (EventDebug(EDBUG_TYPE_RAISELOWER)) Eprintf("EwinLower(%d) %#lx %s n=%d\n", call_depth, - _EwinGetClientXwin(ewin), EwinGetName(ewin), num); + EwinGetClientXwin(ewin), EwinGetName(ewin), num); if (num == 0) /* Quit if stacking is unchanged */ goto done; @@ -1390,13 +1386,13 @@ EwinShow(EWin * ewin) if (EoIsShown(ewin)) return; - if (_EwinGetClientWin(ewin)) + if (EwinGetClientWin(ewin)) { #if 0 /* FIXME - Why? */ if (ewin->state.shaded) EMoveResizeWindow(ewin->win_container, -30, -30, 1, 1); #endif - EMapWindow(_EwinGetClientWin(ewin)); + EMapWindow(EwinGetClientWin(ewin)); } if (ewin->update.shape) @@ -1422,7 +1418,7 @@ EwinHide(EWin * ewin) EwinUnmap1(ewin); - EUnmapWindow(_EwinGetClientWin(ewin)); + EUnmapWindow(EwinGetClientWin(ewin)); EoUnmap(ewin); EwinUnmap2(ewin); @@ -1444,7 +1440,7 @@ EwinKill(EWin * ewin) if (EwinIsInternal(ewin)) return; - XKillClient(disp, _EwinGetClientXwin(ewin)); + XKillClient(disp, EwinGetClientXwin(ewin)); #if 0 /* Wait for unmap/destroy for now */ EwinUnmap1(ewin); @@ -1943,7 +1939,7 @@ EwinsSetFree(void) /* This makes E determine the client window stacking at exit */ EwinInstantUnShade(ewin); - EReparentWindow(_EwinGetClientWin(ewin), RRoot.win, + EReparentWindow(EwinGetClientWin(ewin), RRoot.win, ewin->client.x, ewin->client.y); } } @@ -2002,7 +1998,7 @@ EwinHandleEventsToplevel(Win win __UNUSED__, XEvent * ev, void *prm) default: #if DEBUG_EWIN_EVENTS Eprintf("EwinHandleEventsToplevel: type=%2d win=%#lx: %s\n", - ev->type, _EwinGetClientXwin(ewin), EwinGetName(ewin)); + ev->type, EwinGetClientXwin(ewin), EwinGetName(ewin)); #endif break; } @@ -2015,12 +2011,12 @@ EwinHandleEventsContainer(Win win __UNUSED__, XEvent * ev, void *prm) #if 0 Eprintf("EwinHandleEventsContainer: type=%2d win=%#lx: %s\n", - ev->type, _EwinGetClientXwin(ewin), EwinGetName(ewin)); + ev->type, EwinGetClientXwin(ewin), EwinGetName(ewin)); #endif switch (ev->type) { case ButtonPress: - FocusHandleClick(ewin, _EwinGetContainerWin(ewin)); + FocusHandleClick(ewin, EwinGetContainerWin(ewin)); break; case MapRequest: EwinEventMapRequest(ewin, ev->xmaprequest.window); @@ -2046,7 +2042,7 @@ EwinHandleEventsContainer(Win win __UNUSED__, XEvent * ev, void *prm) if (ewin->state.state == EWIN_STATE_NEW) { Eprintf("EwinEventUnmap %#lx: Ignoring bogus Unmap event\n", - _EwinGetClientXwin(ewin)); + EwinGetClientXwin(ewin)); break; } #endif @@ -2070,7 +2066,7 @@ EwinHandleEventsContainer(Win win __UNUSED__, XEvent * ev, void *prm) default: Eprintf("EwinHandleEventsContainer: type=%2d win=%#lx: %s\n", - ev->type, _EwinGetClientXwin(ewin), EwinGetName(ewin)); + ev->type, EwinGetClientXwin(ewin), EwinGetName(ewin)); break; } } @@ -2118,7 +2114,7 @@ EwinHandleEventsClient(Win win __UNUSED__, XEvent * ev, void *prm) default: #if DEBUG_EWIN_EVENTS Eprintf("EwinHandleEventsClient: type=%2d win=%#lx: %s\n", - ev->type, _EwinGetClientXwin(ewin), EwinGetName(ewin)); + ev->type, EwinGetClientXwin(ewin), EwinGetName(ewin)); #endif break; } diff --git a/src/ewins.h b/src/ewins.h index e4d19940..d3700679 100644 --- a/src/ewins.h +++ b/src/ewins.h @@ -275,10 +275,10 @@ struct _ewin #define EwinIsWindowGroupLeader(ewin) ((ewin)->icccm.is_group_leader) #define EwinGetWindowGroup(ewin) ((ewin)->icccm.group) -#define _EwinGetClientWin(ewin) ((ewin)->client.win) -#define _EwinGetClientXwin(ewin) Xwin((ewin)->client.win) -#define _EwinGetContainerWin(ewin) ((ewin)->win_container) -#define _EwinGetContainerXwin(ewin) Xwin((ewin)->win_container) +#define EwinGetClientWin(ewin) ((ewin)->client.win) +#define EwinGetClientXwin(ewin) Xwin((ewin)->client.win) +#define EwinGetContainerWin(ewin) ((ewin)->win_container) +#define EwinGetContainerXwin(ewin) Xwin((ewin)->win_container) /* ewins.c */ #define EWIN_CHANGE_NAME (1<<0) diff --git a/src/ewmh.c b/src/ewmh.c index 322dfa5f..e2182240 100644 --- a/src/ewmh.c +++ b/src/ewmh.c @@ -303,7 +303,7 @@ EWMH_SetClientList(void) { wl = Emalloc(num * sizeof(Ecore_X_Window)); for (i = 0; i < num; i++) - wl[i] = _EwinGetClientXwin(lst[i]); + wl[i] = EwinGetClientXwin(lst[i]); ecore_x_netwm_client_list_set(VRoot.xwin, wl, num); Efree(wl); } @@ -326,7 +326,7 @@ EWMH_SetClientStacking(void) { wl = Emalloc(num * sizeof(Ecore_X_Window)); for (i = 0; i < num; i++) - wl[i] = _EwinGetClientXwin(lst[num - i - 1]); + wl[i] = EwinGetClientXwin(lst[num - i - 1]); ecore_x_netwm_client_list_stacking_set(VRoot.xwin, wl, num); Efree(wl); } @@ -371,7 +371,7 @@ EWMH_SetWindowDesktop(const EWin * ewin) val = 0xFFFFFFFF; else val = EoGetDeskNum(ewin); - ecore_x_netwm_desktop_set(_EwinGetClientXwin(ewin), val); + ecore_x_netwm_desktop_set(EwinGetClientXwin(ewin), val); } void @@ -412,7 +412,7 @@ EWMH_SetWindowState(const EWin * ewin) ECORE_X_ATOM_NET_WM_STATE_DEMANDS_ATTENTION, ewin->state.attention); - ecore_x_window_prop_atom_set(_EwinGetClientXwin(ewin), + ecore_x_window_prop_atom_set(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_STATE, atom_list, atom_count); } @@ -435,14 +435,14 @@ EWMH_SetWindowBorder(const EWin * ewin) else val[0] = val[1] = val[2] = val[3] = 0; - ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), + ecore_x_window_prop_card32_set(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_FRAME_EXTENTS, val, 4); } void EWMH_SetWindowOpacity(const EWin * ewin) { - ecore_x_netwm_opacity_set(_EwinGetClientXwin(ewin), ewin->ewmh.opacity); + ecore_x_netwm_opacity_set(EwinGetClientXwin(ewin), ewin->ewmh.opacity); ecore_x_netwm_opacity_set(EoGetXwin(ewin), ewin->ewmh.opacity); } @@ -457,7 +457,7 @@ EWMH_GetWindowName(EWin * ewin) _EFREE(ewin->ewmh.wm_name); - ecore_x_netwm_name_get(_EwinGetClientXwin(ewin), &val); + ecore_x_netwm_name_get(EwinGetClientXwin(ewin), &val); if (!val) return; ewin->ewmh.wm_name = EstrUtf82Int(val, 0); @@ -473,7 +473,7 @@ EWMH_GetWindowIconName(EWin * ewin) _EFREE(ewin->ewmh.wm_icon_name); - ecore_x_netwm_icon_name_get(_EwinGetClientXwin(ewin), &val); + ecore_x_netwm_icon_name_get(EwinGetClientXwin(ewin), &val); if (!val) return; ewin->ewmh.wm_icon_name = EstrUtf82Int(val, 0); @@ -488,7 +488,7 @@ EWMH_GetWindowDesktop(EWin * ewin) int num; unsigned int desk; - num = ecore_x_netwm_desktop_get(_EwinGetClientXwin(ewin), &desk); + num = ecore_x_netwm_desktop_get(EwinGetClientXwin(ewin), &desk); if (num <= 0) return; @@ -512,7 +512,7 @@ EWMH_GetWindowState(EWin * ewin) Ecore_X_Atom *p_atoms, atom; int i, n_atoms; - n_atoms = ecore_x_window_prop_atom_list_get(_EwinGetClientXwin(ewin), + n_atoms = ecore_x_window_prop_atom_list_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_STATE, &p_atoms); if (n_atoms <= 0) @@ -564,7 +564,7 @@ EWMH_GetWindowType(EWin * ewin) Ecore_X_Atom *p_atoms, atom; int n_atoms; - n_atoms = ecore_x_window_prop_atom_list_get(_EwinGetClientXwin(ewin), + n_atoms = ecore_x_window_prop_atom_list_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_WINDOW_TYPE, &p_atoms); if (n_atoms <= 0) @@ -631,7 +631,7 @@ EWMH_GetWindowIcons(EWin * ewin) ewin->ewmh.wm_icon = NULL; } - num = ecore_x_window_prop_card32_list_get(_EwinGetClientXwin(ewin), + num = ecore_x_window_prop_card32_list_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_ICON, &val); ewin->ewmh.wm_icon_len = num; if (num <= 0) @@ -658,7 +658,7 @@ EWMH_GetWindowUserTime(EWin * ewin) int num; unsigned int ts; - num = ecore_x_netwm_user_time_get(_EwinGetClientXwin(ewin), &ts); + num = ecore_x_netwm_user_time_get(EwinGetClientXwin(ewin), &ts); if (num <= 0) return; @@ -674,7 +674,7 @@ EWMH_GetWindowMisc(EWin * ewin) int num; Ecore_X_Window win; - num = ecore_x_window_prop_window_get(_EwinGetClientXwin(ewin), + num = ecore_x_window_prop_window_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK, &win, 1); if (num <= 0) @@ -690,7 +690,7 @@ EWMH_GetWindowOpacity(EWin * ewin) int num; unsigned int opacity; - num = ecore_x_netwm_opacity_get(_EwinGetClientXwin(ewin), &opacity); + num = ecore_x_netwm_opacity_get(EwinGetClientXwin(ewin), &opacity); if (num <= 0) return; @@ -708,12 +708,12 @@ EWMH_GetWindowStrut(EWin * ewin) int num; unsigned int val[12]; - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_STRUT_PARTIAL, val, 12); if (num < 4) - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_STRUT, val, 4); if (num < 4) return; @@ -764,7 +764,7 @@ EWMH_SetWindowActions(const EWin * ewin) if (!ewin->state.inhibit_close) aa[num++] = ECORE_X_ATOM_NET_WM_ACTION_CLOSE; - ecore_x_window_prop_atom_set(_EwinGetClientXwin(ewin), + ecore_x_window_prop_atom_set(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS, aa, num); } @@ -789,8 +789,8 @@ EWMH_GetWindowHints(EWin * ewin) void EWMH_DelWindowHints(const EWin * ewin) { - XDeleteProperty(disp, _EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_DESKTOP); - XDeleteProperty(disp, _EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_STATE); + XDeleteProperty(disp, EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_DESKTOP); + XDeleteProperty(disp, EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_STATE); } /* diff --git a/src/finders.c b/src/finders.c index 0eb85a81..85078427 100644 --- a/src/finders.c +++ b/src/finders.c @@ -64,7 +64,7 @@ EwinFindByClient(Window win) ewins = EwinListGetAll(&num); for (i = 0; i < num; i++) { - if (win == _EwinGetClientXwin(ewins[i])) + if (win == EwinGetClientXwin(ewins[i])) return ewins[i]; } return NULL; @@ -79,8 +79,8 @@ EwinFindByChildren(Window win) ewins = EwinListGetAll(&num); for (i = 0; i < num; i++) { - if ((win == _EwinGetClientXwin(ewins[i])) || - (win == _EwinGetContainerXwin(ewins[i]))) + if ((win == EwinGetClientXwin(ewins[i])) || + (win == EwinGetContainerXwin(ewins[i]))) { return ewins[i]; } @@ -214,7 +214,7 @@ EwinListTransients(const EWin * ewin, int *num, int group) if (ew == ewin) continue; - if (EwinGetTransientFor(ew) == _EwinGetClientXwin(ewin)) + if (EwinGetTransientFor(ew) == EwinGetClientXwin(ewin)) { lst = Erealloc(lst, (j + 1) * sizeof(EWin *)); lst[j++] = ew; @@ -271,7 +271,7 @@ EwinListTransientFor(const EWin * ewin, int *num) continue; /* Regular parent or if root trans, top level group members */ - if ((EwinGetTransientFor(ewin) == _EwinGetClientXwin(ew)) || + if ((EwinGetTransientFor(ewin) == EwinGetClientXwin(ew)) || (!EwinIsTransient(ew) && EwinGetTransientFor(ewin) == VRoot.xwin && EwinGetWindowGroup(ew) == EwinGetWindowGroup(ewin))) diff --git a/src/focus.c b/src/focus.c index 456e4099..944f6543 100644 --- a/src/focus.c +++ b/src/focus.c @@ -68,7 +68,7 @@ FocusEwinValid(EWin * ewin, int want_on_screen, int click, int want_visible) #if 0 Eprintf("FocusEwinValid %#lx %s: st=%d sh=%d inh=%d cl=%d(%d) vis=%d(%d)\n", - _EwinGetClientXwin(ewin), EwinGetName(ewin), + EwinGetClientXwin(ewin), EwinGetName(ewin), ewin->state.state, EoIsShown(ewin), ewin->state.inhibit_focus, click, ewin->props.focusclick, want_visible, ewin->state.visibility); #endif @@ -217,11 +217,11 @@ FocusEwinSetGrabs(EWin * ewin) { if (!ewin->state.click_grab_isset) { - GrabButtonSet(AnyButton, AnyModifier, _EwinGetContainerWin(ewin), + GrabButtonSet(AnyButton, AnyModifier, EwinGetContainerWin(ewin), ButtonPressMask, ECSR_PGRAB, 1); if (EventDebug(EDBUG_TYPE_GRABS)) Eprintf("FocusEwinSetGrabs: %#lx set %s\n", - _EwinGetClientXwin(ewin), EwinGetName(ewin)); + EwinGetClientXwin(ewin), EwinGetName(ewin)); ewin->state.click_grab_isset = 1; } } @@ -230,10 +230,10 @@ FocusEwinSetGrabs(EWin * ewin) if (ewin->state.click_grab_isset) { GrabButtonRelease(AnyButton, AnyModifier, - _EwinGetContainerWin(ewin)); + EwinGetContainerWin(ewin)); if (EventDebug(EDBUG_TYPE_GRABS)) Eprintf("FocusEwinSetGrabs: %#lx unset %s\n", - _EwinGetClientXwin(ewin), EwinGetName(ewin)); + EwinGetClientXwin(ewin), EwinGetName(ewin)); ewin->state.click_grab_isset = 0; } } @@ -290,7 +290,7 @@ doFocusToEwin(EWin * ewin, int why) if (EventDebug(EDBUG_TYPE_FOCUS)) Eprintf("doFocusToEWin %#lx %s why=%d\n", - (ewin) ? _EwinGetClientXwin(ewin) : 0, + (ewin) ? EwinGetClientXwin(ewin) : 0, (ewin) ? EwinGetName(ewin) : "None", why); switch (why) @@ -390,7 +390,7 @@ doFocusToEwin(EWin * ewin, int why) if (Conf.focus.mode != MODE_FOCUS_CLICK) DoIn("AUTORAISE_TIMEOUT", 0.001 * Conf.autoraise.delay, - AutoraiseTimeout, _EwinGetClientXwin(ewin), NULL); + AutoraiseTimeout, EwinGetClientXwin(ewin), NULL); } if (do_raise) @@ -409,7 +409,7 @@ doFocusToEwin(EWin * ewin, int why) { case FOCUS_PREV: DoIn("REVERSE_FOCUS_TIMEOUT", 0.5, ReverseTimeout, - _EwinGetClientXwin(ewin), NULL); + EwinGetClientXwin(ewin), NULL); break; case FOCUS_DESK_ENTER: if (Conf.focus.mode == MODE_FOCUS_CLICK) @@ -453,7 +453,7 @@ FocusToEWin(EWin * ewin, int why) { if (EventDebug(EDBUG_TYPE_FOCUS)) Eprintf("FocusToEWin(%d) %#lx %s why=%d\n", focus_inhibit, - (ewin) ? _EwinGetClientXwin(ewin) : 0, + (ewin) ? EwinGetClientXwin(ewin) : 0, (ewin) ? EwinGetName(ewin) : "None", why); switch (why) @@ -618,8 +618,8 @@ FocusHandleClick(EWin * ewin, Win win) /* Allow click to pass thorugh */ if (EventDebug(EDBUG_TYPE_GRABS)) Eprintf("FocusHandleClick %#lx %#lx\n", Xwin(win), - _EwinGetContainerXwin(ewin)); - if (win == _EwinGetContainerWin(ewin)) + EwinGetContainerXwin(ewin)); + if (win == EwinGetContainerWin(ewin)) { ESync(); XAllowEvents(disp, ReplayPointer, CurrentTime); @@ -904,7 +904,7 @@ FocusIpc(const char *params, Client * c __UNUSED__) ewin = GetFocusEwin(); if (ewin) - IpcPrintf("Focused: %#lx\n", _EwinGetClientXwin(ewin)); + IpcPrintf("Focused: %#lx\n", EwinGetClientXwin(ewin)); else IpcPrintf("Focused: none\n"); } diff --git a/src/gnome.c b/src/gnome.c index fd0131f3..ebc1c928 100644 --- a/src/gnome.c +++ b/src/gnome.c @@ -303,7 +303,7 @@ GNOME_GetHintIcons(EWin * ewin, Atom atom_change) if ((atom_change) && (atom_change != atom_get)) return; - num = ecore_x_window_prop_xid_list_get(_EwinGetClientXwin(ewin), atom_get, + num = ecore_x_window_prop_xid_list_get(EwinGetClientXwin(ewin), atom_get, XA_PIXMAP, &plst); if (num < 2) return; @@ -332,7 +332,7 @@ GNOME_GetHintLayer(EWin * ewin, Atom atom_change) if ((atom_change) && (atom_change != atom_get)) return; - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), atom_get, + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), atom_get, &layer, 1); if (num <= 0) return; @@ -356,7 +356,7 @@ GNOME_GetHintState(EWin * ewin, Atom atom_change) if ((atom_change) && (atom_change != atom_get)) return; - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), atom_get, + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), atom_get, &flags, 1); if (num <= 0) return; @@ -389,7 +389,7 @@ GNOME_GetHintAppState(EWin * ewin, Atom atom_change) if ((atom_change) && (atom_change != atom_get)) return; - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), atom_get, + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), atom_get, &flags, 1); if (num <= 0) return; @@ -411,7 +411,7 @@ GNOME_GetHintDesktop(EWin * ewin, Atom atom_change) if ((atom_change) && (atom_change != atom_get)) return; - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), atom_get, + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), atom_get, &desk, 1); if (num <= 0) return; @@ -435,7 +435,7 @@ GNOME_GetHint(EWin * ewin, Atom atom_change) if ((atom_change) && (atom_change != atom_get)) return; - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), atom_get, + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), atom_get, &flags, 1); if (num <= 0) return; @@ -469,7 +469,7 @@ GNOME_SetHint(const EWin * ewin) val |= WIN_STATE_SHADED; if (EwinInhGetUser(ewin, move)) val |= WIN_STATE_FIXED_POSITION; - ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), atom_set, &val, 1); + ecore_x_window_prop_card32_set(EwinGetClientXwin(ewin), atom_set, &val, 1); } void @@ -484,7 +484,7 @@ GNOME_SetEwinArea(const EWin * ewin) atom_set = XInternAtom(disp, XA_WIN_AREA, False); val[0] = ewin->area_x; val[1] = ewin->area_y; - ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), atom_set, val, 2); + ecore_x_window_prop_card32_set(EwinGetClientXwin(ewin), atom_set, val, 2); } void @@ -498,7 +498,7 @@ GNOME_SetEwinDesk(const EWin * ewin) if (!atom_set) atom_set = XInternAtom(disp, XA_WIN_WORKSPACE, False); val = EoGetDeskNum(ewin); - ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), atom_set, &val, 1); + ecore_x_window_prop_card32_set(EwinGetClientXwin(ewin), atom_set, &val, 1); } #if 0 /* Does nothing */ @@ -517,7 +517,7 @@ GNOME_GetExpandedSize(EWin * ewin, Atom atom_change) if ((atom_change) && (atom_change != atom_get)) return; - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), atom_get, + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), atom_get, exp, 4); if (num >= 4) { @@ -668,7 +668,7 @@ GNOME_SetClientList(void) for (i = 0; i < num; i++) { if (!lst[i]->props.skip_ext_task && !EwinIsTransientChild(lst[i])) - wl[j++] = _EwinGetClientXwin(lst[i]); + wl[j++] = EwinGetClientXwin(lst[i]); } } ecore_x_window_prop_card32_set(VRoot.xwin, atom_set, wl, j); @@ -706,7 +706,7 @@ GNOME_DelHints(const EWin * ewin) atom_get[5] = XInternAtom(disp, XA_WIN_AREA, False); } - win = _EwinGetClientXwin(ewin); + win = EwinGetClientXwin(ewin); XDeleteProperty(disp, win, atom_get[0]); XDeleteProperty(disp, win, atom_get[1]); XDeleteProperty(disp, win, atom_get[2]); @@ -783,7 +783,7 @@ GNOME_ProcessClientMessage(XClientMessageEvent * event) val = event->data.l[0]; EoSetLayer(ewin, val); - ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), a4, + ecore_x_window_prop_card32_set(EwinGetClientXwin(ewin), a4, &val, 1); EwinRaise(ewin); } diff --git a/src/hints.c b/src/hints.c index 834ead8c..5cc4b398 100644 --- a/src/hints.c +++ b/src/hints.c @@ -343,15 +343,15 @@ EHintsSetInfo(const EWin * ewin) c[6] = ewin->lh; c[7] = ewin->ll; - ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), ENL_WIN_DATA, + ecore_x_window_prop_card32_set(EwinGetClientXwin(ewin), ENL_WIN_DATA, (unsigned int *)c, ENL_DATA_ITEMS); - ecore_x_window_prop_string_set(_EwinGetClientXwin(ewin), ENL_WIN_BORDER, + ecore_x_window_prop_string_set(EwinGetClientXwin(ewin), ENL_WIN_BORDER, ewin->normal_border->name); if (EventDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap set einf %#lx: %4d+%4d %4dx%4d: %s\n", - _EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, + EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); } @@ -366,7 +366,7 @@ EHintsGetInfo(EWin * ewin) if (EwinIsInternal(ewin)) return; - num = ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), ENL_WIN_DATA, + num = ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), ENL_WIN_DATA, (unsigned int *)c, ENL_DATA_ITEMS + 1); if (num != ENL_DATA_ITEMS) return; @@ -390,14 +390,14 @@ EHintsGetInfo(EWin * ewin) ewin->ll = c[7]; str = - ecore_x_window_prop_string_get(_EwinGetClientXwin(ewin), ENL_WIN_BORDER); + ecore_x_window_prop_string_get(EwinGetClientXwin(ewin), ENL_WIN_BORDER); if (str) EwinSetBorderByName(ewin, str); Efree(str); if (EventDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap get einf %#lx: %4d+%4d %4dx%4d: %s\n", - _EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, + EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); } diff --git a/src/icccm.c b/src/icccm.c index a37fe16e..d1b31974 100644 --- a/src/icccm.c +++ b/src/icccm.c @@ -87,7 +87,7 @@ ICCCM_GetTitle(EWin * ewin, Atom atom_change) _EFREE(ewin->icccm.wm_name); - ewin->icccm.wm_name = ecore_x_icccm_title_get(_EwinGetClientXwin(ewin)); + ewin->icccm.wm_name = ecore_x_icccm_title_get(EwinGetClientXwin(ewin)); EwinChange(ewin, EWIN_CHANGE_NAME); } @@ -98,7 +98,7 @@ ICCCM_GetColormap(EWin * ewin) XWindowAttributes xwa; ewin->client.cmap = None; - if (XGetWindowAttributes(disp, _EwinGetClientXwin(ewin), &xwa) + if (XGetWindowAttributes(disp, EwinGetClientXwin(ewin), &xwa) && xwa.colormap) ewin->client.cmap = xwa.colormap; } @@ -113,9 +113,9 @@ ICCCM_Delete(const EWin * ewin) } if (ewin->icccm.delete_window) - ecore_x_icccm_delete_window_send(_EwinGetClientXwin(ewin), CurrentTime); + ecore_x_icccm_delete_window_send(EwinGetClientXwin(ewin), CurrentTime); else - XKillClient(disp, _EwinGetClientXwin(ewin)); + XKillClient(disp, EwinGetClientXwin(ewin)); } #if 0 /* Deprecated */ @@ -125,22 +125,22 @@ ICCCM_Save(const EWin * ewin) if (EwinIsInternal(ewin)) return; - ecore_x_icccm_send_save_yourself(_EwinGetClientXwin(ewin)); + ecore_x_icccm_send_save_yourself(EwinGetClientXwin(ewin)); } #endif void ICCCM_Iconify(const EWin * ewin) { - EUnmapWindow(_EwinGetClientWin(ewin)); - ecore_x_icccm_state_set_iconic(_EwinGetClientXwin(ewin)); + EUnmapWindow(EwinGetClientWin(ewin)); + ecore_x_icccm_state_set_iconic(EwinGetClientXwin(ewin)); } void ICCCM_DeIconify(const EWin * ewin) { - EMapWindow(_EwinGetClientWin(ewin)); - ecore_x_icccm_state_set_normal(_EwinGetClientXwin(ewin)); + EMapWindow(EwinGetClientWin(ewin)); + ecore_x_icccm_state_set_normal(EwinGetClientXwin(ewin)); } void @@ -150,9 +150,9 @@ ICCCM_Withdraw(const EWin * ewin) * or changing the value to Withdrawn. Since twm/fvwm does * it that way, we change it to Withdrawn. */ - ecore_x_icccm_state_set_withdrawn(_EwinGetClientXwin(ewin)); + ecore_x_icccm_state_set_withdrawn(EwinGetClientXwin(ewin)); - XRemoveFromSaveSet(disp, _EwinGetClientXwin(ewin)); + XRemoveFromSaveSet(disp, EwinGetClientXwin(ewin)); } void @@ -273,7 +273,7 @@ ICCCM_Configure(EWin * ewin) if (count == 0) ewin->ewmh.sync_request_count = ++count; - ecore_x_client_message32_send(_EwinGetClientXwin(ewin), + ecore_x_client_message32_send(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_PROTOCOLS, StructureNotifyMask, ECORE_X_ATOM_NET_WM_SYNC_REQUEST, @@ -284,8 +284,8 @@ ICCCM_Configure(EWin * ewin) ev.type = ConfigureNotify; ev.xconfigure.display = disp; - ev.xconfigure.event = _EwinGetClientXwin(ewin); - ev.xconfigure.window = _EwinGetClientXwin(ewin); + ev.xconfigure.event = EwinGetClientXwin(ewin); + ev.xconfigure.window = EwinGetClientXwin(ewin); #if 0 /* FIXME - Remove? */ Desk *dsk; @@ -305,7 +305,7 @@ ICCCM_Configure(EWin * ewin) ev.xconfigure.border_width = 0; ev.xconfigure.above = EoGetXwin(ewin); ev.xconfigure.override_redirect = False; - XSendEvent(disp, _EwinGetClientXwin(ewin), False, StructureNotifyMask, &ev); + XSendEvent(disp, EwinGetClientXwin(ewin), False, StructureNotifyMask, &ev); #if USE_XSYNC if (ewin->ewmh.sync_request_enable && !EServerIsGrabbed()) @@ -329,7 +329,7 @@ ICCCM_Configure(EWin * ewin) void ICCCM_AdoptStart(const EWin * ewin) { - Window win = _EwinGetClientXwin(ewin); + Window win = EwinGetClientXwin(ewin); if (!EwinIsInternal(ewin)) XAddToSaveSet(disp, win); @@ -338,7 +338,7 @@ ICCCM_AdoptStart(const EWin * ewin) void ICCCM_Adopt(const EWin * ewin) { - Window win = _EwinGetClientXwin(ewin); + Window win = EwinGetClientXwin(ewin); if (ewin->icccm.start_iconified) ecore_x_icccm_state_set_iconic(win); @@ -370,7 +370,7 @@ ICCCM_Cmap(EWin * ewin) int i, num; Ecore_X_Window *wlist; - num = ecore_x_window_prop_window_list_get(_EwinGetClientXwin(ewin), + num = ecore_x_window_prop_window_list_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_COLORMAP_WINDOWS, &wlist); if (num > 0) @@ -401,7 +401,7 @@ ICCCM_Focus(const EWin * ewin) { if (ewin) Eprintf("ICCCM_Focus T=%#lx %#lx %s\n", Mode.events.time, - _EwinGetClientXwin(ewin), EwinGetName(ewin)); + EwinGetClientXwin(ewin), EwinGetName(ewin)); else Eprintf("ICCCM_Focus None T=%#lx\n", Mode.events.time); } @@ -415,14 +415,14 @@ ICCCM_Focus(const EWin * ewin) if (ewin->icccm.take_focus) { - ecore_x_icccm_take_focus_send(_EwinGetClientXwin(ewin), + ecore_x_icccm_take_focus_send(EwinGetClientXwin(ewin), Mode.events.time); } - XSetInputFocus(disp, _EwinGetClientXwin(ewin), RevertToPointerRoot, + XSetInputFocus(disp, EwinGetClientXwin(ewin), RevertToPointerRoot, Mode.events.time); - HintsSetActiveWindow(_EwinGetClientXwin(ewin)); + HintsSetActiveWindow(EwinGetClientXwin(ewin)); } void @@ -434,7 +434,7 @@ ICCCM_GetGeoms(EWin * ewin, Atom atom_change) if (atom_change && atom_change != ECORE_X_ATOM_WM_NORMAL_HINTS) return; - if (XGetWMNormalHints(disp, _EwinGetClientXwin(ewin), &hint, &mask)) + if (XGetWMNormalHints(disp, EwinGetClientXwin(ewin), &hint, &mask)) { if (!(ewin->state.placed)) { @@ -558,11 +558,11 @@ ICCCM_GetGeoms(EWin * ewin, Atom atom_change) if (EventDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap get icccm %#lx: %4d+%4d %4dx%4d: %s\n", - _EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, + EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); } -#define TryGroup(e) (((e)->icccm.group != None) && ((e)->icccm.group != _EwinGetClientXwin(e))) +#define TryGroup(e) (((e)->icccm.group != None) && ((e)->icccm.group != EwinGetClientXwin(e))) void ICCCM_GetInfo(EWin * ewin, Atom atom_change) @@ -574,7 +574,7 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change) _EFREE(ewin->icccm.wm_res_name); _EFREE(ewin->icccm.wm_res_class); - if (XGetClassHint(disp, _EwinGetClientXwin(ewin), &hint) || + if (XGetClassHint(disp, EwinGetClientXwin(ewin), &hint) || (TryGroup(ewin) && XGetClassHint(disp, ewin->icccm.group, &hint))) { ewin->icccm.wm_res_name = Estrdup(hint.res_name); @@ -591,7 +591,7 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change) _EFREE(ewin->icccm.wm_command); - argc = ecore_x_window_prop_string_list_get(_EwinGetClientXwin(ewin), + argc = ecore_x_window_prop_string_list_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_COMMAND, &argv); if ((argc < 0) && TryGroup(ewin)) @@ -609,7 +609,7 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change) _EFREE(ewin->icccm.wm_machine); ewin->icccm.wm_machine = - ecore_x_window_prop_string_get(_EwinGetClientXwin(ewin), + ecore_x_window_prop_string_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_CLIENT_MACHINE); if (!ewin->icccm.wm_machine && TryGroup(ewin)) ewin->icccm.wm_machine = @@ -622,7 +622,7 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change) _EFREE(ewin->icccm.wm_icon_name); ewin->icccm.wm_icon_name = - ecore_x_window_prop_string_get(_EwinGetClientXwin(ewin), + ecore_x_window_prop_string_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_ICON_NAME); if (!ewin->icccm.wm_icon_name && TryGroup(ewin)) ewin->icccm.wm_icon_name = @@ -634,7 +634,7 @@ ICCCM_GetInfo(EWin * ewin, Atom atom_change) { _EFREE(ewin->icccm.wm_role); ewin->icccm.wm_role = - ecore_x_window_prop_string_get(_EwinGetClientXwin(ewin), + ecore_x_window_prop_string_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_WINDOW_ROLE); } } @@ -649,7 +649,7 @@ ICCCM_GetHints(EWin * ewin, Atom atom_change) hint = NULL; if (atom_change == 0 || atom_change == ECORE_X_ATOM_WM_HINTS) - hint = XGetWMHints(disp, _EwinGetClientXwin(ewin)); + hint = XGetWMHints(disp, EwinGetClientXwin(ewin)); if (hint) { /* I have to make sure the thing i'm docking is a dock app */ @@ -660,7 +660,7 @@ ICCCM_GetHints(EWin * ewin, Atom atom_change) WindowGroupHint)) { if ((hint->icon_x == 0) && (hint->icon_y == 0) - && hint->window_group == _EwinGetClientXwin(ewin)) + && hint->window_group == EwinGetClientXwin(ewin)) ewin->state.docked = 1; } } @@ -711,7 +711,7 @@ ICCCM_GetHints(EWin * ewin, Atom atom_change) if (atom_change == 0 || atom_change == ECORE_X_ATOM_WM_PROTOCOLS) { - if (XGetWMProtocols(disp, _EwinGetClientXwin(ewin), &prop, &num)) + if (XGetWMProtocols(disp, EwinGetClientXwin(ewin), &prop, &num)) { ewin->icccm.take_focus = 0; ewin->icccm.delete_window = 0; @@ -727,7 +727,7 @@ ICCCM_GetHints(EWin * ewin, Atom atom_change) unsigned int c; ewin->ewmh.sync_request_enable = 1; - ecore_x_window_prop_card32_get(_EwinGetClientXwin(ewin), + ecore_x_window_prop_card32_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER, &c, 1); ewin->ewmh.sync_request_counter = c; @@ -742,14 +742,14 @@ ICCCM_GetHints(EWin * ewin, Atom atom_change) { ewin->icccm.transient = 0; ewin->icccm.transient_for = None; - if (XGetTransientForHint(disp, _EwinGetClientXwin(ewin), &win)) + if (XGetTransientForHint(disp, EwinGetClientXwin(ewin), &win)) { ewin->icccm.transient = 1; ewin->icccm.transient_for = win; } } - if (ewin->icccm.group == _EwinGetClientXwin(ewin)) + if (ewin->icccm.group == EwinGetClientXwin(ewin)) { ewin->icccm.is_group_leader = 1; } @@ -762,7 +762,7 @@ ICCCM_GetHints(EWin * ewin, Atom atom_change) { Ecore_X_Window cleader; - num = ecore_x_window_prop_window_get(_EwinGetClientXwin(ewin), + num = ecore_x_window_prop_window_get(EwinGetClientXwin(ewin), ECORE_X_ATOM_WM_CLIENT_LEADER, &cleader, 1); if (num > 0) diff --git a/src/ipc.c b/src/ipc.c index 5c9ca6fe..6846ad71 100644 --- a/src/ipc.c +++ b/src/ipc.c @@ -449,20 +449,20 @@ IPC_WinList(const char *params, Client * c __UNUSED__) switch (format[0]) { case '\0': - IpcPrintf("%#lx : %s\n", _EwinGetClientXwin(e), + IpcPrintf("%#lx : %s\n", EwinGetClientXwin(e), SS(e->icccm.wm_name)); break; default: IpcPrintf("%#lx : %s :: %d : %d %d : %d %d %dx%d\n", - _EwinGetClientXwin(e), SS(e->icccm.wm_name), + EwinGetClientXwin(e), SS(e->icccm.wm_name), (EoIsSticky(e)) ? -1 : (int)EoGetDeskNum(e), e->area_x, e->area_y, EoGetX(e), EoGetY(e), EoGetW(e), EoGetH(e)); break; case 'a': IpcPrintf("%#10lx : %5d %5d %4dx%4d :: %2d : %d %d : %s\n", - _EwinGetClientXwin(e), EoGetX(e), EoGetY(e), EoGetW(e), + EwinGetClientXwin(e), EoGetX(e), EoGetY(e), EoGetW(e), EoGetH(e), (EoIsSticky(e)) ? -1 : (int)EoGetDeskNum(e), e->area_x, e->area_y, SS(e->icccm.wm_name)); break; @@ -470,7 +470,7 @@ IPC_WinList(const char *params, Client * c __UNUSED__) case 'g': IpcPrintf ("%#10lx : %5d %5d %4dx%4d :: %2d : %s %4d,%4d %2d,%2d : %s\n", - _EwinGetClientXwin(e), EoGetX(e), EoGetY(e), EoGetW(e), + EwinGetClientXwin(e), EoGetX(e), EoGetY(e), EoGetW(e), EoGetH(e), (EoIsSticky(e)) ? -1 : (int)EoGetDeskNum(e), TxtPG[e->place.gravity & 3], e->place.gx, e->place.gy, e->place.ax, e->place.ay, SS(e->icccm.wm_name)); @@ -479,7 +479,7 @@ IPC_WinList(const char *params, Client * c __UNUSED__) case 'p': IpcPrintf ("%#10lx : %5d %5d %4dx%4d :: %2d : \"%s\" \"%s\" \"%s\"\n", - _EwinGetClientXwin(e), EoGetX(e), EoGetY(e), EoGetW(e), + EwinGetClientXwin(e), EoGetX(e), EoGetY(e), EoGetW(e), EoGetH(e), (EoIsSticky(e)) ? -1 : (int)EoGetDeskNum(e), SS(e->icccm.wm_res_name), SS(e->icccm.wm_res_class), SS(e->icccm.wm_name)); @@ -561,7 +561,7 @@ IpcWinop(const WinOp * wop, EWin * ewin, const char *prm) } _EFREE(ewin->icccm.wm_name); ewin->icccm.wm_name = Estrdup(prm); - XStoreName(disp, _EwinGetClientXwin(ewin), ewin->icccm.wm_name); + XStoreName(disp, EwinGetClientXwin(ewin), ewin->icccm.wm_name); EwinBorderUpdateInfo(ewin); break; @@ -1143,9 +1143,9 @@ EwinShowInfo(const EWin * ewin) SS(ewin->icccm.wm_role), SS(ewin->icccm.wm_command), SS(ewin->icccm.wm_machine), - _EwinGetClientXwin(ewin), + EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, - _EwinGetContainerXwin(ewin), + EwinGetContainerXwin(ewin), EoGetXwin(ewin), EoGetX(ewin), EoGetY(ewin), EoGetW(ewin), EoGetH(ewin), #if USE_COMPOSITE @@ -1254,7 +1254,7 @@ IPC_Reparent(const char *params, Client * c __UNUSED__) if (!ewin || !enew) IpcPrintf("No matching client or target EWin found\n"); else - EwinReparent(ewin, _EwinGetClientWin(enew)); + EwinReparent(ewin, EwinGetClientWin(enew)); } static void diff --git a/src/menus-misc.c b/src/menus-misc.c index 1c555865..a3baf806 100644 --- a/src/menus-misc.c +++ b/src/menus-misc.c @@ -651,7 +651,7 @@ MenuLoadFromEwins(Menu * m, int (*f) (EWin * ewin, void *prm), void *prm) if (!f(lst[i], prm)) continue; - Esnprintf(s, sizeof(s), "wop %#lx focus", _EwinGetClientXwin(lst[i])); + Esnprintf(s, sizeof(s), "wop %#lx focus", EwinGetClientXwin(lst[i])); mi = MenuItemCreate(EwinGetName(lst[i]), NULL, s, NULL); MenuAddItem(m, mi); } @@ -739,11 +739,11 @@ MenuLoadFromGroups(Menu * m) mm = MenuCreate("__SUBMENUGROUP_E", NULL, m, NULL); Esnprintf(s, sizeof(s), "gop %li showhide", - _EwinGetClientXwin(lst[i]->members[0])); + EwinGetClientXwin(lst[i]->members[0])); mi = MenuItemCreate(_("Show/Hide this group"), NULL, s, NULL); Esnprintf(s, sizeof(s), "wop %#lx ic", - _EwinGetClientXwin(lst[i]->members[0])); + EwinGetClientXwin(lst[i]->members[0])); MenuAddItem(mm, mi); mi = MenuItemCreate(_("Iconify this group"), NULL, s, NULL); MenuAddItem(mm, mi); @@ -751,7 +751,7 @@ MenuLoadFromGroups(Menu * m) for (j = 0; j < lst[i]->num_members; j++) { Esnprintf(s, sizeof(s), "wop %#lx focus", - _EwinGetClientXwin(lst[i]->members[j])); + EwinGetClientXwin(lst[i]->members[j])); mi = MenuItemCreate(EwinGetName(lst[i]->members[j]), NULL, s, NULL); MenuAddItem(mm, mi); diff --git a/src/mwm.c b/src/mwm.c index fa917c1d..53a59616 100644 --- a/src/mwm.c +++ b/src/mwm.c @@ -101,7 +101,7 @@ MWM_GetHints(EWin * ewin, Atom atom_change) ewin->mwm.func_close = 1; puc = NULL; - XGetWindowProperty(disp, _EwinGetClientXwin(ewin), _MOTIF_WM_HINTS, 0, 20, + XGetWindowProperty(disp, EwinGetClientXwin(ewin), _MOTIF_WM_HINTS, 0, 20, False, _MOTIF_WM_HINTS, &a2, &fmt, &num, &end, &puc); mwmhints = (MWMHints *) puc; if (!mwmhints) diff --git a/src/pager.c b/src/pager.c index 4c67023e..f59d25ef 100644 --- a/src/pager.c +++ b/src/pager.c @@ -904,19 +904,19 @@ PagerMenuShow(Pager * p, int x, int y) pw_menu = MenuCreate("__DESK_WIN_MENU", _("Window Options"), NULL, NULL); - Esnprintf(s, sizeof(s), "wop %#lx ic", _EwinGetClientXwin(ewin)); + Esnprintf(s, sizeof(s), "wop %#lx ic", EwinGetClientXwin(ewin)); mi = MenuItemCreate(_("Iconify"), NULL, s, NULL); MenuAddItem(pw_menu, mi); - Esnprintf(s, sizeof(s), "wop %#lx close", _EwinGetClientXwin(ewin)); + Esnprintf(s, sizeof(s), "wop %#lx close", EwinGetClientXwin(ewin)); mi = MenuItemCreate(_("Close"), NULL, s, NULL); MenuAddItem(pw_menu, mi); - Esnprintf(s, sizeof(s), "wop %#lx kill", _EwinGetClientXwin(ewin)); + Esnprintf(s, sizeof(s), "wop %#lx kill", EwinGetClientXwin(ewin)); mi = MenuItemCreate(_("Annihilate"), NULL, s, NULL); MenuAddItem(pw_menu, mi); - Esnprintf(s, sizeof(s), "wop %#lx st", _EwinGetClientXwin(ewin)); + Esnprintf(s, sizeof(s), "wop %#lx st", EwinGetClientXwin(ewin)); mi = MenuItemCreate(_("Stick / Unstick"), NULL, s, NULL); MenuAddItem(pw_menu, mi); @@ -1440,7 +1440,7 @@ PagerHiwinHandleMouseUp(Pager * p, int px, int py, int button) else if (ewin2 && ewin2->props.vroot) { /* Dropping onto virtual root */ - EwinReparent(ewin, _EwinGetClientWin(ewin2)); + EwinReparent(ewin, EwinGetClientWin(ewin2)); } else if (!in_vroot) { diff --git a/src/session.c b/src/session.c index 5177d9ba..e40db674 100644 --- a/src/session.c +++ b/src/session.c @@ -451,7 +451,7 @@ SessionGetInfo(EWin * ewin, Atom atom_change) atom_change == atom_wm_client_leader))) return; - num = ecore_x_window_prop_window_get(_EwinGetClientXwin(ewin), + num = ecore_x_window_prop_window_get(EwinGetClientXwin(ewin), atom_wm_client_leader, &win, 1); if (num > 0) ewin->session_id = ecore_x_window_prop_string_get(win, atom_sm_client_id); diff --git a/src/snaps.c b/src/snaps.c index 85441812..56dfa8b3 100644 --- a/src/snaps.c +++ b/src/snaps.c @@ -163,7 +163,7 @@ SnapshotEwinMatch(const Snapshot * sn, const EWin * ewin) return 0; if (ewin->state.identified) - return sn->win == _EwinGetClientXwin(ewin); + return sn->win == EwinGetClientXwin(ewin); if (sn->startup_id && !sn->cmd) return 0; @@ -679,7 +679,7 @@ _DlgFillSnap(Dialog * d, DItem * table, void *data) sd = Ecalloc(1, sizeof(SnapDlgData)); DialogSetData(d, sd); - sd->client = _EwinGetClientXwin(ewin); + sd->client = EwinGetClientXwin(ewin); sn = ewin->snap; if (sn) @@ -948,7 +948,7 @@ SnapshotEwinDialog(const EWin * ewin) { char s[1024]; - Esnprintf(s, sizeof(s), "SNAPSHOT_WINDOW-%#lx", _EwinGetClientXwin(ewin)); + Esnprintf(s, sizeof(s), "SNAPSHOT_WINDOW-%#lx", EwinGetClientXwin(ewin)); DialogShowSimpleWithName(&DlgSnap, s, (void *)ewin); } @@ -1121,7 +1121,7 @@ Real_SaveSnapInfo(int dumval __UNUSED__, void *dumdat __UNUSED__) { fprintf(f, "NEW: %s\n", sn->name); if (sn->used) - fprintf(f, "WIN: %#lx\n", _EwinGetClientXwin(sn->used)); + fprintf(f, "WIN: %#lx\n", EwinGetClientXwin(sn->used)); if ((sn->match_flags & SNAP_MATCH_TITLE) && sn->win_title) fprintf(f, "TITLE: %s\n", sn->win_title); if ((sn->match_flags & SNAP_MATCH_NAME) && sn->win_name) @@ -1462,7 +1462,7 @@ SnapshotEwinApply(EWin * ewin) ewin->client.x += ((sn->area_x - ax) * VRoot.w); ewin->client.y += ((sn->area_y - ay) * VRoot.h); } - EMoveResizeWindow(_EwinGetClientWin(ewin), ewin->client.x, + EMoveResizeWindow(EwinGetClientWin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h); } @@ -1516,7 +1516,7 @@ SnapshotEwinApply(EWin * ewin) if (EventDebug(EDBUG_TYPE_SNAPS)) Eprintf("Snap get snap %#lx: %4d+%4d %4dx%4d: %s\n", - _EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, + EwinGetClientXwin(ewin), ewin->client.x, ewin->client.y, ewin->client.w, ewin->client.h, EwinGetName(ewin)); } @@ -1634,8 +1634,7 @@ _SnapShow(void *data, void *prm) #define SU(sn, item) ((sn->match_flags & item) ? '>' : ':') if (sn->used) - Esnprintf(buf, sizeof(buf), "In use - %#lx", - _EwinGetClientXwin(sn->used)); + Esnprintf(buf, sizeof(buf), "In use - %#lx", EwinGetClientXwin(sn->used)); else Esnprintf(buf, sizeof(buf), "*** Unused ***"); IpcPrintf(" Snapshot Name: %s %s\n", name, buf); diff --git a/src/stacking.c b/src/stacking.c index 31514d90..8e2b892b 100644 --- a/src/stacking.c +++ b/src/stacking.c @@ -28,7 +28,7 @@ #define ENABLE_DEBUG_STACKING 1 #define EobjGetCwin(p) \ - ((p->type == EOBJ_TYPE_EWIN) ? _EwinGetClientXwin(((EWin*)(p))) : None) + ((p->type == EOBJ_TYPE_EWIN) ? EwinGetClientXwin(((EWin*)(p))) : None) typedef struct _eobjlist EobjList; @@ -481,7 +481,7 @@ EwinListStackIsRaised(const EWin * ewin) continue; if (eo->ilayer > eox->ilayer) continue; - if (EwinGetTransientFor((EWin *) eo) == _EwinGetClientXwin(ewin)) + if (EwinGetTransientFor((EWin *) eo) == EwinGetClientXwin(ewin)) continue; return eo == eox; } diff --git a/src/zoom.c b/src/zoom.c index 0257ed61..3ba42e27 100644 --- a/src/zoom.c +++ b/src/zoom.c @@ -218,7 +218,7 @@ Zoom(EWin * ewin) if (zoom_mask_4) EDestroyWindow(zoom_mask_4); SwitchRes(0, 0, 0, 0, 0); - EXWarpPointer(_EwinGetClientXwin(ewin), ewin->client.w / 2, + EXWarpPointer(EwinGetClientXwin(ewin), ewin->client.w / 2, ewin->client.h / 2); ESync(); zoom_last_ewin = NULL; @@ -250,15 +250,15 @@ Zoom(EWin * ewin) EwinBorderGetSize(ewin, &bl, &br, &bt, &bb); EwinMove(ewin, -bl + x1, -bt + y1); FocusToEWin(ewin, FOCUS_SET); - EXWarpPointer(_EwinGetClientXwin(ewin), ewin->client.w / 2, + EXWarpPointer(EwinGetClientXwin(ewin), ewin->client.w / 2, ewin->client.h / 2); #if 0 /* Doesn't work as intended */ - XGrabPointer(disp, _EwinGetClientXwin(ewin), True, + XGrabPointer(disp, EwinGetClientXwin(ewin), True, ButtonPressMask | ButtonReleaseMask | PointerMotionMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask, GrabModeAsync, GrabModeAsync, - _EwinGetClientXwin(ewin), None, CurrentTime); + EwinGetClientXwin(ewin), None, CurrentTime); #endif zoom_mask_1 = ZoomMask(0, 0, x1, mode->vdisplay); zoom_mask_2 = ZoomMask(0, 0, mode->hdisplay, y1);