/* Implements a lightweight menubar widget.
- Copyright (C) 1992 Lucid, Inc.
- Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 1992 Lucid, Inc.
+Copyright (C) 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to the
-Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
/* Created by devin@lucid.com */
#include <config.h>
#endif
-#include "../src/lisp.h"
+#include <setjmp.h>
+#include "lisp.h"
#include <stdio.h>
extern int gray_bitmap_height;
extern char *gray_bitmap_bits;
-/* Defined in xterm.c. */
-extern int x_alloc_nearest_color_for_widget __P ((Widget, Colormap, XColor*));
-extern int x_alloc_lighter_color_for_widget __P ((Widget, Display*, Colormap,
- unsigned long *,
- double, int));
-extern int x_catch_errors __P ((Display*));
-extern int x_uncatch_errors __P ((Display*, int));
-extern int x_had_errors_p __P ((Display*));
-extern int x_clear_errors __P ((Display*));
-extern unsigned long x_copy_dpy_color __P ((Display *, Colormap,
- unsigned long));
-
-/* Defined in xfaces.c. */
-extern void x_free_dpy_colors __P ((Display *, Screen *, Colormap,
- unsigned long *pixels, int npixels));
+#include "xterm.h"
+
#else /* not emacs */
#include <X11/bitmaps/gray>
/* FIXME: Should ESC close one level of menu structure or the complete menu? */
-/* FIXME: Should F10 enter to menu? Which one? File? */
+/* FIXME: F10 should enter the menu, the first one in the menu-bar. */
#define offset(field) XtOffset(XlwMenuWidget, field)
static XtResource
xlwMenuResources[] =
{
+#ifdef HAVE_X_I18N
+ {XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet),
+ offset(menu.fontSet), XtRFontSet, NULL},
+#endif
{XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *),
- offset(menu.font),XtRString, "XtDefaultFont"},
+ offset(menu.font), XtRString, "XtDefaultFont"},
{XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
offset(menu.foreground), XtRString, "XtDefaultForeground"},
+ {XtNdisabledForeground, XtCDisabledForeground, XtRPixel, sizeof(Pixel),
+ offset(menu.disabled_foreground), XtRString, (XtPointer)NULL},
{XtNbuttonForeground, XtCButtonForeground, XtRPixel, sizeof(Pixel),
offset(menu.button_foreground), XtRString, "XtDefaultForeground"},
{XtNmargin, XtCMargin, XtRDimension, sizeof(Dimension),
- offset(menu.margin), XtRImmediate, (XtPointer) 4},
+ offset(menu.margin), XtRImmediate, (XtPointer)1},
{XtNhorizontalSpacing, XtCMargin, XtRDimension, sizeof(Dimension),
offset(menu.horizontal_spacing), XtRImmediate, (XtPointer)3},
{XtNverticalSpacing, XtCMargin, XtRDimension, sizeof(Dimension),
- offset(menu.vertical_spacing), XtRImmediate, (XtPointer)1},
+ offset(menu.vertical_spacing), XtRImmediate, (XtPointer)2},
{XtNarrowSpacing, XtCMargin, XtRDimension, sizeof(Dimension),
offset(menu.arrow_spacing), XtRImmediate, (XtPointer)10},
{XmNshadowThickness, XmCShadowThickness, XtRDimension,
sizeof (Dimension), offset (menu.shadow_thickness),
- XtRImmediate, (XtPointer) 2},
+ XtRImmediate, (XtPointer)1},
{XmNtopShadowColor, XmCTopShadowColor, XtRPixel, sizeof (Pixel),
offset (menu.top_shadow_color), XtRImmediate, (XtPointer)-1},
{XmNbottomShadowColor, XmCBottomShadowColor, XtRPixel, sizeof (Pixel),
offset(menu.select), XtRCallback, (XtPointer)NULL},
{XtNhighlightCallback, XtCCallback, XtRCallback, sizeof(XtPointer),
offset(menu.highlight), XtRCallback, (XtPointer)NULL},
+ {XtNenterCallback, XtCCallback, XtRCallback, sizeof(XtPointer),
+ offset(menu.enter), XtRCallback, (XtPointer)NULL},
+ {XtNleaveCallback, XtCCallback, XtRCallback, sizeof(XtPointer),
+ offset(menu.leave), XtRCallback, (XtPointer)NULL},
{XtNmenu, XtCMenu, XtRPointer, sizeof(XtPointer),
offset(menu.contents), XtRImmediate, (XtPointer)NULL},
{XtNcursor, XtCCursor, XtRCursor, sizeof(Cursor),
static void Select();
static void Key();
static void Nothing();
-static int separator_height ();
+static int separator_height __P ((enum menu_separator));
+static void pop_up_menu __P ((XlwMenuWidget, XButtonPressedEvent *));
+
static XtActionsRec
xlwMenuActionsList [] =
{"right", Right},
{"select", Select},
{"key", Key},
+ {"MenuGadgetEscape", Key}, /* Compatibility with Lesstif/Motif. */
{"nothing", Nothing},
};
XtNumber(xlwMenuResources), /* resource_count */
NULLQUARK, /* xrm_class */
TRUE, /* compress_motion */
- TRUE, /* compress_exposure */
+ XtExposeCompressMaximal, /* compress_exposure */
TRUE, /* compress_enterleave */
FALSE, /* visible_interest */
XlwMenuDestroy, /* destroy */
int submenu_destroyed;
+/* For debug, if installation-directory is non-nil this is not an installed
+ Emacs. In that case we do not grab the keyboard to make it easier to
+ debug. */
+#define GRAB_KEYBOARD (EQ (Vinstallation_directory, Qnil))
+
static int next_release_must_exit;
\f/* Utilities */
+/* Ungrab pointer and keyboard */
+static void
+ungrab_all (w, ungrabtime)
+ Widget w;
+ Time ungrabtime;
+{
+ XtUngrabPointer (w, ungrabtime);
+ if (GRAB_KEYBOARD) XtUngrabKeyboard (w, ungrabtime);
+}
/* Like abort, but remove grabs from widget W before. */
{
if (XtIsShell (XtParent (w)))
XtRemoveGrab (w);
- XtUngrabPointer (w, CurrentTime);
+ ungrab_all (w, CurrentTime);
abort ();
}
pop_new_stack_if_no_contents (mw)
XlwMenuWidget mw;
{
- if (mw->menu.new_depth)
+ if (mw->menu.new_depth > 1)
{
if (!mw->menu.new_stack [mw->menu.new_depth - 1]->contents)
mw->menu.new_depth -= 1;
}
\f/* Size code */
-int
+static int
string_width (mw, s)
XlwMenuWidget mw;
char *s;
{
XCharStruct xcs;
int drop;
+#ifdef HAVE_X_I18N
+ XRectangle ink, logical;
+ if (mw->menu.fontSet)
+ {
+ XmbTextExtents (mw->menu.fontSet, s, strlen (s), &ink, &logical);
+ return logical.width;
+ }
+#endif
XTextExtents (mw->menu.font, s, strlen (s), &drop, &drop, &drop, &xcs);
return xcs.width;
+
}
+#ifdef HAVE_X_I18N
+#define MENU_FONT_HEIGHT(mw) \
+ ((mw)->menu.fontSet != NULL \
+ ? (mw)->menu.font_extents->max_logical_extent.height \
+ : (mw)->menu.font->ascent + (mw)->menu.font->descent)
+#define MENU_FONT_ASCENT(mw) \
+ ((mw)->menu.fontSet != NULL \
+ ? - (mw)->menu.font_extents->max_logical_extent.y \
+ : (mw)->menu.font->ascent)
+#else
+#define MENU_FONT_HEIGHT(mw) \
+ ((mw)->menu.font->ascent + (mw)->menu.font->descent)
+#define MENU_FONT_ASCENT(mw) ((mw)->menu.font->ascent)
+#endif
+
static int
arrow_width (mw)
XlwMenuWidget mw;
{
- return (mw->menu.font->ascent * 3/4) | 1;
+ return (MENU_FONT_ASCENT (mw) * 3/4) | 1;
}
/* Return the width of toggle buttons of widget MW. */
toggle_button_width (mw)
XlwMenuWidget mw;
{
- return ((mw->menu.font->ascent + mw->menu.font->descent) * 2 / 3) | 1;
+ return (MENU_FONT_HEIGHT (mw) * 2 / 3) | 1;
}
}
else
{
- *height =
- mw->menu.font->ascent + mw->menu.font->descent
- + 2 * mw->menu.vertical_spacing + 2 * mw->menu.shadow_thickness;
+ *height = MENU_FONT_HEIGHT (mw)
+ + 2 * mw->menu.vertical_spacing + 2 * mw->menu.shadow_thickness;
*label_width =
string_width (mw, resource_widget_value (mw, val))
double factor = 1.62;
int thickness2 = thickness * factor;
- y += (mw->menu.font->ascent + mw->menu.font->descent - height) / 2;
+ y += (MENU_FONT_HEIGHT (mw) - height) / 2;
if (down_p)
{
width = toggle_button_width (mw);
height = width;
x += mw->menu.horizontal_spacing;
- y += (mw->menu.font->ascent - height) / 2;
+ y += (MENU_FONT_ASCENT (mw) - height) / 2;
draw_shadow_rectangle (mw, window, x, y, width, height, False, selected_p);
}
width = radio_button_width (mw);
height = width;
x += mw->menu.horizontal_spacing;
- y += (mw->menu.font->ascent - height) / 2;
+ y += (MENU_FONT_ASCENT (mw) - height) / 2;
draw_shadow_rhombus (mw, window, x, y, width, height, False, selected_p);
}
{
GC deco_gc;
GC text_gc;
- int font_ascent = mw->menu.font->ascent;
- int font_descent = mw->menu.font->descent;
+ int font_height = MENU_FONT_HEIGHT (mw);
+ int font_ascent = MENU_FONT_ASCENT (mw);
int shadow = mw->menu.shadow_thickness;
int margin = mw->menu.margin;
int h_spacing = mw->menu.horizontal_spacing;
if (val->enabled)
text_gc = mw->menu.foreground_gc;
else
- text_gc = mw->menu.inactive_gc;
+ text_gc = mw->menu.disabled_gc;
deco_gc = mw->menu.foreground_gc;
if (separator_p)
x_offset += ws->button_width;
- XDrawString (XtDisplay (mw), ws->window, text_gc, x_offset,
+#ifdef HAVE_X_I18N
+ if (mw->menu.fontSet)
+ XmbDrawString (XtDisplay (mw), ws->window, mw->menu.fontSet,
+ text_gc, x_offset,
+ y + v_spacing + shadow + font_ascent,
+ display_string, strlen (display_string));
+ else
+#endif
+ XDrawString (XtDisplay (mw), ws->window,
+ text_gc, x_offset,
y + v_spacing + shadow + font_ascent,
display_string, strlen (display_string));
}
else if (val->key)
{
- XDrawString (XtDisplay (mw), ws->window, text_gc,
+#ifdef HAVE_X_I18N
+ if (mw->menu.fontSet)
+ XmbDrawString (XtDisplay (mw), ws->window,
+ mw->menu.fontSet,
+ text_gc,
+ x + label_width + mw->menu.arrow_spacing,
+ y + v_spacing + shadow + font_ascent,
+ val->key, strlen (val->key));
+ else
+#endif
+ XDrawString (XtDisplay (mw), ws->window,
+ text_gc,
x + label_width + mw->menu.arrow_spacing,
y + v_spacing + shadow + font_ascent,
val->key, strlen (val->key));
mw->menu.background_gc,
x + shadow, y + shadow,
label_width + h_spacing - 1,
- font_ascent + font_descent + 2 * v_spacing - 1);
+ font_height + 2 * v_spacing - 1);
draw_shadow_rectangle (mw, ws->window, x, y, width, height,
True, False);
}
{
if (val->enabled)
*hit_return = val;
- else
- no_return = 1;
+ else
+ no_return = 1;
+ if (mw->menu.inside_entry != val)
+ {
+ if (mw->menu.inside_entry)
+ XtCallCallbackList ((Widget)mw, mw->menu.leave,
+ (XtPointer) mw->menu.inside_entry);
+ mw->menu.inside_entry = val;
+ XtCallCallbackList ((Widget)mw, mw->menu.enter,
+ (XtPointer) mw->menu.inside_entry);
+ }
}
if (horizontal_p)
{
XlwMenuWidget mw = (XlwMenuWidget) w;
int i;
-
+
for (i = 0; i < mw->menu.windows_length; ++i)
if (window == mw->menu.windows[i].window)
break;
/* unmap the menus that popped down */
for (i = new_depth - 1; i < old_depth; i++)
- if (i >= new_depth || !new_stack[i]->contents)
+ if (i >= new_depth || (i > 0 && !new_stack[i]->contents))
XUnmapWindow (XtDisplay (mw), windows[i].window);
}
relative_pos->x = ev->x_root - x;
relative_pos->y = ev->y_root - y;
return (x - shadow < ev->x_root && ev->x_root < x + ws->width
- && y - shadow < ev->y_root && ev->y_root < y + ws->height);
+ && y - shadow < ev->y_root && ev->y_root < y + ws->height);
}
static Boolean
int i;
XPoint relative_pos;
window_state* ws;
+ int inside = 0;
*val = NULL;
ws = &mw->menu.windows [i];
if (ws && motion_event_is_in_menu (mw, ev, i, &relative_pos))
{
+ inside = 1;
display_menu (mw, i, True, NULL, &relative_pos, val, NULL, NULL);
if (*val)
}
}
}
+
+ if (!inside)
+ {
+ if (mw->menu.inside_entry != NULL)
+ XtCallCallbackList ((Widget)mw, mw->menu.leave,
+ (XtPointer) mw->menu.inside_entry);
+ mw->menu.inside_entry = NULL;
+ }
+
return False;
}
XlwMenuWidget mw;
{
XGCValues xgcv;
+ float scale;
+ XtGCMask mask = GCForeground | GCBackground;
+#ifdef HAVE_X_I18N
+ if (!mw->menu.fontSet)
+ {
+ xgcv.font = mw->menu.font->fid;
+ mask |= GCFont;
+ }
+#else
xgcv.font = mw->menu.font->fid;
+ mask |= GCFont;
+#endif
xgcv.foreground = mw->menu.foreground;
xgcv.background = mw->core.background_pixel;
- mw->menu.foreground_gc = XtGetGC ((Widget)mw,
- GCFont | GCForeground | GCBackground,
- &xgcv);
+ mw->menu.foreground_gc = XtGetGC ((Widget)mw, mask, &xgcv);
- xgcv.font = mw->menu.font->fid;
xgcv.foreground = mw->menu.button_foreground;
- xgcv.background = mw->core.background_pixel;
- mw->menu.button_gc = XtGetGC ((Widget)mw,
- GCFont | GCForeground | GCBackground,
- &xgcv);
+ mw->menu.button_gc = XtGetGC ((Widget)mw, mask, &xgcv);
- xgcv.font = mw->menu.font->fid;
- xgcv.foreground = mw->menu.foreground;
xgcv.background = mw->core.background_pixel;
- xgcv.fill_style = FillStippled;
- xgcv.stipple = mw->menu.gray_pixmap;
- mw->menu.inactive_gc = XtGetGC ((Widget)mw,
- (GCFont | GCForeground | GCBackground
- | GCFillStyle | GCStipple), &xgcv);
- xgcv.font = mw->menu.font->fid;
+#define BRIGHTNESS(color) (((color) & 0xff) + (((color) >> 8) & 0xff) + (((color) >> 16) & 0xff))
+
+ /* Allocate color for disabled menu-items. */
+ mw->menu.disabled_foreground = mw->menu.foreground;
+ if (BRIGHTNESS(mw->menu.foreground) < BRIGHTNESS(mw->core.background_pixel))
+ scale = 2.3;
+ else
+ scale = 0.55;
+
+ x_alloc_lighter_color_for_widget ((Widget) mw, XtDisplay ((Widget) mw),
+ mw->core.colormap,
+ &mw->menu.disabled_foreground,
+ scale,
+ 0x8000);
+
+ if (mw->menu.foreground == mw->menu.disabled_foreground
+ || mw->core.background_pixel == mw->menu.disabled_foreground)
+ {
+ /* Too few colors, use stipple. */
+ xgcv.foreground = mw->menu.foreground;
+ xgcv.fill_style = FillStippled;
+ xgcv.stipple = mw->menu.gray_pixmap;
+ mw->menu.disabled_gc = XtGetGC ((Widget)mw, mask
+ | GCFillStyle | GCStipple, &xgcv);
+ }
+ else
+ {
+ /* Many colors available, use disabled pixel. */
+ xgcv.foreground = mw->menu.disabled_foreground;
+ mw->menu.disabled_gc = XtGetGC ((Widget)mw, mask, &xgcv);
+ }
+
xgcv.foreground = mw->menu.button_foreground;
xgcv.background = mw->core.background_pixel;
xgcv.fill_style = FillStippled;
xgcv.stipple = mw->menu.gray_pixmap;
- mw->menu.inactive_button_gc = XtGetGC ((Widget)mw,
- (GCFont | GCForeground | GCBackground
- | GCFillStyle | GCStipple), &xgcv);
+ mw->menu.inactive_button_gc = XtGetGC ((Widget)mw, mask
+ | GCFillStyle | GCStipple, &xgcv);
- xgcv.font = mw->menu.font->fid;
xgcv.foreground = mw->core.background_pixel;
xgcv.background = mw->menu.foreground;
- mw->menu.background_gc = XtGetGC ((Widget)mw,
- GCFont | GCForeground | GCBackground,
- &xgcv);
+ mw->menu.background_gc = XtGetGC ((Widget)mw, mask, &xgcv);
}
static void
{
XtReleaseGC ((Widget) mw, mw->menu.foreground_gc);
XtReleaseGC ((Widget) mw, mw->menu.button_gc);
- XtReleaseGC ((Widget) mw, mw->menu.inactive_gc);
+ XtReleaseGC ((Widget) mw, mw->menu.disabled_gc);
XtReleaseGC ((Widget) mw, mw->menu.inactive_button_gc);
XtReleaseGC ((Widget) mw, mw->menu.background_gc);
/* let's get some segvs if we try to use these... */
mw->menu.foreground_gc = (GC) -1;
mw->menu.button_gc = (GC) -1;
- mw->menu.inactive_gc = (GC) -1;
+ mw->menu.disabled_gc = (GC) -1;
mw->menu.inactive_button_gc = (GC) -1;
mw->menu.background_gc = (GC) -1;
}
Cardinal *num_args;
{
/* Get the GCs and the widget size */
- XSetWindowAttributes xswa;
- int mask;
Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw)));
Display* display = XtDisplay (mw);
Can anyone find a real fix? -- rms. */
if (mw->menu.font == 0)
mw->menu.font = xlwmenu_default_font;
-
+#ifdef HAVE_X_I18N
+ if (mw->menu.fontSet)
+ mw->menu.font_extents = XExtentsOfFontSet (mw->menu.fontSet);
+#endif
+
make_drawing_gcs (mw);
make_shadow_gcs (mw);
- xswa.background_pixel = mw->core.background_pixel;
- xswa.border_pixel = mw->core.border_pixel;
- mask = CWBackPixel | CWBorderPixel;
-
mw->menu.popped_up = False;
mw->menu.old_depth = 1;
xswa.save_under = True;
xswa.cursor = mw->menu.cursor_shape;
mask = CWSaveUnder | CWCursor;
+ /* I sometimes get random BadCursor errors while creating the first
+ frame on a display. I can not find their reason, but they are
+ annoying so for now let's ignore any errors here. -- lorentey */
+#ifdef emacs
+ x_catch_errors (XtDisplay (w));
+#endif
XChangeWindowAttributes (XtDisplay (w), XtWindow (w), mask, &xswa);
+#ifdef emacs
+ x_uncatch_errors ();
+#endif
mw->menu.windows [0].window = XtWindow (w);
mw->menu.windows [0].x = w->core.x;
XlwMenuWidget mw = (XlwMenuWidget) w;
if (pointer_grabbed)
- XtUngrabPointer ((Widget)w, CurrentTime);
+ ungrab_all ((Widget)w, CurrentTime);
pointer_grabbed = 0;
submenu_destroyed = 1;
if (newmw->core.background_pixel != oldmw->core.background_pixel
|| newmw->menu.foreground != oldmw->menu.foreground
- || newmw->menu.font != oldmw->menu.font)
+#ifdef HAVE_X_I18N
+ || newmw->menu.fontSet != oldmw->menu.fontSet
+ || (newmw->menu.fontSet == NULL && newmw->menu.font != oldmw->menu.font)
+#else
+ || newmw->menu.font != oldmw->menu.font
+#endif
+ )
{
release_drawing_gcs (newmw);
make_drawing_gcs (newmw);
}
}
+#ifdef HAVE_X_I18N
+ if (newmw->menu.fontSet != oldmw->menu.fontSet && newmw->menu.fontSet != NULL)
+ {
+ redisplay = True;
+ newmw->menu.font_extents = XExtentsOfFontSet (newmw->menu.fontSet);
+ }
+#endif
+
return redisplay;
}
if (!mw->menu.popped_up)
{
menu_post_event = *ev;
+ /* If event is set to CurrentTime, get the last known time stamp.
+ This is for calculating if (popup) menus should stay up after
+ a fast click. */
+ if (menu_post_event.xbutton.time == CurrentTime)
+ menu_post_event.xbutton.time
+ = XtLastTimestampProcessed (XtDisplay (w));
+
pop_up_menu (mw, (XButtonPressedEvent*) ev);
}
else
mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y;
/* handles the down like a move, slots are compatible */
+ ev->xmotion.is_hint = 0;
handle_motion_event (mw, &ev->xmotion);
}
}
{
}
-widget_value *
-find_first_selectable (mw, item)
+static widget_value *
+find_first_selectable (mw, item, skip_titles)
XlwMenuWidget mw;
widget_value *item;
+ int skip_titles;
{
widget_value *current = item;
enum menu_separator separator;
- while (lw_separator_p (current->name, &separator, 0) || !current->enabled)
+ while (lw_separator_p (current->name, &separator, 0) || !current->enabled
+ || (skip_titles && !current->call_data && !current->contents))
if (current->next)
current=current->next;
else
- return NULL;
+ return NULL;
return current;
}
-widget_value *
-find_next_selectable (mw, item)
+static widget_value *
+find_next_selectable (mw, item, skip_titles)
XlwMenuWidget mw;
widget_value *item;
+ int skip_titles;
{
widget_value *current = item;
enum menu_separator separator;
while (current->next && (current=current->next) &&
- (lw_separator_p (current->name, &separator, 0) || !current->enabled))
+ (lw_separator_p (current->name, &separator, 0) || !current->enabled
+ || (skip_titles && !current->call_data && !current->contents)))
;
if (current == item)
{
+ if (mw->menu.old_depth < 2)
+ return current;
current = mw->menu.old_stack [mw->menu.old_depth - 2]->contents;
- while (lw_separator_p (current->name, &separator, 0) || !current->enabled)
+ while (lw_separator_p (current->name, &separator, 0)
+ || !current->enabled
+ || (skip_titles && !current->call_data
+ && !current->contents))
{
if (current->next)
current=current->next;
return current;
}
-widget_value *
-find_prev_selectable (mw, item)
+static widget_value *
+find_prev_selectable (mw, item, skip_titles)
XlwMenuWidget mw;
widget_value *item;
+ int skip_titles;
{
widget_value *current = item;
widget_value *prev = item;
- while ((current=find_next_selectable (mw, current)) != item)
+ while ((current=find_next_selectable (mw, current, skip_titles))
+ != item)
{
if (prev == current)
break;
{
XlwMenuWidget mw = (XlwMenuWidget) w;
widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1];
+ int popup_menu_p = mw->menu.top_depth == 1;
/* Inside top-level menu-bar? */
- if (mw->menu.old_depth == 2)
+ if (mw->menu.old_depth == mw->menu.top_depth)
/* When <down> in the menu-bar is pressed, display the corresponding
- sub-menu and select the first selectable menu item there. */
- set_new_state (mw, find_first_selectable (mw, selected_item->contents), mw->menu.old_depth);
+ sub-menu and select the first selectable menu item there.
+ If this is a popup menu, skip title item of the popup. */
+ set_new_state (mw,
+ find_first_selectable (mw,
+ selected_item->contents,
+ popup_menu_p),
+ mw->menu.old_depth);
else
/* Highlight next possible (enabled and not separator) menu item. */
- set_new_state (mw, find_next_selectable (mw, selected_item), mw->menu.old_depth - 1);
+ set_new_state (mw, find_next_selectable (mw, selected_item, popup_menu_p),
+ mw->menu.old_depth - 1);
remap_menubar (mw);
}
{
XlwMenuWidget mw = (XlwMenuWidget) w;
widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1];
+ int popup_menu_p = mw->menu.top_depth == 1;
/* Inside top-level menu-bar? */
- if (mw->menu.old_depth == 2)
+ if (mw->menu.old_depth == mw->menu.top_depth)
{
/* FIXME: this is tricky. <up> in the menu-bar should select the
last selectable item in the list. So we select the first
selectable one and find the previous selectable item. Is there
a better way? */
- set_new_state (mw, find_first_selectable (mw, selected_item->contents), mw->menu.old_depth);
+ /* If this is a popup menu, skip title item of the popup. */
+ set_new_state (mw,
+ find_first_selectable (mw,
+ selected_item->contents,
+ popup_menu_p),
+ mw->menu.old_depth);
remap_menubar (mw);
selected_item = mw->menu.old_stack [mw->menu.old_depth - 1];
- set_new_state (mw, find_prev_selectable (mw, selected_item), mw->menu.old_depth - 1);
+ set_new_state (mw,
+ find_prev_selectable (mw,
+ selected_item,
+ popup_menu_p),
+ mw->menu.old_depth - 1);
}
else
/* Highlight previous (enabled and not separator) menu item. */
- set_new_state (mw, find_prev_selectable (mw, selected_item), mw->menu.old_depth - 1);
+ set_new_state (mw, find_prev_selectable (mw, selected_item, popup_menu_p),
+ mw->menu.old_depth - 1);
remap_menubar (mw);
}
-static void
+void
Left (w, ev, params, num_params)
Widget w;
XEvent *ev;
widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1];
/* Inside top-level menu-bar? */
- if (mw->menu.old_depth == 2)
+ if (mw->menu.old_depth == mw->menu.top_depth)
/* When <left> in the menu-bar is pressed, display the previous item on
the menu-bar. If the current item is the first one, highlight the
last item in the menubar (probably Help). */
- set_new_state (mw, find_prev_selectable (mw, selected_item), mw->menu.old_depth - 1);
+ set_new_state (mw, find_prev_selectable (mw, selected_item, 0),
+ mw->menu.old_depth - 1);
+ else if (mw->menu.old_depth == 1
+ && selected_item->contents) /* Is this menu item expandable? */
+ {
+ set_new_state (mw, selected_item->contents, mw->menu.old_depth);
+ remap_menubar (mw);
+ selected_item = mw->menu.old_stack [mw->menu.old_depth - 1];
+ if (!selected_item->enabled && find_first_selectable (mw,
+ selected_item,
+ 0))
+ set_new_state (mw, find_first_selectable (mw, selected_item, 0),
+ mw->menu.old_depth - 1);
+ }
+
else
{
pop_new_stack_if_no_contents (mw);
- set_new_state (mw, mw->menu.old_stack [mw->menu.old_depth - 2], mw->menu.old_depth - 2);
+ set_new_state (mw, mw->menu.old_stack [mw->menu.old_depth - 2],
+ mw->menu.old_depth - 2);
}
remap_menubar (mw);
}
-static void
+void
Right (w, ev, params, num_params)
Widget w;
XEvent *ev;
widget_value* selected_item = mw->menu.old_stack [mw->menu.old_depth - 1];
/* Inside top-level menu-bar? */
- if (mw->menu.old_depth == 2)
+ if (mw->menu.old_depth == mw->menu.top_depth)
/* When <right> in the menu-bar is pressed, display the next item on
the menu-bar. If the current item is the last one, highlight the
first item (probably File). */
- set_new_state (mw, find_next_selectable (mw, selected_item), mw->menu.old_depth - 1);
+ set_new_state (mw, find_next_selectable (mw, selected_item, 0),
+ mw->menu.old_depth - 1);
else if (selected_item->contents) /* Is this menu item expandable? */
{
set_new_state (mw, selected_item->contents, mw->menu.old_depth);
remap_menubar (mw);
selected_item = mw->menu.old_stack [mw->menu.old_depth - 1];
- if (!selected_item->enabled && find_first_selectable (mw, selected_item))
- set_new_state (mw, find_first_selectable (mw, selected_item), mw->menu.old_depth - 1);
+ if (!selected_item->enabled && find_first_selectable (mw,
+ selected_item,
+ 0))
+ set_new_state (mw, find_first_selectable (mw, selected_item, 0),
+ mw->menu.old_depth - 1);
}
else
{
pop_new_stack_if_no_contents (mw);
- set_new_state (mw, mw->menu.old_stack [mw->menu.old_depth - 2], mw->menu.old_depth - 2);
+ set_new_state (mw, mw->menu.old_stack [mw->menu.old_depth - 2],
+ mw->menu.old_depth - 2);
}
remap_menubar (mw);
if (mw->menu.popped_up)
{
mw->menu.popped_up = False;
- XtUngrabPointer ((Widget)mw, ev->xmotion.time);
+ ungrab_all ((Widget)mw, ev->xmotion.time);
if (XtIsShell (XtParent ((Widget) mw)))
XtPopdown (XtParent ((Widget) mw));
else
if (mw->menu.popped_up)
{
mw->menu.popped_up = False;
- XtUngrabPointer ((Widget)mw, ev->xmotion.time);
+ ungrab_all ((Widget)mw, ev->xmotion.time);
if (XtIsShell (XtParent ((Widget) mw)))
XtPopdown (XtParent ((Widget) mw));
else
\f/* Special code to pop-up a menu */
-void
+static void
pop_up_menu (mw, event)
XlwMenuWidget mw;
XButtonPressedEvent* event;
int borderwidth = mw->menu.shadow_thickness;
Screen* screen = XtScreen (mw);
Display *display = XtDisplay (mw);
- int count;
next_release_must_exit = 0;
+ mw->menu.inside_entry = NULL;
XtCallCallbackList ((Widget)mw, mw->menu.open, NULL);
if (XtIsShell (XtParent ((Widget)mw)))
display_menu (mw, 0, False, NULL, NULL, NULL, NULL, NULL);
mw->menu.windows [0].x = x + borderwidth;
mw->menu.windows [0].y = y + borderwidth;
+ mw->menu.top_depth = 1; /* Popup menus don't have a bar so top is 1 */
}
else
{
/* notes the absolute position of the menubar window */
mw->menu.windows [0].x = ev->xmotion.x_root - ev->xmotion.x;
mw->menu.windows [0].y = ev->xmotion.y_root - ev->xmotion.y;
+ mw->menu.top_depth = 2;
}
#ifdef emacs
- count = x_catch_errors (display);
+ x_catch_errors (display);
#endif
- XtGrabPointer ((Widget)mw, False,
- (PointerMotionMask
- | PointerMotionHintMask
- | ButtonReleaseMask
- | ButtonPressMask),
- GrabModeAsync, GrabModeAsync, None,
- mw->menu.cursor_shape,
- event->time);
- pointer_grabbed = 1;
+ if (XtGrabPointer ((Widget)mw, False,
+ (PointerMotionMask
+ | PointerMotionHintMask
+ | ButtonReleaseMask
+ | ButtonPressMask),
+ GrabModeAsync, GrabModeAsync, None,
+ mw->menu.cursor_shape,
+ event->time) == Success)
+ {
+ if (! GRAB_KEYBOARD
+ || XtGrabKeyboard ((Widget)mw, False, GrabModeAsync,
+ GrabModeAsync, event->time) == Success)
+ {
+ XtSetKeyboardFocus((Widget)mw, None);
+ pointer_grabbed = 1;
+ }
+ else
+ XtUngrabPointer ((Widget)mw, event->time);
+ }
+
#ifdef emacs
if (x_had_errors_p (display))
{
pointer_grabbed = 0;
XtUngrabPointer ((Widget)mw, event->time);
}
- x_uncatch_errors (display, count);
+ x_uncatch_errors ();
#endif
+ ((XMotionEvent*)event)->is_hint = 0;
handle_motion_event (mw, (XMotionEvent*)event);
}
+
+/* arch-tag: 657f43dd-dfd0-4cc9-910c-52935f01176e
+ (do not change this comment) */
HCoop / bpt / emacs.git / blobdiff