Deactivate unused code, trivial cleanups.
SVN revision: 31626
This commit is contained in:
parent
7877da172b
commit
6089e2ef04
|
@ -951,11 +951,13 @@ BackgroundGetFgFile(const Background * bg)
|
|||
return bg->top.file;
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
int
|
||||
BackgroundGetColor(const Background * bg)
|
||||
{
|
||||
return (bg->pmap) ? 0 : bg->bg_solid.pixel;
|
||||
}
|
||||
#endif
|
||||
|
||||
Pixmap
|
||||
BackgroundGetPixmap(const Background * bg)
|
||||
|
@ -2495,11 +2497,11 @@ BackgroundsIpc(const char *params)
|
|||
int i, len, num, len2;
|
||||
Background *bg;
|
||||
|
||||
len = len2 = 0;
|
||||
cmd[0] = prm[0] = '\0';
|
||||
p = params;
|
||||
if (p)
|
||||
{
|
||||
len = len2 = 0;
|
||||
sscanf(p, "%100s %n%100s %n", cmd, &len2, prm, &len);
|
||||
p += len;
|
||||
}
|
||||
|
|
|
@ -684,6 +684,7 @@ BorderFind(const char *name)
|
|||
return (Border *) ecore_list_find(border_list, _BorderMatchName, name);
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
Border *
|
||||
BorderAlloc(const char *name)
|
||||
{
|
||||
|
@ -701,6 +702,7 @@ BorderFree(Border * b)
|
|||
{
|
||||
BorderDecRefcount(b);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
BorderWinpartAdd(Border * b, const char *iclass, const char *aclass,
|
||||
|
|
|
@ -50,7 +50,7 @@ static void ContainerEventIconWin(Win win, XEvent * ev, void *prm);
|
|||
|
||||
ContainerCfg Conf_containers;
|
||||
|
||||
Ecore_List *container_list = NULL;
|
||||
static Ecore_List *container_list = NULL;
|
||||
|
||||
static int
|
||||
_ContainerMatchName(const void *data, const void *match)
|
||||
|
|
|
@ -806,6 +806,7 @@ DesksSetCurrent(Desk * dsk)
|
|||
desks.current = dsk;
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
void
|
||||
DesksClear(void)
|
||||
{
|
||||
|
@ -819,6 +820,7 @@ DesksClear(void)
|
|||
EClearWindow(EoGetWin(dsk));
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
DesksResize(int w, int h)
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
#include "desktops.h"
|
||||
#include "eobj.h"
|
||||
#include "ewins.h"
|
||||
#include "hints.h"
|
||||
#include "piximg.h"
|
||||
#include "xwin.h"
|
||||
|
||||
|
@ -124,10 +123,10 @@ static Font font = None; /* Used in mode 1 (technical) */
|
|||
|
||||
#define _SHAPE_SET_RECT(rl, _x, _y, _w, _h) \
|
||||
do { \
|
||||
rl[0].x = _x; rl[0].y = _y; rl[0].width = _w; rl[0].height = 1; \
|
||||
rl[1].x = _x; rl[1].y = _y + _h - 1; rl[1].width = _w; rl[1].height = 1; \
|
||||
rl[2].x = _x; rl[2].y = _y + 1; rl[2].width = 1; rl[2].height = _h - 2; \
|
||||
rl[3].x = _x + _w - 1; rl[3].y = _y + 1; rl[3].width = 1; rl[3].height = _h - 2; \
|
||||
rl[0].x = (_x); rl[0].y = (_y); rl[0].width = (_w); rl[0].height = 1; \
|
||||
rl[1].x = (_x); rl[1].y = (_y)+(_h)-1; rl[1].width = (_w); rl[1].height = 1; \
|
||||
rl[2].x = (_x); rl[2].y = (_y)+1; rl[2].width = 1; rl[2].height = (_h)-2; \
|
||||
rl[3].x = (_x)+(_w)-1; rl[3].y = (_y)+1; rl[3].width = 1; rl[3].height = (_h)-2; \
|
||||
} while(0)
|
||||
|
||||
#define _R(x) (((x) >> 16) & 0xff)
|
||||
|
|
|
@ -60,6 +60,7 @@ EModuleFind(const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
static void
|
||||
EModuleCommand(const EModule * em, const char *cmd, const char *prm)
|
||||
{
|
||||
|
@ -76,6 +77,7 @@ EModuleCommand(const EModule * em, const char *cmd, const char *prm)
|
|||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
ModuleConfigSet(const char *name, const char *item, const char *params)
|
||||
|
@ -144,6 +146,7 @@ ModuleConfigShow(const char *name, const char *item)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
int
|
||||
ModuleCommand(const char *name, const char *cmd, const char *params)
|
||||
{
|
||||
|
@ -157,6 +160,7 @@ ModuleCommand(const char *name, const char *cmd, const char *params)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
ModulesSignal(int sig, void *prm)
|
||||
|
|
|
@ -118,6 +118,7 @@ EwinOpFind(const char *op)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
void
|
||||
EwinFixPosition(EWin * ewin)
|
||||
{
|
||||
|
@ -141,6 +142,7 @@ EwinFixPosition(EWin * ewin)
|
|||
if (x != EoGetX(ewin) || y != EoGetY(ewin))
|
||||
EwinMove(ewin, x, y);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
EwinDetermineArea(EWin * ewin)
|
||||
|
|
|
@ -465,12 +465,9 @@ void EwinSyncRequestWait(EWin * ewin);
|
|||
/* moveresize.c */
|
||||
int ActionMoveStart(EWin * ewin, char constrained, int nogroup);
|
||||
int ActionMoveEnd(EWin * ewin);
|
||||
int ActionMoveSuspend(void);
|
||||
int ActionMoveResume(void);
|
||||
void ActionMoveHandleMotion(void);
|
||||
int ActionResizeStart(EWin * ewin, int hv);
|
||||
int ActionResizeEnd(EWin * ewin);
|
||||
void ActionResizeHandleMotion(void);
|
||||
|
||||
int ActionsSuspend(void);
|
||||
int ActionsResume(void);
|
||||
void ActionsHandleMotion(void);
|
||||
|
|
|
@ -84,7 +84,6 @@ FontLookup(const char *name)
|
|||
/*
|
||||
* Configuration load
|
||||
*/
|
||||
#include "conf.h"
|
||||
|
||||
static int
|
||||
_FontConfigLoad(FILE * fs)
|
||||
|
|
|
@ -130,7 +130,6 @@ void ICCCM_Iconify(const EWin * ewin);
|
|||
void ICCCM_DeIconify(const EWin * ewin);
|
||||
void ICCCM_SizeMatch(const EWin * ewin, int wi, int hi, int *pwo,
|
||||
int *pho);
|
||||
void ICCCM_MatchSize(EWin * ewin);
|
||||
void ICCCM_GetIncrementalSize(EWin * ewin, unsigned int w,
|
||||
unsigned int h, unsigned int *wi,
|
||||
unsigned int *hi);
|
||||
|
|
|
@ -216,12 +216,14 @@ ICCCM_SizeMatch(const EWin * ewin, int wi, int hi, int *pwo, int *pho)
|
|||
*pho = h;
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
void
|
||||
ICCCM_MatchSize(EWin * ewin)
|
||||
{
|
||||
ICCCM_SizeMatch(ewin, ewin->client.w, ewin->client.h, &ewin->client.w,
|
||||
&ewin->client.h);
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
ICCCM_GetIncrementalSize(EWin * ewin, unsigned int w, unsigned int h,
|
||||
|
|
|
@ -658,6 +658,7 @@ MenuFreePixmaps(Menu * m)
|
|||
m->filled = 0;
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
void
|
||||
MenuRepack(Menu * m)
|
||||
{
|
||||
|
@ -676,6 +677,7 @@ MenuRepack(Menu * m)
|
|||
EwinResize(ewin, m->w, m->h);
|
||||
EwinRaise(ewin);
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
MenuAddItem(Menu * m, MenuItem * item)
|
||||
|
@ -1896,8 +1898,6 @@ MenuConfigLoad(FILE * fs)
|
|||
ic = NULL;
|
||||
if (strcmp("NULL", s2))
|
||||
ic = ImageclassFind(s2, 0);
|
||||
if (i2 <= 0)
|
||||
break;
|
||||
_EFDUP(txt, p3);
|
||||
break;
|
||||
case MENU_ACTION:
|
||||
|
|
|
@ -197,7 +197,7 @@ ActionMoveEnd(EWin * ewin)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
ActionMoveSuspend(void)
|
||||
{
|
||||
EWin *ewin, **lst;
|
||||
|
@ -230,7 +230,7 @@ ActionMoveSuspend(void)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
static int
|
||||
ActionMoveResume(void)
|
||||
{
|
||||
EWin *ewin, **lst;
|
||||
|
@ -460,7 +460,7 @@ ActionResizeEnd(EWin * ewin)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
ActionMoveHandleMotion(void)
|
||||
{
|
||||
int dx, dy, dd;
|
||||
|
@ -681,7 +681,7 @@ ActionMoveHandleMotion(void)
|
|||
Efree(gwins);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
ActionResizeHandleMotion(void)
|
||||
{
|
||||
int x, y, w, h;
|
||||
|
|
|
@ -397,6 +397,7 @@ SlideoutsHide(void)
|
|||
* Configuration load/save
|
||||
*/
|
||||
#include "conf.h"
|
||||
|
||||
int
|
||||
SlideoutsConfigLoad(FILE * fs)
|
||||
{
|
||||
|
@ -410,6 +411,8 @@ SlideoutsConfigLoad(FILE * fs)
|
|||
if (!slideout_list)
|
||||
slideout_list = ecore_list_new();
|
||||
|
||||
name[0] = '\0';
|
||||
|
||||
while (GetLine(s, sizeof(s), fs))
|
||||
{
|
||||
i1 = ConfigParseline1(s, s2, NULL, NULL);
|
||||
|
|
|
@ -314,8 +314,10 @@ AnimatorDel(Animator * an)
|
|||
}
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
void *
|
||||
AnimatorGetData(Animator * an)
|
||||
{
|
||||
return an->data;
|
||||
}
|
||||
#endif
|
||||
|
|
4
src/x.c
4
src/x.c
|
@ -956,6 +956,7 @@ EGetWindowAttributes(Win win, XWindowAttributes * pxwa)
|
|||
pxwa->colormap = win->cmap;
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
void
|
||||
EConfigureWindow(Win win, unsigned int mask, XWindowChanges * wc)
|
||||
{
|
||||
|
@ -990,6 +991,7 @@ EConfigureWindow(Win win, unsigned int mask, XWindowChanges * wc)
|
|||
if ((doit) || (mask & (CWBorderWidth | CWSibling | CWStackMode)))
|
||||
XConfigureWindow(disp, win->xwin, mask, wc);
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
ESetWindowBackgroundPixmap(Win win, Pixmap pmap)
|
||||
|
@ -1294,6 +1296,7 @@ EShapeCombineRectangles(Win win, int dest, int x, int y,
|
|||
EShapeUpdate(win);
|
||||
}
|
||||
|
||||
#if 0 /* Unused */
|
||||
XRectangle *
|
||||
EShapeGetRectangles(Win win, int dest, int *rn, int *ord)
|
||||
{
|
||||
|
@ -1338,6 +1341,7 @@ EShapeGetRectangles(Win win, int dest, int *rn, int *ord)
|
|||
}
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
int
|
||||
EShapeCopy(Win dst, Win src)
|
||||
|
|
Loading…
Reference in New Issue