Thu Mar 18 12:10:13 EST 2004

(Mandrake)

Fixed a boatload of warnings.  Commented out a couple of functions that
were no longer being used.  I fixed some of these warnings a few years ago
and somehow *ahem* they were put back in ;)


SVN revision: 9392
This commit is contained in:
Mandrake 2004-03-18 17:03:50 +00:00
parent 04a55a4bca
commit 68ea5e7268
45 changed files with 9435 additions and 9509 deletions

View File

@ -2552,3 +2552,12 @@ Shuffle around some event handling code (arrange according to event number).
Skip one level of event handling functions. Skip one level of event handling functions.
Show annoying message about RandR screen size change, if enabled. Show annoying message about RandR screen size change, if enabled.
Maintain a global window stacking order (not entirely finished). Maintain a global window stacking order (not entirely finished).
-------------------------------------------------------------------------------
Thu Mar 18 12:10:13 EST 2004
(Mandrake)
Fixed a boatload of warnings. Commented out a couple of functions that
were no longer being used. I fixed some of these warnings a few years ago
and somehow *ahem* they were put back in ;)

View File

@ -231,6 +231,7 @@ TextSize(TextState * ts, char *text, int *width, int *height, int fsize)
} }
freestrlist(lines, num_lines); freestrlist(lines, num_lines);
return; return;
fsize = 0;
} }
void void
@ -430,4 +431,5 @@ TextDraw(TextState * ts, Window win, char *text,
} }
freestrlist(lines, num_lines); freestrlist(lines, num_lines);
return; return;
h = fsize = 0;
} }

1261
po/de.po

File diff suppressed because it is too large Load Diff

1096
po/dk.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

1189
po/es.po

File diff suppressed because it is too large Load Diff

1188
po/fr.po

File diff suppressed because it is too large Load Diff

1081
po/hu.po

File diff suppressed because it is too large Load Diff

1190
po/ja.po

File diff suppressed because it is too large Load Diff

1190
po/ko.po

File diff suppressed because it is too large Load Diff

1093
po/nl.po

File diff suppressed because it is too large Load Diff

1192
po/no.po

File diff suppressed because it is too large Load Diff

1190
po/pl.po

File diff suppressed because it is too large Load Diff

1186
po/pt.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

1194
po/ru.po

File diff suppressed because it is too large Load Diff

1188
po/sv.po

File diff suppressed because it is too large Load Diff

1192
po/tr.po

File diff suppressed because it is too large Load Diff

View File

@ -1676,8 +1676,12 @@ void AddToFamily(Window win);
EWin *AddInternalToFamily(Window win, char *bname, int type, EWin *AddInternalToFamily(Window win, char *bname, int type,
void *ptr, void *ptr,
void (*init) (EWin * ewin, void *ptr)); void (*init) (EWin * ewin, void *ptr));
void CalcEwinSizes(EWin *ewin);
void HonorIclass(char *s, int id); void HonorIclass(char *s, int id);
void SyncBorderToEwin(EWin * ewin); void SyncBorderToEwin(EWin * ewin);
void UpdateBorderInfo(EWin * ewin);
void RealiseEwinWinpart(EWin * ewin, int i);
int DrawEwinWinpart(EWin * ewin, int i);
int ChangeEwinWinpart(EWin * ewin, int i); int ChangeEwinWinpart(EWin * ewin, int i);
void DrawEwin(EWin * ewin); void DrawEwin(EWin * ewin);
int ChangeEwinWinpartContents(EWin * ewin, int i); int ChangeEwinWinpartContents(EWin * ewin, int i);
@ -2232,6 +2236,7 @@ void FreePmapMask(PmapMask * pmm);
void IB_Animate(char iconify, EWin * from, EWin * to); void IB_Animate(char iconify, EWin * from, EWin * to);
void IconifyEwin(EWin * ewin); void IconifyEwin(EWin * ewin);
void DeIconifyEwin(EWin * ewin); void DeIconifyEwin(EWin * ewin);
void MakeIcon(EWin *ewin);
void RemoveMiniIcon(EWin * ewin); void RemoveMiniIcon(EWin * ewin);
Iconbox *IconboxCreate(char *name); Iconbox *IconboxCreate(char *name);
void IconboxDestroy(Iconbox * ib); void IconboxDestroy(Iconbox * ib);

View File

