*** empty log message ***

diff --git a/Changes b/Changes
index 087d3b3dbd28d1b61315c189598de70867bea6b8..6edb564feb91a27171a465dba40b87a149b2b7af 100644 (file)
--- a/Changes
+++ b/Changes
@@ -12,6 +12,7 @@
           keysyms that also have string translations, when not --enable-xim.
           reported by joel reed.
         - re-enabled esc-seq. for font-switching (\033 ] 50 ; <fontset> \007).
+        - re-enabled menubar (experimental!).
         - fix bug in locale-handling that kept the correct locale from
           being selected.
         - implemented esc-seq. to switch locales (\033 ] 9 ; <locale> \007).

diff --git a/autoconf/configure.in b/autoconf/configure.in
index 3308787c5456431372fe78aba9f9719d18f0ce67..129bb54522c2bd9aac69e0c17c1264a21b70c1e8 100644 (file)
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -107,13 +107,6 @@ AC_ARG_ENABLE(everything,
     codesets=all
   fi])
 
-echo
-if test x$support_menubar = xyes; then
-    support_menubar=no
-    echo "******* menubar support disabled, does not work"
-fi
-echo
-
 AC_ARG_ENABLE(unicode3,
   [  --enable-unicode3       use 21 instead of 16 bits to represent unicode characters],
   [if test x$enableval = xyes; then

diff --git a/src/command.C b/src/command.C
index e09c8c878eac87dd87d19dd52bbffec7f1ebd357..6ce9850241a3ba495b087c1a78b7578c3e339319 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -696,6 +696,7 @@ rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
 
   n = cmdbuf_ptr - cmdbuf_base;
   s = cmdbuf_base + BUFSIZ - 1 - cmdbuf_endp;
+
   if (n > 0 && s < count)
     {
       MEMMOVE (cmdbuf_base, cmdbuf_ptr,
@@ -704,13 +705,18 @@ rxvt_term::cmd_write (const unsigned char *str, unsigned int count)
       cmdbuf_endp -= n;
       s += n;
     }
+
   if (count > s)
     {
       rxvt_print_error ("data loss: cmd_write too large");
       count = s;
     }
+
   for (; count--;)
     *cmdbuf_endp++ = *str++;
+
+  cmd_parse ();
+
   return 0;
 }
 #endif                         /* MENUBAR_MAX */
@@ -792,7 +798,7 @@ rxvt_term::pty_fill ()
     }
   else if (n < 0 && errno != EAGAIN)
     destroy ();
-
+  
   return false;
 }
 
@@ -819,106 +825,116 @@ rxvt_term::pty_cb (io_watcher &w, short revents)
               tt_winch ();
             }
 
