--- rxvt-unicode/src/menubar.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/menubar.h	2006/01/04 04:42:45	1.7
@@ -1,18 +1,14 @@
-/*
- * $Id: menubar.h,v 1.1 2003/11/24 17:28:08 pcg Exp $
- */
-
-#ifndef _MENUBAR_H_
-#define _MENUBAR_H_
+#ifndef MENUBAR_H_
+#define MENUBAR_H_
 
 typedef struct {
-    short           type;	/* must not be changed; first element */
-    short           len;	/* strlen (str) */
-    unsigned char  *str;	/* action to take */
+    int    type;	/* must not be changed; first element */
+    int    len;	/* strlen (str) */
+    char  *str;	/* action to take */
 } action_t;
 
 typedef struct {
-    short           type;	/* must not be changed; first element */
+    int             type;	/* must not be changed; first element */
     struct menu_t  *menu;	/* sub-menu */
 } submenu_t;
 
@@ -24,9 +20,9 @@
     short           len;	/* strlen (name) */
     short           len2;	/* strlen (name) */
     union {
-	short           type;	/* must not be changed; first element */
-	action_t        action;
-	submenu_t       submenu;
+        short           type;	/* must not be changed; first element */
+        action_t        action;
+        submenu_t       submenu;
     } entry;
 } menuitem_t;
 
@@ -48,6 +44,7 @@
     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] */
@@ -71,11 +68,10 @@
 
 #define HSPACE		1	/* one space */
 #define isSeparator(name)	((name)[0] == '\0')
-#define HEIGHT_SEPARATOR	(SHADOW + 1)
+#define HEIGHT_SEPARATOR	(MENU_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		'{'