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

14 files changed, 29 insertions, 146 deletions

diff --git a/ChangeLog b/ChangeLog
index a09fe39..bfa3648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2393,3 +2393,12 @@ Tue Sep 14 16:41:08 PDT 1999	Michael Jennings <mej@eterm.org>
 	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.
+	
+-------------------------------------------------------------------------------
diff --git a/libmej/mem.c b/libmej/mem.c
index f44c2fb..68ed3bb 100644
--- a/libmej/mem.c
+++ b/libmej/mem.c
@@ -370,14 +370,3 @@ HandleSigSegv(int sig)
 #endif
   exit(EXIT_FAILURE);
 }
-
-inline void *
-fixed_realloc(void *ptr, size_t size)
-{
-
-  if (ptr)
-    return (realloc(ptr, size));
-  else
-    return (malloc(size));
-
-}
diff --git a/libmej/mem.h b/libmej/mem.h
index fa6c3d3..20ae2a2 100644
--- a/libmej/mem.h
+++ b/libmej/mem.h
@@ -39,7 +39,7 @@ typedef struct memrec_struct {
 #  include <dmalloc.h>
 #  define MALLOC(sz)		malloc(sz)
 #  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)
 #elif (DEBUG >= DEBUG_MALLOC)
 #  define MALLOC(sz)		Malloc(sz)
@@ -54,7 +54,7 @@ typedef struct memrec_struct {
 #else
 #  define MALLOC(sz)		malloc(sz)
 #  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)
 #endif
 
diff --git a/libmej/strings.c b/libmej/strings.c
index f712641..99c007b 100644
--- a/libmej/strings.c
+++ b/libmej/strings.c
@@ -407,7 +407,7 @@ StrDup(register const char *str)
 
   len = strlen(str) + 1;  /* Copy NUL byte also */
   newstr = (char *) MALLOC(len);
-  memcpy(newstr, str, len);
+  strcpy(newstr, str);
   return (newstr);
 }
 
diff --git a/src/menus.c b/src/menus.c
index 7b75aa6..07bc90b 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -476,6 +476,7 @@ menu_add_item(menu_t * menu, menuitem_t * item)
     menu->numitems = 1;
     menu->items = (menuitem_t **) MALLOC(sizeof(menuitem_t *));
   }
+
   menu->items[menu->numitems - 1] = item;
   return 1;
 
@@ -614,6 +615,7 @@ menuitem_create(char *text)
 
   menuitem = (menuitem_t *) MALLOC(sizeof(menu_t));
   MEMSET(menuitem, 0, sizeof(menu_t));
