*** empty log message ***

[gnu-emacs] / lisp / scroll-bar.el

diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 2100a1f51ec9c0ee05d548939f20a940df6eced2..d08c5c63acd91971115ac7bd2500770bd0586e4b 100644 (file)
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -1,6 +1,7 @@
-;;; scroll-bar.el --- window system-independent scroll bar support.
+;;; scroll-bar.el --- window system-independent scroll bar support

 
 

-;; Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001
+;;  Free Software Foundation, Inc.

 
 ;; Maintainer: FSF
 ;; Keywords: hardware
 
 ;; Maintainer: FSF
 ;; Keywords: hardware


@@ -86,14 +87,14 @@ This is nil while loading `scroll-bar.el', and t afterward.")
         (list (cons 'vertical-scroll-bars scroll-bar-mode)))
        (setq frames (cdr frames))))))
 
         (list (cons 'vertical-scroll-bars scroll-bar-mode)))
        (setq frames (cdr frames))))))
 

-(defcustom scroll-bar-mode 'left
+(defcustom scroll-bar-mode
+  (if (eq system-type 'windows-nt) 'right 'left)

   "*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).
   "*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).

-When you set the variable in a Lisp program, it takes effect for new frames,
-and for existing frames when `toggle-scroll-bar' is used.
-When you set this with the customization buffer,
-it takes effect immediately for all frames."
+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)")
                 (const left)
                 (const right))
   :type '(choice (const :tag "none (nil)")
                 (const left)
                 (const right))


@@ -104,7 +105,7 @@ it takes effect immediately for all frames."
 ;; If it is set again, that is for real.
 (setq scroll-bar-mode-explicit t)
 
 ;; If it is set again, that is for real.
 (setq scroll-bar-mode-explicit t)
 

-(defun scroll-bar-mode (flag)
+(defun scroll-bar-mode (&optional flag)

   "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.
   "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.


@@ -116,7 +117,7 @@ turn off scroll bars; otherwise, turn on scroll bars."
   ;; Tweedle the variable according to the argument.
   (set-scroll-bar-mode (if (null flag) (not scroll-bar-mode)
                         (and (or (not (numberp flag)) (>= flag 0))
   ;; Tweedle the variable according to the argument.
   (set-scroll-bar-mode (if (null flag) (not scroll-bar-mode)
                         (and (or (not (numberp flag)) (>= flag 0))

-                             'left))))
+                             (if (eq system-type 'windows-nt) 'right 'left)))))

 
 (defun toggle-scroll-bar (arg)
   "Toggle whether or not the selected frame has vertical scroll bars.
 
 (defun toggle-scroll-bar (arg)
   "Toggle whether or not the selected frame has vertical scroll bars.


@@ -130,10 +131,12 @@ when they are turned on; if it is nil, they go on the left."
                           (frame-parameters (selected-frame))))
                -1 1))
     (setq arg (prefix-numeric-value arg)))
                           (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 'left))))))
+  (modify-frame-parameters
+   (selected-frame)
+   (list (cons 'vertical-scroll-bars
+              (if (> arg 0)
+                  (or scroll-bar-mode
+                      (if (eq system-type 'windows-nt) 'right 'left)))))))

 
 (defun toggle-horizontal-scroll-bar (arg)
   "Toggle whether or not the selected frame has horizontal scroll bars.
 
 (defun toggle-horizontal-scroll-bar (arg)
   "Toggle whether or not the selected frame has horizontal scroll bars.


@@ -248,16 +251,17 @@ EVENT should be a scroll bar click."
         (before-scroll))
     (with-current-buffer (window-buffer window)
       (setq before-scroll point-before-scroll))
         (before-scroll))
     (with-current-buffer (window-buffer window)
       (setq before-scroll point-before-scroll))

-    (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))))
+    (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.
 
 (defun scroll-bar-scroll-up (event)
   "Scroll the line next to the scroll bar click to the top of the window.


@@ -268,28 +272,79 @@ EVENT should be a scroll bar click."
         (before-scroll))
     (with-current-buffer (window-buffer window)
       (setq before-scroll point-before-scroll))
         (before-scroll))
     (with-current-buffer (window-buffer window)
       (setq before-scroll point-before-scroll))

-    (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))))
+    (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)))))

 
 \f
 
 \f

-;;;; Bindings.
+;;; Tookit scroll bars.

 
 

-;;; For now, we'll set things up to work like xterm.
-(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)
+(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))))))

 
 

-(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)
+\f
+;;;; 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)))

 
 \f
 (provide 'scroll-bar)
 
 \f
 (provide 'scroll-bar)