@ -564,6 +564,8 @@ doNothing(EWin * ewin, void *params)
{ {
EDBUG(6, "doNothing"); EDBUG(6, "doNothing");
EDBUG_RETURN(0); EDBUG_RETURN(0);
ewin = NULL;
params = NULL;
} }
static int static int
@ -653,6 +655,8 @@ hideMenu(EWin * ewin, void *params)
{ {
EDBUG(6, "hideMenu"); EDBUG(6, "hideMenu");
EDBUG_RETURN(0); EDBUG_RETURN(0);
ewin = NULL;
params = NULL;
} }
static int static int
@ -840,6 +844,7 @@ static int
doExec(EWin * edummy, void *params) doExec(EWin * edummy, void *params)
{ {
return execApplication(params); return execApplication(params);
edummy = NULL;
} }
static int static int
@ -870,6 +875,7 @@ doAlert(EWin * edummy, void *params)
Efree(pp); Efree(pp);
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -880,6 +886,7 @@ doExit(EWin * ewin, void *params)
SessionExit(params); SessionExit(params);
EDBUG_RETURN(0); EDBUG_RETURN(0);
ewin = NULL;
} }
static int static int
@ -1102,6 +1109,7 @@ DoRaise(EWin * ewin, void *params, int nogroup)
RaiseEwin(gwins[i]); RaiseEwin(gwins[i]);
Efree(gwins); Efree(gwins);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1117,6 +1125,7 @@ DoLower(EWin * ewin, void *params, int nogroup)
LowerEwin(gwins[i]); LowerEwin(gwins[i]);
Efree(gwins); Efree(gwins);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1204,6 +1213,7 @@ DoRaiseLower(EWin * ewin, void *params, int nogroup)
Efree(gwins); Efree(gwins);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1392,6 +1402,7 @@ doCleanup(EWin * edummy, void *params)
Efree(lst); Efree(lst);
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1400,6 +1411,7 @@ doKill(EWin * ewin, void *params)
EDBUG(6, "doKill"); EDBUG(6, "doKill");
KillEwin(ewin, 0); KillEwin(ewin, 0);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1408,6 +1420,7 @@ doKillNoGroup(EWin * ewin, void *params)
EDBUG(6, "doKillNoGroup"); EDBUG(6, "doKillNoGroup");
KillEwin(ewin, 1); KillEwin(ewin, 1);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1418,6 +1431,7 @@ doKillNasty(EWin * ewin, void *params)
SoundPlay("SOUND_WINDOW_CLOSE"); SoundPlay("SOUND_WINDOW_CLOSE");
EDestroyWindow(disp, ewin->client.win); EDestroyWindow(disp, ewin->client.win);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
/* Desktop actions */ /* Desktop actions */
@ -1439,18 +1453,21 @@ DoGotoDesktop(EWin * edummy, void *params, int num)
SoundPlay("SOUND_DESKTOP_SHUT"); SoundPlay("SOUND_DESKTOP_SHUT");
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
doNextDesktop(EWin * edummy, void *params) doNextDesktop(EWin * edummy, void *params)
{ {
return DoGotoDesktop(edummy, NULL, desks.current + 1); return DoGotoDesktop(edummy, NULL, desks.current + 1);
params = NULL;
} }
static int static int
doPrevDesktop(EWin * edummy, void *params) doPrevDesktop(EWin * edummy, void *params)
{ {
return DoGotoDesktop(edummy, NULL, desks.current - 1); return DoGotoDesktop(edummy, NULL, desks.current - 1);
params = NULL;
} }
static int static int
@ -1459,7 +1476,7 @@ doGotoDesktop(EWin * edummy, void *params)
return DoGotoDesktop(edummy, params, desks.current); return DoGotoDesktop(edummy, params, desks.current);
} }
int static int
doInplaceDesktop(EWin * edummy, void *params) doInplaceDesktop(EWin * edummy, void *params)
{ {
return DoGotoDesktop(edummy, params, desks.current); return DoGotoDesktop(edummy, params, desks.current);
@ -1480,6 +1497,7 @@ doRaiseDesktop(EWin * edummy, void *params)
RaiseDesktop(d); RaiseDesktop(d);
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1497,6 +1515,7 @@ doLowerDesktop(EWin * edummy, void *params)
LowerDesktop(d); LowerDesktop(d);
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1518,6 +1537,7 @@ doDragDesktop(EWin * edummy, void *params)
mode.win_y = desks.desk[d].y; mode.win_y = desks.desk[d].y;
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
/* Window ops */ /* Window ops */
@ -1550,6 +1570,7 @@ DoStick(EWin * ewin, void *params, int nogroup)
Efree(gwins); Efree(gwins);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1580,6 +1601,7 @@ doSkipLists(EWin * ewin, void *params)
RememberImportantInfoForEwin(ewin); RememberImportantInfoForEwin(ewin);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1593,6 +1615,7 @@ doSkipTask(EWin * ewin, void *params)
RememberImportantInfoForEwin(ewin); RememberImportantInfoForEwin(ewin);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1605,6 +1628,7 @@ doSkipFocus(EWin * ewin, void *params)
RememberImportantInfoForEwin(ewin); RememberImportantInfoForEwin(ewin);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1617,6 +1641,7 @@ doSkipWinList(EWin * ewin, void *params)
RememberImportantInfoForEwin(ewin); RememberImportantInfoForEwin(ewin);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -1629,6 +1654,7 @@ doNeverFocus(EWin * ewin, void *params)
RememberImportantInfoForEwin(ewin); RememberImportantInfoForEwin(ewin);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
/* Button actions */ /* Button actions */
@ -1659,6 +1685,8 @@ doDragButtonStart(EWin * edummy, void *params)
mode.firstlast = 0; mode.firstlast = 0;
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
params = NULL;
} }
int int
@ -1688,6 +1716,7 @@ doDragButtonEnd(void *params)
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
/* Settings */ /* Settings */
@ -1717,6 +1746,7 @@ doFocusModeSet(EWin * edummy, void *params)
FocusFix(); FocusFix();
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1739,6 +1769,7 @@ doMoveModeSet(EWin * edummy, void *params)
#endif #endif
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1759,6 +1790,7 @@ doResizeModeSet(EWin * edummy, void *params)
conf.resizemode = 3; conf.resizemode = 3;
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1777,6 +1809,7 @@ doSlideModeSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1796,6 +1829,7 @@ doCleanupSlideSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1813,6 +1847,7 @@ doMapSlideSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1840,6 +1875,7 @@ doSoundSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1850,6 +1886,7 @@ doButtonMoveResistSet(EWin * edummy, void *params)
conf.button_move_resistance = atoi((char *)params); conf.button_move_resistance = atoi((char *)params);
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1860,6 +1897,7 @@ doDesktopBgTimeoutSet(EWin * edummy, void *params)
conf.backgrounds.timeout = atoi((char *)params); conf.backgrounds.timeout = atoi((char *)params);
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1870,6 +1908,7 @@ doMapSlideSpeedSet(EWin * edummy, void *params)
conf.slidespeedmap = atoi((char *)params); conf.slidespeedmap = atoi((char *)params);
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1880,6 +1919,7 @@ doCleanupSlideSpeedSet(EWin * edummy, void *params)
conf.slidespeedcleanup = atoi((char *)params); conf.slidespeedcleanup = atoi((char *)params);
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1915,6 +1955,7 @@ doDragdirSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1943,6 +1984,7 @@ doDragbarOrderSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1965,6 +2007,7 @@ doDragbarWidthSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -1987,6 +2030,7 @@ doDragbarLengthSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2004,6 +2048,7 @@ doDeskSlideSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2014,6 +2059,7 @@ doDeskSlideSpeedSet(EWin * edummy, void *params)
conf.desks.slidespeed = atoi((char *)params); conf.desks.slidespeed = atoi((char *)params);
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2031,6 +2077,7 @@ doHiQualityBgSet(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2047,6 +2094,7 @@ doAutosaveSet(EWin * edummy, void *params)
conf.autosave = 1; conf.autosave = 1;
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2059,6 +2107,7 @@ doToolTipSet(EWin * edummy, void *params)
conf.tooltips.enable = !conf.tooltips.enable; conf.tooltips.enable = !conf.tooltips.enable;
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
/* Misc actions */ /* Misc actions */
@ -2074,6 +2123,7 @@ doPlaySoundClass(EWin * edummy, void *params)
SoundPlay((char *)params); SoundPlay((char *)params);
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2107,6 +2157,7 @@ doDeskray(EWin * edummy, void *params)
} }
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2198,6 +2249,7 @@ doHideShowButton(EWin * edummy, void *params)
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2205,6 +2257,8 @@ doScrollContainer(EWin * edummy, void *params)
{ {
EDBUG(6, "doScrollContainer"); EDBUG(6, "doScrollContainer");
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
params = NULL;
} }
/* More winops */ /* More winops */
@ -2257,6 +2311,7 @@ DoIconifyWindow(EWin * ewin, void *params, int nogroup)
if (gwins) if (gwins)
Efree(gwins); Efree(gwins);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -2318,6 +2373,7 @@ doScrollWindows(EWin * edummy, void *params)
Efree(lst); Efree(lst);
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
/* More winops */ /* More winops */
@ -2353,6 +2409,7 @@ DoShade(EWin * ewin, void *params, int nogroup)
} }
Efree(gwins); Efree(gwins);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -2410,6 +2467,7 @@ doSendToNextDesk(EWin * ewin, void *params)
ewin->sticky = 0; ewin->sticky = 0;
RememberImportantInfoForEwin(ewin); RememberImportantInfoForEwin(ewin);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -2422,6 +2480,7 @@ doSendToPrevDesk(EWin * ewin, void *params)
ewin->sticky = 0; ewin->sticky = 0;
RememberImportantInfoForEwin(ewin); RememberImportantInfoForEwin(ewin);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -2467,6 +2526,7 @@ doToggleFixedPos(EWin * ewin, void *params)
ewin->fixedpos = 1; ewin->fixedpos = 1;
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -2506,6 +2566,8 @@ doFocusNext(EWin * edummy, void *params)
else else
FocusGetNextEwin(); FocusGetNextEwin();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
params = NULL;
} }
static int static int
@ -2514,6 +2576,8 @@ doFocusPrev(EWin * edummy, void *params)
EDBUG(6, "doFocusPrev"); EDBUG(6, "doFocusPrev");
FocusGetPrevEwin(); FocusGetPrevEwin();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
params = NULL;
} }
static int static int
@ -2530,6 +2594,7 @@ doFocusSet(EWin * ewin, void *params)
FocusToEWin(ewin, FOCUS_SET); FocusToEWin(ewin, FOCUS_SET);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -2573,6 +2638,7 @@ doBackgroundSet(EWin * edummy, void *params)
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
/* Area actions */ /* Area actions */
@ -2589,6 +2655,7 @@ doAreaSet(EWin * edummy, void *params)
SetCurrentArea(a, b); SetCurrentArea(a, b);
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2604,6 +2671,7 @@ doAreaMoveBy(EWin * edummy, void *params)
MoveCurrentAreaBy(a, b); MoveCurrentAreaBy(a, b);
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2618,6 +2686,7 @@ doLinearAreaSet(EWin * edummy, void *params)
SetCurrentLinearArea(da); SetCurrentLinearArea(da);
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2632,6 +2701,7 @@ doLinearAreaMoveBy(EWin * edummy, void *params)
MoveCurrentLinearAreaBy(da); MoveCurrentLinearAreaBy(da);
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2648,6 +2718,7 @@ doWarpPointer(EWin * edummy, void *params)
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2837,6 +2908,8 @@ doAbout(EWin * edummy, void *params)
DialogAddButton(d, _("OK"), NULL, 1); DialogAddButton(d, _("OK"), NULL, 1);
ShowDialog(d); ShowDialog(d);
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
params = NULL;
} }
static int static int
@ -2847,6 +2920,7 @@ doFX(EWin * edummy, void *params)
FX_Op((const char *)params, FX_OP_TOGGLE); FX_Op((const char *)params, FX_OP_TOGGLE);
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2862,6 +2936,7 @@ doSetPagerHiq(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2877,6 +2952,7 @@ doSetPagerSnap(EWin * edummy, void *params)
} }
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -2955,6 +3031,7 @@ doConfigure(EWin * edummy, void *params)
} }
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
struct _keyset struct _keyset
@ -3110,6 +3187,7 @@ doInsertKeys(EWin * edummy, void *params)
} }
} }
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -3133,6 +3211,7 @@ doCreateIconbox(EWin * edummy, void *params)
IconboxShow(ib); IconboxShow(ib);
autosave(); autosave();
EDBUG_RETURN(0); EDBUG_RETURN(0);
edummy = NULL;
} }
static int static int
@ -3141,6 +3220,7 @@ doShowHideGroup(EWin * ewin, void *params)
EDBUG(6, "doShowGroup"); EDBUG(6, "doShowGroup");
ShowHideWinGroups(ewin, NULL, SET_TOGGLE); ShowHideWinGroups(ewin, NULL, SET_TOGGLE);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -3150,6 +3230,7 @@ doStartGroup(EWin * ewin, void *params)
BuildWindowGroup(&ewin, 1); BuildWindowGroup(&ewin, 1);
SaveGroups(); SaveGroups();
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -3171,6 +3252,7 @@ doAddToGroup(EWin * ewin, void *params)
AddEwinToGroup(ewin, current_group); AddEwinToGroup(ewin, current_group);
SaveGroups(); SaveGroups();
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -3183,6 +3265,7 @@ doRemoveFromGroup(EWin * ewin, void *params)
SaveGroups(); SaveGroups();
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -3193,6 +3276,7 @@ doBreakGroup(EWin * ewin, void *params)
GROUP_SELECT_EWIN_ONLY, ACTION_BREAK_GROUP); GROUP_SELECT_EWIN_ONLY, ACTION_BREAK_GROUP);
SaveGroups(); SaveGroups();
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static int static int
@ -3237,6 +3321,7 @@ doZoom(EWin * ewin, void *params)
else else
Zoom(ewin); Zoom(ewin);
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
static ActionFunction ActionFunctions[ACTION_NUMBEROF] = { static ActionFunction ActionFunctions[ACTION_NUMBEROF] = {

View File

@ -193,7 +193,9 @@ GetContextEwin(void)
if (mode.focuswin) if (mode.focuswin)
EDBUG_RETURN(mode.focuswin); EDBUG_RETURN(mode.focuswin);
if (mode.mouse_over_win); /* FIXME: Is this semicolin supposed to be here in this if statement? */
/* until someone says one way or another its commented out --Mandrake */
/* if (mode.mouse_over_win); */
EDBUG_RETURN(mode.mouse_over_win); EDBUG_RETURN(mode.mouse_over_win);
return NULL; return NULL;
@ -3096,6 +3098,8 @@ void
EwinChange(EWin * ewin, unsigned int flag) EwinChange(EWin * ewin, unsigned int flag)
{ {
EWinChanges.flags |= flag; EWinChanges.flags |= flag;
return;
ewin = NULL;
} }
void void
@ -3148,6 +3152,8 @@ BorderWinpartEventExpose(XEvent * ev, EWin * ewin, int j)
ewin->bits[j].expose = 1; ewin->bits[j].expose = 1;
if (DrawEwinWinpart(ewin, j) && IsPropagateEwinOnQueue(ewin)) if (DrawEwinWinpart(ewin, j) && IsPropagateEwinOnQueue(ewin))
PropagateShapes(ewin->win); PropagateShapes(ewin->win);
return;
ev = NULL;
} }
static void static void
@ -3213,6 +3219,8 @@ BorderWinpartEventLeave2(XEvent * ev, EWin * ewin, int j)
ewin->bits[j].left = 0; ewin->bits[j].left = 0;
ewin->bits[j].state = STATE_NORMAL; ewin->bits[j].state = STATE_NORMAL;
ChangeEwinWinpart(ewin, j); ChangeEwinWinpart(ewin, j);
return;
ev = NULL;
} }
static int static int