-          uint32_t ch = NOCHAR;
+          if (cmd_parse ())
+            break;
+        }
+    }
+}
+
+bool
+rxvt_term::cmd_parse ()
+{
+  bool flag = false;
+  uint32_t ch = NOCHAR;
+
+  for (;;)
+    {
+      if (ch == NOCHAR)
+        ch = next_char ();
+
+      if (ch == NOCHAR) // TODO: improve
+        break;
+
+      if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
+        {
+          /* Read a text string from the input buffer */
+          uint32_t buf[BUFSIZ];
+          bool refreshnow = false;
+          int nlines = 0;
+          uint32_t *str = buf;
+
+          *str++ = ch;
 
           for (;;)
             {
-              if (ch == NOCHAR)
-                ch = next_char ();
+              ch = next_char ();
 
-              if (ch == NOCHAR) // TODO: improve
+              if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
                 break;
-
-              if (ch >= ' ' || ch == '\t' || ch == '\n' || ch == '\r')
+              else
                 {
-                  /* Read a text string from the input buffer */
-                  uint32_t buf[BUFSIZ];
-                  bool refreshnow = false;
-                  int nlines = 0;
-                  uint32_t *str = buf;
-
                   *str++ = ch;
 
-                  for (;;)
+                  if (ch == '\n')
                     {
-                      ch = next_char ();
+                      nlines++;
+                      refresh_count++;
 
-                      if (ch == NOCHAR || (ch < ' ' && ch != '\t' && ch != '\n' && ch != '\r'))
-                        break;
-                      else
+                      if (! (Options & Opt_jumpScroll)
+                          || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
                         {
-                          *str++ = ch;
-
-                          if (ch == '\n')
-                            {
-                              nlines++;
-                              refresh_count++;
-
-                              if (! (Options & Opt_jumpScroll)
-                                  || (refresh_count >= (refresh_limit * (TermWin.nrow - 1))))
-                                {
-                                  refreshnow = true;
-                                  flag = false;
-                                  ch = NOCHAR;
-                                  break;
-                                }
-
-                              // scr_add_lines only works for nlines < TermWin.nrow - 1.
-                              if (nlines >= TermWin.nrow - 1)
-                                {
-                                  scr_add_lines (buf, nlines, str - buf);
-                                  nlines = 0;
-                                  str = buf;
-                                }
-                            }
-
-                          if (str >= buf + BUFSIZ)
-                            {
-                              ch = NOCHAR;
-                              break;
-                            }
+                          refreshnow = true;
+                          flag = false;
+                          ch = NOCHAR;
+                          break;
                         }
-                    }
 
-                  scr_add_lines (buf, nlines, str - buf);
-
-                  /*
-                   * If there have been a lot of new lines, then update the screen
-                   * What the heck I'll cheat and only refresh less than every page-full.
-                   * the number of pages between refreshes is refresh_limit, which
-                   * is incremented here because we must be doing flat-out scrolling.
-                   *
-                   * refreshing should be correct for small scrolls, because of the
-                   * time-out
-                   */
-                  if (refreshnow)
-                    {
-                      if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
-                        refresh_limit++;
-
-                      scr_refresh (refresh_type);
+                      // scr_add_lines only works for nlines < TermWin.nrow - 1.
+                      if (nlines >= TermWin.nrow - 1)
+                        {
+                          scr_add_lines (buf, nlines, str - buf);
+                          nlines = 0;
+                          str = buf;
+                        }
                     }
 
-                }
-              else
-                {
-                  switch (ch)
+                  if (str >= buf + BUFSIZ)
                     {
-                      default:
-                        process_nonprinting (ch);
-                        break;
-                      case C0_ESC:     /* escape char */
-                        process_escape_seq ();
-                        break;
-                        /*case 0x9b: */        /* CSI */
-                        /*  process_csi_seq (); */
+                      ch = NOCHAR;
+                      break;
                     }
-
-                  ch = NOCHAR;
                 }
             }
+
+          scr_add_lines (buf, nlines, str - buf);
+
+          /*
+           * If there have been a lot of new lines, then update the screen
+           * What the heck I'll cheat and only refresh less than every page-full.
+           * the number of pages between refreshes is refresh_limit, which
+           * is incremented here because we must be doing flat-out scrolling.
+           *
+           * refreshing should be correct for small scrolls, because of the
+           * time-out
+           */
+          if (refreshnow)
+            {
+              if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
+                refresh_limit++;
+
+              scr_refresh (refresh_type);
+            }
+
+        }
+      else
+        {
+          switch (ch)
+            {
+              default:
+                process_nonprinting (ch);
+                break;
+              case C0_ESC:     /* escape char */
+                process_escape_seq ();
+                break;
+                /*case 0x9b: */        /* CSI */
+                /*  process_csi_seq (); */
+            }
+
+          ch = NOCHAR;
         }
     }
+
+  return flag;
 }
 
 // read the next character, currently handles UTF-8

diff --git a/src/init.C b/src/init.C
index 6f2f043bed12e39aec4cdd367c0a70615fef8f3a..de1af4f7d4d129167e0a5c0ae773716c0aa4bcba 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -1248,10 +1248,13 @@ rxvt_term::create_windows (int argc, const char *const *argv)
                                         0,
                                         PixColors[Color_fg],
                                         PixColors[Color_scroll]);
+
 #ifdef DEBUG_X
       XStoreName (display->display, menuBar.win, "menubar");
 #endif
 
+      menuBar.drawable = new rxvt_drawable (display, menuBar.win);
+
       XDefineCursor (display->display, menuBar.win,
                      XCreateFontCursor (display->display, XC_left_ptr));
 

diff --git a/src/main.C b/src/main.C
index 7b5a30041b97b62d5f7470a9e29af98c2824a998..cb12af8c5704d0cd7ccf9389c62da74f187b2b01 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -119,8 +119,15 @@ rxvt_term::~rxvt_term ()
   delete TermWin.fontset;
 
   if (display)
