Remove/comment out unused stuff.

SVN revision: 34533
This commit is contained in:
Kim Woelders 2008-05-10 23:22:31 +00:00
parent eb7ff37841
commit 26f7112636
20 changed files with 7 additions and 148 deletions

View File

@ -944,14 +944,6 @@ 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)
{

View File

@ -43,7 +43,6 @@ void BackgroundDecRefcount(Background * bg);
void BackgroundTouch(Background * bg);
const char *BackgroundGetName(const Background * bg);
int BackgroundGetColor(const Background * bg);
Pixmap BackgroundGetPixmap(const Background * bg);
unsigned int BackgroundGetSeqNo(const Background * bg);
int BackgroundIsNone(const Background * bg);

View File

@ -664,26 +664,6 @@ BorderFind(const char *name)
return (Border *) ecore_list_find(border_list, _BorderMatchName, name);
}
#if 0 /* Unused */
Border *
BorderAlloc(const char *name)
{
Border *b;
b = BorderFind(name);
if (b)
BorderIncRefcount(b);
return b;
}
void
BorderFree(Border * b)
{
BorderDecRefcount(b);
}
#endif
static void
BorderWinpartAdd(Border * b, const char *iclass, const char *aclass,
const char *tclass, const char *cclass, char ontop, int flags,

View File

@ -83,8 +83,6 @@ struct _ewinbit {
/* borders.c */
Border *BorderFind(const char *name);
Border *BorderAlloc(const char *name);
void BorderFree(Border * b);
const char *BorderGetName(const Border * b);
int BorderConfigLoad(FILE * fs);
void EwinBorderSelect(EWin * ewin);

View File

@ -809,22 +809,6 @@ DesksSetCurrent(Desk * dsk)
desks.current = dsk;
}
#if 0 /* Unused */
void
DesksClear(void)
{
Desk *dsk;
unsigned int i;
for (i = 0; i < Conf.desks.num; i++)
{
dsk = _DeskGet(i);
if (dsk->viewable)
EClearWindow(EoGetWin(dsk));
}
}
#endif
static void
DesksResize(int w, int h)
{

View File

@ -89,7 +89,6 @@ Desk *DesktopAt(int x, int y);
unsigned int DesksGetCurrentNum(void);
void DesksSetCurrent(Desk * dsk);
void DesksGetAreaSize(int *aw, int *ah);
void DesksClear(void);
void DesksFixArea(int *ax, int *ay);

View File

@ -75,7 +75,6 @@ Dialog *DialogFind(const char *name);
void DialogBindKey(Dialog * d, const char *key,
DialogCallbackFunc * func, int val,
void *data);
void DialogSetText(Dialog * d, const char *text);
void DialogSetTitle(Dialog * d, const char *title);
void DialogSetExitFunction(Dialog * d, DialogCallbackFunc * func,
int val);

View File

@ -462,6 +462,7 @@ CfgItemListNamedItemSet(const CfgItem * pcl, int ncl, const char *item,
return 0;
}
#if 0 /* Unused */
int
CfgItemListNamedItemToString(const CfgItem * pcl, int ncl, const char *item,
char *buf, int len)
@ -475,6 +476,7 @@ CfgItemListNamedItemToString(const CfgItem * pcl, int ncl, const char *item,
return 0;
}
#endif
/*
* Set <module>.<item> <value>

View File

@ -63,8 +63,4 @@ int CfgItemListNamedItemSet(const CfgItem * pcl, int ncl,
const char *item,
const char *value);
int CfgItemListNamedItemToString(const CfgItem * pcl, int ncl,
const char *item, char *buf,
int len);
#endif /* _ECONFIG_H_ */

View File

@ -566,6 +566,7 @@ ScaleTile(Win wsrc, Drawable src, Win wdst, Pixmap dst,
imlib_free_image();
}
#if 0 /* Unused */
void
EDrawableDumpImage(Drawable draw, const char *txt)
{
@ -587,6 +588,7 @@ EDrawableDumpImage(Drawable draw, const char *txt)
imlib_save_image(buf);
imlib_free_image_and_decache();
}
#endif
void
FreePmapMask(PmapMask * pmm)

View File

@ -197,7 +197,6 @@ EObj *const *EobjListStackGetForDesk(int *num, Desk * dsk);
void EobjListFocusAdd(EObj * eo, int ontop);
void EobjListFocusDel(EObj * eo);
int EobjListFocusRaise(EObj * eo);
int EobjListFocusLower(EObj * eo);
void EobjListOrderAdd(EObj * eo);
void EobjListOrderDel(EObj * eo);

View File

@ -466,18 +466,6 @@ DetermineEwinFloat(EWin * ewin, int dx, int dy)
}
}
#if 0 /* Remove? */
EWin *
GetEwinByCurrentPointer(void)
{
Window child;
EQueryPointer(EoGetWin(DesksGetCurrent()), NULL, NULL, &child, NULL);
return EwinFindByFrame(child);
}
#endif
EWin *
GetEwinPointerInClient(void)
{

View File

@ -345,7 +345,6 @@ void EwinHide(EWin * ewin);
void EwinKill(EWin * ewin);
void DetermineEwinFloat(EWin * ewin, int dx, int dy);
EWin *GetEwinPointerInClient(void);
EWin *GetEwinByCurrentPointer(void);
EWin *GetFocusEwin(void);
EWin *GetContextEwin(void);
void SetContextEwin(EWin * ewin);
@ -407,8 +406,6 @@ void EwinInstantUnShade(EWin * ewin);
void EwinShade(EWin * ewin);
void EwinUnShade(EWin * ewin);
void EwinMoveToArea(EWin * ewin, int ax, int ay);
void EwinMoveToLinearArea(EWin * ewin, int a);
void EwinMoveLinearAreaBy(EWin * ewin, int a);
void EwinOpMove(EWin * ewin, int source, int x, int y);
void EwinOpResize(EWin * ewin, int source, int w, int h);
@ -439,7 +436,6 @@ void EwinOpFullscreen(EWin * ewin, int source, int on);
/* finders.c */
EWin *EwinFindByPtr(const EWin * ewin);
EWin *EwinFindByFrame(Window win);
EWin *EwinFindByClient(Window win);
EWin *EwinFindByChildren(Window win);
EWin **EwinsFindByExpr(const char *match, int *pnum, int *pflags);

View File

@ -43,23 +43,6 @@ EwinFindByPtr(const EWin * ewin)
return NULL;
}
#if 0 /* Remove? */
EWin *
EwinFindByFrame(Window win)
{
EWin *const *ewins;
int i, num;
ewins = EwinListGetAll(&num);
for (i = 0; i < num; i++)
{
if (win == EoGetXwin(ewins[i]))
return ewins[i];
}
return NULL;
}
#endif
EWin *
EwinFindByClient(Window win)
{

View File

@ -35,7 +35,6 @@
#include "xwin.h"
#define EwinListFocusRaise(ewin) EobjListFocusRaise(EoObj(ewin))
#define EwinListFocusLower(ewin) EobjListFocusLower(EoObj(ewin))
static char focus_inhibit = 1;
static char focus_is_set = 0;
@ -514,11 +513,6 @@ FocusNewDeskBegin(void)
void
FocusNewDesk(void)
{
#if 0 /* Remove? */
/* Set the mouse-over window */
Mode.mouse_over_ewin = GetEwinByCurrentPointer();
#endif
FocusToEWin(NULL, FOCUS_DESK_ENTER);
/* Unfreeze keyboard */
@ -531,11 +525,6 @@ FocusInit(void)
/* Start focusing windows */
FocusEnable(1);
#if 0 /* Remove? */
/* Set the mouse-over window */
Mode.mouse_over_ewin = GetEwinByCurrentPointer();
#endif
focus_pending_why = 0;
focus_pending_ewin = focus_pending_new = NULL;
FocusToEWin(NULL, FOCUS_INIT);

View File

@ -75,6 +75,7 @@ Eiconv(iconv_t icd, const char *txt, size_t len)
#endif
#if 0 /* Unused */
/* Convert locale to internal format (alloc always) */
char *
EstrLoc2Int(const char *str, int len)
@ -91,6 +92,7 @@ EstrLoc2Int(const char *str, int len)
len = strlen(str);
return Estrndup(str, len);
}
#endif
/* Convert UTF-8 to internal format (alloc always) */
char *

View File

@ -46,7 +46,6 @@ void LangInit(void);
void LangExit(void);
void LangExport(void);
char *EstrLoc2Int(const char *str, int len);
char *EstrUtf82Int(const char *str, int len);
const char *EstrInt2Enc(const char *str, int want_utf8);
void EstrInt2EncFree(const char *str, int want_utf8);

View File

@ -917,7 +917,7 @@ _DlgFillSnap(Dialog * d, DItem * table, void *data)
}
}
const DialogDef DlgSnap = {
static const DialogDef DlgSnap = {
NULL,
NULL,
N_("Remembered Application Attributes"),

47
src/x.c
View File

@ -1378,53 +1378,6 @@ EShapeCombineRectangles(Win win, int dest, int x, int y,
EShapeUpdate(win);
}
#if 0 /* Unused */
XRectangle *
EShapeGetRectangles(Win win, int dest, int *rn, int *ord)
{
if (!win)
return NULL;
if (!win->attached)
{
XRectangle *r;
#if DEBUG_SHAPE_OPS
Eprintf("EShapeGetRectangles-A %#lx nr=%d\n", win->xwin, win->num_rect);
#endif
*rn = win->num_rect;
*ord = win->ord;
if (win->num_rect > 0)
{
r = EMALLOC(XRectangle, win->num_rect);
if (!r)
return NULL;
memcpy(r, win->rects, sizeof(XRectangle) * win->num_rect);
return r;
}
}
else
{
XRectangle *r, *rr;
#if DEBUG_SHAPE_OPS
Eprintf("EShapeGetRectangles-B %#lx nr=%d\n", win->xwin, win->num_rect);
#endif
r = XShapeGetRectangles(disp, win->xwin, dest, rn, ord);
if (r)
{
rr = EMALLOC(XRectangle, *rn);
if (!rr)
return NULL;
memcpy(rr, r, sizeof(XRectangle) * *rn);
XFree(r);
return rr;
}
}
return NULL;
}
#endif
int
EShapeCopy(Win dst, Win src)
{

View File

@ -226,7 +226,6 @@ void EShapeCombineRectangles(Win win, int dest, int x, int y,
int op, int ordering);
void EShapeCombineShape(Win win, int dest, int x, int y,
Win src_win, int src_kind, int op);
XRectangle *EShapeGetRectangles(Win win, int dest, int *rn, int *ord);
int EShapeCopy(Win dst, Win src);
int EShapePropagate(Win win);
int EShapeCheck(Win win);