Mercurial > emacs
annotate lisp/scroll-bar.el @ 94414:d86cb59eea9f
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org.el (org-html-level-start): Always have id's in HTML
(org-export-as-html): Use `org-link-protocols' to
retrieve the export form of the link.
(org-add-link-type): Final parameter renamed from PUBLISH. Better
documentation of how it is to be used. Avoid double entries for
the same link type.
(org-add-link-props): New function.
(org-modules-loaded): New variable.
(org-load-modules-maybe, org-set-modules): New function.
(org-modules): New option.
(org-mode, org-cycle, orgstruct-mode, org-run-like-in-org-mode)
(orgtbl-mode, org-store-link, org-insert-link-global)
(org-open-at-point): Call `org-load-modules-maybe'.
(org-search-view): Add more text properties.
(org-agenda-schedule, org-agenda-deadline): Allow also in
search-type agendas.
(org-search-view): Order of arguments has been changed.
Interpret prefix-arg as TODO-ONLY.
(org-agenda, org-run-agenda-series, org-agenda-manipulate-query):
Take new argument order of `org-search-view' into account.
(org-todo-only): New variable.
(org-search-syntax-table): New variable and function.
(org-search-view): Do the search with the special syntax table.
(define-obsolete-function-alias): Make work with XEmacs.
(org-add-planning-info): Use old date as default when modifying an
existing deadline or scheduled item.
(org-agenda-compute-time-span): Make argument N optional.
(org-agenda-format-date-aligned): Require `cal-iso'.
(org-agenda-list): Include week into into agenda heading, don't
list it at each date (only on Mondays).
(org-read-date-analyze): Define local variable `iso-date'.
(org-agenda-format-date-aligned): Remove dependency on
`calendar-time-from-absolute'.
(org-remember-apply-template, org-go-to-remember-target):
Interpret filenames relative to `org-directory'.
(org-complete): Silently fail when trying to complete
keywords that don't have a default value.
(org-get-current-options): Added a #+DATE: option.
(org-additional-option-like-keywords): Removed "DATE:" from the
list of additional keywords.
(org-export-as-html): Removed (current-time) as unnecessary second
argument of `format-time-string'.
(org-clock-find-position): Handle special case at end of
buffer.
(org-agenda-day-view): New argument DAY-OF-YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-week-view): New argument ISO-WEEK, pass it on to
`org-agenda-change-time-span'.
(org-agenda-month-view): New argument MONTH, pass it on to
`org-agenda-change-time-span'.
(org-agenda-year-view): New argument YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-change-time-span): New optional argument N, pass it on
to `org-agenda-compute-time-span'.
(org-agenda-compute-time-span): New argument N, interpret it by
changing the starting day.
(org-small-year-to-year): New function.
(org-scheduled-past-days): Respect
`org-scheduled-past-days'.
(org-auto-repeat-maybe): Make sure that repeating
dates are pushed into the future, and that the shift is at least
one interval, never 0.
(org-update-checkbox-count): Fix bug with checkbox
counting.
(org-add-note): New command.
(org-add-log-setup): Renamed from `org-add-log-maybe'.
(org-log-note-headings): New entry for plain notes (i.e. notes not
related to state changes or clocking).
(org-get-org-file): Check for availability of
`remember-data-file'.
(org-cached-entry-get): Allow a regexp value for
`org-use-property-inheritance'.
(org-use-property-inheritance): Allow regexp value. Fix bug in
customization type.
(org-use-tag-inheritance): Allow a list and a regexp value for
this variable.
(org-scan-tags, org-get-tags-at): Implement selective tag
inheritance.
(org-entry-get): Respect value `selective' for the INHERIT
argument.
(org-tag-inherit-p, org-property-inherit-p): New functions.
(org-agenda-format-date-aligned): Allow 10 characters for
weekday, to acomodate German locale.
(org-add-archive-files): New function.
(org-agenda-files): New argument `ext', to
get archive files as well.
(org-tbl-menu): Protect the use of variables that
are only available when org-table.el gets loaded.
(org-read-agenda-file-list): Error if `org-agenda-files' is a
single directory.
(org-open-file): Allow a batch process to trigger
waiting after executing a system command.
(org-store-link): Link to headline when there is not
target and no region in an org-mode buffer when creating a link.
(org-link-types-re): New variable.
(org-make-link-regexps): Compute `org-link-types-re'.
(org-make-link-description-function): New option.
(org-agenda-date, org-agenda-date-weekend): New faces.
(org-archive-sibling-heading): New option.
(org-archive-to-archive-sibling): New function.
(org-iswitchb): New command.
(org-buffer-list): New function.
(org-agenda-columns): Also try the #+COLUMNS line in
the buffer associated with the entry at point (or with the first
entry in the agenda view).
(org-modules): Add entry for org-bibtex.el.
(org-completion-fallback-command): Moved into `org-completion'
group.
(org-clock-heading-function): Moved to `org-progress' group.
(org-auto-repeat-maybe): Make sure that a note can
be enforces if `org-log-repeat' is `note'.
(org-modules): Allow additional symbols for external
packages.
(org-ctrl-c-ctrl-c): Allow for `org-clock-overlays' to be
undefined.
(org-clock-goto): Hide drawers after showing an
entry with `org-clock-goto.'
(org-shiftup, org-shiftdown, org-shiftright, org-shiftleft): Try
also a clocktable block shift.
(org-clocktable-try-shift): New function.
(org-columns-hscoll-title): New function.
(org-columns-previous-hscroll): New variable.
(org-columns-full-header-line-format): New variable.
(org-columns-display-here-title, org-columns-remove-overlays):
Install `org-columns-hscoll-title' in post-command-hook.
* org/org.el: Split into many small files.
* org/org-agenda.el: New file, split off from org.el.
* org/org-archive.el: New file, split off from org.el.
* org/org-bbdb.el: New file.
* org/org-bibtex.el: New file, split off from org.el.
* org/org-clock.el: New file, split off from org.el.
* org/org-colview.el: New file, split off from org.el.
* org/org-compat.el: New file, split off from org.el.
* org/org-exp.el: New file, split off from org.el.
* org/org-faces.el: New file, split off from org.el.
* org/org-gnus.el: New file, split off from org.el.
* org/org-info.el: New file, split off from org.el.
* org/org-infojs.el: New file.
* org/org-irc.el: New file.
* org/org-macs.el: New file, split off from org.el.
* org/org-mew.el: New file.
* org/org-mhe.el: New file, split off from org.el.
* org/org-publish.el: New file, split off from org.el.
* org/org-remember.el: New file, split off from org.el.
* org/org-rmail.el: New file, split off from org.el.
* org/org-table.el: New file, split off from org.el.
* org/org-vm.el: New file, split off from org.el.
* org/org-wl.el: New file, split off from org.el.
2008-04-27 Jason Riedy <jason@acm.org>
* lisp/org-table.el (orgtbl-to-generic): Add a :remove-nil-lines
parameter that supresses lines that evaluate to NIL.
(orgtbl-get-fmt): New inline function for
picking apart formats that may be lists.
(orgtbl-apply-fmt): New inline function for applying formats that
may be functions.
(orgtbl-eval-str): New inline function for strings that may be
functions.
(orgtbl-format-line, orgtbl-to-generic): Use and document.
(orgtbl-to-latex, orgtbl-to-texinfo): Document.
(*orgtbl-llfmt*, *orgtbl-llstart*)
(*orgtbl-llend*): Dynamic variables for last-line formatting.
(orgtbl-format-section): Shift formatting to support detecting the
last line and formatting it specially.
(orgtbl-to-generic): Document :ll* formats. Set to the non-ll
formats unless overridden.
(orgtbl-to-latex): Suggest using :llend to suppress the final \\.
(*orgtbl-table*, *orgtbl-rtn*): Dynamically
bound variables to hold the input collection of lines and output
formatted text.
(*orgtbl-hline*, *orgtbl-sep*, *orgtbl-fmt*, *orgtbl-efmt*,
(*orgtbl-lfmt*, *orgtbl-lstart*, *orgtbl-lend*): Dynamically bound
format parameters.
(orgtbl-format-line): New function encapsulating formatting for a
single line.
(orgtbl-format-section): Similar for each section. Rebinding the
dynamic vars customizes the formatting for each section.
(orgtbl-to-generic): Use orgtbl-format-line and
orgtbl-format-section.
(org-get-param): Now unused, so delete.
(orgtbl-gather-send-defs): New function to
gather all the SEND definitions before a table.
(orgtbl-send-replace-tbl): New function to find the RECEIVE
corresponding to the current name.
(orgtbl-send-table): Use the previous two functions and implement
multiple destinations for each table.
* doc/org.texi (A LaTeX example): Note that fmt may be a
one-argument function, and efmt may be a two-argument function.
(Radio tables): Document multiple destinations.
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org-agenda.el (org-add-to-diary-list): New function.
(org-prefix-has-effort): New variable.
(org-sort-agenda-noeffort-is-high): New option.
(org-agenda-columns-show-summaries)
(org-agenda-columns-compute-summary-properties): New options.
(org-format-agenda-item): Compute the duration of the item.
(org-agenda-weekend-days): New variable.
(org-agenda-list, org-timeline): Use the proper faces for dates in
the agenda and timeline buffers.
(org-agenda-archive-to-archive-sibling): New command.
(org-agenda-start-with-clockreport-mode): New option.
(org-agenda-clockreport-parameter-plist): New option.
(org-agenda-clocktable-mode): New variable.
(org-agenda-deadline-leaders): Allow a function value for the
deadline leader.
(org-agenda-get-deadlines): Deal with new function value.
* lisp/org-clock.el (org-clock): New customization group.
(org-clock-into-drawer, org-clock-out-when-done)
(org-clock-in-switch-to-state, org-clock-heading-function): Moved
into the new group.
(org-clock-out-remove-zero-time-clocks): New option.
(org-clock-out): Use `org-clock-out-remove-zero-time-clocks'.
(org-dblock-write:clocktable): Allow a Lisp form for the scope
parameter.
(org-dblock-write:clocktable): Fixed bug with total time
calculation.
(org-dblock-write:clocktable): Request the unrestricted list of
files.
(org-get-clocktable): New function.
(org-dblock-write:clocktable): Make sure :tstart and :tend can not
only be strings but also integers (an absolute day number) and
lists (m d y).
* org/org-colview.el (org-columns-next-allowed-value)
(org-columns-edit-value): Limit the effort for updatig in the
agenda to recomputing a single file.
(org-columns-compute): Only write property value if it has
changed. This avoids raising the buffer-change-flag
unnecessarily.
(org-agenda-colview-summarize)
(org-agenda-colview-compute): New functions.
(org-agenda-columns): Call `org-agenda-colview-summarize'.
* org/org-exp.el (org-export-run-in-background): New option.
(org-export-icalendar): Allow a batch process to trigger waiting
after executing a system command.
(org-export-preprocess-string): Renamed-from
`org-cleaned-string-for-export'.
(org-export-html-style): Made target class look like normal text.
(org-export-as-html): Make use of the better proprocessing in
`org-cleaned-string-for-export'.
(org-cleaned-string-for-export): Better treatment of heuristic
targets, many more internal links will now work in HTML export.
(org-get-current-options): Incorporate LINK_UP, LINK_HOME, and
INFOJS.
(org-export-inbuffer-options-extra): New variable.
(org-export-options-filters): New hook.
(org-infile-export-plist): Find also the settings keywords in
`org-export-inbuffer-options-extra'.
(org-infile-export-plist): Allow multiple #+OPTIONS lines and
multiple #+INFOJS_OPT lines.
(org-export-html-handle-js-options): New function.
(org-export-html-infojs-setup): New option.
(org-export-as-html): Call `org-export-html-handle-js-options'.
Add autoload to all entry points.
(org-skip-comments): Function removed.
* org/org-table.el (org-table-make-reference): Extra parenthesis
around single fields, to make sure that algebraic formulas get
correctly interpreted by calc.
(org-table-current-column): No longer interactive.
* org/org-export-latex.el (org-export-latex-preprocess): Renamed
from `org-export-latex-cleaned-string'.
2008-04-27 Bastien Guerry <bzg@altern.org>
* org/org-publish.el (org-publish-get-base-files-1): New function.
(org-publish-get-base-files): Use it.
(org-publish-temp-files): New variable.
Don't require 'dired-aux anymore.
(org-publish-initial-buffer): New variable.
(org-publish-org-to, org-publish): Use it.
(org-publish-get-base-files-1): Bug fix: get
the proper list of files when recursing thru a directory.
(org-publish-get-base-files): Use the :exclude property to skip
both files and directories.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 27 Apr 2008 18:33:39 +0000 |
parents | 1e3a407766b9 |
children | ee5932bf781d |
rev | line source |
---|---|
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
36803
diff
changeset
|
1 ;;; scroll-bar.el --- window system-independent scroll bar support |
1772 | 2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003, |
79721 | 4 ;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
1772 | 5 |
6 ;; Maintainer: FSF | |
7 ;; Keywords: hardware | |
8 | |
14169 | 9 ;; This file is part of GNU Emacs. |
1772 | 10 |
14169 | 11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
12 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75347
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
14169 | 14 ;; any later version. |
1772 | 15 |
14169 | 16 ;; GNU Emacs is distributed in the hope that it will be useful, |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
1772 | 20 |
14169 | 21 ;; You should have received a copy of the GNU General Public License |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
2233
fb0ed5a1d0f3
Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
25 |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2233
diff
changeset
|
26 ;;; Commentary: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2233
diff
changeset
|
27 |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2233
diff
changeset
|
28 ;; Window-system-independent bindings of mouse clicks on the scroll bar. |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2233
diff
changeset
|
29 ;; Presently emulates the scroll-bar behavior of xterm. |
14169 | 30 |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2233
diff
changeset
|
31 ;;; Code: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2233
diff
changeset
|
32 |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1772
diff
changeset
|
33 (require 'mouse) |
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1772
diff
changeset
|
34 |
1772 | 35 |
36 ;;;; Utilities. | |
37 | |
7222
3dae5675cd3e
(scroll-bar-event-ratio): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4469
diff
changeset
|
38 (defun scroll-bar-event-ratio (event) |
3dae5675cd3e
(scroll-bar-event-ratio): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4469
diff
changeset
|
39 "Given a scroll bar event EVENT, return the scroll bar position as a ratio. |
3dae5675cd3e
(scroll-bar-event-ratio): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4469
diff
changeset
|
40 The value is a cons cell (PORTION . WHOLE) containing two integers |
3dae5675cd3e
(scroll-bar-event-ratio): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4469
diff
changeset
|
41 whose ratio gives the event's vertical position in the scroll bar, with 0 |
3dae5675cd3e
(scroll-bar-event-ratio): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4469
diff
changeset
|
42 referring to the top and 1 to the bottom." |
3dae5675cd3e
(scroll-bar-event-ratio): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4469
diff
changeset
|
43 (nth 2 event)) |
3dae5675cd3e
(scroll-bar-event-ratio): New function.
Richard M. Stallman <rms@gnu.org>
parents:
4469
diff
changeset
|
44 |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
45 (defun scroll-bar-scale (num-denom whole) |
1772 | 46 "Given a pair (NUM . DENOM) and WHOLE, return (/ (* NUM WHOLE) DENOM). |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
47 This is handy for scaling a position on a scroll bar into real units, |
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
48 like buffer positions. If SCROLL-BAR-POS is the (PORTION . WHOLE) pair |
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
49 from a scroll bar event, then (scroll-bar-scale SCROLL-BAR-POS |
1772 | 50 \(buffer-size)) is the position in the current buffer corresponding to |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
51 that scroll bar position." |
1772 | 52 ;; We multiply before we divide to maintain precision. |
53 ;; We use floating point because the product of a large buffer size | |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
54 ;; with a large scroll bar portion can easily overflow a lisp int. |
1772 | 55 (truncate (/ (* (float (car num-denom)) whole) (cdr num-denom)))) |
56 | |
54399
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
57 (defun scroll-bar-columns (side) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
58 "Return the width, measured in columns, of the vertical scrollbar on SIDE. |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
59 SIDE must be the symbol `left' or `right'." |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
60 (let* ((wsb (window-scroll-bars)) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
61 (vtype (nth 2 wsb)) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
62 (cols (nth 1 wsb))) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
63 (cond |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
64 ((not (memq side '(left right))) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
65 (error "`left' or `right' expected instead of %S" side)) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
66 ((and (eq vtype side) cols)) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
67 ((eq (frame-parameter nil 'vertical-scroll-bars) side) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
68 ;; nil means it's a non-toolkit scroll bar, and its width in |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
69 ;; columns is 14 pixels rounded up. |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
70 (ceiling (or (frame-parameter nil 'scroll-bar-width) 14) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
71 (frame-char-width))) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
72 (0)))) |
ad02f6299e9a
2004-03-15 Masatake YAMATO <jet@gyve.org>
Masatake YAMATO <jet@gyve.org>
parents:
52558
diff
changeset
|
73 |
1772 | 74 |
1954
059d99d03aae
* term/x-win.el (scroll-bar-mode, scroll-bar-mode): Move these
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
75 ;;;; Helpful functions for enabling and disabling scroll bars. |
059d99d03aae
* term/x-win.el (scroll-bar-mode, scroll-bar-mode): Move these
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
76 |
18480
f0c705a82dca
(scroll-bar-mode): Extra defvar to avoid warning.
Richard M. Stallman <rms@gnu.org>
parents:
18479
diff
changeset
|
77 (defvar scroll-bar-mode) |
74982
3b9c6c0ac744
(previous-scroll-bar-mode): New variable
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
78 (defvar previous-scroll-bar-mode nil) |
18480
f0c705a82dca
(scroll-bar-mode): Extra defvar to avoid warning.
Richard M. Stallman <rms@gnu.org>
parents:
18479
diff
changeset
|
79 |
18891
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
80 (defvar scroll-bar-mode-explicit nil |
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
81 "Non-nil means `set-scroll-bar-mode' should really do something. |
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
82 This is nil while loading `scroll-bar.el', and t afterward.") |
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
83 |
20129
a68db1ead5cf
(set-scroll-bar-mode): Take just one arg.
Karl Heuer <kwzh@gnu.org>
parents:
20061
diff
changeset
|
84 (defun set-scroll-bar-mode-1 (ignore value) |
a68db1ead5cf
(set-scroll-bar-mode): Take just one arg.
Karl Heuer <kwzh@gnu.org>
parents:
20061
diff
changeset
|
85 (set-scroll-bar-mode value)) |
a68db1ead5cf
(set-scroll-bar-mode): Take just one arg.
Karl Heuer <kwzh@gnu.org>
parents:
20061
diff
changeset
|
86 |
a68db1ead5cf
(set-scroll-bar-mode): Take just one arg.
Karl Heuer <kwzh@gnu.org>
parents:
20061
diff
changeset
|
87 (defun set-scroll-bar-mode (value) |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
88 "Set `scroll-bar-mode' to VALUE and put the new value into effect." |
74982
3b9c6c0ac744
(previous-scroll-bar-mode): New variable
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
89 (if scroll-bar-mode |
3b9c6c0ac744
(previous-scroll-bar-mode): New variable
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
90 (setq previous-scroll-bar-mode scroll-bar-mode)) |
3b9c6c0ac744
(previous-scroll-bar-mode): New variable
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
91 |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
92 (setq scroll-bar-mode value) |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
93 |
18891
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
94 (when scroll-bar-mode-explicit |
83496
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
95 (modify-all-frames-parameters (list (cons 'vertical-scroll-bars |
f271076dab2d
Fix toolbars on X frames when Emacs is started on a tty. (Reported by Richard Lewis.)
Karoly Lorentey <lorentey@elte.hu>
parents:
68651
diff
changeset
|
96 scroll-bar-mode))))) |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
97 |
52558
3fb606ea8bf6
(set-scroll-bar-mode): Initialize to new built-in variable
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
98 (defcustom scroll-bar-mode default-frame-scroll-bars |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
99 "*Specify whether to have vertical scroll bars, and on which side. |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
100 Possible values are nil (no scroll bars), `left' (scroll bars on left) |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
101 and `right' (scroll bars on right). |
22908
53b018832269
(scroll-bar-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21734
diff
changeset
|
102 To set this variable in a Lisp program, use `set-scroll-bar-mode' |
53b018832269
(scroll-bar-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21734
diff
changeset
|
103 to make it take real effect. |
53b018832269
(scroll-bar-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
21734
diff
changeset
|
104 Setting the variable with a customization buffer also takes effect." |
50398
1b58100e624c
(scroll-bar-mode): Correctly specify `nil' choice.
Miles Bader <miles@gnu.org>
parents:
49016
diff
changeset
|
105 :type '(choice (const :tag "none (nil)" nil) |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
106 (const left) |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
107 (const right)) |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
108 :group 'frames |
47494
06a428ab2fcb
(scroll-bar-mode): Specify :initialize.
Richard M. Stallman <rms@gnu.org>
parents:
42851
diff
changeset
|
109 ;; The default value for :initialize would try to use :set |
06a428ab2fcb
(scroll-bar-mode): Specify :initialize.
Richard M. Stallman <rms@gnu.org>
parents:
42851
diff
changeset
|
110 ;; when processing the file in cus-dep.el. |
06a428ab2fcb
(scroll-bar-mode): Specify :initialize.
Richard M. Stallman <rms@gnu.org>
parents:
42851
diff
changeset
|
111 :initialize 'custom-initialize-default |
20129
a68db1ead5cf
(set-scroll-bar-mode): Take just one arg.
Karl Heuer <kwzh@gnu.org>
parents:
20061
diff
changeset
|
112 :set 'set-scroll-bar-mode-1) |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
113 |
18891
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
114 ;; We just set scroll-bar-mode, but that was the default. |
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
115 ;; If it is set again, that is for real. |
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
116 (setq scroll-bar-mode-explicit t) |
86c0d896480e
(scroll-bar-mode-explicit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
18480
diff
changeset
|
117 |
42851
4c0ca26cfc69
(scroll-bar-mode): Make argument optional.
Pavel Janík <Pavel@Janik.cz>
parents:
38412
diff
changeset
|
118 (defun scroll-bar-mode (&optional flag) |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
119 "Toggle display of vertical scroll bars on all frames. |
1954
059d99d03aae
* term/x-win.el (scroll-bar-mode, scroll-bar-mode): Move these
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
120 This command applies to all frames that exist and frames to be |
059d99d03aae
* term/x-win.el (scroll-bar-mode, scroll-bar-mode): Move these
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
121 created in the future. |
059d99d03aae
* term/x-win.el (scroll-bar-mode, scroll-bar-mode): Move these
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
122 With a numeric argument, if the argument is negative, |
059d99d03aae
* term/x-win.el (scroll-bar-mode, scroll-bar-mode): Move these
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
123 turn off scroll bars; otherwise, turn on scroll bars." |
059d99d03aae
* term/x-win.el (scroll-bar-mode, scroll-bar-mode): Move these
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
124 (interactive "P") |
3613
f37a9c897699
* scroll-bar.el (scroll-bar-mode): Variable deleted.
Jim Blandy <jimb@redhat.com>
parents:
3588
diff
changeset
|
125 |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
126 ;; Tweedle the variable according to the argument. |
52558
3fb606ea8bf6
(set-scroll-bar-mode): Initialize to new built-in variable
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
127 (set-scroll-bar-mode (if (if (null flag) |
3fb606ea8bf6
(set-scroll-bar-mode): Initialize to new built-in variable
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
128 (not scroll-bar-mode) |
3fb606ea8bf6
(set-scroll-bar-mode): Initialize to new built-in variable
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
129 (setq flag (prefix-numeric-value flag)) |
3fb606ea8bf6
(set-scroll-bar-mode): Initialize to new built-in variable
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
130 (or (not (numberp flag)) (>= flag 0))) |
74982
3b9c6c0ac744
(previous-scroll-bar-mode): New variable
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
131 (or previous-scroll-bar-mode |
3b9c6c0ac744
(previous-scroll-bar-mode): New variable
Jan Djärv <jan.h.d@swipnet.se>
parents:
68651
diff
changeset
|
132 default-frame-scroll-bars)))) |
3613
f37a9c897699
* scroll-bar.el (scroll-bar-mode): Variable deleted.
Jim Blandy <jimb@redhat.com>
parents:
3588
diff
changeset
|
133 |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
134 (defun toggle-scroll-bar (arg) |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
135 "Toggle whether or not the selected frame has vertical scroll bars. |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
136 With arg, turn vertical scroll bars on if and only if arg is positive. |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
137 The variable `scroll-bar-mode' controls which side the scroll bars are on |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
138 when they are turned on; if it is nil, they go on the left." |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
139 (interactive "P") |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
140 (if (null arg) |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
141 (setq arg |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
142 (if (cdr (assq 'vertical-scroll-bars |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
143 (frame-parameters (selected-frame)))) |
20061
fb0d3082b28c
(toggle-scroll-bar): Call prefix-numeric-value.
Karl Heuer <kwzh@gnu.org>
parents:
19683
diff
changeset
|
144 -1 1)) |
fb0d3082b28c
(toggle-scroll-bar): Call prefix-numeric-value.
Karl Heuer <kwzh@gnu.org>
parents:
19683
diff
changeset
|
145 (setq arg (prefix-numeric-value arg))) |
21734
807f4e7fa560
(scroll-bar-mode, toggle-scroll-bar): By default,
Geoff Voelker <voelker@cs.washington.edu>
parents:
21427
diff
changeset
|
146 (modify-frame-parameters |
807f4e7fa560
(scroll-bar-mode, toggle-scroll-bar): By default,
Geoff Voelker <voelker@cs.washington.edu>
parents:
21427
diff
changeset
|
147 (selected-frame) |
807f4e7fa560
(scroll-bar-mode, toggle-scroll-bar): By default,
Geoff Voelker <voelker@cs.washington.edu>
parents:
21427
diff
changeset
|
148 (list (cons 'vertical-scroll-bars |
807f4e7fa560
(scroll-bar-mode, toggle-scroll-bar): By default,
Geoff Voelker <voelker@cs.washington.edu>
parents:
21427
diff
changeset
|
149 (if (> arg 0) |
52558
3fb606ea8bf6
(set-scroll-bar-mode): Initialize to new built-in variable
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
150 (or scroll-bar-mode default-frame-scroll-bars)))))) |
3613
f37a9c897699
* scroll-bar.el (scroll-bar-mode): Variable deleted.
Jim Blandy <jimb@redhat.com>
parents:
3588
diff
changeset
|
151 |
18479
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
152 (defun toggle-horizontal-scroll-bar (arg) |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
153 "Toggle whether or not the selected frame has horizontal scroll bars. |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
154 With arg, turn horizontal scroll bars on if and only if arg is positive. |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
155 Horizontal scroll bars aren't implemented yet." |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
156 (interactive "P") |
dedaafd841c0
(toggle-scroll-bar): Moved from frame.el.
Richard M. Stallman <rms@gnu.org>
parents:
15264
diff
changeset
|
157 (error "Horizontal scroll bars aren't implemented yet")) |
1954
059d99d03aae
* term/x-win.el (scroll-bar-mode, scroll-bar-mode): Move these
Jim Blandy <jimb@redhat.com>
parents:
1821
diff
changeset
|
158 |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
159 ;;;; Buffer navigation using the scroll bar. |
1772 | 160 |
2698
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
161 ;;; This was used for up-events on button 2, but no longer. |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
162 (defun scroll-bar-set-window-start (event) |
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
163 "Set the window start according to where the scroll bar is dragged. |
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
164 EVENT should be a scroll bar click or drag event." |
1772 | 165 (interactive "e") |
1821
04fb1d3d6992
JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents:
1772
diff
changeset
|
166 (let* ((end-position (event-end event)) |
1772 | 167 (window (nth 0 end-position)) |
168 (portion-whole (nth 2 end-position))) | |
169 (save-excursion | |
170 (set-buffer (window-buffer window)) | |
171 (save-excursion | |
3588
9685f1d5545b
* scroll-bar.el (scroll-bar-set-window-start): Remember that the
Jim Blandy <jimb@redhat.com>
parents:
3508
diff
changeset
|
172 (goto-char (+ (point-min) |
9685f1d5545b
* scroll-bar.el (scroll-bar-set-window-start): Remember that the
Jim Blandy <jimb@redhat.com>
parents:
3508
diff
changeset
|
173 (scroll-bar-scale portion-whole |
9685f1d5545b
* scroll-bar.el (scroll-bar-set-window-start): Remember that the
Jim Blandy <jimb@redhat.com>
parents:
3508
diff
changeset
|
174 (- (point-max) (point-min))))) |
1772 | 175 (beginning-of-line) |
176 (set-window-start window (point)))))) | |
177 | |
15215
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
178 (defun scroll-bar-drag-position (portion-whole) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
179 "Calculate new window start for drag event." |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
180 (save-excursion |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
181 (goto-char (+ (point-min) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
182 (scroll-bar-scale portion-whole |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
183 (- (point-max) (point-min))))) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
184 (beginning-of-line) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
185 (point))) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
186 |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
187 (defun scroll-bar-maybe-set-window-start (event) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
188 "Set the window start according to where the scroll bar is dragged. |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
189 Only change window start if the new start is substantially different. |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
190 EVENT should be a scroll bar click or drag event." |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
191 (interactive "e") |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
192 (let* ((end-position (event-end event)) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
193 (window (nth 0 end-position)) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
194 (portion-whole (nth 2 end-position)) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
195 (next-portion-whole (cons (1+ (car portion-whole)) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
196 (cdr portion-whole))) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
197 portion-start |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
198 next-portion-start |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
199 (current-start (window-start window))) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
200 (save-excursion |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
201 (set-buffer (window-buffer window)) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
202 (setq portion-start (scroll-bar-drag-position portion-whole)) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
203 (setq next-portion-start (max |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
204 (scroll-bar-drag-position next-portion-whole) |
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
205 (1+ portion-start))) |
19683
af32e336d12c
(scroll-bar-maybe-set-window-start): Change window
Geoff Voelker <voelker@cs.washington.edu>
parents:
18891
diff
changeset
|
206 (if (or (>= current-start next-portion-start) |
15215
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
207 (< current-start portion-start)) |
15264
0eb55cad57c6
(scroll-bar-maybe-set-window-start): Always set
Karl Heuer <kwzh@gnu.org>
parents:
15215
diff
changeset
|
208 (set-window-start window portion-start) |
0eb55cad57c6
(scroll-bar-maybe-set-window-start): Always set
Karl Heuer <kwzh@gnu.org>
parents:
15215
diff
changeset
|
209 ;; Always set window start, to ensure scroll bar position is updated. |
0eb55cad57c6
(scroll-bar-maybe-set-window-start): Always set
Karl Heuer <kwzh@gnu.org>
parents:
15215
diff
changeset
|
210 (set-window-start window current-start))))) |
15215
681866822119
(scroll-bar-drag-position): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
211 |
2698
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
212 ;; Scroll the window to the proper position for EVENT. |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
213 (defun scroll-bar-drag-1 (event) |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
214 (let* ((start-position (event-start event)) |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
215 (window (nth 0 start-position)) |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
216 (portion-whole (nth 2 start-position))) |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
217 (save-excursion |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
218 (set-buffer (window-buffer window)) |
3508 | 219 ;; Calculate position relative to the accessible part of the buffer. |
220 (goto-char (+ (point-min) | |
221 (scroll-bar-scale portion-whole | |
222 (- (point-max) (point-min))))) | |
50717
318f8d4ecf5a
(scroll-bar-drag-1): Replace beginning-of-line with vertical-motion.
Juanma Barranquero <lekktu@gmail.com>
parents:
50398
diff
changeset
|
223 (vertical-motion 0 window) |
2698
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
224 (set-window-start window (point))))) |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
225 |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
226 (defun scroll-bar-drag (event) |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
227 "Scroll the window by dragging the scroll bar slider. |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
228 If you click outside the slider, the window scrolls to bring the slider there." |
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
229 (interactive "e") |
11145
fb77829412af
(scroll-bar-drag): Bind echo-keystrokes to 0.
Richard M. Stallman <rms@gnu.org>
parents:
10555
diff
changeset
|
230 (let* (done |
21427
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
231 (echo-keystrokes 0) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
232 (end-position (event-end event)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
233 (window (nth 0 end-position)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
234 (before-scroll)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
235 (with-current-buffer (window-buffer window) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
236 (setq before-scroll point-before-scroll)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
237 (save-selected-window |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
238 (select-window window) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
239 (setq before-scroll |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
240 (or before-scroll (point)))) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
241 (scroll-bar-drag-1 event) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
242 (track-mouse |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
243 (while (not done) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
244 (setq event (read-event)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
245 (if (eq (car-safe event) 'mouse-movement) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
246 (setq event (read-event))) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
247 (cond ((eq (car-safe event) 'scroll-bar-movement) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
248 (scroll-bar-drag-1 event)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
249 (t |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
250 ;; Exit when we get the drag event; ignore that event. |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
251 (setq done t))))) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
252 (sit-for 0) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
253 (with-current-buffer (window-buffer window) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
254 (setq point-before-scroll before-scroll)))) |
2698
6940c6b5d988
(scroll-bar-drag, scroll-bar-drag-1): New functions.
Richard M. Stallman <rms@gnu.org>
parents:
2315
diff
changeset
|
255 |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
256 (defun scroll-bar-scroll-down (event) |
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
257 "Scroll the window's top line down to the location of the scroll bar click. |
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
258 EVENT should be a scroll bar click." |
1772 | 259 (interactive "e") |
21427
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
260 (let* ((end-position (event-end event)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
261 (window (nth 0 end-position)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
262 (before-scroll)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
263 (with-current-buffer (window-buffer window) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
264 (setq before-scroll point-before-scroll)) |
23248
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
265 (unwind-protect |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
266 (save-selected-window |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
267 (let ((portion-whole (nth 2 end-position))) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
268 (select-window window) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
269 (setq before-scroll |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
270 (or before-scroll (point))) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
271 (scroll-down |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
272 (scroll-bar-scale portion-whole (1- (window-height))))) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
273 (sit-for 0)) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
274 (with-current-buffer (window-buffer window) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
275 (setq point-before-scroll before-scroll))))) |
1772 | 276 |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
277 (defun scroll-bar-scroll-up (event) |
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
278 "Scroll the line next to the scroll bar click to the top of the window. |
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
279 EVENT should be a scroll bar click." |
1772 | 280 (interactive "e") |
21427
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
281 (let* ((end-position (event-end event)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
282 (window (nth 0 end-position)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
283 (before-scroll)) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
284 (with-current-buffer (window-buffer window) |
b5a5ac474741
(scroll-bar-drag): Set point-before-scroll
Richard M. Stallman <rms@gnu.org>
parents:
20129
diff
changeset
|
285 (setq before-scroll point-before-scroll)) |
23248
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
286 (unwind-protect |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
287 (save-selected-window |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
288 (let ((portion-whole (nth 2 end-position))) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
289 (select-window window) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
290 (setq before-scroll |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
291 (or before-scroll (point))) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
292 (scroll-up |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
293 (scroll-bar-scale portion-whole (1- (window-height))))) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
294 (sit-for 0)) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
295 (with-current-buffer (window-buffer window) |
6119bb0ddd69
(scroll-bar-scroll-down, scroll-bar-scroll-up):
Karl Heuer <kwzh@gnu.org>
parents:
22908
diff
changeset
|
296 (setq point-before-scroll before-scroll))))) |
1772 | 297 |
298 | |
24981 | 299 ;;; Tookit scroll bars. |
300 | |
301 (defun scroll-bar-toolkit-scroll (event) | |
302 (interactive "e") | |
303 (let* ((end-position (event-end event)) | |
304 (window (nth 0 end-position)) | |
305 (part (nth 4 end-position)) | |
306 before-scroll) | |
27421
34b81c946198
(scroll-bar-timer): Variable removed.
Gerd Moellmann <gerd@gnu.org>
parents:
26510
diff
changeset
|
307 (cond ((eq part 'end-scroll)) |
24981 | 308 (t |
309 (with-current-buffer (window-buffer window) | |
310 (setq before-scroll point-before-scroll)) | |
311 (save-selected-window | |
312 (select-window window) | |
313 (setq before-scroll (or before-scroll (point))) | |
314 (cond ((eq part 'above-handle) | |
315 (scroll-up '-)) | |
316 ((eq part 'below-handle) | |
317 (scroll-up nil)) | |
26510
6866d2a9a421
(scroll-bar-toolkit-scroll): add handling of the `ratio'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
24981
diff
changeset
|
318 ((eq part 'ratio) |
6866d2a9a421
(scroll-bar-toolkit-scroll): add handling of the `ratio'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
24981
diff
changeset
|
319 (let* ((portion-whole (nth 2 end-position)) |
6866d2a9a421
(scroll-bar-toolkit-scroll): add handling of the `ratio'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
24981
diff
changeset
|
320 (lines (scroll-bar-scale portion-whole |
6866d2a9a421
(scroll-bar-toolkit-scroll): add handling of the `ratio'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
24981
diff
changeset
|
321 (1- (window-height))))) |
6866d2a9a421
(scroll-bar-toolkit-scroll): add handling of the `ratio'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
24981
diff
changeset
|
322 (scroll-up (cond ((not (zerop lines)) lines) |
6866d2a9a421
(scroll-bar-toolkit-scroll): add handling of the `ratio'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
24981
diff
changeset
|
323 ((< (car portion-whole) 0) -1) |
6866d2a9a421
(scroll-bar-toolkit-scroll): add handling of the `ratio'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
24981
diff
changeset
|
324 (t 1))))) |
24981 | 325 ((eq part 'up) |
326 (scroll-up -1)) | |
327 ((eq part 'down) | |
328 (scroll-up 1)) | |
329 ((eq part 'top) | |
330 (set-window-start window (point-min))) | |
331 ((eq part 'bottom) | |
332 (goto-char (point-max)) | |
333 (recenter)) | |
334 ((eq part 'handle) | |
335 (scroll-bar-drag-1 event)))) | |
336 (sit-for 0) | |
337 (with-current-buffer (window-buffer window) | |
338 (setq point-before-scroll before-scroll)))))) | |
339 | |
340 | |
341 | |
1772 | 342 ;;;; Bindings. |
343 | |
344 ;;; For now, we'll set things up to work like xterm. | |
36803
4b1f1bdaf676
(toplevel): Test if `x-toolkit-scroll-bars' is
Gerd Moellmann <gerd@gnu.org>
parents:
34871
diff
changeset
|
345 (cond ((and (boundp 'x-toolkit-scroll-bars) x-toolkit-scroll-bars) |
24981 | 346 (global-set-key [vertical-scroll-bar mouse-1] |
347 'scroll-bar-toolkit-scroll)) | |
348 (t | |
349 (global-set-key [vertical-scroll-bar mouse-1] | |
350 'scroll-bar-scroll-up) | |
351 (global-set-key [vertical-scroll-bar drag-mouse-1] | |
352 'scroll-bar-scroll-up) | |
353 (global-set-key [vertical-scroll-bar down-mouse-2] | |
354 'scroll-bar-drag) | |
355 (global-set-key [vertical-scroll-bar mouse-3] | |
356 'scroll-bar-scroll-down) | |
357 (global-set-key [vertical-scroll-bar drag-mouse-3] | |
358 'scroll-bar-scroll-down))) | |
1772 | 359 |
360 | |
1973
3a08dacd8bfb
These are in preparation for a more thorough renaming to occur soon.
Jim Blandy <jimb@redhat.com>
parents:
1954
diff
changeset
|
361 (provide 'scroll-bar) |
1772 | 362 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
363 ;; arch-tag: 6f1d01d0-0b1e-4bf8-86db-d491e0f399f3 |
1981
bde0ca7e33b3
Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents:
1973
diff
changeset
|
364 ;;; scroll-bar.el ends here |