-    if (TermWin.parent[0])
-      XDestroyWindow (display->display, TermWin.parent[0]);
+    {
+      if (TermWin.parent[0])
+        XDestroyWindow (display->display, TermWin.parent[0]);
+#if defined(MENUBAR) && (MENUBAR_MAX > 1)
+      if (menuBar.win)
+        XDestroyWindow (display->display, menuBar.win);
+      delete menuBar.drawable;
+#endif
+    }
 
   // TODO: free pixcolours, colours should become part of rxvt_display
 
@@ -251,7 +258,7 @@ rxvt_term::init (int argc, const char *const *argv)
 
   set_locale ("");
 
-#if (MENUBAR_MAX)
+#if MENUBAR_MAX
   menubar_read (rs[Rs_menu]);
 #endif
 #ifdef HAVE_SCROLLBARS

diff --git a/src/menubar.C b/src/menubar.C
index e5a60b4f14a0e638a46f42711c61517d57bd66d8..f6088c777f7b9265d62375963ccba487a2333b07 100644 (file)
--- a/src/menubar.C
+++ b/src/menubar.C
@@ -23,6 +23,9 @@
  *----------------------------------------------------------------------*/
 
 #include "../config.h"         /* NECESSARY */
+
+#include <stdlib.h>
+
 #include "rxvt.h"              /* NECESSARY */
 #ifdef MENUBAR
 #include "version.h"
@@ -46,6 +49,30 @@ Arrows[NARROWS] = {
 
 /*}}} */
 
+static void
+draw_string (rxvt_drawable &d, GC gc, rxvt_fontset *fs, int x, int y, char *str, int len)
+{
+  mbstate mbs;
+
+  while (len)
+    {
+      wchar_t w;
+      int l = mbrtowc (&w, str, len, mbs);
+
+      if (l <= 0)
+        break;
+
+      len -= l;
+      str += l;
+
+      rxvt_font *font = (*fs)[fs->find_font (w)];
+      text_t ch = w;
+      font->draw (d, x, y, &ch, 1, Color_bg, Color_scroll);
+
+      x += font->width * wcwidth (w);
+    }
+}
+
 /*
  * find an item called NAME in MENU
  */
@@ -493,16 +520,19 @@ rxvt_term::menu_find_base (menu_t **menu, char *path)
           if (*p == '/')
             path = p;
         }
+
       if (path[0] == '/')
         {
           path++;
           *menu = NULL;
         }
+
       while ((p = STRCHR (path, '/')) != NULL)
         {
           p[0] = '\0';
           if (path[0] == '\0')
             return NULL;
+
           if (!STRCMP (path, DOT))
             {
               /* nothing to do */
@@ -525,6 +555,7 @@ rxvt_term::menu_find_base (menu_t **menu, char *path)
           path = (p + 1);
         }
     }
+
   if (!STRCMP (path, DOTS))
     {
       path += STRLEN (DOTS);
@@ -532,14 +563,13 @@ rxvt_term::menu_find_base (menu_t **menu, char *path)
         *menu = (*menu)->parent;
       return path;
     }
+
   /* find this menu */
   if (*menu == NULL)
     {
       for (m = CurrentBar->tail; m != NULL; m = m->prev)
-        {
-          if (!STRCMP (path, m->name))
-            break;
-        }
+        if (!STRCMP (path, m->name))
+          break;
     }
   else
     {
@@ -554,11 +584,13 @@ rxvt_term::menu_find_base (menu_t **menu, char *path)
             }
         }
     }
+
   if (m != NULL)
     {
       *menu = m;
       path += STRLEN (path);
     }
+
   return path;
 }
 
