Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h backgrounds.c buttons.c desktops.c ewin-ops.c ewins.c
ewmh.c focus.c gnome.c iclass.c ipc.c main.c pager.c
Log Message:
Desktop fixes, namespace cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -3 -r1.376 -r1.377
--- E.h 24 Feb 2005 22:07:32 -0000 1.376
+++ E.h 26 Feb 2005 16:40:36 -0000 1.377
@@ -1364,22 +1364,20 @@
void SlideWindowTo(Window win, int fx, int fy, int tx, int ty,
int speed);
-void RefreshDesktop(int num);
-void DesktopsRefresh(void);
-void DesktopSetBg(int desk, Background * bg, int refresh);
+void DeskRefresh(int num);
+void DesksRefresh(void);
+void DeskSetBg(int desk, Background * bg, int refresh);
int DesktopAt(int x, int y);
-void GotoDesktop(int num);
-void MoveDesktop(int num, int x, int y);
-void RaiseDesktop(int num);
-void LowerDesktop(int num);
-void HideDesktop(int num);
-void ShowDesktop(int num);
+void DeskGoto(int num);
+void DeskRaise(int num);
+void DeskLower(int num);
+void DeskMove(int num, int x, int y);
+void DeskHide(int num);
+void DeskShow(int num);
void StackDesktops(void);
void StackDesktop(int num);
-void DesktopAddEwinToBottom(EWin * ewin);
-void DesktopAddEwinToTop(EWin * ewin);
-void GotoDesktopByEwin(EWin * ewin);
-void DesktopsEventsConfigure(int mode);
+void DeskGotoByEwin(EWin * ewin);
+void DesksEventsConfigure(int mode);
void DeskDragStart(int desk);
void DeskDragMotion(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- backgrounds.c 22 Feb 2005 21:44:28 -0000 1.16
+++ backgrounds.c 26 Feb 2005 16:40:36 -0000 1.17
@@ -1022,7 +1022,7 @@
bg = BackgroundCreate(name, &xclr, bg1, i1, i2,
i3, i4, i5, i6, bg2, j1,
j2, j3, j4, j5);
- DesktopSetBg(atoi(s2), bg, 0);
+ DeskSetBg(atoi(s2), bg, 0);
}
}
}
@@ -1034,7 +1034,7 @@
(Conf.backgrounds.user))
{
if (bg)
- DesktopSetBg(atoi(s2), bg, 0);
+ DeskSetBg(atoi(s2), bg, 0);
}
}
}
@@ -1327,7 +1327,7 @@
for (i = 0; i < DesksGetNumber(); i++)
{
if (DeskGetBackground(i) == tmp_bg)
- DesktopSetBg(i, tmp_bg, 1);
+ DeskSetBg(i, tmp_bg, 1);
}
{
@@ -1496,7 +1496,7 @@
DialogItemSliderSetVal(bg_sel_slider, 0);
DialogDrawItems(bg_sel_dialog, bg_sel_slider, 0, 0, 99999, 99999);
- DesktopSetBg(DesksGetCurrent(), tmp_bg, 0);
+ DeskSetBg(DesksGetCurrent(), tmp_bg, 0);
BG_RedrawView(0);
@@ -1534,7 +1534,7 @@
}
}
- DesktopSetBg(DesksGetCurrent(), bg, 0);
+ DeskSetBg(DesksGetCurrent(), bg, 0);
if (val == 0)
BackgroundDestroy(tmp_bg);
else
@@ -1730,7 +1730,7 @@
{
BackgroundImagesKeep(tmp_bg, 0);
BgDialogSetNewCurrent(bglist[tmp_bg_selected]);
- DesktopSetBg(DesksGetCurrent(), tmp_bg, 0);
+ DeskSetBg(DesksGetCurrent(), tmp_bg, 0);
autosave();
}
if (bglist)
@@ -1802,7 +1802,7 @@
if ((bglist[i] == tmp_bg) && (i > 0))
{
BGSettingsGoTo(bglist[i - 1]);
- DesktopSetBg(DesksGetCurrent(), bglist[i - 1], 0);
+ DeskSetBg(DesksGetCurrent(), bglist[i - 1], 0);
break;
}
}
@@ -1822,7 +1822,7 @@
if ((bglist[i] == tmp_bg) && (i < (num - 1)))
{
BGSettingsGoTo(bglist[i + 1]);
- DesktopSetBg(DesksGetCurrent(), bglist[i + 1], 0);
+ DeskSetBg(DesksGetCurrent(), bglist[i + 1], 0);
break;
}
}
@@ -2352,7 +2352,7 @@
* above here
* --Mandrake
*/
- RefreshDesktop(DesksGetCurrent());
+ DeskRefresh(DesksGetCurrent());
}
/*
@@ -2490,7 +2490,7 @@
for (i = 0; i < DesksGetNumber(); i++)
{
if (DeskGetBackground(i) == bg)
- DesktopSetBg(i, bg, 0);
+ DeskSetBg(i, bg, 0);
}
}
}
@@ -2598,7 +2598,7 @@
num = DesksGetCurrent();
sscanf(p, "%d %n", &num, &len);
- DesktopSetBg(num, bg, 1);
+ DeskSetBg(num, bg, 1);
autosave();
}
else if (!strncmp(cmd, "xget", 2))
@@ -2644,7 +2644,7 @@
if (!w[0])
break;
i = atoi(w);
- DesktopSetBg(i, bg, 1);
+ DeskSetBg(i, bg, 1);
}
autosave();
}
@@ -2682,7 +2682,7 @@
for (i = 0; i < DesksGetNumber(); i++)
{
if ((desks.desk[i].bg == bg) && (desks.desk[i].viewable))
- RefreshDesktop(i);
+ DeskRefresh(i);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/buttons.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- buttons.c 2 Feb 2005 17:11:34 -0000 1.46
+++ buttons.c 26 Feb 2005 16:40:36 -0000 1.47
@@ -735,8 +735,8 @@
ButtonMoveRelative(b, dx, dy);
if (Conf.deskmode == MODE_DESKRAY)
{
- MoveDesktop(Mode.deskdrag, DeskGetX(Mode.deskdrag),
- DeskGetY(Mode.deskdrag) + dy);
+ DeskMove(Mode.deskdrag, DeskGetX(Mode.deskdrag),
+ DeskGetY(Mode.deskdrag) + dy);
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- desktops.c 22 Feb 2005 21:44:31 -0000 1.124
+++ desktops.c 26 Feb 2005 16:40:36 -0000 1.125
@@ -83,7 +83,6 @@
Conf.desks.dragbar_length = VRoot.w;
Esnprintf(s, sizeof(s), "DRAGBAR_DESKTOP_%i", d->num);
-
ac = FindItem(s, 0, LIST_FINDBY_NAME, LIST_TYPE_ACLASS);
if (!ac)
{
@@ -136,7 +135,7 @@
Esnprintf(s, sizeof(s), "desk raise %i", d->num);
ActionAddTo(a, s);
t = _("Click here to raise this desktop\nto the top.\n");
- ActionclassSetTooltipString(ac, t);
+ ActionclassSetTooltipString(ac2, t);
}
Esnprintf(s, sizeof(s), "LOWERBUTTON_DESKTOP_%i", d->num);
@@ -150,7 +149,7 @@
Esnprintf(s, sizeof(s), "desk lower %i", d->num);
ActionAddTo(a, s);
t = _("Click here to lower this desktop\nto the bottom.\n");
- ActionclassSetTooltipString(ac, t);
+ ActionclassSetTooltipString(ac3, t);
}
if (Conf.desks.dragdir < 2)
@@ -420,7 +419,7 @@
{
rnd = rand();
rnd %= num;
- DesktopSetBg(desk, lst[rnd], 0);
+ DeskSetBg(desk, lst[rnd], 0);
Efree(lst);
}
}
@@ -486,7 +485,7 @@
EMoveWindow(EoGetWin(d), VRoot.w, 0);
}
BackgroundPixmapFree(d->bg);
- RefreshDesktop(desk);
+ DeskRefresh(desk);
DeskControlsDestroy(d);
DeskControlsCreate(d);
DeskControlsShow(d);
@@ -611,7 +610,7 @@
}
void
-DesktopsEventsConfigure(int mode)
+DesksEventsConfigure(int mode)
{
int i;
@@ -633,7 +632,7 @@
pnum = Conf.desks.num;
for (i = quantity; i < Conf.desks.num; i++)
- LowerDesktop(i);
+ DeskLower(i);
Conf.desks.num = quantity;
if (Conf.desks.num > pnum)
@@ -660,9 +659,11 @@
}
}
if (DesksGetCurrent() >= Conf.desks.num)
- GotoDesktop(Conf.desks.num - 1);
+ DeskGoto(Conf.desks.num - 1);
HintsSetDesktopConfig();
+
+ autosave();
}
static void
@@ -709,11 +710,13 @@
/* Restack buttons - Hmmm. */
StackDesktops();
+
+ autosave();
}
#if 0 /* Unused */
static void
-ShowDesktopTabs(void)
+DeskShowTabs(void)
{
Button **blst;
int num, i;
@@ -729,7 +732,7 @@
}
static void
-HideDesktopTabs(void)
+DeskHideTabs(void)
{
Button **blst;
int num, i;
@@ -746,7 +749,7 @@
#endif
static void
-ShowDesktopButtons(void)
+DeskShowButtons(void)
{
Button **blst;
int i, num;
@@ -836,7 +839,7 @@
}
void
-RefreshDesktop(int desk)
+DeskRefresh(int desk)
{
Desk *d;
Background *bg;
@@ -848,7 +851,7 @@
return;
if (EventDebug(EDBUG_TYPE_DESKS))
- Eprintf("RefreshDesktop %d\n", desk);
+ Eprintf("DeskRefresh %d\n", desk);
d = _DeskGet(desk);
@@ -862,7 +865,7 @@
}
void
-DesktopsRefresh(void)
+DesksRefresh(void)
{
Desk *d;
int i;
@@ -871,12 +874,12 @@
{
d = _DeskGet(i);
if (d->bg)
- DesktopSetBg(i, d->bg, 1);
+ DeskSetBg(i, d->bg, 1);
}
}
void
-DesktopSetBg(int desk, Background * bg, int refresh)
+DeskSetBg(int desk, Background * bg, int refresh)
{
Desk *d;
@@ -902,7 +905,7 @@
d->bg = bg;
if (d->viewable)
- RefreshDesktop(desk);
+ DeskRefresh(desk);
ModulesSignal(ESIGNAL_BACKGROUND_CHANGE, (void *)desk);
}
@@ -967,7 +970,7 @@
}
void
-GotoDesktop(int desk)
+DeskGoto(int desk)
{
static int pdesk = -1;
Desk *d;
@@ -984,7 +987,7 @@
return;
if (EventDebug(EDBUG_TYPE_DESKS))
- Eprintf("GotoDesktop %d\n", desk);
+ Eprintf("DeskGoto %d\n", desk);
ModulesSignal(ESIGNAL_DESK_SWITCH_START, NULL);
@@ -1006,26 +1009,26 @@
switch (Conf.desks.dragdir)
{
case 0:
- MoveDesktop(desk, VRoot.w, 0);
- RaiseDesktop(desk);
+ DeskMove(desk, VRoot.w, 0);
+ DeskRaise(desk);
SlideWindowTo(EoGetWin(d), VRoot.w, 0, 0, 0,
Conf.desks.slidespeed);
break;
case 1:
- MoveDesktop(desk, -VRoot.w, 0);
- RaiseDesktop(desk);
+ DeskMove(desk, -VRoot.w, 0);
+ DeskRaise(desk);
SlideWindowTo(EoGetWin(d), -VRoot.w, 0, 0, 0,
Conf.desks.slidespeed);
break;
case 2:
- MoveDesktop(desk, 0, VRoot.h);
- RaiseDesktop(desk);
+ DeskMove(desk, 0, VRoot.h);
+ DeskRaise(desk);
SlideWindowTo(EoGetWin(d), 0, VRoot.h, 0, 0,
Conf.desks.slidespeed);
break;
case 3:
- MoveDesktop(desk, 0, -VRoot.h);
- RaiseDesktop(desk);
+ DeskMove(desk, 0, -VRoot.h);
+ DeskRaise(desk);
SlideWindowTo(EoGetWin(d), 0, -VRoot.h, 0, 0,
Conf.desks.slidespeed);
break;
@@ -1038,20 +1041,20 @@
GetWinXY(EoGetWin(d), &x, &y);
SlideWindowTo(EoGetWin(d), EoGetX(d), EoGetY(d), 0, 0,
Conf.desks.slidespeed);
- RaiseDesktop(desk);
+ DeskRaise(desk);
}
StackDesktops();
}
else
{
- RaiseDesktop(desk);
+ DeskRaise(desk);
StackDesktops();
}
- MoveDesktop(desk, 0, 0);
+ DeskMove(desk, 0, 0);
}
else
{
- RaiseDesktop(desk);
+ DeskRaise(desk);
}
ActionsResume();
@@ -1067,7 +1070,7 @@
}
void
-MoveDesktop(int desk, int x, int y)
+DeskMove(int desk, int x, int y)
{
Desk *d, *dd;
int i;
@@ -1132,7 +1135,7 @@
if ((!d->viewable) && (v))
{
d->viewable = v;
- RefreshDesktop(desks.order[i]);
+ DeskRefresh(desks.order[i]);
}
else
{
@@ -1174,13 +1177,13 @@
d = _DeskGet(desk);
d->viewable = 1;
- RefreshDesktop(desk);
+ DeskRefresh(desk);
if (desk != 0)
EMapWindow(EoGetWin(d));
}
void
-RaiseDesktop(int desk)
+DeskRaise(int desk)
{
Desk *d;
int i;
@@ -1191,18 +1194,18 @@
d = _DeskGet(desk);
if (EventDebug(EDBUG_TYPE_DESKS))
- Eprintf("RaiseDesktop %d\n", desk);
+ Eprintf("DeskRaise %d\n", desk);
FocusNewDeskBegin();
d->viewable = 1;
- RefreshDesktop(desk);
+ DeskRefresh(desk);
MoveToDeskTop(desk);
if (desk == 0)
{
for (i = Conf.desks.num - 1; i > 0; i--)
{
- HideDesktop(desks.order[i]);
+ DeskHide(desks.order[i]);
}
}
StackDesktops();
@@ -1222,7 +1225,7 @@
}
void
-LowerDesktop(int desk)
+DeskLower(int desk)
{
if ((desk <= 0) || (desk >= Conf.desks.num))
return;
@@ -1230,7 +1233,7 @@
FocusNewDeskBegin();
MoveToDeskBottom(desk);
UncoverDesktop(desks.order[0]);
- HideDesktop(desk);
+ DeskHide(desk);
StackDesktops();
desks.current = desks.order[0];
MoveStickyWindowsToCurrentDesk();
@@ -1247,7 +1250,7 @@
}
void
-HideDesktop(int desk)
+DeskHide(int desk)
{
Desk *d;
@@ -1263,7 +1266,7 @@
}
void
-ShowDesktop(int desk)
+DeskShow(int desk)
{
Desk *d;
int i;
@@ -1274,13 +1277,13 @@
d = _DeskGet(desk);
d->viewable = 1;
- RefreshDesktop(desk);
+ DeskRefresh(desk);
MoveToDeskTop(desk);
if (desk == 0)
{
for (i = Conf.desks.num - 1; i > 0; i--)
- HideDesktop(desks.order[i]);
+ DeskHide(desks.order[i]);
}
else
{
@@ -1383,11 +1386,11 @@
}
void
-GotoDesktopByEwin(EWin * ewin)
+DeskGotoByEwin(EWin * ewin)
{
if (!EoIsSticky(ewin))
{
- GotoDesktop(EoGetDesk(ewin));
+ DeskGoto(EoGetDesk(ewin));
SetCurrentArea(ewin->area_x, ewin->area_y);
}
}
@@ -1434,24 +1437,24 @@
case 0:
if ((EoGetX(d) + dx) < 0)
dx = -EoGetX(d);
- MoveDesktop(Mode.deskdrag, EoGetX(d) + dx, EoGetY(d));
+ DeskMove(Mode.deskdrag, EoGetX(d) + dx, EoGetY(d));
break;
case 1:
if ((EoGetX(d) + dx) > 0)
- MoveDesktop(Mode.deskdrag, 0, EoGetY(d));
+ DeskMove(Mode.deskdrag, 0, EoGetY(d));
else
- MoveDesktop(Mode.deskdrag, EoGetX(d) + dx, EoGetY(d));
+ DeskMove(Mode.deskdrag, EoGetX(d) + dx, EoGetY(d));
break;
case 2:
if ((EoGetY(d) + dy) < 0)
dy = -EoGetY(d);
- MoveDesktop(Mode.deskdrag, EoGetX(d), EoGetY(d) + dy);
+ DeskMove(Mode.deskdrag, EoGetX(d), EoGetY(d) + dy);
break;
case 3:
if ((EoGetY(d) + dy) > 0)
- MoveDesktop(Mode.deskdrag, EoGetX(d), 0);
+ DeskMove(Mode.deskdrag, EoGetX(d), 0);
else
- MoveDesktop(Mode.deskdrag, EoGetX(d), EoGetY(d) + dy);
+ DeskMove(Mode.deskdrag, EoGetX(d), EoGetY(d) + dy);
break;
default:
break;
@@ -1527,11 +1530,9 @@
int i;
for (i = 0; i < Conf.desks.num; i++)
- MoveDesktop(i, 0, 0);
+ DeskMove(i, 0, 0);
DesksControlsRefresh();
}
-
- autosave();
}
static void
@@ -1554,8 +1555,6 @@
{
DesksControlsRefresh();
}
-
- autosave();
}
#if 0 /* FIXME */
@@ -1574,7 +1573,6 @@
{
DesksControlsRefresh();
}
- autosave();
return 0;
}
@@ -1592,7 +1590,6 @@
{
DesksControlsRefresh();
}
- autosave();
return 0;
}
@@ -1603,26 +1600,26 @@
{
if (!atoi(params))
{
- HideDesktopTabs();
+ DeskHideTabs();
Conf.deskmode = MODE_NONE;
}
else
{
Conf.deskmode = MODE_DESKRAY;
- ShowDesktopTabs();
+ DeskShowTabs();
}
}
else
{
if (Conf.deskmode == MODE_DESKRAY)
{
- HideDesktopTabs();
+ DeskHideTabs();
Conf.deskmode = MODE_NONE;
}
else
{
Conf.deskmode = MODE_DESKRAY;
- ShowDesktopTabs();
+ DeskShowTabs();
}
}
return 0;
@@ -1646,14 +1643,14 @@
SetAreaSize(Conf.desks.areas_nx, Conf.desks.areas_ny);
DeskSetViewable(0, 1);
- RefreshDesktop(0);
+ DeskRefresh(0);
/* toss down the dragbar and related */
DesksControlsCreate();
DesksControlsShow();
/* then draw all the buttons that belong on the desktop */
- ShowDesktopButtons();
+ DeskShowButtons();
break;
}
}
@@ -1688,7 +1685,6 @@
DesksControlsRefresh();
}
}
- autosave();
}
static void
@@ -2188,7 +2184,7 @@
{
int pd = DesksGetCurrent();
- GotoDesktop(desk);
+ DeskGoto(desk);
if (DesksGetCurrent() != pd)
SoundPlay("SOUND_DESKTOP_SHUT");
@@ -2253,13 +2249,13 @@
{
sscanf(prm, "%i", &desk);
SoundPlay("SOUND_DESKTOP_RAISE");
- RaiseDesktop(desk);
+ DeskRaise(desk);
}
else if (!strncmp(cmd, "lower", 2))
{
sscanf(prm, "%i", &desk);
SoundPlay("SOUND_DESKTOP_LOWER");
- LowerDesktop(desk);
+ DeskLower(desk);
}
else if (!strcmp(cmd, "drag"))
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewin-ops.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ewin-ops.c 15 Feb 2005 22:18:51 -0000 1.13
+++ ewin-ops.c 26 Feb 2005 16:40:36 -0000 1.14
@@ -1292,7 +1292,7 @@
#if 0 /* Not necessary when the the _XROOT... atoms
are initially set on each desk */
/* Refresh bg before apps are planted so they can pick it up */
DeskSetViewable(desk, 1);
- RefreshDesktop(desk);
+ DeskRefresh(desk);
#endif
EoSetDesk(ewin, desk);
SnapshotEwinUpdate(ewin, SNAP_USE_DESK);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ewins.c 15 Feb 2005 22:18:52 -0000 1.18
+++ ewins.c 26 Feb 2005 16:40:36 -0000 1.19
@@ -737,7 +737,7 @@
desk = EoGetDesk(ewin2);
if (!Mode.wm.startup && Conf.focus.switchfortransientmap &&
!ewin->iconified)
- GotoDesktopByEwin(ewin2);
+ DeskGotoByEwin(ewin2);
}
}
@@ -780,7 +780,7 @@
/* if the loser has manual placement on and the app asks to be on
*/
/* a desktop, then send E to that desktop so the user can place */
/* the window there */
- GotoDesktop(desk);
+ DeskGoto(desk);
XQueryPointer(disp, VRoot.win, &root_return, &junk, &rx, &ry, &wx,
&wy, &mask);
@@ -840,7 +840,7 @@
/* if the loser has manual placement on and the app asks to be on */
/* a desktop, then send E to that desktop so the user can place */
/* the window there */
- GotoDesktop(desk);
+ DeskGoto(desk);
XQueryPointer(disp, VRoot.win, &root_return, &junk, &rx, &ry, &wx, &wy,
&mask);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- ewmh.c 22 Feb 2005 19:02:33 -0000 1.64
+++ ewmh.c 26 Feb 2005 16:40:36 -0000 1.65
@@ -709,7 +709,7 @@
*/
if (ev->message_type == ECORE_X_ATOM_NET_CURRENT_DESKTOP)
{
- GotoDesktop(ev->data.l[0]);
+ DeskGoto(ev->data.l[0]);
goto done;
}
else if (ev->message_type == ECORE_X_ATOM_NET_DESKTOP_VIEWPORT)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -3 -r1.90 -r1.91
--- focus.c 25 Jan 2005 21:57:17 -0000 1.90
+++ focus.c 26 Feb 2005 16:40:36 -0000 1.91
@@ -307,7 +307,7 @@
/* NB! ewin != NULL */
if (do_follow)
- GotoDesktopByEwin(ewin);
+ DeskGotoByEwin(ewin);
if (Conf.autoraise.enable)
{
@@ -374,7 +374,7 @@
/* we are about to flip desktops or areas - disable enter and leave events
* temporarily */
EwinsEventsConfigure(0);
- DesktopsEventsConfigure(0);
+ DesksEventsConfigure(0);
}
static void
@@ -404,7 +404,7 @@
/* we flipped - re-enable enter and leave events */
EwinsEventsConfigure(1);
- DesktopsEventsConfigure(1);
+ DesksEventsConfigure(1);
/* Set the mouse-over window */
ewin = GetEwinByCurrentPointer();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/gnome.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- gnome.c 13 Feb 2005 14:49:37 -0000 1.43
+++ gnome.c 26 Feb 2005 16:40:36 -0000 1.44
@@ -783,7 +783,7 @@
}
if (event->message_type == a3)
{
- GotoDesktop(event->data.l[0]);
+ DeskGoto(event->data.l[0]);
return;
}
if (event->message_type == a4)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- iclass.c 22 Feb 2005 21:44:39 -0000 1.53
+++ iclass.c 26 Feb 2005 16:40:36 -0000 1.54
@@ -75,7 +75,7 @@
TransparencyMakeColorModifier();
if (changed)
- DesktopsRefresh();
+ DesksRefresh();
}
#else
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- ipc.c 20 Feb 2005 17:23:00 -0000 1.205
+++ ipc.c 26 Feb 2005 16:40:36 -0000 1.206
@@ -675,7 +675,7 @@
IpcPrintf("focused: %s", (ewin == GetFocusEwin())? "yes" : "no");
goto done;
}
- GotoDesktopByEwin(ewin);
+ DeskGotoByEwin(ewin);
if (ewin->iconified)
EwinOpIconify(ewin, 0);
if (ewin->shaded)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -3 -r1.114 -r1.115
--- main.c 22 Feb 2005 21:04:24 -0000 1.114
+++ main.c 26 Feb 2005 16:40:36 -0000 1.115
@@ -264,7 +264,7 @@
Mode.queue_up = DRAW_QUEUE_ENABLE;
/* let's make sure we set this up and go to our desk anyways */
- GotoDesktop(DesksGetCurrent());
+ DeskGoto(DesksGetCurrent());
ecore_x_sync();
#ifdef SIGCONT
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- pager.c 22 Feb 2005 21:45:03 -0000 1.116
+++ pager.c 26 Feb 2005 16:40:36 -0000 1.117
@@ -1602,7 +1602,7 @@
if (win != Mode.last_bpress || !in_pager)
goto done;
PagerAreaAt(p, px, py, &pax, &pay);
- GotoDesktop(p->desktop);
+ DeskGoto(p->desktop);
if (p->desktop != DesksGetCurrent())
SoundPlay("SOUND_DESKTOP_SHUT");
SetCurrentArea(pax, pay);
@@ -1677,7 +1677,7 @@
if (!in_pager)
break;
PagerAreaAt(p, px, py, &pax, &pay);
- GotoDesktop(p->desktop);
+ DeskGoto(p->desktop);
SetCurrentArea(pax, pay);
ewin = EwinInPagerAt(p, px, py);
if (ewin)
@@ -2214,7 +2214,7 @@
ForceUpdatePagersForDesktop(desks.order[0]);
UpdatePagerSel();
#endif
- /* GotoDesktop */
+ /* DeskGoto */
desk = DesksGetCurrent();
if (pdesk >= 0)
RedrawPagersForDesktop(pdesk, 0);
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
