Trivial renaming.

SVN revision: 22448
This commit is contained in:
Kim Woelders 2006-05-03 20:52:15 +00:00
parent a8238f7fe9
commit 2a431b38e7
14 changed files with 60 additions and 60 deletions

View File

@ -593,8 +593,8 @@ DialogShowArranged(Dialog * d, int center)
if (EoGetDesk(ewin) != DesksGetCurrent()) if (EoGetDesk(ewin) != DesksGetCurrent())
EwinMoveToDesktop(ewin, DesksGetCurrent()); EwinMoveToDesktop(ewin, DesksGetCurrent());
#endif #endif
RaiseEwin(ewin); EwinRaise(ewin);
ShowEwin(ewin); EwinShow(ewin);
return; return;
} }
@ -663,7 +663,7 @@ DialogShowArranged(Dialog * d, int center)
DialogRedraw(d); DialogRedraw(d);
DialogUpdate(d); DialogUpdate(d);
ShowEwin(ewin); EwinShow(ewin);
} }
void void
@ -687,7 +687,7 @@ DialogClose(Dialog * d)
if (d->exit_func) if (d->exit_func)
d->exit_func(d, d->exit_val, NULL); d->exit_func(d, d->exit_val, NULL);
HideEwin(d->ewin); EwinHide(d->ewin);
} }
static DItem * static DItem *

View File