@@ -570,7 +602,6 @@ rxvt_term::menu_delete (menu_t *menu)
 {
   menu_t         *parent = NULL, *prev, *next;
   menuitem_t     *item;
-  bar_t          *CurrentBar = CurrentBar;
 
 #ifdef DEBUG_STRICT
   assert (CurrentBar != NULL);
@@ -620,14 +651,13 @@ rxvt_term::menu_delete (menu_t *menu)
   item = menu->tail;
   while (item != NULL)
     {
-      menuitem_t     *p = item->prev;
+      menuitem_t *p = item->prev;
 
       menuitem_free (menu, item);
       item = p;
     }
 
-  if (menu->name != NULL)
-    free (menu->name);
+  free (menu->name);
   free (menu);
 
   return parent;
@@ -636,8 +666,7 @@ rxvt_term::menu_delete (menu_t *menu)
 menu_t         *
 rxvt_term::menu_add (menu_t *parent, char *path)
 {
-  menu_t         *menu;
-  bar_t          *CurrentBar = CurrentBar;
+  menu_t *menu;
 
 #ifdef DEBUG_STRICT
   assert (CurrentBar != NULL);
@@ -645,7 +674,7 @@ rxvt_term::menu_add (menu_t *parent, char *path)
 
   if (STRCHR (path, '/') != NULL)
     {
-      char           *p;
+      char *p;
 
       if (path[0] == '/')
         {
@@ -683,6 +712,7 @@ rxvt_term::menu_add (menu_t *parent, char *path)
   menu->prev = menu->next = NULL;
 
   menu->win = None;
+  menu->drawable = 0;
   menu->x = menu->y = menu->w = menu->h = 0;
   menu->item = NULL;
 
@@ -781,8 +811,7 @@ rxvt_term::drawtriangle (int x, int y, int state)
   x -= SHADOW + (3 * w / 2);
   y += SHADOW * 3;
 
-  rxvt_Draw_Triangle (display->display, ActiveMenu->win, top, bot, x, y, w,
-                     'r');
+  rxvt_Draw_Triangle (display->display, ActiveMenu->win, top, bot, x, y, w, 'r');
 }
 
 void
@@ -824,6 +853,7 @@ rxvt_print_menu_ancestors (menu_t *menu)
       fprintf (stderr, "Top Level menu\n");
       return;
     }
+
   fprintf (stderr, "menu %s ", menu->name);
   if (menu->parent != NULL)
     {
@@ -837,12 +867,14 @@ rxvt_print_menu_ancestors (menu_t *menu)
               break;
             }
         }
+
       if (item == NULL)
         {
           fprintf (stderr, "is an orphan!\n");
           return;
         }
     }
+
   fprintf (stderr, "\n");
   rxvt_print_menu_ancestors (menu->parent);
 }
@@ -895,9 +927,8 @@ rxvt_print_menu_descendants (menu_t *menu)
 void
 rxvt_term::menu_show ()
 {
-  int             x, y, xright;
-  menu_t         *ActiveMenu = ActiveMenu;
-  menuitem_t     *item;
+  int x, y, xright;
+  menuitem_t *item;
 
   if (ActiveMenu == NULL)
     return;
@@ -922,6 +953,7 @@ rxvt_term::menu_show ()
              : HEIGHT_TEXT + 2 * SHADOW;
       ActiveMenu->h = h + 2 * SHADOW;
     }
+
   if (ActiveMenu->win == None)
     {
       ActiveMenu->win = XCreateSimpleWindow (display->display, TermWin.vt,
@@ -930,8 +962,10 @@ rxvt_term::menu_show ()
                                             0,
                                             PixColors[Color_fg],
                                             PixColors[Color_scroll]);
+      ActiveMenu->drawable = new rxvt_drawable (display, ActiveMenu->win);
       XMapWindow (display->display, ActiveMenu->win);
     }
+
   rxvt_Draw_Shadow (display->display, ActiveMenu->win,
                    topShadowGC, botShadowGC,
                    0, 0, ActiveMenu->w, ActiveMenu->h);
