#include <config.h>
#endif
-#include "../src/lisp.h"
+#include "lisp.h"
#include <stdio.h>
static void Key();
static void Nothing();
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},
};
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;
{
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);
}
Cardinal *num_args;
{
/* Get the GCs and the widget size */
- XSetWindowAttributes xswa;
- int mask;
Window window = RootWindowOfScreen (DefaultScreenOfDisplay (XtDisplay (mw)));
Display* display = XtDisplay (mw);
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;
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
{
}
-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;
{
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)
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;
{
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);
\f/* Special code to pop-up a menu */
-void
+static void
pop_up_menu (mw, event)
XlwMenuWidget mw;
XButtonPressedEvent* event;
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
handle_motion_event (mw, (XMotionEvent*)event);
}
+
+/* arch-tag: 657f43dd-dfd0-4cc9-910c-52935f01176e
+ (do not change this comment) */