View File

@ -146,4 +146,6 @@ CloneDesktop(int d)
Efree(clist); Efree(clist);
} }
#endif #endif
return;
d = 0;
} }

View File

@ -562,7 +562,7 @@ SetBackgroundTo(Window win, Background * dsk, char setbg)
if (!dpmap) if (!dpmap)
{ {
int w, h, x, y; unsigned int w, h, x, y;
char hasbg, hasfg; char hasbg, hasfg;
Pixmap pmap, mask; Pixmap pmap, mask;
ColorModifierClass *cm; ColorModifierClass *cm;

View File

@ -340,7 +340,7 @@ DialogCreate(char *name)
return d; return d;
} }
void static void
FreeDButton(DButton * db) FreeDButton(DButton * db)
{ {
if (db->text) if (db->text)
@ -575,6 +575,8 @@ DialogMoveResize(EWin * ewin, int resize)
if (conf.theme.transparency || IclassIsTransparent(d->iclass)) if (conf.theme.transparency || IclassIsTransparent(d->iclass))
DialogRedraw(d); DialogRedraw(d);
return;
resize = 0;
} }
static void static void

View File

@ -82,7 +82,7 @@ ToolTipTimeout(int val, void *data)
EDBUG_RETURN_; EDBUG_RETURN_;
} }
void static void
TooltipsHandleEvent(void) TooltipsHandleEvent(void)
{ {
if (ttip) if (ttip)
@ -766,6 +766,7 @@ HandleReparent(XEvent * ev)
{ {
EDBUG(5, "HandleReparent"); EDBUG(5, "HandleReparent");
EDBUG_RETURN_; EDBUG_RETURN_;
ev = NULL;
} }
void void
@ -781,6 +782,7 @@ HandleConfigureNotify(XEvent * ev)
#endif #endif
EDBUG_RETURN_; EDBUG_RETURN_;
ev = NULL;
} }
void void

