Mercurial > emacs
view lisp/x-menu.el @ 1785:19755499df90
* window.c (window_internal_width): New function, which accounts
for scrollbars if present.
* lisp.h (window_internal_height, window_internal_width): Add
extern declarations for these.
* dispnew.c (direct_output_for_insert, direct_output_forward_char,
buffer_posn_from_coords): Use window_internal_width instead of
writing out its definition.
* indent.c (compute_motion): Doc fix; mention scrollbars and
window_internal_width.
(pos_tab_offset, Fvertical_motion): Use window_internal_width
instead of writing it out.
* window.c (Fpos_visible_in_window_p, Fwindow_width, Fscroll_left,
Fscroll_right): Same.
* xdisp.c (redisplay, try_window, try_window_id,
display_text_line): Same.
* xdisp.c (display_string): Add new variable `f', to be W's
frame. Use it to set desired_glyphs, and to get the frame's width
to decide whether or not to draw vertical bars.
* xdisp.c (display_text_line): If we're using vertical scrollbars,
don't draw the vertical bars separating side-by-side windows.
(display_string): Same thing. Draw spaces to fill in the part of
the mode line that is under the scrollbar in partial-width
windows.
* xdisp.c (display_text_line): Use the usable internal width of
the window, as calculated above, as the limit on the length of the
overlay arrow's image, rather than using the window's width field,
less one.
* xdisp.c (redisplay): Call condemn_scrollbars_hook and
judge_scrollbars_hook whenever they are set, not just when the
frame has vertical scrollbars.
* termhooks.h (mouse_position_hook): Doc fix.
(set_vertical_scrollbar_hook): This doesn't return anything any
more, and doesn't take a struct scrollbar * argument any more.
(condemn_scrollbars_hook, redeem_scrollbar_hook,
judge_scrollbars_hook): Doc fixes.
* term.c (mouse_position_hook): Doc fix.
(set_vertical_scrollbar_hook): This doesn't return
anything any more. Doc fixes.
* keyboard.c (kbd_buffer_get_event): Receive the scrollbar's
window from *mouse_position_hook and pass it to
make_lispy_movement, instead of working with a pointer to a struct
scrollbar.
(make_lispy_event): We don't need a window_from_scrollbar function
anymore; we are given the window directly in *EVENT.
Unify the code which generates
text-area mouse clicks and scrollbar clicks; use the same code to
distinguish clicks from drags on the scrollbar as in the text area.
Distinguish clicks from drags by storing a copy of the lispy
position list returned as part of the event.
(button_down_location): Make this a lisp vector, rather than an
array of random structures.
(struct mouse_position): Remove this; it's been replaced by a lisp
list.
(make_lispy_movement): Accept the scrollbar's window as a
parameter, rather than the scrollbar itself.
If FRAME is zero, assume that the other arguments are garbage.
(syms_of_keyboard): No need to staticpro each window of
button_down_location now; just initialize and staticpro it.
* window.c (window_from_scrollbar): Function deleted; no longer
needed.
* xdisp.c (redisplay_window): Just pass the window to
set_vertical_scrollbar hook; don't pass the scrollbar object too.
* xterm.c (XTmouse_position): Don't return a pointer to the
scrollbar for scrollbar motion; instead, return the scrollbar's
window.
* xdisp.c (echo_area_display): Move the assignment of f and the
check for visibility out of the "#ifdef MULTI_FRAME" clause; they
should work under any circumstances.
* xdisp.c (redisplay_window): If we're not going to redisplay this
window because it's a minibuffer whose contents have already been
updated, go ahead and jump to the scrollbar refreshing code
anyway; they still need to be updated. Initialize opoint, so it's
known to be valid when we jump. Calculate the scrollbar settings
properly for minibuffers, no matter what they are displaying at
the time.
* xdisp.c (redisplay_windows): Don't restore the current buffer
and its point before refreshing the scrollbars; we need the buffer
accurate.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Thu, 14 Jan 1993 15:18:53 +0000 |
parents | 2cdce064065f |
children | 83fea4c633e8 |
line wrap: on
line source
;;; x-menu.el --- menu support for X ;; Copyright (C) 1986 Free Software Foundation, Inc. ;; 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. ;;; Code: (defmacro caar (conscell) (list 'car (list 'car conscell))) (defmacro cdar (conscell) (list 'cdr (list 'car conscell))) (defun x-menu-mode () "Major mode for creating permanent menus for use with X. These menus are implemented entirely in Lisp; popup menus, implemented with x-popup-menu, are implemented using XMenu primitives." (make-local-variable 'x-menu-items-per-line) (make-local-variable 'x-menu-item-width) (make-local-variable 'x-menu-items-alist) (make-local-variable 'x-process-mouse-hook) (make-local-variable 'x-menu-assoc-buffer) (setq buffer-read-only t) (setq truncate-lines t) (setq x-process-mouse-hook 'x-menu-pick-entry) (setq mode-line-buffer-identification '("MENU: %32b"))) (defvar x-menu-max-width 0) (defvar x-menu-items-per-line 0) (defvar x-menu-item-width 0) (defvar x-menu-items-alist nil) (defvar x-menu-assoc-buffer nil) (defvar x-menu-item-spacing 1 "*Minimum horizontal spacing between objects in a permanent X menu.") (defun x-menu-create-menu (name) "Create a permanent X menu. Returns an item which should be used as a menu object whenever referring to the menu." (let ((old (current-buffer)) (buf (get-buffer-create name))) (set-buffer buf) (x-menu-mode) (setq x-menu-assoc-buffer old) (set-buffer old) buf)) (defun x-menu-change-associated-buffer (menu buffer) "Change associated buffer of MENU to BUFFER. BUFFER should be a buffer object." (let ((old (current-buffer))) (set-buffer menu) (setq x-menu-assoc-buffer buffer) (set-buffer old))) (defun x-menu-add-item (menu item binding) "Adds to MENU an item with name ITEM, associated with BINDING. Following a sequence of calls to x-menu-add-item, a call to x-menu-compute should be performed before the menu will be made available to the user. BINDING should be a function of one argument, which is the numerical button/key code as defined in x-menu.el." (let ((old (current-buffer)) elt) (set-buffer menu) (if (setq elt (assoc item x-menu-items-alist)) (rplacd elt binding) (setq x-menu-items-alist (append x-menu-items-alist (list (cons item binding))))) (set-buffer old) item)) (defun x-menu-delete-item (menu item) "Deletes from MENU the item named ITEM. x-menu-compute should be called before the menu is made available to the user." (let ((old (current-buffer)) elt) (set-buffer menu) (if (setq elt (assoc item x-menu-items-alist)) (rplaca elt nil)) (set-buffer old) item)) (defun x-menu-activate (menu) "Computes all necessary parameters for MENU. This must be called whenever a menu is modified before it is made available to the user. This also creates the menu itself." (let ((buf (current-buffer))) (pop-to-buffer menu) (let (buffer-read-only) (setq x-menu-max-width (1- (frame-width))) (setq x-menu-item-width 0) (let (items-head (items-tail x-menu-items-alist)) (while items-tail (if (caar items-tail) (progn (setq items-head (cons (car items-tail) items-head)) (setq x-menu-item-width (max x-menu-item-width (length (caar items-tail)))))) (setq items-tail (cdr items-tail))) (setq x-menu-items-alist (reverse items-head))) (setq x-menu-item-width (+ x-menu-item-spacing x-menu-item-width)) (setq x-menu-items-per-line (max 1 (/ x-menu-max-width x-menu-item-width))) (erase-buffer) (let ((items-head x-menu-items-alist)) (while items-head (let ((items 0)) (while (and items-head (<= (setq items (1+ items)) x-menu-items-per-line)) (insert (format (concat "%" (int-to-string x-menu-item-width) "s") (caar items-head))) (setq items-head (cdr items-head)))) (insert ?\n))) (shrink-window (max 0 (- (window-height) (1+ (count-lines (point-min) (point-max)))))) (goto-char (point-min))) (pop-to-buffer buf))) (defun x-menu-pick-entry (position event) "Internal function for dispatching on mouse/menu events" (let* ((x (min (1- x-menu-items-per-line) (/ (current-column) x-menu-item-width))) (y (- (count-lines (point-min) (point)) (if (zerop (current-column)) 0 1))) (item (+ x (* y x-menu-items-per-line))) (litem (cdr (nth item x-menu-items-alist)))) (and litem (funcall litem event))) (pop-to-buffer x-menu-assoc-buffer)) ;;; x-menu.el ends here