Changeset 1721

Timestamp:

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

Author:

himi

Message:

Meadow--Multilingual Enhancement to GNU Emacs with ADvantages Over Windows

Files:

• branches/GNU/src/bitmaps (added)
• branches/GNU/src/bitmaps/cntrpmsk.xbm (added)
• branches/GNU/src/bitmaps/cntrptr.xbm (added)
• branches/GNU/src/bitmaps/crosswv.xbm (added)
• branches/GNU/src/bitmaps/dimple1.xbm (added)
• branches/GNU/src/bitmaps/dimple3.xbm (added)
• branches/GNU/src/bitmaps/gray.xbm (added)
• branches/GNU/src/bitmaps/gray1.xbm (added)
• branches/GNU/src/bitmaps/gray3.xbm (added)
• branches/GNU/src/xmenu.c (modified) (16 diffs)
• branches/GNU/src/xrdb.c (modified) (2 diffs)
• branches/GNU/src/xselect.c (modified) (25 diffs)
• branches/GNU/src/xterm.c (modified) (75 diffs)
• branches/GNU/src/xterm.h (modified) (5 diffs)

branches/GNU/src/xmenu.c

@@ -42 +42 @@
-#include "keyboard.h"
-#include "blockinput.h"
+#include "puresize.h"
-#include "buffer.h"
-
@@ -90 +91 @@
-Lisp_Object Qdebug_on_next_call;
-
+Lisp_Object Qmenu_alias;
+
+extern Lisp_Object Qmenu_enable;
-extern Lisp_Object Qmenu_bar;
-extern Lisp_Object Qmouse_click, Qevent_kind;
-
-QCtoggle, QCradio
+Vdefine_key_rebound_commands
-
-extern Lisp_Object Voverriding_local_map;
@@ -114 +118 @@
-static void keymap_panes ();
-static void single_keymap_panes ();
-static void single_menu_item ();
-static void list_of_panes ();
-static void list_of_items ();
@@ -337 +340 @@
-}
-
+/* Figure out the current keyboard equivalent of a menu item ITEM1.
+   The item string for menu display should be ITEM_STRING.
+   Store the equivalent keyboard key sequence's
+   textual description into *DESCRIP_PTR.
+   Also cache them in the item itself.
+   Return the real definition to execute.  */
+
+static Lisp_Object
+menu_item_equiv_key (item_string, item1, descrip_ptr)
+     Lisp_Object item_string;
+     Lisp_Object item1;
+     Lisp_Object *descrip_ptr;
+{
+  /* This is the real definition--the function to run.  */
+  Lisp_Object def;
+  /* This is the sublist that records cached equiv key data
+     so we can save time.  */
+  Lisp_Object cachelist;
+  /* These are the saved equivalent keyboard key sequence
+     and its key-description.  */
+  Lisp_Object savedkey, descrip;
+  Lisp_Object def1;
+  int changed = 0;
+  struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
+
+  /* If a help string follows the item string, skip it.  */
+  if (CONSP (XCONS (item1)->cdr)
+      && STRINGP (XCONS (XCONS (item1)->cdr)->car))
+    item1 = XCONS (item1)->cdr;
+
+  def = Fcdr (item1);
+
+  /* Get out the saved equivalent-keyboard-key info.  */
+  cachelist = savedkey = descrip = Qnil;
+  if (CONSP (def) && CONSP (XCONS (def)->car)
+      && (NILP (XCONS (XCONS (def)->car)->car)
+          || VECTORP (XCONS (XCONS (def)->car)->car)))
+    {
+      cachelist = XCONS (def)->car;
+      def = XCONS (def)->cdr;
+      savedkey = XCONS (cachelist)->car;
+      descrip = XCONS (cachelist)->cdr;
+    }
+
+  GCPRO4 (def, def1, savedkey, descrip);
+
+  /* Is it still valid?  */
+  def1 = Qnil;
+  if (!NILP (savedkey))
+    def1 = Fkey_binding (savedkey, Qnil);
+  /* If not, update it.  */
+  if (! EQ (def1, def)
+      /* If the command is an alias for another
+         (such as easymenu.el and lmenu.el set it up),
+         check if the original command matches the cached command.  */
+      && !(SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)
+           && EQ (def1, XSYMBOL (def)->function))
+      /* If something had no key binding before, don't recheck it
+         because that is too slow--except if we have a list of rebound
+         commands in Vdefine_key_rebound_commands, do recheck any command
+         that appears in that list.  */
+      && (NILP (cachelist) || !NILP (savedkey)
+          || (! EQ (Qt, Vdefine_key_rebound_commands)
+              && !NILP (Fmemq (def, Vdefine_key_rebound_commands)))))
+    {
+      changed = 1;
+      descrip = Qnil;
+      /* If the command is an alias for another
+         (such as easymenu.el and lmenu.el set it up),
+         see if the original command name has equivalent keys.  */
+      if (SYMBOLP (def) && SYMBOLP (XSYMBOL (def)->function)
+          && ! NILP (Fget (def, Qmenu_alias)))
+        savedkey = Fwhere_is_internal (XSYMBOL (def)->function,
+                                       Qnil, Qt, Qnil);
+      else
+        /* Otherwise look up the specified command itself.
+           We don't try both, because that makes easymenu menus slow.  */
+        savedkey = Fwhere_is_internal (def, Qnil, Qt, Qnil);
+
+      if (!NILP (savedkey))
+        {
+          descrip = Fkey_description (savedkey);
+          descrip = concat2 (make_string ("  (", 3), descrip);
+          descrip = concat2 (descrip, make_string (")", 1));
+        }
+    }
+
+  /* Cache the data we just got in a sublist of the menu binding.  */
+  if (NILP (cachelist))
+    {
+      CHECK_IMPURE (item1);
+      XCONS (item1)->cdr = Fcons (Fcons (savedkey, descrip), def);
+    }
+  else if (changed)
+    {
+      XCONS (cachelist)->car = savedkey;
+      XCONS (cachelist)->cdr = descrip;
+    }
+
+  UNGCPRO;
+  *descrip_ptr = descrip;
+  return def;
+}
+
+/* This is used as the handler when calling internal_condition_case_1.  */
+
+static Lisp_Object
+menu_item_enabled_p_1 (arg)
+     Lisp_Object arg;
+{
+  /* If we got a quit from within the menu computation,
+     quit all the way out of it.  This takes care of C-] in the debugger.  */
+  if (CONSP (arg) && EQ (XCONS (arg)->car, Qquit))
+    Fsignal (Qquit, Qnil);
+
+  return Qnil;
+}
+
+/* Return non-nil if the command DEF is enabled when used as a menu item.
+   This is based on looking for a menu-enable property.
+   If NOTREAL is set, don't bother really computing this.  */
+
+static Lisp_Object
+menu_item_enabled_p (def, notreal)
+     Lisp_Object def;
+     int notreal;
+{
+  Lisp_Object enabled, tem;
+
+  enabled = Qt;
+  if (notreal)
+    return enabled;
+  if (SYMBOLP (def))
+    {
+      /* No property, or nil, means enable.
+         Otherwise, enable if value is not nil.  */
+      tem = Fget (def, Qmenu_enable);
+      if (!NILP (tem))
+        /* (condition-case nil (eval tem)
+           (error nil))  */
+        enabled = internal_condition_case_1 (Feval, tem, Qerror,
+                                             menu_item_enabled_p_1);
+    }
+  return enabled;
+}
+
-/* Look through KEYMAPS, a vector of keymaps that is NMAPS long,
-   and generate menu panes for them in menu_items.
@@ -365 +514 @@
-   The other arguments are passed along
-   or point to local variables of the previous function.
- only check for equivalent key bindings, don't
-evaluate expressions in menu items and don't make any menu
+
+don't bother really computing whether an item is enabled
-
-   If we encounter submenus deeper than MAXDEPTH levels, ignore them.  */
@@ -378 +527 @@
-     int maxdepth;
-{
-
-
-
-
+
+
+
-
-  if (maxdepth <= 0)
-    return;
-
+  pending_maps = Qnil;
+
-  push_menu_pane (pane_name, prefix);
-
-#ifndef HAVE_BOXES
-  /* Remember index for first item in this pane so we can go back and
-     add a prefix when (if) we see the first button.  After that, notbuttons
-     is set to 0, to mark that we have seen a button and all non button
-     items need a prefix.  */
-  notbuttons = menu_items_used;
-#endif
-
-  for (tail = keymap; CONSP (tail); tail = XCONS (tail)->cdr)
-    {
-
-
-
+
+
-      item = XCONS (tail)->car;
-      if (CONSP (item))
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      else if (VECTORP (item))
-        {
@@ -414 +618 @@
-              Lisp_Object character;
-              XSETFASTINT (character, c);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
-      UNGCPRO;
-    }
-
@@ -434 +695 @@
-      pending_maps = Fcdr (pending_maps);
-    }
-}
-
-/* This is a subroutine of single_keymap_panes that handles one
-   keymap entry.
-   KEY is a key in a keymap and ITEM is its binding. 
-   PENDING_MAPS_PTR points to a list of keymaps waiting to be made into
-   separate panes.
-   If NOTREAL is nonzero, only check for equivalent key bindings, don't
-   evaluate expressions in menu items and don't make any menu.
-   If we encounter submenus deeper than MAXDEPTH levels, ignore them.
-   NOTBUTTONS_PTR is only used when simulating toggle boxes and radio
-   buttons.  It points to variable notbuttons in single_keymap_panes,
-   which keeps track of if we have seen a button in this menu or not.  */
-
-static void
-single_menu_item (key, item, pending_maps_ptr, notreal, maxdepth,
-                  notbuttons_ptr)
-     Lisp_Object key, item;
-     Lisp_Object *pending_maps_ptr;
-     int maxdepth, notreal;
-     int *notbuttons_ptr;
-{
-  Lisp_Object def, map, item_string, enabled;
-  struct gcpro gcpro1, gcpro2;
-  int res;
-  
-  /* Parse the menu item and leave the result in item_properties.  */
-  GCPRO2 (key, item);
-  res = parse_menu_item (item, notreal, 0);
-  UNGCPRO;
-  if (!res)
-    return;                     /* Not a menu item.  */
-
-  map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP];
-  
-  if (notreal)
-    {
-      /* We don't want to make a menu, just traverse the keymaps to
-         precompute equivalent key bindings.  */
-      if (!NILP (map))
-        single_keymap_panes (map, Qnil, key, 1, maxdepth - 1);
-      return;
-    }
-
-  enabled = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE];
-  item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; 
-
-  if (!NILP (map) && XSTRING (item_string)->data[0] == '@')
-    {
-      if (!NILP (enabled))
-        /* An enabled separate pane. Remember this to handle it later.  */
-        *pending_maps_ptr = Fcons (Fcons (map, Fcons (item_string, key)),
-                                   *pending_maps_ptr);
-      return;
-    }
-
-#ifndef HAVE_BOXES
-  /* Simulate radio buttons and toggle boxes by putting a prefix in
-     front of them.  */
-  {
-    Lisp_Object prefix = Qnil;
-    Lisp_Object type = XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE];
-    if (!NILP (type))
-      {
-        Lisp_Object selected
-          = XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED];
-
-        if (*notbuttons_ptr)
-          /* The first button. Line up previous items in this menu.  */
-          {
-            int index = *notbuttons_ptr; /* Index for first item this menu.  */
-            int submenu = 0;
-            Lisp_Object tem;
-            while (index < menu_items_used)
-              {
-                tem
-                  = XVECTOR (menu_items)->contents[index + MENU_ITEMS_ITEM_NAME];
-                if (NILP (tem))
-                  {
-                    index++;
-                    submenu++;          /* Skip sub menu.  */
-                  }
-                else if (EQ (tem, Qlambda))
-                  {
-                    index++;
-                    submenu--;          /* End sub menu.  */
-                  }
-                else if (EQ (tem, Qt))
-                  index += 3;           /* Skip new pane marker. */
-                else if (EQ (tem, Qquote))
-                  index++;              /* Skip a left, right divider. */
-                else
-                  {
-                    if (!submenu && XSTRING (tem)->data[0] != '\0'
-                        && XSTRING (tem)->data[0] != '-')
-                      XVECTOR (menu_items)->contents[index + MENU_ITEMS_ITEM_NAME]
-                        = concat2 (build_string ("    "), tem);
-                    index += MENU_ITEMS_ITEM_LENGTH;
-                  }
-              }
-            *notbuttons_ptr = 0;
-          }
-
-        /* Calculate prefix, if any, for this item.  */
-        if (EQ (type, QCtoggle))
-          prefix = build_string (NILP (selected) ? "[ ] " : "[X] ");
-        else if (EQ (type, QCradio))
-          prefix = build_string (NILP (selected) ? "( ) " : "(*) ");
-      }
-    /* Not a button. If we have earlier buttons, then we need a prefix.  */
-    else if (!*notbuttons_ptr && XSTRING (item_string)->data[0] != '\0'
-             && XSTRING (item_string)->data[0] != '-')
-      prefix = build_string ("    ");
-
-    if (!NILP (prefix))
-      item_string = concat2 (prefix, item_string);
-  }
-#endif /* not HAVE_BOXES */
- 
-#ifndef USE_X_TOOLKIT
-  if (!NILP(map))
-    /* Indicate visually that this is a submenu.  */
-    item_string = concat2 (item_string, build_string (" >"));
-#endif
-
-  push_menu_item (item_string, enabled, key,
-                  XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF],
-                  XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ]);
-
-#ifdef USE_X_TOOLKIT
-  /* Display a submenu using the toolkit.  */
-  if (! (NILP (map) || NILP (enabled)))
-    {
-      push_submenu_start ();
-      single_keymap_panes (map, Qnil, key, 0, maxdepth - 1);
-      push_submenu_end ();
-    }
-#endif
-}
-
@@ -687 +810 @@
-          FRAME_PTR new_f = selected_frame;
-          Lisp_Object bar_window;
-enum scroll_bar_par
+in
-          unsigned long time;
-
@@ -1026 +1149 @@
-               && dpyinfo->display == event.xbutton.display)
-        {
-
-
-
-
-
-
+
+
-        }
-      /* Button presses outside the menu also pop it down.  */
@@ -1096 +1215 @@
-   execute Lisp code.  */
-   
-void
-x_activate_menubar (f)
-     FRAME_PTR f;
@@ -1567 +1685 @@
-      specbind (Qdebug_on_next_call, Qnil);
-
-et
+tore
-      if (NILP (Voverriding_local_map_menu_flag))
-        {
@@ -2442 +2560 @@
-                  continue;
-                }
-STRING_BYTES (XSTRING (item))
+XSTRING (item)->size
-              if (width > maxwidth)
-                maxwidth = width;
@@ -2465 +2583 @@
-          if (!NILP (descrip))
-            {
-STRING_BYTES (XSTRING (item_name))
+XSTRING (item_name)->size
-#ifdef C_ALLOCA
-              Lisp_Object spacer;
@@ -2477 +2595 @@
-              item_data
-                = (unsigned char *) alloca (maxwidth
-STRING_BYTES (XSTRING (descrip))
+XSTRING (descrip)->size
-              bcopy (XSTRING (item_name)->data, item_data,
-STRING_BYTES (XSTRING (item_name))
+XSTRING (item_name)->size
-              for (j = XSTRING (item_name)->size; j < maxwidth; j++)
-                item_data[j] = ' ';
-              bcopy (XSTRING (descrip)->data, item_data + j,
-STRING_BYTES (XSTRING (descrip))
-STRING_BYTES (XSTRING (descrip))
+XSTRING (descrip)->size
+XSTRING (descrip)->size
-#endif
-            }
@@ -2608 +2726 @@
-#endif /* HAVE_MENUS */
-
-void
-syms_of_xmenu ()
-{
-  staticpro (&menu_items);
-  menu_items = Qnil;
+
+  Qmenu_alias = intern ("menu-alias");
+  staticpro (&Qmenu_alias);
-
-  Qdebug_on_next_call = intern ("debug-on-next-call");

branches/GNU/src/xrdb.c

@@ -23 +23 @@
-#ifdef emacs
-#include <config.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
@@ -89 +85 @@
-#define realloc xrealloc
-#define free xfree
-extern long *xmalloc (), *xrealloc ();
-#endif
-

branches/GNU/src/xselect.c

@@ -1 +1 @@
-/* X Selection processing for Emacs.
-, 1997
+
-
-This file is part of GNU Emacs.
@@ -28 +28 @@
-#include "frame.h"      /* Need this to get the X window of selected_frame */
-#include "blockinput.h"
-#include "buffer.h"
-#include "charset.h"
-#include "coding.h"
-#include "process.h"
-
-#define CUT_BUFFER_SUPPORT
@@ -50 +48 @@
-/* Coding system for communicating with other X clients via cutbuffer,
-   selection, and clipboard.  */
-
-
-
-
+
-
-/* If this is a smaller number than the max-request-size of the display,
@@ -735 +730 @@
-      x_selection_current_request = 0;
-
-x
+
-         calls xmalloc itself.  */
-      if (!nofree)
-x
+
-    }
-  unbind_to (count, Qnil);
@@ -941 +936 @@
-          else
-            property_change_wait_list = rest->next;
-x
+
-          return;
-        }
@@ -1030 +1025 @@
-          else
-            property_change_wait_list = rest->next;
-x
+
-          return;
-        }
@@ -1174 +1169 @@
-/* Subroutines of x_get_window_property_as_lisp_data */
-
-x
+
-
-static void
@@ -1257 +1252 @@
-}
-
-x
+
-
-static void
@@ -1319 +1314 @@
-            XSelectInput (display, window, STANDARD_EVENT_SET);
-          unexpect_property_change (wait_object);
-x
+
-             calls xmalloc itself.  */
-x
+
-          break;
-        }
@@ -1346 +1341 @@
-      bcopy (tmp_data, (*data_ret) + offset, tmp_size_bytes);
-      offset += tmp_size_bytes;
-x
+
-         calls xmalloc itself.  */
-x
+
-    }
-}
@@ -1403 +1398 @@
-      unsigned int min_size_bytes = * ((unsigned int *) data);
-      BLOCK_INPUT;
-x
+
-         calls xmalloc itself.  */
-x
+
-      UNBLOCK_INPUT;
-      receive_incremental_selection (display, window, property, target_type,
@@ -1423 +1418 @@
-                                     actual_type, actual_format);
-  
-x
+
-     calls xmalloc itself.  */
-x
+
-  return val;
-}
@@ -1474 +1469 @@
-      int require_encoding = 0;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        {
-
-
-
-
-
-
-
-
-
+
+
-            {
-
-
+
-                {
-
-
-
-
-
+
+
-                }
-            }
-        }
-      if (!require_encoding)
-
-
-
-
+
-      else
-        {
-
+, dummy
-          unsigned char *buf;
-          struct coding_system coding;
-
-          if (NILP (Vnext_selection_coding_system))
-            Vnext_selection_coding_system = Vselection_coding_system;
-          setup_coding_system
-
-
-
+
+
-          bufsize = decoding_buffer_size (&coding, size);
-          buf = (unsigned char *) xmalloc (bufsize);
-
-
-
-
-
-
-
+
+
+
-        }
-      return str;
@@ -1589 +1564 @@
-
-
-x
+
-
-static void
@@ -1631 +1606 @@
-
-      *format_ret = 8;
-STRING_BYTES (XSTRING (obj))
+XSTRING (obj)->size
-      *data_ret = XSTRING (obj)->data;
-      bzero (charsets, (MAX_CHARSET + 1) * sizeof (int));
-
-
-
+
-             ? 0
-, 1
+
-
-      if (!num || (num == 1 && charsets[CHARSET_ASCII]))
@@ -1645 +1618 @@
-          *nofree_ret = 1;
-          if (NILP (type)) type = QSTRING;
-          Vlast_coding_system_used = Qraw_text;
-        }
-      else
@@ -1653 +1625 @@
-             expects if OBJ contains only ASCII and Latin-1
-             characters.  */
-
+, dummy
-          unsigned char *buf;
-          struct coding_system coding;
-
-          if (NILP (Vnext_selection_coding_system))
-            Vnext_selection_coding_system = Vselection_coding_system;
-          setup_coding_system
-
-
-
+
+
-          bufsize = encoding_buffer_size (&coding, *size_ret);
-          buf = (unsigned char *) xmalloc (bufsize);
-encode_coding (&coding, *data_ret, buf, *size_ret, bufsize);
-  *size_ret = coding.produced
+*size_ret = encode_coding (&coding, *data_ret, buf,
+                            *size_ret, bufsize, &dummy)
-          *data_ret = buf;
-charset_latin_iso8859_1
+get_charset_id(charset_latin_iso8859_1)
-              && (num == 1 || (num == 2 && charsets[CHARSET_ASCII])))
-            {
@@ -1679 +1648 @@
-              if (NILP (type)) type = QCOMPOUND_TEXT;
-            }
-          Vlast_coding_system_used = coding.symbol;
-        }
-    }
@@ -1942 +1910 @@
-  Time timestamp;
-  Atom selection_atom;
-struct selection_input_e
+XSelectionClearE
-  Display *display;
-  struct x_display_info *dpyinfo;
@@ -1972 +1940 @@
-  SELECTION_EVENT_SELECTION (&event) = selection_atom;
-  SELECTION_EVENT_TIME (&event) = timestamp;
-(struct input_event *) 
+
-
-  return Qt;
@@ -2117 +2085 @@
-  x_get_window_property (display, window, buffer_atom, &data, &bytes,
-                         &type, &format, &size, 0);
-
-
+
-  
-  if (format != 8 || type != XA_STRING)
@@ -2127 +2094 @@
-
-  ret = (bytes ? make_string ((char *) data, bytes) : Qnil);
-x
+
-     calls xmalloc itself.  */
-x
+
-  return ret;
-}
@@ -2161 +2128 @@
-                                  display, buffer);
-  data = (unsigned char *) XSTRING (string)->data;
-STRING_BYTES (XSTRING (string))
+XSTRING (string)->size
-  bytes_remaining = bytes;
-
@@ -2196 +2163 @@
-DEFUN ("x-rotate-cut-buffers-internal", Fx_rotate_cut_buffers_internal,
-  Sx_rotate_cut_buffers_internal, 1, 1, 0,
-.
-Positive means shift th
+s;
+positive means mov
-  (n)
-     Lisp_Object n;
@@ -2298 +2265 @@
-  Vx_sent_selection_hooks = Qnil;
-
-selection-coding-system", &Vselection
+clipboard-coding-system", &Vclipboard
-    "Coding sy