View File

@ -83,6 +83,9 @@ AutoraiseTimeout(int val, void *data)
ewin = FindItem("", val, LIST_FINDBY_ID, LIST_TYPE_EWIN); ewin = FindItem("", val, LIST_FINDBY_ID, LIST_TYPE_EWIN);
if (ewin) if (ewin)
RaiseEwin(ewin); RaiseEwin(ewin);
return;
data = NULL;
} }
static void static void
@ -93,6 +96,9 @@ ReverseTimeout(int val, void *data)
ewin = RemoveItem("EWIN", val, LIST_FINDBY_ID, LIST_TYPE_EWIN); ewin = RemoveItem("EWIN", val, LIST_FINDBY_ID, LIST_TYPE_EWIN);
if (ewin) if (ewin)
AddItem(ewin, "EWIN", ewin->client.win, LIST_TYPE_EWIN); AddItem(ewin, "EWIN", ewin->client.win, LIST_TYPE_EWIN);
return;
data = NULL;
} }
static void static void
@ -503,6 +509,7 @@ FocusHandleEnter(XEvent * ev)
} }
EDBUG_RETURN_; EDBUG_RETURN_;
ev = NULL;
} }
void void

View File

@ -82,7 +82,7 @@ static FXHandler fx_handlers[] = {
static FXHandler * static FXHandler *
FX_Find(const char *name) FX_Find(const char *name)
{ {
int i; unsigned int i;
for (i = 0; i < N_FX_HANDLERS; i++) for (i = 0; i < N_FX_HANDLERS; i++)
if (!strcmp(fx_handlers[i].name, name)) if (!strcmp(fx_handlers[i].name, name))
@ -129,10 +129,16 @@ FX_Op(const char *name, int fx_op)
} }
} }
void #if 0
/*
e Doesn't look like this is ever used, commented out for now
* --Mandrake
*/
static void
FX_Activate(char *effect) FX_Activate(char *effect)
{ {
int i; unsigned int i;
for (i = 0; i < N_FX_HANDLERS; i++) for (i = 0; i < N_FX_HANDLERS; i++)
{ {
@ -147,11 +153,12 @@ FX_Activate(char *effect)
} }
return; return;
} }
#endif
void void
FX_DeskChange(void) FX_DeskChange(void)
{ {
int i; unsigned int i;
for (i = 0; i < N_FX_HANDLERS; i++) for (i = 0; i < N_FX_HANDLERS; i++)
{ {
@ -166,7 +173,7 @@ FX_DeskChange(void)
void void
FX_Pause(void) FX_Pause(void)
{ {
int i; unsigned int i;
for (i = 0; i < N_FX_HANDLERS; i++) for (i = 0; i < N_FX_HANDLERS; i++)
{ {
@ -191,7 +198,7 @@ FX_Pause(void)
char ** char **
FX_Active(int *num) FX_Active(int *num)
{ {
int i; unsigned int i;
char **list = NULL; char **list = NULL;
*num = 0; *num = 0;
@ -211,7 +218,7 @@ FX_Active(int *num)
int int
FX_IsOn(char *effect) FX_IsOn(char *effect)
{ {
int i; unsigned int i;
for (i = 0; i < N_FX_HANDLERS; i++) for (i = 0; i < N_FX_HANDLERS; i++)
{ {
@ -319,6 +326,8 @@ FX_Ripple_Init(const char *name)
{ {
fx_ripple_count = 0; fx_ripple_count = 0;
DoIn("FX_RIPPLE_TIMEOUT", 0.066, FX_ripple_timeout, 0, NULL); DoIn("FX_RIPPLE_TIMEOUT", 0.066, FX_ripple_timeout, 0, NULL);
return;
name = NULL;
} }
void void
@ -636,6 +645,8 @@ FX_Raindrops_Init(const char *name)
fx_raindrops[i].y = rand() % (root.h - fx_raindrop_size); fx_raindrops[i].y = rand() % (root.h - fx_raindrop_size);
} }
DoIn("FX_RAINDROPS_TIMEOUT", 0.066, FX_raindrops_timeout, 0, NULL); DoIn("FX_RAINDROPS_TIMEOUT", 0.066, FX_raindrops_timeout, 0, NULL);
return;
name = NULL;
} }
void void
@ -839,6 +850,8 @@ FX_Waves_Init(const char *name)
{ {
fx_wave_count = 0; fx_wave_count = 0;
DoIn("FX_WAVE_TIMEOUT", 0.066, FX_Wave_timeout, 0, NULL); DoIn("FX_WAVE_TIMEOUT", 0.066, FX_Wave_timeout, 0, NULL);
return;
name = NULL;
} }
void void

View File

@ -127,7 +127,7 @@ SignalsSetup(void)
SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, SIGFPE, SIGSEGV, SIGPIPE, SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, SIGFPE, SIGSEGV, SIGPIPE,
SIGALRM, SIGTERM, SIGUSR1, SIGUSR2, SIGCHLD, SIGBUS SIGALRM, SIGTERM, SIGUSR1, SIGUSR2, SIGCHLD, SIGBUS
}; };
int i; unsigned int i;
struct sigaction sa; struct sigaction sa;
EDBUG(6, "SignalsSetup"); EDBUG(6, "SignalsSetup");

View File

@ -154,6 +154,7 @@ HintsSetWindowArea(EWin * ewin)
GNOME_SetEwinArea(ewin); GNOME_SetEwinArea(ewin);
#endif #endif
EDBUG_RETURN_; EDBUG_RETURN_;
ewin = NULL;
} }
void void

View File

@ -541,6 +541,8 @@ IconboxMoveResize(EWin * ewin, int resize)
ib->force_update = 1; ib->force_update = 1;
IconboxRedraw(ib); IconboxRedraw(ib);
call_depth--; call_depth--;
return;
resize = 0;
} }
static void static void
@ -940,7 +942,7 @@ IB_GetEIcon(EWin * ewin)
imlib_free_image(); imlib_free_image();
} }
void static void
IB_AddIcondef(char *title, char *name, char *class, char *file) IB_AddIcondef(char *title, char *name, char *class, char *file)
{ {
/* add match for a window pointing to an iconfile */ /* add match for a window pointing to an iconfile */
@ -2234,6 +2236,10 @@ IB_ShowMenu(Iconbox * ib, int x, int y)
MenuAddItem(p_menu, mi); MenuAddItem(p_menu, mi);
ActionsCall(ACTION_SHOW_MENU, NULL, "named __IBOX_MENU"); ActionsCall(ACTION_SHOW_MENU, NULL, "named __IBOX_MENU");
return;
x = 0;
y = 0;
} }
void void

View File

@ -3458,6 +3458,8 @@ static void
IPC_ButtonShow(char *params, Client * c) IPC_ButtonShow(char *params, Client * c)
{ {
ActionsCall(ACTION_HIDESHOW_BUTTON, NULL, params); ActionsCall(ACTION_HIDESHOW_BUTTON, NULL, params);
return;
c = NULL;
} }
static void static void
@ -4104,6 +4106,11 @@ IPC_FocusMode(char *params, Client * c)
static void static void
IPC_ShowIcons(char *params, Client * c) IPC_ShowIcons(char *params, Client * c)
{ {
/* Doesn't look like this function is doing anything, but it used to
* if I recall correctly --Mandrake */
return;
params = NULL;
c = NULL;
} }
static void static void
@ -4602,6 +4609,9 @@ IPC_ReloadMenus(char *params, Client * c)
MenusDestroyLoaded(); MenusDestroyLoaded();
LoadConfigFile("menus.cfg"); LoadConfigFile("menus.cfg");
return;
params = NULL;
c = NULL;
} }
static void static void