@ -492,7 +492,7 @@ doEwinMoveResize(EWin * ewin, Desk * dsk, int x, int y, int w, int h, int flags)
if (raise) if (raise)
{ {
EoSetFloating(ewin, floating); EoSetFloating(ewin, floating);
RaiseEwin(ewin); EwinRaise(ewin);
} }
if (Mode.mode == MODE_NONE || Conf.movres.update_while_moving) if (Mode.mode == MODE_NONE || Conf.movres.update_while_moving)
@ -652,7 +652,7 @@ EwinIconify(EWin * ewin)
ModulesSignal(ESIGNAL_EWIN_ICONIFY, ewin); ModulesSignal(ESIGNAL_EWIN_ICONIFY, ewin);
ewin->state.iconified = 1; ewin->state.iconified = 1;
HideEwin(ewin); EwinHide(ewin);
/* Save position at which the window was iconified */ /* Save position at which the window was iconified */
EwinRememberPositionSet(ewin); EwinRememberPositionSet(ewin);
@ -733,8 +733,8 @@ EwinDeIconify1(EWin * ewin, int dx, int dy)
ewin->state.iconified = 0; ewin->state.iconified = 0;
ewin->state.showingdesk = 0; ewin->state.showingdesk = 0;
RaiseEwin(ewin); EwinRaise(ewin);
ShowEwin(ewin); EwinShow(ewin);
ICCCM_DeIconify(ewin); ICCCM_DeIconify(ewin);
lst = EwinListTransients(ewin, &num, 0); lst = EwinListTransients(ewin, &num, 0);
@ -1386,7 +1386,7 @@ EwinOpFullscreen(EWin * ewin, int source __UNUSED__, int on)
Efree(lst); Efree(lst);
} }
RaiseEwin(ewin); EwinRaise(ewin);
EwinMoveResize(ewin, x, y, w, h); EwinMoveResize(ewin, x, y, w, h);
ewin->state.maximized_horz = ewin->state.maximized_vert = 0; ewin->state.maximized_horz = ewin->state.maximized_vert = 0;
ewin->state.fullscreen = 1; ewin->state.fullscreen = 1;
@ -1414,7 +1414,7 @@ EwinOpFullscreen(EWin * ewin, int source __UNUSED__, int on)
ewin->state.fullscreen = 0; ewin->state.fullscreen = 0;
EwinStateUpdate(ewin); EwinStateUpdate(ewin);
RaiseEwin(ewin); EwinRaise(ewin);
EwinMoveResize(ewin, x, y, w, h); EwinMoveResize(ewin, x, y, w, h);
} }
@ -1515,7 +1515,7 @@ EwinOpRaise(EWin * ewin, int source __UNUSED__)
gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_RAISE, gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_RAISE,
Mode.nogroup, &num); Mode.nogroup, &num);
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
RaiseEwin(gwins[i]); EwinRaise(gwins[i]);
Efree(gwins); Efree(gwins);
} }
@ -1529,7 +1529,7 @@ EwinOpLower(EWin * ewin, int source __UNUSED__)
gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_LOWER, gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_LOWER,
Mode.nogroup, &num); Mode.nogroup, &num);
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
LowerEwin(gwins[i]); EwinLower(gwins[i]);
Efree(gwins); Efree(gwins);
} }
@ -1581,13 +1581,13 @@ EwinOpRaiseLower(EWin * ewin)
{ {
SoundPlay("SOUND_LOWER"); SoundPlay("SOUND_LOWER");
for (j = 0; j < gnum; j++) for (j = 0; j < gnum; j++)
LowerEwin(gwins[j]); EwinLower(gwins[j]);
} }
else else
{ {
SoundPlay("SOUND_RAISE"); SoundPlay("SOUND_RAISE");
for (j = 0; j < gnum; j++) for (j = 0; j < gnum; j++)
RaiseEwin(gwins[j]); EwinRaise(gwins[j]);
} }
if (gwins) if (gwins)
@ -1747,7 +1747,7 @@ EwinOpSetLayer(EWin * ewin, int source __UNUSED__, int layer)
SoundPlay("SOUND_WINDOW_CHANGE_LAYER_UP"); SoundPlay("SOUND_WINDOW_CHANGE_LAYER_UP");
} }
EoSetLayer(ewin, layer); EoSetLayer(ewin, layer);
RaiseEwin(ewin); EwinRaise(ewin);
EwinStateUpdate(ewin); EwinStateUpdate(ewin);
HintsSetWindowState(ewin); HintsSetWindowState(ewin);
SnapshotEwinUpdate(ewin, SNAP_USE_LAYER); SnapshotEwinUpdate(ewin, SNAP_USE_LAYER);
@ -1825,7 +1825,7 @@ EwinOpMoveToDesk(EWin * ewin, int source __UNUSED__, Desk * dsk, int inc)
EoSetSticky(ewin, 0); EoSetSticky(ewin, 0);
EwinMoveToDesktop(ewin, dsk); EwinMoveToDesktop(ewin, dsk);
RaiseEwin(ewin); EwinRaise(ewin);
EwinBorderUpdateState(ewin); EwinBorderUpdateState(ewin);
EwinStateUpdate(ewin); EwinStateUpdate(ewin);
HintsSetWindowState(ewin); HintsSetWindowState(ewin);

View File

