Changeset 1709

Timestamp:

02/17/98 01:45:20 (11 years ago)

Author:

himi

Message:

Emacs 20.3.5 FSF import

Files:

• branches/GNU/src/x-list-font.c (added)
• branches/GNU/src/xmenu.c (modified) (73 diffs)
• branches/GNU/src/xselect.c (modified) (83 diffs)

branches/GNU/src/xmenu.c

@@ -1 +1 @@
-/* X Communication module for terminals which understand the X protocol.
-
-
+
-
-This file is part of GNU Emacs.
@@ -32 +31 @@
-/* Rewritten for clarity and GC protection by rms in Feb 94.  */
-
-#include <config.h>
-
-/* On 4.3 this loses if it comes after xterm.h.  */
-#include <signal.h>
+#include <config.h>
-
-#include <stdio.h>
-#include "lisp.h"
-#include "termhooks.h"
-#include "keyboard.h"
-#include "frame.h"
-#include "window.h"
+#include "keyboard.h"
-#include "blockinput.h"
-#include "buffer.h"
@@ -67 +65 @@
-#undef HAVE_MULTILINGUAL_MENU
-#ifdef USE_X_TOOLKIT
-#include "widget.h"
-#include <X11/Xlib.h>
-#include <X11/IntrinsicP.h>
@@ -115 +112 @@
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-/* This holds a Lisp vector that holds the results of decoding
@@ -162 +145 @@
-#define MENU_ITEMS_PANE_LENGTH 3
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-static Lisp_Object menu_items;
@@ -192 +169 @@
-/* Flag which when set indicates a dialog or menu has been posted by
-   Xt on behalf of one of the widget sets.  */
-
+static 
-
-static int next_menubar_widget_id;
@@ -216 +193 @@
-  FRAME_PTR f;
-
-DR (tail)
-
-AR (tail)
+ONS (tail)->cdr
+
+ONS (tail)->car
-      if (!GC_FRAMEP (frame))
-        continue;
-      f = XFRAME (frame);
-!FRAME_WINDOW_P (f)
+f->output_data.nothing == 1
-        continue;
-      if (f->output_data.x->id == id)
@@ -339 +316 @@
-}
-
-  NAME is the string to
-display.  ENABLE if non-nil means this item can be selected.  KEY
-is the key generated by choosing this item, or nil if this item
-doesn't really have a definition.  DEF is the definition of this
-item.  EQUIV is the textual description of the keyboard equivalent
-for this item (or nil if none).  TYPE is the type of this menu
-item, one of nil, `toggle' or `radio'.
+
+NAME is the string to display.  ENABLE if non-nil means
+this item can be selected.  KEY is the key generated by
+choosing this item, or nil if this item doesn't really have a definition.
+DEF is the definition of this item.
+EQUIV is the textual description of the keyboard equivalent for
+this item (or nil if none). 
-
-static void
-, type, selected, help
-, type, selected, help
+
+
-{
-  if (menu_items_used + MENU_ITEMS_ITEM_LENGTH > menu_items_allocated)
@@ -359 +336 @@
-  XVECTOR (menu_items)->contents[menu_items_used++] = equiv;
-  XVECTOR (menu_items)->contents[menu_items_used++] = def;
-  XVECTOR (menu_items)->contents[menu_items_used++] = type;
-  XVECTOR (menu_items)->contents[menu_items_used++] = selected;
-  XVECTOR (menu_items)->contents[menu_items_used++] = help;
-}
-
@@ -383 +357 @@
-     P is the number of panes we have made so far.  */
-  for (mapno = 0; mapno < nmaps; mapno++)
-
-
+
-
-  finish_menu_items ();
@@ -424 +397 @@
-#endif
-
-DR (tail)
+ONS (tail)->cdr
-    {
-      GCPRO2 (keymap, pending_maps);
-      /* Look at each key binding, and if it is a menu item add it
-         to this menu.  */
-AR (tail)
+ONS (tail)->car
-      if (CONSP (item))
-AR (item), XCDR (item)
+ONS (item)->car, XCONS (item)->cdr
-                          &pending_maps, notreal, maxdepth, &notbuttons);
-      else if (VECTORP (item))
@@ -454 +427 @@
-      Lisp_Object elt, eltcdr, string;
-      elt = Fcar (pending_maps);
-DR (elt)
-AR (eltcdr)
+ONS (elt)->cdr
+ONS (eltcdr)->car
-      /* We no longer discard the @ from the beginning of the string here.
-         Instead, we do this in xmenu_show.  */
-      single_keymap_panes (Fcar (elt), string,
-DR (eltcdr)
+ONS (eltcdr)->cdr
-      pending_maps = Fcdr (pending_maps);
-    }
@@ -484 +457 @@
-     int *notbuttons_ptr;
-{
-
+def, 
-  struct gcpro gcpro1, gcpro2;
-  int res;
@@ -589 +562 @@
-  push_menu_item (item_string, enabled, key,
-                  XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF],
-
-
-
-
+
-
-#ifdef USE_X_TOOLKIT
@@ -644 +614 @@
-      item = Fcar (tail);
-      if (STRINGP (item))
-, Qnil, Qnil, Qnil
+
-      else if (NILP (item))
-        push_left_right_boundary ();
@@ -652 +622 @@
-          item1 = Fcar (item);
-          CHECK_STRING (item1, 1);
-, Qnil, Qnil, Qnil
+
-        }
-    }
@@ -693 +663 @@
-     Lisp_Object position, menu;
-{
+  int number_of_panes, panes;
-  Lisp_Object keymap, tem;
- = 0, ypos = 0
+, ypos
-  Lisp_Object title;
-  char *error_name;
-  Lisp_Object selection;
-
+
+
-  Lisp_Object x, y, window;
-  int keymaps = 0;
@@ -711 +683 @@
-      /* Decode the first argument: find the window and the coordinates.  */
-      if (EQ (position, Qt)
-
-
+
-        {
-          /* Use the mouse's current position.  */
-SELECTED_FRAME ()
+selected_frame
-          Lisp_Object bar_window;
-          enum scroll_bar_part part;
@@ -791 +762 @@
-  /* Decode the menu items from what was specified.  */
-
-
-
+
+
+
+
+
-    {
-      /* We were given a keymap.  Extract menu info from the keymap.  */
-      Lisp_Object prompt;
+      keymap = get_keymap (menu);
-
-      /* Extract the detailed info to make one pane.  */
@@ -812 +787 @@
-      keymaps = 1;
-    }
-CONSP (menu) && KEYMAPP (XCAR (menu)
+!NILP (tem
-    {
-      /* We were given a list of keymaps.  */
@@ -828 +803 @@
-          Lisp_Object prompt;
-
-, 1, 0
+
-
-          prompt = map_prompt (keymap);
@@ -899 +874 @@
-     Lisp_Object position, contents;
-{
-struct frame * f = NULL
+FRAME_PTR f
-  Lisp_Object window;
-
@@ -906 +881 @@
-  /* Decode the first argument: find the window or frame to use.  */
-  if (EQ (position, Qt)
-
-
+
-    {
-#if 0 /* Using the frame the mouse is on may not be right.  */
-      /* Use the mouse's current position.  */
-SELECTED_FRAME ()
+selected_frame
-      Lisp_Object bar_window;
-      int part;
@@ -1080 +1054 @@
-              || x_non_menubar_window_to_frame (dpyinfo, event.xany.window)))
-        {
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-      else
@@ -1099 +1077 @@
-      XPutBackEvent (queue_tmp->event.xany.display, &queue_tmp->event);
-      queue = queue_tmp->next;
-x
+
-      /* Cause these events to get read as soon as we UNBLOCK_INPUT.  */
-      interrupt_input_pending = 1;
@@ -1147 +1125 @@
-}
-
+
-/* This callback is invoked when the user selects a menubar cascade
-   pushbutton, but before the pulldown menu is posted.  */
@@ -1157 +1136 @@
-{
-  popup_activated_flag = 1;
-}
-
-/* This callback is invoked when a dialog or menu is finished being
-   used and has been unposted.  */
-
-static void
-popup_deactivate_callback (widget, id, client_data)
-     Widget widget;
-     LWLIB_ID id;
-     XtPointer client_data;
-{
-  popup_activated_flag = 0;
-}
-
-/* Lwlib callback called when menu items are highlighted/unhighlighted
-   while moving the mouse over them.  WIDGET is the menu bar or menu
-   popup widget.  ID is its LWLIB_ID.  CALL_DATA contains a pointer to
-   the widget_value structure for the menu item, or null in case of
-   unhighlighting.  */
-
-void
-menu_highlight_callback (widget, id, call_data)
-     Widget widget;
-     LWLIB_ID id;
-     void *call_data;
-{
-  widget_value *wv = (widget_value *) call_data;
-  struct frame *f;
-  Lisp_Object frame, help;
-
-  help = wv && wv->help ? build_string (wv->help) : Qnil;
-  
-  /* Determine the frame for the help event.  */
-  f = menubar_id_to_frame (id);
-  if (f)
-    {
-      XSETFRAME (frame, f);
-      kbd_buffer_store_help_event (frame, help);
-    }
-  else
-    {
-      /* WIDGET is the popup menu.  It's parent is the frame's 
-         widget.  See which frame that is.  */
-      Widget frame_widget = XtParent (widget);
-      Lisp_Object tail;
-
-      for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
-        {
-          frame = XCAR (tail);
-          if (GC_FRAMEP (frame)
-              && (f = XFRAME (frame),
-                  FRAME_X_P (f) && f->output_data.x->widget == frame_widget))
-            break;
-        }
-
-      show_help_echo (help, Qnil, Qnil, Qnil, 1);
-    }
-}
-
@@ -1236 +1158 @@
-  if (!f)
-    return;
-  entry = Qnil;
-  subprefix_stack = (Lisp_Object *) alloca (f->menu_bar_items_used * sizeof (Lisp_Object));
-  vector = f->menu_bar_vector;
@@ -1271 +1192 @@
-
-              XSETFRAME (frame, f);
-
-
-
+
+
-              kbd_buffer_store_event (&buf);
-
@@ -1279 +1199 @@
-                if (!NILP (subprefix_stack[j]))
-                  {
-
-
-
+
+
-                    kbd_buffer_store_event (&buf);
-                  }
@@ -1287 +1206 @@
-              if (!NILP (prefix))
-                {
-
-
-
+
+
-                  kbd_buffer_store_event (&buf);
-                }
-
-
-
-
+
+
-              kbd_buffer_store_event (&buf);
-
@@ -1303 +1220 @@
-        }
-    }
+}
+
+/* This callback is invoked when a dialog or menu is finished being
+   used and has been unposted.  */
+
+static void
+popup_deactivate_callback (widget, id, client_data)
+     Widget widget;
+     LWLIB_ID id;
+     XtPointer client_data;
+{
+  popup_activated_flag = 0;
-}
-
@@ -1362 +1291 @@
-  Lisp_Object *mapvec;
-  widget_value **submenu_stack;
+  int mapno;
-  int previous_items = menu_items_used;
-  int top_level_items = 0;
@@ -1383 +1313 @@
-    {
-      if (SYMBOLP (mapvec[i])
-
+
+
-        {
-          /* Here we have a command at top level in the menu bar
@@ -1389 +1320 @@
-          top_level_items = 1;
-          push_menu_pane (Qnil, Qnil);
-
-
+
-        }
-      else
@@ -1405 +1335 @@
-  wv->value = 0;
-  wv->enabled = 1;
-  wv->button_type = BUTTON_TYPE_NONE;
-  first_wv = wv;
-  save_wv = 0;
@@ -1442 +1371 @@
-          Lisp_Object pane_name, prefix;
-          char *pane_string;
-          
-          pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];
-          prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
-          
-#ifndef HAVE_MULTILINGUAL_MENU
-          if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
-
-
-
-
+
-#endif
-          pane_string = (NILP (pane_name)
@@ -1477 +1401 @@
-              wv->value = 0;
-              wv->enabled = 1;
-              wv->button_type = BUTTON_TYPE_NONE;
-            }
-          save_wv = wv;
@@ -1486 +1409 @@
-        {
-          /* Create a new item within current pane.  */
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-#ifndef HAVE_MULTILINGUAL_MENU
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-          wv = xmalloc_widget_value ();
-          if (prev_wv) 
@@ -1525 +1435 @@
-          wv->call_data = (!NILP (def) ? (void *) (EMACS_INT) i : 0);
-          wv->enabled = !NILP (enable);
-          
-          if (NILP (type))
-            wv->button_type = BUTTON_TYPE_NONE;
-          else if (EQ (type, QCradio))
-            wv->button_type = BUTTON_TYPE_RADIO;
-          else if (EQ (type, QCtoggle))
-            wv->button_type = BUTTON_TYPE_TOGGLE;
-          else
-            abort ();
-
-          wv->selected = !NILP (selected);
-          if (STRINGP (help))
-            wv->help = XSTRING (help)->data;
-                   
-          prev_wv = wv;
-
@@ -1556 +1452 @@
-  return first_wv;
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
-update_frame_menubar (f)
-     FRAME_PTR f;
@@ -1568 +1464 @@
-  struct x_output *x = f->output_data.x;
-  int columns, rows;
+  int menubar_changed;
-  
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-  BLOCK_INPUT;
-
-to 
+ to
+
-  columns = f->width;
-  rows = f->height;
-
-
-to refigure sizes until I'm done." 
+ to
+refigure sizes until I'm done."
-  lw_refigure_widget (x->column_widget, False);
-
-
-
-
+
+
+
+
-  XtUnmanageChild (x->edit_widget);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-  /* Re-manage the text-area widget, and then thrash the sizes.  */
@@ -1599 +1510 @@
-  /* Force the pane widget to resize itself with the right values.  */
-  EmacsFrameSetCharSize (x->edit_widget, columns, rows);
+
-  UNBLOCK_INPUT;
-  return 1;
-}
-
@@ -1614 +1525 @@
-{
-  Widget menubar_widget = f->output_data.x->menubar_widget;
-items
+tail, items, frame
-  widget_value *wv, *first_wv, *prev_wv = 0;
-  int i;
@@ -1641 +1552 @@
-  wv->value = 0;
-  wv->enabled = 1;
-  wv->button_type = BUTTON_TYPE_NONE;
-  first_wv = wv;
-
@@ -1677 +1587 @@
-
-      /* Run the Lucid hook.  */
-
-
+
-      /* If it has changed current-menubar from previous value,
-         really recompute the menubar from the value.  */
@@ -1715 +1624 @@
-          /* Don't set wv->name here; GC during the loop might relocate it.  */
-          wv->enabled = 1;
-          wv->button_type = BUTTON_TYPE_NONE;
-          prev_wv = wv;
-        }
@@ -1774 +1682 @@
-          wv->value = 0;
-          wv->enabled = 1;
-          wv->button_type = BUTTON_TYPE_NONE;
-          /* This prevents lwlib from assuming this
-             menu item is really supposed to be empty.  */
@@ -1817 +1724 @@
-                                         popup_activate_callback,
-                                         menubar_selection_callback,
-
-
+
-      f->output_data.x->menubar_widget = menubar_widget;
-    }
@@ -1846 +1752 @@
-  
-  free_menubar_widget_value_tree (first_wv);
+
-  update_frame_menubar (f);
-
@@ -1866 +1773 @@
-}
-
-
-/* Get rid of the menu bar of frame F, and free its storage.
-   This is used when deleting a frame, and when turning off the menu bar.  */
@@ -1875 +1781 @@
-{
-  Widget menubar_widget;
+  int id;
-
-  menubar_widget = f->output_data.x->menubar_widget;
@@ -1882 +1789 @@
-  if (menubar_widget)
-    {
-#ifdef USE_MOTIF
-      /* Removing the menu bar magically changes the shell widget's x
-         and y position of (0, 0) which, when the menu bar is turned
-         on again, leads to pull-down menuss appearing in strange
-         positions near the upper-left corner of the display.  This
-         happens only with some window managers like twm and ctwm,
-         but not with other like Motif's mwm or kwm, because the
-         latter generate ConfigureNotify events when the menu bar
-         is switched off, which fixes the shell position.  */
-      Position x0, y0, x1, y1;
-#endif
-      
-      BLOCK_INPUT;
-
-#ifdef USE_MOTIF
-      if (f->output_data.x->widget)
-        XtVaGetValues (f->output_data.x->widget, XtNx, &x0, XtNy, &y0, NULL);
-#endif
-      
-      lw_destroy_all_widgets ((LWLIB_ID) f->output_data.x->id);
-      f->output_data.x->menubar_widget = NULL;
-
-#ifdef USE_MOTIF
-      if (f->output_data.x->widget)
-        {
-          XtVaGetValues (f->output_data.x->widget, XtNx, &x1, XtNy, &y1, NULL);
-          if (x1 == 0 && y1 == 0)
-            XtVaSetValues (f->output_data.x->widget, XtNx, x0, XtNy, y0, NULL);
-        }
-#endif
-      
-      UNBLOCK_INPUT;
-    }
@@ -1947 +1825 @@
-LWLIB_ID widget_id_tick;
-
+#ifdef __STDC__
-static Lisp_Object *volatile menu_item_selection;
+#else
+static Lisp_Object *menu_item_selection;
+#endif
-
-static void
@@ -1982 +1864 @@
-
-  int first_pane;
+  int next_release_must_exit = 0;
-
-  *error = NULL;
@@ -1997 +1880 @@
-  wv->value = 0;
-  wv->enabled = 1;
-  wv->button_type = BUTTON_TYPE_NONE;
-  first_wv = wv;
-  first_pane = 1;
@@ -2032 +1914 @@
-          Lisp_Object pane_name, prefix;
-          char *pane_string;
-
-
-
-
+
+
-#ifndef HAVE_MULTILINGUAL_MENU
-
-
-
-
-
+
+
-#endif
-          pane_string = (NILP (pane_name)
@@ -2065 +1942 @@
-              wv->value = 0;
-              wv->enabled = 1;
-              wv->button_type = BUTTON_TYPE_NONE;
-              save_wv = wv;
-              prev_wv = 0;
@@ -2080 +1956 @@
-        {
-          /* Create a new item within current pane.  */
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-#ifndef HAVE_MULTILINGUAL_MENU
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-          wv = xmalloc_widget_value ();
-          if (prev_wv) 
@@ -2118 +1984 @@
-            = (!NILP (def) ? (void *) &XVECTOR (menu_items)->contents[i] : 0);
-          wv->enabled = !NILP (enable);
-
-          if (NILP (type))
-            wv->button_type = BUTTON_TYPE_NONE;
-          else if (EQ (type, QCtoggle))
-            wv->button_type = BUTTON_TYPE_TOGGLE;
-          else if (EQ (type, QCradio))
-            wv->button_type = BUTTON_TYPE_RADIO;
-          else
-            abort ();
-
-          wv->selected = !NILP (selected);
-          if (STRINGP (help))
-            wv->help = XSTRING (help)->data;
-          
-          prev_wv = wv;
-
@@ -2155 +2007 @@
-        title = string_make_unibyte (title);
-#endif
-      
-      wv_title->name = (char *) XSTRING (title)->data;
-      wv_title->enabled = True;
-      wv_title->button_type = BUTTON_TYPE_NONE;
-      wv_title->next = wv_sep1;
-      first_wv->contents = wv_title;
@@ -2168 +2018 @@
-                           f->output_data.x->widget, 1, 0,
-                           popup_selection_callback,
-
-
+
-
-  /* Adjust coordinates to relative to the outer (window manager) window.  */
@@ -2231 +2080 @@
-
-  /* Display the menu.  */
-(XEvent *) 
+
-  popup_activated_flag = 1;
-
@@ -2249 +2098 @@
-      Lisp_Object prefix, entry;
-
-entry = 
+
-      i = 0;
-      while (i < menu_items_used)
@@ -2333 +2182 @@
-  char dialog_name[6];
-
-
+save_wv = 0, *
-
-  /* Number of elements seen so far, before boundary.  */
@@ -2442 +2291 @@
-  menu = lw_create_widget (first_wv->name, "dialog", dialog_id, first_wv,
-                           f->output_data.x->widget, 1, 0,
-, 0
+
-  lw_modify_all_widgets (dialog_id, first_wv->contents, True);
-  /* Free the widget_value objects we used to specify the contents.  */
@@ -2476 +2325 @@
-                = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
-              i += MENU_ITEMS_PANE_LENGTH;
-            }
-          else if (EQ (XVECTOR (menu_items)->contents[i], Qquote))
-            {
-              /* This is the boundary between left-side elts and
-                 right-side elts.  */
-              ++i;
-            }
-          else
@@ -2504 +2347 @@
-  return Qnil;
-}
-
-#else /* not USE_X_TOOLKIT */
-
-/* The frame of the last activated non-toolkit menu bar.
-   Used to generate menu help events.  */
-
-static struct frame *menu_help_frame;
-
-
-/* Show help HELP_STRING, or clear help if HELP_STRING is null.
-
-   PANE is the pane number, and ITEM is the menu item number in
-   the menu (currently not used).
-   
-   This cannot be done with generating a HELP_EVENT because
-   XMenuActivate contains a loop that doesn't let Emacs process
-   keyboard events.  */
-
-static void
-menu_help_callback (help_string, pane, item)
-     char *help_string;
-     int pane, item;
-{
-  extern Lisp_Object Qmenu_item;
-  Lisp_Object *first_item;
-  Lisp_Object pane_name;
-  Lisp_Object menu_object;
- 
-  first_item = XVECTOR (menu_items)->contents;
-  if (EQ (first_item[0], Qt))
-    pane_name = first_item[MENU_ITEMS_PANE_NAME];
-  else if (EQ (first_item[0], Qquote))
-    /* This shouldn't happen, see xmenu_show.  */
-    pane_name = build_string ("");
-  else
-    pane_name = first_item[MENU_ITEMS_ITEM_NAME];
- 
-  /* (menu-item MENU-NAME PANE-NUMBER)  */
-  menu_object = Fcons (Qmenu_item,
-                       Fcons (pane_name,
-                              Fcons (make_number (pane), Qnil)));
-  show_help_echo (help_string ? build_string (help_string) : Qnil,
-                  Qnil, menu_object, make_number (item), 1);
-}
-  
-
-static Lisp_Object
@@ -2681 +2480 @@
-        {
-          /* Create a new item within current pane.  */
-, help
+
-          unsigned char *item_data;
-          char *help_string;
-
-          item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME];
@@ -2689 +2487 @@
-          descrip
-            = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY];
-          help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP];
-          help_string = STRINGP (help) ? XSTRING (help)->data : NULL;
-          
-          if (!NILP (descrip))
-            {
@@ -2721 +2516 @@
-          if (XMenuAddSelection (FRAME_X_DISPLAY (f),
-                                 menu, lpane, 0, item_data,
-