Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
backgrounds.c backgrounds.h borders.c borders.h desktops.c
desktops.h dialog.h econfig.c econfig.h eimage.c eobj.h
ewins.c ewins.h finders.c focus.c lang.c lang.h snaps.c x.c
xwin.h
Log Message:
Remove/comment out unused stuff.
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- backgrounds.c 29 Mar 2008 17:18:58 -0000 1.109
+++ backgrounds.c 10 May 2008 23:22:31 -0000 1.110
@@ -944,14 +944,6 @@
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)
{
===================================================================
RCS file: /cvs/e/e16/e/src/backgrounds.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- backgrounds.h 25 Feb 2007 01:38:30 -0000 1.14
+++ backgrounds.h 10 May 2008 23:22:31 -0000 1.15
@@ -43,7 +43,6 @@
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);
===================================================================
RCS file: /cvs/e/e16/e/src/borders.c,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -3 -r1.307 -r1.308
--- borders.c 30 Mar 2008 12:13:15 -0000 1.307
+++ borders.c 10 May 2008 23:22:31 -0000 1.308
@@ -664,26 +664,6 @@
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,
===================================================================
RCS file: /cvs/e/e16/e/src/borders.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- borders.h 24 Mar 2008 09:47:50 -0000 1.14
+++ borders.h 10 May 2008 23:22:31 -0000 1.15
@@ -83,8 +83,6 @@
/* 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);
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -3 -r1.287 -r1.288
--- desktops.c 10 May 2008 23:15:32 -0000 1.287
+++ desktops.c 10 May 2008 23:22:31 -0000 1.288
@@ -809,22 +809,6 @@
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)
{
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- desktops.h 23 Mar 2008 11:54:23 -0000 1.31
+++ desktops.h 10 May 2008 23:22:31 -0000 1.32
@@ -89,7 +89,6 @@
unsigned int DesksGetCurrentNum(void);
void DesksSetCurrent(Desk * dsk);
void DesksGetAreaSize(int *aw, int *ah);
-void DesksClear(void);
void DesksFixArea(int *ax, int *ay);
===================================================================
RCS file: /cvs/e/e16/e/src/dialog.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- dialog.h 23 Mar 2008 11:54:23 -0000 1.22
+++ dialog.h 10 May 2008 23:22:31 -0000 1.23
@@ -75,7 +75,6 @@
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);
===================================================================
RCS file: /cvs/e/e16/e/src/econfig.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- econfig.c 23 Mar 2008 11:54:23 -0000 1.19
+++ econfig.c 10 May 2008 23:22:31 -0000 1.20
@@ -462,6 +462,7 @@
return 0;
}
+#if 0 /* Unused */
int
CfgItemListNamedItemToString(const CfgItem * pcl, int ncl, const char *item,
char *buf, int len)
@@ -475,6 +476,7 @@
return 0;
}
+#endif
/*
* Set <module>.<item> <value>
===================================================================
RCS file: /cvs/e/e16/e/src/econfig.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- econfig.h 23 Mar 2008 11:54:23 -0000 1.8
+++ econfig.h 10 May 2008 23:22:31 -0000 1.9
@@ -63,8 +63,4 @@
const char *item,
const char *value);
-int CfgItemListNamedItemToString(const CfgItem * pcl, int ncl,
- const char *item, char *buf,
- int len);
-
#endif /* _ECONFIG_H_ */
===================================================================
RCS file: /cvs/e/e16/e/src/eimage.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- eimage.c 30 Mar 2008 12:13:15 -0000 1.26
+++ eimage.c 10 May 2008 23:22:31 -0000 1.27
@@ -566,6 +566,7 @@
imlib_free_image();
}
+#if 0 /* Unused */
void
EDrawableDumpImage(Drawable draw, const char *txt)
{
@@ -587,6 +588,7 @@
imlib_save_image(buf);
imlib_free_image_and_decache();
}
+#endif
void
FreePmapMask(PmapMask * pmm)
===================================================================
RCS file: /cvs/e/e16/e/src/eobj.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- eobj.h 23 Mar 2008 11:54:23 -0000 1.47
+++ eobj.h 10 May 2008 23:22:31 -0000 1.48
@@ -197,7 +197,6 @@
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);
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -3 -r1.226 -r1.227
--- ewins.c 24 Mar 2008 11:12:40 -0000 1.226
+++ ewins.c 10 May 2008 23:22:31 -0000 1.227
@@ -466,18 +466,6 @@
}
}
-#if 0 /* Remove? */
-EWin *
-GetEwinByCurrentPointer(void)
-{
- Window child;
-
- EQueryPointer(EoGetWin(DesksGetCurrent()), NULL, NULL, &child, NULL);
-
- return EwinFindByFrame(child);
-}
-#endif
-
EWin *
GetEwinPointerInClient(void)
{
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- ewins.h 24 Mar 2008 09:47:50 -0000 1.85
+++ ewins.h 10 May 2008 23:22:31 -0000 1.86
@@ -345,7 +345,6 @@
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 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 @@
/* 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);
===================================================================
RCS file: /cvs/e/e16/e/src/finders.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- finders.c 19 Jan 2008 13:38:51 -0000 1.56
+++ finders.c 10 May 2008 23:22:31 -0000 1.57
@@ -43,23 +43,6 @@
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)
{
===================================================================
RCS file: /cvs/e/e16/e/src/focus.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- focus.c 10 May 2008 23:15:32 -0000 1.174
+++ focus.c 10 May 2008 23:22:31 -0000 1.175
@@ -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 @@
void
FocusNewDesk(void)
{
-#if 0 /* Remove? */
- /* Set the mouse-over window */
- Mode.mouse_over_ewin = GetEwinByCurrentPointer();
-#endif
-
FocusToEWin(NULL, FOCUS_DESK_ENTER);
/* Unfreeze keyboard */
@@ -530,11 +524,6 @@
{
/* 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;
===================================================================
RCS file: /cvs/e/e16/e/src/lang.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- lang.c 30 Mar 2008 12:13:16 -0000 1.24
+++ lang.c 10 May 2008 23:22:31 -0000 1.25
@@ -75,6 +75,7 @@
#endif
+#if 0 /* Unused */
/* Convert locale to internal format (alloc always) */
char *
EstrLoc2Int(const char *str, int len)
@@ -91,6 +92,7 @@
len = strlen(str);
return Estrndup(str, len);
}
+#endif
/* Convert UTF-8 to internal format (alloc always) */
char *
===================================================================
RCS file: /cvs/e/e16/e/src/lang.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- lang.h 13 Jan 2007 19:14:28 -0000 1.4
+++ lang.h 10 May 2008 23:22:31 -0000 1.5
@@ -46,7 +46,6 @@
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);
===================================================================
RCS file: /cvs/e/e16/e/src/snaps.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -3 -r1.138 -r1.139
--- snaps.c 24 Mar 2008 11:12:40 -0000 1.138
+++ snaps.c 10 May 2008 23:22:31 -0000 1.139
@@ -917,7 +917,7 @@
}
}
-const DialogDef DlgSnap = {
+static const DialogDef DlgSnap = {
NULL,
NULL,
N_("Remembered Application Attributes"),
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- x.c 30 Mar 2008 12:13:16 -0000 1.174
+++ x.c 10 May 2008 23:22:31 -0000 1.175
@@ -1378,53 +1378,6 @@
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)
{
===================================================================
RCS file: /cvs/e/e16/e/src/xwin.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- xwin.h 25 Apr 2008 19:12:12 -0000 1.44
+++ xwin.h 10 May 2008 23:22:31 -0000 1.45
@@ -226,7 +226,6 @@
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);
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
