Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
actions.c
Log Message:
Remove obsolete stuff.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.174.2.11
retrieving revision 1.174.2.12
diff -u -3 -r1.174.2.11 -r1.174.2.12
--- actions.c 24 Aug 2004 23:37:51 -0000 1.174.2.11
+++ actions.c 26 Aug 2004 22:12:47 -0000 1.174.2.12
@@ -818,12 +818,9 @@
*/
static int
-doNothing(EWin * ewin, const char *params)
+doNothing(EWin * ewin __UNUSED__, const char *params __UNUSED__)
{
- EDBUG(6, "doNothing");
- EDBUG_RETURN(0);
- ewin = NULL;
- params = NULL;
+ return 0;
}
static int
@@ -840,13 +837,11 @@
int i;
#endif
- EDBUG(6, "spawnMenu");
-
if (!params)
- EDBUG_RETURN(0);
+ return 0;
if (MenusActive())
- EDBUG_RETURN(0);
+ return 0;
#if 0 /* FIXME: Incorrect placement if in deskslide */
for (i = 0; i < Conf.desks.num; i++)
@@ -913,17 +908,14 @@
#endif
if (!MenusActive())
- EDBUG_RETURN(0);
- EDBUG_RETURN(1);
+ return 0;
+ return 1;
}
static int
-hideMenu(EWin * ewin, const char *params)
+hideMenu(EWin * ewin __UNUSED__, const char *params __UNUSED__)
{
- EDBUG(6, "hideMenu");
- EDBUG_RETURN(0);
- ewin = NULL;
- params = NULL;
+ return 0;
}
static int
@@ -934,10 +926,9 @@
char *real_exec;
int fd;
- EDBUG(6, "runApp");
-
if (fork())
- EDBUG_RETURN(0);
+ return 0;
+
setsid();
/* Close all file descriptors except the std 3 */
for (fd = 3; fd < 1024; fd++)
@@ -1042,7 +1033,7 @@
sprintf(real_exec, "exec %s", params);
execl(sh, sh, "-c", real_exec, NULL);
exit(0);
- EDBUG_RETURN(0);
+ return 0;
}
int
@@ -1058,20 +1049,17 @@
}
static int
-doExec(EWin * edummy, const char *params)
+doExec(EWin * edummy __UNUSED__, const char *params)
{
return execApplication(params);
- edummy = NULL;
}
static int
-doAlert(EWin * edummy, const char *params)
+doAlert(EWin * edummy __UNUSED__, const char *params)
{
char *pp;
int i;
- EDBUG(6, "doAlert");
-
pp = Estrdup(params);
if (!pp)
EDBUG_RETURN(1);
@@ -1091,19 +1079,14 @@
DialogAlertOK(pp);
Efree(pp);
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
-doExit(EWin * ewin, const char *params)
+doExit(EWin * edummy __UNUSED__, const char *params)
{
- EDBUG(6, "doExit");
-
SessionExit(params);
-
- EDBUG_RETURN(0);
- ewin = NULL;
+ return 0;
}
static int
@@ -1329,35 +1312,31 @@
}
static int
-DoRaise(EWin * ewin, const char *params, int nogroup)
+DoRaise(EWin * ewin, const char *params __UNUSED__, int nogroup)
{
EWin **gwins = NULL;
int i, num;
- EDBUG(6, "DoRaise");
SoundPlay("SOUND_RAISE");
gwins = ListWinGroupMembersForEwin(ewin, ACTION_RAISE, nogroup, &num);
for (i = 0; i < num; i++)
RaiseEwin(gwins[i]);
Efree(gwins);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-DoLower(EWin * ewin, const char *params, int nogroup)
+DoLower(EWin * ewin, const char *params __UNUSED__, int nogroup)
{
EWin **gwins = NULL;
int i, num;
- EDBUG(6, "DoLower");
SoundPlay("SOUND_LOWER");
gwins = ListWinGroupMembersForEwin(ewin, ACTION_LOWER, nogroup, &num);
for (i = 0; i < num; i++)
LowerEwin(gwins[i]);
Efree(gwins);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
@@ -1401,14 +1380,12 @@
}
static int
-DoRaiseLower(EWin * ewin, const char *params, int nogroup)
+DoRaiseLower(EWin * ewin, const char *params __UNUSED__, int nogroup)
{
EWin **gwins, *const *lst;
int gnum, j, raise = 0;
int i, num;
- EDBUG(6, "doRaiseLower");
-
lst = EwinListGetForDesktop(ewin->desktop, &num);
gwins = ListWinGroupMembersForEwin(ewin, ACTION_RAISE_LOWER, nogroup, &gnum);
for (j = 0; j < gnum; j++)
@@ -1444,8 +1421,7 @@
if (gwins)
Efree(gwins);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
@@ -1461,7 +1437,7 @@
}
static int
-doCleanup(EWin * edummy, const char *params)
+doCleanup(EWin * edummy __UNUSED__, const char *params)
{
const char *type;
int method;
@@ -1471,8 +1447,6 @@
EWin *const *lst, *ewin;
Button **blst;
- EDBUG(6, "doCleanup");
-
type = params;
method = ARRANGE_BY_SIZE;
speed = Conf.slidespeedcleanup;
@@ -1629,8 +1603,7 @@
if (floating)
Efree(floating);
}
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static void
@@ -1650,46 +1623,37 @@
}
if (gwins)
Efree(gwins);
-
- EDBUG_RETURN_;
}
static int
doKill(EWin * ewin, const char *params)
{
- EDBUG(6, "doKill");
DoKill(ewin, params, 0);
- EDBUG_RETURN(0);
+ return 0;
}
static int
doKillNoGroup(EWin * ewin, const char *params)
{
- EDBUG(6, "doKillNoGroup");
DoKill(ewin, params, 1);
- EDBUG_RETURN(0);
+ return 0;
}
static int
-doKillNasty(EWin * ewin, const char *params)
+doKillNasty(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doKillNasty");
-
SoundPlay("SOUND_WINDOW_CLOSE");
EDestroyWindow(disp, ewin->client.win);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
/* Desktop actions */
static int
-DoGotoDesktop(EWin * edummy, const char *params, int num)
+DoGotoDesktop(EWin * edummy __UNUSED__, const char *params, int num)
{
int pd;
- EDBUG(6, "DoGotoDesktop");
-
pd = desks.current;
if (params)
@@ -1699,22 +1663,19 @@
if (desks.current != pd)
SoundPlay("SOUND_DESKTOP_SHUT");
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
-doNextDesktop(EWin * edummy, const char *params)
+doNextDesktop(EWin * edummy, const char *params __UNUSED__)
{
return DoGotoDesktop(edummy, NULL, desks.current + 1);
- params = NULL;
}
static int
-doPrevDesktop(EWin * edummy, const char *params)
+doPrevDesktop(EWin * edummy, const char *params __UNUSED__)
{
return DoGotoDesktop(edummy, NULL, desks.current - 1);
- params = NULL;
}
static int
@@ -1730,12 +1691,10 @@
}
static int
-doRaiseDesktop(EWin * edummy, const char *params)
+doRaiseDesktop(EWin * edummy __UNUSED__, const char *params)
{
int d = 0;
- EDBUG(6, "doRaiseDesktop");
-
if (!params)
d = desks.current;
else
@@ -1743,17 +1702,14 @@
SoundPlay("SOUND_DESKTOP_RAISE");
RaiseDesktop(d);
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
-doLowerDesktop(EWin * edummy, const char *params)
+doLowerDesktop(EWin * edummy __UNUSED__, const char *params)
{
int d = 0;
- EDBUG(6, "doLowerDesktop");
-
if (!params)
d = desks.current;
else
@@ -1761,17 +1717,14 @@
SoundPlay("SOUND_DESKTOP_LOWER");
LowerDesktop(d);
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
-doDragDesktop(EWin * edummy, const char *params)
+doDragDesktop(EWin * edummy __UNUSED__, const char *params)
{
int d = 0;
- EDBUG(6, "doDragDesktop");
-
if (!params)
d = desks.current;
else
@@ -1783,22 +1736,19 @@
Mode.win_x = desks.desk[d].x;
Mode.win_y = desks.desk[d].y;
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
/* Window ops */
static int
-DoStick(EWin * ewin, const char *params, int nogroup)
+DoStick(EWin * ewin, const char *params __UNUSED__, int nogroup)
{
EWin **gwins = NULL;
Group *curr_group = NULL;
int i, num;
char sticky;
- EDBUG(6, "DoStick");
-
sticky = ewin->sticky;
gwins = ListWinGroupMembersForEwin(ewin, ACTION_STICK, nogroup, &num);
@@ -1822,8 +1772,7 @@
if (gwins)
Efree(gwins);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
@@ -1839,12 +1788,10 @@
}
static int
-doSkipLists(EWin * ewin, const char *params)
+doSkipLists(EWin * ewin, const char *params __UNUSED__)
{
char skip;
- EDBUG(6, "doSkipLists");
-
skip = ewin->skipfocus;
ewin->skiptask = !(skip);
ewin->skipwinlist = !(skip);
@@ -1855,15 +1802,12 @@
#endif
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doSkipTask(EWin * ewin, const char *params)
+doSkipTask(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doSkipTask");
-
ewin->skiptask = !ewin->skiptask;
HintsSetWindowState(ewin);
#if ENABLE_GNOME
@@ -1871,66 +1815,54 @@
#endif
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doSkipFocus(EWin * ewin, const char *params)
+doSkipFocus(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doSkipFocus");
-
ewin->skipfocus = !ewin->skipfocus;
HintsSetWindowState(ewin);
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doSkipWinList(EWin * ewin, const char *params)
+doSkipWinList(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doSkipWinList");
-
ewin->skipwinlist = !ewin->skipwinlist;
HintsSetWindowState(ewin);
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doNeverFocus(EWin * ewin, const char *params)
+doNeverFocus(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doSkipWinList");
-
ewin->neverfocus = !ewin->neverfocus;
HintsSetWindowState(ewin);
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
/* Button actions */
static int
-doDragButtonStart(EWin * edummy, const char *params)
+doDragButtonStart(EWin * edummy __UNUSED__, const char *params __UNUSED__)
{
Button *b;
- EDBUG(6, "doDragButtonStart");
-
b = Mode.button;
if (!b)
- EDBUG_RETURN(0);
+ return 0;
if (ButtonIsFixed(b))
{
Mode.button = NULL;
- EDBUG_RETURN(0);
+ return 0;
}
GrabPointerSet(VRoot.win, ECSR_GRAB, 0);
@@ -1940,22 +1872,18 @@
Mode.start_y = Mode.y;
ButtonGetGeometry(b, &Mode.win_x, &Mode.win_y, NULL, NULL);
- EDBUG_RETURN(0);
- edummy = NULL;
- params = NULL;
+ return 0;
}
int
-doDragButtonEnd(const char *params)
+doDragButtonEnd(const char *params __UNUSED__)
{
Button *b;
int d;
- EDBUG(6, "doDragButtonEnd");
-
b = Mode.button;
if (!b)
- EDBUG_RETURN(0);
+ return 0;
Mode.mode = MODE_NONE;
GrabPointerRelease();
@@ -1971,16 +1899,14 @@
autosave();
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
/* Settings */
static int
-doFocusModeSet(EWin * edummy, const char *params)
+doFocusModeSet(EWin * edummy __UNUSED__, const char *params)
{
- EDBUG(6, "doFocusModeSet");
if (params)
{
if (!strcmp("pointer", params))
@@ -2001,104 +1927,15 @@
}
FocusFix();
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doMoveModeSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doMoveModeSet");
- if (params)
- Conf.movemode = atoi(params);
- else
- Conf.movemode++;
- if (Conf.movemode < 0 || Conf.movemode > 5)
- Conf.movemode = 0;
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doResizeModeSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doResizeModeSet");
- if (params)
- Conf.resizemode = atoi(params);
- else
- Conf.resizemode++;
- if (Conf.resizemode < 0 || Conf.resizemode > 4)
- Conf.resizemode = 0;
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doSlideModeSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doSlideModeSet");
- if (params)
- {
- Conf.slidemode = atoi(params);
- }
- else
- {
- Conf.slidemode++;
- if (Conf.slidemode > 4)
- Conf.slidemode = 0;
- }
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doCleanupSlideSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doCleanupSlideSet");
- if (params)
- {
- Conf.cleanupslide = atoi(params);
- }
- else
- {
- if (Conf.cleanupslide)
- Conf.cleanupslide = 0;
- else
- Conf.cleanupslide = 1;
- }
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doMapSlideSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doMapSlideSet");
- if (params)
- Conf.mapslide = atoi(params);
- else
- {
- if (Conf.mapslide)
- Conf.mapslide = 0;
- else
- Conf.mapslide = 1;
- }
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
-#if 0
+#if 0 /* About to go */
static int
doSoundSet(EWin * edummy, const char *params)
{
char snd;
- EDBUG(6, "doSoundSet");
snd = Conf.sound;
if (params)
Conf.sound = atoi(params);
@@ -2117,53 +1954,7 @@
SoundExit();
}
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-#endif
-
-static int
-doButtonMoveResistSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doButtonMoveResistSet");
- if (params)
- Conf.button_move_resistance = atoi(params);
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doDesktopBgTimeoutSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doDesktopBgTimeoutSet");
- if (params)
- Conf.backgrounds.timeout = atoi(params);
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doMapSlideSpeedSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doMapSlideSpeedSet");
- if (params)
- Conf.slidespeedmap = atoi(params);
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doCleanupSlideSpeedSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doCleanupSlideSpeedSet");
- if (params)
- Conf.slidespeedcleanup = atoi(params);
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
@@ -2173,7 +1964,6 @@
Button *b;
int i;
- EDBUG(6, "doDragdirSet");
pd = Conf.desks.dragdir;
if (params)
Conf.desks.dragdir = atoi(params);
@@ -2198,8 +1988,7 @@
ShowDesktopControls();
}
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
@@ -2208,7 +1997,6 @@
char pd;
Button *b;
- EDBUG(6, "doDragbarOrderSet");
pd = Conf.desks.dragbar_ordering;
if (params)
Conf.desks.dragbar_ordering = atoi(params);
@@ -2227,8 +2015,7 @@
ShowDesktopControls();
}
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
@@ -2237,7 +2024,6 @@
int pd;
Button *b;
- EDBUG(6, "doDragbarWidthSet");
pd = Conf.desks.dragbar_width;
if (params)
Conf.desks.dragbar_width = atoi(params);
@@ -2250,8 +2036,7 @@
ShowDesktopControls();
}
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
@@ -2260,7 +2045,6 @@
int pd;
Button *b;
- EDBUG(6, "doDragbarLengthSet");
pd = Conf.desks.dragbar_length;
if (params)
Conf.desks.dragbar_length = atoi(params);
@@ -2273,107 +2057,23 @@
ShowDesktopControls();
}
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doDeskSlideSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doDeskSlideSet");
- if (params)
- Conf.desks.slidein = atoi(params);
- else
- {
- if (Conf.desks.slidein)
- Conf.desks.slidein = 0;
- else
- Conf.desks.slidein = 1;
- }
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doDeskSlideSpeedSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doDeskSlideSpeedSet");
- if (params)
- Conf.desks.slidespeed = atoi(params);
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doHiQualityBgSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doHiQualityBgSet");
- if (params)
- Conf.backgrounds.hiquality = atoi(params);
- else
- {
- if (Conf.backgrounds.hiquality)
- Conf.backgrounds.hiquality = 0;
- else
- Conf.backgrounds.hiquality = 1;
- }
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doAutosaveSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doAutosaveSet");
- if (params)
- Conf.autosave = atoi(params);
- else
- {
- if (Conf.autosave)
- Conf.autosave = 0;
- else
- Conf.autosave = 1;
- }
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doToolTipSet(EWin * edummy, const char *params)
-{
- EDBUG(6, "doToolTipSet");
- if (params)
- Conf.tooltips.enable = atoi(params);
- else
- Conf.tooltips.enable = !Conf.tooltips.enable;
- autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
-/* Misc actions */
-
static int
doPlaySoundClass(EWin * edummy, const char *params)
{
- EDBUG(6, "doPlaySoundClass");
-
if (!params)
- EDBUG_RETURN(0);
+ return 0;
SoundPlay(params);
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
doDeskray(EWin * edummy, const char *params)
{
- EDBUG(6, "doDeskray");
if (params)
{
if (!atoi(params))
@@ -2400,20 +2100,18 @@
ShowDesktopTabs();
}
}
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
+#endif
static int
-doHideShowButton(EWin * edummy, const char *params)
+doHideShowButton(EWin * edummy __UNUSED__, const char *params)
{
Button **lst, *b;
char s[1024];
const char *ss;
int num, i;
- EDBUG(6, "doHideShowButton");
-
if (params)
{
sscanf(params, "%1000s", s);
@@ -2493,47 +2191,19 @@
StackDesktops();
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
-}
-
-static int
-doScrollContainer(EWin * edummy, const char *params)
-{
- EDBUG(6, "doScrollContainer");
- EDBUG_RETURN(0);
- edummy = NULL;
- params = NULL;
+ return 0;
}
/* More winops */
static int
-DoIconifyWindow(EWin * ewin, const char *params, int nogroup)
+DoIconifyWindow(EWin * ewin, const char *params __UNUSED__, int nogroup)
{
Group *curr_group = NULL;
char iconified;
EWin **gwins = NULL;
int i, num;
- EDBUG(6, "DoIconifyWindow");
-
-#if 0 /* FIXME - Do we use this? */
- if (params)
- {
- ewin =
- FindItem("ICON", atoi(params), LIST_FINDBY_BOTH,
- LIST_TYPE_ICONIFIEDS);
- if (!ewin)
- ewin = FindItem(NULL, atoi(params), LIST_FINDBY_ID, LIST_TYPE_EWIN);
- }
- else
- ewin = GetFocusEwin();
-
- if (!ewin)
- EDBUG_RETURN(1);
-#endif
-
iconified = ewin->iconified;
gwins = ListWinGroupMembersForEwin(ewin, ACTION_ICONIFY, nogroup, &num);
@@ -2553,8 +2223,7 @@
}
if (gwins)
Efree(gwins);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
@@ -2576,9 +2245,8 @@
{
Slideout *s;
- EDBUG(6, "doSlideout");
if (!params)
- EDBUG_RETURN(0);
+ return 0;
s = FindItem(params, 0, LIST_FINDBY_NAME, LIST_TYPE_SLIDEOUT);
if (s)
@@ -2586,18 +2254,17 @@
SoundPlay("SOUND_SLIDEOUT_SHOW");
SlideoutShow(s, ewin, Mode.context_win);
}
- EDBUG_RETURN(0);
+ return 0;
}
static int
-doScrollWindows(EWin * edummy, const char *params)
+doScrollWindows(EWin * edummy __UNUSED__, const char *params)
{
int x, y, num, i;
EWin *const *lst;
- EDBUG(6, "doScrollWindows");
if (!params)
- EDBUG_RETURN(0);
+ return 0;
x = 0;
y = 0;
@@ -2610,22 +2277,19 @@
(!lst[i]->floating))
MoveEwin(lst[i], lst[i]->x + x, lst[i]->y + y);
}
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
/* More winops */
static int
-DoShade(EWin * ewin, const char *params, int nogroup)
+DoShade(EWin * ewin, const char *params __UNUSED__, int nogroup)
{
EWin **gwins = NULL;
Group *curr_group = NULL;
int i, num;
char shaded;
- EDBUG(6, "doShade");
-
gwins = ListWinGroupMembersForEwin(ewin, ACTION_SHADE, nogroup, &num);
shaded = ewin->shaded;
for (i = 0; i < num; i++)
@@ -2646,8 +2310,7 @@
RememberImportantInfoForEwin(gwins[i]);
}
Efree(gwins);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
@@ -2665,67 +2328,58 @@
static int
doMaxH(EWin * ewin, const char *params)
{
- EDBUG(6, "doMaxH");
if (ewin->shaded)
- EDBUG_RETURN(0);
+ return 0;
MaxHeight(ewin, params);
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
static int
doMaxW(EWin * ewin, const char *params)
{
- EDBUG(6, "doMaxW");
if (ewin->shaded)
- EDBUG_RETURN(0);
+ return 0;
MaxWidth(ewin, params);
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
static int
doMax(EWin * ewin, const char *params)
{
- EDBUG(6, "doMax");
if (ewin->shaded)
- EDBUG_RETURN(0);
+ return 0;
MaxSize(ewin, params);
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
static int
-doSendToNextDesk(EWin * ewin, const char *params)
+doSendToNextDesk(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doSendToNextDesk");
MoveEwinToDesktop(ewin, ewin->desktop + 1);
RaiseEwin(ewin);
ICCCM_Configure(ewin);
ewin->sticky = 0;
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doSendToPrevDesk(EWin * ewin, const char *params)
+doSendToPrevDesk(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doSendToPrevDesk");
MoveEwinToDesktop(ewin, ewin->desktop - 1);
RaiseEwin(ewin);
ICCCM_Configure(ewin);
ewin->sticky = 0;
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
doSnapshot(EWin * ewin, const char *params)
{
- EDBUG(6, "doSnapshot");
-
if (!params)
SnapshotEwinAll(ewin);
else if (!strcmp(params, "none"))
@@ -2750,21 +2404,18 @@
SnapshotEwinGroups(ewin, 1);
else if (!strcmp(params, "dialog"))
SnapshotEwinDialog(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
static int
-doToggleFixedPos(EWin * ewin, const char *params)
+doToggleFixedPos(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doToggleFixedPos");
-
if (ewin->fixedpos)
ewin->fixedpos = 0;
else
ewin->fixedpos = 1;
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
@@ -2772,10 +2423,8 @@
{
int l;
- EDBUG(6, "doSetLayer");
-
if (!params)
- EDBUG_RETURN(0);
+ return 0;
l = atoi(params);
if (ewin->layer > l)
{
@@ -2790,7 +2439,7 @@
HintsSetWindowState(ewin);
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
/* Focus actions */
@@ -2798,26 +2447,20 @@
static int
doFocusNext(EWin * edummy __UNUSED__, const char *params __UNUSED__)
{
- EDBUG(6, "doFocusNext");
FocusGetNextEwin();
- EDBUG_RETURN(0);
+ return 0;
}
static int
-doFocusPrev(EWin * edummy, const char *params)
+doFocusPrev(EWin * edummy __UNUSED__, const char *params __UNUSED__)
{
- EDBUG(6, "doFocusPrev");
FocusGetPrevEwin();
- EDBUG_RETURN(0);
- edummy = NULL;
- params = NULL;
+ return 0;
}
static int
-doFocusSet(EWin * ewin, const char *params)
+doFocusSet(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doFocusSet");
-
GotoDesktopByEwin(ewin);
if (ewin->iconified)
@@ -2827,8 +2470,7 @@
RaiseEwin(ewin);
FocusToEWin(ewin, FOCUS_SET);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
@@ -2841,81 +2483,70 @@
/* Area actions */
static int
-doAreaSet(EWin * edummy, const char *params)
+doAreaSet(EWin * edummy __UNUSED__, const char *params)
{
int a, b;
- EDBUG(6, "doAreaSet");
if (!params)
- EDBUG_RETURN(0);
+ return 0;
sscanf(params, "%i %i", &a, &b);
SetCurrentArea(a, b);
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
-doAreaMoveBy(EWin * edummy, const char *params)
+doAreaMoveBy(EWin * edummy __UNUSED__, const char *params)
{
int a, b;
- EDBUG(6, "doAreaMoveBy");
if (!params)
- EDBUG_RETURN(0);
+ return 0;
sscanf(params, "%i %i", &a, &b);
MoveCurrentAreaBy(a, b);
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
-doLinearAreaSet(EWin * edummy, const char *params)
+doLinearAreaSet(EWin * edummy __UNUSED__, const char *params)
{
int da;
- EDBUG(6, "doLinearAreaSet");
if (params)
{
sscanf(params, "%i", &da);
SetCurrentLinearArea(da);
}
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
-doLinearAreaMoveBy(EWin * edummy, const char *params)
+doLinearAreaMoveBy(EWin * edummy __UNUSED__, const char *params)
{
int da;
- EDBUG(6, "doLinearAreaMoveBy");
if (params)
{
sscanf(params, "%i", &da);
MoveCurrentLinearAreaBy(da);
}
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
-doWarpPointer(EWin * edummy, const char *params)
+doWarpPointer(EWin * edummy __UNUSED__, const char *params)
{
int dx, dy;
- EDBUG(6, "doWarpPointer");
-
if (params)
{
sscanf(params, "%i %i", &dx, &dy);
XWarpPointer(disp, None, None, 0, 0, 0, 0, dx, dy);
}
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
@@ -2923,14 +2554,13 @@
{
int dx, dy;
- EDBUG(6, "doMoveWinToArea");
if (params)
{
sscanf(params, "%i %i", &dx, &dy);
MoveEwinToArea(ewin, dx, dy);
}
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
static int
@@ -2938,7 +2568,6 @@
{
int dx, dy;
- EDBUG(6, "doMoveWinByArea");
if (params)
{
sscanf(params, "%i %i", &dx, &dy);
@@ -2947,7 +2576,7 @@
MoveEwinToArea(ewin, dx, dy);
}
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
static int
@@ -2955,14 +2584,13 @@
{
int da;
- EDBUG(6, "doMoveWinToLinearArea");
if (params)
{
sscanf(params, "%i", &da);
MoveEwinToLinearArea(ewin, da);
}
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
#if 0 /* Not used */
@@ -2972,14 +2600,13 @@
EWin *ewin;
int da;
- EDBUG(6, "doMoveWinByLinearArea");
if (params)
{
sscanf(params, "%i", &da);
MoveEwinLinearAreaBy(ewin, da);
}
RememberImportantInfoForEwin(ewin);
- EDBUG_RETURN(0);
+ return 0;
}
#endif
@@ -2992,15 +2619,13 @@
Border *b;
char shadechange = 0;
- EDBUG(6, "doSetWinBorder");
-
if (!params)
- EDBUG_RETURN(0);
+ return 0;
sscanf(params, "%1000s", buf);
b = (Border *) FindItem(buf, 0, LIST_FINDBY_NAME, LIST_TYPE_BORDER);
if (!b)
- EDBUG_RETURN(0);
+ return 0;
has_shaded = 0;
gwins = ListWinGroupMembersForEwin(ewin, ACTION_SET_WINDOW_BORDER, nogroup,
@@ -3017,7 +2642,7 @@
{
if ((b->border.left == 0) && (b->border.right == 0)
&& (b->border.top == 0) && (b->border.bottom == 0))
- EDBUG_RETURN(0);
+ return 0;
}
for (i = 0; i < num; i++)
{
@@ -3038,7 +2663,7 @@
}
if (gwins)
Efree(gwins);
- EDBUG_RETURN(0);
+ return 0;
}
static int
@@ -3054,18 +2679,17 @@
}
static int
-doAbout(EWin * edummy, const char *params)
+doAbout(EWin * edummy __UNUSED__, const char *params __UNUSED__)
{
Dialog *d;
DItem *table, *di;
char buf[1024];
- EDBUG(6, "doAbout");
d = FindItem("ABOUT_ENLIGHTENMENT", 0, LIST_FINDBY_NAME, LIST_TYPE_DIALOG);
if (d)
{
ShowDialog(d);
- EDBUG_RETURN(0);
+ return 0;
}
d = DialogCreate("ABOUT_ENLIGHTENMENT");
@@ -3102,15 +2726,14 @@
DialogAddButton(d, _("OK"), NULL, 1);
ShowDialog(d);
- EDBUG_RETURN(0);
- edummy = NULL;
- params = NULL;
+
+ return 0;
}
+#if 0 /* About to go */
static int
-doSetPagerHiq(EWin * edummy, const char *params)
+doSetPagerHiq(EWin * edummy __UNUSED__, const char *params)
{
- EDBUG(6, "doSetPagerHiq");
if (params)
{
char num;
@@ -3119,14 +2742,11 @@
PagerSetHiQ(num);
}
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
}
static int
-doSetPagerSnap(EWin * edummy, const char *params)
+doSetPagerSnap(EWin * edummy __UNUSED__, const char *params)
{
- EDBUG(6, "doSetPagerSnap");
if (params)
{
char num;
@@ -3135,9 +2755,8 @@
PagerSetSnap(num);
}
autosave();
- EDBUG_RETURN(0);
- edummy = NULL;
}
+#endif
static int
doSettings(EWin * edummy __UNUSED__, const char *params)
@@ -3181,7 +2800,7 @@
};
static int
-doInsertKeys(EWin * edummy, const char *params)
+doInsertKeys(EWin * edummy __UNUSED__, const char *params)
{
static const struct _keyset ks[] = {
{"a", 0, "a"},
@@ -3283,7 +2902,6 @@
{"Tab", ShiftMask, "\\t"}
};
- EDBUG(6, "doInsertKeys");
if (params)
{
Window win = 0;
@@ -3325,8 +2943,7 @@
}
}
}
- EDBUG_RETURN(0);
- edummy = NULL;
+ return 0;
}
static int
@@ -3339,28 +2956,23 @@
}
static int
-doShowHideGroup(EWin * ewin, const char *params)
+doShowHideGroup(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doShowGroup");
ShowHideWinGroups(ewin, NULL, SET_TOGGLE);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doStartGroup(EWin * ewin, const char *params)
+doStartGroup(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doStartGroup");
BuildWindowGroup(&ewin, 1);
SaveGroups();
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doAddToGroup(EWin * ewin, const char *params)
+doAddToGroup(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doAddToGroup");
if (!Mode.groups.current)
{
ChooseGroupDialog(ewin,
@@ -3370,48 +2982,41 @@
" the latest one. \n\n"
" Pick another group that the window will belong to here:
\n\n"),
GROUP_SELECT_ALL_EXCEPT_EWIN, ACTION_ADD_TO_GROUP);
- EDBUG_RETURN(0);
+ return 0;
}
else
AddEwinToGroup(ewin, Mode.groups.current);
SaveGroups();
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doRemoveFromGroup(EWin * ewin, const char *params)
+doRemoveFromGroup(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doRemoveFromGroup");
ChooseGroupDialog(ewin,
_(" Select the group to remove the window from. "),
GROUP_SELECT_EWIN_ONLY, ACTION_REMOVE_FROM_GROUP);
SaveGroups();
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doBreakGroup(EWin * ewin, const char *params)
+doBreakGroup(EWin * ewin, const char *params __UNUSED__)
{
- EDBUG(6, "doBreakGroup");
ChooseGroupDialog(ewin, _(" Select the group to break "),
GROUP_SELECT_EWIN_ONLY, ACTION_BREAK_GROUP);
SaveGroups();
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
-doZoom(EWin * ewin, const char *params)
+doZoom(EWin * ewin, const char *params __UNUSED__)
{
char s[1024];
- EDBUG(6, "doZoom");
-
if (!(CanZoom()))
- EDBUG_RETURN(0);
+ return 0;
Esnprintf(s, sizeof(s), "%s/.zoom_warn", EDirUser());
if (!exists(s))
@@ -3437,15 +3042,14 @@
"This is a warning and will only be displayed this one time.\n"
"If your Server does not behave well then you will probably\n"
"have to avoid using this feature.\n"));
- EDBUG_RETURN(0);
+ return 0;
}
if (InZoom())
Zoom(NULL);
else
Zoom(ewin);
- EDBUG_RETURN(0);
- params = NULL;
+ return 0;
}
static int
@@ -3484,27 +3088,27 @@
ACTION_ITEM(0, 0, 0, 0, doInplaceDesktop), /* ACTION_DESKTOP_INPLACE */
ACTION_ITEM(0, 0, 0, 0, doDragButtonStart), /* ACTION_DRAG_BUTTON */
ACTION_ITEM(0, 0, 0, 0, doFocusModeSet), /* ACTION_FOCUSMODE_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doMoveModeSet), /* ACTION_MOVEMODE_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doResizeModeSet), /* ACTION_RESIZEMODE_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doSlideModeSet), /* ACTION_SLIDEMODE_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doCleanupSlideSet), /* ACTION_CLEANUPSILDE_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doMapSlideSet), /* ACTION_MAPSLIDE_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_MOVEMODE_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_RESIZEMODE_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_SLIDEMODE_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_CLEANUPSILDE_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_MAPSLIDE_SET @@ */
ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_SOUND_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doButtonMoveResistSet), /*
ACTION_BUTTONMOVE_RESIST_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doDesktopBgTimeoutSet), /*
ACTION_DESKTOPBG_TIMEOUT_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doMapSlideSpeedSet), /* ACTION_MAPSLIDE_SPEED_SET
@@ */
- ACTION_ITEM(0, 0, 0, 0, doCleanupSlideSpeedSet), /*
ACTION_CLEANUPSLIDE_SPEED_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doDragdirSet), /* ACTION_DRAGDIR_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doDragbarOrderSet), /* ACTION_DRAGBAR_ORDER_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doDragbarWidthSet), /* ACTION_DRAGBAR_WIDTH_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doDragbarLengthSet), /* ACTION_DRAGBAR_LENGTH_SET
@@ */
- ACTION_ITEM(0, 0, 0, 0, doDeskSlideSet), /* ACTION_DESKSLIDE_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doDeskSlideSpeedSet), /* ACTION_DESKSLIDE_SPEED_SET
@@ */
- ACTION_ITEM(0, 0, 0, 0, doHiQualityBgSet), /* ACTION_HIQUALITYBG_SET @@ */
- ACTION_ITEM(0, 0, 0, 0, doPlaySoundClass), /* ACTION_PLAYSOUNDCLASS */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_BUTTONMOVE_RESIST_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_DESKTOPBG_TIMEOUT_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_MAPSLIDE_SPEED_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_CLEANUPSLIDE_SPEED_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_DRAGDIR_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_DRAGBAR_ORDER_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_DRAGBAR_WIDTH_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_DRAGBAR_LENGTH_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_DESKSLIDE_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_DESKSLIDE_SPEED_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_HIQUALITYBG_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_PLAYSOUNDCLASS */
ACTION_ITEM(0, 0, 1, 0, doGotoDesktop), /* ACTION_GOTO_DESK */
- ACTION_ITEM(0, 0, 0, 0, doDeskray), /* ACTION_DESKRAY @@ */
- ACTION_ITEM(0, 0, 0, 0, doAutosaveSet), /* ACTION_AUTOSAVE_SET @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_DESKRAY @@ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_AUTOSAVE_SET @@ */
ACTION_ITEM(0, 0, 0, 0, doHideShowButton), /* ACTION_HIDESHOW_BUTTON */
ACTION_ITEM(1, 0, 0, 0, doIconifyWindow), /* ACTION_ICONIFY */
ACTION_ITEM(0, 0, 0, 0, doSlideout), /* ACTION_SLIDEOUT */
@@ -3516,8 +3120,8 @@
ACTION_ITEM(1, 0, 0, 0, doSendToNextDesk), /* ACTION_SEND_TO_NEXT_DESK */
ACTION_ITEM(1, 0, 0, 0, doSendToPrevDesk), /* ACTION_SEND_TO_PREV_DESK */
ACTION_ITEM(1, 0, 0, 0, doSnapshot), /* ACTION_SNAPSHOT */
- ACTION_ITEM(0, 0, 0, 1, doScrollContainer), /* ACTION_SCROLL_CONTAINER */
- ACTION_ITEM(0, 0, 0, 0, doToolTipSet), /* ACTION_TOOLTIP_SET @@ */
+ ACTION_ITEM(0, 0, 0, 1, NULL), /* ACTION_SCROLL_CONTAINER */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_TOOLTIP_SET @@ */
ACTION_ITEM(0, 0, 0, 0, doFocusNext), /* ACTION_FOCUS_NEXT */
ACTION_ITEM(0, 0, 0, 0, doFocusPrev), /* ACTION_FOCUS_PREV */
ACTION_ITEM(1, 0, 0, 0, doFocusSet), /* ACTION_FOCUS_SET */
@@ -3536,8 +3140,8 @@
ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_FX */
ACTION_ITEM(1, 0, 0, 0, doMoveWinToLinearArea), /*
ACTION_MOVE_WINDOW_TO_LINEAR_AREA */
ACTION_ITEM(1, 0, 0, 0, doMoveWinByArea), /* ACTION_MOVE_WINDOW_BY_LINEAR_AREA */
- ACTION_ITEM(0, 0, 0, 0, doSetPagerHiq), /* ACTION_SET_PAGER_HIQ */
- ACTION_ITEM(0, 0, 0, 0, doSetPagerSnap), /* ACTION_SET_PAGER_SNAP */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_SET_PAGER_HIQ */
+ ACTION_ITEM(0, 0, 0, 0, NULL), /* ACTION_SET_PAGER_SNAP */
ACTION_ITEM(0, 0, 0, 0, doSettings), /* ACTION_SETTINGS */
ACTION_ITEM(1, 0, 0, 1, doMoveConstrained), /* ACTION_MOVE_CONSTRAINED */
ACTION_ITEM(0, 0, 0, 0, doInsertKeys), /* ACTION_INSERT_KEYS */
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