View File

@ -151,6 +151,8 @@ MenuMoveResize(EWin * ewin, int resize)
if ((!m->style->use_item_bg && m->pmm.pmap == 0) || if ((!m->style->use_item_bg && m->pmm.pmap == 0) ||
conf.theme.transparency || IclassIsTransparent(m->style->bg_iclass)) conf.theme.transparency || IclassIsTransparent(m->style->bg_iclass))
MenuRedraw(m); MenuRedraw(m);
return;
resize = 0;
} }
static void static void
@ -1893,7 +1895,7 @@ MenuCreateMoveToDesktop(char *name, MenuStyle * ms)
} }
#endif #endif
Menu * static Menu *
MenuCreateFromGroups(char *name, MenuStyle * ms) MenuCreateFromGroups(char *name, MenuStyle * ms)
{ {
Menu *m, *mm; Menu *m, *mm;

View File

@ -37,7 +37,7 @@ static const char *const thms[] = { "themes/DEFAULT/epplets/epplets.cfg" };
void void
BlumFlimFrub(void) BlumFlimFrub(void)
{ {
int i; unsigned int i;
char s[1024]; char s[1024];
for (i = 0; i < N_BINS; i++) for (i = 0; i < N_BINS; i++)

View File

@ -82,6 +82,7 @@ ActionMoveStart(EWin * ewin, void *params, char constrained, int nogroup)
mode.swapcoord_x = start_move_x = ewin->x; mode.swapcoord_x = start_move_x = ewin->x;
mode.swapcoord_y = start_move_y = ewin->y; mode.swapcoord_y = start_move_y = ewin->y;
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
int int
@ -320,6 +321,7 @@ ActionResizeStart(EWin * ewin, void *params, int hv)
mode.firstlast = 1; mode.firstlast = 1;
EDBUG_RETURN(0); EDBUG_RETURN(0);
params = NULL;
} }
int int

View File

@ -112,6 +112,8 @@ PagerUpdateTimeout(int val, void *data)
PagerEwinUpdateFromPager(p, lst[i]); PagerEwinUpdateFromPager(p, lst[i]);
p->update_phase = 0; p->update_phase = 0;
} }
return;
val = 0;
} }
Pager * Pager *
@ -277,11 +279,19 @@ PagerMoveResize(EWin * ewin, int resize)
lst = EwinListGetForDesktop(p->desktop, &num); lst = EwinListGetForDesktop(p->desktop, &num);
for (i = 0; i < num; i++) for (i = 0; i < num; i++)
PagerEwinUpdateMini(p, lst[i]); PagerEwinUpdateMini(p, lst[i]);
return;
resize = 0;
} }
static void static void
PagerRefresh(EWin * ewin) PagerRefresh(EWin * ewin)
{ {
/* This doesn't do anything anymore apparently
* --Mandrake
*/
return;
ewin = NULL;
} }
static void static void
@ -399,7 +409,12 @@ PagerDestroy(Pager * p)
Efree(p); Efree(p);
} }
void #if 0
/*
e Doesn't look like this is ever used, commented out for now
* --Mandrake
*/
static void
PagerOnUnmap(Pager * p) PagerOnUnmap(Pager * p)
{ {
PagerHideHi(p); PagerHideHi(p);
@ -409,6 +424,7 @@ PagerOnUnmap(Pager * p)
mode.mode = MODE_NONE; mode.mode = MODE_NONE;
} }
} }
#endif
Pager ** Pager **
PagersForDesktop(int d, int *num) PagersForDesktop(int d, int *num)
@ -1388,6 +1404,9 @@ PagerHandleMotion(Pager * p, Window win, int x, int y, int in)
PagerShowTt(ewin); PagerShowTt(ewin);
} }
return;
win = 0;
} }
void void

