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

Remove some obsolete stuff doing nothing (mode.showicons, ShowIcons, HideIcons, 

HandlePager, external_pager_window).


SVN revision: 7135
This commit is contained in:
Kim Woelders 2003-07-11 17:58:19 +00:00
parent f7218a95d2
commit cb9cc07028
8 changed files with 9 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/E.h
View File

@ -1238,7 +1238,6 @@ typedef struct _emode
char numdesktops;
char transientsfollowleader;
char switchfortransientmap;
char showicons;
char snap;
int edge_snap_dist;
int screen_snap_dist;
@ -2559,9 +2558,6 @@ void RemoveMiniIcon(EWin * ewin);
void MakeIcon(EWin * ewin);
void DockIt(EWin * ewin);
void DockDestroy(EWin * ewin);
void HideIcons(void);
void ShowIcons(void);
void HandlePager(void);
Iconbox *CreateIconbox(char *name);
void FreeIconbox(Iconbox * ib);
void ShowIconbox(Iconbox * ib);
@ -3123,7 +3119,6 @@ extern Menu *task_menu[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
extern Menu *desk_menu;
extern Menu *group_menu;
extern char no_overwrite;
extern Window external_pager_window;
extern char clickmenu;
extern Window last_bpress;
extern int child_count;

30
src/comms.c
View File

@ -1182,8 +1182,7 @@ HandleComms(XClientMessageEvent * ev)
}
else if (!strcmp(w, "set_controls"))
{
int i, num, wd;
Button **blst;
int wd;
int a, b;
int ax, ay;
char dragbar_change = 0;
@ -1385,12 +1384,7 @@ HandleComms(XClientMessageEvent * ev)
}
else if (!strcmp(w, "SHOWICONS:"))
{
word(s, wd, w);
mode.showicons = atoi(w);
if (mode.showicons)
ShowIcons();
else
HideIcons();
/* Obsolete */
}
else if (!strcmp(w, "ALL_NEW_WINDOWS_GET_FOCUS:"))
{
@ -1480,6 +1474,7 @@ HandleComms(XClientMessageEvent * ev)
ShowDesktopControls();
}
FixFocus();
GetAreaSize(&ax, &ay);
GetCurrentArea(&a, &b);
if (a >= ax)
@ -1489,21 +1484,6 @@ HandleComms(XClientMessageEvent * ev)
}
if (b >= ay)
SetCurrentArea(a, ay - 1);
blst = (Button **) ListItemType(&num, LIST_TYPE_BUTTON);
if (blst)
{
for (i = 0; i < num; i++)
{
if (!strcmp(blst[i]->name, "ICON"))
{
if (mode.showicons)
ShowButton(blst[i]);
else
HideButton(blst[i]);
}
}
Efree(blst);
}
}
else if (!strcmp(w, "get_controls"))
{
@ -1525,7 +1505,7 @@ HandleComms(XClientMessageEvent * ev)
"DRAGBARORDERING: %i\n" "DRAGBARLENGTH: %i\n"
"DESKSLIDEIN: %i\n" "DESKSLIDESPEED: %i\n" "HIQUALITYBG: %i\n"
"TRANSIENTSFOLLOWLEADER: %i\n" "SWITCHFORTRANSIENTMAP: %i\n"
"SHOWICONS: %i\n" "AREA_SIZE: %i %i\n"
"AREA_SIZE: %i %i\n"
"ALL_NEW_WINDOWS_GET_FOCUS: %i\n"
"NEW_TRANSIENTS_GET_FOCUS: %i\n"
"NEW_TRANSIENTS_GET_FOCUS_IF_GROUP_FOCUSED: %i\n"
@ -1547,7 +1527,7 @@ HandleComms(XClientMessageEvent * ev)
desks.dragbar_ordering, desks.dragbar_length, desks.slidein,
desks.slidespeed, desks.hiqualitybg,
mode.transientsfollowleader, mode.switchfortransientmap,
mode.showicons, a, b, mode.all_new_windows_get_focus,
a, b, mode.all_new_windows_get_focus,
mode.new_transients_get_focus,
mode.new_transients_get_focus_if_group_focused,
mode.manual_placement, mode.manual_placement_mouse_pointer,

3
src/config.c
View File

@ -623,7 +623,7 @@ Config_Control(FILE * ConfigFile)
mode.switchfortransientmap = i2;
break;
case CONTROL_SHOWICONS:
mode.showicons = i2;
/* Obsolete */
break;
case CONTROL_ALL_NEW_WINDOWS_GET_FOCUS:
mode.all_new_windows_get_focus = i2;
@ -3850,7 +3850,6 @@ SaveUserControlConfig(FILE * autosavefile)
fprintf(autosavefile, "333 %i\n", (int)mode.numdesktops);
fprintf(autosavefile, "335 %i\n", (int)mode.transientsfollowleader);
fprintf(autosavefile, "336 %i\n", (int)mode.switchfortransientmap);
fprintf(autosavefile, "337 %i\n", (int)mode.showicons);
GetAreaSize(&a, &b);
fprintf(autosavefile, "407 %i %i\n", a, b);
fprintf(autosavefile, "340 %i\n", (int)mode.all_new_windows_get_focus);

6
src/evhandlers.c
View File

@ -1097,13 +1097,11 @@ HandleDestroy(XEvent * ev)
HintsSetClientList();
EDBUG_RETURN_;
}
c = FindItem(NULL, win, LIST_FINDBY_ID, LIST_TYPE_CLIENT);
if (c)
DeleteClient(c);
if (win == external_pager_window)
{
ShowIcons();
}
EDBUG_RETURN_;
}

