Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: dialog.c ewin-ops.c ewins.c ewins.h focus.c gnome.c icccm.c iconify.c icons.c menus.c moveresize.c pager.c warp.c zoom.c Log Message: Trivial renaming. =================================================================== RCS file: /cvs/e/e16/e/src/dialog.c,v retrieving revision 1.153 retrieving revision 1.154 diff -u -3 -r1.153 -r1.154 --- dialog.c 29 Apr 2006 19:39:20 -0000 1.153 +++ dialog.c 3 May 2006 20:52:15 -0000 1.154 @@ -593,8 +593,8 @@ if (EoGetDesk(ewin) != DesksGetCurrent()) EwinMoveToDesktop(ewin, DesksGetCurrent()); #endif - RaiseEwin(ewin); - ShowEwin(ewin); + EwinRaise(ewin); + EwinShow(ewin); return; } @@ -663,7 +663,7 @@ DialogRedraw(d); DialogUpdate(d); - ShowEwin(ewin); + EwinShow(ewin); } void @@ -687,7 +687,7 @@ if (d->exit_func) d->exit_func(d, d->exit_val, NULL); - HideEwin(d->ewin); + EwinHide(d->ewin); } static DItem * =================================================================== RCS file: /cvs/e/e16/e/src/ewin-ops.c,v retrieving revision 1.96 retrieving revision 1.97 diff -u -3 -r1.96 -r1.97 --- ewin-ops.c 22 Apr 2006 22:00:01 -0000 1.96 +++ ewin-ops.c 3 May 2006 20:52:15 -0000 1.97 @@ -492,7 +492,7 @@ if (raise) { EoSetFloating(ewin, floating); - RaiseEwin(ewin); + EwinRaise(ewin); } if (Mode.mode == MODE_NONE || Conf.movres.update_while_moving) @@ -652,7 +652,7 @@ ModulesSignal(ESIGNAL_EWIN_ICONIFY, ewin); ewin->state.iconified = 1; - HideEwin(ewin); + EwinHide(ewin); /* Save position at which the window was iconified */ EwinRememberPositionSet(ewin); @@ -733,8 +733,8 @@ ewin->state.iconified = 0; ewin->state.showingdesk = 0; - RaiseEwin(ewin); - ShowEwin(ewin); + EwinRaise(ewin); + EwinShow(ewin); ICCCM_DeIconify(ewin); lst = EwinListTransients(ewin, &num, 0); @@ -1386,7 +1386,7 @@ Efree(lst); } - RaiseEwin(ewin); + EwinRaise(ewin); EwinMoveResize(ewin, x, y, w, h); ewin->state.maximized_horz = ewin->state.maximized_vert = 0; ewin->state.fullscreen = 1; @@ -1414,7 +1414,7 @@ ewin->state.fullscreen = 0; EwinStateUpdate(ewin); - RaiseEwin(ewin); + EwinRaise(ewin); EwinMoveResize(ewin, x, y, w, h); } @@ -1515,7 +1515,7 @@ gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_RAISE, Mode.nogroup, &num); for (i = 0; i < num; i++) - RaiseEwin(gwins[i]); + EwinRaise(gwins[i]); Efree(gwins); } @@ -1529,7 +1529,7 @@ gwins = ListWinGroupMembersForEwin(ewin, GROUP_ACTION_LOWER, Mode.nogroup, &num); for (i = 0; i < num; i++) - LowerEwin(gwins[i]); + EwinLower(gwins[i]); Efree(gwins); } @@ -1581,13 +1581,13 @@ { SoundPlay("SOUND_LOWER"); for (j = 0; j < gnum; j++) - LowerEwin(gwins[j]); + EwinLower(gwins[j]); } else { SoundPlay("SOUND_RAISE"); for (j = 0; j < gnum; j++) - RaiseEwin(gwins[j]); + EwinRaise(gwins[j]); } if (gwins) @@ -1747,7 +1747,7 @@ SoundPlay("SOUND_WINDOW_CHANGE_LAYER_UP"); } EoSetLayer(ewin, layer); - RaiseEwin(ewin); + EwinRaise(ewin); EwinStateUpdate(ewin); HintsSetWindowState(ewin); SnapshotEwinUpdate(ewin, SNAP_USE_LAYER); @@ -1825,7 +1825,7 @@ EoSetSticky(ewin, 0); EwinMoveToDesktop(ewin, dsk); - RaiseEwin(ewin); + EwinRaise(ewin); EwinBorderUpdateState(ewin); EwinStateUpdate(ewin); HintsSetWindowState(ewin); =================================================================== RCS file: /cvs/e/e16/e/src/ewins.c,v retrieving revision 1.160 retrieving revision 1.161 diff -u -3 -r1.160 -r1.161 --- ewins.c 29 Apr 2006 19:39:21 -0000 1.160 +++ ewins.c 3 May 2006 20:52:15 -0000 1.161 @@ -800,7 +800,7 @@ EwinOpFullscreen(ewin, OPSRC_WM, 2); ewin->state.placed = 1; EwinMoveToDesktopAt(ewin, dsk, EoGetX(ewin), EoGetY(ewin)); - ShowEwin(ewin); + EwinShow(ewin); goto done; } @@ -894,7 +894,7 @@ y = Mode.events.y + 1; EwinMoveToDesktopAt(ewin, dsk, x, y); EwinMove(ewin, x, y); - ShowEwin(ewin); + EwinShow(ewin); GrabPointerSet(VRoot.win, ECSR_GRAB, 0); Mode.place.doing_manual = 1; EoSetFloating(ewin, 1); /* Causes reparenting to root */ @@ -929,7 +929,7 @@ FocusEnable(0); EwinMoveToDesktopAt(ewin, dsk, fx, fy); - ShowEwin(ewin); + EwinShow(ewin); ewin->req_x = x; ewin->req_y = y; DoIn("Slide", 0.05, EwinSlideIn, 0, ewin); @@ -937,7 +937,7 @@ else { EwinMoveToDesktopAt(ewin, dsk, x, y); - ShowEwin(ewin); + EwinShow(ewin); } done: @@ -1082,7 +1082,7 @@ _EwinGetClientXwin(ewin)); EReparentWindow(_EwinGetClientWin(ewin), ewin->win_container, 0, 0); - ShowEwin(ewin); + EwinShow(ewin); } else AddToFamily(NULL, win); @@ -1229,9 +1229,9 @@ if (Mode.mode == MODE_NONE) { if (xwc.stack_mode == Above) - RaiseEwin(ewin); + EwinRaise(ewin); else if (xwc.stack_mode == Below) - LowerEwin(ewin); + EwinLower(ewin); } } @@ -1282,9 +1282,9 @@ if (ewin) { if (ev->xcirculaterequest.place == PlaceOnTop) - RaiseEwin(ewin); + EwinRaise(ewin); else - LowerEwin(ewin); + EwinLower(ewin); } else { @@ -1338,7 +1338,7 @@ } void -RaiseEwin(EWin * ewin) +EwinRaise(EWin * ewin) { static int call_depth = 0; EWin **lst; @@ -1351,7 +1351,7 @@ num = EoRaise(ewin); 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); if (num == 0) /* Quit if stacking is unchanged */ @@ -1359,7 +1359,7 @@ lst = EwinListTransients(ewin, &num, 1); for (i = 0; i < num; i++) - RaiseEwin(lst[i]); + EwinRaise(lst[i]); if (lst) Efree(lst); @@ -1371,7 +1371,7 @@ } void -LowerEwin(EWin * ewin) +EwinLower(EWin * ewin) { static int call_depth = 0; EWin **lst; @@ -1384,7 +1384,7 @@ num = EoLower(ewin); 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); if (num == 0) /* Quit if stacking is unchanged */ @@ -1392,7 +1392,7 @@ lst = EwinListTransientFor(ewin, &num); for (i = 0; i < num; i++) - LowerEwin(lst[i]); + EwinLower(lst[i]); if (lst) Efree(lst); @@ -1404,7 +1404,7 @@ } void -ShowEwin(EWin * ewin) +EwinShow(EWin * ewin) { if (EoIsShown(ewin)) return; @@ -1434,7 +1434,7 @@ } void -HideEwin(EWin * ewin) +EwinHide(EWin * ewin) { if (!EwinIsInternal(ewin) && (!EoIsShown(ewin) || !EwinIsMapped(ewin))) return; =================================================================== RCS file: /cvs/e/e16/e/src/ewins.h,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- ewins.h 29 Apr 2006 19:39:21 -0000 1.49 +++ ewins.h 3 May 2006 20:52:15 -0000 1.50 @@ -291,10 +291,10 @@ #define EWIN_CHANGE_ATTENTION (1<<6) void EwinShapeSet(EWin * ewin); -void RaiseEwin(EWin * ewin); -void LowerEwin(EWin * ewin); -void ShowEwin(EWin * ewin); -void HideEwin(EWin * ewin); +void EwinRaise(EWin * ewin); +void EwinLower(EWin * ewin); +void EwinShow(EWin * ewin); +void EwinHide(EWin * ewin); void DetermineEwinFloat(EWin * ewin, int dx, int dy); EWin *GetEwinPointerInClient(void); EWin *GetEwinByCurrentPointer(void); =================================================================== RCS file: /cvs/e/e16/e/src/focus.c,v retrieving revision 1.149 retrieving revision 1.150 diff -u -3 -r1.149 -r1.150 --- focus.c 29 Apr 2006 19:39:21 -0000 1.149 +++ focus.c 3 May 2006 20:52:15 -0000 1.150 @@ -142,7 +142,7 @@ ewin = EwinFindByClient(val); if (ewin) - RaiseEwin(ewin); + EwinRaise(ewin); } static void @@ -394,7 +394,7 @@ } if (do_raise) - RaiseEwin(ewin); + EwinRaise(ewin); if (Conf.focus.warp_always) do_warp = 1; @@ -609,7 +609,7 @@ FocusHandleClick(EWin * ewin, Win win) { if (Conf.focus.clickraises) - RaiseEwin(ewin); + EwinRaise(ewin); if (Conf.focus.mode == MODE_FOCUS_CLICK || ewin->props.focusclick) FocusToEWin(ewin, FOCUS_CLICK); =================================================================== RCS file: /cvs/e/e16/e/src/gnome.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -3 -r1.65 -r1.66 --- gnome.c 29 Apr 2006 19:39:21 -0000 1.65 +++ gnome.c 3 May 2006 20:52:15 -0000 1.66 @@ -785,7 +785,7 @@ EoSetLayer(ewin, val); ecore_x_window_prop_card32_set(_EwinGetClientXwin(ewin), a4, &val, 1); - RaiseEwin(ewin); + EwinRaise(ewin); } return; } =================================================================== RCS file: /cvs/e/e16/e/src/icccm.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -3 -r1.124 -r1.125 --- icccm.c 29 Apr 2006 19:39:21 -0000 1.124 +++ icccm.c 3 May 2006 20:52:15 -0000 1.125 @@ -108,7 +108,7 @@ { if (EwinIsInternal(ewin)) { - HideEwin((EWin *) ewin); + EwinHide((EWin *) ewin); return; } =================================================================== RCS file: /cvs/e/e16/e/src/iconify.c,v retrieving revision 1.203 retrieving revision 1.204 diff -u -3 -r1.203 -r1.204 --- iconify.c 29 Apr 2006 19:39:21 -0000 1.203 +++ iconify.c 3 May 2006 20:52:15 -0000 1.204 @@ -620,7 +620,7 @@ EwinMove(ewin, VRoot.w - EoGetW(ewin), VRoot.h - EoGetH(ewin)); } - ShowEwin(ewin); + EwinShow(ewin); } /* =================================================================== RCS file: /cvs/e/e16/e/src/icons.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- icons.c 18 Apr 2006 16:26:51 -0000 1.11 +++ icons.c 3 May 2006 20:52:15 -0000 1.12 @@ -83,7 +83,7 @@ if (ewin->state.shaded) EwinInstantUnShade(ewin); - RaiseEwin(ewin); + EwinRaise(ewin); w = h = size; =================================================================== RCS file: /cvs/e/e16/e/src/menus.c,v retrieving revision 1.243 retrieving revision 1.244 diff -u -3 -r1.243 -r1.244 --- menus.c 30 Apr 2006 13:15:52 -0000 1.243 +++ menus.c 3 May 2006 20:52:15 -0000 1.244 @@ -177,7 +177,7 @@ { EUnmapWindow(m->win); EReparentWindow(m->win, VRoot.win, ewin->client.x, ewin->client.y); - HideEwin(ewin); + EwinHide(ewin); } m->ewin = NULL; @@ -275,8 +275,8 @@ if (ewin) { #if 0 /* ??? */ - RaiseEwin(ewin); - ShowEwin(ewin); + EwinRaise(ewin); + EwinShow(ewin); return; #else MenuHide(m); @@ -357,7 +357,7 @@ { ICCCM_Cmap(NULL); EwinOpFloatAt(ewin, OPSRC_NA, EoGetX(ewin), EoGetY(ewin)); - ShowEwin(ewin); + EwinShow(ewin); if (Conf.menus.animate) EwinUnShade(ewin); } @@ -637,7 +637,7 @@ ICCCM_SetSizeConstraints(ewin, m->w, m->h, m->w, m->h, 0, 0, 1, 1, 0.0, 65535.0); EwinResize(ewin, m->w, m->h); - RaiseEwin(ewin); + EwinRaise(ewin); } void @@ -1582,8 +1582,8 @@ EwinMove(ewin2, EoGetX(ewin) + xo, EoGetY(ewin) + yo); Mode.move.check = 1; EwinOpFloatAt(ewin2, OPSRC_NA, EoGetX(ewin2), EoGetY(ewin2)); - RaiseEwin(ewin2); - ShowEwin(ewin2); + EwinRaise(ewin2); + EwinShow(ewin2); if (Conf.menus.animate) EwinUnShade(ewin2); =================================================================== RCS file: /cvs/e/e16/e/src/moveresize.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- moveresize.c 16 Apr 2006 13:27:38 -0000 1.68 +++ moveresize.c 3 May 2006 20:52:15 -0000 1.69 @@ -86,7 +86,7 @@ Mode_mr.win_x = Mode.events.x - (EoGetX(ewin) + EoGetX(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 || Mode.move.swap, &num); =================================================================== RCS file: /cvs/e/e16/e/src/pager.c,v retrieving revision 1.211 retrieving revision 1.212 diff -u -3 -r1.211 -r1.212 --- pager.c 29 Apr 2006 19:39:21 -0000 1.211 +++ pager.c 3 May 2006 20:52:15 -0000 1.212 @@ -648,7 +648,7 @@ if (p->ewin) { - ShowEwin(p->ewin); + EwinShow(p->ewin); return; } @@ -691,7 +691,7 @@ VRoot.h - (DesksGetNumber() - p->dsk->num) * EoGetH(ewin)); } - ShowEwin(ewin); + EwinShow(ewin); } static void @@ -956,7 +956,7 @@ static void PagerClose(Pager * p) { - HideEwin(p->ewin); + EwinHide(p->ewin); } static void @@ -1372,7 +1372,7 @@ ewin = EwinInPagerAt(p, px, py); if (ewin) { - RaiseEwin(ewin); + EwinRaise(ewin); FocusToEWin(ewin, FOCUS_SET); } } =================================================================== RCS file: /cvs/e/e16/e/src/warp.c,v retrieving revision 1.93 retrieving revision 1.94 diff -u -3 -r1.93 -r1.94 --- warp.c 29 Apr 2006 19:39:21 -0000 1.93 +++ warp.c 3 May 2006 20:52:15 -0000 1.94 @@ -335,7 +335,7 @@ WarpFocusShow(); if (Conf.focus.raise_on_next) - RaiseEwin(ewin); + EwinRaise(ewin); if (Conf.focus.warp_on_next) if (ewin != Mode.mouse_over_ewin && !ewin->state.iconified) { @@ -358,7 +358,7 @@ if (!EwinFindByPtr(ewin)) return; - RaiseEwin(ewin); + EwinRaise(ewin); if (ewin->state.iconified) EwinDeIconify(ewin); FocusToEWin(ewin, FOCUS_SET); @@ -381,7 +381,7 @@ if (ewin->state.shaded) EwinUnShade(ewin); if (Conf.warplist.raise_on_select) - RaiseEwin(ewin); + EwinRaise(ewin); if (Conf.warplist.warp_on_select) if (ewin != Mode.mouse_over_ewin) { =================================================================== RCS file: /cvs/e/e16/e/src/zoom.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- zoom.c 29 Apr 2006 19:39:21 -0000 1.36 +++ zoom.c 3 May 2006 20:52:15 -0000 1.37 @@ -246,7 +246,7 @@ y2 = mode->vdisplay - ewin->client.h - y1; if (y2 < 0) y2 = 0; - RaiseEwin(ewin); + EwinRaise(ewin); EwinBorderGetSize(ewin, &bl, &br, &bt, &bb); EwinMove(ewin, -bl + x1, -bt + y1); FocusToEWin(ewin, FOCUS_SET); ------------------------------------------------------- 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