@@ -943,9 +977,9 @@ rxvt_term::menu_show ()
 
   for (y = 0, item = ActiveMenu->head; item != NULL; item = item->next)
     {
-      const int       xoff = (SHADOW + Width2Pixel (HSPACE) / 2);
-      register int    h;
-      GC              gc = menubarGC;
+      const int xoff = (SHADOW + Width2Pixel (HSPACE) / 2);
+      register int h;
+      GC gc = menubarGC;
 
       if (isSeparator (item->name))
         {
@@ -961,9 +995,7 @@ rxvt_term::menu_show ()
           int             len = item->len;
 
           if (item->entry.type == MenuLabel)
-            {
-              gc = botShadowGC;
-            }
+            gc = botShadowGC;
           else if (item->entry.type == MenuSubMenu)
             {
               int             x1, y1;
@@ -1005,18 +1037,15 @@ rxvt_term::menu_show ()
             name = NULL;
 
           if (len && name)
-            draw_string (display->display, ActiveMenu->win, gc, xoff,
-                         2 * SHADOW + y + TermWin.font->ascent + 1,
-                         name, len);
+            draw_string (*ActiveMenu->drawable, gc, TermWin.fontset,
+                         xoff, 2 * SHADOW + y, name, len);
 
           len = item->len2;
           name = item->name2;
 
           if (len && name)
-            draw_string (display->display, ActiveMenu->win, gc,
-                         ActiveMenu->w - (xoff + Width2Pixel (xright)),
-                         2 * SHADOW + y + TermWin.font->ascent + 1,
-                         name, len);
+            draw_string (*ActiveMenu->drawable, gc, TermWin.fontset,
+                         ActiveMenu->w - (xoff + Width2Pixel (xright)), 2 * SHADOW + y, name, len);
 
           h = HEIGHT_TEXT + 2 * SHADOW;
         }
@@ -1027,10 +1056,10 @@ rxvt_term::menu_show ()
 void
 rxvt_term::menu_display (void (rxvt_term::*update) ())
 {
-  menu_t         *ActiveMenu = ActiveMenu;
-
   if (ActiveMenu == NULL)
     return;
+
+  delete ActiveMenu->drawable;
   if (ActiveMenu->win != None)
     XDestroyWindow (display->display, ActiveMenu->win);
   ActiveMenu->win = None;
@@ -1038,6 +1067,7 @@ rxvt_term::menu_display (void (rxvt_term::*update) ())
 
   if (ActiveMenu->parent == NULL)
     drawbox_menubar (ActiveMenu->x, ActiveMenu->len, +1);
+
   ActiveMenu = ActiveMenu->parent;
   (this->*update) ();
 }
@@ -1059,7 +1089,7 @@ rxvt_term::menu_clear (menu_t *menu)
 {
   if (menu != NULL)
     {
-      menuitem_t     *item = menu->tail;
+      menuitem_t *item = menu->tail;
 
       while (item != NULL)
         {
@@ -1076,15 +1106,13 @@ rxvt_term::menu_clear (menu_t *menu)
 void
 rxvt_term::menubar_clear ()
 {
-  bar_t          *CurrentBar = CurrentBar;
-
   if (CurrentBar != NULL)
     {
-      menu_t         *menu = CurrentBar->tail;
+      menu_t *menu = CurrentBar->tail;
 
       while (menu != NULL)
         {
-          menu_t         *prev = menu->prev;
+          menu_t *prev = menu->prev;
 
           menu_delete (menu);
           menu = prev;
@@ -1096,8 +1124,10 @@ rxvt_term::menubar_clear ()
           free (CurrentBar->title);
           CurrentBar->title = NULL;
         }
+
       menuarrow_free (0);      /* remove all arrow functions */
     }
+
   ActiveMenu = NULL;
 }
 
@@ -1106,7 +1136,7 @@ rxvt_term::menubar_clear ()
 bar_t          *
 rxvt_term::menubar_find (const char *name)
 {
-  bar_t          *bar = CurrentBar;
+  bar_t *bar = CurrentBar;
 
 #ifdef DEBUG_MENUBAR_STACKING
   fprintf (stderr, "looking for [menu:%s] ...", name ? name : " (nil)");
@@ -1140,8 +1170,8 @@ rxvt_term::menubar_find (const char *name)
 int
 rxvt_term::menubar_push (const char *name)
 {
-  int             ret = 1;
-  bar_t          *bar;
+  int ret = 1;
+  bar_t *bar;
 
   if (CurrentBar == NULL)
     {
@@ -1199,6 +1229,7 @@ rxvt_term::menubar_push (const char *name)
               CurrentBar = bar;
 
             }
+
           menubar_clear ();
         }
     }
@@ -1253,8 +1284,8 @@ rxvt_term::menubar_remove (const char *name)
 void
 rxvt_action_decode (FILE *fp, action_t *act)
 {
-  unsigned char  *str;
-  short           len;
+  unsigned char *str;
+  short len;
 
   if (act == NULL || (len = act->len) == 0 || (str = act->str) == NULL)
     return;
@@ -1287,6 +1318,7 @@ rxvt_action_decode (FILE *fp, action_t *act)
             break;
         }
     }
+
   /*
    * control character form is preferred, since backslash-escaping
    * can be really ugly looking when the backslashes themselves also
@@ -1322,8 +1354,10 @@ rxvt_action_decode (FILE *fp, action_t *act)
               fprintf (fp, "%c", ch);
             break;
         }
+
       len--;
     }
+
   fprintf (fp, "\n");
 }
 
@@ -1439,6 +1473,7 @@ rxvt_term::menubar_read (const char *filename)
   file = (char *)rxvt_File_find (filename, ".menu", rs[Rs_path]);
   if (file == NULL)
     return;
+
   fp = fopen (file, "rb");
   free (file);
   if (fp == NULL)
@@ -1554,8 +1589,8 @@ rxvt_term::menubar_read (const char *filename)
 void
 rxvt_term::menubar_dispatch (char *str)
 {
-  int             n, cmd;
-  char           *path, *name, *name2;
+  int n, cmd;
+  char *path, *name, *name2;
 
   if (menubar_visible () && ActiveMenu != NULL)
     menubar_expose ();
@@ -1976,9 +2011,9 @@ rxvt_term::draw_Arrows (int name, int state)
 
   for (i = 0; i < NARROWS; i++)
     {
-      const int       w = Width2Pixel (1);
-      const int       y = (menuBar_TotalHeight () - w) / 2;
-      int             x = Arrows_x + (5 * Width2Pixel (i)) / 4;
+      const int w = Width2Pixel (1);
+      const int y = (menuBar_TotalHeight () - w) / 2;
+      int       x = Arrows_x + (5 * Width2Pixel (i)) / 4;
 
       if (!name || name == Arrows[i].name)
         rxvt_Draw_Triangle (display->display, menuBar.win, top, bot, x, y, w,
@@ -1990,8 +2025,8 @@ rxvt_term::draw_Arrows (int name, int state)
 void
 rxvt_term::menubar_expose ()
 {
-  menu_t         *menu;
-  int             x;
+  menu_t *menu;
+  int x;
 
   if (!menubar_visible () || menuBar.win == 0)
     return;
@@ -2001,17 +2036,13 @@ rxvt_term::menubar_expose ()
       /* Create the graphics context */
       XGCValues       gcvalue;
 
-      gcvalue.font = TermWin.font->fid;
-
       gcvalue.foreground = (XDEPTH <= 2 ? PixColors[Color_fg]
                             : PixColors[Color_Black]);
       menubarGC = XCreateGC (display->display, menuBar.win,
-                            GCForeground | GCFont, &gcvalue);
+                            GCForeground, &gcvalue);
 
     }
   /* make sure the font is correct */
-  XSetFont (display->display, menubarGC, TermWin.font->fid);
-  XSetFont (display->display, botShadowGC, TermWin.font->fid);
   XClearWindow (display->display, menuBar.win);
 
   menu_hide_all ();
@@ -2033,9 +2064,9 @@ rxvt_term::menubar_expose ()
             len = (TermWin.ncol - (menu->x + HSPACE));
 
           drawbox_menubar (menu->x, len, +1);
-          draw_string (display->display, menuBar.win, menubarGC,
+          draw_string (*menuBar.drawable, menubarGC, TermWin.fontset,
                        (Width2Pixel (menu->x) + Width2Pixel (HSPACE) / 2),
-                       menuBar_height () - SHADOW, menu->name, len);
+                       SHADOW, menu->name, len);
 
           if (x >= TermWin.ncol)
             break;
@@ -2096,9 +2127,9 @@ rxvt_term::menubar_expose ()
 
       ncol -= (x + len + HSPACE);
       if (len > 0 && ncol >= 0)
-        draw_string (display->display, menuBar.win, menubarGC,
+        draw_string (*menuBar.drawable, menubarGC, TermWin.fontset,
                      Width2Pixel (x) + Width2Pixel (ncol + HSPACE) / 2,
-                     menuBar_height () - SHADOW, title, len);
+                     SHADOW, title, len);
     }
 }
 