@ -800,7 +800,7 @@ AddToFamily(EWin * ewin, Window win)
EwinOpFullscreen(ewin, OPSRC_WM, 2); EwinOpFullscreen(ewin, OPSRC_WM, 2);
ewin->state.placed = 1; ewin->state.placed = 1;
EwinMoveToDesktopAt(ewin, dsk, EoGetX(ewin), EoGetY(ewin)); EwinMoveToDesktopAt(ewin, dsk, EoGetX(ewin), EoGetY(ewin));
ShowEwin(ewin); EwinShow(ewin);
goto done; goto done;
} }
@ -894,7 +894,7 @@ AddToFamily(EWin * ewin, Window win)
y = Mode.events.y + 1; y = Mode.events.y + 1;
EwinMoveToDesktopAt(ewin, dsk, x, y); EwinMoveToDesktopAt(ewin, dsk, x, y);
EwinMove(ewin, x, y); EwinMove(ewin, x, y);
ShowEwin(ewin); EwinShow(ewin);
GrabPointerSet(VRoot.win, ECSR_GRAB, 0); GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
Mode.place.doing_manual = 1; Mode.place.doing_manual = 1;
EoSetFloating(ewin, 1); /* Causes reparenting to root */ EoSetFloating(ewin, 1); /* Causes reparenting to root */
@ -929,7 +929,7 @@ AddToFamily(EWin * ewin, Window win)
FocusEnable(0); FocusEnable(0);
EwinMoveToDesktopAt(ewin, dsk, fx, fy); EwinMoveToDesktopAt(ewin, dsk, fx, fy);
ShowEwin(ewin); EwinShow(ewin);
ewin->req_x = x; ewin->req_x = x;
ewin->req_y = y; ewin->req_y = y;
DoIn("Slide", 0.05, EwinSlideIn, 0, ewin); DoIn("Slide", 0.05, EwinSlideIn, 0, ewin);
@ -937,7 +937,7 @@ AddToFamily(EWin * ewin, Window win)
else else
{ {
EwinMoveToDesktopAt(ewin, dsk, x, y); EwinMoveToDesktopAt(ewin, dsk, x, y);
ShowEwin(ewin); EwinShow(ewin);
} }
done: done:
@ -1082,7 +1082,7 @@ EwinEventMapRequest(EWin * ewin, Window win)
_EwinGetClientXwin(ewin)); _EwinGetClientXwin(ewin));
EReparentWindow(_EwinGetClientWin(ewin), ewin->win_container, 0, EReparentWindow(_EwinGetClientWin(ewin), ewin->win_container, 0,
0); 0);
ShowEwin(ewin); EwinShow(ewin);
} }
else else
AddToFamily(NULL, win); AddToFamily(NULL, win);
@ -1229,9 +1229,9 @@ EwinEventConfigureRequest(EWin * ewin, XEvent * ev)
if (Mode.mode == MODE_NONE) if (Mode.mode == MODE_NONE)
{ {
if (xwc.stack_mode == Above) if (xwc.stack_mode == Above)
RaiseEwin(ewin); EwinRaise(ewin);
else if (xwc.stack_mode == Below) else if (xwc.stack_mode == Below)
LowerEwin(ewin); EwinLower(ewin);
} }
} }
@ -1282,9 +1282,9 @@ EwinEventCirculateRequest(EWin * ewin, XEvent * ev)
if (ewin) if (ewin)
{ {
if (ev->xcirculaterequest.place == PlaceOnTop) if (ev->xcirculaterequest.place == PlaceOnTop)
RaiseEwin(ewin); EwinRaise(ewin);
else else
LowerEwin(ewin); EwinLower(ewin);
} }
else else
{ {
@ -1338,7 +1338,7 @@ EwinReparent(EWin * ewin, Win parent)
} }
void void
RaiseEwin(EWin * ewin) EwinRaise(EWin * ewin)
{ {
static int call_depth = 0; static int call_depth = 0;
EWin **lst; EWin **lst;
@ -1351,7 +1351,7 @@ RaiseEwin(EWin * ewin)
num = EoRaise(ewin); num = EoRaise(ewin);
if (EventDebug(EDBUG_TYPE_RAISELOWER)) if (EventDebug(EDBUG_TYPE_RAISELOWER))
Eprintf("RaiseEwin(%d) %#lx %s n=%d\n", call_depth, 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 */ if (num == 0) /* Quit if stacking is unchanged */
@ -1359,7 +1359,7 @@ RaiseEwin(EWin * ewin)
lst = EwinListTransients(ewin, &num, 1); lst = EwinListTransients(ewin, &num, 1);
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
RaiseEwin(lst[i]); EwinRaise(lst[i]);
if (lst) if (lst)
Efree(lst); Efree(lst);
@ -1371,7 +1371,7 @@ RaiseEwin(EWin * ewin)
} }
void void
LowerEwin(EWin * ewin) EwinLower(EWin * ewin)
{ {
static int call_depth = 0; static int call_depth = 0;
EWin **lst; EWin **lst;
@ -1384,7 +1384,7 @@ LowerEwin(EWin * ewin)
num = EoLower(ewin); num = EoLower(ewin);
if (EventDebug(EDBUG_TYPE_RAISELOWER)) if (EventDebug(EDBUG_TYPE_RAISELOWER))
Eprintf("LowerEwin(%d) %#lx %s n=%d\n", call_depth, 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 */ if (num == 0) /* Quit if stacking is unchanged */
@ -1392,7 +1392,7 @@ LowerEwin(EWin * ewin)
lst = EwinListTransientFor(ewin, &num); lst = EwinListTransientFor(ewin, &num);
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
LowerEwin(lst[i]); EwinLower(lst[i]);
if (lst) if (lst)
Efree(lst); Efree(lst);
@ -1404,7 +1404,7 @@ LowerEwin(EWin * ewin)
} }
void void
ShowEwin(EWin * ewin) EwinShow(EWin * ewin)
{ {
if (EoIsShown(ewin)) if (EoIsShown(ewin))
return; return;
@ -1434,7 +1434,7 @@ ShowEwin(EWin * ewin)
} }
void void
HideEwin(EWin * ewin) EwinHide(EWin * ewin)
{ {
if (!EwinIsInternal(ewin) && (!EoIsShown(ewin) || !EwinIsMapped(ewin))) if (!EwinIsInternal(ewin) && (!EoIsShown(ewin) || !EwinIsMapped(ewin)))
return; return;

View File

@ -291,10 +291,10 @@ struct _ewin
#define EWIN_CHANGE_ATTENTION (1<<6) #define EWIN_CHANGE_ATTENTION (1<<6)
void EwinShapeSet(EWin * ewin); void EwinShapeSet(EWin * ewin);
void RaiseEwin(EWin * ewin); void EwinRaise(EWin * ewin);
void LowerEwin(EWin * ewin); void EwinLower(EWin * ewin);
void ShowEwin(EWin * ewin); void EwinShow(EWin * ewin);
void HideEwin(EWin * ewin); void EwinHide(EWin * ewin);
void DetermineEwinFloat(EWin * ewin, int dx, int dy); void DetermineEwinFloat(EWin * ewin, int dx, int dy);
EWin *GetEwinPointerInClient(void); EWin *GetEwinPointerInClient(void);
EWin *GetEwinByCurrentPointer(void); EWin *GetEwinByCurrentPointer(void);

View File

@ -142,7 +142,7 @@ AutoraiseTimeout(int val, void *data __UNUSED__)
ewin = EwinFindByClient(val); ewin = EwinFindByClient(val);
if (ewin) if (ewin)
RaiseEwin(ewin); EwinRaise(ewin);
} }
static void static void
@ -394,7 +394,7 @@ doFocusToEwin(EWin * ewin, int why)
} }
if (do_raise) if (do_raise)
RaiseEwin(ewin); EwinRaise(ewin);
if (Conf.focus.warp_always) if (Conf.focus.warp_always)
do_warp = 1; do_warp = 1;
@ -609,7 +609,7 @@ void
FocusHandleClick(EWin * ewin, Win win) FocusHandleClick(EWin * ewin, Win win)
{ {
if (Conf.focus.clickraises) if (Conf.focus.clickraises)
RaiseEwin(ewin); EwinRaise(ewin);
if (Conf.focus.mode == MODE_FOCUS_CLICK || ewin->props.focusclick) if (Conf.focus.mode == MODE_FOCUS_CLICK || ewin->props.focusclick)
FocusToEWin(ewin, FOCUS_CLICK); FocusToEWin(ewin, FOCUS_CLICK);

View File

@ -785,7 +785,7 @@ GNOME_ProcessClientMessage(XClientMessageEvent * event)
EoSetLayer(ewin, val); EoSetLayer(ewin, val);
ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), a4, ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), a4,
&val, 1); &val, 1);
RaiseEwin(ewin); EwinRaise(ewin);
} }
return; return;
} }

