Thu Sep 16 16:21:22 PDT 1999 Michael Jennings <mej@eterm.org>

Fixed a possible null-byte overflow in the menu code.

	Also, there seems to be a memory leak in XLoadQueryFont() in some
	versions of XFree86 3.9.x, so I removed the unnecessary "font" lines
	from the themes for the time being.


SVN revision: 296
This commit is contained in:
Michael Jennings 1999-09-16 22:40:44 +00:00
parent 17fc1ddb01
commit 7ee0bc1332
14 changed files with 29 additions and 146 deletions

View File

@ -2393,3 +2393,12 @@ Tue Sep 14 16:41:08 PDT 1999 Michael Jennings <mej@eterm.org>
buffer overflows. buffer overflows.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Thu Sep 16 16:21:22 PDT 1999 Michael Jennings <mej@eterm.org>
Fixed a possible null-byte overflow in the menu code.
Also, there seems to be a memory leak in XLoadQueryFont() in some
versions of XFree86 3.9.x, so I removed the unnecessary "font" lines
from the themes for the time being.
-------------------------------------------------------------------------------

View File

@ -370,14 +370,3 @@ HandleSigSegv(int sig)
#endif #endif
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
inline void *
fixed_realloc(void *ptr, size_t size)
{
if (ptr)
return (realloc(ptr, size));
else
return (malloc(size));
}

View File

@ -39,7 +39,7 @@ typedef struct memrec_struct {
# include <dmalloc.h> # include <dmalloc.h>
# define MALLOC(sz) malloc(sz) # define MALLOC(sz) malloc(sz)
# define CALLOC(type,n) calloc((n),(sizeof(type))) # define CALLOC(type,n) calloc((n),(sizeof(type)))
# define REALLOC(mem,sz) fixed_realloc((mem),(sz)) # define REALLOC(mem,sz) realloc((mem), (sz))
# define FREE(ptr) free(ptr) # define FREE(ptr) free(ptr)
#elif (DEBUG >= DEBUG_MALLOC) #elif (DEBUG >= DEBUG_MALLOC)
# define MALLOC(sz) Malloc(sz) # define MALLOC(sz) Malloc(sz)
@ -54,7 +54,7 @@ typedef struct memrec_struct {
#else #else
# define MALLOC(sz) malloc(sz) # define MALLOC(sz) malloc(sz)
# define CALLOC(type,n) calloc((n),(sizeof(type))) # define CALLOC(type,n) calloc((n),(sizeof(type)))
# define REALLOC(mem,sz) fixed_realloc((mem),(sz)) # define REALLOC(mem,sz) ((sz) ? ((mem) ? (realloc((mem), (sz))) : (malloc(sz))) : ((mem) ? (free(mem)) : (NULL)))
# define FREE(ptr) free(ptr) # define FREE(ptr) free(ptr)
#endif #endif

View File

@ -407,7 +407,7 @@ StrDup(register const char *str)
len = strlen(str) + 1; /* Copy NUL byte also */ len = strlen(str) + 1; /* Copy NUL byte also */
newstr = (char *) MALLOC(len); newstr = (char *) MALLOC(len);
memcpy(newstr, str, len); strcpy(newstr, str);
return (newstr); return (newstr);
} }

View File