@@ -2131,47 +2162,50 @@ rxvt_term::menubar_mapping (int map)
 int
 rxvt_term::menu_select (XButtonEvent &ev)
 {
-  menuitem_t     *thisitem, *item = NULL;
-  int             this_y, y;
-  menu_t         *ActiveMenu = ActiveMenu;
+  menuitem_t *thisitem, *item = NULL;
+  int this_y, y;
 
-  Window          unused_root, unused_child;
-  int             unused_root_x, unused_root_y;
-  unsigned int    unused_mask;
+  Window unused_root, unused_child;
+  int unused_root_x, unused_root_y;
+  unsigned int unused_mask;
 
   if (ActiveMenu == NULL)
     return 0;
 
   XQueryPointer (display->display, ActiveMenu->win,
-                &unused_root, &unused_child,
-                &unused_root_x, &unused_root_y,
-                &ev.x, &ev.y, &unused_mask);
+                 &unused_root, &unused_child,
+                 &unused_root_x, &unused_root_y,
+                 &ev.x, &ev.y, &unused_mask);
 
   if (ActiveMenu->parent != NULL && (ev.x < 0 || ev.y < 0))
     {
       menu_hide ();
       return 1;
     }
+
   /* determine the menu item corresponding to the Y index */
   y = SHADOW;
   if (ev.x >= 0 && ev.x <= (ActiveMenu->w - SHADOW))
     {
       for (item = ActiveMenu->head; item != NULL; item = item->next)
         {
-          int             h = HEIGHT_TEXT + 2 * SHADOW;
+          int h = HEIGHT_TEXT + 2 * SHADOW;
 
           if (isSeparator (item->name))
             h = HEIGHT_SEPARATOR;
           else if (ev.y >= y && ev.y < (y + h))
             break;
+
           y += h;
         }
     }