View File

@ -108,7 +108,7 @@ ICCCM_Delete(const EWin * ewin)
{ {
if (EwinIsInternal(ewin)) if (EwinIsInternal(ewin))
{ {
HideEwin((EWin *) ewin); EwinHide((EWin *) ewin);
return; return;
} }

View File

@ -620,7 +620,7 @@ IconboxShow(Iconbox * ib)
EwinMove(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin)); EwinMove(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin));
} }
ShowEwin(ewin); EwinShow(ewin);
} }
/* /*

View File

@ -83,7 +83,7 @@ IB_SnapEWin(EWin * ewin, int size)
if (ewin->state.shaded) if (ewin->state.shaded)
EwinInstantUnShade(ewin); EwinInstantUnShade(ewin);
RaiseEwin(ewin); EwinRaise(ewin);
w = h = size; w = h = size;

View File

@ -177,7 +177,7 @@ MenuHide(Menu * m)
{ {
EUnmapWindow(m->win); EUnmapWindow(m->win);
EReparentWindow(m->win, VRoot.win, ewin->client.x, ewin->client.y); EReparentWindow(m->win, VRoot.win, ewin->client.x, ewin->client.y);
HideEwin(ewin); EwinHide(ewin);
} }
m->ewin = NULL; m->ewin = NULL;
@ -275,8 +275,8 @@ MenuShow(Menu * m, char noshow)
if (ewin) if (ewin)
{ {
#if 0 /* ??? */ #if 0 /* ??? */
RaiseEwin(ewin); EwinRaise(ewin);
ShowEwin(ewin); EwinShow(ewin);
return; return;
#else #else
MenuHide(m); MenuHide(m);
@ -357,7 +357,7 @@ MenuShow(Menu * m, char noshow)
{ {
ICCCM_Cmap(NULL); ICCCM_Cmap(NULL);
EwinOpFloatAt(ewin, OPSRC_NA, EoGetX(ewin), EoGetY(ewin)); EwinOpFloatAt(ewin, OPSRC_NA, EoGetX(ewin), EoGetY(ewin));
ShowEwin(ewin); EwinShow(ewin);
if (Conf.menus.animate) if (Conf.menus.animate)
EwinUnShade(ewin); EwinUnShade(ewin);
} }
@ -637,7 +637,7 @@ MenuRepack(Menu * m)
ICCCM_SetSizeConstraints(ewin, m->w, m->h, m->w, m->h, 0, 0, 1, 1, ICCCM_SetSizeConstraints(ewin, m->w, m->h, m->w, m->h, 0, 0, 1, 1,
0.0, 65535.0); 0.0, 65535.0);
EwinResize(ewin, m->w, m->h); EwinResize(ewin, m->w, m->h);
RaiseEwin(ewin); EwinRaise(ewin);
} }
void void
@ -1582,8 +1582,8 @@ SubmenuShowTimeout(int val __UNUSED__, void *dat)
EwinMove(ewin2, EoGetX(ewin) + xo, EoGetY(ewin) + yo); EwinMove(ewin2, EoGetX(ewin) + xo, EoGetY(ewin) + yo);
Mode.move.check = 1; Mode.move.check = 1;
EwinOpFloatAt(ewin2, OPSRC_NA, EoGetX(ewin2), EoGetY(ewin2)); EwinOpFloatAt(ewin2, OPSRC_NA, EoGetX(ewin2), EoGetY(ewin2));
RaiseEwin(ewin2); EwinRaise(ewin2);
ShowEwin(ewin2); EwinShow(ewin2);
if (Conf.menus.animate) if (Conf.menus.animate)
EwinUnShade(ewin2); EwinUnShade(ewin2);