@ -476,6 +476,7 @@ menu_add_item(menu_t * menu, menuitem_t * item)
menu->numitems = 1; menu->numitems = 1;
menu->items = (menuitem_t **) MALLOC(sizeof(menuitem_t *)); menu->items = (menuitem_t **) MALLOC(sizeof(menuitem_t *));
} }
menu->items[menu->numitems - 1] = item; menu->items[menu->numitems - 1] = item;
return 1; return 1;
@ -614,6 +615,7 @@ menuitem_create(char *text)
menuitem = (menuitem_t *) MALLOC(sizeof(menu_t)); menuitem = (menuitem_t *) MALLOC(sizeof(menu_t));
MEMSET(menuitem, 0, sizeof(menu_t)); MEMSET(menuitem, 0, sizeof(menu_t));
if (text) { if (text) {
menuitem->text = StrDup(text); menuitem->text = StrDup(text);
menuitem->len = strlen(text); menuitem->len = strlen(text);
@ -636,6 +638,8 @@ unsigned char
menuitem_set_action(menuitem_t * item, unsigned char type, char *action) menuitem_set_action(menuitem_t * item, unsigned char type, char *action)
{ {
unsigned long len;
ASSERT_RVAL(item != NULL, 0); ASSERT_RVAL(item != NULL, 0);
item->type = type; item->type = type;
@ -645,7 +649,8 @@ menuitem_set_action(menuitem_t * item, unsigned char type, char *action)
break; break;
case MENUITEM_STRING: case MENUITEM_STRING:
case MENUITEM_ECHO: case MENUITEM_ECHO:
item->action.string = StrDup(action); item->action.string = (char *) MALLOC(strlen(action) + 2);
strcpy(item->action.string, action);
parse_escaped_string(item->action.string); parse_escaped_string(item->action.string);
break; break;
default: default:

View File

@ -174,6 +174,7 @@ parse_escaped_string(char *str)
register char *pold, *pnew; register char *pold, *pnew;
unsigned char i; unsigned char i;
size_t len = strlen(str);
D_STRINGS(("parse_escaped_string(\"%s\")\n", str)); D_STRINGS(("parse_escaped_string(\"%s\")\n", str));

View File

@ -1418,9 +1418,9 @@ shell_expand(char *s)
{ {
register char *tmp; register char *tmp;
register char *new;
register char *pbuff = s, *tmp1; register char *pbuff = s, *tmp1;
register unsigned long j, k, l = 0; register unsigned long j, k, l = 0;
char new[CONFIG_BUFF];
unsigned char eval_escape = 1, eval_var = 1, eval_exec = 1, eval_func = 1, in_single = 0, in_double = 0; unsigned char eval_escape = 1, eval_var = 1, eval_exec = 1, eval_func = 1, in_single = 0, in_double = 0;
unsigned long fsize; unsigned long fsize;
char *Command, *Output, *EnvVar, *OutFile; char *Command, *Output, *EnvVar, *OutFile;
@ -1430,7 +1430,9 @@ shell_expand(char *s)
if (!s) if (!s)
return ((char *) NULL); return ((char *) NULL);
#if 0
new = (char *) MALLOC(CONFIG_BUFF); new = (char *) MALLOC(CONFIG_BUFF);
#endif
for (j = 0; *pbuff && j < CONFIG_BUFF; pbuff++, j++) { for (j = 0; *pbuff && j < CONFIG_BUFF; pbuff++, j++) {
switch (*pbuff) { switch (*pbuff) {
@ -1675,7 +1677,9 @@ shell_expand(char *s)
D_PARSE(("shell_expand(%s) returning \"%s\"\n", s, new)); D_PARSE(("shell_expand(%s) returning \"%s\"\n", s, new));
strcpy(s, new); strcpy(s, new);
#if 0
FREE(new); FREE(new);
#endif
return (s); return (s);
} }
@ -2165,7 +2169,7 @@ parse_keyboard(char *buff)
#ifdef KEYSYM_ATTRIBUTE #ifdef KEYSYM_ATTRIBUTE
int sym, len; int sym, len;
char *str = buff + 7; char *str = buff + 7, *s;
sym = (int) strtol(str, (char **) NULL, 0); sym = (int) strtol(str, (char **) NULL, 0);
if (sym != (int) 2147483647L) { if (sym != (int) 2147483647L) {
@ -2177,7 +2181,10 @@ parse_keyboard(char *buff)
file_peek_path(), file_peek_line(), sym + 0xff00); file_peek_path(), file_peek_line(), sym + 0xff00);
return; return;
} }
str = Word(3, buff); s = Word(3, buff);
str = (char *) MALLOC(strlen(s) + 2);
strcpy(str, s);
FREE(s);
chomp(str); chomp(str);
len = parse_escaped_string(str); len = parse_escaped_string(str);
if (len > 255) if (len > 255)

View File

@ -34,7 +34,6 @@ begin menu
end end
begin menu begin menu
title Toggles title Toggles
font fixed
begin menuitem begin menuitem
text "Cursor Visible" text "Cursor Visible"
action string "\e[?25t" action string "\e[?25t"
@ -86,7 +85,6 @@ begin menu
end end
begin menu begin menu
title Keys title Keys
font fixed
begin menuitem begin menuitem
text "Application Arrow Keys" text "Application Arrow Keys"
action string "\e[?1t" action string "\e[?1t"
@ -106,7 +104,6 @@ begin menu
end end
begin menu begin menu
title Scrollbar title Scrollbar
font fixed
begin menuitem begin menuitem
text "Toggle Visibility" text "Toggle Visibility"
rtext "Ctrl-Button2" rtext "Ctrl-Button2"
@ -140,7 +137,6 @@ begin menu
end end
begin menu begin menu
title Width title Width
font fixed
begin menuitem begin menuitem
text "5" text "5"
action string "\e]6;10;;5;\a" action string "\e]6;10;;5;\a"
@ -208,7 +204,6 @@ begin menu
end end
begin menu begin menu
title "Move to Desktop" title "Move to Desktop"
font fixed
begin menuitem begin menuitem
text "0" text "0"
action string "\e]6;50;0;\a" action string "\e]6;50;0;\a"
@ -244,7 +239,6 @@ begin menu
end end
begin menu begin menu
title Terminal title Terminal
font fixed
begin menuitem begin menuitem
text "Toggles" text "Toggles"
action submenu "Toggles" action submenu "Toggles"
@ -275,7 +269,6 @@ end
begin menu begin menu
title Transparency title Transparency
font fixed
begin menuitem begin menuitem
text "Force Update" text "Force Update"
action string "\e]6;3\a" action string "\e]6;3\a"
@ -291,7 +284,6 @@ begin menu
end end
begin menu begin menu
title Tiled title Tiled
font fixed
begin menuitem begin menuitem
text "70's Marble" text "70's Marble"
action string "\e]20;70s_marble.png;0x0+0+0:tile\a" action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@ -423,7 +415,6 @@ begin menu
end end
begin menu begin menu
title Scaled title Scaled
font fixed
begin menuitem begin menuitem
text "Alien Spheres" text "Alien Spheres"
action string "\e]20;alien_spheres.jpg;100x100+50+50\a" action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@ -551,7 +542,6 @@ begin menu
end end
begin menu begin menu
title Attrib title Attrib
font fixed
begin menuitem begin menuitem
text "Full Size" text "Full Size"
action string "\e]20;;100x100" action string "\e]20;;100x100"
@ -589,7 +579,6 @@ begin menu
end end
begin menu begin menu
title Pixmap title Pixmap
font fixed
begin menuitem begin menuitem
text "None" text "None"
action string "\e[m\e]20;;\a" action string "\e[m\e]20;;\a"
@ -614,7 +603,6 @@ begin menu
end end
begin menu begin menu
title Brightness title Brightness
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;brightness;512\a" action string "\e]6;1;image;brightness;512\a"
@ -686,7 +674,6 @@ begin menu
end end
begin menu begin menu
title Contrast title Contrast
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;contrast;512\a" action string "\e]6;1;image;contrast;512\a"
@ -758,7 +745,6 @@ begin menu
end end
begin menu begin menu
title Gamma title Gamma
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;gamma;512\a" action string "\e]6;1;image;gamma;512\a"
@ -830,7 +816,6 @@ begin menu
end end
begin menu begin menu
title Background title Background
font fixed
begin menuitem begin menuitem
text "Transparency" text "Transparency"
action submenu "Transparency" action submenu "Transparency"
@ -856,7 +841,6 @@ end
# This is the menu that gets called by Ctrl-Button3 # This is the menu that gets called by Ctrl-Button3
begin menu begin menu
title Eterm title Eterm
font fixed
begin menuitem begin menuitem
text "Font" text "Font"
action submenu Font action submenu Font

View File

@ -34,7 +34,6 @@ begin menu
end end
begin menu begin menu
title Toggles title Toggles
font fixed
begin menuitem begin menuitem
text "Cursor Visible" text "Cursor Visible"
action string "\e[?25t" action string "\e[?25t"
@ -86,7 +85,6 @@ begin menu
end end
begin menu begin menu
title Keys title Keys
font fixed
begin menuitem begin menuitem
text "Application Arrow Keys" text "Application Arrow Keys"
action string "\e[?1t" action string "\e[?1t"
@ -106,7 +104,6 @@ begin menu
end end
begin menu begin menu
title Scrollbar title Scrollbar
font fixed
begin menuitem begin menuitem
text "Toggle Visibility" text "Toggle Visibility"
rtext "Ctrl-Button2" rtext "Ctrl-Button2"
@ -140,7 +137,6 @@ begin menu
end end
begin menu begin menu
title Width title Width
font fixed
begin menuitem begin menuitem
text "5" text "5"
action string "\e]6;10;;5;\a" action string "\e]6;10;;5;\a"
@ -208,7 +204,6 @@ begin menu
end end
begin menu begin menu
title "Move to Desktop" title "Move to Desktop"
font fixed
begin menuitem begin menuitem
text "0" text "0"
action string "\e]6;50;0;\a" action string "\e]6;50;0;\a"
@ -244,7 +239,6 @@ begin menu
end end
begin menu begin menu
title Terminal title Terminal
font fixed
begin menuitem begin menuitem
text "Toggles" text "Toggles"
action submenu "Toggles" action submenu "Toggles"
@ -275,7 +269,6 @@ end
begin menu begin menu
title Transparency title Transparency
font fixed
begin menuitem begin menuitem
text "Force Update" text "Force Update"
action string "\e]6;3\a" action string "\e]6;3\a"
@ -291,7 +284,6 @@ begin menu
end end
begin menu begin menu
title Tiled title Tiled
font fixed
begin menuitem begin menuitem
text "70's Marble" text "70's Marble"
action string "\e]20;70s_marble.png;0x0+0+0:tile\a" action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@ -423,7 +415,6 @@ begin menu
end end
begin menu begin menu
title Scaled title Scaled
font fixed
begin menuitem begin menuitem
text "Alien Spheres" text "Alien Spheres"
action string "\e]20;alien_spheres.jpg;100x100+50+50\a" action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@ -551,7 +542,6 @@ begin menu
end end
begin menu begin menu
title Attrib title Attrib
font fixed
begin menuitem begin menuitem
text "Full Size" text "Full Size"
action string "\e]20;;100x100" action string "\e]20;;100x100"
@ -589,7 +579,6 @@ begin menu
end end
begin menu begin menu
title Pixmap title Pixmap
font fixed
begin menuitem begin menuitem
text "None" text "None"
action string "\e[m\e]20;;\a" action string "\e[m\e]20;;\a"
@ -614,7 +603,6 @@ begin menu
end end
begin menu begin menu
title Brightness title Brightness
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;brightness;512\a" action string "\e]6;1;image;brightness;512\a"
@ -686,7 +674,6 @@ begin menu
end end
begin menu begin menu
title Contrast title Contrast
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;contrast;512\a" action string "\e]6;1;image;contrast;512\a"
@ -758,7 +745,6 @@ begin menu
end end
begin menu begin menu
title Gamma title Gamma
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;gamma;512\a" action string "\e]6;1;image;gamma;512\a"
@ -830,7 +816,6 @@ begin menu
end end
begin menu begin menu
title Background title Background
font fixed
begin menuitem begin menuitem
text "Transparency" text "Transparency"
action submenu "Transparency" action submenu "Transparency"
@ -856,7 +841,6 @@ end
# This is the menu that gets called by Ctrl-Button3 # This is the menu that gets called by Ctrl-Button3
begin menu begin menu
title Eterm title Eterm
font fixed
begin menuitem begin menuitem
text "Font" text "Font"
action submenu Font action submenu Font