+
   if (item == NULL && ev.type == ButtonRelease)
     {
       menu_hide_all ();
       return 0;
     }
+
   thisitem = item;
   this_y = y - SHADOW;
 
@@ -2180,10 +2214,9 @@ rxvt_term::menu_select (XButtonEvent &ev)
     {
       if (ActiveMenu->item != thisitem)
         {
-          for (y = 0, item = ActiveMenu->head; item != NULL;
-               item = item->next)
+          for (y = 0, item = ActiveMenu->head; item != NULL; item = item->next)
             {
-              int             h;
+              int h;
 
               if (isSeparator (item->name))
                 h = HEIGHT_SEPARATOR;
@@ -2193,10 +2226,12 @@ rxvt_term::menu_select (XButtonEvent &ev)
                   drawbox_menuitem (y, 0);     /* No Shadow */
                   if (item->entry.type == MenuSubMenu)
                     drawtriangle (ActiveMenu->w, y, +1);
+
                   break;
                 }
               else
                 h = HEIGHT_TEXT + 2 * SHADOW;
+
               y += h;
             }
         }
@@ -2215,23 +2250,20 @@ rxvt_term::menu_select (XButtonEvent &ev)
                     case MenuAction:
                     case MenuTerminalAction:
                       drawbox_menuitem (this_y, -1);
-                      {
 #ifdef HAVE_NANOSLEEP
-                        struct timespec rqt;
+                      struct timespec rqt;
 
-                        rqt.tv_sec = 0;
-                        rqt.tv_nsec = MENU_DELAY_USEC * 1000;
-                        nanosleep (&rqt, NULL);
+                      rqt.tv_sec = 0;
+                      rqt.tv_nsec = MENU_DELAY_USEC * 1000;
+                      nanosleep (&rqt, NULL);
 #else
-                        /* use select for timing */
-                        struct timeval  tv;
+                      /* use select for timing */
+                      struct timeval  tv;
 
-                        tv.tv_sec = 0;
-                        tv.tv_usec = MENU_DELAY_USEC;
-                        select (0, NULL, NULL, NULL, &tv);
+                      tv.tv_sec = 0;
+                      tv.tv_usec = MENU_DELAY_USEC;
+                      select (0, NULL, NULL, NULL, &tv);
 #endif
-
-                      }
                       /* remove menu before sending keys to the application */
                       menu_hide_all ();
 #ifndef DEBUG_MENU
@@ -2252,17 +2284,20 @@ rxvt_term::menu_select (XButtonEvent &ev)
           return 0;
         }
     }
+
 DoMenu:
   ActiveMenu->item = thisitem;
   y = this_y;