+
   if (text) {
     menuitem->text = StrDup(text);
     menuitem->len = strlen(text);
@@ -636,6 +638,8 @@ unsigned char
 menuitem_set_action(menuitem_t * item, unsigned char type, char *action)
 {
 
+  unsigned long len;
+
   ASSERT_RVAL(item != NULL, 0);
 
   item->type = type;
@@ -645,7 +649,8 @@ menuitem_set_action(menuitem_t * item, unsigned char type, char *action)
       break;
     case MENUITEM_STRING:
     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);
       break;
     default:
diff --git a/src/misc.c b/src/misc.c
index 8b24956..5be4e39 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -174,6 +174,7 @@ parse_escaped_string(char *str)
 
   register char *pold, *pnew;
   unsigned char i;
+  size_t len = strlen(str);
 
   D_STRINGS(("parse_escaped_string(\"%s\")\n", str));
 
diff --git a/src/options.c b/src/options.c
index b1db043..f6ae8fa 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1418,9 +1418,9 @@ shell_expand(char *s)
 {
 
   register char *tmp;
-  register char *new;
   register char *pbuff = s, *tmp1;
   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 long fsize;
   char *Command, *Output, *EnvVar, *OutFile;
@@ -1430,7 +1430,9 @@ shell_expand(char *s)
   if (!s)
     return ((char *) NULL);
 
+#if 0
   new = (char *) MALLOC(CONFIG_BUFF);
+#endif
 
   for (j = 0; *pbuff && j < CONFIG_BUFF; pbuff++, j++) {
     switch (*pbuff) {
@@ -1675,7 +1677,9 @@ shell_expand(char *s)
   D_PARSE(("shell_expand(%s) returning \"%s\"\n", s, new));
 
   strcpy(s, new);
+#if 0
   FREE(new);
+#endif
   return (s);
 }
 
@@ -2165,7 +2169,7 @@ parse_keyboard(char *buff)
 #ifdef KEYSYM_ATTRIBUTE
 
     int sym, len;
-    char *str = buff + 7;
+    char *str = buff + 7, *s;
 
     sym = (int) strtol(str, (char **) NULL, 0);
     if (sym != (int) 2147483647L) {
@@ -2177,7 +2181,10 @@ parse_keyboard(char *buff)
 		    file_peek_path(), file_peek_line(), sym + 0xff00);
 	return;
       }
-      str = Word(3, buff);
+      s = Word(3, buff);
+      str = (char *) MALLOC(strlen(s) + 2);
+      strcpy(str, s);
+      FREE(s);
       chomp(str);
       len = parse_escaped_string(str);
       if (len > 255)
diff --git a/themes/Eterm/Eterm-menu.cfg b/themes/Eterm/Eterm-menu.cfg
index 7fec1e1..ac84547 100644
--- a/themes/Eterm/Eterm-menu.cfg
+++ b/themes/Eterm/Eterm-menu.cfg
@@ -34,7 +34,6 @@ begin menu
 end
 begin menu
   title Toggles
-  font fixed
   begin menuitem
     text "Cursor Visible"
     action string "\e[?25t"
@@ -86,7 +85,6 @@ begin menu
 end
 begin menu
   title Keys
-  font fixed
   begin menuitem
     text "Application Arrow Keys"
     action string "\e[?1t"
@@ -106,7 +104,6 @@ begin menu
 end
 begin menu
   title Scrollbar
-  font fixed
   begin menuitem
     text "Toggle Visibility"
     rtext "Ctrl-Button2"
@@ -140,7 +137,6 @@ begin menu
 end
 begin menu
   title Width
-  font fixed
   begin menuitem
     text "5"
     action string "\e]6;10;;5;\a"
@@ -208,7 +204,6 @@ begin menu
 end
 begin menu
   title "Move to Desktop"
-  font fixed
   begin menuitem
     text "0"
     action string "\e]6;50;0;\a"
@@ -244,7 +239,6 @@ begin menu
 end
 begin menu
   title Terminal
-  font fixed
   begin menuitem
     text "Toggles"
     action submenu "Toggles"
@@ -275,7 +269,6 @@ end
 
 begin menu
   title Transparency
-  font fixed
   begin menuitem
     text "Force Update"
     action string "\e]6;3\a"
@@ -291,7 +284,6 @@ begin menu
 end
 begin menu
   title Tiled
-  font fixed
   begin menuitem
     text "70's Marble"
     action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@@ -423,7 +415,6 @@ begin menu
 end
 begin menu
   title Scaled
-  font fixed
   begin menuitem
     text "Alien Spheres"
     action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@@ -551,7 +542,6 @@ begin menu
 end
 begin menu
   title Attrib
-  font fixed
   begin menuitem
     text "Full Size"
     action string "\e]20;;100x100"
@@ -589,7 +579,6 @@ begin menu
 end
 begin menu
   title Pixmap
-  font fixed
   begin menuitem
     text "None"
     action string "\e[m\e]20;;\a"
@@ -614,7 +603,6 @@ begin menu
 end
 begin menu
   title Brightness
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;brightness;512\a"
@@ -686,7 +674,6 @@ begin menu
 end
 begin menu
   title Contrast
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;contrast;512\a"
@@ -758,7 +745,6 @@ begin menu
 end
 begin menu
   title Gamma
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;gamma;512\a"
@@ -830,7 +816,6 @@ begin menu
 end
 begin menu
   title Background
-  font fixed
   begin menuitem
     text "Transparency"
     action submenu "Transparency"
@@ -856,7 +841,6 @@ end
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
-  font fixed
   begin menuitem
     text "Font"
     action submenu Font
diff --git a/themes/cEterm/cEterm-menu.cfg b/themes/cEterm/cEterm-menu.cfg
index 7fec1e1..ac84547 100644
--- a/themes/cEterm/cEterm-menu.cfg
+++ b/themes/cEterm/cEterm-menu.cfg
@@ -34,7 +34,6 @@ begin menu
 end
 begin menu
   title Toggles
-  font fixed
   begin menuitem
     text "Cursor Visible"
     action string "\e[?25t"
@@ -86,7 +85,6 @@ begin menu
 end
 begin menu
   title Keys
-  font fixed
   begin menuitem
     text "Application Arrow Keys"
     action string "\e[?1t"
@@ -106,7 +104,6 @@ begin menu
 end
 begin menu
   title Scrollbar
-  font fixed
   begin menuitem
     text "Toggle Visibility"
     rtext "Ctrl-Button2"
@@ -140,7 +137,6 @@ begin menu
 end
 begin menu
   title Width
-  font fixed
   begin menuitem
     text "5"
     action string "\e]6;10;;5;\a"
@@ -208,7 +204,6 @@ begin menu
 end
 begin menu
   title "Move to Desktop"
-  font fixed
   begin menuitem
     text "0"
     action string "\e]6;50;0;\a"
@@ -244,7 +239,6 @@ begin menu
 end
 begin menu
   title Terminal
-  font fixed
   begin menuitem
     text "Toggles"
     action submenu "Toggles"
@@ -275,7 +269,6 @@ end
 
 begin menu
   title Transparency
-  font fixed
   begin menuitem
     text "Force Update"
     action string "\e]6;3\a"
@@ -291,7 +284,6 @@ begin menu
 end
 begin menu
   title Tiled
-  font fixed
   begin menuitem
     text "70's Marble"
     action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@@ -423,7 +415,6 @@ begin menu
 end
 begin menu
   title Scaled
-  font fixed
   begin menuitem
     text "Alien Spheres"
     action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@@ -551,7 +542,6 @@ begin menu
 end
 begin menu
   title Attrib
-  font fixed
   begin menuitem
     text "Full Size"
     action string "\e]20;;100x100"
@@ -589,7 +579,6 @@ begin menu
 end
 begin menu
   title Pixmap
-  font fixed
   begin menuitem
     text "None"
     action string "\e[m\e]20;;\a"
@@ -614,7 +603,6 @@ begin menu
 end
 begin menu
   title Brightness
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;brightness;512\a"
@@ -686,7 +674,6 @@ begin menu
 end
 begin menu
   title Contrast
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;contrast;512\a"
@@ -758,7 +745,6 @@ begin menu
 end
 begin menu
   title Gamma
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;gamma;512\a"
@@ -830,7 +816,6 @@ begin menu
 end
 begin menu
   title Background
-  font fixed
   begin menuitem
     text "Transparency"
     action submenu "Transparency"
@@ -856,7 +841,6 @@ end
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
-  font fixed
   begin menuitem
     text "Font"
     action submenu Font
diff --git a/themes/chooser/chooser-menu.cfg b/themes/chooser/chooser-menu.cfg
index b689a84..0468cdc 100644
--- a/themes/chooser/chooser-menu.cfg
+++ b/themes/chooser/chooser-menu.cfg
@@ -30,7 +30,6 @@ begin menu
 end
 begin menu
   title Toggles
-  font fixed
   begin menuitem
     text "Cursor Visible"
     action string "\e[?25t"
@@ -82,7 +81,6 @@ begin menu
 end
 begin menu
   title Keys
-  font fixed
   begin menuitem
     text "Application Arrow Keys"
     action string "\e[?1t"
@@ -102,7 +100,6 @@ begin menu
 end
 begin menu
   title Scrollbar
-  font fixed
   begin menuitem
     text "Toggle Visibility"
     rtext "Ctrl-Button2"
@@ -136,7 +133,6 @@ begin menu
 end
 begin menu
   title Width
-  font fixed
   begin menuitem
     text "5"
     action string "\e]6;10;;5;\a"
@@ -204,7 +200,6 @@ begin menu
 end
 begin menu
   title "Move to Desktop"
-  font fixed
   begin menuitem
     text "0"
     action string "\e]6;50;0;\a"
@@ -240,7 +235,6 @@ begin menu
 end
 begin menu
   title Terminal
-  font fixed
   begin menuitem
     text "Toggles"
     action submenu "Toggles"
@@ -271,7 +265,6 @@ end
 
 begin menu
   title Transparency
-  font fixed
   begin menuitem
     text "Force Update"
     action string "\e]6;3\a"
@@ -287,7 +280,6 @@ begin menu
 end
 begin menu
   title Tiled
-  font fixed
   begin menuitem
     text "70's Marble"
     action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@@ -419,7 +411,6 @@ begin menu
 end
 begin menu
   title Scaled
-  font fixed
   begin menuitem
     text "Alien Spheres"
     action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@@ -547,7 +538,6 @@ begin menu
 end
 begin menu
   title Attrib
-  font fixed
   begin menuitem
     text "Full Size"
     action string "\e]20;;100x100"
@@ -585,7 +575,6 @@ begin menu
 end
 begin menu
   title Pixmap
-  font fixed
   begin menuitem
     text "None"
     action string "\e[m\e]20;;\a"
@@ -610,7 +599,6 @@ begin menu
 end
 begin menu
   title Brightness
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;brightness;512\a"
@@ -682,7 +670,6 @@ begin menu
 end
 begin menu
   title Contrast
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;contrast;512\a"
@@ -754,7 +741,6 @@ begin menu
 end
 begin menu
   title Gamma
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;gamma;512\a"
@@ -826,7 +812,6 @@ begin menu
 end
 begin menu
   title Background
-  font fixed
   begin menuitem
     text "Transparency"
     action submenu "Transparency"
@@ -857,7 +842,6 @@ define(HOST_ITEM, `begin menuitem
 # ALIEN_MENU(protocol)
 define(ALIEN_MENU, `begin menu
   title "Alien Cluster $1"
-  font fixed
   HOST_ITEM(`$1', `apone')
   HOST_ITEM(`$1', `ash')
   HOST_ITEM(`$1', `bishop')
@@ -871,7 +855,6 @@ define(ALIEN_MENU, `begin menu
 end')
 define(IT_MENU, `begin menu
   title "IT Hosts $1"
-  font fixed
   HOST_ITEM(`$1', `allen')
   HOST_ITEM(`$1', `babylon4')
   HOST_ITEM(`$1', `icarus')
@@ -883,7 +866,6 @@ define(IT_MENU, `begin menu
 end')
 define(COM_MENU, `begin menu
   title "3Com $1"
-  font fixed
   HOST_ITEM(`$1', `bkup-u2')
   HOST_ITEM(`$1', `bkup-us')
   HOST_ITEM(`$1', `corsys1')
@@ -929,13 +911,11 @@ define(COM_MENU, `begin menu
 end')
 define(EXT_MENU, `begin menu
   title "External $1"
-  font fixed
   HOST_ITEM(`$1', `foobar.com')
 end')
 
 define(PROTOCOL_MENU, `begin menu
   title "$1"
-  font fixed
   begin menuitem
     text "Alien Cluster"
     action submenu "Alien Cluster $1"
@@ -966,7 +946,6 @@ DO_PROTOCOL(ftp)
 
 begin menu
   title Chooser
-  font fixed
   ECHO_ITEM(`New Eterm Window', `Eterm &\r')
   -
   SUBMENU_ITEM(`ssh')
@@ -978,7 +957,6 @@ end
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
-  font fixed
   SUBMENU_ITEM(Chooser)
   -
   SUBMENU_ITEM(Font)
diff --git a/themes/emacs/emacs-menu.cfg b/themes/emacs/emacs-menu.cfg
index f3dbe75..15851d2 100644
--- a/themes/emacs/emacs-menu.cfg
+++ b/themes/emacs/emacs-menu.cfg
@@ -34,7 +34,6 @@ begin menu
 end
 begin menu
   title Toggles
-  font fixed
   begin menuitem
     text "Cursor Visible"
     action string "\e[?25t"
@@ -86,7 +85,6 @@ begin menu
 end
 begin menu
   title Keys
-  font fixed
   begin menuitem
     text "Application Arrow Keys"
     action string "\e[?1t"
@@ -106,7 +104,6 @@ begin menu
 end
 begin menu
   title Scrollbar
-  font fixed
   begin menuitem
     text "Toggle Visibility"
     rtext "Ctrl-Button2"
@@ -140,7 +137,6 @@ begin menu
 end
 begin menu
   title Width
-  font fixed
   begin menuitem
     text "5"
     action string "\e]6;10;;5;\a"
@@ -208,7 +204,6 @@ begin menu
 end
 begin menu
   title "Move to Desktop"
-  font fixed
   begin menuitem
     text "0"
     action string "\e]6;50;0;\a"
@@ -244,7 +239,6 @@ begin menu
 end
 begin menu
   title Terminal
-  font fixed
   begin menuitem
     text "Toggles"
     action submenu "Toggles"
@@ -275,7 +269,6 @@ end
 
 begin menu
   title Transparency
-  font fixed
   begin menuitem
     text "Force Update"
     action string "\e]6;3\a"
@@ -291,7 +284,6 @@ begin menu
 end
 begin menu
   title Tiled
-  font fixed
   begin menuitem
     text "70's Marble"
     action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@@ -423,7 +415,6 @@ begin menu
 end
 begin menu
   title Scaled
-  font fixed
   begin menuitem
     text "Alien Spheres"
     action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@@ -551,7 +542,6 @@ begin menu
 end
 begin menu
   title Attrib
-  font fixed
   begin menuitem
     text "Full Size"
     action string "\e]20;;100x100"
@@ -589,7 +579,6 @@ begin menu
 end
 begin menu
   title Pixmap
-  font fixed
   begin menuitem
     text "None"
     action string "\e[m\e]20;;\a"
@@ -614,7 +603,6 @@ begin menu
 end
 begin menu
   title Brightness
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;brightness;512\a"
@@ -686,7 +674,6 @@ begin menu
 end
 begin menu
   title Contrast
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;contrast;512\a"
@@ -758,7 +745,6 @@ begin menu
 end
 begin menu
   title Gamma
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;gamma;512\a"
@@ -830,7 +816,6 @@ begin menu
 end
 begin menu
   title Background
-  font fixed
   begin menuitem
     text "Transparency"
     action submenu "Transparency"
@@ -855,7 +840,6 @@ end
 
 begin menu
   title Buffers
-  font fixed
   begin menuitem
     text "List all"
     action echo "C-xC-b"
@@ -872,7 +856,6 @@ end
 
 begin menu
   title Files
-  font fixed
   begin menuitem
     text "Open File..."
     action echo "C-xC-f"
@@ -930,7 +913,6 @@ begin menu
 end
 begin menu
   title Edit
-  font fixed
   begin menuitem
     text "Undo"
     action echo "C-_"
@@ -968,7 +950,6 @@ begin menu
 end
 begin menu
   title Search
-  font fixed
   begin menuitem
     text "Search..."
     action echo "C-s"
@@ -1027,7 +1008,6 @@ begin menu
 end
 begin menu
   title Help
-  font fixed
   begin menuitem
     text "Customize"
     action echo "M-xcustomize"
@@ -1096,7 +1076,6 @@ end
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
-  font fixed
   begin menuitem
     text "Buffers"
     action submenu Buffers
diff --git a/themes/irc/irc-menu.cfg b/themes/irc/irc-menu.cfg
index 7fec1e1..ac84547 100644
--- a/themes/irc/irc-menu.cfg
+++ b/themes/irc/irc-menu.cfg
@@ -34,7 +34,6 @@ begin menu
 end
 begin menu
   title Toggles
-  font fixed
   begin menuitem
     text "Cursor Visible"
     action string "\e[?25t"
@@ -86,7 +85,6 @@ begin menu
 end
 begin menu
   title Keys
-  font fixed
   begin menuitem
     text "Application Arrow Keys"
     action string "\e[?1t"
@@ -106,7 +104,6 @@ begin menu
 end
 begin menu
   title Scrollbar
-  font fixed
   begin menuitem
     text "Toggle Visibility"
     rtext "Ctrl-Button2"
@@ -140,7 +137,6 @@ begin menu
 end
 begin menu
   title Width
-  font fixed
   begin menuitem
     text "5"
     action string "\e]6;10;;5;\a"
@@ -208,7 +204,6 @@ begin menu
 end
 begin menu
   title "Move to Desktop"
-  font fixed
   begin menuitem
     text "0"
     action string "\e]6;50;0;\a"
@@ -244,7 +239,6 @@ begin menu
 end
 begin menu
   title Terminal
-  font fixed
   begin menuitem
     text "Toggles"
     action submenu "Toggles"
@@ -275,7 +269,6 @@ end
 
 begin menu
   title Transparency
-  font fixed
   begin menuitem
     text "Force Update"
     action string "\e]6;3\a"
@@ -291,7 +284,6 @@ begin menu
 end
 begin menu
   title Tiled
-  font fixed
   begin menuitem
     text "70's Marble"
     action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@@ -423,7 +415,6 @@ begin menu
 end
 begin menu
   title Scaled
-  font fixed
   begin menuitem
     text "Alien Spheres"
     action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@@ -551,7 +542,6 @@ begin menu
 end
 begin menu
   title Attrib
-  font fixed
   begin menuitem
     text "Full Size"
     action string "\e]20;;100x100"
@@ -589,7 +579,6 @@ begin menu
 end
 begin menu
   title Pixmap
-  font fixed
   begin menuitem
     text "None"
     action string "\e[m\e]20;;\a"
@@ -614,7 +603,6 @@ begin menu
 end
 begin menu
   title Brightness
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;brightness;512\a"
@@ -686,7 +674,6 @@ begin menu
 end
 begin menu
   title Contrast
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;contrast;512\a"
@@ -758,7 +745,6 @@ begin menu
 end
 begin menu
   title Gamma
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;gamma;512\a"
@@ -830,7 +816,6 @@ begin menu
 end
 begin menu
   title Background
-  font fixed
   begin menuitem
     text "Transparency"
     action submenu "Transparency"
@@ -856,7 +841,6 @@ end
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
-  font fixed
   begin menuitem
     text "Font"
     action submenu Font
diff --git a/themes/mutt/mutt-menu.cfg b/themes/mutt/mutt-menu.cfg
index 33b6405..b2d5cab 100644
--- a/themes/mutt/mutt-menu.cfg
+++ b/themes/mutt/mutt-menu.cfg
@@ -34,7 +34,6 @@ begin menu
 end
 begin menu
   title Toggles
-  font fixed
   begin menuitem
     text "Cursor Visible"
     action string "\e[?25t"
@@ -86,7 +85,6 @@ begin menu
 end
 begin menu
   title Keys
-  font fixed
   begin menuitem
     text "Application Arrow Keys"
     action string "\e[?1t"
@@ -106,7 +104,6 @@ begin menu
 end
 begin menu
   title Scrollbar
-  font fixed
   begin menuitem
     text "Toggle Visibility"
     rtext "Ctrl-Button2"
@@ -140,7 +137,6 @@ begin menu
 end
 begin menu
   title Width
-  font fixed
   begin menuitem
     text "5"
     action string "\e]6;10;;5;\a"
@@ -208,7 +204,6 @@ begin menu
 end
 begin menu
   title "Move to Desktop"
-  font fixed
   begin menuitem
     text "0"
     action string "\e]6;50;0;\a"
@@ -244,7 +239,6 @@ begin menu
 end
 begin menu
   title Terminal
-  font fixed
   begin menuitem
     text "Toggles"
     action submenu "Toggles"
@@ -275,7 +269,6 @@ end
 
 begin menu
   title Transparency
-  font fixed
   begin menuitem
     text "Force Update"
     action string "\e]6;3\a"
@@ -291,7 +284,6 @@ begin menu
 end
 begin menu
   title Tiled
-  font fixed
   begin menuitem
     text "70's Marble"
     action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@@ -423,7 +415,6 @@ begin menu
 end
 begin menu
   title Scaled
-  font fixed
   begin menuitem
     text "Alien Spheres"
     action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@@ -551,7 +542,6 @@ begin menu
 end
 begin menu
   title Attrib
-  font fixed
   begin menuitem
     text "Full Size"
     action string "\e]20;;100x100"
@@ -589,7 +579,6 @@ begin menu
 end
 begin menu
   title Pixmap
-  font fixed
   begin menuitem
     text "None"
     action string "\e[m\e]20;;\a"
@@ -614,7 +603,6 @@ begin menu
 end
 begin menu
   title Brightness
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;brightness;512\a"
@@ -686,7 +674,6 @@ begin menu
 end
 begin menu
   title Contrast
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;contrast;512\a"
@@ -758,7 +745,6 @@ begin menu
 end
 begin menu
   title Gamma
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;gamma;512\a"
@@ -830,7 +816,6 @@ begin menu
 end
 begin menu
   title Background
-  font fixed
   begin menuitem
     text "Transparency"
     action submenu "Transparency"
@@ -855,7 +840,6 @@ end
 
 begin menu
   title "Messages"
-  font fixed
   begin menuitem
     text "New Message"
     action echo "m"
@@ -914,7 +898,6 @@ begin menu
 end
 begin menu
   title "Change to Folder"
-  font fixed
   begin menuitem
     text "Inbox"
     action echo "c!\r"
@@ -934,7 +917,6 @@ begin menu
 end
 begin menu
   title Forward
-  font fixed
   begin menuitem
     text "Forward by Message Date"
     action echo "od"
@@ -966,7 +948,6 @@ begin menu
 end
 begin menu
   title Reverse
-  font fixed
   begin menuitem
     text "Reverse by Date"
     action echo "Od"
@@ -999,7 +980,6 @@ end
 
 begin menu
   title Sort
-  font fixed
   begin menuitem
     text "Forward"
     action submenu Forward
@@ -1030,7 +1010,6 @@ end
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
-  font fixed
   begin menuitem
     text "Messages"
     action submenu Messages
diff --git a/themes/trans/trans-menu.cfg b/themes/trans/trans-menu.cfg
index 7fec1e1..ac84547 100644
--- a/themes/trans/trans-menu.cfg
+++ b/themes/trans/trans-menu.cfg
@@ -34,7 +34,6 @@ begin menu
 end
 begin menu
   title Toggles
-  font fixed
   begin menuitem
     text "Cursor Visible"
     action string "\e[?25t"
@@ -86,7 +85,6 @@ begin menu
 end
 begin menu
   title Keys
-  font fixed
   begin menuitem
     text "Application Arrow Keys"
     action string "\e[?1t"
@@ -106,7 +104,6 @@ begin menu
 end
 begin menu
   title Scrollbar
-  font fixed
   begin menuitem
     text "Toggle Visibility"
     rtext "Ctrl-Button2"
@@ -140,7 +137,6 @@ begin menu
 end
 begin menu
   title Width
-  font fixed
   begin menuitem
     text "5"
     action string "\e]6;10;;5;\a"
@@ -208,7 +204,6 @@ begin menu
 end
 begin menu
   title "Move to Desktop"
-  font fixed
   begin menuitem
     text "0"
     action string "\e]6;50;0;\a"
@@ -244,7 +239,6 @@ begin menu
 end
 begin menu
   title Terminal
-  font fixed
   begin menuitem
     text "Toggles"
     action submenu "Toggles"
@@ -275,7 +269,6 @@ end
 
 begin menu
   title Transparency
-  font fixed
   begin menuitem
     text "Force Update"
     action string "\e]6;3\a"
@@ -291,7 +284,6 @@ begin menu
 end
 begin menu
   title Tiled
-  font fixed
   begin menuitem
     text "70's Marble"
     action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
@@ -423,7 +415,6 @@ begin menu
 end
 begin menu
   title Scaled
-  font fixed
   begin menuitem
     text "Alien Spheres"
     action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
@@ -551,7 +542,6 @@ begin menu
 end
 begin menu
   title Attrib
-  font fixed
   begin menuitem
     text "Full Size"
     action string "\e]20;;100x100"
@@ -589,7 +579,6 @@ begin menu
 end
 begin menu
   title Pixmap
-  font fixed
   begin menuitem
     text "None"
     action string "\e[m\e]20;;\a"
@@ -614,7 +603,6 @@ begin menu
 end
 begin menu
   title Brightness
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;brightness;512\a"
@@ -686,7 +674,6 @@ begin menu
 end
 begin menu
   title Contrast
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;contrast;512\a"
@@ -758,7 +745,6 @@ begin menu
 end
 begin menu
   title Gamma
-  font fixed
   begin menuitem
     text "512 (200%)"
     action string "\e]6;1;image;gamma;512\a"
@@ -830,7 +816,6 @@ begin menu
 end
 begin menu
   title Background
-  font fixed
   begin menuitem
     text "Transparency"
     action submenu "Transparency"
@@ -856,7 +841,6 @@ end
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
-  font fixed
   begin menuitem
     text "Font"
     action submenu Font