View File

@ -932,6 +932,9 @@ LogoutCB(int val, void *data)
{ {
doSMExit(NULL); doSMExit(NULL);
} }
return;
val = 0;
data = NULL;
} }
void void

View File

@ -3248,6 +3248,8 @@ CB_ThemeTransparency(int val, void *data)
tmp_theme_transparency); tmp_theme_transparency);
DialogItemTextSetText(di, s); DialogItemTextSetText(di, s);
DialogDrawItems(bg_sel_dialog, di, 0, 0, 99999, 99999); DialogDrawItems(bg_sel_dialog, di, 0, 0, 99999, 99999);
return;
val = 0;
} }
#endif #endif

View File

@ -214,7 +214,7 @@ SclassCreate(const char *name, const char *file)
EDBUG_RETURN(sclass); EDBUG_RETURN(sclass);
} }
void static void
SclassApply(SoundClass * sclass) SclassApply(SoundClass * sclass)
{ {
#ifdef HAVE_LIBESD #ifdef HAVE_LIBESD
@ -240,7 +240,7 @@ SclassApply(SoundClass * sclass)
EDBUG_RETURN_; EDBUG_RETURN_;
} }
void static void
SclassDestroy(SoundClass * sclass) SclassDestroy(SoundClass * sclass)
{ {
EDBUG(5, "SclassDestroy"); EDBUG(5, "SclassDestroy");

View File

@ -33,7 +33,7 @@ struct _ewinlist
}; };
#if ENABLE_DEBUG_STACKING #if ENABLE_DEBUG_STACKING
void static void
EwinListShow(const char *txt, EWinList * ewl) EwinListShow(const char *txt, EWinList * ewl)
{ {
int i; int i;
@ -54,7 +54,7 @@ EwinListShow(const char *txt, EWinList * ewl)
#define EwinListShow(txt, ewl) #define EwinListShow(txt, ewl)
#endif #endif
int static int
EwinListGetIndex(EWinList * ewl, EWin * ewin) EwinListGetIndex(EWinList * ewl, EWin * ewin)
{ {
int i; int i;

View File

@ -24,7 +24,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
int static int
AddEToFile(char *file) AddEToFile(char *file)
{ {
FILE *f1, *f2; FILE *f1, *f2;
@ -115,7 +115,7 @@ AddEToFile(char *file)
EDBUG_RETURN(1); EDBUG_RETURN(1);
} }
int static int
CreateEFile(char *file) CreateEFile(char *file)
{ {
FILE *f; FILE *f;

View File

@ -318,6 +318,7 @@ TextSize(TextClass * tclass, int active, int sticky, int state,
} }
freestrlist(lines, num_lines); freestrlist(lines, num_lines);
EDBUG_RETURN_; EDBUG_RETURN_;
fsize = 0;
} }
void void
@ -805,6 +806,7 @@ TextDraw(TextClass * tclass, Window win, int active, int sticky, int state,
} }
freestrlist(lines, num_lines); freestrlist(lines, num_lines);
EDBUG_RETURN_; EDBUG_RETURN_;
fsize = 0;
} }
void void

