--- rxvt-unicode/src/menubar.h	2003/11/24 17:28:08	1.1
+++ rxvt-unicode/src/menubar.h	2004/02/24 16:25:45	1.4
@@ -1,9 +1,5 @@
-/*
- * $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 */
@@ -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] */
@@ -74,8 +71,7 @@
 #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		'{'