Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c borders.c container.c desktops.c draw.c
emodule.c ewin-ops.c ewins.h fonts.c hints.h icccm.c menus.c
moveresize.c slideout.c timers.c x.c
Log Message:
Deactivate unused code, trivial cleanups.
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- backgrounds.c 28 Aug 2007 17:58:23 -0000 1.100
+++ backgrounds.c 5 Sep 2007 19:12:55 -0000 1.101
@@ -951,11 +951,13 @@
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 @@
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;
}
===================================================================
RCS file: /cvs/e/e16/e/src/borders.c,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -3 -r1.299 -r1.300
--- borders.c 27 Jul 2007 16:59:49 -0000 1.299
+++ borders.c 5 Sep 2007 19:12:55 -0000 1.300
@@ -684,6 +684,7 @@
return (Border *) ecore_list_find(border_list, _BorderMatchName, name);
}
+#if 0 /* Unused */
Border *
BorderAlloc(const char *name)
{
@@ -701,6 +702,7 @@
{
BorderDecRefcount(b);
}
+#endif
static void
BorderWinpartAdd(Border * b, const char *iclass, const char *aclass,
===================================================================
RCS file: /cvs/e/e16/e/src/container.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- container.c 27 Jul 2007 16:59:49 -0000 1.15
+++ container.c 5 Sep 2007 19:12:55 -0000 1.16
@@ -50,7 +50,7 @@
ContainerCfg Conf_containers;
-Ecore_List *container_list = NULL;
+static Ecore_List *container_list = NULL;
static int
_ContainerMatchName(const void *data, const void *match)
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -3 -r1.268 -r1.269
--- desktops.c 28 Jul 2007 08:39:55 -0000 1.268
+++ desktops.c 5 Sep 2007 19:12:55 -0000 1.269
@@ -806,6 +806,7 @@
desks.current = dsk;
}
+#if 0 /* Unused */
void
DesksClear(void)
{
@@ -819,6 +820,7 @@
EClearWindow(EoGetWin(dsk));
}
}
+#endif
static void
DesksResize(int w, int h)
===================================================================
RCS file: /cvs/e/e16/e/src/draw.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -3 -r1.111 -r1.112
--- draw.c 28 Aug 2007 17:58:23 -0000 1.111
+++ draw.c 5 Sep 2007 19:12:55 -0000 1.112
@@ -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 @@
#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)
===================================================================
RCS file: /cvs/e/e16/e/src/emodule.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emodule.c 18 May 2007 08:25:02 -0000 1.8
+++ emodule.c 5 Sep 2007 19:12:55 -0000 1.9
@@ -60,6 +60,7 @@
return NULL;
}
+#if 0 /* Unused */
static void
EModuleCommand(const EModule * em, const char *cmd, const char *prm)
{
@@ -76,6 +77,7 @@
break;
}
}
+#endif
int
ModuleConfigSet(const char *name, const char *item, const char *params)
@@ -144,6 +146,7 @@
return 0;
}
+#if 0 /* Unused */
int
ModuleCommand(const char *name, const char *cmd, const char *params)
{
@@ -157,6 +160,7 @@
return 0;
}
+#endif
void
ModulesSignal(int sig, void *prm)
===================================================================
RCS file: /cvs/e/e16/e/src/ewin-ops.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -3 -r1.120 -r1.121
--- ewin-ops.c 16 Jun 2007 08:41:53 -0000 1.120
+++ ewin-ops.c 5 Sep 2007 19:12:55 -0000 1.121
@@ -118,6 +118,7 @@
return NULL;
}
+#if 0 /* Unused */
void
EwinFixPosition(EWin * ewin)
{
@@ -141,6 +142,7 @@
if (x != EoGetX(ewin) || y != EoGetY(ewin))
EwinMove(ewin, x, y);
}
+#endif
static void
EwinDetermineArea(EWin * ewin)
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- ewins.h 23 Jul 2007 18:59:42 -0000 1.78
+++ ewins.h 5 Sep 2007 19:12:55 -0000 1.79
@@ -465,12 +465,9 @@
/* 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);
===================================================================
RCS file: /cvs/e/e16/e/src/fonts.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- fonts.c 7 Aug 2007 15:05:08 -0000 1.13
+++ fonts.c 5 Sep 2007 19:12:55 -0000 1.14
@@ -84,7 +84,6 @@
/*
* Configuration load
*/
-#include "conf.h"
static int
_FontConfigLoad(FILE * fs)
===================================================================
RCS file: /cvs/e/e16/e/src/hints.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- hints.h 16 Apr 2007 20:31:33 -0000 1.16
+++ hints.h 5 Sep 2007 19:12:55 -0000 1.17
@@ -130,7 +130,6 @@
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);
===================================================================
RCS file: /cvs/e/e16/e/src/icccm.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -3 -r1.140 -r1.141
--- icccm.c 16 Apr 2007 16:48:46 -0000 1.140
+++ icccm.c 5 Sep 2007 19:12:55 -0000 1.141
@@ -216,12 +216,14 @@
*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,
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -3 -r1.285 -r1.286
--- menus.c 27 Jul 2007 16:59:49 -0000 1.285
+++ menus.c 5 Sep 2007 19:12:55 -0000 1.286
@@ -658,6 +658,7 @@
m->filled = 0;
}
+#if 0 /* Unused */
void
MenuRepack(Menu * m)
{
@@ -676,6 +677,7 @@
EwinResize(ewin, m->w, m->h);
EwinRaise(ewin);
}
+#endif
void
MenuAddItem(Menu * m, MenuItem * item)
@@ -1896,8 +1898,6 @@
ic = NULL;
if (strcmp("NULL", s2))
ic = ImageclassFind(s2, 0);
- if (i2 <= 0)
- break;
_EFDUP(txt, p3);
break;
case MENU_ACTION:
===================================================================
RCS file: /cvs/e/e16/e/src/moveresize.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- moveresize.c 11 Jul 2007 09:21:27 -0000 1.81
+++ moveresize.c 5 Sep 2007 19:12:56 -0000 1.82
@@ -197,7 +197,7 @@
return 0;
}
-int
+static int
ActionMoveSuspend(void)
{
EWin *ewin, **lst;
@@ -230,7 +230,7 @@
return 0;
}
-int
+static int
ActionMoveResume(void)
{
EWin *ewin, **lst;
@@ -460,7 +460,7 @@
return 0;
}
-void
+static void
ActionMoveHandleMotion(void)
{
int dx, dy, dd;
@@ -681,7 +681,7 @@
Efree(gwins);
}
-void
+static void
ActionResizeHandleMotion(void)
{
int x, y, w, h;
===================================================================
RCS file: /cvs/e/e16/e/src/slideout.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- slideout.c 27 Jul 2007 16:59:50 -0000 1.60
+++ slideout.c 5 Sep 2007 19:12:56 -0000 1.61
@@ -397,6 +397,7 @@
* Configuration load/save
*/
#include "conf.h"
+
int
SlideoutsConfigLoad(FILE * fs)
{
@@ -409,6 +410,8 @@
if (!slideout_list)
slideout_list = ecore_list_new();
+
+ name[0] = '\0';
while (GetLine(s, sizeof(s), fs))
{
===================================================================
RCS file: /cvs/e/e16/e/src/timers.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- timers.c 25 Jul 2007 20:02:57 -0000 1.31
+++ timers.c 5 Sep 2007 19:12:56 -0000 1.32
@@ -314,8 +314,10 @@
}
}
+#if 0 /* Unused */
void *
AnimatorGetData(Animator * an)
{
return an->data;
}
+#endif
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- x.c 28 Aug 2007 17:58:23 -0000 1.162
+++ x.c 5 Sep 2007 19:12:56 -0000 1.163
@@ -956,6 +956,7 @@
pxwa->colormap = win->cmap;
}
+#if 0 /* Unused */
void
EConfigureWindow(Win win, unsigned int mask, XWindowChanges * wc)
{
@@ -990,6 +991,7 @@
if ((doit) || (mask & (CWBorderWidth | CWSibling | CWStackMode)))
XConfigureWindow(disp, win->xwin, mask, wc);
}
+#endif
void
ESetWindowBackgroundPixmap(Win win, Pixmap pmap)
@@ -1294,6 +1296,7 @@
EShapeUpdate(win);
}
+#if 0 /* Unused */
XRectangle *
EShapeGetRectangles(Win win, int dest, int *rn, int *ord)
{
@@ -1338,6 +1341,7 @@
}
return NULL;
}
+#endif
int
EShapeCopy(Win dst, Win src)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
