Mercurial > emacs
view lisp/emacs-lisp/levents.el @ 83004:7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.
lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.
lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell). Use tty-create-frame-with-faces,
not make-terminal-frame.
src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.
src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.
src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.
src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, update_begin)
(update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end)
(clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init. Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info. Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.
src/dispextern.h: Updated prototypes.
src/dispnew.c: Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.
src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.
src/process.c: Include frame.h before termhooks.h.
src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here. Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.
src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error.
src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X.
src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.
src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.
src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.
src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.
src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.
src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 05 Jan 2004 05:54:35 +0000 |
parents | 695cf19ef79e |
children | 18a818a2ee7c 375f2633d815 |
line wrap: on
line source
;;; levents.el --- emulate the Lucid event data type and associated functions ;; Copyright (C) 1993, 2001 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: emulations ;; 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, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; Things we cannot emulate in Lisp: ;; It is not possible to emulate current-mouse-event as a variable, ;; though it is not hard to obtain the data from (this-command-keys). ;; We do not have a variable unread-command-event; ;; instead, we have the more general unread-command-events. ;; Our read-key-sequence and read-char are not precisely ;; compatible with those in Lucid Emacs, but they should work ok. ;;; Code: (defun next-command-event (event) (error "You must rewrite to use `read-command-event' instead of `next-command-event'")) (defun next-event (event) (error "You must rewrite to use `read-event' instead of `next-event'")) (defun dispatch-event (event) (error "`dispatch-event' not supported")) ;; Make events of type eval, menu and timeout ;; execute properly. (define-key global-map [menu] 'execute-eval-event) (define-key global-map [timeout] 'execute-eval-event) (define-key global-map [eval] 'execute-eval-event) (defun execute-eval-event (event) (interactive "e") (funcall (nth 1 event) (nth 2 event))) (put 'eval 'event-symbol-elements '(eval)) (put 'menu 'event-symbol-elements '(eval)) (put 'timeout 'event-symbol-elements '(eval)) (defun allocate-event () "Returns an empty event structure. In this emulation, it returns nil." nil) (defun button-press-event-p (obj) "True if the argument is a mouse-button-press event object." (and (consp obj) (symbolp (car obj)) (memq 'down (get (car obj) 'event-symbol-elements)))) (defun button-release-event-p (obj) "True if the argument is a mouse-button-release event object." (and (consp obj) (symbolp (car obj)) (or (memq 'click (get (car obj) 'event-symbol-elements)) (memq 'drag (get (car obj) 'event-symbol-elements))))) (defun button-event-p (obj) "True if the argument is a mouse-button press or release event object." (and (consp obj) (symbolp (car obj)) (or (memq 'click (get (car obj) 'event-symbol-elements)) (memq 'down (get (car obj) 'event-symbol-elements)) (memq 'drag (get (car obj) 'event-symbol-elements))))) (defun mouse-event-p (obj) "True if the argument is a mouse-button press or release event object." (and (consp obj) (symbolp (car obj)) (or (eq (car obj) 'mouse-movement) (memq 'click (get (car obj) 'event-symbol-elements)) (memq 'down (get (car obj) 'event-symbol-elements)) (memq 'drag (get (car obj) 'event-symbol-elements))))) (defun character-to-event (ch &optional event) "Converts a numeric ASCII value to an event structure, replete with bucky bits. The character is the first argument, and the event to fill in is the second. This function contains knowledge about what the codes mean -- for example, the number 9 is converted to the character Tab, not the distinct character Control-I. Beware that character-to-event and event-to-character are not strictly inverse functions, since events contain much more information than the ASCII character set can encode." ch) (defun copy-event (event1 &optional event2) "Make a copy of the given event object. In this emulation, `copy-event' just returns its argument." event1) (defun deallocate-event (event) "Allow the given event structure to be reused. In actual Lucid Emacs, you MUST NOT use this event object after calling this function with it. You will lose. It is not necessary to call this function, as event objects are garbage- collected like all other objects; however, it may be more efficient to explicitly deallocate events when you are sure that that is safe. This emulation does not actually deallocate or reuse events except via garbage collection and `cons'." nil) (defun enqueue-eval-event: (function object) "Add an eval event to the back of the queue. It will be the next event read after all pending events." (setq unread-command-events (nconc unread-command-events (list (list 'eval function object))))) (defun eval-event-p (obj) "True if the argument is an eval or menu event object." (eq (car-safe obj) 'eval)) (defun event-button (event) "Return the button-number of the given mouse-button-press event." (let ((sym (car (get (car event) 'event-symbol-elements)))) (cdr (assq sym '((mouse-1 . 1) (mouse-2 . 2) (mouse-3 . 3) (mouse-4 . 4) (mouse-5 . 5)))))) (defun event-function (event) "Return the callback function of the given timeout, menu, or eval event." (nth 1 event)) (defun event-key (event) "Returns the KeySym of the given key-press event. The value is an ASCII printing character (not upper case) or a symbol." (if (symbolp event) (car (get event 'event-symbol-elements)) (let ((base (logand event (1- (lsh 1 18))))) (downcase (if (< base 32) (logior base 64) base))))) (defun event-object (event) "Returns the function argument of the given timeout, menu, or eval event." (nth 2 event)) (defun event-point (event) "Returns the character position of the given mouse-related event. If the event did not occur over a window, or did not occur over text, then this returns nil. Otherwise, it returns an index into the buffer visible in the event's window." (posn-point (event-end event))) ;; Return position of start of line LINE in WINDOW. ;; If LINE is nil, return the last position ;; visible in WINDOW. (defun event-closest-point-1 (window &optional line) (let* ((total (- (window-height window) (if (window-minibuffer-p window) 0 1))) (distance (or line total))) (save-excursion (goto-char (window-start window)) (if (= (vertical-motion distance) distance) (if (not line) (forward-char -1))) (point)))) (defun event-closest-point (event &optional start-window) "Return the nearest position to where EVENT ended its motion. This is computed for the window where EVENT's motion started, or for window WINDOW if that is specified." (or start-window (setq start-window (posn-window (event-start event)))) (if (eq start-window (posn-window (event-end event))) (if (eq (event-point event) 'vertical-line) (event-closest-point-1 start-window (cdr (posn-col-row (event-end event)))) (if (eq (event-point event) 'mode-line) (event-closest-point-1 start-window) (event-point event))) ;; EVENT ended in some other window. (let* ((end-w (posn-window (event-end event))) (end-w-top) (w-top (nth 1 (window-edges start-window)))) (setq end-w-top (if (windowp end-w) (nth 1 (window-edges end-w)) (/ (cdr (posn-x-y (event-end event))) (frame-char-height end-w)))) (if (>= end-w-top w-top) (event-closest-point-1 start-window) (window-start start-window))))) (defun event-process (event) "Returns the process of the given process-output event." (nth 1 event)) (defun event-timestamp (event) "Returns the timestamp of the given event object. In Lucid Emacs, this works for any kind of event. In this emulation, it returns nil for non-mouse-related events." (and (listp event) (posn-timestamp (event-end event)))) (defun event-to-character (event &optional lenient) "Returns the closest ASCII approximation to the given event object. If the event isn't a keypress, this returns nil. If the second argument is non-nil, then this is lenient in its translation; it will ignore modifier keys other than control and meta, and will ignore the shift modifier on those characters which have no shifted ASCII equivalent (Control-Shift-A for example, will be mapped to the same ASCII code as Control-A.) If the second arg is nil, then nil will be returned for events which have no direct ASCII equivalent." (if (symbolp event) (and lenient (cdr (assq event '((backspace . 8) (delete . 127) (tab . 9) (return . 10) (enter . 10))))) ;; Our interpretation is, ASCII means anything a number can represent. (if (integerp event) event nil))) (defun event-window (event) "Returns the window of the given mouse-related event object." (posn-window (event-end event))) (defun event-x (event) "Returns the X position in characters of the given mouse-related event." (/ (car (posn-col-row (event-end event))) (frame-char-width (window-frame (event-window event))))) (defun event-x-pixel (event) "Returns the X position in pixels of the given mouse-related event." (car (posn-col-row (event-end event)))) (defun event-y (event) "Returns the Y position in characters of the given mouse-related event." (/ (cdr (posn-col-row (event-end event))) (frame-char-height (window-frame (event-window event))))) (defun event-y-pixel (event) "Returns the Y position in pixels of the given mouse-related event." (cdr (posn-col-row (event-end event)))) (defun key-press-event-p (obj) "True if the argument is a keyboard event object." (or (integerp obj) (and (symbolp obj) (get obj 'event-symbol-elements)))) (defun menu-event-p (obj) "True if the argument is a menu event object." (eq (car-safe obj) 'menu)) (defun motion-event-p (obj) "True if the argument is a mouse-motion event object." (eq (car-safe obj) 'mouse-movement)) (defun read-command-event () "Return the next keyboard or mouse event; execute other events. This is similar to the function `next-command-event' of Lucid Emacs, but different in that it returns the event rather than filling in an existing event object." (let (event) (while (progn (setq event (read-event)) (not (or (key-press-event-p event) (button-press-event-p event) (button-release-event-p event) (menu-event-p event)))) (let ((type (car-safe event))) (cond ((eq type 'eval) (funcall (nth 1 event) (nth 2 event))) ((eq type 'switch-frame) (select-frame (nth 1 event)))))) event)) (defun process-event-p (obj) "True if the argument is a process-output event object. GNU Emacs 19 does not currently generate process-output events." (eq (car-safe obj) 'process)) (provide 'levents) ;;; arch-tag: a80c21da-69d7-46de-9cdb-5f68577b5525 ;;; levents.el ends here