Mercurial > emacs
view lisp/emacs-lisp/easymenu.el @ 9704:39b34bbe59c9
(x_catch_errors, x_check_errors, x_had_errors_p)
(x_uncatch_errors): Make the argument a display, not a frame.
(XTread_socket_fake_io_error): New variable.
(XTread_socket): Obey XTread_socket_fake_io_error.
(x_initialize): Init x_noop_count, x_focus_frame
and x_highlight_frame here.
(x_term_init): Not here.
(x_term_init): Open the connection first thing;
if that fails, don't allocate dpyinfo.
(x_delete_display): New function.
(x_connection_closed): New args dpyinfo and error_message.
Delete all frames on the dead display
and all frames using them for minibuffers.
Call x_delete_display.
Maybe signal a Lisp error.
(x_term_init): Don't report error here--just return 0.
(x_scroll_bar_report_motion): Store proper value in
*bar_window (the Emacs window, not the X window number).
(x_scroll_bar_report_motion): Don't clear *fp.
(x_wm_set_icon_pixmap): Use x_bitmap_pixmap.
(show_mouse_face): New arg dpyinfo. All callers changed.
(clear_mouse_face): New arg dpyinfo. All callers changed.
(scratch_cursor_gc): Variable deleted.
(dumpglyphs): Use scratch_cursor_gc in x_display_info.
(syms_of_xterm): Don't staticpro mouse_face_window.
(expose_all_windows, expose_all_icons): Variables deleted.
(BLOCK_INPUT_mask): Variable deleted.
(x_term_init): Set up x_id_name field.
(x_id_name): Variable deleted.
(x_font_table, x_font_table_size, x_n_fonts): Vars deleted.
(x_new_font): Use new fields.
(warp_mouse_on_deiconify): Unused variable deleted.
(x_term_init): Set up dpyinfo->xrdb.
Set up dpyinfo->vertical_scroll_bar_cursor.
(x_scroll_bar_create): Use vertical_scroll_bar_cursor slot.
(x_vertical_scroll_bar_cursor): Variable deleted.
(x_term_init): Really return dpyinfo.
(x_term_init): Call add_keyboard_wait_descriptor,
not change_keyboard_wait_descriptor.
(x_term_init): Pass new arg to init_sigio.
Don't set old_fcntl_owner.
Don't call change_input_fd.
(XTread_socket): Loop over displays and process input from each.
(x_display_name_list): New variable.
(syms_of_xterm): staticpro it.
Don't staticpro slots in the_x_screen.
(x_term_init): Update x_display_name_list along with x_display_list.
Actually malloc the x_display_info.
(the_x_screen): Variable deleted.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Wed, 26 Oct 1994 09:26:40 +0000 |
parents | bada2dc32adc |
children | a721dbc48e10 |
line wrap: on
line source
;;; easymenu.el --- support the easymenu interface for defining a menu. ;; Copyright (C) 1994 Free Software Foundation, Inc. ;; Keywords: emulations ;; Author: rms ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA. ;;; This is compatible with easymenu.el by Per Abrahamsen ;;; but it is much simpler as it doesn't try to support other Emacs versions. ;;; The code was mostly derived from lmenu.el. ;;; Code: ;;;###autoload (defmacro easy-menu-define (symbol maps doc menu) "Define a menu bar submenu in maps MAPS, according to MENU. The arguments SYMBOL and DOC are ignored; they are present for compatibility only. SYMBOL is not evaluated. In other Emacs versions these arguments may be used as a variable to hold the menu data, and a doc string for that variable. The first element of MENU must be a string. It is the menu bar item name. The rest of the elements are menu items. A menu item is usually a vector of three elements: [NAME CALLBACK ENABLE] NAME is a string--the menu item name. CALLBACK is a command to run when the item is chosen, or a list to evaluate when the item is chosen. ENABLE is an expression; the item is enabled for selection whenever this expression's value is non-nil. A menu item can be a string. Then that string appears in the menu as unselectable text. A string consisting solely of hyphens is displayed as a solid horizontal line. A menu item can be a list. It is treated as a submenu. The first element should be the submenu name. That's used as the menu item in the top-level menu. The cdr of the submenu list is a list of menu items, as above." (` (let* ((maps (, maps)) (menu (, menu)) (keymap (easy-menu-create-keymaps (car menu) (cdr menu)))) (and (keymapp maps) (setq maps (list maps))) (while maps (define-key (car maps) (vector 'menu-bar (intern (car menu))) (cons (car menu) keymap)) (setq maps (cdr maps)))))) (defvar easy-menu-item-count 0) ;; Return a menu keymap corresponding to a Lucid-style menu list ;; MENU-ITEMS, and with name MENU-NAME. ;;;###autoload (defun easy-menu-create-keymaps (menu-name menu-items) (let ((menu (make-sparse-keymap menu-name))) ;; Process items in reverse order, ;; since the define-key loop reverses them again. (setq menu-items (reverse menu-items)) (while menu-items (let* ((item (car menu-items)) (callback (if (vectorp item) (aref item 1))) command enabler name) (cond ((stringp item) (setq command nil) (setq name (if (string-match "^-+$" item) "" item))) ((consp item) (setq command (easy-menu-create-keymaps (car item) (cdr item))) (setq name (car item))) ((vectorp item) (setq command (make-symbol (format "menu-function-%d" easy-menu-item-count))) (setq easy-menu-item-count (1+ easy-menu-item-count)) (put command 'menu-enable (aref item 2)) (setq name (aref item 0)) (if (keymapp callback) (setq name (concat name " ..."))) (if (symbolp callback) (fset command callback) (fset command (list 'lambda () '(interactive) callback))))) (if (null command) ;; Handle inactive strings specially--allow any number ;; of identical ones. (setcdr menu (cons (list nil name) (cdr menu))) (if name (define-key menu (vector (intern name)) (cons name command))))) (setq menu-items (cdr menu-items))) menu)) (defun easy-menu-change (path name items) "Change menu found at PATH as item NAME to contain ITEMS. PATH is a list of strings for locating the menu containing NAME in the menu bar. ITEMS is a list of menu items, as in `easy-menu-define'. These items entirely replace the previous items in that map. Call this from `activate-menubar-hook' to implement dynamic menus." (let ((map (key-binding (apply 'vector 'menu-bar (mapcar 'intern (append path (list name))))))) (if (keymapp map) (setcdr map (cdr (easy-menu-create-keymaps name items))) (error "Malformed menu in `easy-menu-change'")))) (defmacro easy-menu-remove (menu)) (defmacro easy-menu-add (menu &optional map)) (provide 'easymenu) ;;; easymenu.el ends here