2012-08-10 14:47:12 +00:00
|
|
|
|
;;; mouse.el --- window system-independent mouse support -*- lexical-binding: t -*-
|
1992-07-16 04:23:17 +00:00
|
|
|
|
|
2018-01-01 08:21:42 +00:00
|
|
|
|
;; Copyright (C) 1993-1995, 1999-2018 Free Software Foundation, Inc.
|
1992-07-22 02:58:21 +00:00
|
|
|
|
|
2014-02-10 01:34:22 +00:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
2000-07-19 15:52:02 +00:00
|
|
|
|
;; Keywords: hardware, mouse
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: emacs
|
1992-07-16 04:23:17 +00:00
|
|
|
|
|
1995-10-30 17:35:01 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1995-10-30 17:35:01 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
|
;; (at your option) any later version.
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
1995-10-30 17:35:01 +00:00
|
|
|
|
;; 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.
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
1995-10-30 17:35:01 +00:00
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
1993-03-22 05:42:35 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
|
|
;; This package provides various useful commands (including help
|
|
|
|
|
|
;; system access) through the mouse. All this code assumes that mouse
|
|
|
|
|
|
;; interpretation has been abstracted into Emacs input events.
|
|
|
|
|
|
|
1993-03-17 16:56:02 +00:00
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
1991-12-20 07:15:37 +00:00
|
|
|
|
;;; Utility functions.
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
2008-04-01 08:35:58 +00:00
|
|
|
|
;; Indent track-mouse like progn.
|
1991-12-20 07:15:37 +00:00
|
|
|
|
(put 'track-mouse 'lisp-indent-function 0)
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
2016-07-13 15:08:21 +00:00
|
|
|
|
(defgroup mouse nil
|
|
|
|
|
|
"Input from the mouse." ;; "Mouse support."
|
|
|
|
|
|
:group 'environment
|
|
|
|
|
|
:group 'editing)
|
|
|
|
|
|
|
1997-05-03 22:19:10 +00:00
|
|
|
|
(defcustom mouse-yank-at-point nil
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"If non-nil, mouse yank commands yank at point instead of at click."
|
1997-05-03 22:19:10 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
|
:group 'mouse)
|
2004-04-30 21:37:43 +00:00
|
|
|
|
|
2010-07-14 18:03:39 +00:00
|
|
|
|
(defcustom mouse-drag-copy-region nil
|
2010-09-05 22:40:57 +00:00
|
|
|
|
"If non-nil, copy to kill-ring upon mouse adjustments of the region.
|
|
|
|
|
|
|
|
|
|
|
|
This affects `mouse-save-then-kill' (\\[mouse-save-then-kill]) in
|
|
|
|
|
|
addition to mouse drags."
|
2004-04-30 21:37:43 +00:00
|
|
|
|
:type 'boolean
|
2010-07-17 02:49:48 +00:00
|
|
|
|
:version "24.1"
|
2004-04-30 21:37:43 +00:00
|
|
|
|
:group 'mouse)
|
|
|
|
|
|
|
2005-03-31 10:10:25 +00:00
|
|
|
|
(defcustom mouse-1-click-follows-link 450
|
2004-12-19 00:50:51 +00:00
|
|
|
|
"Non-nil means that clicking Mouse-1 on a link follows the link.
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
2004-12-19 00:50:51 +00:00
|
|
|
|
With the default setting, an ordinary Mouse-1 click on a link
|
|
|
|
|
|
performs the same action as Mouse-2 on that link, while a longer
|
2005-10-16 16:50:00 +00:00
|
|
|
|
Mouse-1 click \(hold down the Mouse-1 button for more than 450
|
2004-12-19 00:50:51 +00:00
|
|
|
|
milliseconds) performs the original Mouse-1 binding \(which
|
2004-12-17 15:16:18 +00:00
|
|
|
|
typically sets point where you click the mouse).
|
|
|
|
|
|
|
|
|
|
|
|
If value is an integer, the time elapsed between pressing and
|
|
|
|
|
|
releasing the mouse button determines whether to follow the link
|
2004-12-19 00:50:51 +00:00
|
|
|
|
or perform the normal Mouse-1 action (typically set point).
|
2011-12-31 01:27:15 +00:00
|
|
|
|
The absolute numeric value specifies the maximum duration of a
|
2004-12-17 15:16:18 +00:00
|
|
|
|
\"short click\" in milliseconds. A positive value means that a
|
|
|
|
|
|
short click follows the link, and a longer click performs the
|
2005-06-10 14:05:55 +00:00
|
|
|
|
normal action. A negative value gives the opposite behavior.
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
|
|
|
|
|
If value is `double', a double click follows the link.
|
|
|
|
|
|
|
2004-12-19 00:50:51 +00:00
|
|
|
|
Otherwise, a single Mouse-1 click unconditionally follows the link.
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
|
|
|
|
|
Note that dragging the mouse never follows the link.
|
|
|
|
|
|
|
|
|
|
|
|
This feature only works in modes that specifically identify
|
|
|
|
|
|
clickable text as links, so it may not work with some external
|
|
|
|
|
|
packages. See `mouse-on-link-p' for details."
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2004-12-17 15:16:18 +00:00
|
|
|
|
:type '(choice (const :tag "Disabled" nil)
|
|
|
|
|
|
(const :tag "Double click" double)
|
2005-10-16 16:50:00 +00:00
|
|
|
|
(number :tag "Single click time limit" :value 450)
|
2004-12-17 15:16:18 +00:00
|
|
|
|
(other :tag "Single click" t))
|
|
|
|
|
|
:group 'mouse)
|
|
|
|
|
|
|
2005-02-25 23:30:59 +00:00
|
|
|
|
(defcustom mouse-1-click-in-non-selected-windows t
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"If non-nil, a Mouse-1 click also follows links in non-selected windows.
|
2005-02-25 23:30:59 +00:00
|
|
|
|
|
|
|
|
|
|
If nil, a Mouse-1 click on a link in a non-selected window performs
|
|
|
|
|
|
the normal mouse-1 binding, typically selects the window and sets
|
|
|
|
|
|
point at the click position."
|
|
|
|
|
|
:type 'boolean
|
|
|
|
|
|
:version "22.1"
|
|
|
|
|
|
:group 'mouse)
|
|
|
|
|
|
|
2013-03-09 04:15:53 +00:00
|
|
|
|
(defun mouse--down-1-maybe-follows-link (&optional _prompt)
|
|
|
|
|
|
"Turn `mouse-1' events into `mouse-2' events if follows-link.
|
|
|
|
|
|
Expects to be bound to `down-mouse-1' in `key-translation-map'."
|
2014-08-07 18:35:54 +00:00
|
|
|
|
(when (and mouse-1-click-follows-link
|
|
|
|
|
|
(eq (if (eq mouse-1-click-follows-link 'double)
|
|
|
|
|
|
'double-down-mouse-1 'down-mouse-1)
|
2016-05-10 21:23:26 +00:00
|
|
|
|
(car-safe last-input-event)))
|
|
|
|
|
|
(let ((action (mouse-on-link-p (event-start last-input-event))))
|
|
|
|
|
|
(when (and action
|
|
|
|
|
|
(or mouse-1-click-in-non-selected-windows
|
|
|
|
|
|
(eq (selected-window)
|
|
|
|
|
|
(posn-window (event-start last-input-event)))))
|
|
|
|
|
|
(let ((timedout
|
|
|
|
|
|
(sit-for (if (numberp mouse-1-click-follows-link)
|
|
|
|
|
|
(/ (abs mouse-1-click-follows-link) 1000.0)
|
|
|
|
|
|
0))))
|
|
|
|
|
|
(if (if (and (numberp mouse-1-click-follows-link)
|
|
|
|
|
|
(>= mouse-1-click-follows-link 0))
|
|
|
|
|
|
timedout (not timedout))
|
|
|
|
|
|
nil
|
|
|
|
|
|
;; Use read-key so it works for xterm-mouse-mode!
|
|
|
|
|
|
(let ((event (read-key)))
|
|
|
|
|
|
(if (eq (car-safe event)
|
|
|
|
|
|
(if (eq mouse-1-click-follows-link 'double)
|
|
|
|
|
|
'double-mouse-1 'mouse-1))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
;; Turn the mouse-1 into a mouse-2 to follow links,
|
|
|
|
|
|
;; but only if ‘mouse-on-link-p’ hasn’t returned a
|
|
|
|
|
|
;; string or vector (see its docstring).
|
|
|
|
|
|
(if (or (stringp action) (vectorp action))
|
|
|
|
|
|
(push (aref action 0) unread-command-events)
|
|
|
|
|
|
(let ((newup (if (eq mouse-1-click-follows-link 'double)
|
|
|
|
|
|
'double-mouse-2 'mouse-2)))
|
|
|
|
|
|
;; If mouse-2 has never been done by the user, it
|
|
|
|
|
|
;; doesn't have the necessary property to be
|
|
|
|
|
|
;; interpreted correctly.
|
|
|
|
|
|
(unless (get newup 'event-kind)
|
|
|
|
|
|
(put newup 'event-kind (get (car event) 'event-kind)))
|
|
|
|
|
|
(push (cons newup (cdr event)) unread-command-events)))
|
|
|
|
|
|
;; Don't change the down event, only the up-event
|
|
|
|
|
|
;; (bug#18212).
|
|
|
|
|
|
nil)
|
|
|
|
|
|
(push event unread-command-events)
|
|
|
|
|
|
nil))))))))
|
2013-03-09 04:15:53 +00:00
|
|
|
|
|
|
|
|
|
|
(define-key key-translation-map [down-mouse-1]
|
|
|
|
|
|
#'mouse--down-1-maybe-follows-link)
|
|
|
|
|
|
(define-key key-translation-map [double-down-mouse-1]
|
|
|
|
|
|
#'mouse--down-1-maybe-follows-link)
|
2005-02-25 23:30:59 +00:00
|
|
|
|
|
1991-12-20 07:15:37 +00:00
|
|
|
|
|
1994-10-12 09:27:49 +00:00
|
|
|
|
;; Provide a mode-specific menu on a mouse button.
|
|
|
|
|
|
|
2007-10-19 02:14:58 +00:00
|
|
|
|
(defun minor-mode-menu-from-indicator (indicator)
|
2008-02-21 09:15:32 +00:00
|
|
|
|
"Show menu for minor mode specified by INDICATOR.
|
|
|
|
|
|
Interactively, INDICATOR is read using completion.
|
|
|
|
|
|
If there is no menu defined for the minor mode, then create one with
|
|
|
|
|
|
items `Turn Off' and `Help'."
|
|
|
|
|
|
(interactive
|
2008-04-18 10:30:18 +00:00
|
|
|
|
(list (completing-read
|
2008-02-21 09:15:32 +00:00
|
|
|
|
"Minor mode indicator: "
|
|
|
|
|
|
(describe-minor-mode-completion-table-for-indicator))))
|
2009-09-17 01:32:56 +00:00
|
|
|
|
(let* ((minor-mode (lookup-minor-mode-from-indicator indicator))
|
|
|
|
|
|
(mm-fun (or (get minor-mode :minor-mode-function) minor-mode)))
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 15:41:44 +00:00
|
|
|
|
(unless minor-mode (error "Cannot find minor mode for `%s'" indicator))
|
2008-02-21 09:15:32 +00:00
|
|
|
|
(let* ((map (cdr-safe (assq minor-mode minor-mode-map-alist)))
|
|
|
|
|
|
(menu (and (keymapp map) (lookup-key map [menu-bar]))))
|
2008-04-01 08:35:58 +00:00
|
|
|
|
(setq menu
|
|
|
|
|
|
(if menu
|
|
|
|
|
|
(mouse-menu-non-singleton menu)
|
2015-04-24 18:46:42 +00:00
|
|
|
|
(if (fboundp mm-fun) ; bug#20201
|
|
|
|
|
|
`(keymap
|
|
|
|
|
|
,indicator
|
2016-05-01 19:36:39 +00:00
|
|
|
|
(turn-off menu-item "Turn off minor mode" ,mm-fun)
|
2015-04-24 18:46:42 +00:00
|
|
|
|
(help menu-item "Help for minor mode"
|
|
|
|
|
|
(lambda () (interactive)
|
|
|
|
|
|
(describe-function ',mm-fun)))))))
|
|
|
|
|
|
(if menu
|
|
|
|
|
|
(popup-menu menu)
|
|
|
|
|
|
(message "No menu available")))))
|
2007-10-19 02:14:58 +00:00
|
|
|
|
|
|
|
|
|
|
(defun mouse-minor-mode-menu (event)
|
|
|
|
|
|
"Show minor-mode menu for EVENT on minor modes area of the mode line."
|
|
|
|
|
|
(interactive "@e")
|
|
|
|
|
|
(let ((indicator (car (nth 4 (car (cdr event))))))
|
|
|
|
|
|
(minor-mode-menu-from-indicator indicator)))
|
|
|
|
|
|
|
2008-04-09 03:53:48 +00:00
|
|
|
|
(defun mouse-menu-major-mode-map ()
|
2010-12-08 03:32:31 +00:00
|
|
|
|
(run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
|
2008-04-01 08:35:58 +00:00
|
|
|
|
(let* (;; Keymap from which to inherit; may be null.
|
|
|
|
|
|
(ancestor (mouse-menu-non-singleton
|
1999-07-19 21:49:13 +00:00
|
|
|
|
(and (current-local-map)
|
2000-08-29 11:10:48 +00:00
|
|
|
|
(local-key-binding [menu-bar]))))
|
1999-07-19 21:49:13 +00:00
|
|
|
|
;; Make a keymap in which our last command leads to a menu or
|
|
|
|
|
|
;; default to the edit menu.
|
|
|
|
|
|
(newmap (if ancestor
|
2008-01-04 06:29:12 +00:00
|
|
|
|
(make-sparse-keymap (concat (format-mode-line mode-name)
|
|
|
|
|
|
" Mode"))
|
lisp/*: Add declarations, remove unused bindings, mark unused args.
* lisp/avoid.el (mouse-avoidance-mode): Mark unused arg.
(mouse-avoidance-nudge-mouse): Remove unused binding.
* lisp/imenu.el (imenu-default-goto-function): Mark unused args.
(imenu-progress-message): Remove obsolete macro; all callers changed.
* lisp/mouse.el (mouse-menu-major-mode-map):
* lisp/emacs-lisp/authors.el (authors-scan-change-log)
(authors-add-to-author-list):
* lisp/emacs-lisp/avl-tree.el (avl-tree--enter-balance):
* lisp/emacs-lisp/smie.el (smie-auto-fill):
* lisp/mail/sendmail.el (mail-bury):
* lisp/mail/unrmail.el (unrmail):
* lisp/net/tls.el (open-tls-stream):
* lisp/textmodes/picture.el (picture-mouse-set-point):
Remove unused bindings.
* lisp/subr.el (keymap-canonicalize): Remove unused binding.
(read-passwd): Mark unused arg.
* lisp/tutorial.el (tutorial--display-changes): Remove unused binding.
(tutorial--save-tutorial-to): Remove unused variable.
* lisp/emacs-lisp/package.el (define-package, package-menu-mark-delete)
(package-menu-mark-install, package-menu-mark-unmark): Mark unused args.
(package-generate-autoloads, package-menu--generate)
(package-menu--find-upgrades): Remove unused bindings.
* lisp/emulation/cua-rect.el (cua-restrict-regexp-rectangle)
(cua-restrict-prefix-rectangle): Doc fixes. Remove unused bindings.
(cua--mouse-ignore, cua--delete-rectangle, cua--extract-rectangle)
(cua--indent-rectangle, cua-open-rectangle, cua-close-rectangle)
(cua-blank-rectangle, cua-string-rectangle, cua-replace-in-rectangle)
(cua-incr-rectangle, cua-sequence-rectangle, cua--convert-rectangle-as)
(cua--rectangle-aux-replace, cua--left-fill-rectangle)
(cua-scroll-rectangle-up, cua-scroll-rectangle-down)
(cua-delete-char-rectangle): Mark unused args.
(cua-align-rectangle): Remove unused binding.
* lisp/mail/rmail.el (compilation--message->loc)
(epa--find-coding-system-for-mime-charset): Declare.
* lisp/net/dbus.el (dbus-register-service): Declare.
(dbus-name-owner-changed-handler): Remove unused binding.
* lisp/nxml/nxml-mode.el (nxml-electric-slash, nxml-in-mixed-content-p)
(nxml-compute-indent-from-matching-start-tag): Remove unused variables.
(nxml-scan-backward-within): Mark unused arg.
(nxml-dynamic-markup-word): Remove unused binding.
2012-04-19 17:20:26 +00:00
|
|
|
|
menu-bar-edit-menu)))
|
1999-07-19 21:49:13 +00:00
|
|
|
|
(if ancestor
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(set-keymap-parent newmap ancestor))
|
2008-04-09 03:53:48 +00:00
|
|
|
|
newmap))
|
1994-10-12 09:27:49 +00:00
|
|
|
|
|
2008-04-01 08:35:58 +00:00
|
|
|
|
(defun mouse-menu-non-singleton (menubar)
|
2011-01-28 17:18:54 +00:00
|
|
|
|
"Return menu keybar MENUBAR, or a lone submenu inside it.
|
|
|
|
|
|
If MENUBAR defines exactly one submenu, return just that submenu.
|
|
|
|
|
|
Otherwise, return MENUBAR."
|
1994-10-12 09:27:49 +00:00
|
|
|
|
(if menubar
|
2008-04-01 08:35:58 +00:00
|
|
|
|
(let (submap)
|
|
|
|
|
|
(map-keymap
|
|
|
|
|
|
(lambda (k v) (setq submap (if submap t (cons k v))))
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(keymap-canonicalize menubar))
|
2008-04-01 08:35:58 +00:00
|
|
|
|
(if (eq submap t)
|
|
|
|
|
|
menubar
|
|
|
|
|
|
(lookup-key menubar (vector (car submap)))))))
|
2000-07-19 15:52:02 +00:00
|
|
|
|
|
2008-04-09 03:53:48 +00:00
|
|
|
|
(defun mouse-menu-bar-map ()
|
|
|
|
|
|
"Return a keymap equivalent to the menu bar.
|
2000-07-19 15:52:02 +00:00
|
|
|
|
The contents are the items that would be in the menu bar whether or
|
|
|
|
|
|
not it is actually displayed."
|
2010-12-08 03:32:31 +00:00
|
|
|
|
(run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
|
2000-07-24 15:19:02 +00:00
|
|
|
|
(let* ((local-menu (and (current-local-map)
|
|
|
|
|
|
(lookup-key (current-local-map) [menu-bar])))
|
|
|
|
|
|
(global-menu (lookup-key global-map [menu-bar]))
|
2000-09-02 11:19:55 +00:00
|
|
|
|
;; If a keymap doesn't have a prompt string (a lazy
|
|
|
|
|
|
;; programmer didn't bother to provide one), create it and
|
|
|
|
|
|
;; insert it into the keymap; each keymap gets its own
|
|
|
|
|
|
;; prompt. This is required for non-toolkit versions to
|
|
|
|
|
|
;; display non-empty menu pane names.
|
|
|
|
|
|
(minor-mode-menus
|
|
|
|
|
|
(mapcar
|
2008-04-04 17:31:20 +00:00
|
|
|
|
(lambda (menu)
|
|
|
|
|
|
(let* ((minor-mode (car menu))
|
|
|
|
|
|
(menu (cdr menu))
|
|
|
|
|
|
(title-or-map (cadr menu)))
|
|
|
|
|
|
(or (stringp title-or-map)
|
|
|
|
|
|
(setq menu
|
|
|
|
|
|
(cons 'keymap
|
|
|
|
|
|
(cons (concat
|
|
|
|
|
|
(capitalize (subst-char-in-string
|
|
|
|
|
|
?- ?\s (symbol-name
|
|
|
|
|
|
minor-mode)))
|
|
|
|
|
|
" Menu")
|
|
|
|
|
|
(cdr menu)))))
|
|
|
|
|
|
menu))
|
2000-09-02 11:19:55 +00:00
|
|
|
|
(minor-mode-key-binding [menu-bar])))
|
2000-07-24 15:19:02 +00:00
|
|
|
|
(local-title-or-map (and local-menu (cadr local-menu)))
|
|
|
|
|
|
(global-title-or-map (cadr global-menu)))
|
|
|
|
|
|
(or (null local-menu)
|
|
|
|
|
|
(stringp local-title-or-map)
|
|
|
|
|
|
(setq local-menu (cons 'keymap
|
2008-01-04 08:34:15 +00:00
|
|
|
|
(cons (concat (format-mode-line mode-name)
|
2008-01-04 06:29:12 +00:00
|
|
|
|
" Mode Menu")
|
2000-07-24 15:19:02 +00:00
|
|
|
|
(cdr local-menu)))))
|
|
|
|
|
|
(or (stringp global-title-or-map)
|
|
|
|
|
|
(setq global-menu (cons 'keymap
|
|
|
|
|
|
(cons "Global Menu"
|
|
|
|
|
|
(cdr global-menu)))))
|
2000-07-19 15:52:02 +00:00
|
|
|
|
;; Supplying the list is faster than making a new map.
|
2008-04-09 03:53:48 +00:00
|
|
|
|
;; FIXME: We have a problem here: we have to use the global/local/minor
|
|
|
|
|
|
;; so they're displayed in the expected order, but later on in the command
|
|
|
|
|
|
;; loop, they're actually looked up in the opposite order.
|
|
|
|
|
|
(apply 'append
|
|
|
|
|
|
global-menu
|
|
|
|
|
|
local-menu
|
|
|
|
|
|
minor-mode-menus)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-major-mode-menu (event &optional prefix)
|
|
|
|
|
|
"Pop up a mode-specific menu of mouse commands.
|
|
|
|
|
|
Default to the Edit menu if the major mode doesn't define a menu."
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 04:13:02 +00:00
|
|
|
|
(declare (obsolete mouse-menu-major-mode-map "23.1"))
|
2008-04-09 03:53:48 +00:00
|
|
|
|
(interactive "@e\nP")
|
|
|
|
|
|
(run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
|
|
|
|
|
|
(popup-menu (mouse-menu-major-mode-map) event prefix))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-popup-menubar (event prefix)
|
|
|
|
|
|
"Pop up a menu equivalent to the menu bar for keyboard EVENT with PREFIX.
|
|
|
|
|
|
The contents are the items that would be in the menu bar whether or
|
|
|
|
|
|
not it is actually displayed."
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 04:13:02 +00:00
|
|
|
|
(declare (obsolete mouse-menu-bar-map "23.1"))
|
2008-04-09 03:53:48 +00:00
|
|
|
|
(interactive "@e \nP")
|
|
|
|
|
|
(run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
|
2011-06-01 15:34:41 +00:00
|
|
|
|
(popup-menu (mouse-menu-bar-map) (unless (integerp event) event) prefix))
|
2000-07-19 15:52:02 +00:00
|
|
|
|
|
|
|
|
|
|
(defun mouse-popup-menubar-stuff (event prefix)
|
|
|
|
|
|
"Popup a menu like either `mouse-major-mode-menu' or `mouse-popup-menubar'.
|
|
|
|
|
|
Use the former if the menu bar is showing, otherwise the latter."
|
Use declare forms, where possible, to mark obsolete functions.
* lisp/allout.el (allout-passphrase-hint-string): Likewise.
(allout-init): Use a declare form to mark obsolete.
* lisp/calendar/calendar.el (calendar-version):
* lisp/calendar/icalendar.el (icalendar-extract-ical-from-buffer)
(icalendar-convert-diary-to-ical):
* lisp/cus-edit.el (custom-mode):
* lisp/ansi-color.el (ansi-color-unfontify-region):
* lisp/international/latin1-disp.el (latin1-char-displayable-p):
* lisp/progmodes/cwarn.el (turn-on-cwarn-mode):
* lisp/progmodes/which-func.el (which-func-update-1): Use
define-obsolete-function-alias.
* lisp/bookmark.el (bookmark-jump-noselect): Use a declare form to mark
this function obsolete.
* lisp/calendar/cal-x.el (calendar-two-frame-setup)
(calendar-only-one-frame-setup, calendar-one-frame-setup):
* lisp/calendar/calendar.el (american-calendar, european-calendar)
(calendar-for-loop):
* lisp/comint.el (comint-dynamic-simple-complete)
(comint-dynamic-complete-as-filename, comint-unquote-filename):
* lisp/desktop.el (desktop-load-default):
* lisp/dired-x.el (dired-omit-here-always)
(dired-hack-local-variables, dired-default-directory):
* lisp/emacs-lisp/derived.el (derived-mode-class):
* lisp/emacs-lisp/timer.el (timer-set-time-with-usecs):
* lisp/emacs-lock.el (toggle-emacs-lock):
* lisp/epa.el (epa-display-verify-result):
* lisp/epg.el (epg-sign-keys, epg-start-sign-keys)
(epg-passphrase-callback-function):
* lisp/eshell/esh-util.el (eshell-for):
* lisp/eshell/eshell.el (eshell-remove-from-window-buffer-names)
(eshell-add-to-window-buffer-names):
* lisp/files.el (locate-file-completion):
* lisp/imenu.el (imenu-example--create-c-index)
(imenu-example--create-lisp-index)
(imenu-example--lisp-extract-index-name)
(imenu-example--name-and-position):
* lisp/international/mule-cmds.el (princ-list):
* lisp/international/mule-diag.el (decode-codepage-char):
* lisp/international/mule-util.el (detect-coding-with-priority):
* lisp/iswitchb.el (iswitchb-read-buffer):
* lisp/mail/mailalias.el (mail-complete):
* lisp/mail/sendmail.el (mail-sent-via):
* lisp/mouse.el (mouse-popup-menubar-stuff, mouse-popup-menubar)
(mouse-major-mode-menu):
* lisp/password-cache.el (password-read-and-add):
* lisp/pcomplete.el (pcomplete-parse-comint-arguments):
* lisp/progmodes/sh-script.el (sh-maybe-here-document):
* lisp/replace.el (query-replace-regexp-eval):
* lisp/savehist.el (savehist-load):
* lisp/simple.el (choose-completion-delete-max-match):
* lisp/term.el (term-dynamic-simple-complete):
* lisp/vc/ediff-init.el (ediff-check-version):
* lisp/vc/ediff-wind.el (ediff-choose-window-setup-function-automatically):
* lisp/vc/vc.el (vc-diff-switches-list):
* lisp/view.el (view-return-to-alist-update): Likewise.
* lisp/iswitchb.el (iswitchb-read-buffer): Move code of
iswitchb-define-mode-map here, and delete that obsolete function.
* lisp/subr.el (eval-next-after-load, makehash, insert-string)
(assoc-ignore-representation, assoc-ignore-case): Use declare to
mark obsolete.
(mode-line-inverse-video): Variable deleted.
* lisp/emacs-lisp/byte-run.el (make-obsolete): Doc fix; emphasize that
this applies to functions.
* lisp/erc/erc.el (erc-send-command): Use define-obsolete-function-alias.
* lisp/international/mule-util.el (string-to-sequence): Remove.
* lisp/net/newst-backend.el (newsticker-cache-filename):
* lisp/net/newst-treeview.el (newsticker-groups-filename): Fix
incorrect obsolescence declaration.
* lisp/net/snmp-mode.el (snmp-font-lock-keywords-3): Don't use obsolete
font-lock-reference-face.
* lisp/url/url-parse.el (url-recreate-url-attributes):
* lisp/url/url-util.el (url-generate-unique-filename): Use declare to mark
obsolete.
* src/xdisp.c (mode_line_inverse_video): Delete obsolete variable.
2012-09-25 04:13:02 +00:00
|
|
|
|
(declare (obsolete nil "23.1"))
|
2008-04-09 03:53:48 +00:00
|
|
|
|
(interactive "@e\nP")
|
|
|
|
|
|
(run-hooks 'activate-menubar-hook 'menu-bar-update-hook)
|
|
|
|
|
|
(popup-menu
|
|
|
|
|
|
(if (zerop (or (frame-parameter nil 'menu-bar-lines) 0))
|
|
|
|
|
|
(mouse-menu-bar-map)
|
|
|
|
|
|
(mouse-menu-major-mode-map))
|
|
|
|
|
|
event prefix))
|
1994-10-12 09:27:49 +00:00
|
|
|
|
|
1994-08-11 20:35:31 +00:00
|
|
|
|
;; Commands that operate on windows.
|
|
|
|
|
|
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(defun mouse-minibuffer-check (event)
|
|
|
|
|
|
(let ((w (posn-window (event-start event))))
|
|
|
|
|
|
(and (window-minibuffer-p w)
|
|
|
|
|
|
(not (minibuffer-window-active-p w))
|
Add new error and function `user-error'.
* lisp/subr.el (user-error): New function.
* lisp/window.el (switch-to-buffer):
* lisp/vc/smerge-mode.el (smerge-resolve-function, smerge-resolve)
(smerge-match-conflict):
* lisp/simple.el (previous-matching-history-element)
(next-matching-history-element, goto-history-element, undo-more)
(undo-start):
* lisp/progmodes/etags.el (visit-tags-table-buffer, find-tag-tag)
(find-tag-noselect, find-tag-in-order, etags-goto-tag-location)
(next-file, tags-loop-scan, list-tags, complete-tag):
* lisp/progmodes/compile.el (compilation-loop):
* lisp/mouse.el (mouse-minibuffer-check):
* lisp/man.el (Man-bgproc-sentinel, Man-goto-page):
* lisp/info.el (Info-find-node-2, Info-extract-pointer, Info-history-back)
(Info-history-forward, Info-follow-reference, Info-menu)
(Info-extract-menu-item, Info-extract-menu-counting)
(Info-forward-node, Info-backward-node, Info-next-menu-item)
(Info-last-menu-item, Info-next-preorder, Info-last-preorder)
(Info-next-reference, Info-prev-reference, Info-index)
(Info-index-next, Info-follow-nearest-node)
(Info-copy-current-node-name):
* lisp/imenu.el (imenu--make-index-alist)
(imenu-default-create-index-function, imenu-add-to-menubar):
* lisp/files.el (basic-save-buffer, recover-file):
* lisp/emacs-lisp/easy-mmode.el (easy-mmode-define-navigation):
* lisp/emacs-lisp/checkdoc.el (checkdoc-continue, checkdoc-comments)
(checkdoc-message-text, checkdoc-defun):
* lisp/dabbrev.el (dabbrev-completion, dabbrev--abbrev-at-point):
* lisp/cus-edit.el (customize-changed-options, customize-rogue)
(customize-saved, custom-variable-set, custom-variable-mark-to-save)
(custom-variable-mark-to-reset-standard)
(custom-variable-reset-backup, custom-face-mark-to-reset-standard)
(custom-file):
* lisp/completion.el (check-completion-length):
* lisp/comint.el (comint-search-arg)
(comint-previous-matching-input-string-position)
(comint-previous-matching-input)
(comint-replace-by-expanded-history-before-point, comint-send-input)
(comint-copy-old-input, comint-backward-matching-input)
(comint-goto-process-mark, comint-set-process-mark):
* lisp/calendar/calendar.el (calendar-cursor-to-date): Use it.
* lisp/bindings.el (debug-ignored-errors): Remove regexps, add `user-error'.
* src/data.c (PUT_ERROR): New macro.
(syms_of_data): Use it. Add new error type `user-error'.
* src/undo.c (user_error): New function.
(Fprimitive_undo): Use it.
* src/print.c (print_error_message): Adjust print style for `user-error'.
* src/keyboard.c (user_error): New function.
(Fexit_recursive_edit, Fabort_recursive_edit): Use it.
2012-05-04 23:16:47 +00:00
|
|
|
|
(user-error "Minibuffer window is not active")))
|
1994-12-26 05:09:41 +00:00
|
|
|
|
;; Give temporary modes such as isearch a chance to turn off.
|
|
|
|
|
|
(run-hooks 'mouse-leave-buffer-hook))
|
1994-03-09 04:00:12 +00:00
|
|
|
|
|
1991-12-20 07:15:37 +00:00
|
|
|
|
(defun mouse-delete-window (click)
|
1992-09-26 08:15:35 +00:00
|
|
|
|
"Delete the window you click on.
|
2001-08-09 14:57:30 +00:00
|
|
|
|
Do nothing if the frame has just one window.
|
1998-07-29 05:41:04 +00:00
|
|
|
|
This command must be bound to a mouse click."
|
1992-09-13 11:44:06 +00:00
|
|
|
|
(interactive "e")
|
2001-08-09 14:57:30 +00:00
|
|
|
|
(unless (one-window-p t)
|
1998-07-29 05:41:04 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
|
|
|
|
|
(delete-window (posn-window (event-start click)))))
|
1991-12-20 07:15:37 +00:00
|
|
|
|
|
1994-02-25 19:35:58 +00:00
|
|
|
|
(defun mouse-select-window (click)
|
|
|
|
|
|
"Select the window clicked on; don't move point."
|
|
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
1994-02-25 19:35:58 +00:00
|
|
|
|
(let ((oframe (selected-frame))
|
|
|
|
|
|
(frame (window-frame (posn-window (event-start click)))))
|
|
|
|
|
|
(select-window (posn-window (event-start click)))
|
|
|
|
|
|
(raise-frame frame)
|
|
|
|
|
|
(select-frame frame)
|
|
|
|
|
|
(or (eq frame oframe)
|
1996-09-03 21:37:35 +00:00
|
|
|
|
(set-mouse-position (selected-frame) (1- (frame-width)) 0))))
|
1994-02-25 19:35:58 +00:00
|
|
|
|
|
2014-07-21 01:38:21 +00:00
|
|
|
|
(define-obsolete-function-alias 'mouse-tear-off-window 'tear-off-window "24.4")
|
|
|
|
|
|
(defun tear-off-window (click)
|
|
|
|
|
|
"Delete the selected window, and create a new frame displaying its buffer."
|
1992-10-17 21:57:45 +00:00
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
1992-10-17 21:57:45 +00:00
|
|
|
|
(let* ((window (posn-window (event-start click)))
|
|
|
|
|
|
(buf (window-buffer window))
|
2014-07-21 01:38:21 +00:00
|
|
|
|
(frame (make-frame))) ;FIXME: Use pop-to-buffer.
|
1992-10-17 21:57:45 +00:00
|
|
|
|
(select-frame frame)
|
|
|
|
|
|
(switch-to-buffer buf)
|
|
|
|
|
|
(delete-window window)))
|
|
|
|
|
|
|
* mouse.el: Begin adapting this to the new event format.
(event-window, event-point, mouse-coords, mouse-timestamp):
Removed.
(event-start, event-end, posn-window, posn-point, posn-col-row,
posn-timestamp): New accessors; these are defsubsts.
(mouse-delete-window, mouse-delete-other-windows,
mouse-split-window-vertically, mouse-set-point): Rewritten to use
the new accessors.
* mouse.el: Remove hack of binding down-mouse-1.
* mouse.el (mouse-movement-p): Add docstring for this.
1992-10-07 20:46:31 +00:00
|
|
|
|
(defun mouse-delete-other-windows ()
|
2001-05-15 13:16:59 +00:00
|
|
|
|
"Delete all windows except the one you click on."
|
* mouse.el: Begin adapting this to the new event format.
(event-window, event-point, mouse-coords, mouse-timestamp):
Removed.
(event-start, event-end, posn-window, posn-point, posn-col-row,
posn-timestamp): New accessors; these are defsubsts.
(mouse-delete-window, mouse-delete-other-windows,
mouse-split-window-vertically, mouse-set-point): Rewritten to use
the new accessors.
* mouse.el: Remove hack of binding down-mouse-1.
* mouse.el (mouse-movement-p): Add docstring for this.
1992-10-07 20:46:31 +00:00
|
|
|
|
(interactive "@")
|
1991-12-20 07:15:37 +00:00
|
|
|
|
(delete-other-windows))
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
1991-12-20 07:15:37 +00:00
|
|
|
|
(defun mouse-split-window-vertically (click)
|
|
|
|
|
|
"Select Emacs window mouse is on, then split it vertically in half.
|
|
|
|
|
|
The window is split at the line clicked on.
|
|
|
|
|
|
This command must be bound to a mouse click."
|
1992-09-26 08:15:35 +00:00
|
|
|
|
(interactive "@e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
* mouse.el: Begin adapting this to the new event format.
(event-window, event-point, mouse-coords, mouse-timestamp):
Removed.
(event-start, event-end, posn-window, posn-point, posn-col-row,
posn-timestamp): New accessors; these are defsubsts.
(mouse-delete-window, mouse-delete-other-windows,
mouse-split-window-vertically, mouse-set-point): Rewritten to use
the new accessors.
* mouse.el: Remove hack of binding down-mouse-1.
* mouse.el (mouse-movement-p): Add docstring for this.
1992-10-07 20:46:31 +00:00
|
|
|
|
(let ((start (event-start click)))
|
|
|
|
|
|
(select-window (posn-window start))
|
1994-05-22 20:56:11 +00:00
|
|
|
|
(let ((new-height (1+ (cdr (posn-col-row (event-end click)))))
|
1993-03-02 07:29:05 +00:00
|
|
|
|
(first-line window-min-height)
|
|
|
|
|
|
(last-line (- (window-height) window-min-height)))
|
|
|
|
|
|
(if (< last-line first-line)
|
2015-07-02 07:03:45 +00:00
|
|
|
|
(user-error "Window too short to split")
|
|
|
|
|
|
;; Bind `window-combination-resize' to nil so we are sure to get
|
|
|
|
|
|
;; the split right at the line clicked on.
|
|
|
|
|
|
(let (window-combination-resize)
|
|
|
|
|
|
(split-window-vertically
|
|
|
|
|
|
(min (max new-height first-line) last-line)))))))
|
1991-12-20 07:15:37 +00:00
|
|
|
|
|
1992-09-26 08:15:35 +00:00
|
|
|
|
(defun mouse-split-window-horizontally (click)
|
|
|
|
|
|
"Select Emacs window mouse is on, then split it horizontally in half.
|
|
|
|
|
|
The window is split at the column clicked on.
|
|
|
|
|
|
This command must be bound to a mouse click."
|
|
|
|
|
|
(interactive "@e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
1993-03-02 07:29:05 +00:00
|
|
|
|
(let ((start (event-start click)))
|
|
|
|
|
|
(select-window (posn-window start))
|
|
|
|
|
|
(let ((new-width (1+ (car (posn-col-row (event-end click)))))
|
|
|
|
|
|
(first-col window-min-width)
|
|
|
|
|
|
(last-col (- (window-width) window-min-width)))
|
|
|
|
|
|
(if (< last-col first-col)
|
2015-07-02 07:03:45 +00:00
|
|
|
|
(user-error "Window too narrow to split")
|
|
|
|
|
|
;; Bind `window-combination-resize' to nil so we are sure to get
|
|
|
|
|
|
;; the split right at the column clicked on.
|
|
|
|
|
|
(let (window-combination-resize)
|
|
|
|
|
|
(split-window-horizontally
|
|
|
|
|
|
(min (max new-width first-col) last-col)))))))
|
1992-09-26 08:15:35 +00:00
|
|
|
|
|
2011-10-21 09:15:32 +00:00
|
|
|
|
(defun mouse-drag-line (start-event line)
|
2012-07-08 08:26:21 +00:00
|
|
|
|
"Drag a mode line, header line, or vertical line with the mouse.
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
START-EVENT is the starting mouse event of the drag action. LINE
|
2012-07-08 08:26:21 +00:00
|
|
|
|
must be one of the symbols `header', `mode', or `vertical'."
|
1994-12-26 05:09:41 +00:00
|
|
|
|
;; Give temporary modes such as isearch a chance to turn off.
|
|
|
|
|
|
(run-hooks 'mouse-leave-buffer-hook)
|
2011-10-21 09:15:32 +00:00
|
|
|
|
(let* ((echo-keystrokes 0)
|
2000-10-06 11:43:39 +00:00
|
|
|
|
(start (event-start start-event))
|
2011-10-21 09:15:32 +00:00
|
|
|
|
(window (posn-window start))
|
|
|
|
|
|
(frame (window-frame window))
|
2014-10-24 09:58:43 +00:00
|
|
|
|
;; `position' records the x- or y-coordinate of the last
|
|
|
|
|
|
;; sampled position.
|
|
|
|
|
|
(position (if (eq line 'vertical)
|
|
|
|
|
|
(+ (window-pixel-left window)
|
|
|
|
|
|
(car (posn-x-y start)))
|
|
|
|
|
|
(+ (window-pixel-top window)
|
|
|
|
|
|
(cdr (posn-x-y start)))))
|
|
|
|
|
|
;; `last-position' records the x- or y-coordinate of the
|
|
|
|
|
|
;; previously sampled position. The difference of `position'
|
|
|
|
|
|
;; and `last-position' determines the size change of WINDOW.
|
|
|
|
|
|
(last-position position)
|
2012-07-08 08:26:21 +00:00
|
|
|
|
(draggable t)
|
2014-10-24 09:58:43 +00:00
|
|
|
|
posn-window growth dragged)
|
|
|
|
|
|
;; Decide on whether we are allowed to track at all and whose
|
|
|
|
|
|
;; window's edge we drag.
|
2011-10-21 09:15:32 +00:00
|
|
|
|
(cond
|
|
|
|
|
|
((eq line 'header)
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
;; Drag bottom edge of window above the header line.
|
|
|
|
|
|
(setq window (window-in-direction 'above window t)))
|
|
|
|
|
|
((eq line 'mode))
|
2016-06-05 09:50:47 +00:00
|
|
|
|
((eq line 'vertical)
|
|
|
|
|
|
(let ((divider-width (frame-right-divider-width frame)))
|
|
|
|
|
|
(when (and (or (not (numberp divider-width))
|
|
|
|
|
|
(zerop divider-width))
|
2016-07-05 05:33:29 +00:00
|
|
|
|
(eq (frame-parameter frame 'vertical-scroll-bars) 'left))
|
|
|
|
|
|
(setq window (window-in-direction 'left window t))))))
|
2014-10-21 20:11:22 +00:00
|
|
|
|
(let* ((exitfun nil)
|
|
|
|
|
|
(move
|
2014-10-24 09:58:43 +00:00
|
|
|
|
(lambda (event) (interactive "e")
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((not (consp event))
|
|
|
|
|
|
nil)
|
|
|
|
|
|
((eq line 'vertical)
|
|
|
|
|
|
;; Drag right edge of `window'.
|
|
|
|
|
|
(setq start (event-start event))
|
|
|
|
|
|
(setq position (car (posn-x-y start)))
|
|
|
|
|
|
;; Set `posn-window' to the window where `event' was recorded.
|
|
|
|
|
|
;; This can be `window' or the window on the left or right of
|
|
|
|
|
|
;; `window'.
|
|
|
|
|
|
(when (window-live-p (setq posn-window (posn-window start)))
|
|
|
|
|
|
;; Add left edge of `posn-window' to `position'.
|
|
|
|
|
|
(setq position (+ (window-pixel-left posn-window) position))
|
|
|
|
|
|
(unless (nth 1 start)
|
|
|
|
|
|
;; Add width of objects on the left of the text area to
|
|
|
|
|
|
;; `position'.
|
|
|
|
|
|
(when (eq (window-current-scroll-bars posn-window) 'left)
|
|
|
|
|
|
(setq position (+ (window-scroll-bar-width posn-window)
|
|
|
|
|
|
position)))
|
|
|
|
|
|
(setq position (+ (car (window-fringes posn-window))
|
|
|
|
|
|
(or (car (window-margins posn-window)) 0)
|
|
|
|
|
|
position))))
|
|
|
|
|
|
;; When the cursor overshoots after shrinking a window to its
|
|
|
|
|
|
;; minimum size and the dragging direction changes, have the
|
|
|
|
|
|
;; cursor first catch up with the window edge.
|
|
|
|
|
|
(unless (or (zerop (setq growth (- position last-position)))
|
|
|
|
|
|
(and (> growth 0)
|
|
|
|
|
|
(< position (+ (window-pixel-left window)
|
|
|
|
|
|
(window-pixel-width window))))
|
|
|
|
|
|
(and (< growth 0)
|
|
|
|
|
|
(> position (+ (window-pixel-left window)
|
|
|
|
|
|
(window-pixel-width window)))))
|
|
|
|
|
|
(setq dragged t)
|
|
|
|
|
|
(adjust-window-trailing-edge window growth t t))
|
|
|
|
|
|
(setq last-position position))
|
|
|
|
|
|
(draggable
|
|
|
|
|
|
;; Drag bottom edge of `window'.
|
|
|
|
|
|
(setq start (event-start event))
|
|
|
|
|
|
;; Set `posn-window' to the window where `event' was recorded.
|
|
|
|
|
|
;; This can be either `window' or the window above or below of
|
|
|
|
|
|
;; `window'.
|
|
|
|
|
|
(setq posn-window (posn-window start))
|
|
|
|
|
|
(setq position (cdr (posn-x-y start)))
|
|
|
|
|
|
(when (window-live-p posn-window)
|
|
|
|
|
|
;; Add top edge of `posn-window' to `position'.
|
|
|
|
|
|
(setq position (+ (window-pixel-top posn-window) position))
|
|
|
|
|
|
;; If necessary, add height of header line to `position'
|
|
|
|
|
|
(when (memq (posn-area start)
|
2014-11-04 17:46:49 +00:00
|
|
|
|
'(nil left-fringe right-fringe left-margin right-margin))
|
2014-10-24 09:58:43 +00:00
|
|
|
|
(setq position (+ (window-header-line-height posn-window) position))))
|
|
|
|
|
|
;; When the cursor overshoots after shrinking a window to its
|
|
|
|
|
|
;; minimum size and the dragging direction changes, have the
|
|
|
|
|
|
;; cursor first catch up with the window edge.
|
|
|
|
|
|
(unless (or (zerop (setq growth (- position last-position)))
|
|
|
|
|
|
(and (> growth 0)
|
|
|
|
|
|
(< position (+ (window-pixel-top window)
|
|
|
|
|
|
(window-pixel-height window))))
|
|
|
|
|
|
(and (< growth 0)
|
|
|
|
|
|
(> position (+ (window-pixel-top window)
|
|
|
|
|
|
(window-pixel-height window)))))
|
|
|
|
|
|
(setq dragged t)
|
|
|
|
|
|
(adjust-window-trailing-edge window growth nil t))
|
2016-09-21 15:00:18 +00:00
|
|
|
|
(setq last-position position)))))
|
|
|
|
|
|
(old-track-mouse track-mouse))
|
2015-06-30 15:59:21 +00:00
|
|
|
|
;; Start tracking. The special value 'dragging' signals the
|
|
|
|
|
|
;; display engine to freeze the mouse pointer shape for as long
|
|
|
|
|
|
;; as we drag.
|
|
|
|
|
|
(setq track-mouse 'dragging)
|
2014-10-24 09:58:43 +00:00
|
|
|
|
;; Loop reading events and sampling the position of the mouse.
|
|
|
|
|
|
(setq exitfun
|
|
|
|
|
|
(set-transient-map
|
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
|
(define-key map [switch-frame] #'ignore)
|
|
|
|
|
|
(define-key map [select-window] #'ignore)
|
|
|
|
|
|
(define-key map [scroll-bar-movement] #'ignore)
|
|
|
|
|
|
(define-key map [mouse-movement] move)
|
|
|
|
|
|
;; Swallow drag-mouse-1 events to avoid selecting some other window.
|
|
|
|
|
|
(define-key map [drag-mouse-1]
|
|
|
|
|
|
(lambda () (interactive) (funcall exitfun)))
|
|
|
|
|
|
;; For vertical line dragging swallow also a mouse-1
|
|
|
|
|
|
;; event (but only if we dragged at least once to allow mouse-1
|
|
|
|
|
|
;; clicks to get through).
|
|
|
|
|
|
(when (eq line 'vertical)
|
|
|
|
|
|
(define-key map [mouse-1]
|
|
|
|
|
|
`(menu-item "" ,(lambda () (interactive) (funcall exitfun))
|
|
|
|
|
|
:filter ,(lambda (cmd) (if dragged cmd)))))
|
|
|
|
|
|
;; Some of the events will of course end up looked up
|
2015-03-25 01:04:00 +00:00
|
|
|
|
;; with a mode-line, header-line or vertical-line prefix ...
|
2014-10-24 09:58:43 +00:00
|
|
|
|
(define-key map [mode-line] map)
|
|
|
|
|
|
(define-key map [header-line] map)
|
2015-03-25 01:04:00 +00:00
|
|
|
|
(define-key map [vertical-line] map)
|
2014-10-24 09:58:43 +00:00
|
|
|
|
;; ... and some maybe even with a right- or bottom-divider
|
|
|
|
|
|
;; prefix.
|
|
|
|
|
|
(define-key map [right-divider] map)
|
|
|
|
|
|
(define-key map [bottom-divider] map)
|
|
|
|
|
|
map)
|
2016-09-21 15:00:18 +00:00
|
|
|
|
t (lambda () (setq track-mouse old-track-mouse)))))))
|
2011-10-21 09:15:32 +00:00
|
|
|
|
|
1999-09-09 14:54:25 +00:00
|
|
|
|
(defun mouse-drag-mode-line (start-event)
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
"Change the height of a window by dragging on its mode line.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action.
|
|
|
|
|
|
|
|
|
|
|
|
If the drag happens in a mode line on the bottom of a frame and
|
|
|
|
|
|
that frame's `drag-with-mode-line' parameter is non-nil, drag the
|
|
|
|
|
|
frame instead."
|
1999-09-09 14:54:25 +00:00
|
|
|
|
(interactive "e")
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
(let* ((start (event-start start-event))
|
|
|
|
|
|
(window (posn-window start))
|
|
|
|
|
|
(frame (window-frame window)))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((not (window-live-p window)))
|
|
|
|
|
|
((or (not (window-at-side-p window 'bottom))
|
|
|
|
|
|
;; Allow resizing the minibuffer window if it's on the
|
|
|
|
|
|
;; same frame as and immediately below `window', and it's
|
|
|
|
|
|
;; either active or `resize-mini-windows' is nil.
|
|
|
|
|
|
(let ((minibuffer-window (minibuffer-window frame)))
|
|
|
|
|
|
(and (eq (window-frame minibuffer-window) frame)
|
|
|
|
|
|
(or (not resize-mini-windows)
|
|
|
|
|
|
(eq minibuffer-window
|
|
|
|
|
|
(active-minibuffer-window))))))
|
|
|
|
|
|
(mouse-drag-line start-event 'mode))
|
|
|
|
|
|
((and (frame-parameter frame 'drag-with-mode-line)
|
|
|
|
|
|
(window-at-side-p window 'bottom)
|
|
|
|
|
|
(let ((minibuffer-window (minibuffer-window frame)))
|
|
|
|
|
|
(not (eq (window-frame minibuffer-window) frame))))
|
|
|
|
|
|
;; Drag frame when the window is on the bottom of its frame and
|
|
|
|
|
|
;; there is no minibuffer window below.
|
|
|
|
|
|
(mouse-drag-frame start-event 'move)))))
|
1999-09-09 14:54:25 +00:00
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-header-line (start-event)
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
"Change the height of a window by dragging on its header line.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action.
|
|
|
|
|
|
|
|
|
|
|
|
If the drag happens in a header line on the top of a frame and
|
|
|
|
|
|
that frame's `drag-with-header-line' parameter is non-nil, drag
|
|
|
|
|
|
the frame instead."
|
1999-09-09 14:54:25 +00:00
|
|
|
|
(interactive "e")
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
(let* ((start (event-start start-event))
|
|
|
|
|
|
(window (posn-window start)))
|
|
|
|
|
|
(if (and (window-live-p window)
|
|
|
|
|
|
(not (window-at-side-p window 'top)))
|
|
|
|
|
|
(mouse-drag-line start-event 'header)
|
|
|
|
|
|
(let ((frame (window-frame window)))
|
|
|
|
|
|
(when (frame-parameter frame 'drag-with-header-line)
|
|
|
|
|
|
(mouse-drag-frame start-event 'move))))))
|
2006-06-19 21:47:23 +00:00
|
|
|
|
|
1995-09-18 14:15:22 +00:00
|
|
|
|
(defun mouse-drag-vertical-line (start-event)
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
"Change the width of a window by dragging on a vertical line.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
1995-09-18 14:15:22 +00:00
|
|
|
|
(interactive "e")
|
2011-10-21 09:15:32 +00:00
|
|
|
|
(mouse-drag-line start-event 'vertical))
|
1995-09-18 14:15:22 +00:00
|
|
|
|
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
(defun mouse-resize-frame (frame x-diff y-diff &optional x-move y-move)
|
|
|
|
|
|
"Helper function for `mouse-drag-frame'."
|
|
|
|
|
|
(let* ((frame-x-y (frame-position frame))
|
|
|
|
|
|
(frame-x (car frame-x-y))
|
|
|
|
|
|
(frame-y (cdr frame-x-y))
|
|
|
|
|
|
alist)
|
|
|
|
|
|
(if (> x-diff 0)
|
|
|
|
|
|
(when x-move
|
|
|
|
|
|
(setq x-diff (min x-diff frame-x))
|
|
|
|
|
|
(setq x-move (- frame-x x-diff)))
|
|
|
|
|
|
(let* ((min-width (frame-windows-min-size frame t nil t))
|
|
|
|
|
|
(min-diff (max 0 (- (frame-inner-width frame) min-width))))
|
|
|
|
|
|
(setq x-diff (max x-diff (- min-diff)))
|
|
|
|
|
|
(when x-move
|
|
|
|
|
|
(setq x-move (+ frame-x (- x-diff))))))
|
|
|
|
|
|
|
|
|
|
|
|
(if (> y-diff 0)
|
|
|
|
|
|
(when y-move
|
|
|
|
|
|
(setq y-diff (min y-diff frame-y))
|
|
|
|
|
|
(setq y-move (- frame-y y-diff)))
|
|
|
|
|
|
(let* ((min-height (frame-windows-min-size frame nil nil t))
|
|
|
|
|
|
(min-diff (max 0 (- (frame-inner-height frame) min-height))))
|
|
|
|
|
|
(setq y-diff (max y-diff (- min-diff)))
|
|
|
|
|
|
(when y-move
|
|
|
|
|
|
(setq y-move (+ frame-y (- y-diff))))))
|
|
|
|
|
|
|
|
|
|
|
|
(unless (zerop x-diff)
|
|
|
|
|
|
(when x-move
|
|
|
|
|
|
(push `(left . ,x-move) alist))
|
|
|
|
|
|
(push `(width . (text-pixels . ,(+ (frame-text-width frame) x-diff)))
|
|
|
|
|
|
alist))
|
|
|
|
|
|
(unless (zerop y-diff)
|
|
|
|
|
|
(when y-move
|
|
|
|
|
|
(push `(top . ,y-move) alist))
|
|
|
|
|
|
(push `(height . (text-pixels . ,(+ (frame-text-height frame) y-diff)))
|
|
|
|
|
|
alist))
|
|
|
|
|
|
(when alist
|
|
|
|
|
|
(modify-frame-parameters frame alist))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-frame (start-event part)
|
|
|
|
|
|
"Drag a frame or one of its edges with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action. Its
|
|
|
|
|
|
position window denotes the frame that will be dragged.
|
|
|
|
|
|
|
|
|
|
|
|
PART specifies the part that has been dragged and must be one of
|
|
|
|
|
|
the symbols 'left', 'top', 'right', 'bottom', 'top-left',
|
|
|
|
|
|
'top-right', 'bottom-left', 'bottom-right' to drag an internal
|
|
|
|
|
|
border or edge. If PART equals 'move', this means to move the
|
|
|
|
|
|
frame with the mouse."
|
|
|
|
|
|
;; Give temporary modes such as isearch a chance to turn off.
|
|
|
|
|
|
(run-hooks 'mouse-leave-buffer-hook)
|
|
|
|
|
|
(let* ((echo-keystrokes 0)
|
|
|
|
|
|
(start (event-start start-event))
|
|
|
|
|
|
(window (posn-window start))
|
|
|
|
|
|
;; FRAME is the frame to drag.
|
|
|
|
|
|
(frame (if (window-live-p window)
|
|
|
|
|
|
(window-frame window)
|
|
|
|
|
|
window))
|
|
|
|
|
|
(width (frame-native-width frame))
|
|
|
|
|
|
(height (frame-native-height frame))
|
|
|
|
|
|
;; PARENT is the parent frame of FRAME or, if FRAME is a
|
|
|
|
|
|
;; top-level frame, FRAME's workarea.
|
|
|
|
|
|
(parent (frame-parent frame))
|
|
|
|
|
|
(parent-edges
|
|
|
|
|
|
(if parent
|
|
|
|
|
|
`(0 0 ,(frame-native-width parent) ,(frame-native-height parent))
|
|
|
|
|
|
(let* ((attributes
|
|
|
|
|
|
(car (display-monitor-attributes-list)))
|
|
|
|
|
|
(workarea (assq 'workarea attributes)))
|
|
|
|
|
|
(and workarea
|
|
|
|
|
|
`(,(nth 1 workarea) ,(nth 2 workarea)
|
|
|
|
|
|
,(+ (nth 1 workarea) (nth 3 workarea))
|
|
|
|
|
|
,(+ (nth 2 workarea) (nth 4 workarea)))))))
|
|
|
|
|
|
(parent-left (and parent-edges (nth 0 parent-edges)))
|
|
|
|
|
|
(parent-top (and parent-edges (nth 1 parent-edges)))
|
|
|
|
|
|
(parent-right (and parent-edges (nth 2 parent-edges)))
|
|
|
|
|
|
(parent-bottom (and parent-edges (nth 3 parent-edges)))
|
|
|
|
|
|
;; `pos-x' and `pos-y' record the x- and y-coordinates of the
|
|
|
|
|
|
;; last sampled mouse position. Note that we sample absolute
|
|
|
|
|
|
;; mouse positions to avoid that moving the mouse from one
|
|
|
|
|
|
;; frame into another gets into our way. `last-x' and `last-y'
|
|
|
|
|
|
;; records the x- and y-coordinates of the previously sampled
|
|
|
|
|
|
;; position. The differences between `last-x' and `pos-x' as
|
|
|
|
|
|
;; well as `last-y' and `pos-y' determine the amount the mouse
|
|
|
|
|
|
;; has been dragged between the last two samples.
|
|
|
|
|
|
pos-x-y pos-x pos-y
|
|
|
|
|
|
(last-x-y (mouse-absolute-pixel-position))
|
|
|
|
|
|
(last-x (car last-x-y))
|
|
|
|
|
|
(last-y (cdr last-x-y))
|
|
|
|
|
|
;; `snap-x' and `snap-y' record the x- and y-coordinates of the
|
|
|
|
|
|
;; mouse position when FRAME snapped. As soon as the
|
|
|
|
|
|
;; difference between `pos-x' and `snap-x' (or `pos-y' and
|
|
|
|
|
|
;; `snap-y') exceeds the value of FRAME's `snap-width'
|
|
|
|
|
|
;; parameter, unsnap FRAME (at the respective side). `snap-x'
|
2017-07-06 07:23:30 +00:00
|
|
|
|
;; and `snap-y' nil mean FRAME is currently not snapped.
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
snap-x snap-y
|
|
|
|
|
|
(exitfun nil)
|
|
|
|
|
|
(move
|
|
|
|
|
|
(lambda (event)
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(when (consp event)
|
|
|
|
|
|
(setq pos-x-y (mouse-absolute-pixel-position))
|
|
|
|
|
|
(setq pos-x (car pos-x-y))
|
|
|
|
|
|
(setq pos-y (cdr pos-x-y))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((eq part 'left)
|
|
|
|
|
|
(mouse-resize-frame frame (- last-x pos-x) 0 t))
|
|
|
|
|
|
((eq part 'top)
|
|
|
|
|
|
(mouse-resize-frame frame 0 (- last-y pos-y) nil t))
|
|
|
|
|
|
((eq part 'right)
|
|
|
|
|
|
(mouse-resize-frame frame (- pos-x last-x) 0))
|
|
|
|
|
|
((eq part 'bottom)
|
|
|
|
|
|
(mouse-resize-frame frame 0 (- pos-y last-y)))
|
|
|
|
|
|
((eq part 'top-left)
|
|
|
|
|
|
(mouse-resize-frame
|
|
|
|
|
|
frame (- last-x pos-x) (- last-y pos-y) t t))
|
|
|
|
|
|
((eq part 'top-right)
|
|
|
|
|
|
(mouse-resize-frame
|
|
|
|
|
|
frame (- pos-x last-x) (- last-y pos-y) nil t))
|
|
|
|
|
|
((eq part 'bottom-left)
|
|
|
|
|
|
(mouse-resize-frame
|
|
|
|
|
|
frame (- last-x pos-x) (- pos-y last-y) t))
|
|
|
|
|
|
((eq part 'bottom-right)
|
|
|
|
|
|
(mouse-resize-frame
|
|
|
|
|
|
frame (- pos-x last-x) (- pos-y last-y)))
|
|
|
|
|
|
((eq part 'move)
|
|
|
|
|
|
(let* ((old-position (frame-position frame))
|
|
|
|
|
|
(old-left (car old-position))
|
|
|
|
|
|
(old-top (cdr old-position))
|
|
|
|
|
|
(left (+ old-left (- pos-x last-x)))
|
|
|
|
|
|
(top (+ old-top (- pos-y last-y)))
|
|
|
|
|
|
right bottom
|
|
|
|
|
|
;; `snap-width' (maybe also a yet to be provided
|
|
|
|
|
|
;; `snap-height') could become floats to handle
|
|
|
|
|
|
;; proportionality wrt PARENT. We don't do any
|
|
|
|
|
|
;; checks on this parameter so far.
|
|
|
|
|
|
(snap-width (frame-parameter frame 'snap-width)))
|
|
|
|
|
|
;; Docking and constraining.
|
|
|
|
|
|
(when (and (numberp snap-width) parent-edges)
|
|
|
|
|
|
(cond
|
|
|
|
|
|
;; Docking at the left parent edge.
|
|
|
|
|
|
((< pos-x last-x)
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((and (> left parent-left)
|
|
|
|
|
|
(<= (- left parent-left) snap-width))
|
|
|
|
|
|
;; Snap when the mouse moved leftward and
|
|
|
|
|
|
;; FRAME's left edge would end up within
|
|
|
|
|
|
;; `snap-width' pixels from PARENT's left edge.
|
|
|
|
|
|
(setq snap-x pos-x)
|
|
|
|
|
|
(setq left parent-left))
|
|
|
|
|
|
((and (<= left parent-left)
|
|
|
|
|
|
(<= (- parent-left left) snap-width)
|
|
|
|
|
|
snap-x (<= (- snap-x pos-x) snap-width))
|
|
|
|
|
|
;; Stay snapped when the mouse moved leftward
|
|
|
|
|
|
;; but not more than `snap-width' pixels from
|
|
|
|
|
|
;; the time FRAME snapped.
|
|
|
|
|
|
(setq left parent-left))
|
|
|
|
|
|
(t
|
|
|
|
|
|
;; Unsnap when the mouse moved more than
|
|
|
|
|
|
;; `snap-width' pixels leftward from the time
|
|
|
|
|
|
;; FRAME snapped.
|
|
|
|
|
|
(setq snap-x nil))))
|
|
|
|
|
|
((> pos-x last-x)
|
|
|
|
|
|
(setq right (+ left width))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((and (< right parent-right)
|
|
|
|
|
|
(<= (- parent-right right) snap-width))
|
|
|
|
|
|
;; Snap when the mouse moved rightward and
|
|
|
|
|
|
;; FRAME's right edge would end up within
|
|
|
|
|
|
;; `snap-width' pixels from PARENT's right edge.
|
|
|
|
|
|
(setq snap-x pos-x)
|
|
|
|
|
|
(setq left (- parent-right width)))
|
|
|
|
|
|
((and (>= right parent-right)
|
|
|
|
|
|
(<= (- right parent-right) snap-width)
|
|
|
|
|
|
snap-x (<= (- pos-x snap-x) snap-width))
|
|
|
|
|
|
;; Stay snapped when the mouse moved rightward
|
|
|
|
|
|
;; but not more more than `snap-width' pixels
|
|
|
|
|
|
;; from the time FRAME snapped.
|
|
|
|
|
|
(setq left (- parent-right width)))
|
|
|
|
|
|
(t
|
|
|
|
|
|
;; Unsnap when the mouse moved rightward more
|
|
|
|
|
|
;; than `snap-width' pixels from the time FRAME
|
|
|
|
|
|
;; snapped.
|
|
|
|
|
|
(setq snap-x nil)))))
|
|
|
|
|
|
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((< pos-y last-y)
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((and (> top parent-top)
|
|
|
|
|
|
(<= (- top parent-top) snap-width))
|
|
|
|
|
|
;; Snap when the mouse moved upward and FRAME's
|
|
|
|
|
|
;; top edge would end up within `snap-width'
|
|
|
|
|
|
;; pixels from PARENT's top edge.
|
|
|
|
|
|
(setq snap-y pos-y)
|
|
|
|
|
|
(setq top parent-top))
|
|
|
|
|
|
((and (<= top parent-top)
|
|
|
|
|
|
(<= (- parent-top top) snap-width)
|
|
|
|
|
|
snap-y (<= (- snap-y pos-y) snap-width))
|
|
|
|
|
|
;; Stay snapped when the mouse moved upward but
|
|
|
|
|
|
;; not more more than `snap-width' pixels from
|
|
|
|
|
|
;; the time FRAME snapped.
|
|
|
|
|
|
(setq top parent-top))
|
|
|
|
|
|
(t
|
|
|
|
|
|
;; Unsnap when the mouse moved upward more than
|
|
|
|
|
|
;; `snap-width' pixels from the time FRAME
|
|
|
|
|
|
;; snapped.
|
|
|
|
|
|
(setq snap-y nil))))
|
|
|
|
|
|
((> pos-y last-y)
|
|
|
|
|
|
(setq bottom (+ top height))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((and (< bottom parent-bottom)
|
|
|
|
|
|
(<= (- parent-bottom bottom) snap-width))
|
|
|
|
|
|
;; Snap when the mouse moved downward and
|
|
|
|
|
|
;; FRAME's bottom edge would end up within
|
|
|
|
|
|
;; `snap-width' pixels from PARENT's bottom
|
|
|
|
|
|
;; edge.
|
|
|
|
|
|
(setq snap-y pos-y)
|
|
|
|
|
|
(setq top (- parent-bottom height)))
|
|
|
|
|
|
((and (>= bottom parent-bottom)
|
|
|
|
|
|
(<= (- bottom parent-bottom) snap-width)
|
|
|
|
|
|
snap-y (<= (- pos-y snap-y) snap-width))
|
|
|
|
|
|
;; Stay snapped when the mouse moved downward
|
|
|
|
|
|
;; but not more more than `snap-width' pixels
|
|
|
|
|
|
;; from the time FRAME snapped.
|
|
|
|
|
|
(setq top (- parent-bottom height)))
|
|
|
|
|
|
(t
|
|
|
|
|
|
;; Unsnap when the mouse moved downward more
|
|
|
|
|
|
;; than `snap-width' pixels from the time FRAME
|
|
|
|
|
|
;; snapped.
|
|
|
|
|
|
(setq snap-y nil))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; If requested, constrain FRAME's draggable areas to
|
|
|
|
|
|
;; PARENT's edges. The `top-visible' parameter should
|
|
|
|
|
|
;; be set when FRAME has a draggable header-line. If
|
|
|
|
|
|
;; set to a number, it ascertains that the top of
|
|
|
|
|
|
;; FRAME is always constrained to the top of PARENT
|
|
|
|
|
|
;; and that at least as many pixels of FRAME as
|
|
|
|
|
|
;; specified by that number are visible on each of the
|
|
|
|
|
|
;; three remaining sides of PARENT.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; The `bottom-visible' parameter should be set when
|
|
|
|
|
|
;; FRAME has a draggable mode-line. If set to a
|
|
|
|
|
|
;; number, it ascertains that the bottom of FRAME is
|
|
|
|
|
|
;; always constrained to the bottom of PARENT and that
|
|
|
|
|
|
;; at least as many pixels of FRAME as specified by
|
|
|
|
|
|
;; that number are visible on each of the three
|
|
|
|
|
|
;; remaining sides of PARENT.
|
|
|
|
|
|
(let ((par (frame-parameter frame 'top-visible))
|
|
|
|
|
|
bottom-visible)
|
|
|
|
|
|
(unless par
|
|
|
|
|
|
(setq par (frame-parameter frame 'bottom-visible))
|
|
|
|
|
|
(setq bottom-visible t))
|
|
|
|
|
|
(when (and (numberp par) parent-edges)
|
|
|
|
|
|
(setq left
|
|
|
|
|
|
(max (min (- parent-right par) left)
|
|
|
|
|
|
(+ (- parent-left width) par)))
|
|
|
|
|
|
(setq top
|
|
|
|
|
|
(if bottom-visible
|
|
|
|
|
|
(min (max top (- parent-top (- height par)))
|
|
|
|
|
|
(- parent-bottom height))
|
|
|
|
|
|
(min (max top parent-top)
|
|
|
|
|
|
(- parent-bottom par))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Use `modify-frame-parameters' since `left' and
|
|
|
|
|
|
;; `top' may want to move FRAME out of its PARENT.
|
|
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
|
frame
|
|
|
|
|
|
`((left . (+ ,left)) (top . (+ ,top)))))))
|
|
|
|
|
|
(setq last-x pos-x)
|
|
|
|
|
|
(setq last-y pos-y))))
|
|
|
|
|
|
(old-track-mouse track-mouse))
|
|
|
|
|
|
;; Start tracking. The special value 'dragging' signals the
|
|
|
|
|
|
;; display engine to freeze the mouse pointer shape for as long
|
|
|
|
|
|
;; as we drag.
|
|
|
|
|
|
(setq track-mouse 'dragging)
|
|
|
|
|
|
;; Loop reading events and sampling the position of the mouse.
|
|
|
|
|
|
(setq exitfun
|
|
|
|
|
|
(set-transient-map
|
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
|
(define-key map [switch-frame] #'ignore)
|
|
|
|
|
|
(define-key map [select-window] #'ignore)
|
|
|
|
|
|
(define-key map [scroll-bar-movement] #'ignore)
|
|
|
|
|
|
(define-key map [mouse-movement] move)
|
|
|
|
|
|
;; Swallow drag-mouse-1 events to avoid selecting some other window.
|
|
|
|
|
|
(define-key map [drag-mouse-1]
|
|
|
|
|
|
(lambda () (interactive) (funcall exitfun)))
|
|
|
|
|
|
;; Some of the events will of course end up looked up
|
|
|
|
|
|
;; with a mode-line, header-line or vertical-line prefix ...
|
|
|
|
|
|
(define-key map [mode-line] map)
|
|
|
|
|
|
(define-key map [header-line] map)
|
|
|
|
|
|
(define-key map [vertical-line] map)
|
|
|
|
|
|
;; ... and some maybe even with a right- or bottom-divider
|
|
|
|
|
|
;; prefix.
|
|
|
|
|
|
(define-key map [right-divider] map)
|
|
|
|
|
|
(define-key map [bottom-divider] map)
|
|
|
|
|
|
map)
|
|
|
|
|
|
t (lambda () (setq track-mouse old-track-mouse))))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-left-edge (start-event)
|
|
|
|
|
|
"Drag left edge of a frame with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(mouse-drag-frame start-event 'left))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-top-left-corner (start-event)
|
|
|
|
|
|
"Drag top left corner of a frame with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(mouse-drag-frame start-event 'top-left))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-top-edge (start-event)
|
|
|
|
|
|
"Drag top edge of a frame with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(mouse-drag-frame start-event 'top))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-top-right-corner (start-event)
|
|
|
|
|
|
"Drag top right corner of a frame with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(mouse-drag-frame start-event 'top-right))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-right-edge (start-event)
|
|
|
|
|
|
"Drag right edge of a frame with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(mouse-drag-frame start-event 'right))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-bottom-right-corner (start-event)
|
|
|
|
|
|
"Drag bottom right corner of a frame with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(mouse-drag-frame start-event 'bottom-right))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-bottom-edge (start-event)
|
|
|
|
|
|
"Drag bottom edge of a frame with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(mouse-drag-frame start-event 'bottom))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-drag-bottom-left-corner (start-event)
|
|
|
|
|
|
"Drag bottom left corner of a frame with the mouse.
|
|
|
|
|
|
START-EVENT is the starting mouse event of the drag action."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(mouse-drag-frame start-event 'bottom-left))
|
|
|
|
|
|
|
2016-07-08 15:36:55 +00:00
|
|
|
|
(defcustom mouse-select-region-move-to-beginning nil
|
|
|
|
|
|
"Effect of selecting a region extending backward from double click.
|
|
|
|
|
|
Nil means keep point at the position clicked (region end);
|
|
|
|
|
|
non-nil means move point to beginning of region."
|
|
|
|
|
|
:type '(choice (const :tag "Don't move point" nil)
|
2016-07-12 08:43:24 +00:00
|
|
|
|
(const :tag "Move point to beginning of region" t))
|
|
|
|
|
|
:group 'mouse
|
2016-11-16 15:39:43 +00:00
|
|
|
|
:version "26.1")
|
2016-07-08 15:36:55 +00:00
|
|
|
|
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(defun mouse-set-point (event &optional promote-to-region)
|
1991-12-20 07:15:37 +00:00
|
|
|
|
"Move point to the position clicked on with the mouse.
|
2014-05-11 05:49:14 +00:00
|
|
|
|
This should be bound to a mouse click event type.
|
2016-07-08 15:36:55 +00:00
|
|
|
|
If PROMOTE-TO-REGION is non-nil and event is a multiple-click, select
|
|
|
|
|
|
the corresponding element around point, with the resulting position of
|
|
|
|
|
|
point determined by `mouse-select-region-move-to-beginning'."
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(interactive "e\np")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check event)
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(if (and promote-to-region (> (event-click-count event) 1))
|
2016-07-08 15:36:55 +00:00
|
|
|
|
(progn
|
|
|
|
|
|
(mouse-set-region event)
|
|
|
|
|
|
(when mouse-select-region-move-to-beginning
|
|
|
|
|
|
(when (> (posn-point (event-start event)) (region-beginning))
|
|
|
|
|
|
(exchange-point-and-mark))))
|
2014-05-11 05:49:14 +00:00
|
|
|
|
;; Use event-end in case called from mouse-drag-region.
|
|
|
|
|
|
;; If EVENT is a click, event-end and event-start give same value.
|
|
|
|
|
|
(posn-set-point (event-end event))))
|
1991-12-20 07:15:37 +00:00
|
|
|
|
|
1995-02-12 04:51:42 +00:00
|
|
|
|
(defvar mouse-last-region-beg nil)
|
|
|
|
|
|
(defvar mouse-last-region-end nil)
|
|
|
|
|
|
(defvar mouse-last-region-tick nil)
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-region-match ()
|
|
|
|
|
|
"Return non-nil if there's an active region that was set with the mouse."
|
|
|
|
|
|
(and (mark t) mark-active
|
|
|
|
|
|
(eq mouse-last-region-beg (region-beginning))
|
|
|
|
|
|
(eq mouse-last-region-end (region-end))
|
|
|
|
|
|
(eq mouse-last-region-tick (buffer-modified-tick))))
|
|
|
|
|
|
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(defvar mouse--drag-start-event nil)
|
|
|
|
|
|
|
1992-10-17 07:07:39 +00:00
|
|
|
|
(defun mouse-set-region (click)
|
1993-09-17 21:26:18 +00:00
|
|
|
|
"Set the region to the text dragged over, and copy to kill ring.
|
2011-07-14 14:01:16 +00:00
|
|
|
|
This should be bound to a mouse drag event.
|
|
|
|
|
|
See the `mouse-drag-copy-region' variable to control whether this
|
|
|
|
|
|
command alters the kill ring or not."
|
1992-10-17 07:07:39 +00:00
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
2009-07-15 01:25:32 +00:00
|
|
|
|
(select-window (posn-window (event-start click)))
|
|
|
|
|
|
(let ((beg (posn-point (event-start click)))
|
2016-06-09 08:12:48 +00:00
|
|
|
|
(end
|
|
|
|
|
|
(if (eq (posn-window (event-end click)) (selected-window))
|
|
|
|
|
|
(posn-point (event-end click))
|
|
|
|
|
|
;; If the mouse ends up in any other window or on the menu
|
|
|
|
|
|
;; bar, use `window-point' of selected window (Bug#23707).
|
|
|
|
|
|
(window-point)))
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(click-count (event-click-count click)))
|
|
|
|
|
|
(let ((drag-start (terminal-parameter nil 'mouse-drag-start)))
|
|
|
|
|
|
(when drag-start
|
2014-05-27 05:01:49 +00:00
|
|
|
|
;; Drag events don't come with a click count, sadly, so we hack
|
|
|
|
|
|
;; our way around this problem by remembering the start-event in
|
|
|
|
|
|
;; `mouse-drag-start' and fetching the click-count from there.
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(when (and (<= click-count 1)
|
|
|
|
|
|
(equal beg (posn-point (event-start drag-start))))
|
|
|
|
|
|
(setq click-count (event-click-count drag-start)))
|
2014-05-27 05:01:49 +00:00
|
|
|
|
;; Occasionally we get spurious drag events where the user hasn't
|
|
|
|
|
|
;; dragged his mouse, but instead Emacs has dragged the text under the
|
|
|
|
|
|
;; user's mouse. Try to recover those cases (bug#17562).
|
|
|
|
|
|
(when (and (equal (posn-x-y (event-start click))
|
|
|
|
|
|
(posn-x-y (event-end click)))
|
|
|
|
|
|
(not (eq (car drag-start) 'mouse-movement)))
|
|
|
|
|
|
(setq end beg))
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(setf (terminal-parameter nil 'mouse-drag-start) nil)))
|
|
|
|
|
|
(when (and (integerp beg) (integerp end))
|
|
|
|
|
|
(let ((range (mouse-start-end beg end (1- click-count))))
|
|
|
|
|
|
(if (< end beg)
|
|
|
|
|
|
(setq end (nth 0 range) beg (nth 1 range))
|
|
|
|
|
|
(setq beg (nth 0 range) end (nth 1 range)))))
|
2009-07-15 01:25:32 +00:00
|
|
|
|
(and mouse-drag-copy-region (integerp beg) (integerp end)
|
|
|
|
|
|
;; Don't set this-command to `kill-region', so a following
|
|
|
|
|
|
;; C-w won't double the text in the kill ring. Ignore
|
|
|
|
|
|
;; `last-command' so we don't append to a preceding kill.
|
|
|
|
|
|
(let (this-command last-command deactivate-mark)
|
|
|
|
|
|
(copy-region-as-kill beg end)))
|
|
|
|
|
|
(if (numberp beg) (goto-char beg))
|
|
|
|
|
|
;; On a text terminal, bounce the cursor.
|
1995-06-05 17:36:29 +00:00
|
|
|
|
(or transient-mark-mode
|
2009-07-15 01:25:32 +00:00
|
|
|
|
(window-system)
|
1993-05-15 19:52:01 +00:00
|
|
|
|
(sit-for 1))
|
1992-10-17 07:07:39 +00:00
|
|
|
|
(push-mark)
|
1993-05-15 20:32:23 +00:00
|
|
|
|
(set-mark (point))
|
2009-07-15 01:25:32 +00:00
|
|
|
|
(if (numberp end) (goto-char end))
|
1995-02-12 04:51:42 +00:00
|
|
|
|
(mouse-set-region-1)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-set-region-1 ()
|
2004-05-28 21:06:26 +00:00
|
|
|
|
;; Set transient-mark-mode for a little while.
|
2008-04-02 20:16:33 +00:00
|
|
|
|
(unless (eq (car-safe transient-mark-mode) 'only)
|
2014-06-23 15:32:24 +00:00
|
|
|
|
(setq-local transient-mark-mode
|
|
|
|
|
|
(cons 'only
|
|
|
|
|
|
(unless (eq transient-mark-mode 'lambda)
|
|
|
|
|
|
transient-mark-mode))))
|
1995-02-12 04:51:42 +00:00
|
|
|
|
(setq mouse-last-region-beg (region-beginning))
|
|
|
|
|
|
(setq mouse-last-region-end (region-end))
|
|
|
|
|
|
(setq mouse-last-region-tick (buffer-modified-tick)))
|
1992-10-17 07:07:39 +00:00
|
|
|
|
|
1997-05-03 22:19:10 +00:00
|
|
|
|
(defcustom mouse-scroll-delay 0.25
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"The pause between scroll steps caused by mouse drags, in seconds.
|
1993-06-30 04:47:37 +00:00
|
|
|
|
If you drag the mouse beyond the edge of a window, Emacs scrolls the
|
|
|
|
|
|
window to bring the text beyond that edge into view, with a delay of
|
|
|
|
|
|
this many seconds between scroll steps. Scrolling stops when you move
|
|
|
|
|
|
the mouse back into the window, or release the button.
|
|
|
|
|
|
This variable's value may be non-integral.
|
1997-05-03 22:19:10 +00:00
|
|
|
|
Setting this to zero causes Emacs to scroll as fast as it can."
|
|
|
|
|
|
:type 'number
|
|
|
|
|
|
:group 'mouse)
|
1993-06-30 04:47:37 +00:00
|
|
|
|
|
1997-05-03 22:19:10 +00:00
|
|
|
|
(defcustom mouse-scroll-min-lines 1
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"The minimum number of lines scrolled by dragging mouse out of window.
|
1995-09-24 23:20:39 +00:00
|
|
|
|
Moving the mouse out the top or bottom edge of the window begins
|
|
|
|
|
|
scrolling repeatedly. The number of lines scrolled per repetition
|
|
|
|
|
|
is normally equal to the number of lines beyond the window edge that
|
|
|
|
|
|
the mouse has moved. However, it always scrolls at least the number
|
1997-05-03 22:19:10 +00:00
|
|
|
|
of lines specified by this variable."
|
|
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'mouse)
|
1995-09-18 14:15:22 +00:00
|
|
|
|
|
1994-06-17 00:51:33 +00:00
|
|
|
|
(defun mouse-scroll-subr (window jump &optional overlay start)
|
|
|
|
|
|
"Scroll the window WINDOW, JUMP lines at a time, until new input arrives.
|
1993-06-30 04:47:37 +00:00
|
|
|
|
If OVERLAY is an overlay, let it stretch from START to the far edge of
|
|
|
|
|
|
the newly visible text.
|
|
|
|
|
|
Upon exit, point is at the far edge of the newly visible text."
|
1995-09-18 14:15:22 +00:00
|
|
|
|
(cond
|
|
|
|
|
|
((and (> jump 0) (< jump mouse-scroll-min-lines))
|
|
|
|
|
|
(setq jump mouse-scroll-min-lines))
|
|
|
|
|
|
((and (< jump 0) (< (- jump) mouse-scroll-min-lines))
|
|
|
|
|
|
(setq jump (- mouse-scroll-min-lines))))
|
1994-06-19 18:04:35 +00:00
|
|
|
|
(let ((opoint (point)))
|
|
|
|
|
|
(while (progn
|
|
|
|
|
|
(goto-char (window-start window))
|
|
|
|
|
|
(if (not (zerop (vertical-motion jump window)))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(set-window-start window (point))
|
|
|
|
|
|
(if (natnump jump)
|
1998-03-14 08:20:37 +00:00
|
|
|
|
(if (window-end window)
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(goto-char (window-end window))
|
|
|
|
|
|
;; window-end doesn't reflect the window's new
|
|
|
|
|
|
;; start position until the next redisplay.
|
|
|
|
|
|
(vertical-motion (1- jump) window))
|
|
|
|
|
|
(vertical-motion (- (window-height window) 2)))
|
1994-06-19 18:04:35 +00:00
|
|
|
|
(goto-char (window-start window)))
|
|
|
|
|
|
(if overlay
|
|
|
|
|
|
(move-overlay overlay start (point)))
|
|
|
|
|
|
;; Now that we have scrolled WINDOW properly,
|
|
|
|
|
|
;; put point back where it was for the redisplay
|
|
|
|
|
|
;; so that we don't mess up the selected window.
|
|
|
|
|
|
(or (eq window (selected-window))
|
|
|
|
|
|
(goto-char opoint))
|
1994-06-25 23:48:04 +00:00
|
|
|
|
(sit-for mouse-scroll-delay)))))
|
1994-06-19 18:04:35 +00:00
|
|
|
|
(or (eq window (selected-window))
|
|
|
|
|
|
(goto-char opoint))))
|
1993-05-15 19:52:01 +00:00
|
|
|
|
|
1993-11-15 09:56:05 +00:00
|
|
|
|
(defvar mouse-selection-click-count 0)
|
1993-09-20 17:36:49 +00:00
|
|
|
|
|
1995-06-29 22:19:13 +00:00
|
|
|
|
(defvar mouse-selection-click-count-buffer nil)
|
|
|
|
|
|
|
1993-06-30 04:47:37 +00:00
|
|
|
|
(defun mouse-drag-region (start-event)
|
1993-06-08 05:16:47 +00:00
|
|
|
|
"Set the region to the text that the mouse is dragged over.
|
1993-08-10 17:03:06 +00:00
|
|
|
|
Highlight the drag area as you move the mouse.
|
|
|
|
|
|
This must be bound to a button-down mouse event.
|
1996-04-30 16:11:53 +00:00
|
|
|
|
In Transient Mark mode, the highlighting remains as long as the mark
|
2017-05-27 11:57:11 +00:00
|
|
|
|
remains active. Otherwise, it remains until the next input event.
|
2002-01-17 02:07:54 +00:00
|
|
|
|
|
2017-05-27 11:57:11 +00:00
|
|
|
|
When the region already exists and `mouse-drag-and-drop-region'
|
|
|
|
|
|
is non-nil, this moves the entire region of text to where mouse
|
|
|
|
|
|
is dragged over to."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(if (and mouse-drag-and-drop-region
|
|
|
|
|
|
(not (member 'triple (event-modifiers start-event)))
|
|
|
|
|
|
(equal (mouse-posn-property (event-start start-event) 'face) 'region))
|
|
|
|
|
|
(mouse-drag-and-drop-region start-event)
|
|
|
|
|
|
;; Give temporary modes such as isearch a chance to turn off.
|
|
|
|
|
|
(run-hooks 'mouse-leave-buffer-hook)
|
|
|
|
|
|
(mouse-drag-track start-event)))
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
2006-09-15 08:53:18 +00:00
|
|
|
|
(defun mouse-posn-property (pos property)
|
2006-09-20 04:56:58 +00:00
|
|
|
|
"Look for a property at click position.
|
|
|
|
|
|
POS may be either a buffer position or a click position like
|
2006-09-21 18:02:47 +00:00
|
|
|
|
those returned from `event-start'. If the click position is on
|
2006-09-20 04:56:58 +00:00
|
|
|
|
a string, the text property PROPERTY is examined.
|
|
|
|
|
|
If this is nil or the click is not on a string, then
|
|
|
|
|
|
the corresponding buffer position is searched for PROPERTY.
|
|
|
|
|
|
If PROPERTY is encountered in one of those places,
|
|
|
|
|
|
its value is returned."
|
2006-09-15 08:53:18 +00:00
|
|
|
|
(if (consp pos)
|
|
|
|
|
|
(let ((w (posn-window pos)) (pt (posn-point pos))
|
|
|
|
|
|
(str (posn-string pos)))
|
|
|
|
|
|
(or (and str
|
|
|
|
|
|
(get-text-property (cdr str) property (car str)))
|
2014-06-06 02:35:17 +00:00
|
|
|
|
;; Mouse clicks in the fringe come with a position in
|
|
|
|
|
|
;; (nth 5). This is useful but is not exactly where we clicked, so
|
|
|
|
|
|
;; don't look up that position's properties!
|
|
|
|
|
|
(and pt (not (memq (posn-area pos) '(left-fringe right-fringe
|
|
|
|
|
|
left-margin right-margin)))
|
2006-09-15 08:53:18 +00:00
|
|
|
|
(get-char-property pt property w))))
|
|
|
|
|
|
(get-char-property pos property)))
|
|
|
|
|
|
|
2004-12-17 15:16:18 +00:00
|
|
|
|
(defun mouse-on-link-p (pos)
|
|
|
|
|
|
"Return non-nil if POS is on a link in the current buffer.
|
2016-07-07 16:15:03 +00:00
|
|
|
|
POS must specify a buffer position in the current buffer, as a list
|
|
|
|
|
|
of the form returned by the `event-start' and `event-end' functions,
|
|
|
|
|
|
or a mouse event location in the selected window (see `event-start').
|
2005-02-25 23:30:59 +00:00
|
|
|
|
However, if `mouse-1-click-in-non-selected-windows' is non-nil,
|
|
|
|
|
|
POS may be a mouse event location in any window.
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
|
|
|
|
|
A clickable link is identified by one of the following methods:
|
|
|
|
|
|
|
2005-01-12 10:54:02 +00:00
|
|
|
|
- If the character at POS has a non-nil `follow-link' text or
|
2005-04-08 09:24:25 +00:00
|
|
|
|
overlay property, the value of that property determines what to do.
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
2005-01-12 10:54:02 +00:00
|
|
|
|
- If there is a local key-binding or a keybinding at position POS
|
|
|
|
|
|
for the `follow-link' event, the binding of that event determines
|
|
|
|
|
|
what to do.
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
2005-01-12 10:54:02 +00:00
|
|
|
|
The resulting value determine whether POS is inside a link:
|
|
|
|
|
|
|
|
|
|
|
|
- If the value is `mouse-face', POS is inside a link if there
|
2004-12-17 15:16:18 +00:00
|
|
|
|
is a non-nil `mouse-face' property at POS. Return t in this case.
|
|
|
|
|
|
|
2005-01-12 10:54:02 +00:00
|
|
|
|
- If the value is a function, FUNC, POS is inside a link if
|
2004-12-17 15:16:18 +00:00
|
|
|
|
the call \(FUNC POS) returns non-nil. Return the return value
|
2006-07-23 21:13:13 +00:00
|
|
|
|
from that call. Arg is \(posn-point POS) if POS is a mouse event.
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
2005-01-12 10:54:02 +00:00
|
|
|
|
- Otherwise, return the value itself.
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
|
|
|
|
|
The return value is interpreted as follows:
|
|
|
|
|
|
|
|
|
|
|
|
- If it is a string, the mouse-1 event is translated into the
|
|
|
|
|
|
first character of the string, i.e. the action of the mouse-1
|
|
|
|
|
|
click is the local or global binding of that character.
|
|
|
|
|
|
|
|
|
|
|
|
- If it is a vector, the mouse-1 event is translated into the
|
|
|
|
|
|
first element of that vector, i.e. the action of the mouse-1
|
|
|
|
|
|
click is the local or global binding of that event.
|
|
|
|
|
|
|
|
|
|
|
|
- Otherwise, the mouse-1 event is translated into a mouse-2 event
|
|
|
|
|
|
at the same position."
|
2006-09-15 08:53:18 +00:00
|
|
|
|
(let ((action
|
2013-03-20 18:13:00 +00:00
|
|
|
|
(and (or (not (consp pos))
|
2006-09-15 08:53:18 +00:00
|
|
|
|
mouse-1-click-in-non-selected-windows
|
|
|
|
|
|
(eq (selected-window) (posn-window pos)))
|
|
|
|
|
|
(or (mouse-posn-property pos 'follow-link)
|
2013-03-19 12:47:10 +00:00
|
|
|
|
(let ((area (posn-area pos)))
|
|
|
|
|
|
(when area
|
|
|
|
|
|
(key-binding (vector area 'follow-link) nil t pos)))
|
2006-09-15 08:53:18 +00:00
|
|
|
|
(key-binding [follow-link] nil t pos)))))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((eq action 'mouse-face)
|
|
|
|
|
|
(and (mouse-posn-property pos 'mouse-face) t))
|
|
|
|
|
|
((functionp action)
|
2006-09-20 04:56:58 +00:00
|
|
|
|
;; FIXME: This seems questionable if the click is not in a buffer.
|
2006-09-19 16:33:30 +00:00
|
|
|
|
;; Should we instead decide that `action' takes a `posn'?
|
2006-09-20 04:56:58 +00:00
|
|
|
|
(if (consp pos)
|
|
|
|
|
|
(with-current-buffer (window-buffer (posn-window pos))
|
2006-11-06 02:43:53 +00:00
|
|
|
|
(funcall action (posn-point pos)))
|
2006-09-20 04:56:58 +00:00
|
|
|
|
(funcall action pos)))
|
2006-09-15 08:53:18 +00:00
|
|
|
|
(t action))))
|
2005-02-22 09:42:06 +00:00
|
|
|
|
|
2005-03-31 10:10:25 +00:00
|
|
|
|
(defun mouse-fixup-help-message (msg)
|
|
|
|
|
|
"Fix help message MSG for `mouse-1-click-follows-link'."
|
|
|
|
|
|
(let (mp pos)
|
|
|
|
|
|
(if (and mouse-1-click-follows-link
|
|
|
|
|
|
(stringp msg)
|
2010-08-01 16:48:15 +00:00
|
|
|
|
(string-match-p "\\`mouse-2" msg)
|
2005-03-31 10:10:25 +00:00
|
|
|
|
(setq mp (mouse-pixel-position))
|
|
|
|
|
|
(consp (setq pos (cdr mp)))
|
|
|
|
|
|
(car pos) (>= (car pos) 0)
|
|
|
|
|
|
(cdr pos) (>= (cdr pos) 0)
|
|
|
|
|
|
(setq pos (posn-at-x-y (car pos) (cdr pos) (car mp)))
|
|
|
|
|
|
(windowp (posn-window pos)))
|
|
|
|
|
|
(with-current-buffer (window-buffer (posn-window pos))
|
|
|
|
|
|
(if (mouse-on-link-p pos)
|
|
|
|
|
|
(setq msg (concat
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((eq mouse-1-click-follows-link 'double) "double-")
|
|
|
|
|
|
((and (integerp mouse-1-click-follows-link)
|
|
|
|
|
|
(< mouse-1-click-follows-link 0)) "Long ")
|
|
|
|
|
|
(t ""))
|
|
|
|
|
|
"mouse-1" (substring msg 7)))))))
|
|
|
|
|
|
msg)
|
2004-12-17 15:16:18 +00:00
|
|
|
|
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(defun mouse-drag-track (start-event)
|
2006-01-03 17:08:51 +00:00
|
|
|
|
"Track mouse drags by highlighting area between point and cursor.
|
2014-05-11 05:49:14 +00:00
|
|
|
|
The region will be defined with mark and point."
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check start-event)
|
2005-09-21 20:26:49 +00:00
|
|
|
|
(setq mouse-selection-click-count-buffer (current-buffer))
|
2009-07-17 15:45:08 +00:00
|
|
|
|
(deactivate-mark)
|
2011-09-24 18:38:20 +00:00
|
|
|
|
(let* ((scroll-margin 0) ; Avoid margin scrolling (Bug#9541).
|
2016-07-30 08:32:02 +00:00
|
|
|
|
(start-posn (event-start start-event))
|
|
|
|
|
|
(start-point (posn-point start-posn))
|
|
|
|
|
|
(start-window (posn-window start-posn))
|
|
|
|
|
|
(_ (with-current-buffer (window-buffer start-window)
|
|
|
|
|
|
(setq deactivate-mark nil)))
|
2005-09-21 20:26:49 +00:00
|
|
|
|
;; We've recorded what we needed from the current buffer and
|
|
|
|
|
|
;; window, now let's jump to the place of the event, where things
|
|
|
|
|
|
;; are happening.
|
|
|
|
|
|
(_ (mouse-set-point start-event))
|
|
|
|
|
|
(echo-keystrokes 0)
|
1993-06-30 04:47:37 +00:00
|
|
|
|
(bounds (window-edges start-window))
|
2004-11-13 01:29:45 +00:00
|
|
|
|
(make-cursor-line-fully-visible nil)
|
1993-06-30 04:47:37 +00:00
|
|
|
|
(top (nth 1 bounds))
|
2018-05-24 10:45:03 +00:00
|
|
|
|
(bottom (if (or (window-minibuffer-p start-window)
|
|
|
|
|
|
;; Do not account for the mode line if there
|
|
|
|
|
|
;; is no mode line, which is common for child
|
|
|
|
|
|
;; frames.
|
|
|
|
|
|
(not mode-line-format))
|
1993-06-30 04:47:37 +00:00
|
|
|
|
(nth 3 bounds)
|
|
|
|
|
|
;; Don't count the mode line.
|
1993-09-17 21:26:18 +00:00
|
|
|
|
(1- (nth 3 bounds))))
|
2010-07-05 16:42:50 +00:00
|
|
|
|
(click-count (1- (event-click-count start-event)))
|
2006-12-02 21:47:02 +00:00
|
|
|
|
;; Suppress automatic hscrolling, because that is a nuisance
|
|
|
|
|
|
;; when setting point near the right fringe (but see below).
|
2016-09-21 15:00:18 +00:00
|
|
|
|
(auto-hscroll-mode-saved auto-hscroll-mode)
|
|
|
|
|
|
(old-track-mouse track-mouse))
|
2010-07-03 03:07:48 +00:00
|
|
|
|
|
2010-07-05 16:42:50 +00:00
|
|
|
|
(setq mouse-selection-click-count click-count)
|
1995-09-18 14:15:22 +00:00
|
|
|
|
;; In case the down click is in the middle of some intangible text,
|
|
|
|
|
|
;; use the end of that text, and put it in START-POINT.
|
|
|
|
|
|
(if (< (point) start-point)
|
|
|
|
|
|
(goto-char start-point))
|
|
|
|
|
|
(setq start-point (point))
|
2010-07-03 03:07:48 +00:00
|
|
|
|
|
2010-07-05 16:42:50 +00:00
|
|
|
|
;; Activate the region, using `mouse-start-end' to determine where
|
|
|
|
|
|
;; to put point and mark (e.g., double-click will select a word).
|
2014-06-23 15:32:24 +00:00
|
|
|
|
(setq-local transient-mark-mode
|
|
|
|
|
|
(if (eq transient-mark-mode 'lambda)
|
|
|
|
|
|
'(only)
|
|
|
|
|
|
(cons 'only transient-mark-mode)))
|
2010-08-07 19:39:04 +00:00
|
|
|
|
(let ((range (mouse-start-end start-point start-point click-count)))
|
2010-08-16 02:08:01 +00:00
|
|
|
|
(push-mark (nth 0 range) t t)
|
2010-07-05 16:42:50 +00:00
|
|
|
|
(goto-char (nth 1 range)))
|
2010-07-03 03:07:48 +00:00
|
|
|
|
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(setf (terminal-parameter nil 'mouse-drag-start) start-event)
|
|
|
|
|
|
(setq track-mouse t)
|
|
|
|
|
|
(setq auto-hscroll-mode nil)
|
|
|
|
|
|
|
|
|
|
|
|
(set-transient-map
|
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
|
(define-key map [switch-frame] #'ignore)
|
|
|
|
|
|
(define-key map [select-window] #'ignore)
|
|
|
|
|
|
(define-key map [mouse-movement]
|
|
|
|
|
|
(lambda (event) (interactive "e")
|
|
|
|
|
|
(let* ((end (event-end event))
|
|
|
|
|
|
(end-point (posn-point end)))
|
2014-05-27 05:01:49 +00:00
|
|
|
|
(unless (eq end-point start-point)
|
2014-05-11 05:49:14 +00:00
|
|
|
|
;; As soon as the user moves, we can re-enable auto-hscroll.
|
2014-05-27 05:01:49 +00:00
|
|
|
|
(setq auto-hscroll-mode auto-hscroll-mode-saved)
|
|
|
|
|
|
;; And remember that we have moved, so mouse-set-region can know
|
|
|
|
|
|
;; its event is really a drag event.
|
|
|
|
|
|
(setcar start-event 'mouse-movement))
|
|
|
|
|
|
(if (and (eq (posn-window end) start-window)
|
|
|
|
|
|
(integer-or-marker-p end-point))
|
|
|
|
|
|
(mouse--drag-set-mark-and-point start-point
|
|
|
|
|
|
end-point click-count)
|
|
|
|
|
|
(let ((mouse-row (cdr (cdr (mouse-position)))))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((null mouse-row))
|
|
|
|
|
|
((< mouse-row top)
|
|
|
|
|
|
(mouse-scroll-subr start-window (- mouse-row top)
|
|
|
|
|
|
nil start-point))
|
|
|
|
|
|
((>= mouse-row bottom)
|
|
|
|
|
|
(mouse-scroll-subr start-window (1+ (- mouse-row bottom))
|
|
|
|
|
|
nil start-point))))))))
|
2014-05-11 05:49:14 +00:00
|
|
|
|
map)
|
|
|
|
|
|
t (lambda ()
|
2016-09-21 15:00:18 +00:00
|
|
|
|
(setq track-mouse old-track-mouse)
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(setq auto-hscroll-mode auto-hscroll-mode-saved)
|
2013-02-01 23:40:55 +00:00
|
|
|
|
(deactivate-mark)
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(pop-mark)))))
|
2010-07-03 03:07:48 +00:00
|
|
|
|
|
2010-08-16 02:08:01 +00:00
|
|
|
|
(defun mouse--drag-set-mark-and-point (start click click-count)
|
|
|
|
|
|
(let* ((range (mouse-start-end start click click-count))
|
|
|
|
|
|
(beg (nth 0 range))
|
|
|
|
|
|
(end (nth 1 range)))
|
|
|
|
|
|
(cond ((eq (mark) beg)
|
|
|
|
|
|
(goto-char end))
|
|
|
|
|
|
((eq (mark) end)
|
|
|
|
|
|
(goto-char beg))
|
|
|
|
|
|
((< click (mark))
|
|
|
|
|
|
(set-mark end)
|
|
|
|
|
|
(goto-char beg))
|
|
|
|
|
|
(t
|
|
|
|
|
|
(set-mark beg)
|
|
|
|
|
|
(goto-char end)))))
|
|
|
|
|
|
|
1993-09-17 21:26:18 +00:00
|
|
|
|
;; Commands to handle xterm-style multiple clicks.
|
|
|
|
|
|
(defun mouse-skip-word (dir)
|
|
|
|
|
|
"Skip over word, over whitespace, or over identical punctuation.
|
|
|
|
|
|
If DIR is positive skip forward; if negative, skip backward."
|
|
|
|
|
|
(let* ((char (following-char))
|
|
|
|
|
|
(syntax (char-to-string (char-syntax char))))
|
1998-07-30 01:34:38 +00:00
|
|
|
|
(cond ((string= syntax "w")
|
|
|
|
|
|
;; Here, we can't use skip-syntax-forward/backward because
|
|
|
|
|
|
;; they don't pay attention to word-separating-categories,
|
|
|
|
|
|
;; and thus they will skip over a true word boundary. So,
|
2008-06-27 07:34:53 +00:00
|
|
|
|
;; we simulate the original behavior by using forward-word.
|
1998-07-30 01:34:38 +00:00
|
|
|
|
(if (< dir 0)
|
|
|
|
|
|
(if (not (looking-at "\\<"))
|
|
|
|
|
|
(forward-word -1))
|
|
|
|
|
|
(if (or (looking-at "\\<") (not (looking-at "\\>")))
|
|
|
|
|
|
(forward-word 1))))
|
|
|
|
|
|
((string= syntax " ")
|
1995-09-18 14:15:22 +00:00
|
|
|
|
(if (< dir 0)
|
|
|
|
|
|
(skip-syntax-backward syntax)
|
|
|
|
|
|
(skip-syntax-forward syntax)))
|
|
|
|
|
|
((string= syntax "_")
|
|
|
|
|
|
(if (< dir 0)
|
|
|
|
|
|
(skip-syntax-backward "w_")
|
|
|
|
|
|
(skip-syntax-forward "w_")))
|
|
|
|
|
|
((< dir 0)
|
|
|
|
|
|
(while (and (not (bobp)) (= (preceding-char) char))
|
|
|
|
|
|
(forward-char -1)))
|
|
|
|
|
|
(t
|
|
|
|
|
|
(while (and (not (eobp)) (= (following-char) char))
|
|
|
|
|
|
(forward-char 1))))))
|
1993-09-17 21:26:18 +00:00
|
|
|
|
|
1993-09-20 17:36:49 +00:00
|
|
|
|
(defun mouse-start-end (start end mode)
|
2005-11-03 21:37:21 +00:00
|
|
|
|
"Return a list of region bounds based on START and END according to MODE.
|
2003-09-01 18:47:29 +00:00
|
|
|
|
If MODE is 0 then set point to (min START END), mark to (max START END).
|
|
|
|
|
|
If MODE is 1 then set point to start of word at (min START END),
|
|
|
|
|
|
mark to end of word at (max START END).
|
|
|
|
|
|
If MODE is 2 then do the same for lines."
|
1993-09-17 21:26:18 +00:00
|
|
|
|
(if (> start end)
|
|
|
|
|
|
(let ((temp start))
|
|
|
|
|
|
(setq start end
|
|
|
|
|
|
end temp)))
|
1993-11-24 06:35:03 +00:00
|
|
|
|
(setq mode (mod mode 3))
|
1993-09-17 21:26:18 +00:00
|
|
|
|
(cond ((= mode 0)
|
|
|
|
|
|
(list start end))
|
|
|
|
|
|
((and (= mode 1)
|
|
|
|
|
|
(= start end)
|
1994-02-09 22:21:47 +00:00
|
|
|
|
(char-after start)
|
1993-09-17 21:26:18 +00:00
|
|
|
|
(= (char-syntax (char-after start)) ?\())
|
2016-02-25 09:31:23 +00:00
|
|
|
|
(if (/= (syntax-class (syntax-after start)) 4) ; raw syntax code for ?\(
|
|
|
|
|
|
;; This happens in CC Mode when unbalanced parens in CPP
|
|
|
|
|
|
;; constructs are given punctuation syntax with
|
|
|
|
|
|
;; syntax-table text properties. (2016-02-21).
|
|
|
|
|
|
(signal 'scan-error (list "Containing expression ends prematurely"
|
|
|
|
|
|
start start))
|
|
|
|
|
|
(list start
|
|
|
|
|
|
(save-excursion
|
|
|
|
|
|
(goto-char start)
|
|
|
|
|
|
(forward-sexp 1)
|
|
|
|
|
|
(point)))))
|
1993-09-17 21:26:18 +00:00
|
|
|
|
((and (= mode 1)
|
|
|
|
|
|
(= start end)
|
1994-02-09 22:21:47 +00:00
|
|
|
|
(char-after start)
|
1993-09-17 21:26:18 +00:00
|
|
|
|
(= (char-syntax (char-after start)) ?\)))
|
2016-02-25 09:31:23 +00:00
|
|
|
|
(if (/= (syntax-class (syntax-after start)) 5) ; raw syntax code for ?\)
|
|
|
|
|
|
;; See above comment about CC Mode.
|
|
|
|
|
|
(signal 'scan-error (list "Unbalanced parentheses" start start))
|
|
|
|
|
|
(list (save-excursion
|
|
|
|
|
|
(goto-char (1+ start))
|
|
|
|
|
|
(backward-sexp 1)
|
|
|
|
|
|
(point))
|
|
|
|
|
|
(1+ start))))
|
1996-06-29 01:02:59 +00:00
|
|
|
|
((and (= mode 1)
|
|
|
|
|
|
(= start end)
|
|
|
|
|
|
(char-after start)
|
|
|
|
|
|
(= (char-syntax (char-after start)) ?\"))
|
|
|
|
|
|
(let ((open (or (eq start (point-min))
|
|
|
|
|
|
(save-excursion
|
|
|
|
|
|
(goto-char (- start 1))
|
|
|
|
|
|
(looking-at "\\s(\\|\\s \\|\\s>")))))
|
|
|
|
|
|
(if open
|
|
|
|
|
|
(list start
|
|
|
|
|
|
(save-excursion
|
|
|
|
|
|
(condition-case nil
|
2001-10-24 20:02:16 +00:00
|
|
|
|
(progn
|
1996-06-29 01:02:59 +00:00
|
|
|
|
(goto-char start)
|
|
|
|
|
|
(forward-sexp 1)
|
|
|
|
|
|
(point))
|
|
|
|
|
|
(error end))))
|
1996-12-26 20:48:46 +00:00
|
|
|
|
(list (save-excursion
|
1996-06-29 01:02:59 +00:00
|
|
|
|
(condition-case nil
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(goto-char (1+ start))
|
|
|
|
|
|
(backward-sexp 1)
|
|
|
|
|
|
(point))
|
1996-12-26 20:48:46 +00:00
|
|
|
|
(error end)))
|
|
|
|
|
|
(1+ start)))))
|
1993-09-17 21:26:18 +00:00
|
|
|
|
((= mode 1)
|
|
|
|
|
|
(list (save-excursion
|
|
|
|
|
|
(goto-char start)
|
|
|
|
|
|
(mouse-skip-word -1)
|
|
|
|
|
|
(point))
|
|
|
|
|
|
(save-excursion
|
|
|
|
|
|
(goto-char end)
|
|
|
|
|
|
(mouse-skip-word 1)
|
|
|
|
|
|
(point))))
|
|
|
|
|
|
((= mode 2)
|
|
|
|
|
|
(list (save-excursion
|
|
|
|
|
|
(goto-char start)
|
2010-08-16 02:08:01 +00:00
|
|
|
|
(line-beginning-position 1))
|
1993-09-17 21:26:18 +00:00
|
|
|
|
(save-excursion
|
|
|
|
|
|
(goto-char end)
|
|
|
|
|
|
(forward-line 1)
|
|
|
|
|
|
(point))))))
|
1993-06-17 18:17:32 +00:00
|
|
|
|
|
1993-06-13 04:18:43 +00:00
|
|
|
|
;; Subroutine: set the mark where CLICK happened,
|
|
|
|
|
|
;; but don't do anything else.
|
|
|
|
|
|
(defun mouse-set-mark-fast (click)
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
1993-06-13 04:18:43 +00:00
|
|
|
|
(let ((posn (event-start click)))
|
|
|
|
|
|
(select-window (posn-window posn))
|
|
|
|
|
|
(if (numberp (posn-point posn))
|
|
|
|
|
|
(push-mark (posn-point posn) t t))))
|
|
|
|
|
|
|
1996-07-07 01:59:10 +00:00
|
|
|
|
(defun mouse-undouble-last-event (events)
|
|
|
|
|
|
(let* ((index (1- (length events)))
|
|
|
|
|
|
(last (nthcdr index events))
|
|
|
|
|
|
(event (car last))
|
|
|
|
|
|
(basic (event-basic-type event))
|
1997-05-27 22:52:31 +00:00
|
|
|
|
(old-modifiers (event-modifiers event))
|
|
|
|
|
|
(modifiers (delq 'double (delq 'triple (copy-sequence old-modifiers))))
|
1996-07-07 01:59:10 +00:00
|
|
|
|
(new
|
|
|
|
|
|
(if (consp event)
|
1997-07-01 04:33:22 +00:00
|
|
|
|
;; Use reverse, not nreverse, since event-modifiers
|
|
|
|
|
|
;; does not copy the list it returns.
|
1997-07-09 02:47:07 +00:00
|
|
|
|
(cons (event-convert-list (reverse (cons basic modifiers)))
|
1996-07-07 01:59:10 +00:00
|
|
|
|
(cdr event))
|
|
|
|
|
|
event)))
|
|
|
|
|
|
(setcar last new)
|
1997-05-27 22:52:31 +00:00
|
|
|
|
(if (and (not (equal modifiers old-modifiers))
|
|
|
|
|
|
(key-binding (apply 'vector events)))
|
1996-07-07 01:59:10 +00:00
|
|
|
|
t
|
|
|
|
|
|
(setcar last event)
|
|
|
|
|
|
nil)))
|
|
|
|
|
|
|
2001-10-24 20:02:16 +00:00
|
|
|
|
;; Momentarily show where the mark is, if highlighting doesn't show it.
|
1996-08-27 01:03:35 +00:00
|
|
|
|
|
1991-12-20 07:15:37 +00:00
|
|
|
|
(defun mouse-set-mark (click)
|
|
|
|
|
|
"Set mark at the position clicked on with the mouse.
|
|
|
|
|
|
Display cursor at that position for a second.
|
|
|
|
|
|
This must be bound to a mouse click."
|
1992-09-13 11:44:06 +00:00
|
|
|
|
(interactive "e")
|
1994-08-13 20:29:54 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
|
|
|
|
|
(select-window (posn-window (event-start click)))
|
2015-08-24 14:04:46 +00:00
|
|
|
|
;; FIXME: Use save-excursion
|
1990-06-19 20:28:34 +00:00
|
|
|
|
(let ((point-save (point)))
|
|
|
|
|
|
(unwind-protect
|
1991-12-20 07:15:37 +00:00
|
|
|
|
(progn (mouse-set-point click)
|
1993-05-26 18:09:52 +00:00
|
|
|
|
(push-mark nil t t)
|
|
|
|
|
|
(or transient-mark-mode
|
|
|
|
|
|
(sit-for 1)))
|
1990-06-19 20:28:34 +00:00
|
|
|
|
(goto-char point-save))))
|
|
|
|
|
|
|
1991-12-20 07:15:37 +00:00
|
|
|
|
(defun mouse-kill (click)
|
|
|
|
|
|
"Kill the region between point and the mouse click.
|
|
|
|
|
|
The text is saved in the kill ring, as with \\[kill-region]."
|
1992-09-13 11:44:06 +00:00
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
1994-03-11 04:13:50 +00:00
|
|
|
|
(let* ((posn (event-start click))
|
|
|
|
|
|
(click-posn (posn-point posn)))
|
|
|
|
|
|
(select-window (posn-window posn))
|
1992-08-29 02:14:58 +00:00
|
|
|
|
(if (numberp click-posn)
|
|
|
|
|
|
(kill-region (min (point) click-posn)
|
|
|
|
|
|
(max (point) click-posn)))))
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
1992-06-10 01:34:51 +00:00
|
|
|
|
(defun mouse-yank-at-click (click arg)
|
|
|
|
|
|
"Insert the last stretch of killed text at the position clicked on.
|
2000-05-15 20:13:54 +00:00
|
|
|
|
Also move point to one end of the text thus inserted (normally the end),
|
2001-12-18 17:43:09 +00:00
|
|
|
|
and set mark at the beginning.
|
1994-02-06 02:53:16 +00:00
|
|
|
|
Prefix arguments are interpreted as with \\[yank].
|
|
|
|
|
|
If `mouse-yank-at-point' is non-nil, insert at point
|
2010-08-07 19:39:04 +00:00
|
|
|
|
regardless of where you click."
|
2004-11-01 13:50:49 +00:00
|
|
|
|
(interactive "e\nP")
|
1994-12-26 05:09:41 +00:00
|
|
|
|
;; Give temporary modes such as isearch a chance to turn off.
|
|
|
|
|
|
(run-hooks 'mouse-leave-buffer-hook)
|
2009-07-17 15:45:08 +00:00
|
|
|
|
(when select-active-regions
|
|
|
|
|
|
;; Without this, confusing things happen upon e.g. inserting into
|
|
|
|
|
|
;; the middle of an active region.
|
2009-07-17 23:27:28 +00:00
|
|
|
|
(deactivate-mark))
|
1994-02-06 02:53:16 +00:00
|
|
|
|
(or mouse-yank-at-point (mouse-set-point click))
|
1993-09-27 01:02:43 +00:00
|
|
|
|
(setq this-command 'yank)
|
1995-06-22 04:37:38 +00:00
|
|
|
|
(setq mouse-selection-click-count 0)
|
1992-06-10 01:34:51 +00:00
|
|
|
|
(yank arg))
|
|
|
|
|
|
|
2007-12-25 20:09:05 +00:00
|
|
|
|
(defun mouse-yank-primary (click)
|
|
|
|
|
|
"Insert the primary selection at the position clicked on.
|
2011-10-29 06:09:02 +00:00
|
|
|
|
Move point to the end of the inserted text, and set mark at
|
|
|
|
|
|
beginning. If `mouse-yank-at-point' is non-nil, insert at point
|
2007-12-25 20:09:05 +00:00
|
|
|
|
regardless of where you click."
|
|
|
|
|
|
(interactive "e")
|
|
|
|
|
|
;; Give temporary modes such as isearch a chance to turn off.
|
|
|
|
|
|
(run-hooks 'mouse-leave-buffer-hook)
|
2010-08-24 15:48:14 +00:00
|
|
|
|
;; Without this, confusing things happen upon e.g. inserting into
|
|
|
|
|
|
;; the middle of an active region.
|
2009-07-17 23:24:54 +00:00
|
|
|
|
(when select-active-regions
|
2010-08-24 15:48:14 +00:00
|
|
|
|
(let (select-active-regions)
|
|
|
|
|
|
(deactivate-mark)))
|
2007-12-25 20:09:05 +00:00
|
|
|
|
(or mouse-yank-at-point (mouse-set-point click))
|
Consolidate management/ownership of selections.
* lisp/select.el (gui-get-selection-alist): New method.
(gui-get-selection): Use it. Rename from x-get-selection.
(x-get-selection): Define as obsolete alias.
(x-get-clipboard): Mark obsolete.
(gui-get-primary-selection): New function.
(x-get-selection-value): Mark obsolete.
(gui-own-selection-alist, gui-disown-selection-alist)
(gui-selection-owner-p-alist): New methods.
(gui-set-selection): Use them. Rename from x-set-selection.
(x-set-selection): Define as obsolete alias.
(gui--valid-simple-selection-p): Rename from
x-valid-simple-selection-p.
* lisp/w32-common-fns.el (gui-own-selection, gui-disown-selection)
(gui-selection-owner-p, gui-get-selection): Define for w32.
(w32-get-selection-value): Rename from x-get-selection-value.
Use the new gui-last-selected-text.
* lisp/term/x-win.el (x-get-selection-value): Remove.
(x-clipboard-yank): Declare obsolete.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for x.
* lisp/term/w32-win.el (w32-win-suspend-error): Rename from
x-win-suspend-error.
* lisp/term/pc-win.el (w16-get-selection-value): Rename from
x-get-selection-value.
(w16-selection-owner-p): Rename from x-selection-owner-p.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for pc.
(w16--select-text): New function.
* lisp/term/ns-win.el (gui-own-selection, gui-disown-selection)
(gui-get-selection, gui-selection-owner-p): Define for ns.
* lisp/term.el (term-mouse-paste):
* lisp/mouse.el (mouse-yank-primary): Use gui-get-primary-selection.
* src/nsselect.m (ns-own-selection-internal, ns-disown-selection-internal):
Rename from the "x-" prefix.
2014-10-02 03:19:32 +00:00
|
|
|
|
(let ((primary (gui-get-primary-selection)))
|
2017-04-28 08:25:26 +00:00
|
|
|
|
(push-mark)
|
2014-07-02 14:42:00 +00:00
|
|
|
|
(insert-for-yank primary)))
|
2007-12-25 20:09:05 +00:00
|
|
|
|
|
1992-06-10 01:34:51 +00:00
|
|
|
|
(defun mouse-kill-ring-save (click)
|
1991-12-20 07:15:37 +00:00
|
|
|
|
"Copy the region between point and the mouse click in the kill ring.
|
|
|
|
|
|
This does not delete the region; it acts like \\[kill-ring-save]."
|
1992-09-13 11:44:06 +00:00
|
|
|
|
(interactive "e")
|
1993-06-13 04:18:43 +00:00
|
|
|
|
(mouse-set-mark-fast click)
|
1994-07-04 00:49:37 +00:00
|
|
|
|
(let (this-command last-command)
|
2010-07-03 03:07:48 +00:00
|
|
|
|
(kill-ring-save (point) (mark t))))
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
2008-04-01 08:35:58 +00:00
|
|
|
|
;; This function used to delete the text between point and the mouse
|
|
|
|
|
|
;; whenever it was equal to the front of the kill ring, but some
|
|
|
|
|
|
;; people found that confusing.
|
1993-01-26 01:58:16 +00:00
|
|
|
|
|
2010-08-21 04:46:23 +00:00
|
|
|
|
;; The position of the last invocation of `mouse-save-then-kill'.
|
1993-01-26 01:58:16 +00:00
|
|
|
|
(defvar mouse-save-then-kill-posn nil)
|
|
|
|
|
|
|
1993-11-14 06:26:02 +00:00
|
|
|
|
(defun mouse-save-then-kill-delete-region (beg end)
|
1993-11-24 06:35:03 +00:00
|
|
|
|
;; We must make our own undo boundaries
|
|
|
|
|
|
;; because they happen automatically only for the current buffer.
|
|
|
|
|
|
(undo-boundary)
|
1993-11-15 09:56:05 +00:00
|
|
|
|
(if (or (= beg end) (eq buffer-undo-list t))
|
|
|
|
|
|
;; If we have no undo list in this buffer,
|
|
|
|
|
|
;; just delete.
|
|
|
|
|
|
(delete-region beg end)
|
|
|
|
|
|
;; Delete, but make the undo-list entry share with the kill ring.
|
|
|
|
|
|
;; First, delete just one char, so in case buffer is being modified
|
|
|
|
|
|
;; for the first time, the undo list records that fact.
|
2015-09-12 04:30:02 +00:00
|
|
|
|
(let ((inhibit-modification-hooks t))
|
1994-06-13 19:35:07 +00:00
|
|
|
|
(delete-region beg
|
|
|
|
|
|
(+ beg (if (> end beg) 1 -1))))
|
1993-11-15 09:56:05 +00:00
|
|
|
|
(let ((buffer-undo-list buffer-undo-list))
|
|
|
|
|
|
;; Undo that deletion--but don't change the undo list!
|
2015-09-12 04:30:02 +00:00
|
|
|
|
(let ((inhibit-modification-hooks t))
|
1994-06-13 19:35:07 +00:00
|
|
|
|
(primitive-undo 1 buffer-undo-list))
|
1993-11-15 09:56:05 +00:00
|
|
|
|
;; Now delete the rest of the specified region,
|
|
|
|
|
|
;; but don't record it.
|
|
|
|
|
|
(setq buffer-undo-list t)
|
1993-11-24 06:35:03 +00:00
|
|
|
|
(if (/= (length (car kill-ring)) (- (max end beg) (min end beg)))
|
|
|
|
|
|
(error "Lossage in mouse-save-then-kill-delete-region"))
|
1993-11-15 09:56:05 +00:00
|
|
|
|
(delete-region beg end))
|
|
|
|
|
|
(let ((tail buffer-undo-list))
|
|
|
|
|
|
;; Search back in buffer-undo-list for the string
|
|
|
|
|
|
;; that came from deleting one character.
|
|
|
|
|
|
(while (and tail (not (stringp (car (car tail)))))
|
|
|
|
|
|
(setq tail (cdr tail)))
|
|
|
|
|
|
;; Replace it with an entry for the entire deleted text.
|
|
|
|
|
|
(and tail
|
1993-11-24 06:35:03 +00:00
|
|
|
|
(setcar tail (cons (car kill-ring) (min beg end))))))
|
|
|
|
|
|
(undo-boundary))
|
1993-09-20 17:36:49 +00:00
|
|
|
|
|
1992-09-26 08:15:35 +00:00
|
|
|
|
(defun mouse-save-then-kill (click)
|
2010-08-21 04:46:23 +00:00
|
|
|
|
"Set the region according to CLICK; the second time, kill it.
|
|
|
|
|
|
CLICK should be a mouse click event.
|
|
|
|
|
|
|
|
|
|
|
|
If the region is inactive, activate it temporarily. Set mark at
|
|
|
|
|
|
the original point, and move point to the position of CLICK.
|
|
|
|
|
|
|
|
|
|
|
|
If the region is already active, adjust it. Normally, do this by
|
|
|
|
|
|
moving point or mark, whichever is closer, to CLICK. But if you
|
|
|
|
|
|
have selected whole words or lines, move point or mark to the
|
|
|
|
|
|
word or line boundary closest to CLICK instead.
|
|
|
|
|
|
|
2010-09-05 22:40:57 +00:00
|
|
|
|
If `mouse-drag-copy-region' is non-nil, this command also saves the
|
|
|
|
|
|
new region to the kill ring (replacing the previous kill if the
|
|
|
|
|
|
previous region was just saved to the kill ring).
|
|
|
|
|
|
|
2010-08-21 04:46:23 +00:00
|
|
|
|
If this command is called a second consecutive time with the same
|
2010-09-05 22:40:57 +00:00
|
|
|
|
CLICK position, kill the region (or delete it
|
|
|
|
|
|
if `mouse-drag-copy-region' is non-nil)"
|
1992-09-26 08:15:35 +00:00
|
|
|
|
(interactive "e")
|
2010-08-21 04:46:23 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
|
|
|
|
|
(let* ((posn (event-start click))
|
|
|
|
|
|
(click-pt (posn-point posn))
|
|
|
|
|
|
(window (posn-window posn))
|
|
|
|
|
|
(buf (window-buffer window))
|
|
|
|
|
|
;; Don't let a subsequent kill command append to this one.
|
|
|
|
|
|
(this-command this-command)
|
|
|
|
|
|
;; Check if the user has multi-clicked to select words/lines.
|
|
|
|
|
|
(click-count
|
|
|
|
|
|
(if (and (eq mouse-selection-click-count-buffer buf)
|
|
|
|
|
|
(with-current-buffer buf (mark t)))
|
|
|
|
|
|
mouse-selection-click-count
|
|
|
|
|
|
0)))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((not (numberp click-pt)) nil)
|
|
|
|
|
|
;; If the user clicked without moving point, kill the region.
|
|
|
|
|
|
;; This also resets `mouse-selection-click-count'.
|
|
|
|
|
|
((and (eq last-command 'mouse-save-then-kill)
|
|
|
|
|
|
(eq click-pt mouse-save-then-kill-posn)
|
|
|
|
|
|
(eq window (selected-window)))
|
2010-09-05 22:40:57 +00:00
|
|
|
|
(if mouse-drag-copy-region
|
|
|
|
|
|
;; Region already saved in the previous click;
|
|
|
|
|
|
;; don't make a duplicate entry, just delete.
|
|
|
|
|
|
(delete-region (mark t) (point))
|
|
|
|
|
|
(kill-region (mark t) (point)))
|
2010-08-21 04:46:23 +00:00
|
|
|
|
(setq mouse-selection-click-count 0)
|
|
|
|
|
|
(setq mouse-save-then-kill-posn nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Otherwise, if there is a suitable region, adjust it by moving
|
|
|
|
|
|
;; one end (whichever is closer) to CLICK-PT.
|
|
|
|
|
|
((or (with-current-buffer buf (region-active-p))
|
|
|
|
|
|
(and (eq window (selected-window))
|
|
|
|
|
|
(mark t)
|
|
|
|
|
|
(or (and (eq last-command 'mouse-save-then-kill)
|
|
|
|
|
|
mouse-save-then-kill-posn)
|
|
|
|
|
|
(and (memq last-command '(mouse-drag-region
|
|
|
|
|
|
mouse-set-region))
|
|
|
|
|
|
(or mark-even-if-inactive
|
|
|
|
|
|
(not transient-mark-mode))))))
|
|
|
|
|
|
(select-window window)
|
|
|
|
|
|
(let* ((range (mouse-start-end click-pt click-pt click-count)))
|
|
|
|
|
|
(if (< (abs (- click-pt (mark t)))
|
|
|
|
|
|
(abs (- click-pt (point))))
|
|
|
|
|
|
(set-mark (car range))
|
|
|
|
|
|
(goto-char (nth 1 range)))
|
|
|
|
|
|
(setq deactivate-mark nil)
|
|
|
|
|
|
(mouse-set-region-1)
|
2010-09-05 22:40:57 +00:00
|
|
|
|
(when mouse-drag-copy-region
|
|
|
|
|
|
;; Region already copied to kill-ring once, so replace.
|
|
|
|
|
|
(kill-new (filter-buffer-substring (mark t) (point)) t))
|
2010-08-21 04:46:23 +00:00
|
|
|
|
;; Arrange for a repeated mouse-3 to kill the region.
|
|
|
|
|
|
(setq mouse-save-then-kill-posn click-pt)))
|
|
|
|
|
|
|
|
|
|
|
|
;; Otherwise, set the mark where point is and move to CLICK-PT.
|
|
|
|
|
|
(t
|
|
|
|
|
|
(select-window window)
|
|
|
|
|
|
(mouse-set-mark-fast click)
|
|
|
|
|
|
(let ((before-scroll (with-current-buffer buf point-before-scroll)))
|
|
|
|
|
|
(if before-scroll (goto-char before-scroll)))
|
|
|
|
|
|
(exchange-point-and-mark)
|
|
|
|
|
|
(mouse-set-region-1)
|
2010-09-05 22:40:57 +00:00
|
|
|
|
(when mouse-drag-copy-region
|
|
|
|
|
|
(kill-new (filter-buffer-substring (mark t) (point))))
|
2010-08-21 04:46:23 +00:00
|
|
|
|
(setq mouse-save-then-kill-posn click-pt)))))
|
|
|
|
|
|
|
1993-06-17 18:17:32 +00:00
|
|
|
|
|
|
|
|
|
|
(global-set-key [M-mouse-1] 'mouse-start-secondary)
|
|
|
|
|
|
(global-set-key [M-drag-mouse-1] 'mouse-set-secondary)
|
|
|
|
|
|
(global-set-key [M-down-mouse-1] 'mouse-drag-secondary)
|
|
|
|
|
|
(global-set-key [M-mouse-3] 'mouse-secondary-save-then-kill)
|
1993-11-24 06:35:03 +00:00
|
|
|
|
(global-set-key [M-mouse-2] 'mouse-yank-secondary)
|
1993-06-17 18:17:32 +00:00
|
|
|
|
|
2005-09-21 20:26:49 +00:00
|
|
|
|
(defconst mouse-secondary-overlay
|
|
|
|
|
|
(let ((ol (make-overlay (point-min) (point-min))))
|
|
|
|
|
|
(delete-overlay ol)
|
|
|
|
|
|
(overlay-put ol 'face 'secondary-selection)
|
|
|
|
|
|
ol)
|
|
|
|
|
|
"An overlay which records the current secondary selection.
|
|
|
|
|
|
It is deleted when there is no secondary selection.")
|
1993-06-17 18:17:32 +00:00
|
|
|
|
|
1994-10-01 07:30:18 +00:00
|
|
|
|
(defvar mouse-secondary-click-count 0)
|
|
|
|
|
|
|
1993-06-17 18:17:32 +00:00
|
|
|
|
;; A marker which records the specified first end for a secondary selection.
|
|
|
|
|
|
;; May be nil.
|
|
|
|
|
|
(defvar mouse-secondary-start nil)
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-start-secondary (click)
|
|
|
|
|
|
"Set one end of the secondary selection to the position clicked on.
|
|
|
|
|
|
Use \\[mouse-secondary-save-then-kill] to set the other end
|
|
|
|
|
|
and complete the secondary selection."
|
|
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
1993-06-17 18:17:32 +00:00
|
|
|
|
(let ((posn (event-start click)))
|
2005-09-21 20:26:49 +00:00
|
|
|
|
(with-current-buffer (window-buffer (posn-window posn))
|
1993-06-18 17:59:02 +00:00
|
|
|
|
;; Cancel any preexisting secondary selection.
|
2005-09-21 20:26:49 +00:00
|
|
|
|
(delete-overlay mouse-secondary-overlay)
|
1993-06-18 17:59:02 +00:00
|
|
|
|
(if (numberp (posn-point posn))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(or mouse-secondary-start
|
|
|
|
|
|
(setq mouse-secondary-start (make-marker)))
|
|
|
|
|
|
(move-marker mouse-secondary-start (posn-point posn)))))))
|
1993-06-17 18:17:32 +00:00
|
|
|
|
|
|
|
|
|
|
(defun mouse-set-secondary (click)
|
|
|
|
|
|
"Set the secondary selection to the text that the mouse is dragged over.
|
|
|
|
|
|
This must be bound to a mouse drag event."
|
|
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
1993-06-17 18:17:32 +00:00
|
|
|
|
(let ((posn (event-start click))
|
|
|
|
|
|
beg
|
|
|
|
|
|
(end (event-end click)))
|
2005-09-21 20:26:49 +00:00
|
|
|
|
(with-current-buffer (window-buffer (posn-window posn))
|
1993-06-18 17:59:02 +00:00
|
|
|
|
(if (numberp (posn-point posn))
|
|
|
|
|
|
(setq beg (posn-point posn)))
|
2007-04-01 17:45:20 +00:00
|
|
|
|
(move-overlay mouse-secondary-overlay beg (posn-point end))
|
Consolidate management/ownership of selections.
* lisp/select.el (gui-get-selection-alist): New method.
(gui-get-selection): Use it. Rename from x-get-selection.
(x-get-selection): Define as obsolete alias.
(x-get-clipboard): Mark obsolete.
(gui-get-primary-selection): New function.
(x-get-selection-value): Mark obsolete.
(gui-own-selection-alist, gui-disown-selection-alist)
(gui-selection-owner-p-alist): New methods.
(gui-set-selection): Use them. Rename from x-set-selection.
(x-set-selection): Define as obsolete alias.
(gui--valid-simple-selection-p): Rename from
x-valid-simple-selection-p.
* lisp/w32-common-fns.el (gui-own-selection, gui-disown-selection)
(gui-selection-owner-p, gui-get-selection): Define for w32.
(w32-get-selection-value): Rename from x-get-selection-value.
Use the new gui-last-selected-text.
* lisp/term/x-win.el (x-get-selection-value): Remove.
(x-clipboard-yank): Declare obsolete.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for x.
* lisp/term/w32-win.el (w32-win-suspend-error): Rename from
x-win-suspend-error.
* lisp/term/pc-win.el (w16-get-selection-value): Rename from
x-get-selection-value.
(w16-selection-owner-p): Rename from x-selection-owner-p.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for pc.
(w16--select-text): New function.
* lisp/term/ns-win.el (gui-own-selection, gui-disown-selection)
(gui-get-selection, gui-selection-owner-p): Define for ns.
* lisp/term.el (term-mouse-paste):
* lisp/mouse.el (mouse-yank-primary): Use gui-get-primary-selection.
* src/nsselect.m (ns-own-selection-internal, ns-disown-selection-internal):
Rename from the "x-" prefix.
2014-10-02 03:19:32 +00:00
|
|
|
|
(gui-set-selection
|
2007-04-01 17:45:20 +00:00
|
|
|
|
'SECONDARY
|
|
|
|
|
|
(buffer-substring (overlay-start mouse-secondary-overlay)
|
|
|
|
|
|
(overlay-end mouse-secondary-overlay))))))
|
1992-09-26 08:15:35 +00:00
|
|
|
|
|
1993-09-27 01:02:43 +00:00
|
|
|
|
(defun mouse-drag-secondary (start-event)
|
1993-06-17 18:17:32 +00:00
|
|
|
|
"Set the secondary selection to the text that the mouse is dragged over.
|
1993-09-27 01:02:43 +00:00
|
|
|
|
Highlight the drag area as you move the mouse.
|
1996-09-25 03:27:04 +00:00
|
|
|
|
This must be bound to a button-down mouse event.
|
|
|
|
|
|
The function returns a non-nil value if it creates a secondary selection."
|
1993-06-17 18:17:32 +00:00
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check start-event)
|
1996-01-15 05:12:49 +00:00
|
|
|
|
(let* ((echo-keystrokes 0)
|
|
|
|
|
|
(start-posn (event-start start-event))
|
1993-09-27 01:02:43 +00:00
|
|
|
|
(start-point (posn-point start-posn))
|
|
|
|
|
|
(start-window (posn-window start-posn))
|
|
|
|
|
|
(bounds (window-edges start-window))
|
|
|
|
|
|
(top (nth 1 bounds))
|
|
|
|
|
|
(bottom (if (window-minibuffer-p start-window)
|
|
|
|
|
|
(nth 3 bounds)
|
|
|
|
|
|
;; Don't count the mode line.
|
|
|
|
|
|
(1- (nth 3 bounds))))
|
|
|
|
|
|
(click-count (1- (event-click-count start-event))))
|
2005-09-21 20:26:49 +00:00
|
|
|
|
(with-current-buffer (window-buffer start-window)
|
1994-10-01 07:30:18 +00:00
|
|
|
|
(setq mouse-secondary-click-count click-count)
|
1993-11-24 06:35:03 +00:00
|
|
|
|
(if (> (mod click-count 3) 0)
|
1993-11-14 06:26:02 +00:00
|
|
|
|
;; Double or triple press: make an initial selection
|
|
|
|
|
|
;; of one word or line.
|
1993-09-27 01:02:43 +00:00
|
|
|
|
(let ((range (mouse-start-end start-point start-point click-count)))
|
|
|
|
|
|
(set-marker mouse-secondary-start nil)
|
|
|
|
|
|
(move-overlay mouse-secondary-overlay (car range) (nth 1 range)
|
|
|
|
|
|
(window-buffer start-window)))
|
1993-11-14 06:26:02 +00:00
|
|
|
|
;; Single-press: cancel any preexisting secondary selection.
|
1993-09-27 01:02:43 +00:00
|
|
|
|
(or mouse-secondary-start
|
|
|
|
|
|
(setq mouse-secondary-start (make-marker)))
|
|
|
|
|
|
(set-marker mouse-secondary-start start-point)
|
|
|
|
|
|
(delete-overlay mouse-secondary-overlay))
|
2014-10-21 20:11:22 +00:00
|
|
|
|
;; FIXME: Use mouse-drag-track!
|
1993-09-27 01:02:43 +00:00
|
|
|
|
(let (event end end-point)
|
|
|
|
|
|
(track-mouse
|
|
|
|
|
|
(while (progn
|
|
|
|
|
|
(setq event (read-event))
|
|
|
|
|
|
(or (mouse-movement-p event)
|
2005-01-11 15:36:57 +00:00
|
|
|
|
(memq (car-safe event) '(switch-frame select-window))))
|
1993-09-27 01:02:43 +00:00
|
|
|
|
|
2005-01-11 15:36:57 +00:00
|
|
|
|
(if (memq (car-safe event) '(switch-frame select-window))
|
1993-09-27 01:02:43 +00:00
|
|
|
|
nil
|
|
|
|
|
|
(setq end (event-end event)
|
|
|
|
|
|
end-point (posn-point end))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
;; Are we moving within the original window?
|
|
|
|
|
|
((and (eq (posn-window end) start-window)
|
|
|
|
|
|
(integer-or-marker-p end-point))
|
|
|
|
|
|
(let ((range (mouse-start-end start-point end-point
|
|
|
|
|
|
click-count)))
|
1994-07-12 17:03:13 +00:00
|
|
|
|
(if (or (/= start-point end-point)
|
|
|
|
|
|
(null (marker-position mouse-secondary-start)))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(set-marker mouse-secondary-start nil)
|
|
|
|
|
|
(move-overlay mouse-secondary-overlay
|
|
|
|
|
|
(car range) (nth 1 range))))))
|
1994-05-20 08:46:20 +00:00
|
|
|
|
(t
|
|
|
|
|
|
(let ((mouse-row (cdr (cdr (mouse-position)))))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((null mouse-row))
|
|
|
|
|
|
((< mouse-row top)
|
1994-06-17 00:51:33 +00:00
|
|
|
|
(mouse-scroll-subr start-window (- mouse-row top)
|
|
|
|
|
|
mouse-secondary-overlay start-point))
|
1994-06-25 23:48:04 +00:00
|
|
|
|
((>= mouse-row bottom)
|
1994-06-17 00:51:33 +00:00
|
|
|
|
(mouse-scroll-subr start-window (1+ (- mouse-row bottom))
|
1994-05-20 08:46:20 +00:00
|
|
|
|
mouse-secondary-overlay start-point)))))))))
|
1993-09-27 01:02:43 +00:00
|
|
|
|
|
1994-06-19 18:04:35 +00:00
|
|
|
|
(if (consp event)
|
1993-09-27 01:02:43 +00:00
|
|
|
|
(if (marker-position mouse-secondary-start)
|
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
|
(delete-overlay mouse-secondary-overlay)
|
Consolidate management/ownership of selections.
* lisp/select.el (gui-get-selection-alist): New method.
(gui-get-selection): Use it. Rename from x-get-selection.
(x-get-selection): Define as obsolete alias.
(x-get-clipboard): Mark obsolete.
(gui-get-primary-selection): New function.
(x-get-selection-value): Mark obsolete.
(gui-own-selection-alist, gui-disown-selection-alist)
(gui-selection-owner-p-alist): New methods.
(gui-set-selection): Use them. Rename from x-set-selection.
(x-set-selection): Define as obsolete alias.
(gui--valid-simple-selection-p): Rename from
x-valid-simple-selection-p.
* lisp/w32-common-fns.el (gui-own-selection, gui-disown-selection)
(gui-selection-owner-p, gui-get-selection): Define for w32.
(w32-get-selection-value): Rename from x-get-selection-value.
Use the new gui-last-selected-text.
* lisp/term/x-win.el (x-get-selection-value): Remove.
(x-clipboard-yank): Declare obsolete.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for x.
* lisp/term/w32-win.el (w32-win-suspend-error): Rename from
x-win-suspend-error.
* lisp/term/pc-win.el (w16-get-selection-value): Rename from
x-get-selection-value.
(w16-selection-owner-p): Rename from x-selection-owner-p.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for pc.
(w16--select-text): New function.
* lisp/term/ns-win.el (gui-own-selection, gui-disown-selection)
(gui-get-selection, gui-selection-owner-p): Define for ns.
* lisp/term.el (term-mouse-paste):
* lisp/mouse.el (mouse-yank-primary): Use gui-get-primary-selection.
* src/nsselect.m (ns-own-selection-internal, ns-disown-selection-internal):
Rename from the "x-" prefix.
2014-10-02 03:19:32 +00:00
|
|
|
|
(gui-set-selection 'SECONDARY nil)
|
1993-09-27 01:02:43 +00:00
|
|
|
|
(select-window start-window)
|
|
|
|
|
|
(save-excursion
|
|
|
|
|
|
(goto-char mouse-secondary-start)
|
1996-09-25 03:27:04 +00:00
|
|
|
|
(sit-for 1)
|
|
|
|
|
|
nil))
|
Consolidate management/ownership of selections.
* lisp/select.el (gui-get-selection-alist): New method.
(gui-get-selection): Use it. Rename from x-get-selection.
(x-get-selection): Define as obsolete alias.
(x-get-clipboard): Mark obsolete.
(gui-get-primary-selection): New function.
(x-get-selection-value): Mark obsolete.
(gui-own-selection-alist, gui-disown-selection-alist)
(gui-selection-owner-p-alist): New methods.
(gui-set-selection): Use them. Rename from x-set-selection.
(x-set-selection): Define as obsolete alias.
(gui--valid-simple-selection-p): Rename from
x-valid-simple-selection-p.
* lisp/w32-common-fns.el (gui-own-selection, gui-disown-selection)
(gui-selection-owner-p, gui-get-selection): Define for w32.
(w32-get-selection-value): Rename from x-get-selection-value.
Use the new gui-last-selected-text.
* lisp/term/x-win.el (x-get-selection-value): Remove.
(x-clipboard-yank): Declare obsolete.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for x.
* lisp/term/w32-win.el (w32-win-suspend-error): Rename from
x-win-suspend-error.
* lisp/term/pc-win.el (w16-get-selection-value): Rename from
x-get-selection-value.
(w16-selection-owner-p): Rename from x-selection-owner-p.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for pc.
(w16--select-text): New function.
* lisp/term/ns-win.el (gui-own-selection, gui-disown-selection)
(gui-get-selection, gui-selection-owner-p): Define for ns.
* lisp/term.el (term-mouse-paste):
* lisp/mouse.el (mouse-yank-primary): Use gui-get-primary-selection.
* src/nsselect.m (ns-own-selection-internal, ns-disown-selection-internal):
Rename from the "x-" prefix.
2014-10-02 03:19:32 +00:00
|
|
|
|
(gui-set-selection
|
1993-11-24 06:35:03 +00:00
|
|
|
|
'SECONDARY
|
|
|
|
|
|
(buffer-substring (overlay-start mouse-secondary-overlay)
|
|
|
|
|
|
(overlay-end mouse-secondary-overlay)))))))))
|
1993-06-17 18:17:32 +00:00
|
|
|
|
|
1993-11-24 06:35:03 +00:00
|
|
|
|
(defun mouse-yank-secondary (click)
|
1994-02-06 02:53:16 +00:00
|
|
|
|
"Insert the secondary selection at the position clicked on.
|
|
|
|
|
|
Move point to the end of the inserted text.
|
|
|
|
|
|
If `mouse-yank-at-point' is non-nil, insert at point
|
|
|
|
|
|
regardless of where you click."
|
2004-11-01 13:50:49 +00:00
|
|
|
|
(interactive "e")
|
1994-12-26 05:09:41 +00:00
|
|
|
|
;; Give temporary modes such as isearch a chance to turn off.
|
|
|
|
|
|
(run-hooks 'mouse-leave-buffer-hook)
|
1994-02-06 02:53:16 +00:00
|
|
|
|
(or mouse-yank-at-point (mouse-set-point click))
|
2014-10-21 20:11:22 +00:00
|
|
|
|
(let ((secondary (gui-get-selection 'SECONDARY)))
|
2007-07-16 04:42:24 +00:00
|
|
|
|
(if secondary
|
2014-07-02 14:42:00 +00:00
|
|
|
|
(insert-for-yank secondary)
|
2007-07-16 04:42:24 +00:00
|
|
|
|
(error "No secondary selection"))))
|
1993-11-24 06:35:03 +00:00
|
|
|
|
|
1993-12-23 03:33:34 +00:00
|
|
|
|
(defun mouse-kill-secondary ()
|
1993-11-24 06:35:03 +00:00
|
|
|
|
"Kill the text in the secondary selection.
|
|
|
|
|
|
This is intended more as a keyboard command than as a mouse command
|
|
|
|
|
|
but it can work as either one.
|
|
|
|
|
|
|
|
|
|
|
|
The current buffer (in case of keyboard use), or the buffer clicked on,
|
|
|
|
|
|
must be the one that the secondary selection is in. This requirement
|
|
|
|
|
|
is to prevent accidents."
|
1993-12-23 03:33:34 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
|
(let* ((keys (this-command-keys))
|
|
|
|
|
|
(click (elt keys (1- (length keys)))))
|
|
|
|
|
|
(or (eq (overlay-buffer mouse-secondary-overlay)
|
|
|
|
|
|
(if (listp click)
|
|
|
|
|
|
(window-buffer (posn-window (event-start click)))
|
|
|
|
|
|
(current-buffer)))
|
|
|
|
|
|
(error "Select or click on the buffer where the secondary selection is")))
|
1995-02-26 04:17:42 +00:00
|
|
|
|
(let (this-command)
|
2005-09-21 20:26:49 +00:00
|
|
|
|
(with-current-buffer (overlay-buffer mouse-secondary-overlay)
|
1995-02-26 04:17:42 +00:00
|
|
|
|
(kill-region (overlay-start mouse-secondary-overlay)
|
|
|
|
|
|
(overlay-end mouse-secondary-overlay))))
|
2009-07-15 01:25:32 +00:00
|
|
|
|
(delete-overlay mouse-secondary-overlay))
|
1993-06-17 18:17:32 +00:00
|
|
|
|
|
|
|
|
|
|
(defun mouse-secondary-save-then-kill (click)
|
2010-08-21 04:46:23 +00:00
|
|
|
|
"Set the secondary selection and save it to the kill ring.
|
|
|
|
|
|
The second time, kill it. CLICK should be a mouse click event.
|
|
|
|
|
|
|
|
|
|
|
|
If you have not called `mouse-start-secondary' in the clicked
|
|
|
|
|
|
buffer, activate the secondary selection and set it between point
|
|
|
|
|
|
and the click position CLICK.
|
|
|
|
|
|
|
|
|
|
|
|
Otherwise, adjust the bounds of the secondary selection.
|
|
|
|
|
|
Normally, do this by moving its beginning or end, whichever is
|
|
|
|
|
|
closer, to CLICK. But if you have selected whole words or lines,
|
|
|
|
|
|
adjust to the word or line boundary closest to CLICK instead.
|
|
|
|
|
|
|
|
|
|
|
|
If this command is called a second consecutive time with the same
|
|
|
|
|
|
CLICK position, kill the secondary selection."
|
1993-06-17 18:17:32 +00:00
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check click)
|
2010-08-21 04:46:23 +00:00
|
|
|
|
(let* ((posn (event-start click))
|
|
|
|
|
|
(click-pt (posn-point posn))
|
|
|
|
|
|
(window (posn-window posn))
|
|
|
|
|
|
(buf (window-buffer window))
|
|
|
|
|
|
;; Don't let a subsequent kill command append to this one.
|
|
|
|
|
|
(this-command this-command)
|
|
|
|
|
|
;; Check if the user has multi-clicked to select words/lines.
|
|
|
|
|
|
(click-count
|
|
|
|
|
|
(if (eq (overlay-buffer mouse-secondary-overlay) buf)
|
|
|
|
|
|
mouse-secondary-click-count
|
|
|
|
|
|
0))
|
|
|
|
|
|
(beg (overlay-start mouse-secondary-overlay))
|
|
|
|
|
|
(end (overlay-end mouse-secondary-overlay)))
|
|
|
|
|
|
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((not (numberp click-pt)) nil)
|
|
|
|
|
|
|
|
|
|
|
|
;; If the secondary selection is not active in BUF, activate it.
|
|
|
|
|
|
((not (eq buf (or (overlay-buffer mouse-secondary-overlay)
|
|
|
|
|
|
(if mouse-secondary-start
|
|
|
|
|
|
(marker-buffer mouse-secondary-start)))))
|
|
|
|
|
|
(select-window window)
|
|
|
|
|
|
(setq mouse-secondary-start (make-marker))
|
|
|
|
|
|
(move-marker mouse-secondary-start (point))
|
|
|
|
|
|
(move-overlay mouse-secondary-overlay (point) click-pt buf)
|
|
|
|
|
|
(kill-ring-save (point) click-pt))
|
|
|
|
|
|
|
|
|
|
|
|
;; If the user clicked without moving point, delete the secondary
|
|
|
|
|
|
;; selection. This also resets `mouse-secondary-click-count'.
|
|
|
|
|
|
((and (eq last-command 'mouse-secondary-save-then-kill)
|
|
|
|
|
|
(eq click-pt mouse-save-then-kill-posn)
|
|
|
|
|
|
(eq window (selected-window)))
|
|
|
|
|
|
(mouse-save-then-kill-delete-region beg end)
|
|
|
|
|
|
(delete-overlay mouse-secondary-overlay)
|
|
|
|
|
|
(setq mouse-secondary-click-count 0)
|
|
|
|
|
|
(setq mouse-save-then-kill-posn nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Otherwise, if there is a suitable secondary selection overlay,
|
|
|
|
|
|
;; adjust it by moving one end (whichever is closer) to CLICK-PT.
|
|
|
|
|
|
((and beg (eq buf (overlay-buffer mouse-secondary-overlay)))
|
|
|
|
|
|
(let* ((range (mouse-start-end click-pt click-pt click-count)))
|
|
|
|
|
|
(if (< (abs (- click-pt beg))
|
|
|
|
|
|
(abs (- click-pt end)))
|
|
|
|
|
|
(move-overlay mouse-secondary-overlay (car range) end)
|
|
|
|
|
|
(move-overlay mouse-secondary-overlay beg (nth 1 range))))
|
|
|
|
|
|
(setq deactivate-mark nil)
|
|
|
|
|
|
(if (eq last-command 'mouse-secondary-save-then-kill)
|
|
|
|
|
|
;; If the front of the kill ring comes from an immediately
|
|
|
|
|
|
;; previous use of this command, replace the entry.
|
|
|
|
|
|
(kill-new
|
|
|
|
|
|
(buffer-substring (overlay-start mouse-secondary-overlay)
|
|
|
|
|
|
(overlay-end mouse-secondary-overlay))
|
|
|
|
|
|
t)
|
|
|
|
|
|
(let (deactivate-mark)
|
|
|
|
|
|
(copy-region-as-kill (overlay-start mouse-secondary-overlay)
|
|
|
|
|
|
(overlay-end mouse-secondary-overlay))))
|
|
|
|
|
|
(setq mouse-save-then-kill-posn click-pt))
|
|
|
|
|
|
|
|
|
|
|
|
;; Otherwise, set the secondary selection overlay.
|
|
|
|
|
|
(t
|
|
|
|
|
|
(select-window window)
|
|
|
|
|
|
(if mouse-secondary-start
|
|
|
|
|
|
;; All we have is one end of a selection, so put the other
|
|
|
|
|
|
;; end here.
|
|
|
|
|
|
(let ((start (+ 0 mouse-secondary-start)))
|
|
|
|
|
|
(kill-ring-save start click-pt)
|
|
|
|
|
|
(move-overlay mouse-secondary-overlay start click-pt)))
|
|
|
|
|
|
(setq mouse-save-then-kill-posn click-pt))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Finally, set the window system's secondary selection.
|
|
|
|
|
|
(let (str)
|
|
|
|
|
|
(and (overlay-buffer mouse-secondary-overlay)
|
|
|
|
|
|
(setq str (buffer-substring (overlay-start mouse-secondary-overlay)
|
|
|
|
|
|
(overlay-end mouse-secondary-overlay)))
|
|
|
|
|
|
(> (length str) 0)
|
Consolidate management/ownership of selections.
* lisp/select.el (gui-get-selection-alist): New method.
(gui-get-selection): Use it. Rename from x-get-selection.
(x-get-selection): Define as obsolete alias.
(x-get-clipboard): Mark obsolete.
(gui-get-primary-selection): New function.
(x-get-selection-value): Mark obsolete.
(gui-own-selection-alist, gui-disown-selection-alist)
(gui-selection-owner-p-alist): New methods.
(gui-set-selection): Use them. Rename from x-set-selection.
(x-set-selection): Define as obsolete alias.
(gui--valid-simple-selection-p): Rename from
x-valid-simple-selection-p.
* lisp/w32-common-fns.el (gui-own-selection, gui-disown-selection)
(gui-selection-owner-p, gui-get-selection): Define for w32.
(w32-get-selection-value): Rename from x-get-selection-value.
Use the new gui-last-selected-text.
* lisp/term/x-win.el (x-get-selection-value): Remove.
(x-clipboard-yank): Declare obsolete.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for x.
* lisp/term/w32-win.el (w32-win-suspend-error): Rename from
x-win-suspend-error.
* lisp/term/pc-win.el (w16-get-selection-value): Rename from
x-get-selection-value.
(w16-selection-owner-p): Rename from x-selection-owner-p.
(gui-own-selection, gui-disown-selection, gui-get-selection)
(gui-selection-owner-p): Define for pc.
(w16--select-text): New function.
* lisp/term/ns-win.el (gui-own-selection, gui-disown-selection)
(gui-get-selection, gui-selection-owner-p): Define for ns.
* lisp/term.el (term-mouse-paste):
* lisp/mouse.el (mouse-yank-primary): Use gui-get-primary-selection.
* src/nsselect.m (ns-own-selection-internal, ns-disown-selection-internal):
Rename from the "x-" prefix.
2014-10-02 03:19:32 +00:00
|
|
|
|
(gui-set-selection 'SECONDARY str))))
|
2010-08-21 04:46:23 +00:00
|
|
|
|
|
2017-09-21 08:26:00 +00:00
|
|
|
|
(defun secondary-selection-exist-p ()
|
2017-09-21 08:29:11 +00:00
|
|
|
|
"Return non-nil if the secondary selection exists in the current buffer."
|
2017-09-21 08:26:00 +00:00
|
|
|
|
(memq mouse-secondary-overlay (overlays-in (point-min) (point-max))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun secondary-selection-to-region ()
|
|
|
|
|
|
"Set beginning and end of the region to those of the secondary selection.
|
|
|
|
|
|
This puts mark and point at the beginning and the end of the
|
|
|
|
|
|
secondary selection, respectively. This works when the secondary
|
|
|
|
|
|
selection exists and the region does not exist in current buffer;
|
|
|
|
|
|
the secondary selection will be deleted afterward.
|
|
|
|
|
|
If the region is active, or the secondary selection doesn't exist,
|
|
|
|
|
|
this function does nothing."
|
|
|
|
|
|
(when (and (not (region-active-p))
|
|
|
|
|
|
(secondary-selection-exist-p))
|
|
|
|
|
|
(let ((beg (overlay-start mouse-secondary-overlay))
|
|
|
|
|
|
(end (overlay-end mouse-secondary-overlay)))
|
|
|
|
|
|
(push-mark beg t t)
|
|
|
|
|
|
(goto-char end))
|
|
|
|
|
|
;; Delete the secondary selection on current buffer.
|
|
|
|
|
|
(delete-overlay mouse-secondary-overlay)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun secondary-selection-from-region ()
|
|
|
|
|
|
"Set beginning and end of the secondary selection to those of the region.
|
|
|
|
|
|
When there is no region, this function does nothing."
|
|
|
|
|
|
(when (region-active-p) ; Create the secondary selection from the region.
|
|
|
|
|
|
(delete-overlay mouse-secondary-overlay) ; Delete the secondary selection even on a different buffer.
|
|
|
|
|
|
(move-overlay mouse-secondary-overlay (region-beginning) (region-end))))
|
|
|
|
|
|
|
1993-06-17 18:17:32 +00:00
|
|
|
|
|
1998-03-12 23:11:57 +00:00
|
|
|
|
(defcustom mouse-buffer-menu-maxlen 20
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Number of buffers in one pane (submenu) of the buffer menu.
|
1995-12-26 19:43:51 +00:00
|
|
|
|
If we have lots of buffers, divide them into groups of
|
1998-03-12 23:11:57 +00:00
|
|
|
|
`mouse-buffer-menu-maxlen' and make a pane (or submenu) for each one."
|
1997-05-03 22:19:10 +00:00
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'mouse)
|
1995-12-26 19:43:51 +00:00
|
|
|
|
|
1998-04-20 20:45:25 +00:00
|
|
|
|
(defcustom mouse-buffer-menu-mode-mult 4
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Group the buffers by the major mode groups on \\[mouse-buffer-menu]?
|
1998-04-20 20:45:25 +00:00
|
|
|
|
This number which determines (in a hairy way) whether \\[mouse-buffer-menu]
|
|
|
|
|
|
will split the buffer menu by the major modes (see
|
|
|
|
|
|
`mouse-buffer-menu-mode-groups') or just by menu length.
|
|
|
|
|
|
Set to 1 (or even 0!) if you want to group by major mode always, and to
|
|
|
|
|
|
a large number if you prefer a mixed multitude. The default is 4."
|
|
|
|
|
|
:type 'integer
|
|
|
|
|
|
:group 'mouse
|
|
|
|
|
|
:version "20.3")
|
|
|
|
|
|
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(defvar mouse-buffer-menu-mode-groups
|
2011-02-01 21:37:12 +00:00
|
|
|
|
(mapcar (lambda (arg) (cons (purecopy (car arg)) (purecopy (cdr arg))))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
'(("Info\\|Help\\|Apropos\\|Man" . "Help")
|
|
|
|
|
|
("\\bVM\\b\\|\\bMH\\b\\|Message\\|Mail\\|Group\\|Score\\|Summary\\|Article"
|
|
|
|
|
|
. "Mail/News")
|
|
|
|
|
|
("\\<C\\>" . "C")
|
|
|
|
|
|
("ObjC" . "C")
|
|
|
|
|
|
("Text" . "Text")
|
|
|
|
|
|
("Outline" . "Text")
|
2001-10-27 16:32:35 +00:00
|
|
|
|
("\\(HT\\|SG\\|X\\|XHT\\)ML" . "SGML")
|
2008-11-11 17:20:06 +00:00
|
|
|
|
("log\\|diff\\|vc\\|cvs\\|Annotate" . "Version Control") ; "Change Management"?
|
2011-02-04 14:54:13 +00:00
|
|
|
|
("Threads\\|Memory\\|Disassembly\\|Breakpoints\\|Frames\\|Locals\\|Registers\\|Inferior I/O\\|Debugger"
|
|
|
|
|
|
. "GDB")
|
2009-10-26 06:43:36 +00:00
|
|
|
|
("Lisp" . "Lisp")))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
"How to group various major modes together in \\[mouse-buffer-menu].
|
|
|
|
|
|
Each element has the form (REGEXP . GROUPNAME).
|
|
|
|
|
|
If the major mode's name string matches REGEXP, use GROUPNAME instead.")
|
|
|
|
|
|
|
1992-08-31 05:06:54 +00:00
|
|
|
|
(defun mouse-buffer-menu (event)
|
1992-12-29 21:06:51 +00:00
|
|
|
|
"Pop up a menu of buffers for selection with the mouse.
|
|
|
|
|
|
This switches buffers in the window that you clicked on,
|
|
|
|
|
|
and selects that window."
|
1992-09-13 11:44:06 +00:00
|
|
|
|
(interactive "e")
|
1994-03-09 04:00:12 +00:00
|
|
|
|
(mouse-minibuffer-check event)
|
2014-12-18 21:41:34 +00:00
|
|
|
|
(let ((buf (x-popup-menu event (mouse-buffer-menu-map)))
|
|
|
|
|
|
(window (posn-window (event-start event))))
|
|
|
|
|
|
(when buf
|
|
|
|
|
|
(select-window
|
|
|
|
|
|
(if (framep window) (frame-selected-window window)
|
|
|
|
|
|
window))
|
|
|
|
|
|
(switch-to-buffer buf))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-buffer-menu-map ()
|
|
|
|
|
|
;; Make an alist of elements that look like (MENU-ITEM . BUFFER).
|
|
|
|
|
|
(let ((buffers (buffer-list)) split-by-major-mode sum-of-squares)
|
2007-08-06 17:19:26 +00:00
|
|
|
|
(dolist (buf buffers)
|
|
|
|
|
|
;; Divide all buffers into buckets for various major modes.
|
|
|
|
|
|
;; Each bucket looks like (MODE NAMESTRING BUFFERS...).
|
|
|
|
|
|
(with-current-buffer buf
|
|
|
|
|
|
(let* ((adjusted-major-mode major-mode) elt)
|
|
|
|
|
|
(dolist (group mouse-buffer-menu-mode-groups)
|
|
|
|
|
|
(when (string-match (car group) (format-mode-line mode-name))
|
|
|
|
|
|
(setq adjusted-major-mode (cdr group))))
|
|
|
|
|
|
(setq elt (assoc adjusted-major-mode split-by-major-mode))
|
|
|
|
|
|
(unless elt
|
|
|
|
|
|
(setq elt (list adjusted-major-mode
|
|
|
|
|
|
(if (stringp adjusted-major-mode)
|
|
|
|
|
|
adjusted-major-mode
|
2008-01-04 06:29:12 +00:00
|
|
|
|
(format-mode-line mode-name nil nil buf)))
|
2007-08-06 17:19:26 +00:00
|
|
|
|
split-by-major-mode (cons elt split-by-major-mode)))
|
|
|
|
|
|
(or (memq buf (cdr (cdr elt)))
|
|
|
|
|
|
(setcdr (cdr elt) (cons buf (cdr (cdr elt))))))))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
;; Compute the sum of squares of sizes of the major-mode buckets.
|
|
|
|
|
|
(let ((tail split-by-major-mode))
|
|
|
|
|
|
(setq sum-of-squares 0)
|
|
|
|
|
|
(while tail
|
|
|
|
|
|
(setq sum-of-squares
|
|
|
|
|
|
(+ sum-of-squares
|
1998-04-20 20:45:25 +00:00
|
|
|
|
(let ((len (length (cdr (cdr (car tail)))))) (* len len))))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(setq tail (cdr tail))))
|
1998-04-20 20:45:25 +00:00
|
|
|
|
(if (< (* sum-of-squares mouse-buffer-menu-mode-mult)
|
|
|
|
|
|
(* (length buffers) (length buffers)))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
;; Subdividing by major modes really helps, so let's do it.
|
|
|
|
|
|
(let (subdivided-menus (buffers-left (length buffers)))
|
|
|
|
|
|
;; Sort the list to put the most popular major modes first.
|
|
|
|
|
|
(setq split-by-major-mode
|
|
|
|
|
|
(sort split-by-major-mode
|
|
|
|
|
|
(function (lambda (elt1 elt2)
|
|
|
|
|
|
(> (length elt1) (length elt2))))))
|
|
|
|
|
|
;; Make a separate submenu for each major mode
|
|
|
|
|
|
;; that has more than one buffer,
|
|
|
|
|
|
;; unless all the remaining buffers are less than 1/10 of them.
|
|
|
|
|
|
(while (and split-by-major-mode
|
|
|
|
|
|
(and (> (length (car split-by-major-mode)) 3)
|
|
|
|
|
|
(> (* buffers-left 10) (length buffers))))
|
2001-08-28 06:35:00 +00:00
|
|
|
|
(let ((this-mode-list (mouse-buffer-menu-alist
|
|
|
|
|
|
(cdr (cdr (car split-by-major-mode))))))
|
|
|
|
|
|
(and this-mode-list
|
|
|
|
|
|
(setq subdivided-menus
|
|
|
|
|
|
(cons (cons
|
|
|
|
|
|
(nth 1 (car split-by-major-mode))
|
|
|
|
|
|
this-mode-list)
|
|
|
|
|
|
subdivided-menus))))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(setq buffers-left
|
|
|
|
|
|
(- buffers-left (length (cdr (car split-by-major-mode)))))
|
|
|
|
|
|
(setq split-by-major-mode (cdr split-by-major-mode)))
|
|
|
|
|
|
;; If any major modes are left over,
|
|
|
|
|
|
;; make a single submenu for them.
|
|
|
|
|
|
(if split-by-major-mode
|
2001-08-28 06:35:00 +00:00
|
|
|
|
(let ((others-list
|
|
|
|
|
|
(mouse-buffer-menu-alist
|
|
|
|
|
|
;; we don't need split-by-major-mode any more,
|
2016-07-09 23:18:47 +00:00
|
|
|
|
;; so we can ditch it with nconc (mapcan).
|
|
|
|
|
|
(mapcan 'cddr split-by-major-mode))))
|
2001-08-28 06:35:00 +00:00
|
|
|
|
(and others-list
|
|
|
|
|
|
(setq subdivided-menus
|
|
|
|
|
|
(cons (cons "Others" others-list)
|
|
|
|
|
|
subdivided-menus)))))
|
2014-12-18 21:41:34 +00:00
|
|
|
|
(cons "Buffer Menu" (nreverse subdivided-menus)))
|
|
|
|
|
|
(cons "Buffer Menu"
|
|
|
|
|
|
(mouse-buffer-menu-split "Select Buffer"
|
|
|
|
|
|
(mouse-buffer-menu-alist buffers))))))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
|
|
|
|
|
|
(defun mouse-buffer-menu-alist (buffers)
|
|
|
|
|
|
(let (tail
|
|
|
|
|
|
(maxlen 0)
|
|
|
|
|
|
head)
|
|
|
|
|
|
(setq buffers
|
|
|
|
|
|
(sort buffers
|
|
|
|
|
|
(function (lambda (elt1 elt2)
|
|
|
|
|
|
(string< (buffer-name elt1) (buffer-name elt2))))))
|
|
|
|
|
|
(setq tail buffers)
|
|
|
|
|
|
(while tail
|
2005-06-29 13:50:02 +00:00
|
|
|
|
(or (eq ?\s (aref (buffer-name (car tail)) 0))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(setq maxlen
|
|
|
|
|
|
(max maxlen
|
|
|
|
|
|
(length (buffer-name (car tail))))))
|
|
|
|
|
|
(setq tail (cdr tail)))
|
|
|
|
|
|
(setq tail buffers)
|
|
|
|
|
|
(while tail
|
|
|
|
|
|
(let ((elt (car tail)))
|
2006-11-27 14:00:53 +00:00
|
|
|
|
(if (/= (aref (buffer-name elt) 0) ?\s)
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(setq head
|
|
|
|
|
|
(cons
|
|
|
|
|
|
(cons
|
|
|
|
|
|
(format
|
2007-12-06 17:58:08 +00:00
|
|
|
|
(format "%%-%ds %%s%%s %%s" maxlen)
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(buffer-name elt)
|
|
|
|
|
|
(if (buffer-modified-p elt) "*" " ")
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
|
(with-current-buffer elt
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(if buffer-read-only "%" " "))
|
2001-10-24 20:02:16 +00:00
|
|
|
|
(or (buffer-file-name elt)
|
* x-dnd.el (x-dnd-maybe-call-test-function):
* window.el (split-window-vertically):
* whitespace.el (whitespace-help-on):
* vc-rcs.el (vc-rcs-consult-headers):
* userlock.el (ask-user-about-lock-help)
(ask-user-about-supersession-help):
* type-break.el (type-break-force-mode-line-update):
* time-stamp.el (time-stamp-conv-warn):
* terminal.el (te-set-output-log, te-more-break, te-filter)
(te-sentinel,terminal-emulator):
* term.el (make-term, term-exec, term-sentinel, term-read-input-ring)
(term-write-input-ring, term-check-source, term-start-output-log):
(term-display-buffer-line, term-dynamic-list-completions):
(term-ansi-make-term, serial-term):
* subr.el (selective-display):
* strokes.el (strokes-xpm-to-compressed-string, strokes-decode-buffer)
(strokes-encode-buffer, strokes-xpm-for-compressed-string):
* speedbar.el (speedbar-buffers-tail-notes, speedbar-buffers-item-info)
(speedbar-reconfigure-keymaps, speedbar-add-localized-speedbar-support)
(speedbar-remove-localized-speedbar-support)
(speedbar-set-mode-line-format, speedbar-create-tag-hierarchy)
(speedbar-update-special-contents, speedbar-buffer-buttons-engine)
(speedbar-buffers-line-directory):
* simple.el (shell-command-on-region, append-to-buffer)
(prepend-to-buffer):
* shadowfile.el (shadow-save-todo-file):
* scroll-bar.el (scroll-bar-set-window-start, scroll-bar-drag-1)
(scroll-bar-maybe-set-window-start):
* sb-image.el (speedbar-image-dump):
* saveplace.el (save-place-alist-to-file, save-places-to-alist)
(load-save-place-alist-from-file):
* ps-samp.el (ps-print-message-from-summary):
* ps-print.el (ps-flush-output, ps-insert-file, ps-get-boundingbox)
(ps-background-image, ps-begin-job, ps-do-despool):
* ps-bdf.el (bdf-find-file, bdf-read-font-info):
* printing.el (pr-interface, pr-ps-file-print, pr-find-buffer-visiting)
(pr-ps-message-from-summary, pr-lpr-message-from-summary):
(pr-call-process, pr-file-list, pr-interface-save):
* novice.el (disabled-command-function)
(enable-command, disable-command):
* mouse.el (mouse-buffer-menu-alist):
* mouse-copy.el (mouse-kill-preserving-secondary):
* macros.el (kbd-macro-query):
* ledit.el (ledit-go-to-lisp, ledit-go-to-liszt):
* informat.el (batch-info-validate):
* ido.el (ido-copy-current-word, ido-initiate-auto-merge):
* hippie-exp.el (try-expand-dabbrev-visible):
* help-mode.el (help-make-xrefs):
* help-fns.el (describe-variable):
* generic-x.el (bat-generic-mode-run-as-comint):
* finder.el (finder-mouse-select):
* find-dired.el (find-dired-sentinel):
* filesets.el (filesets-file-close):
* files.el (list-directory):
* faces.el (list-faces-display, describe-face):
* facemenu.el (list-colors-display):
* ezimage.el (ezimage-image-association-dump, ezimage-image-dump):
* epg.el (epg--process-filter, epg-cancel):
* epa.el (epa--marked-keys, epa--select-keys, epa-display-info)
(epa--read-signature-type):
* emerge.el (emerge-copy-as-kill-A, emerge-copy-as-kill-B)
(emerge-file-names):
* ehelp.el (electric-helpify):
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise):
* ediff-vers.el (rcs-ediff-view-revision):
* ediff-util.el (ediff-setup):
* ediff-mult.el (ediff-append-custom-diff):
* ediff-diff.el (ediff-exec-process, ediff-process-sentinel)
(ediff-wordify):
* echistory.el (Electric-command-history-redo-expression):
* dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
* disp-table.el (describe-display-table):
* dired.el (dired-find-buffer-nocreate):
* dired-aux.el (dired-rename-subdir, dired-dwim-target-directory):
* dabbrev.el (dabbrev--same-major-mode-p):
* chistory.el (list-command-history):
* apropos.el (apropos-documentation):
* allout.el (allout-obtain-passphrase):
(allout-copy-exposed-to-buffer):
(allout-verify-passphrase): Use with-current-buffer.
2009-11-13 22:19:45 +00:00
|
|
|
|
(with-current-buffer elt
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(if list-buffers-directory
|
|
|
|
|
|
(expand-file-name
|
|
|
|
|
|
list-buffers-directory)))
|
|
|
|
|
|
""))
|
|
|
|
|
|
elt)
|
|
|
|
|
|
head))))
|
|
|
|
|
|
(setq tail (cdr tail)))
|
|
|
|
|
|
;; Compensate for the reversal that the above loop does.
|
|
|
|
|
|
(nreverse head)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun mouse-buffer-menu-split (title alist)
|
|
|
|
|
|
;; If we have lots of buffers, divide them into groups of 20
|
|
|
|
|
|
;; and make a pane (or submenu) for each one.
|
1998-03-12 23:11:57 +00:00
|
|
|
|
(if (> (length alist) (/ (* mouse-buffer-menu-maxlen 3) 2))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(let ((alist alist) sublists next
|
|
|
|
|
|
(i 1))
|
|
|
|
|
|
(while alist
|
1998-03-12 23:11:57 +00:00
|
|
|
|
;; Pull off the next mouse-buffer-menu-maxlen buffers
|
1997-02-10 00:10:16 +00:00
|
|
|
|
;; and make them the next element of sublist.
|
1998-03-12 23:11:57 +00:00
|
|
|
|
(setq next (nthcdr mouse-buffer-menu-maxlen alist))
|
1997-02-10 00:10:16 +00:00
|
|
|
|
(if next
|
1998-03-12 23:11:57 +00:00
|
|
|
|
(setcdr (nthcdr (1- mouse-buffer-menu-maxlen) alist)
|
1997-02-10 00:10:16 +00:00
|
|
|
|
nil))
|
|
|
|
|
|
(setq sublists (cons (cons (format "Buffers %d" i) alist)
|
|
|
|
|
|
sublists))
|
|
|
|
|
|
(setq i (1+ i))
|
|
|
|
|
|
(setq alist next))
|
|
|
|
|
|
(nreverse sublists))
|
|
|
|
|
|
;; Few buffers--put them all in one pane.
|
|
|
|
|
|
(list (cons title alist))))
|
1990-06-19 20:28:34 +00:00
|
|
|
|
|
2009-10-15 01:50:17 +00:00
|
|
|
|
(define-obsolete-function-alias
|
|
|
|
|
|
'mouse-choose-completion 'choose-completion "23.2")
|
1993-07-13 21:33:17 +00:00
|
|
|
|
|
1992-09-12 01:37:46 +00:00
|
|
|
|
;; Font selection.
|
|
|
|
|
|
|
1993-07-26 20:04:19 +00:00
|
|
|
|
(defun font-menu-add-default ()
|
2016-07-05 05:33:29 +00:00
|
|
|
|
(let* ((default (frame-parameter nil 'font))
|
1993-07-26 20:04:19 +00:00
|
|
|
|
(font-alist x-fixed-font-alist)
|
1993-08-11 19:22:35 +00:00
|
|
|
|
(elt (or (assoc "Misc" font-alist) (nth 1 font-alist))))
|
1993-07-26 20:04:19 +00:00
|
|
|
|
(if (assoc "Default" elt)
|
|
|
|
|
|
(delete (assoc "Default" elt) elt))
|
|
|
|
|
|
(setcdr elt
|
1999-09-05 19:44:45 +00:00
|
|
|
|
(cons (list "Default" default)
|
1993-07-26 20:04:19 +00:00
|
|
|
|
(cdr elt)))))
|
|
|
|
|
|
|
1992-09-12 01:37:46 +00:00
|
|
|
|
(defvar x-fixed-font-alist
|
2009-10-26 06:43:36 +00:00
|
|
|
|
(list
|
|
|
|
|
|
(purecopy "Font Menu")
|
|
|
|
|
|
(cons
|
|
|
|
|
|
(purecopy "Misc")
|
|
|
|
|
|
(mapcar
|
|
|
|
|
|
(lambda (arg) (cons (purecopy (car arg)) (purecopy (cdr arg))))
|
1994-08-05 19:31:42 +00:00
|
|
|
|
;; For these, we specify the pixel height and width.
|
2009-10-26 06:43:36 +00:00
|
|
|
|
'(("fixed" "fixed")
|
1994-08-05 19:31:42 +00:00
|
|
|
|
("6x10" "-misc-fixed-medium-r-normal--10-*-*-*-c-60-iso8859-1" "6x10")
|
|
|
|
|
|
("6x12"
|
|
|
|
|
|
"-misc-fixed-medium-r-semicondensed--12-*-*-*-c-60-iso8859-1" "6x12")
|
|
|
|
|
|
("6x13"
|
|
|
|
|
|
"-misc-fixed-medium-r-semicondensed--13-*-*-*-c-60-iso8859-1" "6x13")
|
|
|
|
|
|
("7x13" "-misc-fixed-medium-r-normal--13-*-*-*-c-70-iso8859-1" "7x13")
|
|
|
|
|
|
("7x14" "-misc-fixed-medium-r-normal--14-*-*-*-c-70-iso8859-1" "7x14")
|
|
|
|
|
|
("8x13" "-misc-fixed-medium-r-normal--13-*-*-*-c-80-iso8859-1" "8x13")
|
|
|
|
|
|
("9x15" "-misc-fixed-medium-r-normal--15-*-*-*-c-90-iso8859-1" "9x15")
|
|
|
|
|
|
("10x20" "-misc-fixed-medium-r-normal--20-*-*-*-c-100-iso8859-1" "10x20")
|
|
|
|
|
|
("11x18" "-misc-fixed-medium-r-normal--18-*-*-*-c-110-iso8859-1" "11x18")
|
|
|
|
|
|
("12x24" "-misc-fixed-medium-r-normal--24-*-*-*-c-120-iso8859-1" "12x24")
|
1993-07-25 20:46:18 +00:00
|
|
|
|
("")
|
1994-08-08 10:16:47 +00:00
|
|
|
|
("clean 5x8"
|
|
|
|
|
|
"-schumacher-clean-medium-r-normal--8-*-*-*-c-50-iso8859-1")
|
|
|
|
|
|
("clean 6x8"
|
|
|
|
|
|
"-schumacher-clean-medium-r-normal--8-*-*-*-c-60-iso8859-1")
|
1994-08-05 19:31:42 +00:00
|
|
|
|
("clean 8x8"
|
|
|
|
|
|
"-schumacher-clean-medium-r-normal--8-*-*-*-c-80-iso8859-1")
|
|
|
|
|
|
("clean 8x10"
|
|
|
|
|
|
"-schumacher-clean-medium-r-normal--10-*-*-*-c-80-iso8859-1")
|
|
|
|
|
|
("clean 8x14"
|
|
|
|
|
|
"-schumacher-clean-medium-r-normal--14-*-*-*-c-80-iso8859-1")
|
|
|
|
|
|
("clean 8x16"
|
|
|
|
|
|
"-schumacher-clean-medium-r-normal--16-*-*-*-c-80-iso8859-1")
|
1993-07-25 20:46:18 +00:00
|
|
|
|
("")
|
1999-07-28 18:27:35 +00:00
|
|
|
|
("sony 8x16" "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1")
|
2008-04-01 08:35:58 +00:00
|
|
|
|
;; We don't seem to have these; who knows what they are.
|
|
|
|
|
|
;; ("fg-18" "fg-18")
|
|
|
|
|
|
;; ("fg-25" "fg-25")
|
1999-07-28 18:27:35 +00:00
|
|
|
|
("lucidasanstypewriter-12" "-b&h-lucidatypewriter-medium-r-normal-sans-*-120-*-*-*-*-iso8859-1")
|
|
|
|
|
|
("lucidasanstypewriter-bold-14" "-b&h-lucidatypewriter-bold-r-normal-sans-*-140-*-*-*-*-iso8859-1")
|
|
|
|
|
|
("lucidasanstypewriter-bold-24"
|
|
|
|
|
|
"-b&h-lucidatypewriter-bold-r-normal-sans-*-240-*-*-*-*-iso8859-1")
|
2008-04-01 08:35:58 +00:00
|
|
|
|
;; ("lucidatypewriter-bold-r-24" "-b&h-lucidatypewriter-bold-r-normal-sans-24-240-75-75-m-140-iso8859-1")
|
|
|
|
|
|
;; ("fixed-medium-20" "-misc-fixed-medium-*-*-*-20-*-*-*-*-*-*-*")
|
2009-10-26 06:43:36 +00:00
|
|
|
|
)))
|
|
|
|
|
|
|
|
|
|
|
|
(cons
|
|
|
|
|
|
(purecopy "Courier")
|
|
|
|
|
|
(mapcar
|
|
|
|
|
|
(lambda (arg) (cons (purecopy (car arg)) (purecopy (cdr arg))))
|
1994-08-05 19:31:42 +00:00
|
|
|
|
;; For these, we specify the point height.
|
2009-10-26 06:43:36 +00:00
|
|
|
|
'(("8" "-adobe-courier-medium-r-normal--*-80-*-*-m-*-iso8859-1")
|
1993-05-29 04:34:00 +00:00
|
|
|
|
("10" "-adobe-courier-medium-r-normal--*-100-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("12" "-adobe-courier-medium-r-normal--*-120-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("14" "-adobe-courier-medium-r-normal--*-140-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("18" "-adobe-courier-medium-r-normal--*-180-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("24" "-adobe-courier-medium-r-normal--*-240-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("8 bold" "-adobe-courier-bold-r-normal--*-80-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("10 bold" "-adobe-courier-bold-r-normal--*-100-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("12 bold" "-adobe-courier-bold-r-normal--*-120-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("14 bold" "-adobe-courier-bold-r-normal--*-140-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("18 bold" "-adobe-courier-bold-r-normal--*-180-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("24 bold" "-adobe-courier-bold-r-normal--*-240-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("8 slant" "-adobe-courier-medium-o-normal--*-80-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("10 slant" "-adobe-courier-medium-o-normal--*-100-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("12 slant" "-adobe-courier-medium-o-normal--*-120-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("14 slant" "-adobe-courier-medium-o-normal--*-140-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("18 slant" "-adobe-courier-medium-o-normal--*-180-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("24 slant" "-adobe-courier-medium-o-normal--*-240-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("8 bold slant" "-adobe-courier-bold-o-normal--*-80-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("10 bold slant" "-adobe-courier-bold-o-normal--*-100-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("12 bold slant" "-adobe-courier-bold-o-normal--*-120-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("14 bold slant" "-adobe-courier-bold-o-normal--*-140-*-*-m-*-iso8859-1")
|
|
|
|
|
|
("18 bold slant" "-adobe-courier-bold-o-normal--*-180-*-*-m-*-iso8859-1")
|
2009-10-26 06:43:36 +00:00
|
|
|
|
("24 bold slant" "-adobe-courier-bold-o-normal--*-240-*-*-m-*-iso8859-1")
|
|
|
|
|
|
))))
|
1992-09-12 01:37:46 +00:00
|
|
|
|
"X fonts suitable for use in Emacs.")
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function generate-fontset-menu "fontset" ())
|
|
|
|
|
|
|
2008-06-10 19:57:09 +00:00
|
|
|
|
(defun mouse-select-font ()
|
|
|
|
|
|
"Prompt for a font name, using `x-popup-menu', and return it."
|
|
|
|
|
|
(interactive)
|
|
|
|
|
|
(unless (display-multi-font-p)
|
|
|
|
|
|
(error "Cannot change fonts on this display"))
|
2009-01-27 20:43:27 +00:00
|
|
|
|
(car
|
|
|
|
|
|
(x-popup-menu
|
|
|
|
|
|
(if (listp last-nonmenu-event)
|
|
|
|
|
|
last-nonmenu-event
|
|
|
|
|
|
(list '(0 0) (selected-window)))
|
|
|
|
|
|
(append x-fixed-font-alist
|
|
|
|
|
|
(list (generate-fontset-menu))))))
|
2008-06-10 19:57:09 +00:00
|
|
|
|
|
2008-06-15 20:04:33 +00:00
|
|
|
|
(declare-function text-scale-mode "face-remap")
|
|
|
|
|
|
|
1994-04-14 02:55:13 +00:00
|
|
|
|
(defun mouse-set-font (&rest fonts)
|
2008-06-10 19:57:09 +00:00
|
|
|
|
"Set the default font for the selected frame.
|
|
|
|
|
|
The argument FONTS is a list of font names; the first valid font
|
|
|
|
|
|
in this list is used.
|
|
|
|
|
|
|
|
|
|
|
|
When called interactively, pop up a menu and allow the user to
|
|
|
|
|
|
choose a font."
|
1992-09-12 01:37:46 +00:00
|
|
|
|
(interactive
|
2002-05-29 16:36:55 +00:00
|
|
|
|
(progn (unless (display-multi-font-p)
|
|
|
|
|
|
(error "Cannot change fonts on this display"))
|
|
|
|
|
|
(x-popup-menu
|
2004-12-08 01:14:10 +00:00
|
|
|
|
(if (listp last-nonmenu-event)
|
|
|
|
|
|
last-nonmenu-event
|
|
|
|
|
|
(list '(0 0) (selected-window)))
|
2002-05-29 16:36:55 +00:00
|
|
|
|
;; Append list of fontsets currently defined.
|
|
|
|
|
|
(append x-fixed-font-alist (list (generate-fontset-menu))))))
|
1994-04-16 04:07:43 +00:00
|
|
|
|
(if fonts
|
|
|
|
|
|
(let (font)
|
|
|
|
|
|
(while fonts
|
|
|
|
|
|
(condition-case nil
|
|
|
|
|
|
(progn
|
2008-10-03 07:47:06 +00:00
|
|
|
|
(set-frame-font (car fonts))
|
1994-04-16 04:07:43 +00:00
|
|
|
|
(setq font (car fonts))
|
|
|
|
|
|
(setq fonts nil))
|
1994-04-22 08:49:57 +00:00
|
|
|
|
(error
|
|
|
|
|
|
(setq fonts (cdr fonts)))))
|
1994-04-16 04:07:43 +00:00
|
|
|
|
(if (null font)
|
2002-05-29 16:36:55 +00:00
|
|
|
|
(error "Font not found")))))
|
2008-06-15 20:04:33 +00:00
|
|
|
|
|
|
|
|
|
|
(defvar mouse-appearance-menu-map nil)
|
2008-06-17 05:57:29 +00:00
|
|
|
|
(declare-function x-select-font "xfns.c" (&optional frame ignored)) ; USE_GTK
|
2008-06-18 02:53:20 +00:00
|
|
|
|
(declare-function buffer-face-mode-invoke "face-remap"
|
|
|
|
|
|
(face arg &optional interactive))
|
2008-08-11 01:23:07 +00:00
|
|
|
|
(declare-function font-face-attributes "font.c" (font &optional frame))
|
2015-03-17 18:38:48 +00:00
|
|
|
|
(defvar w32-use-w32-font-dialog)
|
|
|
|
|
|
(defvar w32-fixed-font-alist)
|
2008-06-15 20:04:33 +00:00
|
|
|
|
|
|
|
|
|
|
(defun mouse-appearance-menu (event)
|
2010-07-06 19:42:46 +00:00
|
|
|
|
"Show a menu for changing the default face in the current buffer."
|
2008-06-15 20:04:33 +00:00
|
|
|
|
(interactive "@e")
|
|
|
|
|
|
(require 'face-remap)
|
|
|
|
|
|
(when (display-multi-font-p)
|
|
|
|
|
|
(with-selected-window (car (event-start event))
|
|
|
|
|
|
(if mouse-appearance-menu-map
|
|
|
|
|
|
nil ; regenerate new fonts
|
|
|
|
|
|
;; Initialize mouse-appearance-menu-map
|
|
|
|
|
|
(setq mouse-appearance-menu-map
|
|
|
|
|
|
(make-sparse-keymap "Change Default Buffer Face"))
|
|
|
|
|
|
(define-key mouse-appearance-menu-map [face-remap-reset-base]
|
|
|
|
|
|
'(menu-item "Reset to Default" face-remap-reset-base))
|
|
|
|
|
|
(define-key mouse-appearance-menu-map [text-scale-decrease]
|
|
|
|
|
|
'(menu-item "Decrease Buffer Text Size" text-scale-decrease))
|
|
|
|
|
|
(define-key mouse-appearance-menu-map [text-scale-increase]
|
|
|
|
|
|
'(menu-item "Increase Buffer Text Size" text-scale-increase))
|
|
|
|
|
|
;; Font selector
|
2015-03-17 18:29:55 +00:00
|
|
|
|
(if (and (functionp 'x-select-font)
|
|
|
|
|
|
(or (not (boundp 'w32-use-w32-font-dialog))
|
|
|
|
|
|
w32-use-w32-font-dialog))
|
2008-06-15 20:04:33 +00:00
|
|
|
|
(define-key mouse-appearance-menu-map [x-select-font]
|
|
|
|
|
|
'(menu-item "Change Buffer Font..." x-select-font))
|
|
|
|
|
|
;; If the select-font is unavailable, construct a menu.
|
|
|
|
|
|
(let ((font-submenu (make-sparse-keymap "Change Text Font"))
|
2015-03-17 18:29:55 +00:00
|
|
|
|
(font-alist (cdr (append
|
|
|
|
|
|
(if (eq system-type 'windows-nt)
|
|
|
|
|
|
w32-fixed-font-alist
|
|
|
|
|
|
x-fixed-font-alist)
|
|
|
|
|
|
(list (generate-fontset-menu))))))
|
2008-06-15 20:04:33 +00:00
|
|
|
|
(dolist (family font-alist)
|
|
|
|
|
|
(let* ((submenu-name (car family))
|
|
|
|
|
|
(submenu-map (make-sparse-keymap submenu-name)))
|
|
|
|
|
|
(dolist (font (cdr family))
|
|
|
|
|
|
(let ((font-name (car font))
|
|
|
|
|
|
font-symbol)
|
|
|
|
|
|
(if (string= font-name "")
|
|
|
|
|
|
(define-key submenu-map [space]
|
|
|
|
|
|
'("--"))
|
|
|
|
|
|
(setq font-symbol (intern (cadr font)))
|
|
|
|
|
|
(define-key submenu-map (vector font-symbol)
|
|
|
|
|
|
(list 'menu-item (car font) font-symbol)))))
|
|
|
|
|
|
(define-key font-submenu (vector (intern submenu-name))
|
|
|
|
|
|
(list 'menu-item submenu-name submenu-map))))
|
|
|
|
|
|
(define-key mouse-appearance-menu-map [font-submenu]
|
|
|
|
|
|
(list 'menu-item "Change Text Font" font-submenu)))))
|
|
|
|
|
|
(let ((choice (x-popup-menu event mouse-appearance-menu-map)))
|
|
|
|
|
|
(setq choice (nth (1- (length choice)) choice))
|
|
|
|
|
|
(cond ((eq choice 'text-scale-increase)
|
|
|
|
|
|
(text-scale-increase 1))
|
|
|
|
|
|
((eq choice 'text-scale-decrease)
|
|
|
|
|
|
(text-scale-increase -1))
|
|
|
|
|
|
((eq choice 'face-remap-reset-base)
|
|
|
|
|
|
(text-scale-mode 0)
|
2008-06-17 11:28:06 +00:00
|
|
|
|
(buffer-face-mode 0))
|
2008-06-24 04:52:51 +00:00
|
|
|
|
(choice
|
2008-06-15 20:04:33 +00:00
|
|
|
|
;; Either choice == 'x-select-font, or choice is a
|
|
|
|
|
|
;; symbol whose name is a font.
|
2012-08-17 09:10:31 +00:00
|
|
|
|
(let ((font (if (eq choice 'x-select-font)
|
|
|
|
|
|
(x-select-font)
|
|
|
|
|
|
(symbol-name choice))))
|
|
|
|
|
|
(buffer-face-mode-invoke
|
|
|
|
|
|
(if (fontp font 'font-spec)
|
|
|
|
|
|
(list :font font)
|
|
|
|
|
|
(font-face-attributes font))
|
|
|
|
|
|
t (called-interactively-p 'interactive)))))))))
|
2008-06-15 20:04:33 +00:00
|
|
|
|
|
1991-12-20 07:15:37 +00:00
|
|
|
|
|
2017-05-27 11:57:11 +00:00
|
|
|
|
;; Drag and drop support.
|
|
|
|
|
|
(defcustom mouse-drag-and-drop-region nil
|
2017-12-17 10:19:19 +00:00
|
|
|
|
"If non-nil, dragging the mouse drags the region, if it exists.
|
|
|
|
|
|
If the value is a modifier, such as `control' or `shift' or
|
|
|
|
|
|
`meta', then if that modifier key is pressed when dropping the
|
|
|
|
|
|
region, text is copied instead of being cut."
|
2017-10-15 10:40:34 +00:00
|
|
|
|
:type `(choice
|
|
|
|
|
|
(const :tag "Disable dragging the region" nil)
|
|
|
|
|
|
,@(mapcar
|
|
|
|
|
|
(lambda (modifier)
|
|
|
|
|
|
`(const :tag ,(format "Enable, but copy with the %s modifier"
|
|
|
|
|
|
modifier)
|
|
|
|
|
|
modifier))
|
|
|
|
|
|
'(alt super hyper shift control meta))
|
|
|
|
|
|
(other :tag "Enable dragging the region" t))
|
2017-05-27 11:57:11 +00:00
|
|
|
|
:version "26.1"
|
|
|
|
|
|
:group 'mouse)
|
|
|
|
|
|
|
2017-12-17 10:19:19 +00:00
|
|
|
|
(defcustom mouse-drag-and-drop-region-cut-when-buffers-differ nil
|
|
|
|
|
|
"If non-nil, cut text also when source and destination buffers differ.
|
|
|
|
|
|
If this option is nil, `mouse-drag-and-drop-region' will leave
|
|
|
|
|
|
the text in the source buffer alone when dropping it in a
|
|
|
|
|
|
different buffer. If this is non-nil, it will cut the text just
|
|
|
|
|
|
as it does when dropping text in the source buffer."
|
|
|
|
|
|
:type 'boolean
|
|
|
|
|
|
:version "26.1"
|
|
|
|
|
|
:group 'mouse)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom mouse-drag-and-drop-region-show-tooltip 256
|
|
|
|
|
|
"If non-nil, text is shown by a tooltip in a graphic display.
|
|
|
|
|
|
If this option is nil, `mouse-drag-and-drop-region' does not show
|
|
|
|
|
|
tooltips. If this is t, it shows the entire text dragged in a
|
|
|
|
|
|
tooltip. If this is an integer (as with the default value of
|
|
|
|
|
|
256), it will show that many characters of the dragged text in
|
|
|
|
|
|
a tooltip."
|
|
|
|
|
|
:type 'integer
|
|
|
|
|
|
:version "26.1"
|
|
|
|
|
|
:group 'mouse)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom mouse-drag-and-drop-region-show-cursor t
|
|
|
|
|
|
"If non-nil, move point with mouse cursor during dragging.
|
|
|
|
|
|
If this is nil, `mouse-drag-and-drop-region' leaves point alone.
|
|
|
|
|
|
Otherwise, it will move point together with the mouse cursor and,
|
|
|
|
|
|
in addition, temporarily highlight the original region with the
|
|
|
|
|
|
`mouse-drag-and-drop-region' face."
|
|
|
|
|
|
:type 'boolean
|
|
|
|
|
|
:version "26.1"
|
|
|
|
|
|
:group 'mouse)
|
|
|
|
|
|
|
|
|
|
|
|
(defface mouse-drag-and-drop-region '((t :inherit region))
|
|
|
|
|
|
"Face to highlight original text during dragging.
|
|
|
|
|
|
This face is used by `mouse-drag-and-drop-region' to temporarily
|
|
|
|
|
|
highlight the original region when
|
|
|
|
|
|
`mouse-drag-and-drop-region-show-cursor' is non-nil."
|
|
|
|
|
|
:version "26.1"
|
|
|
|
|
|
:group 'mouse)
|
|
|
|
|
|
|
2017-05-27 11:57:11 +00:00
|
|
|
|
(defun mouse-drag-and-drop-region (event)
|
|
|
|
|
|
"Move text in the region to point where mouse is dragged to.
|
|
|
|
|
|
The transportation of text is also referred as `drag and drop'.
|
|
|
|
|
|
When text is dragged over to a different buffer, or if a
|
|
|
|
|
|
modifier key was pressed when dropping, and the value of the
|
|
|
|
|
|
variable `mouse-drag-and-drop-region' is that modifier, the text
|
|
|
|
|
|
is copied instead of being cut."
|
|
|
|
|
|
(interactive "e")
|
2017-12-17 10:19:19 +00:00
|
|
|
|
(let* ((mouse-button (event-basic-type last-input-event))
|
|
|
|
|
|
(mouse-drag-and-drop-region-show-tooltip
|
|
|
|
|
|
(when (and mouse-drag-and-drop-region-show-tooltip
|
|
|
|
|
|
(display-multi-frame-p)
|
|
|
|
|
|
(require 'tooltip))
|
|
|
|
|
|
mouse-drag-and-drop-region-show-tooltip))
|
|
|
|
|
|
(start (region-beginning))
|
|
|
|
|
|
(end (region-end))
|
|
|
|
|
|
(point (point))
|
|
|
|
|
|
(buffer (current-buffer))
|
|
|
|
|
|
(window (selected-window))
|
|
|
|
|
|
(text-from-read-only buffer-read-only)
|
|
|
|
|
|
(mouse-drag-and-drop-overlay (make-overlay start end))
|
|
|
|
|
|
point-to-paste
|
|
|
|
|
|
point-to-paste-read-only
|
|
|
|
|
|
window-to-paste
|
|
|
|
|
|
buffer-to-paste
|
|
|
|
|
|
cursor-in-text-area
|
|
|
|
|
|
no-modifier-on-drop
|
|
|
|
|
|
drag-but-negligible
|
|
|
|
|
|
clicked
|
|
|
|
|
|
value-selection ; This remains nil when event was "click".
|
|
|
|
|
|
text-tooltip
|
|
|
|
|
|
states
|
|
|
|
|
|
window-exempt)
|
|
|
|
|
|
|
|
|
|
|
|
;; STATES stores for each window on this frame its start and point
|
|
|
|
|
|
;; positions so we can restore them on all windows but for the one
|
|
|
|
|
|
;; where the drop occurs. For inter-frame drags we'll have to do
|
|
|
|
|
|
;; this for all windows on all visible frames. In addition we save
|
|
|
|
|
|
;; also the cursor type for the window's buffer so we can restore it
|
|
|
|
|
|
;; in case we modified it.
|
|
|
|
|
|
;; https://lists.gnu.org/archive/html/emacs-devel/2017-12/msg00090.html
|
|
|
|
|
|
(walk-window-tree
|
|
|
|
|
|
(lambda (window)
|
|
|
|
|
|
(setq states
|
|
|
|
|
|
(cons
|
|
|
|
|
|
(list
|
|
|
|
|
|
window
|
|
|
|
|
|
(copy-marker (window-start window))
|
|
|
|
|
|
(copy-marker (window-point window))
|
|
|
|
|
|
(with-current-buffer (window-buffer window)
|
|
|
|
|
|
cursor-type))
|
|
|
|
|
|
states))))
|
|
|
|
|
|
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(track-mouse
|
|
|
|
|
|
;; When event was "click" instead of "drag", skip loop.
|
|
|
|
|
|
(while (progn
|
|
|
|
|
|
(setq event (read-key)) ; read-event or read-key
|
|
|
|
|
|
(or (mouse-movement-p event)
|
|
|
|
|
|
;; Handle `mouse-autoselect-window'.
|
|
|
|
|
|
(eq (car-safe event) 'select-window)))
|
|
|
|
|
|
;; Obtain the dragged text in region. When the loop was
|
|
|
|
|
|
;; skipped, value-selection remains nil.
|
|
|
|
|
|
(unless value-selection
|
|
|
|
|
|
(setq value-selection (buffer-substring start end))
|
|
|
|
|
|
(when mouse-drag-and-drop-region-show-tooltip
|
|
|
|
|
|
(let ((text-size mouse-drag-and-drop-region-show-tooltip))
|
|
|
|
|
|
(setq text-tooltip
|
|
|
|
|
|
(if (and (integerp text-size)
|
|
|
|
|
|
(> (length value-selection) text-size))
|
|
|
|
|
|
(concat
|
|
|
|
|
|
(substring value-selection 0 (/ text-size 2))
|
|
|
|
|
|
"\n...\n"
|
|
|
|
|
|
(substring value-selection (- (/ text-size 2)) -1))
|
|
|
|
|
|
value-selection))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check if selected text is read-only.
|
|
|
|
|
|
(setq text-from-read-only (or text-from-read-only
|
|
|
|
|
|
(get-text-property start 'read-only)
|
|
|
|
|
|
(not (equal
|
|
|
|
|
|
(next-single-char-property-change
|
|
|
|
|
|
start 'read-only nil end)
|
|
|
|
|
|
end)))))
|
|
|
|
|
|
(setq window-to-paste (posn-window (event-end event)))
|
|
|
|
|
|
(setq point-to-paste (posn-point (event-end event)))
|
|
|
|
|
|
;; Set nil when target buffer is minibuffer.
|
|
|
|
|
|
(setq buffer-to-paste (let (buf)
|
|
|
|
|
|
(when (windowp window-to-paste)
|
|
|
|
|
|
(setq buf (window-buffer window-to-paste))
|
|
|
|
|
|
(when (not (minibufferp buf))
|
|
|
|
|
|
buf))))
|
|
|
|
|
|
(setq cursor-in-text-area (and window-to-paste
|
|
|
|
|
|
point-to-paste
|
|
|
|
|
|
buffer-to-paste))
|
|
|
|
|
|
|
|
|
|
|
|
(when cursor-in-text-area
|
|
|
|
|
|
;; Check if point under mouse is read-only.
|
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
|
(select-window window-to-paste)
|
|
|
|
|
|
(setq point-to-paste-read-only
|
|
|
|
|
|
(or buffer-read-only
|
|
|
|
|
|
(get-text-property point-to-paste 'read-only))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check if "drag but negligible". Operation "drag but
|
|
|
|
|
|
;; negligible" is defined as drag-and-drop the text to
|
|
|
|
|
|
;; the original region. When modifier is pressed, the
|
|
|
|
|
|
;; text will be inserted to inside of the original
|
|
|
|
|
|
;; region.
|
|
|
|
|
|
(setq drag-but-negligible
|
|
|
|
|
|
(and (eq (overlay-buffer mouse-drag-and-drop-overlay)
|
|
|
|
|
|
buffer-to-paste)
|
2018-06-20 07:27:50 +00:00
|
|
|
|
(<= (overlay-start mouse-drag-and-drop-overlay)
|
2017-12-17 10:19:19 +00:00
|
|
|
|
point-to-paste)
|
2018-06-20 07:27:50 +00:00
|
|
|
|
(<= point-to-paste
|
2017-12-17 10:19:19 +00:00
|
|
|
|
(overlay-end mouse-drag-and-drop-overlay)))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Show a tooltip.
|
|
|
|
|
|
(if mouse-drag-and-drop-region-show-tooltip
|
|
|
|
|
|
(tooltip-show text-tooltip)
|
|
|
|
|
|
(tooltip-hide))
|
|
|
|
|
|
|
|
|
|
|
|
;; Show cursor and highlight the original region.
|
|
|
|
|
|
(when mouse-drag-and-drop-region-show-cursor
|
|
|
|
|
|
;; Modify cursor even when point is out of frame.
|
|
|
|
|
|
(setq cursor-type (cond
|
|
|
|
|
|
((not cursor-in-text-area)
|
|
|
|
|
|
nil)
|
|
|
|
|
|
((or point-to-paste-read-only
|
|
|
|
|
|
drag-but-negligible)
|
|
|
|
|
|
'hollow)
|
|
|
|
|
|
(t
|
|
|
|
|
|
'bar)))
|
|
|
|
|
|
(when cursor-in-text-area
|
|
|
|
|
|
(overlay-put mouse-drag-and-drop-overlay
|
|
|
|
|
|
'face 'mouse-drag-and-drop-region)
|
|
|
|
|
|
(deactivate-mark) ; Maintain region in other window.
|
|
|
|
|
|
(mouse-set-point event)))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Hide a tooltip.
|
|
|
|
|
|
(when mouse-drag-and-drop-region-show-tooltip (tooltip-hide))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check if modifier was pressed on drop.
|
|
|
|
|
|
(setq no-modifier-on-drop
|
|
|
|
|
|
(not (member mouse-drag-and-drop-region (event-modifiers event))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Check if event was "click".
|
|
|
|
|
|
(setq clicked (not value-selection))
|
|
|
|
|
|
|
|
|
|
|
|
;; Restore status on drag to outside of text-area or non-mouse input.
|
|
|
|
|
|
(when (or (not cursor-in-text-area)
|
|
|
|
|
|
(not (equal (event-basic-type event) mouse-button)))
|
|
|
|
|
|
(setq drag-but-negligible t
|
|
|
|
|
|
no-modifier-on-drop t))
|
|
|
|
|
|
|
|
|
|
|
|
;; Do not modify any buffers when event is "click",
|
|
|
|
|
|
;; "drag but negligible", or "drag to read-only".
|
|
|
|
|
|
(let* ((mouse-drag-and-drop-region-cut-when-buffers-differ
|
|
|
|
|
|
(if no-modifier-on-drop
|
|
|
|
|
|
mouse-drag-and-drop-region-cut-when-buffers-differ
|
|
|
|
|
|
(not mouse-drag-and-drop-region-cut-when-buffers-differ)))
|
|
|
|
|
|
(wanna-paste-to-same-buffer (equal buffer-to-paste buffer))
|
|
|
|
|
|
(wanna-cut-on-same-buffer (and wanna-paste-to-same-buffer
|
|
|
|
|
|
no-modifier-on-drop))
|
|
|
|
|
|
(wanna-cut-on-other-buffer
|
|
|
|
|
|
(and (not wanna-paste-to-same-buffer)
|
|
|
|
|
|
mouse-drag-and-drop-region-cut-when-buffers-differ))
|
|
|
|
|
|
(cannot-paste (or point-to-paste-read-only
|
|
|
|
|
|
(when (or wanna-cut-on-same-buffer
|
|
|
|
|
|
wanna-cut-on-other-buffer)
|
|
|
|
|
|
text-from-read-only))))
|
|
|
|
|
|
|
2017-05-27 11:57:11 +00:00
|
|
|
|
(cond
|
2017-12-17 10:19:19 +00:00
|
|
|
|
;; Move point within region.
|
|
|
|
|
|
(clicked
|
|
|
|
|
|
(deactivate-mark)
|
|
|
|
|
|
(mouse-set-point event))
|
|
|
|
|
|
;; Undo operation. Set back the original text as region.
|
|
|
|
|
|
((or (and drag-but-negligible
|
|
|
|
|
|
no-modifier-on-drop)
|
|
|
|
|
|
cannot-paste)
|
|
|
|
|
|
;; Inform user either source or destination buffer cannot be modified.
|
|
|
|
|
|
(when (and (not drag-but-negligible)
|
|
|
|
|
|
cannot-paste)
|
|
|
|
|
|
(message "Buffer is read-only"))
|
|
|
|
|
|
|
|
|
|
|
|
;; Select source window back and restore region.
|
|
|
|
|
|
;; (set-window-point window point)
|
|
|
|
|
|
(select-window window)
|
2017-05-27 11:57:11 +00:00
|
|
|
|
(goto-char point)
|
|
|
|
|
|
(setq deactivate-mark nil)
|
|
|
|
|
|
(activate-mark))
|
2017-12-17 10:19:19 +00:00
|
|
|
|
;; Modify buffers.
|
2017-05-27 11:57:11 +00:00
|
|
|
|
(t
|
2017-12-17 10:19:19 +00:00
|
|
|
|
;; * DESTINATION BUFFER::
|
|
|
|
|
|
;; Insert the text to destination buffer under mouse.
|
|
|
|
|
|
(select-window window-to-paste)
|
|
|
|
|
|
(setq window-exempt window-to-paste)
|
|
|
|
|
|
(goto-char point-to-paste)
|
|
|
|
|
|
(push-mark)
|
|
|
|
|
|
(insert value-selection)
|
|
|
|
|
|
;; On success, set the text as region on destination buffer.
|
|
|
|
|
|
(when (not (equal (mark) (point)))
|
|
|
|
|
|
(setq deactivate-mark nil)
|
|
|
|
|
|
(activate-mark))
|
|
|
|
|
|
|
|
|
|
|
|
;; * SOURCE BUFFER::
|
|
|
|
|
|
;; Set back the original text as region or delete the original
|
|
|
|
|
|
;; text, on source buffer.
|
|
|
|
|
|
(if wanna-paste-to-same-buffer
|
|
|
|
|
|
;; When source buffer and destination buffer are the same,
|
|
|
|
|
|
;; remove the original text.
|
|
|
|
|
|
(when no-modifier-on-drop
|
|
|
|
|
|
(let (deactivate-mark)
|
|
|
|
|
|
(delete-region (overlay-start mouse-drag-and-drop-overlay)
|
|
|
|
|
|
(overlay-end mouse-drag-and-drop-overlay))))
|
|
|
|
|
|
;; When source buffer and destination buffer are different,
|
|
|
|
|
|
;; keep (set back the original text as region) or remove the
|
|
|
|
|
|
;; original text.
|
|
|
|
|
|
(select-window window) ; Select window with source buffer.
|
|
|
|
|
|
(goto-char point) ; Move point to the original text on source buffer.
|
|
|
|
|
|
|
|
|
|
|
|
(if mouse-drag-and-drop-region-cut-when-buffers-differ
|
|
|
|
|
|
;; Remove the dragged text from source buffer like
|
|
|
|
|
|
;; operation `cut'.
|
|
|
|
|
|
(delete-region (overlay-start mouse-drag-and-drop-overlay)
|
|
|
|
|
|
(overlay-end mouse-drag-and-drop-overlay))
|
|
|
|
|
|
;; Set back the dragged text as region on source buffer
|
|
|
|
|
|
;; like operation `copy'.
|
|
|
|
|
|
(activate-mark))
|
|
|
|
|
|
(select-window window-to-paste))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Clean up.
|
|
|
|
|
|
(delete-overlay mouse-drag-and-drop-overlay)
|
|
|
|
|
|
|
|
|
|
|
|
;; Restore old states but for the window where the drop
|
|
|
|
|
|
;; occurred. Restore cursor types for all windows.
|
|
|
|
|
|
(dolist (state states)
|
|
|
|
|
|
(let ((window (car state)))
|
|
|
|
|
|
(when (and window-exempt
|
|
|
|
|
|
(not (eq window window-exempt)))
|
|
|
|
|
|
(set-window-start window (nth 1 state) 'noforce)
|
|
|
|
|
|
(set-marker (nth 1 state) nil)
|
|
|
|
|
|
;; If window is selected, the following automatically sets
|
|
|
|
|
|
;; point for that window's buffer.
|
|
|
|
|
|
(set-window-point window (nth 2 state))
|
|
|
|
|
|
(set-marker (nth 2 state) nil))
|
|
|
|
|
|
(with-current-buffer (window-buffer window)
|
|
|
|
|
|
(setq cursor-type (nth 3 state)))))))
|
2017-05-27 11:57:11 +00:00
|
|
|
|
|
|
|
|
|
|
|
1991-12-20 07:15:37 +00:00
|
|
|
|
;;; Bindings for mouse commands.
|
|
|
|
|
|
|
2014-05-11 05:49:14 +00:00
|
|
|
|
(global-set-key [down-mouse-1] 'mouse-drag-region)
|
1993-01-26 01:58:16 +00:00
|
|
|
|
(global-set-key [mouse-1] 'mouse-set-point)
|
|
|
|
|
|
(global-set-key [drag-mouse-1] 'mouse-set-region)
|
1993-05-15 19:52:01 +00:00
|
|
|
|
|
2011-07-01 17:58:14 +00:00
|
|
|
|
(defun mouse--strip-first-event (_prompt)
|
|
|
|
|
|
(substring (this-single-command-raw-keys) 1))
|
|
|
|
|
|
|
|
|
|
|
|
(define-key function-key-map [left-fringe mouse-1] 'mouse--strip-first-event)
|
|
|
|
|
|
(define-key function-key-map [right-fringe mouse-1] 'mouse--strip-first-event)
|
2003-11-23 00:27:27 +00:00
|
|
|
|
|
2010-07-14 18:03:39 +00:00
|
|
|
|
(global-set-key [mouse-2] 'mouse-yank-primary)
|
2006-08-17 03:36:17 +00:00
|
|
|
|
;; Allow yanking also when the corresponding cursor is "in the fringe".
|
2011-07-01 17:58:14 +00:00
|
|
|
|
(define-key function-key-map [right-fringe mouse-2] 'mouse--strip-first-event)
|
|
|
|
|
|
(define-key function-key-map [left-fringe mouse-2] 'mouse--strip-first-event)
|
1993-01-26 01:58:16 +00:00
|
|
|
|
(global-set-key [mouse-3] 'mouse-save-then-kill)
|
2011-07-01 17:58:14 +00:00
|
|
|
|
(define-key function-key-map [right-fringe mouse-3] 'mouse--strip-first-event)
|
|
|
|
|
|
(define-key function-key-map [left-fringe mouse-3] 'mouse--strip-first-event)
|
1992-08-31 05:06:54 +00:00
|
|
|
|
|
1993-01-26 01:58:16 +00:00
|
|
|
|
;; By binding these to down-going events, we let the user use the up-going
|
|
|
|
|
|
;; event to make the selection, saving a click.
|
1995-09-18 14:15:22 +00:00
|
|
|
|
(global-set-key [C-down-mouse-1] 'mouse-buffer-menu)
|
|
|
|
|
|
(if (not (eq system-type 'ms-dos))
|
2008-06-15 20:04:33 +00:00
|
|
|
|
(global-set-key [S-down-mouse-1] 'mouse-appearance-menu))
|
1994-10-30 10:41:03 +00:00
|
|
|
|
;; C-down-mouse-2 is bound in facemenu.el.
|
2008-04-09 03:53:48 +00:00
|
|
|
|
(global-set-key [C-down-mouse-3]
|
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
(tex-dvi-print-command, tex-bibtex-command, tex-start-commands)
(tex-start-options, slitex-run-command, latex-run-command)
(tex-run-command, tex-directory):
* textmodes/ispell.el (ispell-html-skip-alists)
(ispell-tex-skip-alists, ispell-tex-skip-alists):
* textmodes/fill.el (adaptive-fill-first-line-regexp):
(adaptive-fill-regexp):
* textmodes/dns-mode.el (auto-mode-alist):
* progmodes/python.el (interpreter-mode-alist):
* progmodes/etags.el (tags-compression-info-list):
* progmodes/etags.el (tags-file-name):
* net/browse-url.el (browse-url-galeon-program)
(browse-url-firefox-program):
* mail/sendmail.el (mail-signature-file)
(mail-citation-prefix-regexp):
* international/mule-conf.el (eight-bit):
* international/latexenc.el (latex-inputenc-coding-alist):
* international/fontset.el (x-pixel-size-width-font-regexp):
* emacs-lisp/warnings.el (warning-type-format):
* emacs-lisp/trace.el (trace-buffer):
* emacs-lisp/lisp-mode.el (lisp-interaction-mode-map)
(emacs-lisp-mode-map):
* calendar/holidays.el (holiday-solar-holidays)
(holiday-bahai-holidays, holiday-islamic-holidays)
(holiday-christian-holidays, holiday-hebrew-holidays)
(hebrew-holidays-4, hebrew-holidays-3, hebrew-holidays-2)
(hebrew-holidays-1, holiday-oriental-holidays)
(holiday-general-holidays):
* x-dnd.el (x-dnd-known-types):
* tool-bar.el (tool-bar):
* startup.el (site-run-file):
* shell.el (shell-dumb-shell-regexp):
* rfn-eshadow.el (file-name-shadow-tty-properties)
(file-name-shadow-properties):
* paths.el (remote-shell-program, news-directory):
* mouse.el ([C-down-mouse-3]):
* menu-bar.el (menu-bar-tools-menu):
* jka-cmpr-hook.el (jka-compr-load-suffixes)
(jka-compr-mode-alist-additions, jka-compr-compression-info-list)
(jka-compr-compression-info-list):
* isearch.el (search-whitespace-regexp):
* image-file.el (image-file-name-extensions):
* find-dired.el (find-ls-option):
* files.el (directory-listing-before-filename-regexp)
(directory-free-space-args, insert-directory-program)
(list-directory-brief-switches, magic-fallback-mode-alist)
(magic-fallback-mode-alist, auto-mode-interpreter-regexp)
(automount-dir-prefix):
* faces.el (face-x-resources, x-font-regexp, x-font-regexp-head)
(x-font-regexp-slant, x-font-regexp-weight, face-x-resources)
(face-font-registry-alternatives, face-font-registry-alternatives)
(face-font-family-alternatives):
* facemenu.el (facemenu-add-new-face, facemenu-background-menu)
(facemenu-foreground-menu, facemenu-face-menu):
* epa-hook.el (epa-file-name-regexp):
* dnd.el (dnd-protocol-alist):
* textmodes/rst.el (auto-mode-alist):
* button.el (default-button): Purecopy strings.
2009-11-06 05:16:23 +00:00
|
|
|
|
`(menu-item ,(purecopy "Menu Bar") ignore
|
2008-04-09 03:53:48 +00:00
|
|
|
|
:filter (lambda (_)
|
|
|
|
|
|
(if (zerop (or (frame-parameter nil 'menu-bar-lines) 0))
|
|
|
|
|
|
(mouse-menu-bar-map)
|
|
|
|
|
|
(mouse-menu-major-mode-map)))))
|
1994-10-12 09:27:49 +00:00
|
|
|
|
|
2000-10-09 10:23:49 +00:00
|
|
|
|
;; Binding mouse-1 to mouse-select-window when on mode-, header-, or
|
|
|
|
|
|
;; vertical-line prevents Emacs from signaling an error when the mouse
|
|
|
|
|
|
;; button is released after dragging these lines, on non-toolkit
|
|
|
|
|
|
;; versions.
|
1999-09-09 14:54:25 +00:00
|
|
|
|
(global-set-key [header-line down-mouse-1] 'mouse-drag-header-line)
|
2000-10-09 10:23:49 +00:00
|
|
|
|
(global-set-key [header-line mouse-1] 'mouse-select-window)
|
2015-07-02 07:03:45 +00:00
|
|
|
|
;; (global-set-key [mode-line drag-mouse-1] 'mouse-select-window)
|
|
|
|
|
|
(global-set-key [mode-line down-mouse-1] 'mouse-drag-mode-line)
|
|
|
|
|
|
(global-set-key [mode-line mouse-1] 'mouse-select-window)
|
1994-02-25 19:35:58 +00:00
|
|
|
|
(global-set-key [mode-line mouse-2] 'mouse-delete-other-windows)
|
1993-01-26 01:58:16 +00:00
|
|
|
|
(global-set-key [mode-line mouse-3] 'mouse-delete-window)
|
1994-02-25 19:35:58 +00:00
|
|
|
|
(global-set-key [mode-line C-mouse-2] 'mouse-split-window-horizontally)
|
1994-07-07 18:39:02 +00:00
|
|
|
|
(global-set-key [vertical-scroll-bar C-mouse-2] 'mouse-split-window-vertically)
|
2015-07-02 07:03:45 +00:00
|
|
|
|
(global-set-key [horizontal-scroll-bar C-mouse-2] 'mouse-split-window-horizontally)
|
1995-09-18 14:15:22 +00:00
|
|
|
|
(global-set-key [vertical-line down-mouse-1] 'mouse-drag-vertical-line)
|
2015-07-02 07:03:45 +00:00
|
|
|
|
(global-set-key [vertical-line mouse-1] 'mouse-select-window)
|
|
|
|
|
|
(global-set-key [vertical-line C-mouse-2] 'mouse-split-window-vertically)
|
Support resizing frames and windows pixelwise.
* dispextern.h (enum window_part): Add ON_SCROLL_BAR,
ON_RIGHT_DIVIDER and ON_BOTTOM_DIVIDER.
(struct glyph_matrix): Replace window_left_col and
window_top_line by window_pixel_left and window_pixel_top.
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): Minor
rewrite.
(enum face_id): Add WINDOW_DIVIDER_FACE_ID.
(draw_window_divider, move_it_to, x_draw_right_divider)
(x_draw_bottom_divider, change_frame_size): Add or fix
declarations.
* dispnew.c (change_frame_size_1): Change prototype.
(adjust_glyph_matrix, required_matrix_width)
(adjust_frame_glyphs_for_window_redisplay): Use pixel
values instead of lines and columns.
(marginal_area_string): Use WINDOW_FRINGES_WIDTH instead of
WINDOW_TOTAL_FRINGE_WIDTH.
(handle_window_change_signal, do_pending_window_change)
(init_display): Adjusts calls of change_frame_size.
(change_frame_size, change_frame_size_1): Handle pixelwise
changes.
* frame.c (Qright_divider_width, Qbottom_divider_width): New
Lisp objects.
(set_menu_bar_lines_1, set_menu_bar_lines, make_frame)
(make_terminal_frame, Fmake_terminal_frame, Fframe_parameters)
(x_set_internal_border_width, x_set_vertical_scroll_bars)
(x_set_scroll_bar_width, x_figure_window_size): Handle pixel
values.
(set_frame_param): New function.
(Fframe_text_cols, Fframe_text_lines, Fframe_total_cols)
(Fframe_text_width, Fframe_text_height, Fscroll_bar_width)
(Ffringe_width, Fborder_width, Fright_divider_width)
(Fbottom_divider_width): New functions, defsubr them.
(Fset_frame_height, Fset_frame_width, Fset_frame_size): New
argument pixelwise.
(struct frame_parm_table): New members Qright_divider_width and
Qbottom_divider_width.
(x_set_frame_parameters): Handle parameters for pixelwise sizes.
(x_report_frame_params): Handle Qright_divider_width and
Qbottom_divider_width.
(x_set_right_divider_width, x_set_bottom_divider_width): New
functions.
(frame_resize_pixelwise): New option.
* frame.h (struct frame): Add tool_bar_height, menu_bar_height,
new_pixelwise, right_divider_width and bottom_divider_width;
remove total_lines; rename text_lines, text_cols, new_text_lines
and new_text_cols to text_height, text_width, new_height and
new_width respectively.
(FRAME_LINES, FRAME_COLS): Rename to FRAME_TEXT_HEIGHT and
FRAME_TEXT_WIDTH respectively.
(FRAME_MENU_BAR_HEIGHT, FRAME_TOOL_BAR_HEIGHT)
(FRAME_RIGHT_DIVIDER_WIDTH, FRAME_BOTTOM_DIVIDER_WIDTH)
(FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH): New
macros.
(FRAME_TOP_MARGIN_HEIGHT, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH, FRAME_SCROLL_BAR_AREA_WIDTH)
(SET_FRAME_COLS, SET_FRAME_WIDTH, SET_FRAME_HEIGHT)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH, FRAME_PIXEL_WIDTH_TO_TEXT_COLS)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rewrite macros.
(FRAME_TOTAL_COLS_ARG): Remove macro.
* fringe.c (draw_fringe_bitmap_1): Handle right divder.
* gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
(x_wm_set_size_hint): Handle frame pixel sizes.
* indent.c (compute_motion, Fcompute_motion): Call
window_body_width instead of window_body_cols.
* keyboard.c (Qright_divider, Qbottom_divider): New symbols.
(make_lispy_position): Handle right and bottom dividers.
(Fsuspend_emacs): Pixelize call of change_frame_size.
* keyboard.h: Extern Qright_divider, Qbottom_divider.
* lisp.h: Extern set_frame_param.
* nsfns.m (x_set_tool_bar_lines): Pixelize call of
x_set_window_size.
(Fx_create_frame): Add entry for vertical_drag_cursor. Pixelize
call of change_frame_size.
* nsterm.h (struct ns_output): Add vertical_drag_cursor.
* nsterm.m (ns_update_window_end): Optionally draw right
divider.
(x_set_window_size): Add argument pixelwise. Call
check_frame_size and change_frame_size with pixelwise zero.
(ns_draw_window_divider): New function.
(ns_redisplay_interface): Add ns_draw_window_divider.
(updateFrameSize:): Call change_frame_size with pixelwise zero.
(x_new_font): Call x_set_window_size with pixelwise zero.
* print.c (print_object): For a window print its sequence
number again.
* term.c (Fresume_tty): Pixelize call of change_frame_size.
* w32fns.c (x_set_mouse_color): Handle vertical drag cursor.
(x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
(w32_createwindow): Use scroll bar area width.
(w32_wnd_proc): Handle bottom divider width. For
WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
(Fx_create_frame): Default divider width parameters. Caclulate
sizes pixelwise. Add vertical drag cursor support.
(x_create_tip_frame): Default divider widths to zero. Pixelize
call to change_frame_size.
(Fx_show_tip): Add handling of divider widths. Pixelize window
position and sizes.
(Fw32_frame_rect): New function.
(frame_parm_handler w32_frame_parm_handlers): Add divider
widths.
(Vx_window_vertical_drag_shape): Add variable.
* w32inevt.c (resize_event, maybe_generate_resize_event):
Pixelize change_frame_size calls.
* w32menu.c (set_frame_menubar): Pixelize x_set_window_size
call.
* w32term.c (w32_draw_window_divider): New function.
(x_update_window_end): Handle right divider.
(w32_draw_fringe_bitmap, x_scroll_run)
(w32_set_vertical_scroll_bar): Pixelize scrollbar widths.
(w32_read_socket): Handle SIZE_MAXIMIZED separately. Calculate
new frame sizes pixelwise.
(x_new_font): Pixelize call to x_set_window_size.
(x_check_fullscreen): Pixelize call to change_frame_size.
(x_set_window_size_1, x_set_window_size): New argument
pixelwise. Calculate pixelwise.
(x_wm_set_size_hint): Use scroll bar area width.
(w32_redisplay_interface): Add w32_draw_window_divider.
* w32term.h (struct w32_output): Add vertical drag cursor.
* widget.c (set_frame_size, update_wm_hints)
(EmacsFrameResize, EmacsFrameSetValues): Pixelize calls of
change_frame_size.
(EmacsFrameSetCharSize): Pixelize call of x_set_window_size.
* window.c (sequence_number): Restore.
(Fwindow_pixel_width, Fwindow_pixel_height)
(Fwindow_mode_line_height, Fwindow_header_line_height)
(window_pixel_to_total, Frun_window_scroll_functions)
(Fset_window_new_pixel, window_resize_apply_total)
(Fwindow_resize_apply_total): New functions.
(window_body_height, window_body_width): Rename from
window_body_lines. New argument PIXELWISE. Calculate
pixelwise.
(Fwindow_body_height, Fwindow_body_width): New argument
PIXELWISE.
(coordinates_in_window, window_relative_x_coord): Use window's
pixel width instead of total width.
(replace_window, recombine_windows): Initialize pixel values.
(resize_root_window, resize_frame_windows, grow_mini_window)
(shrink_mini_window): New argument PIXELWISE. Calculate
pixelwise.
(Fdelete_other_windows_internal, adjust_window_margins)
(window_resize_check, window_resize_apply)
(Fdelete_window_internal, Fresize_mini_window_internal)
(Fwindow_text_width, Fwindow_text_height): Calculate pixelwise.
(check_frame_size): Rename arguments. New argument PIXELWISE.
Calculate pixelwise.
(set_window_buffer): Make samebuf bool. Run configuration change
hook only if buffer changed.
(Fset_window_buffer): Rewrite doc-string.
(make_window): Initialize new_pixel slot.
(Fwindow_resize_apply): Check pixel size of root window.
(Fsplit_window_internal): Call 2nd argument pixel_size.
Calculate pixelwise.
(Fscroll_left, Fscroll_right): Call window_body_width instead of
window_body_cols.
(save_window_data): New slots frame_text_width,
frame_text_height, frame_menu_bar_height, frame_tool_bar_height.
(saved_window): New slots pixel_left, pixel_top, pixel_height,
pixel_width.
(Fcurrent_window_configuration, Fset_window_configuration)
(save_window_save, compare_window_configurations): Handle new
slots in save_window_data and saved_window.
(Fset_window_scroll_bars): Fix doc-string.
(window_resize_pixelwise): New variable.
(coordinates_in_window, Fcoordinates_in_window_p): Handle
dividers.
(make_parent_window): Adjust sequence_number.
(Fwindow_right_divider_width, Fwindow_bottom_divider_width): New
functions.
* window.h (struct window): New members new_pixel, pixel_left,
pixel_top, pixel_width, pixel_height. Restore sequence_number.
(wset_new_pixel): New function.
(WINDOW_PIXEL_WIDTH, WINDOW_PIXEL_HEIGHT)
(MIN_SAFE_WINDOW_PIXEL_WIDTH, MIN_SAFE_WINDOW_PIXEL_HEIGHT)
(WINDOW_LEFT_PIXEL_EDGE, WINDOW_RIGHT_PIXEL_EDGE)
(WINDOW_TOP_PIXEL_EDGE, WINDOW_BOTTOM_PIXEL_EDGE)
(WINDOW_BOTTOMMOST_P, WINDOW_BOX_LEFT_PIXEL_EDGE)
(WINDOW_BOX_RIGHT_PIXEL_EDGE, WINDOW_MARGINS_COLS)
(WINDOW_MARGINS_WIDTH, WINDOW_RIGHT_DIVIDER_WIDTH)
(WINDOW_BOTTOM_DIVIDER_WIDTH): New macros.
(WINDOW_TOTAL_FRINGE_WIDTH): Rename to WINDOW_FRINGES_WIDTH.
(WINDOW_TOTAL_WIDTH, WINDOW_TOTAL_HEIGHT): Remove macros.
(WINDOW_RIGHT_EDGE_X, WINDOW_LEFT_EDGE_X, WINDOW_TOP_EDGE_Y)
(WINDOW_BOTTOM_EDGE_Y, WINDOW_FULL_WIDTH_P, WINDOW_LEFTMOST_P)
(WINDOW_RIGHTMOST_P, WINDOW_BOX_LEFT_EDGE_X)
(WINDOW_BOX_RIGHT_EDGE_X, WINDOW_FRINGE_COLS)
(WINDOW_BOX_HEIGHT_NO_MODE_LINE, WINDOW_BOX_TEXT_HEIGHT):
Rewrite.
(resize_frame_windows, grow_mini_window, shrink_mini_window)
(window_body_width, check_frame_size): Adapt external declarations.
* xdisp.c (last_max_ascent): New integer.
(window_text_bottom_y): Handle bottom divider.
(window_box_width, window_box_height): Calculate pixelwise.
(get_glyph_string_clip_rects): Handle right divider.
(remember_mouse_glyph): When windows are resized pixelwise
proceed with width and height set to 1.
(init_iterator): Use WINDOW_PIXEL_WIDTH instead of
WINDOW_TOTAL_WIDTH.
(move_it_to): Calculate and return maximum x position
encountered.
(Fwindow_text_pixel_size): New function.
(resize_mini_window, update_tool_bar): Calculate pixelwise.
(tool_bar_lines_needed): Rename to tool_bar_height. Calculate
pixelwise.
(Ftool_bar_lines_needed): Rename to Ftool_bar_height. Calculate
pixelwise.
(redisplay_tool_bar): Calculate pixelwise.
(redisplay_window): Calculate pixelwise. Handle dividers.
(draw_glyphs, x_clear_end_of_line, note_mouse_highlight)
(x_draw_vertical_border): Handle dividers.
(define_frame_cursor1): Handle vertical drag cursor.
(x_draw_right_divider, x_draw_bottom_divider): New functions.
(expose_window): Calculate pixelwise. Handle dividers.
(init_xdisp): Initialize pixel values.
* xfaces.c (Qwindow_divider): New face.
(realize_basic_faces): Realize it.
* xfns.c (x_set_mouse_color): Handle vertical_drag_cursor.
(x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
(x_set_scroll_bar_default_width): Default actual width to 16.
(Fx_create_frame): Set sizes pixelwise.
(x_create_tip_frame): Default divider widths to zero. Pixelize
call of change_frame_size.
(Fx_show_tip): Handle divider widths. Initial pixel position
and sizes.
(frame_parm_handler x_frame_parm_handlers): Add divider widths.
(Vx_window_vertical_drag_shape): New option.
* xmenu.c (free_frame_menubar): Pixelize call of
x_set_window_size.
* xterm.c (x_draw_window_divider): New function.
(x_update_window_end): Optionally draw right divider.
(x_draw_fringe_bitmap, x_scroll_run, x_scroll_bar_create)
(XTset_vertical_scroll_bar): Use scroll bar pixel width.
(handle_one_xevent, x_new_font): Calculate pixelwise.
(x_set_window_size_1, x_set_window_size): New argument
pixelwise. Calculate pixelwise.
(x_wm_set_size_hint): Pixelize call of check_frame_size.
(struct x_redisplay_interface): Add x_draw_window_divider.
* xterm.h (struct x_output): Add vertical_drag_cursor.
* cus-start.el (frame-resize-pixelwise)
(window-resize-pixelwise): New entries.
* emacs-lisp/debug.el (debug): Use window-total-height instead
of window-total-size.
* frame.el (tool-bar-lines-needed): Defalias to tool-bar-height.
* help.el (describe-bindings-internal): Call help-buffer
(temp-buffer-max-width): New option.
(resize-temp-buffer-window, help-window-setup)
(with-help-window): Rewrite.
* mouse.el (mouse-drag-line): Rewrite. Add key bindings for
dragging dividers.
* window.el (frame-char-size, window-min-pixel-height)
(window-safe-min-pixel-height, window-safe-min-pixel-width)
(window-min-pixel-width, window-safe-min-pixel-size)
(window-combination-p, window-safe-min-size)
(window-resizable-p, window--size-to-pixel)
(window--pixel-to-size, window--resize-apply-p): New functions.
(window-safe-min-height): Fix doc-string.
(window-size, window-min-size, window--min-size-1)
(window-sizable, window-sizable-p, window--min-delta-1)
(window-min-delta, window--max-delta-1, window-max-delta)
(window--resizable, window--resizable-p, window-resizable)
(window-full-height-p, window-full-width-p, window-at-side-p)
(window--in-direction-2, window-in-direction)
(window--resize-reset-1, window--resize-mini-window)
(window-resize, window-resize-no-error)
(window--resize-child-windows-normal)
(window--resize-child-windows, window--resize-siblings)
(window--resize-this-window, window--resize-root-window)
(window--resize-root-window-vertically)
(adjust-window-trailing-edge, enlarge-window, shrink-window)
(maximize-window, minimize-window, delete-window)
(quit-restore-window, window-split-min-size, split-window)
(balance-windows-2, balance-windows)
(balance-windows-area-adjust, balance-windows-area)
(window--state-get-1, window-state-get, window--state-put-1)
(window--state-put-2, window-state-put)
(display-buffer-record-window, window--display-buffer): Make
functions handle pixelwise sizing of windows.
(display-buffer--action-function-custom-type)
(display-buffer-fallback-action): Add
display-buffer-in-previous-window.
(display-buffer-use-some-window): Resize window to height it had
before.
(fit-window-to-buffer-horizontally): New option.
(fit-frame-to-buffer): Describe new values.
(fit-frame-to-buffer-bottom-margin): Replace with
fit-frame-to-buffer-margins.
(window--sanitize-margin): New function.
(fit-frame-to-buffer, fit-window-to-buffer): Rewrite completely
using window-text-pixel-size.
2013-11-30 09:25:31 +00:00
|
|
|
|
(global-set-key [right-divider down-mouse-1] 'mouse-drag-vertical-line)
|
2015-07-02 07:03:45 +00:00
|
|
|
|
(global-set-key [right-divider mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [right-divider C-mouse-2] 'mouse-split-window-vertically)
|
Support resizing frames and windows pixelwise.
* dispextern.h (enum window_part): Add ON_SCROLL_BAR,
ON_RIGHT_DIVIDER and ON_BOTTOM_DIVIDER.
(struct glyph_matrix): Replace window_left_col and
window_top_line by window_pixel_left and window_pixel_top.
(WINDOW_WANTS_MODELINE_P, WINDOW_WANTS_HEADER_LINE_P): Minor
rewrite.
(enum face_id): Add WINDOW_DIVIDER_FACE_ID.
(draw_window_divider, move_it_to, x_draw_right_divider)
(x_draw_bottom_divider, change_frame_size): Add or fix
declarations.
* dispnew.c (change_frame_size_1): Change prototype.
(adjust_glyph_matrix, required_matrix_width)
(adjust_frame_glyphs_for_window_redisplay): Use pixel
values instead of lines and columns.
(marginal_area_string): Use WINDOW_FRINGES_WIDTH instead of
WINDOW_TOTAL_FRINGE_WIDTH.
(handle_window_change_signal, do_pending_window_change)
(init_display): Adjusts calls of change_frame_size.
(change_frame_size, change_frame_size_1): Handle pixelwise
changes.
* frame.c (Qright_divider_width, Qbottom_divider_width): New
Lisp objects.
(set_menu_bar_lines_1, set_menu_bar_lines, make_frame)
(make_terminal_frame, Fmake_terminal_frame, Fframe_parameters)
(x_set_internal_border_width, x_set_vertical_scroll_bars)
(x_set_scroll_bar_width, x_figure_window_size): Handle pixel
values.
(set_frame_param): New function.
(Fframe_text_cols, Fframe_text_lines, Fframe_total_cols)
(Fframe_text_width, Fframe_text_height, Fscroll_bar_width)
(Ffringe_width, Fborder_width, Fright_divider_width)
(Fbottom_divider_width): New functions, defsubr them.
(Fset_frame_height, Fset_frame_width, Fset_frame_size): New
argument pixelwise.
(struct frame_parm_table): New members Qright_divider_width and
Qbottom_divider_width.
(x_set_frame_parameters): Handle parameters for pixelwise sizes.
(x_report_frame_params): Handle Qright_divider_width and
Qbottom_divider_width.
(x_set_right_divider_width, x_set_bottom_divider_width): New
functions.
(frame_resize_pixelwise): New option.
* frame.h (struct frame): Add tool_bar_height, menu_bar_height,
new_pixelwise, right_divider_width and bottom_divider_width;
remove total_lines; rename text_lines, text_cols, new_text_lines
and new_text_cols to text_height, text_width, new_height and
new_width respectively.
(FRAME_LINES, FRAME_COLS): Rename to FRAME_TEXT_HEIGHT and
FRAME_TEXT_WIDTH respectively.
(FRAME_MENU_BAR_HEIGHT, FRAME_TOOL_BAR_HEIGHT)
(FRAME_RIGHT_DIVIDER_WIDTH, FRAME_BOTTOM_DIVIDER_WIDTH)
(FRAME_TEXT_TO_PIXEL_WIDTH, FRAME_PIXEL_TO_TEXT_WIDTH): New
macros.
(FRAME_TOP_MARGIN_HEIGHT, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH, FRAME_SCROLL_BAR_AREA_WIDTH)
(SET_FRAME_COLS, SET_FRAME_WIDTH, SET_FRAME_HEIGHT)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH, FRAME_PIXEL_WIDTH_TO_TEXT_COLS)
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Rewrite macros.
(FRAME_TOTAL_COLS_ARG): Remove macro.
* fringe.c (draw_fringe_bitmap_1): Handle right divder.
* gtkutil.c (xg_frame_resized, xg_frame_set_char_size)
(x_wm_set_size_hint): Handle frame pixel sizes.
* indent.c (compute_motion, Fcompute_motion): Call
window_body_width instead of window_body_cols.
* keyboard.c (Qright_divider, Qbottom_divider): New symbols.
(make_lispy_position): Handle right and bottom dividers.
(Fsuspend_emacs): Pixelize call of change_frame_size.
* keyboard.h: Extern Qright_divider, Qbottom_divider.
* lisp.h: Extern set_frame_param.
* nsfns.m (x_set_tool_bar_lines): Pixelize call of
x_set_window_size.
(Fx_create_frame): Add entry for vertical_drag_cursor. Pixelize
call of change_frame_size.
* nsterm.h (struct ns_output): Add vertical_drag_cursor.
* nsterm.m (ns_update_window_end): Optionally draw right
divider.
(x_set_window_size): Add argument pixelwise. Call
check_frame_size and change_frame_size with pixelwise zero.
(ns_draw_window_divider): New function.
(ns_redisplay_interface): Add ns_draw_window_divider.
(updateFrameSize:): Call change_frame_size with pixelwise zero.
(x_new_font): Call x_set_window_size with pixelwise zero.
* print.c (print_object): For a window print its sequence
number again.
* term.c (Fresume_tty): Pixelize call of change_frame_size.
* w32fns.c (x_set_mouse_color): Handle vertical drag cursor.
(x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
(w32_createwindow): Use scroll bar area width.
(w32_wnd_proc): Handle bottom divider width. For
WM_WINDOWPOSCHANGING return zero if we resize pixelwise.
(Fx_create_frame): Default divider width parameters. Caclulate
sizes pixelwise. Add vertical drag cursor support.
(x_create_tip_frame): Default divider widths to zero. Pixelize
call to change_frame_size.
(Fx_show_tip): Add handling of divider widths. Pixelize window
position and sizes.
(Fw32_frame_rect): New function.
(frame_parm_handler w32_frame_parm_handlers): Add divider
widths.
(Vx_window_vertical_drag_shape): Add variable.
* w32inevt.c (resize_event, maybe_generate_resize_event):
Pixelize change_frame_size calls.
* w32menu.c (set_frame_menubar): Pixelize x_set_window_size
call.
* w32term.c (w32_draw_window_divider): New function.
(x_update_window_end): Handle right divider.
(w32_draw_fringe_bitmap, x_scroll_run)
(w32_set_vertical_scroll_bar): Pixelize scrollbar widths.
(w32_read_socket): Handle SIZE_MAXIMIZED separately. Calculate
new frame sizes pixelwise.
(x_new_font): Pixelize call to x_set_window_size.
(x_check_fullscreen): Pixelize call to change_frame_size.
(x_set_window_size_1, x_set_window_size): New argument
pixelwise. Calculate pixelwise.
(x_wm_set_size_hint): Use scroll bar area width.
(w32_redisplay_interface): Add w32_draw_window_divider.
* w32term.h (struct w32_output): Add vertical drag cursor.
* widget.c (set_frame_size, update_wm_hints)
(EmacsFrameResize, EmacsFrameSetValues): Pixelize calls of
change_frame_size.
(EmacsFrameSetCharSize): Pixelize call of x_set_window_size.
* window.c (sequence_number): Restore.
(Fwindow_pixel_width, Fwindow_pixel_height)
(Fwindow_mode_line_height, Fwindow_header_line_height)
(window_pixel_to_total, Frun_window_scroll_functions)
(Fset_window_new_pixel, window_resize_apply_total)
(Fwindow_resize_apply_total): New functions.
(window_body_height, window_body_width): Rename from
window_body_lines. New argument PIXELWISE. Calculate
pixelwise.
(Fwindow_body_height, Fwindow_body_width): New argument
PIXELWISE.
(coordinates_in_window, window_relative_x_coord): Use window's
pixel width instead of total width.
(replace_window, recombine_windows): Initialize pixel values.
(resize_root_window, resize_frame_windows, grow_mini_window)
(shrink_mini_window): New argument PIXELWISE. Calculate
pixelwise.
(Fdelete_other_windows_internal, adjust_window_margins)
(window_resize_check, window_resize_apply)
(Fdelete_window_internal, Fresize_mini_window_internal)
(Fwindow_text_width, Fwindow_text_height): Calculate pixelwise.
(check_frame_size): Rename arguments. New argument PIXELWISE.
Calculate pixelwise.
(set_window_buffer): Make samebuf bool. Run configuration change
hook only if buffer changed.
(Fset_window_buffer): Rewrite doc-string.
(make_window): Initialize new_pixel slot.
(Fwindow_resize_apply): Check pixel size of root window.
(Fsplit_window_internal): Call 2nd argument pixel_size.
Calculate pixelwise.
(Fscroll_left, Fscroll_right): Call window_body_width instead of
window_body_cols.
(save_window_data): New slots frame_text_width,
frame_text_height, frame_menu_bar_height, frame_tool_bar_height.
(saved_window): New slots pixel_left, pixel_top, pixel_height,
pixel_width.
(Fcurrent_window_configuration, Fset_window_configuration)
(save_window_save, compare_window_configurations): Handle new
slots in save_window_data and saved_window.
(Fset_window_scroll_bars): Fix doc-string.
(window_resize_pixelwise): New variable.
(coordinates_in_window, Fcoordinates_in_window_p): Handle
dividers.
(make_parent_window): Adjust sequence_number.
(Fwindow_right_divider_width, Fwindow_bottom_divider_width): New
functions.
* window.h (struct window): New members new_pixel, pixel_left,
pixel_top, pixel_width, pixel_height. Restore sequence_number.
(wset_new_pixel): New function.
(WINDOW_PIXEL_WIDTH, WINDOW_PIXEL_HEIGHT)
(MIN_SAFE_WINDOW_PIXEL_WIDTH, MIN_SAFE_WINDOW_PIXEL_HEIGHT)
(WINDOW_LEFT_PIXEL_EDGE, WINDOW_RIGHT_PIXEL_EDGE)
(WINDOW_TOP_PIXEL_EDGE, WINDOW_BOTTOM_PIXEL_EDGE)
(WINDOW_BOTTOMMOST_P, WINDOW_BOX_LEFT_PIXEL_EDGE)
(WINDOW_BOX_RIGHT_PIXEL_EDGE, WINDOW_MARGINS_COLS)
(WINDOW_MARGINS_WIDTH, WINDOW_RIGHT_DIVIDER_WIDTH)
(WINDOW_BOTTOM_DIVIDER_WIDTH): New macros.
(WINDOW_TOTAL_FRINGE_WIDTH): Rename to WINDOW_FRINGES_WIDTH.
(WINDOW_TOTAL_WIDTH, WINDOW_TOTAL_HEIGHT): Remove macros.
(WINDOW_RIGHT_EDGE_X, WINDOW_LEFT_EDGE_X, WINDOW_TOP_EDGE_Y)
(WINDOW_BOTTOM_EDGE_Y, WINDOW_FULL_WIDTH_P, WINDOW_LEFTMOST_P)
(WINDOW_RIGHTMOST_P, WINDOW_BOX_LEFT_EDGE_X)
(WINDOW_BOX_RIGHT_EDGE_X, WINDOW_FRINGE_COLS)
(WINDOW_BOX_HEIGHT_NO_MODE_LINE, WINDOW_BOX_TEXT_HEIGHT):
Rewrite.
(resize_frame_windows, grow_mini_window, shrink_mini_window)
(window_body_width, check_frame_size): Adapt external declarations.
* xdisp.c (last_max_ascent): New integer.
(window_text_bottom_y): Handle bottom divider.
(window_box_width, window_box_height): Calculate pixelwise.
(get_glyph_string_clip_rects): Handle right divider.
(remember_mouse_glyph): When windows are resized pixelwise
proceed with width and height set to 1.
(init_iterator): Use WINDOW_PIXEL_WIDTH instead of
WINDOW_TOTAL_WIDTH.
(move_it_to): Calculate and return maximum x position
encountered.
(Fwindow_text_pixel_size): New function.
(resize_mini_window, update_tool_bar): Calculate pixelwise.
(tool_bar_lines_needed): Rename to tool_bar_height. Calculate
pixelwise.
(Ftool_bar_lines_needed): Rename to Ftool_bar_height. Calculate
pixelwise.
(redisplay_tool_bar): Calculate pixelwise.
(redisplay_window): Calculate pixelwise. Handle dividers.
(draw_glyphs, x_clear_end_of_line, note_mouse_highlight)
(x_draw_vertical_border): Handle dividers.
(define_frame_cursor1): Handle vertical drag cursor.
(x_draw_right_divider, x_draw_bottom_divider): New functions.
(expose_window): Calculate pixelwise. Handle dividers.
(init_xdisp): Initialize pixel values.
* xfaces.c (Qwindow_divider): New face.
(realize_basic_faces): Realize it.
* xfns.c (x_set_mouse_color): Handle vertical_drag_cursor.
(x_set_menu_bar_lines, x_set_tool_bar_lines): Calculate pixelwise.
(x_set_scroll_bar_default_width): Default actual width to 16.
(Fx_create_frame): Set sizes pixelwise.
(x_create_tip_frame): Default divider widths to zero. Pixelize
call of change_frame_size.
(Fx_show_tip): Handle divider widths. Initial pixel position
and sizes.
(frame_parm_handler x_frame_parm_handlers): Add divider widths.
(Vx_window_vertical_drag_shape): New option.
* xmenu.c (free_frame_menubar): Pixelize call of
x_set_window_size.
* xterm.c (x_draw_window_divider): New function.
(x_update_window_end): Optionally draw right divider.
(x_draw_fringe_bitmap, x_scroll_run, x_scroll_bar_create)
(XTset_vertical_scroll_bar): Use scroll bar pixel width.
(handle_one_xevent, x_new_font): Calculate pixelwise.
(x_set_window_size_1, x_set_window_size): New argument
pixelwise. Calculate pixelwise.
(x_wm_set_size_hint): Pixelize call of check_frame_size.
(struct x_redisplay_interface): Add x_draw_window_divider.
* xterm.h (struct x_output): Add vertical_drag_cursor.
* cus-start.el (frame-resize-pixelwise)
(window-resize-pixelwise): New entries.
* emacs-lisp/debug.el (debug): Use window-total-height instead
of window-total-size.
* frame.el (tool-bar-lines-needed): Defalias to tool-bar-height.
* help.el (describe-bindings-internal): Call help-buffer
(temp-buffer-max-width): New option.
(resize-temp-buffer-window, help-window-setup)
(with-help-window): Rewrite.
* mouse.el (mouse-drag-line): Rewrite. Add key bindings for
dragging dividers.
* window.el (frame-char-size, window-min-pixel-height)
(window-safe-min-pixel-height, window-safe-min-pixel-width)
(window-min-pixel-width, window-safe-min-pixel-size)
(window-combination-p, window-safe-min-size)
(window-resizable-p, window--size-to-pixel)
(window--pixel-to-size, window--resize-apply-p): New functions.
(window-safe-min-height): Fix doc-string.
(window-size, window-min-size, window--min-size-1)
(window-sizable, window-sizable-p, window--min-delta-1)
(window-min-delta, window--max-delta-1, window-max-delta)
(window--resizable, window--resizable-p, window-resizable)
(window-full-height-p, window-full-width-p, window-at-side-p)
(window--in-direction-2, window-in-direction)
(window--resize-reset-1, window--resize-mini-window)
(window-resize, window-resize-no-error)
(window--resize-child-windows-normal)
(window--resize-child-windows, window--resize-siblings)
(window--resize-this-window, window--resize-root-window)
(window--resize-root-window-vertically)
(adjust-window-trailing-edge, enlarge-window, shrink-window)
(maximize-window, minimize-window, delete-window)
(quit-restore-window, window-split-min-size, split-window)
(balance-windows-2, balance-windows)
(balance-windows-area-adjust, balance-windows-area)
(window--state-get-1, window-state-get, window--state-put-1)
(window--state-put-2, window-state-put)
(display-buffer-record-window, window--display-buffer): Make
functions handle pixelwise sizing of windows.
(display-buffer--action-function-custom-type)
(display-buffer-fallback-action): Add
display-buffer-in-previous-window.
(display-buffer-use-some-window): Resize window to height it had
before.
(fit-window-to-buffer-horizontally): New option.
(fit-frame-to-buffer): Describe new values.
(fit-frame-to-buffer-bottom-margin): Replace with
fit-frame-to-buffer-margins.
(window--sanitize-margin): New function.
(fit-frame-to-buffer, fit-window-to-buffer): Rewrite completely
using window-text-pixel-size.
2013-11-30 09:25:31 +00:00
|
|
|
|
(global-set-key [bottom-divider down-mouse-1] 'mouse-drag-mode-line)
|
2015-07-02 07:03:45 +00:00
|
|
|
|
(global-set-key [bottom-divider mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [bottom-divider C-mouse-2] 'mouse-split-window-horizontally)
|
Provide additional support for child frames
Provide mouse dragging and resizing of frames. Allow resizing
frames proportionally. Provide additional functionality for
child frames. Minor bug fixes.
* lisp/frame.el (frame-border-width, frame-pixel-width)
(frame-pixel-height): Alias to `frame-internal-border-width',
`frame-native-width' and `frame-native-height'.
(frame-inner-width, frame-inner-height, frame-outer-width)
(frame-outer-height): New functions.
* lisp/minibuffer.el (completion-auto-help): Fix typo.
* lisp/mouse.el (mouse-drag-line, mouse-drag-mode-line)
(mouse-drag-header-line): Allow moving a frame by dragging the
mode line of its bottommost window (on a minibuffer-less frame)
or the header line of its topmost window.
(mouse-drag-vertical-line): Mention argument in doc-string.
(mouse-resize-frame, mouse-drag-frame, mouse-drag-left-edge)
(mouse-drag-top-left-corner, mouse-drag-top-edge)
(mouse-drag-top-right-corner, mouse-drag-right-edge)
(mouse-drag-bottom-right-corner, mouse-drag-bottom-edge)
(mouse-drag-bottom-left-corner): New functions for resizing a
frame by dragging its internal border together with
corresponding key bindings.
* lisp/tooltip.el (tooltip-frame-parameters): Add
'no-special-glyphs' to default parameters and update version
tag.
* lisp/window.el (frame-auto-hide-function): Add choice to make
frame invisible and update version tag.
(window--delete): Handle 'auto-hide-function' frame parameter.
(window--maybe-raise-frame): Respect 'no-focus-on-map' and
'no-accept-focus' frame parameters.
(display-buffer--action-function-custom-type): Add
`display-buffer-in-child-frame'.
(display-buffer): Mention `display-buffer-in-child-frame' in
doc-string.
(display-buffer-in-child-frame): New action function for
`display-buffer'.
(window--sanitize-margin): Return zero when MARGIN cannot be
sanitized.
(fit-frame-to-buffer): Major rewrite to handle child frames and
'fit-frame-to-buffer-sizes' and 'fit-frame-to-buffer-margins'
frame parameters.
(window-largest-empty-rectangle--maximums-1)
(window-largest-empty-rectangle--maximums)
(window-largest-empty-rectangle--disjoint-maximums)
(window-largest-empty-rectangle): New functions.
* src/dispextern.h (WINDOW_WANTS_MODELINE_P)
(WINDOW_WANTS_HEADER_LINE_P): Remove. Functionality is now
provided by corresponding functions window_wants_modeline and
window_wants_header_line in window.c. Adjust users.
* src/dispnew.c (adjust_glyph_matrix)
(buffer_posn_from_coords): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
* src/frame.c (keep_ratio): New function.
(adjust_frame_size): Call keep_ratio for each of F's child
frames.
(make_frame): Initialize no_special_glyphs slot.
(frame_internal_border_part): New function.
(Fframe_pixel_width, Fframe_pixel_height, Fborder_width): Rename
to Fframe_native_width, Fframe_native_height mand
Fframe_internal_border_width.
(frame_parm_table): Add Qno_special_glyphs entry.
(frame_float_type): New enumeration type.
(frame_float): New function to handle frame size and position
ratios.
(x_set_frame_parameters): Handle size and position ratios.
(x_set_no_special_glyphs): New function
(x_figure_window_size): Handle size and position ratios.
(syms_of_frame): Add Qdisplay_monitor_attributes_list,
Qno_special_glyphs, Qframe_edges, Qkeep_ratio, Qwidth_only,
Qheight_only, Qleft_only and Qtop_only.
* src/frame.h (internal_border_part): New enumeration type.
(struct frame): New slot no_special_glyphs.
(FRAME_NO_SPECIAL_GLYPHS): New macro.
* src/gtkutil.c (xg_frame_restack): Return immediately for
GTK versions before 2.18.0.
* src/keyboard.c (internal_border_parts): New array constant.
(make_lispy_position): For frames with border dragging enabled
return internal border part.
(syms_of_keyboard): New symbols Qdrag_internal_border,
Qleft_edge, Qtop_left_corner, Qtop_edge, Qtop_right_corner,
Qright_edge, Qbottom_right_corner, Qbottom_edge and
Qbottom_left_corner.
* src/minibuf.c (read_minibuf_unwind): When exiting the
minibuffer deal with frames that have the 'minibuffer-exit'
parameter set.
(syms_of_minibuf): New symbol Qminibuffer_exit.
* src/nsfns.m (frame_parm_handler): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/nsterm.h (struct ns_output): Add new cursor types for
dragging frame borders.
* src/w32fns.c (w32_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
Intitialize new cursor types for dragging frame borders.
* src/w32term.h (struct w32_output): Add new cursor types for
dragging frame borders.
* src/window.c (coordinates_in_window)
(Fwindow_line_height, window_internal_height): Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(Fwindow_lines_pixel_dimensions): New function.
(window_parameter): New function.
(Fwindow_parameter): Call window_parameter.
(window_wants_mode_line, window_wants_header_line): New
functions replacing the macros WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P from dispextern.h.
(syms_of_window): New symbols Qmode_line_format and
Qheader_line_format.
* src/window.h: Reorganize and re-comment macros. Use
window_wants_modeline and window_wants_header_line instead of
WINDOW_WANTS_MODELINE_P and WINDOW_WANTS_HEADER_LINE_P.
(MINI_NON_ONLY_WINDOW_P, MINI_ONLY_WINDOW_P): Minor rewrite.
(WINDOW_BUFFER): New macro.
(WINDOW_BOX_LEFT_EDGE_COL, WINDOW_BOX_RIGHT_EDGE_COL): Remove.
* src/xdisp.c (window_text_bottom_y, window_box_height)
(window_box, start_display)
(compute_window_start_on_continuation_line)
(try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id)
(display_line, expose_window): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P.
(pos_visible_p, display_mode_lines): Respect W's
'mode-line-format' and 'header-line-format' window parameters.
(init_iterator): Use window_wants_modeline and
window_wants_header_line instead of WINDOW_WANTS_MODELINE_P and
WINDOW_WANTS_HEADER_LINE_P. For tip frames respect
no_special_glyphs value.
(note_mouse_highlight): Set frame border cursors when on
internal border.
(x_draw_right_divider, x_draw_bottom_divider): Try to improve
drawing of window dividers.
* src/xfns.c (mouse_cursor): Add entries for border parts.
(mouse_cursor_types): Add entries for cursor types to drag
frame borders.
(INSTALL_CURSOR): Add entries for new cursor types to drag
frame borders.
(Fx_create_frame): Handle 'no-special-glyphs' parameter.
(x_frame_parm_handlers): Add entry for
x_set_no_special_glyphs.
(Vx_window_left_edge_shape, Vx_window_top_left_corner_shape)
(Vx_window_top_edge_shape, Vx_window_top_right_corner_shape)
(Vx_window_right_edge_shape)
(Vx_window_bottom_right_corner_shape)
(Vx_window_bottom_edge_shape)
(Vx_window_bottom_left_corner_shape): New variables.
(x_frame_restack): Call xg_frame_restack only for GTK versions
starting with 2.18.0.
* src/xterm.c (x_free_frame_resources): Remove new cursors for
dragging frame borders.
* src/xterm.h (struct x_output): Add new cursor types for
dragging frame borders.
* doc/lispref/display.texi (Size of Displayed Text): Document
`window-lines-pixel-dimensions'.
* doc/lispref/elisp.texi (Top): Add entry for "Mouse Dragging
Parameters".
* doc/lispref/frames.texi (Frame Size): Replace
frame-pixel-width/-height by frame-native-width/-height. Add
frame-inner-width/-height and frame-outer-width/-height docs.
(Position Parameters): Describe specifying position as ratios.
Clarify remark about positions relative to bottom/ridge display
edge.
(Size Parameters): Describe specifying sizes as ratios.
Describe 'fit-frame-to-buffer-margins' and
'fit-frame-to-buffer-sizes' parameters.
(Layout Parameters): Describe 'no-special-glyphs' parameter.
(Frame Interaction Parameters): Describe 'auto-hide-function',
'minibuffer-exit' and 'keep-ratio' parameters.
(Mouse Dragging Parameters): New section describing
'drag-internal-border', 'drag-with-header-line',
'drag-with-mode-line', 'snap-width', 'top-visible' and
'bottom-visible' parameters.
(Management Parameters): Mention that `override-redirect' has
no effect on MS Windows.
(Font and Color Parameters): Mention child frames for `alpha'
parameter.
(Child Frames): Rewrite section with description and cross
references to new frame parameters added.
* doc/lispref/modes.texi (Mode Line Basics): Mention
'mode-line-format' and 'header-line-format' window parameters.
* doc/lispref/windows.texi (Resizing Windows): Mention effect
of `fit-frame-to-buffer-margins' for child frames.
(Display Action Functions): New action function
`display-buffer-in-child-frame'.
(Quitting Windows): Mention `make-frame-invisible' as optional
value of `frame-auto-hide-function' and `auto-hide-function'
frame paameter.
(Coordinates and Windows): Describe new function
`window-largest-empty-rectangle'.
(Window Parameters): Describe new parameters 'mode-line-format'
and 'header-line-format'. Index all window parameters described
in this section.
2017-06-25 09:33:25 +00:00
|
|
|
|
(global-set-key [left-edge down-mouse-1] 'mouse-drag-left-edge)
|
|
|
|
|
|
(global-set-key [left-edge mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [top-left-corner down-mouse-1] 'mouse-drag-top-left-corner)
|
|
|
|
|
|
(global-set-key [top-left-corner mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [top-edge down-mouse-1] 'mouse-drag-top-edge)
|
|
|
|
|
|
(global-set-key [top-edge mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [top-right-corner down-mouse-1] 'mouse-drag-top-right-corner)
|
|
|
|
|
|
(global-set-key [top-right-corner mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [right-edge down-mouse-1] 'mouse-drag-right-edge)
|
|
|
|
|
|
(global-set-key [right-edge mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [bottom-right-corner down-mouse-1] 'mouse-drag-bottom-right-corner)
|
|
|
|
|
|
(global-set-key [bottom-right-corner mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [bottom-edge down-mouse-1] 'mouse-drag-bottom-edge)
|
|
|
|
|
|
(global-set-key [bottom-edge mouse-1] 'ignore)
|
|
|
|
|
|
(global-set-key [bottom-left-corner down-mouse-1] 'mouse-drag-bottom-left-corner)
|
|
|
|
|
|
(global-set-key [bottom-left-corner mouse-1] 'ignore)
|
1992-03-16 20:39:07 +00:00
|
|
|
|
|
|
|
|
|
|
(provide 'mouse)
|
|
|
|
|
|
|
1992-05-30 22:12:04 +00:00
|
|
|
|
;;; mouse.el ends here
|