1
src/globals.c
View File

@ -54,7 +54,6 @@ Menu *task_menu[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
Menu *desk_menu = NULL;
Menu *group_menu = NULL;
char no_overwrite = 0;
Window external_pager_window = 0;
char clickmenu = 0;
Window last_bpress = 0;
int child_count = 0;

19
src/iconify.c
View File

@ -365,25 +365,6 @@ RemoveMiniIcon(EWin * ewin)
DelEwinFromIconbox(ib, ewin);
}
void
HideIcons(void)
{
/* ummmmmmmmmm don't need this anymore - but it used to hide the icons */
/* when a the gnome pager came up */
}
void
ShowIcons(void)
{
/* ummmmmmmmmm don't need this anymore - but it used to show the icons */
/* when a the gnome pager came up */
}
void
HandlePager(void)
{
}
Iconbox *
CreateIconbox(char *name)
{

41
src/ipc.c
View File

@ -218,7 +218,7 @@ IPCStruct IPCArray[] = {
{
IPC_ShowIcons,
"show_icons",
"Toggle the display of icons on the desktop",
"Obsolete - Toggle the display of icons on the desktop",
"Use \"show_icons on\" and \"show_icons off\" to change this setting\n"
"Use \"show_icons ?\" to retrieve the current setting"},
{
@ -4559,45 +4559,6 @@ IPC_FocusMode(char *params, Client * c)
void
IPC_ShowIcons(char *params, Client * c)
{
char buf[FILEPATH_LEN_MAX];
buf[0] = 0;
if (params)
{
if (!strcmp(params, "on"))
{
mode.showicons = 1;
ShowIcons();
}
else if (!strcmp(params, "off"))
{
mode.showicons = 0;
HideIcons();
}
else if (!strcmp(params, "?"))
{
Esnprintf(buf, sizeof(buf), "Icons: ");
if (mode.showicons)
strcat(buf, "on");
else
strcat(buf, "off");
}
else
{
Esnprintf(buf, sizeof(buf), "Error: unknown icon statee: %s",
params);
}
}
else
{
Esnprintf(buf, sizeof(buf), "Error: no icon state specified");
}
if (buf[0])
CommsSend(c, buf);
return;
}
void

1
src/setup.c
View File

@ -523,7 +523,6 @@ SetupX()
mode.numdesktops = 2;
mode.transientsfollowleader = 1;
mode.switchfortransientmap = 1;
mode.showicons = 1;
mode.snap = 1;
mode.edge_snap_dist = 8;
mode.screen_snap_dist = 32;