View File

@ -30,7 +30,6 @@ begin menu
end end
begin menu begin menu
title Toggles title Toggles
font fixed
begin menuitem begin menuitem
text "Cursor Visible" text "Cursor Visible"
action string "\e[?25t" action string "\e[?25t"
@ -82,7 +81,6 @@ begin menu
end end
begin menu begin menu
title Keys title Keys
font fixed
begin menuitem begin menuitem
text "Application Arrow Keys" text "Application Arrow Keys"
action string "\e[?1t" action string "\e[?1t"
@ -102,7 +100,6 @@ begin menu
end end
begin menu begin menu
title Scrollbar title Scrollbar
font fixed
begin menuitem begin menuitem
text "Toggle Visibility" text "Toggle Visibility"
rtext "Ctrl-Button2" rtext "Ctrl-Button2"
@ -136,7 +133,6 @@ begin menu
end end
begin menu begin menu
title Width title Width
font fixed
begin menuitem begin menuitem
text "5" text "5"
action string "\e]6;10;;5;\a" action string "\e]6;10;;5;\a"
@ -204,7 +200,6 @@ begin menu
end end
begin menu begin menu
title "Move to Desktop" title "Move to Desktop"
font fixed
begin menuitem begin menuitem
text "0" text "0"
action string "\e]6;50;0;\a" action string "\e]6;50;0;\a"
@ -240,7 +235,6 @@ begin menu
end end
begin menu begin menu
title Terminal title Terminal
font fixed
begin menuitem begin menuitem
text "Toggles" text "Toggles"
action submenu "Toggles" action submenu "Toggles"
@ -271,7 +265,6 @@ end
begin menu begin menu
title Transparency title Transparency
font fixed
begin menuitem begin menuitem
text "Force Update" text "Force Update"
action string "\e]6;3\a" action string "\e]6;3\a"
@ -287,7 +280,6 @@ begin menu
end end
begin menu begin menu
title Tiled title Tiled
font fixed
begin menuitem begin menuitem
text "70's Marble" text "70's Marble"
action string "\e]20;70s_marble.png;0x0+0+0:tile\a" action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@ -419,7 +411,6 @@ begin menu
end end
begin menu begin menu
title Scaled title Scaled
font fixed
begin menuitem begin menuitem
text "Alien Spheres" text "Alien Spheres"
action string "\e]20;alien_spheres.jpg;100x100+50+50\a" action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@ -547,7 +538,6 @@ begin menu
end end
begin menu begin menu
title Attrib title Attrib
font fixed
begin menuitem begin menuitem
text "Full Size" text "Full Size"
action string "\e]20;;100x100" action string "\e]20;;100x100"
@ -585,7 +575,6 @@ begin menu
end end
begin menu begin menu
title Pixmap title Pixmap
font fixed
begin menuitem begin menuitem
text "None" text "None"
action string "\e[m\e]20;;\a" action string "\e[m\e]20;;\a"
@ -610,7 +599,6 @@ begin menu
end end
begin menu begin menu
title Brightness title Brightness
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;brightness;512\a" action string "\e]6;1;image;brightness;512\a"
@ -682,7 +670,6 @@ begin menu
end end
begin menu begin menu
title Contrast title Contrast
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;contrast;512\a" action string "\e]6;1;image;contrast;512\a"
@ -754,7 +741,6 @@ begin menu
end end
begin menu begin menu
title Gamma title Gamma
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;gamma;512\a" action string "\e]6;1;image;gamma;512\a"
@ -826,7 +812,6 @@ begin menu
end end
begin menu begin menu
title Background title Background
font fixed
begin menuitem begin menuitem
text "Transparency" text "Transparency"
action submenu "Transparency" action submenu "Transparency"
@ -857,7 +842,6 @@ define(HOST_ITEM, `begin menuitem
# ALIEN_MENU(protocol) # ALIEN_MENU(protocol)
define(ALIEN_MENU, `begin menu define(ALIEN_MENU, `begin menu
title "Alien Cluster $1" title "Alien Cluster $1"
font fixed
HOST_ITEM(`$1', `apone') HOST_ITEM(`$1', `apone')
HOST_ITEM(`$1', `ash') HOST_ITEM(`$1', `ash')
HOST_ITEM(`$1', `bishop') HOST_ITEM(`$1', `bishop')
@ -871,7 +855,6 @@ define(ALIEN_MENU, `begin menu
end') end')
define(IT_MENU, `begin menu define(IT_MENU, `begin menu
title "IT Hosts $1" title "IT Hosts $1"
font fixed
HOST_ITEM(`$1', `allen') HOST_ITEM(`$1', `allen')
HOST_ITEM(`$1', `babylon4') HOST_ITEM(`$1', `babylon4')
HOST_ITEM(`$1', `icarus') HOST_ITEM(`$1', `icarus')
@ -883,7 +866,6 @@ define(IT_MENU, `begin menu
end') end')
define(COM_MENU, `begin menu define(COM_MENU, `begin menu
title "3Com $1" title "3Com $1"
font fixed
HOST_ITEM(`$1', `bkup-u2') HOST_ITEM(`$1', `bkup-u2')
HOST_ITEM(`$1', `bkup-us') HOST_ITEM(`$1', `bkup-us')
HOST_ITEM(`$1', `corsys1') HOST_ITEM(`$1', `corsys1')
@ -929,13 +911,11 @@ define(COM_MENU, `begin menu
end') end')
define(EXT_MENU, `begin menu define(EXT_MENU, `begin menu
title "External $1" title "External $1"
font fixed
HOST_ITEM(`$1', `foobar.com') HOST_ITEM(`$1', `foobar.com')
end') end')
define(PROTOCOL_MENU, `begin menu define(PROTOCOL_MENU, `begin menu
title "$1" title "$1"
font fixed
begin menuitem begin menuitem
text "Alien Cluster" text "Alien Cluster"
action submenu "Alien Cluster $1" action submenu "Alien Cluster $1"
@ -966,7 +946,6 @@ DO_PROTOCOL(ftp)
begin menu begin menu
title Chooser title Chooser
font fixed
ECHO_ITEM(`New Eterm Window', `Eterm &\r') ECHO_ITEM(`New Eterm Window', `Eterm &\r')
- -
SUBMENU_ITEM(`ssh') SUBMENU_ITEM(`ssh')
@ -978,7 +957,6 @@ end
# This is the menu that gets called by Ctrl-Button3 # This is the menu that gets called by Ctrl-Button3
begin menu begin menu
title Eterm title Eterm
font fixed
SUBMENU_ITEM(Chooser) SUBMENU_ITEM(Chooser)
- -
SUBMENU_ITEM(Font) SUBMENU_ITEM(Font)

View File

@ -34,7 +34,6 @@ begin menu
end end
begin menu begin menu
title Toggles title Toggles
font fixed
begin menuitem begin menuitem
text "Cursor Visible" text "Cursor Visible"
action string "\e[?25t" action string "\e[?25t"
@ -86,7 +85,6 @@ begin menu
end end
begin menu begin menu
title Keys title Keys
font fixed
begin menuitem begin menuitem
text "Application Arrow Keys" text "Application Arrow Keys"
action string "\e[?1t" action string "\e[?1t"
@ -106,7 +104,6 @@ begin menu
end end
begin menu begin menu
title Scrollbar title Scrollbar
font fixed
begin menuitem begin menuitem
text "Toggle Visibility" text "Toggle Visibility"
rtext "Ctrl-Button2" rtext "Ctrl-Button2"
@ -140,7 +137,6 @@ begin menu
end end
begin menu begin menu
title Width title Width
font fixed
begin menuitem begin menuitem
text "5" text "5"
action string "\e]6;10;;5;\a" action string "\e]6;10;;5;\a"
@ -208,7 +204,6 @@ begin menu
end end
begin menu begin menu
title "Move to Desktop" title "Move to Desktop"
font fixed
begin menuitem begin menuitem
text "0" text "0"
action string "\e]6;50;0;\a" action string "\e]6;50;0;\a"
@ -244,7 +239,6 @@ begin menu
end end
begin menu begin menu
title Terminal title Terminal
font fixed
begin menuitem begin menuitem
text "Toggles" text "Toggles"
action submenu "Toggles" action submenu "Toggles"
@ -275,7 +269,6 @@ end
begin menu begin menu
title Transparency title Transparency
font fixed
begin menuitem begin menuitem
text "Force Update" text "Force Update"
action string "\e]6;3\a" action string "\e]6;3\a"
@ -291,7 +284,6 @@ begin menu
end end
begin menu begin menu
title Tiled title Tiled
font fixed
begin menuitem begin menuitem
text "70's Marble" text "70's Marble"
action string "\e]20;70s_marble.png;0x0+0+0:tile\a" action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@ -423,7 +415,6 @@ begin menu
end end
begin menu begin menu
title Scaled title Scaled
font fixed
begin menuitem begin menuitem
text "Alien Spheres" text "Alien Spheres"
action string "\e]20;alien_spheres.jpg;100x100+50+50\a" action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@ -551,7 +542,6 @@ begin menu
end end
begin menu begin menu
title Attrib title Attrib
font fixed
begin menuitem begin menuitem
text "Full Size" text "Full Size"
action string "\e]20;;100x100" action string "\e]20;;100x100"
@ -589,7 +579,6 @@ begin menu
end end
begin menu begin menu
title Pixmap title Pixmap
font fixed
begin menuitem begin menuitem
text "None" text "None"
action string "\e[m\e]20;;\a" action string "\e[m\e]20;;\a"
@ -614,7 +603,6 @@ begin menu
end end
begin menu begin menu
title Brightness title Brightness
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;brightness;512\a" action string "\e]6;1;image;brightness;512\a"
@ -686,7 +674,6 @@ begin menu
end end
begin menu begin menu
title Contrast title Contrast
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;contrast;512\a" action string "\e]6;1;image;contrast;512\a"
@ -758,7 +745,6 @@ begin menu
end end
begin menu begin menu
title Gamma title Gamma
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;gamma;512\a" action string "\e]6;1;image;gamma;512\a"
@ -830,7 +816,6 @@ begin menu
end end
begin menu begin menu
title Background title Background
font fixed
begin menuitem begin menuitem
text "Transparency" text "Transparency"
action submenu "Transparency" action submenu "Transparency"
@ -855,7 +840,6 @@ end
begin menu begin menu
title Buffers title Buffers
font fixed
begin menuitem begin menuitem
text "List all" text "List all"
action echo "C-xC-b" action echo "C-xC-b"
@ -872,7 +856,6 @@ end
begin menu begin menu
title Files title Files
font fixed
begin menuitem begin menuitem
text "Open File..." text "Open File..."
action echo "C-xC-f" action echo "C-xC-f"
@ -930,7 +913,6 @@ begin menu
end end
begin menu begin menu
title Edit title Edit
font fixed
begin menuitem begin menuitem
text "Undo" text "Undo"
action echo "C-_" action echo "C-_"
@ -968,7 +950,6 @@ begin menu
end end
begin menu begin menu
title Search title Search
font fixed
begin menuitem begin menuitem
text "Search..." text "Search..."
action echo "C-s" action echo "C-s"
@ -1027,7 +1008,6 @@ begin menu
end end
begin menu begin menu
title Help title Help
font fixed
begin menuitem begin menuitem
text "Customize" text "Customize"
action echo "M-xcustomize" action echo "M-xcustomize"
@ -1096,7 +1076,6 @@ end
# This is the menu that gets called by Ctrl-Button3 # This is the menu that gets called by Ctrl-Button3
begin menu begin menu
title Eterm title Eterm
font fixed
begin menuitem begin menuitem
text "Buffers" text "Buffers"
action submenu Buffers action submenu Buffers

View File

@ -34,7 +34,6 @@ begin menu
end end
begin menu begin menu
title Toggles title Toggles
font fixed
begin menuitem begin menuitem
text "Cursor Visible" text "Cursor Visible"
action string "\e[?25t" action string "\e[?25t"
@ -86,7 +85,6 @@ begin menu
end end
begin menu begin menu
title Keys title Keys
font fixed
begin menuitem begin menuitem
text "Application Arrow Keys" text "Application Arrow Keys"
action string "\e[?1t" action string "\e[?1t"
@ -106,7 +104,6 @@ begin menu
end end
begin menu begin menu
title Scrollbar title Scrollbar
font fixed
begin menuitem begin menuitem
text "Toggle Visibility" text "Toggle Visibility"
rtext "Ctrl-Button2" rtext "Ctrl-Button2"
@ -140,7 +137,6 @@ begin menu
end end
begin menu begin menu
title Width title Width
font fixed
begin menuitem begin menuitem
text "5" text "5"
action string "\e]6;10;;5;\a" action string "\e]6;10;;5;\a"
@ -208,7 +204,6 @@ begin menu
end end
begin menu begin menu
title "Move to Desktop" title "Move to Desktop"
font fixed
begin menuitem begin menuitem
text "0" text "0"
action string "\e]6;50;0;\a" action string "\e]6;50;0;\a"
@ -244,7 +239,6 @@ begin menu
end end
begin menu begin menu
title Terminal title Terminal
font fixed
begin menuitem begin menuitem
text "Toggles" text "Toggles"
action submenu "Toggles" action submenu "Toggles"
@ -275,7 +269,6 @@ end
begin menu begin menu
title Transparency title Transparency
font fixed
begin menuitem begin menuitem
text "Force Update" text "Force Update"
action string "\e]6;3\a" action string "\e]6;3\a"
@ -291,7 +284,6 @@ begin menu
end end
begin menu begin menu
title Tiled title Tiled
font fixed
begin menuitem begin menuitem
text "70's Marble" text "70's Marble"
action string "\e]20;70s_marble.png;0x0+0+0:tile\a" action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@ -423,7 +415,6 @@ begin menu
end end
begin menu begin menu
title Scaled title Scaled
font fixed
begin menuitem begin menuitem
text "Alien Spheres" text "Alien Spheres"
action string "\e]20;alien_spheres.jpg;100x100+50+50\a" action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@ -551,7 +542,6 @@ begin menu
end end
begin menu begin menu
title Attrib title Attrib
font fixed
begin menuitem begin menuitem
text "Full Size" text "Full Size"
action string "\e]20;;100x100" action string "\e]20;;100x100"
@ -589,7 +579,6 @@ begin menu
end end
begin menu begin menu
title Pixmap title Pixmap
font fixed
begin menuitem begin menuitem
text "None" text "None"
action string "\e[m\e]20;;\a" action string "\e[m\e]20;;\a"
@ -614,7 +603,6 @@ begin menu
end end
begin menu begin menu
title Brightness title Brightness
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;brightness;512\a" action string "\e]6;1;image;brightness;512\a"
@ -686,7 +674,6 @@ begin menu
end end
begin menu begin menu
title Contrast title Contrast
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;contrast;512\a" action string "\e]6;1;image;contrast;512\a"
@ -758,7 +745,6 @@ begin menu
end end
begin menu begin menu
title Gamma title Gamma
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;gamma;512\a" action string "\e]6;1;image;gamma;512\a"
@ -830,7 +816,6 @@ begin menu
end end
begin menu begin menu
title Background title Background
font fixed
begin menuitem begin menuitem
text "Transparency" text "Transparency"
action submenu "Transparency" action submenu "Transparency"
@ -856,7 +841,6 @@ end
# This is the menu that gets called by Ctrl-Button3 # This is the menu that gets called by Ctrl-Button3
begin menu begin menu
title Eterm title Eterm
font fixed
begin menuitem begin menuitem
text "Font" text "Font"
action submenu Font action submenu Font

View File

@ -34,7 +34,6 @@ begin menu
end end
begin menu begin menu
title Toggles title Toggles
font fixed
begin menuitem begin menuitem
text "Cursor Visible" text "Cursor Visible"
action string "\e[?25t" action string "\e[?25t"
@ -86,7 +85,6 @@ begin menu
end end
begin menu begin menu
title Keys title Keys
font fixed
begin menuitem begin menuitem
text "Application Arrow Keys" text "Application Arrow Keys"
action string "\e[?1t" action string "\e[?1t"
@ -106,7 +104,6 @@ begin menu
end end
begin menu begin menu
title Scrollbar title Scrollbar
font fixed
begin menuitem begin menuitem
text "Toggle Visibility" text "Toggle Visibility"
rtext "Ctrl-Button2" rtext "Ctrl-Button2"
@ -140,7 +137,6 @@ begin menu
end end
begin menu begin menu
title Width title Width
font fixed
begin menuitem begin menuitem
text "5" text "5"
action string "\e]6;10;;5;\a" action string "\e]6;10;;5;\a"
@ -208,7 +204,6 @@ begin menu
end end
begin menu begin menu
title "Move to Desktop" title "Move to Desktop"
font fixed
begin menuitem begin menuitem
text "0" text "0"
action string "\e]6;50;0;\a" action string "\e]6;50;0;\a"
@ -244,7 +239,6 @@ begin menu
end end
begin menu begin menu
title Terminal title Terminal
font fixed
begin menuitem begin menuitem
text "Toggles" text "Toggles"
action submenu "Toggles" action submenu "Toggles"
@ -275,7 +269,6 @@ end
begin menu begin menu
title Transparency title Transparency
font fixed
begin menuitem begin menuitem
text "Force Update" text "Force Update"
action string "\e]6;3\a" action string "\e]6;3\a"
@ -291,7 +284,6 @@ begin menu
end end
begin menu begin menu
title Tiled title Tiled
font fixed
begin menuitem begin menuitem
text "70's Marble" text "70's Marble"
action string "\e]20;70s_marble.png;0x0+0+0:tile\a" action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@ -423,7 +415,6 @@ begin menu
end end
begin menu begin menu
title Scaled title Scaled
font fixed
begin menuitem begin menuitem
text "Alien Spheres" text "Alien Spheres"
action string "\e]20;alien_spheres.jpg;100x100+50+50\a" action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@ -551,7 +542,6 @@ begin menu
end end
begin menu begin menu
title Attrib title Attrib
font fixed
begin menuitem begin menuitem
text "Full Size" text "Full Size"
action string "\e]20;;100x100" action string "\e]20;;100x100"
@ -589,7 +579,6 @@ begin menu
end end
begin menu begin menu
title Pixmap title Pixmap
font fixed
begin menuitem begin menuitem
text "None" text "None"
action string "\e[m\e]20;;\a" action string "\e[m\e]20;;\a"
@ -614,7 +603,6 @@ begin menu
end end
begin menu begin menu
title Brightness title Brightness
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;brightness;512\a" action string "\e]6;1;image;brightness;512\a"
@ -686,7 +674,6 @@ begin menu
end end
begin menu begin menu
title Contrast title Contrast
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;contrast;512\a" action string "\e]6;1;image;contrast;512\a"
@ -758,7 +745,6 @@ begin menu
end end
begin menu begin menu
title Gamma title Gamma
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;gamma;512\a" action string "\e]6;1;image;gamma;512\a"
@ -830,7 +816,6 @@ begin menu
end end
begin menu begin menu
title Background title Background
font fixed
begin menuitem begin menuitem
text "Transparency" text "Transparency"
action submenu "Transparency" action submenu "Transparency"
@ -855,7 +840,6 @@ end
begin menu begin menu
title "Messages" title "Messages"
font fixed
begin menuitem begin menuitem
text "New Message" text "New Message"
action echo "m" action echo "m"
@ -914,7 +898,6 @@ begin menu
end end
begin menu begin menu
title "Change to Folder" title "Change to Folder"
font fixed
begin menuitem begin menuitem
text "Inbox" text "Inbox"
action echo "c!\r" action echo "c!\r"
@ -934,7 +917,6 @@ begin menu
end end
begin menu begin menu
title Forward title Forward
font fixed
begin menuitem begin menuitem
text "Forward by Message Date" text "Forward by Message Date"
action echo "od" action echo "od"
@ -966,7 +948,6 @@ begin menu
end end
begin menu begin menu
title Reverse title Reverse
font fixed
begin menuitem begin menuitem
text "Reverse by Date" text "Reverse by Date"
action echo "Od" action echo "Od"
@ -999,7 +980,6 @@ end
begin menu begin menu
title Sort title Sort
font fixed
begin menuitem begin menuitem
text "Forward" text "Forward"
action submenu Forward action submenu Forward
@ -1030,7 +1010,6 @@ end
# This is the menu that gets called by Ctrl-Button3 # This is the menu that gets called by Ctrl-Button3
begin menu begin menu
title Eterm title Eterm
font fixed
begin menuitem begin menuitem
text "Messages" text "Messages"
action submenu Messages action submenu Messages

View File

@ -34,7 +34,6 @@ begin menu
end end
begin menu begin menu
title Toggles title Toggles
font fixed
begin menuitem begin menuitem
text "Cursor Visible" text "Cursor Visible"
action string "\e[?25t" action string "\e[?25t"
@ -86,7 +85,6 @@ begin menu
end end
begin menu begin menu
title Keys title Keys
font fixed
begin menuitem begin menuitem
text "Application Arrow Keys" text "Application Arrow Keys"
action string "\e[?1t" action string "\e[?1t"
@ -106,7 +104,6 @@ begin menu
end end
begin menu begin menu
title Scrollbar title Scrollbar
font fixed
begin menuitem begin menuitem
text "Toggle Visibility" text "Toggle Visibility"
rtext "Ctrl-Button2" rtext "Ctrl-Button2"
@ -140,7 +137,6 @@ begin menu
end end
begin menu begin menu
title Width title Width
font fixed
begin menuitem begin menuitem
text "5" text "5"
action string "\e]6;10;;5;\a" action string "\e]6;10;;5;\a"
@ -208,7 +204,6 @@ begin menu
end end
begin menu begin menu
title "Move to Desktop" title "Move to Desktop"
font fixed
begin menuitem begin menuitem
text "0" text "0"
action string "\e]6;50;0;\a" action string "\e]6;50;0;\a"
@ -244,7 +239,6 @@ begin menu
end end
begin menu begin menu
title Terminal title Terminal
font fixed
begin menuitem begin menuitem
text "Toggles" text "Toggles"
action submenu "Toggles" action submenu "Toggles"
@ -275,7 +269,6 @@ end
begin menu begin menu
title Transparency title Transparency
font fixed
begin menuitem begin menuitem
text "Force Update" text "Force Update"
action string "\e]6;3\a" action string "\e]6;3\a"
@ -291,7 +284,6 @@ begin menu
end end
begin menu begin menu
title Tiled title Tiled
font fixed
begin menuitem begin menuitem
text "70's Marble" text "70's Marble"
action string "\e]20;70s_marble.png;0x0+0+0:tile\a" action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@ -423,7 +415,6 @@ begin menu
end end
begin menu begin menu
title Scaled title Scaled
font fixed
begin menuitem begin menuitem
text "Alien Spheres" text "Alien Spheres"
action string "\e]20;alien_spheres.jpg;100x100+50+50\a" action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@ -551,7 +542,6 @@ begin menu
end end
begin menu begin menu
title Attrib title Attrib
font fixed
begin menuitem begin menuitem
text "Full Size" text "Full Size"
action string "\e]20;;100x100" action string "\e]20;;100x100"
@ -589,7 +579,6 @@ begin menu
end end
begin menu begin menu
title Pixmap title Pixmap
font fixed
begin menuitem begin menuitem
text "None" text "None"
action string "\e[m\e]20;;\a" action string "\e[m\e]20;;\a"
@ -614,7 +603,6 @@ begin menu
end end
begin menu begin menu
title Brightness title Brightness
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;brightness;512\a" action string "\e]6;1;image;brightness;512\a"
@ -686,7 +674,6 @@ begin menu
end end
begin menu begin menu
title Contrast title Contrast
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;contrast;512\a" action string "\e]6;1;image;contrast;512\a"
@ -758,7 +745,6 @@ begin menu
end end
begin menu begin menu
title Gamma title Gamma
font fixed
begin menuitem begin menuitem
text "512 (200%)" text "512 (200%)"
action string "\e]6;1;image;gamma;512\a" action string "\e]6;1;image;gamma;512\a"
@ -830,7 +816,6 @@ begin menu
end end
begin menu begin menu
title Background title Background
font fixed
begin menuitem begin menuitem
text "Transparency" text "Transparency"
action submenu "Transparency" action submenu "Transparency"
@ -856,7 +841,6 @@ end
# This is the menu that gets called by Ctrl-Button3 # This is the menu that gets called by Ctrl-Button3
begin menu begin menu
title Eterm title Eterm
font fixed
begin menuitem begin menuitem
text "Font" text "Font"
action submenu Font action submenu Font