Mercurial > emacs
view lisp/mouse-drag.el @ 111413:d53ee71e7e89
Unify mouse-highlight code for all GUI and TTY sessions.
term.c: Remove static mouse_face_* variables. All users
changed.
(term_show_mouse_face, term_clear_mouse_face)
(fast_find_position, term_mouse_highlight): Functions deleted.
(tty_draw_row_with_mouse_face): New function.
(term_mouse_movement): Call note_mouse_highlight instead of
term_mouse_highlight.
nsterm.m (ns_update_window_begin, ns_update_window_end)
(ns_update_end, x_destroy_window, ns_frame_up_to_date)
(ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background)
(ns_dumpglyphs_image, ns_dumpglyphs_stretch)
(ns_initialize_display_info, keyDown, mouseMoved, mouseExited):
Replace Display_Info with Mouse_HLInfo everywhere where
mouse_face_* members were accessed for mouse highlight purposes.
xterm.c (x_update_window_begin, x_update_window_end)
(x_update_end, XTframe_up_to_date, x_set_mouse_face_gc)
(handle_one_xevent, x_free_frame_resources, x_term_init): Replace
Display_Info with Mouse_HLInfo everywhere where mouse_face_*
members were accessed for mouse highlight purposes.
w32term.c (x_update_window_begin, x_update_window_end)
(x_update_end, w32_read_socket, x_free_frame_resources)
(w32_initialize_display_info): Replace Display_Info with
Mouse_HLInfo everywhere where mouse_face_* members were accessed
for mouse highlight purposes.
xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight)
(note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code
unless the frame is on a window-system.
(get_tool_bar_item, handle_tool_bar_click)
(note_tool_bar_highlight, draw_glyphs, erase_phys_cursor)
(show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(x_clear_window_mouse_face, cancel_mouse_face, expose_frame):
Replace Display_Info with Mouse_HLInfo everywhere where
mouse_face_* members were accessed for mouse highlight purposes.
(coords_in_mouse_face_p): Move prototype out of the
HAVE_WINDOW_SYSTEM conditional.
(x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the
HAVE_WINDOW_SYSTEM block.
(try_window_id) [HAVE_GPM || MSDOS]: Call
x_clear_window_mouse_face.
(draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM
systems. Call tty_draw_row_with_mouse_face for TTY systems.
(show_mouse_face): Call draw_row_with_mouse_face, instead of
calling draw_glyphs directly.
(show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
(cursor_in_mouse_face_p, rows_from_pos_range)
(mouse_face_from_buffer_pos, mouse_face_from_string_pos)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(x_clear_window_mouse_face, cancel_mouse_face): Move out of the
HAVE_WINDOW_SYSTEM block. Ifdef away window-system specific
fragments.
(note_mouse_highlight): Call popup_activated for MSDOS as well.
Clear mouse highlight if pointer is over glyphs whose OBJECT is an
integer.
(mouse_face_from_buffer_pos): Add parentheses around && within ||.
(x_consider_frame_title, tool_bar_lines_needed): Move
prototypes to HAVE_WINDOW_SYSTEM-only part.
(get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only
part. Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function.
(null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only
part.
dispnew.c (mirror_make_current): Set Y coordinate of the
mode-line and header-line rows.
(init_display): Setup initial frame's output_data for text
terminal frames.
xmenu.c (popup_activated): Don't define on MSDOS, which now has
its own definition on msdos.c.
msdos.c (show_mouse_face, clear_mouse_face)
(fast_find_position, IT_note_mode_line_highlight)
(IT_note_mouse_highlight): Functions deleted.
(IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight
instead of IT_note_mouse_highlight.
(draw_row_with_mouse_face, popup_activated): New functions.
(dos_set_window_size, draw_row_with_mouse_face, IT_update_begin)
(IT_update_end, IT_frame_up_to_date, internal_terminal_init)
(dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere
where mouse_face_* members were accessed for mouse highlight
purposes.
msdos.h (initialize_msdos_display): Add prototype.
frame.h (MOUSE_HL_INFO): New macro.
lisp.h (Mouse_HLInfo): New data type.
xterm.h (struct x_display_info):
w32term.h (struct w32_display_info):
nsterm.h (struct ns_display_info):
termchar.h (struct tty_display_info): Use it instead of
mouse_face_* members.
dispextern.h (show_mouse_face, clear_mouse_face): Update type of
1st argument.
(frame_to_window_pixel_xy, note_mouse_highlight)
(x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face)
(show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of
HAVE_WINDOW_SYSTEM conditional.
(draw_row_with_mouse_face): Declare prototype.
(tty_draw_row_with_mouse_face): Declare prototype.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 06 Nov 2010 10:28:31 +0200 |
parents | 1d1d5d9bd884 |
children | 56b71cddc9c5 376148b31b5e |
line wrap: on
line source
;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling ;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: John Heidemann <johnh@ISI.EDU> ;; Keywords: mouse ;; 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; What is ``mouse-drag.el''? ;; ;; Doesn't that scroll bar seem far away when you want to scroll? ;; This module overloads mouse-2 to do ``throw'' scrolling. You ;; click and drag. The distance you move from your original click ;; turns into a scroll amount. The scroll amount is scaled ;; exponentially to make both large moves and short adjustments easy. ;; What this boils down to is that you can easily scroll around the ;; buffer without much mouse movement. Finally, clicks which aren't ;; drags are passed off to the old mouse-2 binding, so old mouse-2 ;; operations (find-file in dired-mode, yanking in most other modes) ;; still work. ;; ;; There is an alternative way to scroll, ``drag'' scrolling. You ;; can click on a character and then drag it around, scrolling the ;; buffer with you. The character always stays under the mouse. ;; Compared to throw-scrolling, this approach provides direct ;; manipulation (nice) but requires more mouse movement ;; (unfortunate). It is offered as an alternative for those who ;; prefer it. ;; ;; If you like mouse-drag, you should also check out mouse-copy ;; for ``one-click text copy and move''. ;; ;; To use mouse-drag, place the following in your .emacs file: ;; -either- ;; (global-set-key [down-mouse-2] 'mouse-drag-throw) ;; -or- ;; (global-set-key [down-mouse-2] 'mouse-drag-drag) ;; ;; ;; ;; Options: ;; ;; - reverse the throw-scroll direction with \\[mouse-throw-with-scroll-bar] ;; - work around a bug with \\[mouse-extras-work-around-drag-bug] ;; - auto-enable horizontal scrolling with ;; \\[mouse-drag-electric-col-scrolling] ;; ;; ;; History and related work: ;; ;; One-click copying and moving was inspired by lemacs-19.8. ;; Throw-scrolling was inspired by MacPaint's ``hand'' and by Tk's ;; mouse-2 scrolling. The package mouse-scroll.el by Tom Wurgler ;; <twurgler@goodyear.com> is similar to mouse-drag-throw, but ;; doesn't pass clicks through. ;; ;; These functions have been tested in emacs version 19.30, ;; and this package has run in the past on 19.25-19.29. ;; ;; Originally mouse-drag was part of a larger package. ;; As of 11 July 96 the scrolling functions were split out ;; in preparation for incorporation into (the future) emacs-19.32. ;; ;; Thanks: ;; ;; Thanks to Kai Grossjohann ;; <grossjoh@dusty.informatik.uni-dortmund.de> for reporting bugs, to ;; Tom Wurgler <twurgler@goodyear.com> for reporting bugs and ;; suggesting fixes, and to Joel Graber <jgraber@ti.com> for ;; prompting me to do drag-scrolling and for an initial ;; implementation of horizontal drag-scrolling. ;; ;; -johnh@isi.edu, 11-Jul-96 ;; ;; ;; What's new with mouse-drag 2.24? ;; ;; - mouse-drag-electric-col-scrolling (default: on) ;; auto-enables horizontal scrolling when clicks on wrapped ;; lines occur ;; TODO: ;; - For mouse-drag-throw, we should try and place some visual indicator ;; of the original mouse position (like Firefox does). ;;; Code: ;; ;; scrolling code ;; (defun mouse-drag-safe-scroll (row-delta &optional col-delta) "Scroll down ROW-DELTA lines and right COL-DELTA, ignoring buffer edge errors. Keep the cursor on the screen as needed." (let ((scroll-preserve-screen-position nil)) (if (and row-delta (/= 0 row-delta)) (condition-case nil ;; catch and ignore movement errors (scroll-down row-delta) (beginning-of-buffer (message "Beginning of buffer")) (end-of-buffer (message "End of buffer")))) (if (and col-delta (/= 0 col-delta)) (progn (scroll-right col-delta) ;; Make sure that the point stays on the visible screen ;; (if truncation-lines in set). ;; This code mimics the behavior we automatically get ;; when doing vertical scrolling. ;; Problem identified and a fix suggested by Tom Wurgler. (cond ((< (current-column) (window-hscroll)) (move-to-column (window-hscroll))) ; make on left column ((> (- (current-column) (window-hscroll) (window-width) -2) 0) (move-to-column (+ (window-width) (window-hscroll) -3)))))))) (defun mouse-drag-repeatedly-safe-scroll (row-delta &optional col-delta) "Scroll ROW-DELTA rows and COL-DELTA cols until an event happens." (while (sit-for mouse-scroll-delay) (mouse-drag-safe-scroll row-delta col-delta))) (defun mouse-drag-events-are-point-events-p (start-posn end-posn) "Determine if START-POSN and END-POSN are \"close\"." (let* ((start-col-row (posn-col-row start-posn)) (end-col-row (posn-col-row end-posn))) (and ;; ;; We no longer exclude things by time. ;; (< (- (posn-timestamp end-posn) (posn-timestamp start-posn)) ;; (if (numberp double-click-time) ;; (* 2 double-click-time) ;; stretch it a little ;; 999999)) ;; non-numeric => check by position alone (= (car start-col-row) (car end-col-row)) (= (cdr start-col-row) (cdr end-col-row))))) (defvar mouse-drag-electric-col-scrolling t "If non-nil, mouse-drag on a long line enables truncate-lines.") (defun mouse-drag-should-do-col-scrolling () "Determine if it's wise to enable col-scrolling for the current window. Basically, we check for existing horizontal scrolling." (or truncate-lines (> (window-hscroll (selected-window)) 0) (not (window-full-width-p)) (and mouse-drag-electric-col-scrolling (save-excursion ;; on a long line? (let ((beg (progn (beginning-of-line) (point))) (end (progn (end-of-line) (point)))) (if (> (- end beg) (window-width)) (setq truncate-lines t) nil)))))) (defvar mouse-throw-with-scroll-bar nil "*Set direction of mouse-throwing. If nil, the text moves in the direction the mouse moves. If t, the scroll bar moves in the direction the mouse moves.") (defconst mouse-throw-magnifier-min -6) (defconst mouse-throw-magnifier-max 6) (defconst mouse-throw-magnifier-base 1.5) (defun mouse-drag-scroll-delta (mouse-delta) ;; Limit the exponential explosion. (setq mouse-delta (max mouse-throw-magnifier-min (min mouse-throw-magnifier-max mouse-delta))) (* (round (exp (* (log mouse-throw-magnifier-base) (abs mouse-delta)))) (if (< mouse-delta 0) -1 1) (if mouse-throw-with-scroll-bar 1 -1))) ;;;###autoload (defun mouse-drag-throw (start-event) "\"Throw\" the page according to a mouse drag. A \"throw\" is scrolling the page at a speed relative to the distance from the original mouse click to the current mouse location. Try it; you'll like it. It's easier to observe than to explain. If the mouse is clicked and released in the same place of time we assume that the user didn't want to scdebugroll but wanted to whatever mouse-2 used to do, so we pass it through. Throw scrolling was inspired (but is not identical to) the \"hand\" option in MacPaint, or the middle button in Tk text widgets. If `mouse-throw-with-scroll-bar' is non-nil, then this command scrolls in the opposite direction. (Different people have different ideas about which direction is natural. Perhaps it has to do with which hemisphere you're in.) To test this function, evaluate: (global-set-key [down-mouse-2] 'mouse-drag-throw)" (interactive "e") ;; we want to do save-selected-window, but that requires 19.29 (let* ((start-posn (event-start start-event)) (start-window (posn-window start-posn)) (start-row (cdr (posn-col-row start-posn))) (start-col (car (posn-col-row start-posn))) (old-selected-window (selected-window)) event end row mouse-delta scroll-delta have-scrolled window-last-row col mouse-col-delta window-last-col (scroll-col-delta 0) adjusted-mouse-col-delta adjusted-mouse-delta ;; be conservative about allowing horizontal scrolling (col-scrolling-p (mouse-drag-should-do-col-scrolling))) (select-window start-window) (track-mouse (while (progn (setq event (read-event) end (event-end event) row (cdr (posn-col-row end)) col (car (posn-col-row end))) (or (mouse-movement-p event) (eq (car-safe event) 'switch-frame))) (when (eq start-window (posn-window end)) (when col-scrolling-p (setq scroll-col-delta (mouse-drag-scroll-delta (- start-col col)))) (setq scroll-delta (mouse-drag-scroll-delta (- start-row row)))) (if (or (/= 0 scroll-delta) (/= 0 scroll-col-delta)) (progn (setq have-scrolled t) (mouse-drag-safe-scroll scroll-delta scroll-col-delta) (mouse-drag-repeatedly-safe-scroll scroll-delta scroll-col-delta))))) ;xxx ;; If it was a click and not a drag, prepare to pass the event on. ;; Is there a more correct way to reconstruct the event? (if (and (not have-scrolled) (mouse-drag-events-are-point-events-p start-posn end)) (push (cons (event-basic-type start-event) (cdr start-event)) unread-command-events)) ;; Now restore the old window. (select-window old-selected-window))) ;;;###autoload (defun mouse-drag-drag (start-event) "\"Drag\" the page according to a mouse drag. Drag scrolling moves the page according to the movement of the mouse. You \"grab\" the character under the mouse and move it around. If the mouse is clicked and released in the same place of time we assume that the user didn't want to scroll but wanted to whatever mouse-2 used to do, so we pass it through. Drag scrolling is identical to the \"hand\" option in MacPaint, or the middle button in Tk text widgets. To test this function, evaluate: (global-set-key [down-mouse-2] 'mouse-drag-drag)" (interactive "e") ;; we want to do save-selected-window, but that requires 19.29 (let* ((start-posn (event-start start-event)) (start-window (posn-window start-posn)) (start-row (cdr (posn-col-row start-posn))) (start-col (car (posn-col-row start-posn))) (old-selected-window (selected-window)) event end row mouse-delta scroll-delta have-scrolled window-last-row col mouse-col-delta window-last-col (scroll-col-delta 0) ;; be conservative about allowing horizontal scrolling (col-scrolling-p (mouse-drag-should-do-col-scrolling))) (select-window start-window) (setq window-last-row (- (window-height) 2) window-last-col (- (window-width) 2)) (track-mouse (while (progn (setq event (read-event) end (event-end event) row (cdr (posn-col-row end)) col (car (posn-col-row end))) (or (mouse-movement-p event) (eq (car-safe event) 'switch-frame))) ;; Scroll if see if we're on the edge. ;; NEEDSWORK: should handle mouse-in-other window. (cond ((not (eq start-window (posn-window end))) t) ; wait for return to original window ((<= row 0) (mouse-drag-repeatedly-safe-scroll -1 0)) ((>= row window-last-row) (mouse-drag-repeatedly-safe-scroll 1 0)) ((and col-scrolling-p (<= col 1)) (mouse-drag-repeatedly-safe-scroll 0 -1)) ((and col-scrolling-p (>= col window-last-col)) (mouse-drag-repeatedly-safe-scroll 0 1)) (t (setq scroll-delta (- row start-row) start-row row) (if col-scrolling-p (setq scroll-col-delta (- col start-col) start-col col)) (if (or (/= 0 scroll-delta) (/= 0 scroll-col-delta)) (progn (setq have-scrolled t) (mouse-drag-safe-scroll scroll-delta scroll-col-delta))))))) ;; If it was a click and not a drag, prepare to pass the event on. ;; Is there a more correct way to reconstruct the event? (if (and (not have-scrolled) (mouse-drag-events-are-point-events-p start-posn end)) (push (cons (event-basic-type start-event) (cdr start-event)) unread-command-events)) ;; Now restore the old window. (select-window old-selected-window))) (provide 'mouse-drag) ;; arch-tag: e47354ff-82f5-42c4-b3dc-88dd9c04b770 ;;; mouse-drag.el ends here