/* X Communication module for terminals which understand the X protocol.
- Copyright (C) 1986, 1988, 1992 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1988, 1993 Free Software Foundation, Inc.
This file is part of GNU Emacs.
/* On 4.3 this loses if it comes after xterm.h. */
#include <signal.h>
-#include "config.h"
+#include <config.h>
#include "lisp.h"
#include "frame.h"
#include "window.h"
#include "keyboard.h"
+#include "blockinput.h"
/* This may include sys/types.h, and that somehow loses
if this is not done before the other system files. */
#ifndef TRUE
#define TRUE 1
#define FALSE 0
-#endif TRUE
+#endif /* TRUE */
#ifdef HAVE_X11
extern Display *x_current_display;
#define ButtonReleaseMask ButtonReleased
#endif /* not HAVE_X11 */
-Lisp_Object Qmenu_enable;
+extern Lisp_Object Qmenu_enable;
Lisp_Object xmenu_show ();
extern int x_error_handler ();
\(STRING . REAL-DEFINITION). To give the menu a title, put a string into\n\
the keymap as a top-level element.\n\n\
You can also use a list of keymaps as MENU.\n\
- Then each keymap makes a separate pane.\n\n\
+ Then each keymap makes a separate pane.\n\
+When MENU is a keymap or a list of keymaps, the return value\n\
+is a list of events.\n\n\
Alternatively, you can specify a menu of multiple panes\n\
- with a list of the form\n\
-\(TITLE PANE1 PANE2...), where each pane is a list of form\n\
-\(TITLE (LINE ITEM)...). Each line should be a string, and item should\n\
-be the return value for that line (i.e. if it is selected).")
+ with a list of the form (TITLE PANE1 PANE2...),\n\
+where each pane is a list of form (TITLE ITEM1 ITEM2...).\n\
+Each ITEM is normally a cons cell (STRING . VALUE);\n\
+but a string can appear as an item--that makes a nonselectable line\n\
+in the menu.\n\
+With this form of menu, the return value is VALUE from the chosen item.")
(position, menu)
Lisp_Object position, menu;
{
char ***names;
int **enables;
Lisp_Object **obj_list;
+ Lisp_Object *prefixes;
int *items;
char *title;
char *error_name;
XMenu_xpos = FONT_WIDTH (f->display.x->font) * XWINDOW (window)->left;
XMenu_ypos = FONT_HEIGHT (f->display.x->font) * XWINDOW (window)->top;
}
+ else
+ /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
+ but I don't want to make one now. */
+ CHECK_WINDOW (window, 0);
+
+#ifdef HAVE_X11
+ {
+ Window child;
+ int win_x = 0, win_y = 0;
+
+ /* Find the position of the outside upper-left corner of
+ the inner window, with respect to the outer window. */
+ if (f->display.x->parent_desc != ROOT_WINDOW)
+ {
+ BLOCK_INPUT;
+ XTranslateCoordinates (x_current_display,
+
+ /* From-window, to-window. */
+ f->display.x->window_desc,
+ f->display.x->parent_desc,
+
+ /* From-position, to-position. */
+ 0, 0, &win_x, &win_y,
+
+ /* Child of window. */
+ &child);
+ UNBLOCK_INPUT;
+ XMenu_xpos += win_x;
+ XMenu_ypos += win_y;
+ }
+ }
+#endif
XMenu_xpos += FONT_WIDTH (f->display.x->font) * XINT (x);
XMenu_ypos += FONT_HEIGHT (f->display.x->font) * XINT (y);
/* Extract the detailed info to make one pane. */
number_of_panes = keymap_panes (&obj_list, &menus, &names, &enables,
- &items, &menu, 1);
+ &items, &prefixes, &menu, 1);
/* The menu title seems to be ignored,
so put it in the pane title. */
if (menus[0] == 0)
/* Extract the detailed info to make one pane. */
number_of_panes = keymap_panes (&obj_list, &menus, &names, &enables,
- &items, maps, nmaps);
+ &items, &prefixes, maps, nmaps);
/* The menu title seems to be ignored,
so put it in the pane title. */
if (menus[0] == 0)
ltitle = Fcar (menu);
CHECK_STRING (ltitle, 1);
title = (char *) XSTRING (ltitle)->data;
+ prefixes = 0;
number_of_panes = list_of_panes (&obj_list, &menus, &names, &enables,
&items, Fcdr (menu));
}
abort ();
selection = xmenu_show (root, XMenu_xpos, XMenu_ypos, names, enables,
- menus, items, number_of_panes, obj_list, title,
- &error_name);
+ menus, prefixes, items, number_of_panes, obj_list,
+ title, &error_name);
}
UNBLOCK_INPUT;
/* fprintf (stderr, "selection = %x\n", selection); */
/* now free up the strings */
for (i = 0; i < number_of_panes; i++)
{
- free (names[i]);
- free (enables[i]);
- free (obj_list[i]);
+ xfree (names[i]);
+ xfree (enables[i]);
+ xfree (obj_list[i]);
}
- free (menus);
- free (obj_list);
- free (names);
- free (enables);
- free (items);
+ xfree (menus);
+ xfree (obj_list);
+ xfree (names);
+ xfree (enables);
+ xfree (items);
/* free (title); */
if (error_name) error (error_name);
return XMenu_return;
Lisp_Object
xmenu_show (parent, startx, starty, line_list, enable_list, pane_list,
- line_cnt, pane_cnt, item_list, title, error)
+ prefixes, line_cnt, pane_cnt, item_list, title, error)
Window parent;
int startx, starty; /* upper left corner position BROKEN */
char **line_list[]; /* list of strings for items */
int *enable_list[]; /* list of strings for items */
char *pane_list[]; /* list of pane titles */
+ Lisp_Object *prefixes; /* Prefix key for each pane */
char *title;
int pane_cnt; /* total number of panes */
Lisp_Object *item_list[]; /* All items */
int ulx, uly, width, height;
int dispwidth, dispheight;
+ *error = 0;
if (pane_cnt == 0)
return 0;
+ BLOCK_INPUT;
*error = (char *) 0; /* Initialize error pointer to null */
GXMenu = XMenuCreate (XDISPLAY parent, "emacs");
if (GXMenu == NUL)
{
*error = "Can't create menu";
+ UNBLOCK_INPUT;
return (0);
}
{
XMenuDestroy (XDISPLAY GXMenu);
*error = "Can't create pane";
+ UNBLOCK_INPUT;
return (0);
}
for (selidx = 0; selidx < line_cnt[panes]; selidx++)
/* free (datap); */
*error = "Can't add selection to menu";
/* error ("Can't add selection to menu"); */
+ UNBLOCK_INPUT;
return (0);
}
}
fprintf (stderr, "pane= %d line = %d\n", panes, selidx);
#endif
entry = item_list[panes][selidx];
+ if (prefixes != 0)
+ {
+ entry = Fcons (entry, Qnil);
+ if (!NILP (prefixes[panes]))
+ entry = Fcons (prefixes[panes], entry);
+ }
break;
case XM_FAILURE:
/* free (datap_save); */
break;
}
XMenuDestroy (XDISPLAY GXMenu);
+ UNBLOCK_INPUT;
/* free (datap_save);*/
return (entry);
}
syms_of_xmenu ()
{
- Qmenu_enable = intern ("menu-enable");
-
- staticpro (&Qmenu_enable);
defsubr (&Sx_popup_menu);
}
\f
KEYMAPS is a vector of keymaps. NMAPS gives the length of KEYMAPS. */
int
-keymap_panes (vector, panes, names, enables, items, keymaps, nmaps)
+keymap_panes (vector, panes, names, enables, items, prefixes, keymaps, nmaps)
Lisp_Object ***vector; /* RETURN all menu objects */
char ***panes; /* RETURN pane names */
char ****names; /* RETURN all line names */
int ***enables; /* RETURN enable-flags of lines */
int **items; /* RETURN number of items per pane */
+ Lisp_Object **prefixes; /* RETURN vector of prefix keys, per pane */
Lisp_Object *keymaps;
int nmaps;
{
*items = (int *) xmalloc (npanes_allocated * sizeof (int));
*names = (char ***) xmalloc (npanes_allocated * sizeof (char **));
*enables = (int **) xmalloc (npanes_allocated * sizeof (int *));
+ *prefixes = (Lisp_Object *) xmalloc (npanes_allocated * sizeof (Lisp_Object));
/* Loop over the given keymaps, making a pane for each map.
But don't make a pane that is empty--ignore that map instead.
P is the number of panes we have made so far. */
for (mapno = 0; mapno < nmaps; mapno++)
single_keymap_panes (keymaps[mapno], panes, vector, names, enables, items,
- &p, &npanes_allocated, "");
+ prefixes, &p, &npanes_allocated, "");
/* Return the number of panes. */
return p;
The other arguments are passed along
or point to local variables of the previous function. */
-single_keymap_panes (keymap, panes, vector, names, enables, items,
+single_keymap_panes (keymap, panes, vector, names, enables, items, prefixes,
p_ptr, npanes_allocated_ptr, pane_name)
Lisp_Object keymap;
Lisp_Object ***vector; /* RETURN all menu objects */
char ****names; /* RETURN all line names */
int ***enables; /* RETURN enable flags of lines */
int **items; /* RETURN number of items per pane */
+ Lisp_Object **prefixes; /* RETURN vector of prefix keys, per pane */
int *p_ptr;
int *npanes_allocated_ptr;
char *pane_name;
*items
= (int *) xrealloc (*items,
*npanes_allocated_ptr * sizeof (int));
+ *prefixes
+ = (Lisp_Object *) xrealloc (*prefixes,
+ (*npanes_allocated_ptr
+ * sizeof (Lisp_Object)));
*names
= (char ***) xrealloc (*names,
*npanes_allocated_ptr * sizeof (char **));
/* When a menu comes from keymaps, don't give names to the panes. */
(*panes)[*p_ptr] = pane_name;
+ /* Normally put nil as pane's prefix key.
+ Caller will override this if appropriate. */
+ (*prefixes)[*p_ptr] = Qnil;
+
/* Get the length of the list level of the keymap. */
i = XFASTINT (Flength (keymap));
}
tem = Fkeymapp (def);
if (XSTRING (item2)->data[0] == '@' && !NILP (tem))
- pending_maps = Fcons (Fcons (def, item2),
+ pending_maps = Fcons (Fcons (def, Fcons (item2, XCONS (item)->car)),
pending_maps);
else
{
/* The menu item "value" is the key bound here. */
(*vector)[*p_ptr][i] = XCONS (item)->car;
(*enables)[*p_ptr][i]
- = (!NILP (enabled) ? 1
- : NILP (def) ? -1 : 0);
+ = (NILP (def) ? -1 : !NILP (enabled) ? 1 : 0);
i++;
}
}
tem = Fkeymapp (def);
if (XSTRING (item2)->data[0] == '@' && !NILP (tem))
- pending_maps = Fcons (Fcons (def, item2),
+ pending_maps = Fcons (Fcons (def, Fcons (item2, character)),
pending_maps);
else
{
/* The menu item "value" is the key bound here. */
(*vector)[*p_ptr][i] = character;
(*enables)[*p_ptr][i]
- = (!NILP (enabled) ? 1
- : NILP (def) ? -1 : 0);
+ = (NILP (def) ? -1 : !NILP (enabled) ? 1 : 0);
i++;
}
}
/* If we just made an empty pane, get rid of it. */
if (i == 0)
{
- free ((*vector)[*p_ptr]);
- free ((*names)[*p_ptr]);
- free ((*enables)[*p_ptr]);
+ xfree ((*vector)[*p_ptr]);
+ xfree ((*names)[*p_ptr]);
+ xfree ((*enables)[*p_ptr]);
}
/* Otherwise, advance past it. */
else
/* Process now any submenus which want to be panes at this level. */
while (!NILP (pending_maps))
{
- Lisp_Object elt;
+ Lisp_Object elt, eltcdr;
+ int panenum = *p_ptr;
elt = Fcar (pending_maps);
+ eltcdr = XCONS (elt)->cdr;
single_keymap_panes (Fcar (elt), panes, vector, names, enables, items,
- p_ptr, npanes_allocated_ptr,
+ prefixes, p_ptr, npanes_allocated_ptr,
/* Add 1 to discard the @. */
- (char *) XSTRING (XCONS (elt)->cdr)->data + 1);
+ (char *) XSTRING (XCONS (eltcdr)->car)->data + 1);
+ (*prefixes)[panenum] = XCONS (eltcdr)->cdr;
pending_maps = Fcdr (pending_maps);
}
}
for (i = 0, tail = pane; !NILP (tail); tail = Fcdr (tail), i++)
{
item = Fcar (tail);
- if (XTYPE (item) != Lisp_Cons) (void) wrong_type_argument (Qlistp, item);
-#ifdef XDEBUG
- fprintf (stderr, "list_of_items check tail, i=%d\n", i);
-#endif
- (*vector)[i] = Fcdr (item);
- item1 = Fcar (item);
- CHECK_STRING (item1, 1);
-#ifdef XDEBUG
- fprintf (stderr, "list_of_items check item, i=%d%s\n", i,
- XSTRING (item1)->data);
-#endif
- (*names)[i] = (char *) XSTRING (item1)->data;
- (*enables)[i] = 1;
+ if (STRINGP (item))
+ {
+ (*vector)[i] = Qnil;
+ (*names)[i] = (char *) XSTRING (item)->data;
+ (*enables)[i] = -1;
+ }
+ else
+ {
+ CHECK_CONS (item, 0);
+ (*vector)[i] = Fcdr (item);
+ item1 = Fcar (item);
+ CHECK_STRING (item1, 1);
+ (*names)[i] = (char *) XSTRING (item1)->data;
+ (*enables)[i] = 1;
+ }
}
return i;
}
HCoop / bpt / emacs.git / blobdiff