View File

@ -62,6 +62,8 @@ EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text,
imlib_text_draw(0, 0, text); imlib_text_draw(0, 0, text);
imlib_render_image_on_drawable(x, y - ascent); imlib_render_image_on_drawable(x, y - ascent);
imlib_free_image(); imlib_free_image();
return;
vis = NULL;
} }
void void
@ -115,6 +117,10 @@ Efont_extents(Efont * f, char *text, int *font_ascent_return,
*max_ascent_return = imlib_get_maximum_font_ascent(); *max_ascent_return = imlib_get_maximum_font_ascent();
if (max_descent_return) if (max_descent_return)
*max_descent_return = imlib_get_maximum_font_descent(); *max_descent_return = imlib_get_maximum_font_descent();
return;
lbearing_return = NULL;
rbearing_return = NULL;
} }
#else /* USE_IMLIB1 */ #else /* USE_IMLIB1 */

View File

@ -47,7 +47,7 @@ static Window warpFocusTitleWindow = 0;
static int warptitles_num = 0; static int warptitles_num = 0;
static Window *warptitles = NULL; static Window *warptitles = NULL;
static EWin **warptitles_ewin = NULL; static EWin **warptitles_ewin = NULL;
static int warpFocusKey = 0; static unsigned int warpFocusKey = 0;
int int
WarpFocusHandleEvent(XEvent * ev) WarpFocusHandleEvent(XEvent * ev)

