Enlightenment CVS committal Author : kwo Project : e16 Module : e
Dir : e16/e/src Modified Files: E.h borders.c cursors.c desktops.c ewins.c file.c handlers.c pager.c theme.c Log Message: Trivial cleanups. =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v retrieving revision 1.404 retrieving revision 1.405 diff -u -3 -r1.404 -r1.405 --- E.h 12 Apr 2005 16:43:32 -0000 1.404 +++ E.h 15 Apr 2005 21:07:39 -0000 1.405 @@ -60,9 +60,6 @@ #include <Imlib2.h> -#define EAllocColor(pxc) \ - XAllocColor(disp, VRoot.cmap, pxc) - #define ENABLE_TRANSPARENCY 1 #define ENABLE_THEME_TRANSPARENCY 1 @@ -1067,9 +1064,6 @@ Colormap current_cmap; Slideout *slideout; Window context_win; -#if 1 /* Should be removed */ - int context_w, context_h; -#endif char constrained; char nogroup; char keybinds_changed; @@ -1735,7 +1729,6 @@ int fillfield(char *s, int fieldno, char *buf); void fword(char *s, int num, char *wd); int findLocalizedFile(char *fname); -void rmrf(const char *s); /* finders.c */ EWin *FindEwinByBase(Window win); @@ -2297,6 +2290,8 @@ GC ECreateGC(Drawable d, unsigned long mask, XGCValues * val); int EFreeGC(GC gc); +#define EAllocColor(pxc) \ + XAllocColor(disp, VRoot.cmap, pxc) void ESetColor(XColor * pxc, int r, int g, int b); void EGetColor(const XColor * pxc, int *pr, int *pg, int *pb); =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v retrieving revision 1.255 retrieving revision 1.256 diff -u -3 -r1.255 -r1.256 --- borders.c 15 Apr 2005 18:41:04 -0000 1.255 +++ borders.c 15 Apr 2005 21:07:42 -0000 1.256 @@ -110,20 +110,9 @@ ewb->is = is; ewb->ts = ts; -#if 0 /* FIXME - Remove? */ - ImageclassApply(ewin->border->part[i].iclass, ewb->win, - ewb->w, ewb->h, ewin->active, - EoIsSticky(ewin), ewb->state, ewb->expose, ST_BORDER); - if (ts) - TextclassApply(ewin->border->part[i].iclass, ewb->win, - ewb->w, ewb->h, ewin->active, - EoIsSticky(ewin), ewb->state, ewb->expose, - ewin->border->part[i].tclass, txt); -#else ITApply(ewb->win, ewin->border->part[i].iclass, is, ewb->w, ewb->h, ewb->state, ewin->active, EoIsSticky(ewin), ewb->expose, ST_BORDER, ewin->border->part[i].tclass, ts, txt); -#endif } static int @@ -961,32 +950,6 @@ } } -#if 0 /* FIXME */ -/* This was in HandleMouseUp() */ - -{ - -#if 0 - if ((Mode.last_bpress) && (Mode.last_bpress != win)) - { - ev->xbutton.window = Mode.last_bpress; - BordersEventMouseOut2(ev); - ev->xbutton.window = win; - } -#endif -} - -static void -BorderWinpartEventLeave2(EWinBit * wbit, XEvent * ev, EWin * ewin, int j) -{ - ewin->bits[j].left = 0; - ewin->bits[j].state = STATE_NORMAL; - BorderWinpartChange(ewin, j, 0); - return; - ev = NULL; -} -#endif - static void BorderFrameHandleEvents(XEvent * ev, void *prm) { @@ -1009,10 +972,6 @@ switch (ev->type) { -#if 0 - case KeyPress: - break; -#endif case ButtonPress: BorderWinpartEventMouseDown(wbit, ev); break; =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/cursors.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- cursors.c 19 Mar 2005 16:40:00 -0000 1.25 +++ cursors.c 15 Apr 2005 21:07:44 -0000 1.26 @@ -28,9 +28,6 @@ struct _ecursor { char *name; -#if 0 /* Not used */ - Imlib_Color fg, bg; -#endif char *file; Cursor cursor; unsigned int ref_count; @@ -92,10 +89,6 @@ ec = Emalloc(sizeof(ECursor)); ec->name = Estrdup(name); ec->file = Estrdup(image); -#if 0 /* Not used */ - ec->fg = *fg; - ec->bg = *bg; -#endif ec->cursor = curs; ec->ref_count = 0; #if 0 /* Not used */ =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v retrieving revision 1.135 retrieving revision 1.136 diff -u -3 -r1.135 -r1.136 --- desktops.c 30 Mar 2005 22:51:01 -0000 1.135 +++ desktops.c 15 Apr 2005 21:07:44 -0000 1.136 @@ -692,14 +692,6 @@ for (i = 0; i < Conf.desks.num; i++) DeskControlsDestroy(_DeskGet(i)); -#if 0 - while ((b = RemoveItem("_DESKTOP_DRAG_CONTROL", 0, - LIST_FINDBY_NAME, LIST_TYPE_BUTTON))) - ButtonDestroy(b); - while ((b = RemoveItem("_DESKTOP_DESKRAY_DRAG_CONTROL", 0, - LIST_FINDBY_NAME, LIST_TYPE_BUTTON))) - ButtonDestroy(b); -#endif } static void =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- ewins.c 12 Apr 2005 16:43:35 -0000 1.38 +++ ewins.c 15 Apr 2005 21:07:44 -0000 1.39 @@ -802,9 +802,6 @@ /* if the window asked to be iconified at the start */ if (ewin->client.start_iconified) { -#if 0 /* FIXME - Remove? */ - EwinBorderDraw(ewin, 1, 1, 0); -#endif MoveEwinToDesktopAt(ewin, desk, x, y); ecore_x_ungrab(); ewin->state = EWIN_STATE_MAPPED; @@ -834,9 +831,6 @@ ewin->client.already_placed = 1; x = Mode.x + 1; y = Mode.y + 1; -#if 0 /* FIXME - Remove? */ - EwinBorderDraw(ewin, 1, 1, 0); -#endif MoveEwinToDesktop(ewin, desk); RaiseEwin(ewin); MoveEwin(ewin, x, y); @@ -874,9 +868,6 @@ fx = VRoot.w; fy = (rand() % (VRoot.h)) - EoGetH(ewin); } -#if 0 /* FIXME - Remove? */ - EwinBorderDraw(ewin, 1, 1, 0); -#endif MoveEwinToDesktop(ewin, desk); RaiseEwin(ewin); MoveEwin(ewin, fx, fy); @@ -886,9 +877,6 @@ } else { -#if 0 /* FIXME - Remove? */ - EwinBorderDraw(ewin, 1, 1, 0); -#endif MoveEwinToDesktopAt(ewin, desk, x, y); RaiseEwin(ewin); ShowEwin(ewin); @@ -920,10 +908,6 @@ EoIsFloating(ewin)); #endif -#if 0 /* FIXME - Remove? */ - EwinBorderDraw(ewin, 1, 1, 1); -#endif - EwinConformToDesktop(ewin); EwinDetermineArea(ewin); =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/file.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- file.c 19 Mar 2005 16:40:02 -0000 1.68 +++ file.c 15 Apr 2005 21:07:45 -0000 1.69 @@ -869,14 +869,3 @@ return 0; } - -#if 0 /* Not used */ -void -rmrf(const char *path) -{ - char s[FILEPATH_LEN_MAX]; - - Esnprintf(s, sizeof(s), "/bin/rm -rf %s", path); - system(s); -} -#endif =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/handlers.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- handlers.c 19 Mar 2005 16:40:03 -0000 1.44 +++ handlers.c 15 Apr 2005 21:07:45 -0000 1.45 @@ -162,7 +162,6 @@ SignalsSetup(void) { /* This function will set up all the signal handlers for E */ - doSignalsSetup(1); } @@ -170,28 +169,7 @@ SignalsRestore(void) { /* This function will restore all the signal handlers for E */ - -#if 0 - signal(SIGHUP, SIG_DFL); - signal(SIGINT, SIG_DFL); - signal(SIGQUIT, SIG_DFL); - signal(SIGILL, SIG_DFL); - signal(SIGABRT, SIG_DFL); - signal(SIGFPE, SIG_IGN); - signal(SIGSEGV, SIG_IGN); - signal(SIGPIPE, SIG_DFL); - signal(SIGALRM, SIG_DFL); - signal(SIGTERM, SIG_DFL); - signal(SIGUSR1, SIG_DFL); - signal(SIGUSR2, SIG_DFL); - signal(SIGCHLD, SIG_DFL); -#ifdef SIGTSTP - signal(SIGTSTP, SIG_DFL); -#endif - signal(SIGBUS, SIG_IGN); -#else doSignalsSetup(0); -#endif } void =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v retrieving revision 1.126 retrieving revision 1.127 diff -u -3 -r1.126 -r1.127 --- pager.c 12 Apr 2005 16:43:38 -0000 1.126 +++ pager.c 15 Apr 2005 21:07:45 -0000 1.127 @@ -1906,20 +1906,6 @@ Efree(pl); } -#if 0 -static int -PagersCountForDesktop(int desk) -{ - Pager **pl; - int num; - - pl = PagersForDesktop(desk, &num); - if (pl) - Efree(pl); - return num; -} -#endif - /* * Configuration dialog */ =================================================================== RCS file: /cvsroot/enlightenment/e16/e/src/theme.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- theme.c 19 Mar 2005 16:40:17 -0000 1.46 +++ theme.c 15 Apr 2005 21:07:46 -0000 1.47 @@ -27,7 +27,6 @@ static char *badtheme = NULL; static char *badreason = NULL; -static char mustdel = 0; static const char *const theme_files[] = { #if ENABLE_THEME_SANITY_CHECKING @@ -260,13 +259,7 @@ static void ThemeCleanup(void) { - if (!mustdel) - return; - - /* We don't ever get here because mustdel is never set */ -#if 0 /* Don't do recursive theme removal (risky?) */ - rmrf(themepath); -#endif + /* TBD */ } static char * @@ -279,8 +272,6 @@ const char *oktheme = NULL; char *name; - mustdel = 0; - /* its a directory - just use it "as is" */ if (isdir(theme)) { ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs