Mercurial > emacs
view lisp/scroll-bar.el @ 109581:06384b3caebf
Add ability to put Gtk+ tool bar on the left/right/bottom or top. Default top.
* lisp/menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
(menu-bar-showhide-tool-bar-menu-customize-disable)
(menu-bar-showhide-tool-bar-menu-customize-enable-right)
(menu-bar-showhide-tool-bar-menu-customize-enable-top)
(menu-bar-showhide-tool-bar-menu-customize-enable-bottom): New functions
(menu-bar-showhide-tool-bar-menu): If tool bar is moveable,
make a menu for Options => toolbar that can move it.
* src/frame.c (Qtool_bar_position): New variable.
(make_frame): Set tool_bar_position to Qtop.
(frame_parms): Add tool-bar-position.
(x_report_frame_params): Store tool_bar_position.
(x_set_fringe_width): Reset wm size hint after fringe changes.
* src/frame.h (struct frame): Add tool_bar_position.
(Qbottom): Declare.
* src/gtkutil.c (FRAME_TOTAL_PIXEL_WIDTH): New macro.
(xg_frame_set_char_size): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
(xg_height_or_width_changed): Use FRAME_TOTAL_PIXEL_WIDTH.
(xg_create_frame_widgets): Create a hobox for placing widgets
vertically. Use gtk_box_pack_start.
(xg_height_or_width_changed): Renamed from xg_height_changed.
(x_wm_set_size_hint): Add FRAME_TOOLBAR_WIDTH to base_width.
(xg_update_frame_menubar, free_frame_menubar): Change to
xg_height_or_width_changed.
(xg_tool_bar_detach_callback): Update left/right/top/bottom tool bar
size correctly. Remove hardcoded 4, instead use handlebox size -
toolbar size.
(xg_tool_bar_attach_callback): Update left/right/top/bottom tool bar
size correctly. Use handlebox size + toolbar size as additional
size.
(xg_pack_tool_bar): POS is a new parameter.
Set orientation of tool bar based on pos.
Only make handlebox_widget if NULL.
Check if tool bar goes to vbox or hbox depending on pos.
(xg_update_tool_bar_sizes): New function.
(update_frame_tool_bar): Remove old_req, new_req. Do not get tool bar
height, call xg_update_tool_bar_sizes instead.
(free_frame_tool_bar): Remove from hbox or vbox depending on
toolbar_in_hbox, Set all FRAME_TOOLBAR_*_(WIDTH|HEIGHT) to zero.
(xg_change_toolbar_position): New function.
* src/gtkutil.h (xg_change_toolbar_position): Declare.
* src/window.c (calc_absolute_offset): Check for FRAME_TOOLBAR_TOP_HEIGHT
and FRAME_TOOLBAR_LEFT_WIDTH.
* src/xfns.c (x_set_tool_bar_position): New function.
(xic_set_statusarea): Use FRAME_TOOLBAR_TOP_HEIGHT.
(x_frame_parm_handlers): Add x_set_tool_bar_position.
(syms_of_xfns): if USE_GTK, provide move-toolbar.
* src/xterm.c (x_set_window_size_1): Add FRAME_TOOLBAR_WIDTH to pixelwidth.
* src/xterm.h (struct x_output): Add toolbar_top_height,
toolbar_bottom_height, toolbar_left_width, toolbar_right_width. Remove
toolbar_height.
if USE_GTK: Add hbox_widget and toolbar_in_hbox.
(FRAME_TOOLBAR_TOP_HEIGHT, FRAME_TOOLBAR_BOTTOM_HEIGHT)
(FRAME_TOOLBAR_LEFT_WIDTH, FRAME_TOOLBAR_RIGHT_WIDTH): New macros.
(FRAME_TOOLBAR_HEIGHT): Is now TOP_HEIGHT + BOTTOM_HEIGHT.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 29 Jul 2010 18:49:59 +0200 |
parents | dc6153a5f4f7 |
children | 280c8ae2476d |
line wrap: on
line source
;;; scroll-bar.el --- window system-independent scroll bar support ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: hardware ;; 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: ;; Window-system-independent bindings of mouse clicks on the scroll bar. ;; Presently emulates the scroll-bar behavior of xterm. ;;; Code: (require 'mouse) (eval-when-compile (require 'cl)) ;;;; Utilities. (defun scroll-bar-event-ratio (event) "Given a scroll bar event EVENT, return the scroll bar position as a ratio. The value is a cons cell (PORTION . WHOLE) containing two integers whose ratio gives the event's vertical position in the scroll bar, with 0 referring to the top and 1 to the bottom." (nth 2 event)) (defun scroll-bar-scale (num-denom whole) "Given a pair (NUM . DENOM) and WHOLE, return (/ (* NUM WHOLE) DENOM). This is handy for scaling a position on a scroll bar into real units, like buffer positions. If SCROLL-BAR-POS is the (PORTION . WHOLE) pair from a scroll bar event, then (scroll-bar-scale SCROLL-BAR-POS \(buffer-size)) is the position in the current buffer corresponding to that scroll bar position." ;; We multiply before we divide to maintain precision. ;; We use floating point because the product of a large buffer size ;; with a large scroll bar portion can easily overflow a lisp int. (truncate (/ (* (float (car num-denom)) whole) (cdr num-denom)))) (defun scroll-bar-columns (side) "Return the width, measured in columns, of the vertical scrollbar on SIDE. SIDE must be the symbol `left' or `right'." (let* ((wsb (window-scroll-bars)) (vtype (nth 2 wsb)) (cols (nth 1 wsb))) (cond ((not (memq side '(left right))) (error "`left' or `right' expected instead of %S" side)) ((and (eq vtype side) cols)) ((eq (frame-parameter nil 'vertical-scroll-bars) side) ;; nil means it's a non-toolkit scroll bar, and its width in ;; columns is 14 pixels rounded up. (ceiling (or (frame-parameter nil 'scroll-bar-width) 14) (frame-char-width))) (0)))) ;;;; Helpful functions for enabling and disabling scroll bars. (defvar scroll-bar-mode) (defvar previous-scroll-bar-mode nil) (defvar scroll-bar-mode-explicit nil "Non-nil means `set-scroll-bar-mode' should really do something. This is nil while loading `scroll-bar.el', and t afterward.") (defun set-scroll-bar-mode (value) "Set `scroll-bar-mode' to VALUE and put the new value into effect." (if scroll-bar-mode (setq previous-scroll-bar-mode scroll-bar-mode)) (setq scroll-bar-mode value) (when scroll-bar-mode-explicit (modify-all-frames-parameters (list (cons 'vertical-scroll-bars scroll-bar-mode))))) (defcustom scroll-bar-mode default-frame-scroll-bars "Specify whether to have vertical scroll bars, and on which side. Possible values are nil (no scroll bars), `left' (scroll bars on left) and `right' (scroll bars on right). To set this variable in a Lisp program, use `set-scroll-bar-mode' to make it take real effect. Setting the variable with a customization buffer also takes effect." :type '(choice (const :tag "none (nil)" nil) (const left) (const right)) :group 'frames ;; The default value for :initialize would try to use :set ;; when processing the file in cus-dep.el. :initialize 'custom-initialize-default :set (lambda (sym val) (set-scroll-bar-mode val))) ;; We just set scroll-bar-mode, but that was the default. ;; If it is set again, that is for real. (setq scroll-bar-mode-explicit t) (defun get-scroll-bar-mode () scroll-bar-mode) (defsetf get-scroll-bar-mode set-scroll-bar-mode) (define-minor-mode scroll-bar-mode "Toggle display of vertical scroll bars on all frames. This command applies to all frames that exist and frames to be created in the future. With a numeric argument, if the argument is positive turn on scroll bars; otherwise turn off scroll bars." :variable (eq (get-scroll-bar-mode) (or previous-scroll-bar-mode default-frame-scroll-bars))) (defun toggle-scroll-bar (arg) "Toggle whether or not the selected frame has vertical scroll bars. With arg, turn vertical scroll bars on if and only if arg is positive. The variable `scroll-bar-mode' controls which side the scroll bars are on when they are turned on; if it is nil, they go on the left." (interactive "P") (if (null arg) (setq arg (if (cdr (assq 'vertical-scroll-bars (frame-parameters (selected-frame)))) -1 1)) (setq arg (prefix-numeric-value arg))) (modify-frame-parameters (selected-frame) (list (cons 'vertical-scroll-bars (if (> arg 0) (or scroll-bar-mode default-frame-scroll-bars)))))) (defun toggle-horizontal-scroll-bar (arg) "Toggle whether or not the selected frame has horizontal scroll bars. With arg, turn horizontal scroll bars on if and only if arg is positive. Horizontal scroll bars aren't implemented yet." (interactive "P") (error "Horizontal scroll bars aren't implemented yet")) ;;;; Buffer navigation using the scroll bar. ;; This was used for up-events on button 2, but no longer. (defun scroll-bar-set-window-start (event) "Set the window start according to where the scroll bar is dragged. EVENT should be a scroll bar click or drag event." (interactive "e") (let* ((end-position (event-end event)) (window (nth 0 end-position)) (portion-whole (nth 2 end-position))) (with-current-buffer (window-buffer window) (save-excursion (goto-char (+ (point-min) (scroll-bar-scale portion-whole (- (point-max) (point-min))))) (beginning-of-line) (set-window-start window (point)))))) (defun scroll-bar-drag-position (portion-whole) "Calculate new window start for drag event." (save-excursion (goto-char (+ (point-min) (scroll-bar-scale portion-whole (- (point-max) (point-min))))) (beginning-of-line) (point))) (defun scroll-bar-maybe-set-window-start (event) "Set the window start according to where the scroll bar is dragged. Only change window start if the new start is substantially different. EVENT should be a scroll bar click or drag event." (interactive "e") (let* ((end-position (event-end event)) (window (nth 0 end-position)) (portion-whole (nth 2 end-position)) (next-portion-whole (cons (1+ (car portion-whole)) (cdr portion-whole))) portion-start next-portion-start (current-start (window-start window))) (with-current-buffer (window-buffer window) (setq portion-start (scroll-bar-drag-position portion-whole)) (setq next-portion-start (max (scroll-bar-drag-position next-portion-whole) (1+ portion-start))) (if (or (>= current-start next-portion-start) (< current-start portion-start)) (set-window-start window portion-start) ;; Always set window start, to ensure scroll bar position is updated. (set-window-start window current-start))))) ;; Scroll the window to the proper position for EVENT. (defun scroll-bar-drag-1 (event) (let* ((start-position (event-start event)) (window (nth 0 start-position)) (portion-whole (nth 2 start-position))) (save-excursion (with-current-buffer (window-buffer window) ;; Calculate position relative to the accessible part of the buffer. (goto-char (+ (point-min) (scroll-bar-scale portion-whole (- (point-max) (point-min))))) (vertical-motion 0 window) (set-window-start window (point)))))) (defun scroll-bar-drag (event) "Scroll the window by dragging the scroll bar slider. If you click outside the slider, the window scrolls to bring the slider there." (interactive "e") (let* (done (echo-keystrokes 0) (end-position (event-end event)) (window (nth 0 end-position)) (before-scroll)) (with-current-buffer (window-buffer window) (setq before-scroll point-before-scroll)) (save-selected-window (select-window window) (setq before-scroll (or before-scroll (point)))) (scroll-bar-drag-1 event) (track-mouse (while (not done) (setq event (read-event)) (if (eq (car-safe event) 'mouse-movement) (setq event (read-event))) (cond ((eq (car-safe event) 'scroll-bar-movement) (scroll-bar-drag-1 event)) (t ;; Exit when we get the drag event; ignore that event. (setq done t))))) (sit-for 0) (with-current-buffer (window-buffer window) (setq point-before-scroll before-scroll)))) (defun scroll-bar-scroll-down (event) "Scroll the window's top line down to the location of the scroll bar click. EVENT should be a scroll bar click." (interactive "e") (let* ((end-position (event-end event)) (window (nth 0 end-position)) (before-scroll)) (with-current-buffer (window-buffer window) (setq before-scroll point-before-scroll)) (unwind-protect (save-selected-window (let ((portion-whole (nth 2 end-position))) (select-window window) (setq before-scroll (or before-scroll (point))) (scroll-down (scroll-bar-scale portion-whole (1- (window-height))))) (sit-for 0)) (with-current-buffer (window-buffer window) (setq point-before-scroll before-scroll))))) (defun scroll-bar-scroll-up (event) "Scroll the line next to the scroll bar click to the top of the window. EVENT should be a scroll bar click." (interactive "e") (let* ((end-position (event-end event)) (window (nth 0 end-position)) (before-scroll)) (with-current-buffer (window-buffer window) (setq before-scroll point-before-scroll)) (unwind-protect (save-selected-window (let ((portion-whole (nth 2 end-position))) (select-window window) (setq before-scroll (or before-scroll (point))) (scroll-up (scroll-bar-scale portion-whole (1- (window-height))))) (sit-for 0)) (with-current-buffer (window-buffer window) (setq point-before-scroll before-scroll))))) ;;; Tookit scroll bars. (defun scroll-bar-toolkit-scroll (event) (interactive "e") (let* ((end-position (event-end event)) (window (nth 0 end-position)) (part (nth 4 end-position)) before-scroll) (cond ((eq part 'end-scroll)) (t (with-current-buffer (window-buffer window) (setq before-scroll point-before-scroll)) (save-selected-window (select-window window) (setq before-scroll (or before-scroll (point))) (cond ((eq part 'above-handle) (scroll-up '-)) ((eq part 'below-handle) (scroll-up nil)) ((eq part 'ratio) (let* ((portion-whole (nth 2 end-position)) (lines (scroll-bar-scale portion-whole (1- (window-height))))) (scroll-up (cond ((not (zerop lines)) lines) ((< (car portion-whole) 0) -1) (t 1))))) ((eq part 'up) (scroll-up -1)) ((eq part 'down) (scroll-up 1)) ((eq part 'top) (set-window-start window (point-min))) ((eq part 'bottom) (goto-char (point-max)) (recenter)) ((eq part 'handle) (scroll-bar-drag-1 event)))) (sit-for 0) (with-current-buffer (window-buffer window) (setq point-before-scroll before-scroll)))))) ;;;; Bindings. ;; For now, we'll set things up to work like xterm. (cond ((and (boundp 'x-toolkit-scroll-bars) x-toolkit-scroll-bars) (global-set-key [vertical-scroll-bar mouse-1] 'scroll-bar-toolkit-scroll)) (t (global-set-key [vertical-scroll-bar mouse-1] 'scroll-bar-scroll-up) (global-set-key [vertical-scroll-bar drag-mouse-1] 'scroll-bar-scroll-up) (global-set-key [vertical-scroll-bar down-mouse-2] 'scroll-bar-drag) (global-set-key [vertical-scroll-bar mouse-3] 'scroll-bar-scroll-down) (global-set-key [vertical-scroll-bar drag-mouse-3] 'scroll-bar-scroll-down))) (provide 'scroll-bar) ;; arch-tag: 6f1d01d0-0b1e-4bf8-86db-d491e0f399f3 ;;; scroll-bar.el ends here