e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Delete unused mode item, move a "private" one. 

SVN revision: 8111
This commit is contained in:
Kim Woelders 2003-12-13 14:12:22 +00:00
parent ebaffcd943
commit e165c6f6bf
7 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/E.h
View File

@ -1288,8 +1288,6 @@ typedef struct _emode
Colormap current_cmap;
char autosave;
char memory_paranoia;
char destroy;
char adestroy;
Slideout *slideout;
Window context_win;
char tooltips;

14
src/actions.c
View File

@ -26,6 +26,8 @@
#include <process.h>
#endif
static char mode_action_destroy = 0;
ActionClass *
CreateAclass(char *name)
{
@ -291,7 +293,7 @@ RemoveActionClass(ActionClass * ActionClassToRemove)
if (ActionClassToRemove->tooltipstring)
Efree(ActionClassToRemove->tooltipstring);
Efree(ActionClassToRemove);
mode.adestroy = 1;
mode_action_destroy = 1;
EDBUG_RETURN_;
}
@ -411,11 +413,11 @@ EventAclass(XEvent * ev, ActionClass * a)
break;
}
mode.adestroy = 0;
mode_action_destroy = 0;
for (i = 0; i < a->num; i++)
{
if (!mode.adestroy)
if (!mode_action_destroy)
{
act = a->list[i];
ok = 0;
@ -472,12 +474,12 @@ EventAclass(XEvent * ev, ActionClass * a)
}
}
}
if (mode.adestroy)
if (mode_action_destroy)
break;
}
if (reset_ewin)
mode.ewin = NULL;
mode.adestroy = 0;
mode_action_destroy = 0;
EDBUG_RETURN(val);
}
@ -499,7 +501,7 @@ handleAction(ActionType * Action)
* if so, we'd best not stick around here
*/
if (mode.adestroy)
if (mode_action_destroy)
EDBUG_RETURN(0);
/* If there is another action in this series, (now that
* we're sure we didn't already die) perform it

1
src/borders.c
View File

@ -403,7 +403,6 @@ AddToFamily(Window win)
ConformEwinToDesktop(ewin);
ShowEwin(ewin);
ICCCM_DeIconify(ewin);
mode.destroy = 1;
}
EDBUG_RETURN_;
}

1
src/buttons.c
View File

@ -675,7 +675,6 @@ ButtonsEventMouseUp(XEvent * ev, int wasmovres, int wasdrag)
ButtonDraw(buttons[i]);
if ((buttons[i]->aclass) && (!wasdrag) && (!wasmovres))
EventAclass(ev, buttons[i]->aclass);
mode.destroy = 0;
last_bpress = 0;
used = 1;
break;

4
src/evhandlers.c
View File

@ -1694,7 +1694,6 @@ HandleMouseUp(XEvent * ev)
XSendEvent(disp, bpress_win, False, SubstructureNotifyMask, ev);
}
mode.context_win = click_was_in;
mode.destroy = 0;
pslideout = mode.slideout;
if (mode.slideout)
{
@ -1863,7 +1862,6 @@ HandleMouseUp(XEvent * ev)
if (EventAclass(ev, ac))
{
mode.borderpartpress = 0;
mode.destroy = 0;
if ((mode.slideout) && (pslideout))
HideSlideout(mode.slideout, mode.context_win);
click_was_in = 0;
@ -1876,8 +1874,6 @@ HandleMouseUp(XEvent * ev)
if (!wasmovres)
PagersEventMouseUp(ev);
mode.destroy = 0;
exit:
if ((mode.slideout) && (pslideout))
HideSlideout(mode.slideout, mode.context_win);

1
src/iconify.c
View File

@ -321,7 +321,6 @@ DeIconifyEwin(EWin * ewin)
ShowEwin(ewin);
ICCCM_DeIconify(ewin);
FocusToEWin(ewin);
mode.destroy = 1;
if (ewin->has_transients)
{
EWin **lst, *e;

2
src/setup.c
View File

@ -391,8 +391,6 @@ SetupX()
mode.next_move_x_plus = 0;
mode.next_move_y_plus = 0;
mode.mode = MODE_NONE;
mode.destroy = 0;
mode.adestroy = 0;
mode.deskmode = MODE_NONE;
mode.place = 0;
mode.flipp = 0;