Cosmetics.

SVN revision: 9351
This commit is contained in:
Kim Woelders 2004-03-14 09:03:26 +00:00
parent 16f366ca03
commit a50d1836ee
17 changed files with 22 additions and 43 deletions

View File

@ -29,14 +29,6 @@ static void DetermineEwinArea(EWin * ewin);
EWin *Adopt(Window win); EWin *Adopt(Window win);
EWin *AdoptInternal(Window win, Border * border, int type); EWin *AdoptInternal(Window win, Border * border, int type);
#if 0
#define DELETE_EWIN_REFERENCE(ew, ew_ref) \
({ if (ew_ref == ew) { printf("Stale ewin ref (" #ew_ref ")\n"); ew_ref = NULL; } })
#else
#define DELETE_EWIN_REFERENCE(ew, ew_ref) \
({ if (ew_ref == ew) { ew_ref = NULL; } })
#endif
void void
KillEwin(EWin * ewin, int nogroup) KillEwin(EWin * ewin, int nogroup)
{ {
@ -1215,9 +1207,8 @@ AdoptInternal(Window win, Border * border, int type)
ewin->type = type; ewin->type = type;
switch (type) switch (type)
{ {
#if 0
case EWIN_TYPE_DIALOG: case EWIN_TYPE_DIALOG:
#endif break;
case EWIN_TYPE_MENU: case EWIN_TYPE_MENU:
ewin->layer = 99; ewin->layer = 99;
ewin->skiptask = 1; ewin->skiptask = 1;
@ -1381,8 +1372,8 @@ FreeEwin(EWin * ewin)
if (ewin->ibox) if (ewin->ibox)
IconboxDestroy(ewin->ibox); IconboxDestroy(ewin->ibox);
/* May be an overkill but cannot hurt... */ if (ewin == mode.mouse_over_win)
DELETE_EWIN_REFERENCE(ewin, mode.mouse_over_win); mode.mouse_over_win = NULL;
HintsDelWindowHints(ewin); HintsDelWindowHints(ewin);

View File

@ -908,8 +908,7 @@ Config_Control(FILE * ConfigFile)
sscanf(s, "%*s %d %d ", &conf.dock.startx, &conf.dock.starty); sscanf(s, "%*s %d %d ", &conf.dock.startx, &conf.dock.starty);
break; break;
case CONTROL_KDESUPPORT: case CONTROL_KDESUPPORT:
#if 0 #if 0 /* Ignore */
/* Ignore */
#endif #endif
break; break;
case CONTROL_SHOWROOTTOOLTIP: case CONTROL_SHOWROOTTOOLTIP:

View File

@ -547,7 +547,7 @@ SetBackgroundTo(Window win, Background * dsk, char setbg)
if (conf.backgrounds.hiquality) if (conf.backgrounds.hiquality)
{ {
imlib_context_set_dither(1); imlib_context_set_dither(1);
#if 0 #if 0 /* ??? */
imlib_context_set_anti_alias(1); imlib_context_set_anti_alias(1);
#endif #endif
} }

View File

@ -237,7 +237,7 @@ EWMH_Init(Window win_wm_check)
_ATOM_INIT(_NET_WM_STATE_SKIP_TASKBAR); _ATOM_INIT(_NET_WM_STATE_SKIP_TASKBAR);
_ATOM_INIT(_NET_WM_STATE_SKIP_PAGER); _ATOM_INIT(_NET_WM_STATE_SKIP_PAGER);
_ATOM_INIT(_NET_WM_STATE_HIDDEN); _ATOM_INIT(_NET_WM_STATE_HIDDEN);
#if 0 #if 0 /* Not implemented */
_ATOM_INIT(_NET_WM_STATE_FULLSCREEN); _ATOM_INIT(_NET_WM_STATE_FULLSCREEN);
#endif #endif
_ATOM_INIT(_NET_WM_STATE_ABOVE); _ATOM_INIT(_NET_WM_STATE_ABOVE);
@ -667,7 +667,7 @@ EWMH_GetWindowType(EWin * ewin)
ewin->skipfocus = 1; ewin->skipfocus = 1;
ewin->never_use_area = 1; ewin->never_use_area = 1;
} }
#if 0 #if 0 /* Not used by E (yet?) */
else if (atom == _NET_WM_WINDOW_TYPE_TOOLBAR) else if (atom == _NET_WM_WINDOW_TYPE_TOOLBAR)
{ {
} }

View File

@ -347,7 +347,7 @@ FocusNewDeskBegin(void)
if (ewin->pager) if (ewin->pager)
{ {
#if 0 #if 0 /* ??? */
XSelectInput(disp, ewin->client.win, XSelectInput(disp, ewin->client.win,
PropertyChangeMask | FocusChangeMask | PropertyChangeMask | FocusChangeMask |
ResizeRedirectMask | StructureNotifyMask | ResizeRedirectMask | StructureNotifyMask |
@ -476,9 +476,6 @@ FocusNewDesk(void)
void void
FocusHandleEnter(XEvent * ev) FocusHandleEnter(XEvent * ev)
{ {
#if 0
Window win = ev->xcrossing.window;
#endif
EWin *ewin; EWin *ewin;
EDBUG(5, "FocusHandleEnter"); EDBUG(5, "FocusHandleEnter");
@ -519,7 +516,7 @@ FocusHandleLeave(XEvent * ev)
FocusToEWin(NULL, FOCUS_SET); FocusToEWin(NULL, FOCUS_SET);
} }
#if 0 #if 0 /* Remove old code */
void void
FocusHandleEnter(XEvent * ev) FocusHandleEnter(XEvent * ev)
{ {

View File

@ -78,14 +78,6 @@ ICCCM_ProcessClientMessage(XClientMessageEvent * event)
if (!(ewin->iconified)) if (!(ewin->iconified))
IconifyEwin(ewin); IconifyEwin(ewin);
} }
#if 0
else if (event->data.l[0] == NormalState)
{
if (ewin->iconified)
DeIconifyEwin(ewin);
}
HintsSetWindowState(ewin);
#endif
} }
} }

View File

@ -42,7 +42,7 @@ TransparencyMakeColorModifier(void)
if (icm == NULL) if (icm == NULL)
icm = imlib_create_color_modifier(); icm = imlib_create_color_modifier();
imlib_context_set_color_modifier(icm); imlib_context_set_color_modifier(icm);
#if 0 #if 0 /* Useful in this context? */
imlib_modify_color_modifier_gamma(0.5); imlib_modify_color_modifier_gamma(0.5);
imlib_modify_color_modifier_brightness(0.5); imlib_modify_color_modifier_brightness(0.5);
imlib_modify_color_modifier_contrast(0.5); imlib_modify_color_modifier_contrast(0.5);
@ -464,7 +464,7 @@ ImageStateMakePmapMask(ImageState * is, Drawable win, PmapMask * pmm,
imlib_context_set_blend(0); imlib_context_set_blend(0);
#ifdef ENABLE_THEME_TRANSPARENCY #ifdef ENABLE_THEME_TRANSPARENCY
imlib_context_set_color_modifier(NULL); imlib_context_set_color_modifier(NULL);
#if 0 #if 0 /* Do we ever need to free it? */
imlib_free_color_modifier(); imlib_free_color_modifier();
#endif #endif
#endif #endif

View File

@ -1182,7 +1182,7 @@ SelectIconboxForEwin(EWin * ewin)
} }
Efree(ib); Efree(ib);
} }
#if 0 #if 0 /* Do not autocreate iconboxes */
else else
{ {
/* If there are no iconboxes, create one. */ /* If there are no iconboxes, create one. */

View File

@ -4567,7 +4567,7 @@ HandleIPC(char *params, Client * c)
return 0; return 0;
} }
#if 0 #if 0 /* Not implemented */
/* The External function designed for attaching to a dialog box /* The External function designed for attaching to a dialog box
* to return a message back to an external app telling you what * to return a message back to an external app telling you what
* button was depressed * button was depressed

View File

@ -221,7 +221,7 @@ MenuShow(Menu * m, char noshow)
{ {
ButtonDrawWithState(mode.button, STATE_NORMAL); ButtonDrawWithState(mode.button, STATE_NORMAL);
} }
#if 0 #if 0 /* ??? */
RaiseEwin(ewin); RaiseEwin(ewin);
ShowEwin(ewin); ShowEwin(ewin);
EDBUG_RETURN_; EDBUG_RETURN_;
@ -1869,7 +1869,7 @@ MenuCreateFromDesktops(char *name, MenuStyle * ms)
EDBUG_RETURN(m); EDBUG_RETURN(m);
} }
#if 0 #if 0 /* Not finished */
Menu * Menu *
MenuCreateMoveToDesktop(char *name, MenuStyle * ms) MenuCreateMoveToDesktop(char *name, MenuStyle * ms)
{ {

View File

@ -2379,7 +2379,7 @@ SettingsSpecialFX(void)
DialogItemSetFill(di, 1, 0); DialogItemSetFill(di, 1, 0);
DialogItemSetColSpan(di, 4); DialogItemSetColSpan(di, 4);
DialogItemTextSetText(di, _("Effects")); DialogItemTextSetText(di, _("Effects"));
#if 0 #if 0 /* Disabled */
di = DialogAddItem(table, DITEM_CHECKBUTTON); di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetPadding(di, 2, 2, 2, 2); DialogItemSetPadding(di, 2, 2, 2, 2);
DialogItemSetFill(di, 1, 0); DialogItemSetFill(di, 1, 0);

View File

@ -509,7 +509,7 @@ SnapshotEwinDialog(EWin * ewin)
DialogItemCheckButtonSetState(di, tmp_snap_skiplists); DialogItemCheckButtonSetState(di, tmp_snap_skiplists);
DialogItemCheckButtonSetPtr(di, &tmp_snap_skiplists); DialogItemCheckButtonSetPtr(di, &tmp_snap_skiplists);
#if 0 #if 0 /* Disabled (why?) */
di = DialogAddItem(table, DITEM_CHECKBUTTON); di = DialogAddItem(table, DITEM_CHECKBUTTON);
DialogItemSetColSpan(di, 2); DialogItemSetColSpan(di, 2);
DialogItemSetPadding(di, 2, 2, 2, 2); DialogItemSetPadding(di, 2, 2, 2, 2);

View File

@ -361,7 +361,7 @@ ThemeCleanup(void)
return; return;
/* We don't ever get here because mustdel is never set */ /* We don't ever get here because mustdel is never set */
#if 0 #if 0 /* Don't do recursive theme removal (risky?) */
rmrf(themepath); rmrf(themepath);
#endif #endif
} }

View File

@ -944,7 +944,7 @@ EFont_draw_string(Display * disp, Drawable win, GC gc, int x, int y, char *text,
/* XUngrabServer(disp); */ /* XUngrabServer(disp); */
/* XFlush(disp); */ /* XFlush(disp); */
#if 0 #if 0 /* ??? */
if (xatt.depth == 16) if (xatt.depth == 16)
{ {
XVisualInfo xvi, *xvir; XVisualInfo xvi, *xvir;

View File

@ -60,7 +60,7 @@ WarpFocusHandleEvent(XEvent * ev)
if (ev->type != KeyPress && ev->type != KeyRelease) if (ev->type != KeyPress && ev->type != KeyRelease)
EDBUG_RETURN(0); EDBUG_RETURN(0);
#if 0 #if 0 /* Debug */
printf("WarpFocusHandleEvent win=%#x key=%#x(%#x) %d\n", printf("WarpFocusHandleEvent win=%#x key=%#x(%#x) %d\n",
(unsigned)ev->xkey.window, ev->xkey.keycode, (unsigned)ev->xkey.window, ev->xkey.keycode,
warpFocusKey, warpFocusTitleShowing); warpFocusKey, warpFocusTitleShowing);

View File

@ -562,7 +562,7 @@ EGetGeometry(Display * d, Window win, Window * root_return, int *x, int *y,
{ {
ok = XGetGeometry(d, win, root_return, x, y, w, h, bw, depth); ok = XGetGeometry(d, win, root_return, x, y, w, h, bw, depth);
} }
#if 0 #if 0 /* Debug */
if (!ok) if (!ok)
printf("EGetGeometry win=%#x, error %d\n", (unsigned)win, ok); printf("EGetGeometry win=%#x, error %d\n", (unsigned)win, ok);
#endif #endif

View File

@ -252,7 +252,7 @@ Zoom(EWin * ewin)
FocusToEWin(ewin, FOCUS_SET); FocusToEWin(ewin, FOCUS_SET);
XWarpPointer(disp, None, ewin->client.win, 0, 0, 0, 0, XWarpPointer(disp, None, ewin->client.win, 0, 0, 0, 0,
ewin->client.w / 2, ewin->client.h / 2); ewin->client.w / 2, ewin->client.h / 2);
#if 0 #if 0 /* Doesn't work as intended */
XGrabPointer(disp, ewin->client.win, True, XGrabPointer(disp, ewin->client.win, True,
ButtonPressMask | ButtonReleaseMask | ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | ButtonMotionMask | PointerMotionMask | ButtonMotionMask |