View File

@ -119,6 +119,8 @@ SetXID(Window win, Window parent, int x, int y, int w, int h, int depth)
xid->h = h; xid->h = h;
xid->depth = root.depth; xid->depth = root.depth;
AddXID(xid); AddXID(xid);
return;
depth = 0;
} }
Pixmap Pixmap
@ -259,6 +261,8 @@ void
EForgetWindow(Display * d, Window win) EForgetWindow(Display * d, Window win)
{ {
DelXID(win); DelXID(win);
return;
d = NULL;
} }
void void
@ -362,6 +366,9 @@ EShapeCombineMaskTiled(Display * d, Window win, int dest, int x, int y,
XFreeGC(disp, gc); XFreeGC(disp, gc);
EShapeCombineMask(disp, win, dest, x, y, tm, op); EShapeCombineMask(disp, win, dest, x, y, tm, op);
EFreePixmap(disp, tm); EFreePixmap(disp, tm);
return;
d = NULL;
} }
void void

View File

@ -69,7 +69,7 @@ FindMode(int w, int h)
} }
static int static int
GetModeIndex(int dotclock, XF86VidModeModeLine * line) GetModeIndex(unsigned int dotclock, XF86VidModeModeLine * line)
{ {
int i; int i;
const XF86VidModeModeInfo *info; const XF86VidModeModeInfo *info;