View File

@ -86,7 +86,7 @@ ActionMoveStart(EWin * ewin, int grab, char constrained, int nogroup)
Mode_mr.win_x = Mode.events.x - (EoGetX(ewin) + EoGetX(EoGetDesk(ewin))); Mode_mr.win_x = Mode.events.x - (EoGetX(ewin) + EoGetX(EoGetDesk(ewin)));
Mode_mr.win_y = Mode.events.y - (EoGetY(ewin) + EoGetY(EoGetDesk(ewin))); Mode_mr.win_y = Mode.events.y - (EoGetY(ewin) + EoGetY(EoGetDesk(ewin)));
RaiseEwin(ewin); EwinRaise(ewin);
gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, nogroup gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_MOVE, nogroup
|| Mode.move.swap, &num); || Mode.move.swap, &num);

View File

@ -648,7 +648,7 @@ PagerShow(Pager * p)
if (p->ewin) if (p->ewin)
{ {
ShowEwin(p->ewin); EwinShow(p->ewin);
return; return;
} }
@ -691,7 +691,7 @@ PagerShow(Pager * p)
VRoot.h - (DesksGetNumber() - p->dsk->num) * EoGetH(ewin)); VRoot.h - (DesksGetNumber() - p->dsk->num) * EoGetH(ewin));
} }
ShowEwin(ewin); EwinShow(ewin);
} }
static void static void
@ -956,7 +956,7 @@ PagerMenuShow(Pager * p, int x, int y)
static void static void
PagerClose(Pager * p) PagerClose(Pager * p)
{ {
HideEwin(p->ewin); EwinHide(p->ewin);
} }
static void static void
@ -1372,7 +1372,7 @@ PagerHandleMouseUp(Pager * p, int px, int py, int button)
ewin = EwinInPagerAt(p, px, py); ewin = EwinInPagerAt(p, px, py);
if (ewin) if (ewin)
{ {
RaiseEwin(ewin); EwinRaise(ewin);
FocusToEWin(ewin, FOCUS_SET); FocusToEWin(ewin, FOCUS_SET);
} }
} }