-  if (item != NULL)
+
+  if (thisitem != NULL)
     {
       item = ActiveMenu->item;
       if (item->entry.type != MenuLabel)
         drawbox_menuitem (y, +1);
+
       if (item->entry.type == MenuSubMenu)
         {
-          int             x;
+          int x;
 
           drawtriangle (ActiveMenu->w, y, -1);
 
@@ -2284,15 +2319,15 @@ DoMenu:
 void
 rxvt_term::menubar_select (XButtonEvent &ev)
 {
-  menu_t         *menu = NULL;
+  menu_t *menu = NULL;
 
   /* determine the pulldown menu corresponding to the X index */
   if (ev.y >= 0 && ev.y <= menuBar_height () && CurrentBar != NULL)
     {
       for (menu = CurrentBar->head; menu != NULL; menu = menu->next)
         {
-          int             x = Width2Pixel (menu->x);
-          int             w = Width2Pixel (menu->len + HSPACE);
+          int x = Width2Pixel (menu->x);
+          int w = Width2Pixel (menu->len + HSPACE);
 
           if ((ev.x >= x && ev.x < x + w))
             break;
@@ -2400,7 +2435,7 @@ rxvt_term::menubar_control (XButtonEvent &ev)
 
       case MotionNotify:
         while (XCheckTypedWindowEvent (display->display, TermWin.parent[0],
-                                      MotionNotify, (XEvent *)&ev)) ;
+                                       MotionNotify, (XEvent *)&ev)) ;
 
         if (ActiveMenu)
           while (menu_select (ev)) ;

diff --git a/src/menubar.h b/src/menubar.h
index 645ae46244c4e5960bbe796d1b90f12736e34c2f..d2eea614c1886f0b78e5c1eff0e24711bc7c0b93 100644 (file)
--- a/src/menubar.h
+++ b/src/menubar.h
@@ -44,6 +44,7 @@ typedef struct menu_t {
     short           len;       /* strlen (name) */
     short           width;     /* maximum menu width [chars] */
     Window          win;       /* window of the menu */
+    struct rxvt_drawable *drawable;
     short           x;         /* x location [pixels] (chars if parent == NULL) */
     short           y;         /* y location [pixels] */
     short           w, h;      /* window width, height [pixels] */
@@ -70,8 +71,7 @@ typedef struct bar_t {
 #define HEIGHT_SEPARATOR       (SHADOW + 1)
 #define HEIGHT_TEXT            (Height2Pixel(1) + 2)
 
-#define MENU_DELAY_USEC        250000  /* 1/4 sec */
-
+#define MENU_DELAY_USEC        0       /* no delay */
 
 #define SEPARATOR_NAME         "-"
 #define MENUITEM_BEG           '{'

diff --git a/src/rxvt.h b/src/rxvt.h
index 4c61063ea94eeac543d4399af896e14b2fc4aba1..1636d51a5560a568f61efcded3b23783af1a69bc 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1176,6 +1176,7 @@ struct rxvt_term : rxvt_vars {
   void lookup_key (XKeyEvent &ev);
   unsigned int cmd_write (const unsigned char *str, unsigned int count);
   uint32_t cmd_getc ();
+  bool cmd_parse ();
   void mouse_report (XButtonEvent &ev);
   void button_press (XButtonEvent &ev);
   void button_release (XButtonEvent &ev);

diff --git a/src/rxvtcolor.h b/src/rxvtcolor.h
index 8a6f0a7285c6d08ec7ddec1949c3aa16e1838320..31b876b808019811aa4ae034ff8821d36a88fc1f 100644 (file)
--- a/src/rxvtcolor.h
+++ b/src/rxvtcolor.h
@@ -24,7 +24,7 @@ struct refcounted {
   char *id;
 
   refcounted (const char *id);
-  bool init () { }
+  bool init () { return false; }
   ~refcounted ();
 };
 

diff --git a/src/rxvtlib.h.in b/src/rxvtlib.h.in
index fbb5ee20e798231333f39ba0f8e56ebf80353fc1..a35a758fcc8dd082f7f66b15aa43d9d844bde624 100644 (file)
--- a/src/rxvtlib.h.in
+++ b/src/rxvtlib.h.in
@@ -218,6 +218,7 @@ typedef enum {
 typedef struct {
   short           state;
   Window          win;
+  struct rxvt_drawable *drawable;
 } menuBar_t;
 
 typedef struct {