View File

@ -335,7 +335,7 @@ WarpFocus(int delta)
WarpFocusShow(); WarpFocusShow();
if (Conf.focus.raise_on_next) if (Conf.focus.raise_on_next)
RaiseEwin(ewin); EwinRaise(ewin);
if (Conf.focus.warp_on_next) if (Conf.focus.warp_on_next)
if (ewin != Mode.mouse_over_ewin && !ewin->state.iconified) if (ewin != Mode.mouse_over_ewin && !ewin->state.iconified)
{ {
@ -358,7 +358,7 @@ WarpFocusClick(int ix)
if (!EwinFindByPtr(ewin)) if (!EwinFindByPtr(ewin))
return; return;
RaiseEwin(ewin); EwinRaise(ewin);
if (ewin->state.iconified) if (ewin->state.iconified)
EwinDeIconify(ewin); EwinDeIconify(ewin);
FocusToEWin(ewin, FOCUS_SET); FocusToEWin(ewin, FOCUS_SET);
@ -381,7 +381,7 @@ WarpFocusFinish(void)
if (ewin->state.shaded) if (ewin->state.shaded)
EwinUnShade(ewin); EwinUnShade(ewin);
if (Conf.warplist.raise_on_select) if (Conf.warplist.raise_on_select)
RaiseEwin(ewin); EwinRaise(ewin);
if (Conf.warplist.warp_on_select) if (Conf.warplist.warp_on_select)
if (ewin != Mode.mouse_over_ewin) if (ewin != Mode.mouse_over_ewin)
{ {

View File

@ -246,7 +246,7 @@ Zoom(EWin * ewin)
y2 = mode->vdisplay - ewin->client.h - y1; y2 = mode->vdisplay - ewin->client.h - y1;
if (y2 < 0) if (y2 < 0)
y2 = 0; y2 = 0;
RaiseEwin(ewin); EwinRaise(ewin);
EwinBorderGetSize(ewin, &bl, &br, &bt, &bb); EwinBorderGetSize(ewin, &bl, &br, &bt, &bb);
EwinMove(ewin, -bl + x1, -bt + y1); EwinMove(ewin, -bl + x1, -bt + y1);
FocusToEWin(ewin, FOCUS_SET); FocusToEWin(ewin, FOCUS_SET);