2001-07-15 16:15:35 +00:00
|
|
|
|
;;; frame.el --- multi-frame management independent of window systems
|
1992-05-30 21:11:25 +00:00
|
|
|
|
|
2011-01-25 04:08:28 +00:00
|
|
|
|
;; Copyright (C) 1993-1994, 1996-1997, 2000-2011
|
2011-01-16 02:21:30 +00:00
|
|
|
|
;; Free Software Foundation, Inc.
|
1992-07-22 04:22:42 +00:00
|
|
|
|
|
1992-07-16 07:28:05 +00:00
|
|
|
|
;; Maintainer: FSF
|
1992-07-17 08:15:29 +00:00
|
|
|
|
;; Keywords: internal
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: emacs
|
1992-07-16 07:28:05 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1996-01-14 07:34:30 +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.
|
1996-01-14 07:34:30 +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.
|
|
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
2001-07-15 16:15:35 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
1992-07-16 07:28:05 +00:00
|
|
|
|
;;; Code:
|
2010-05-05 02:08:25 +00:00
|
|
|
|
(eval-when-compile (require 'cl))
|
1992-07-16 07:28:05 +00:00
|
|
|
|
|
2004-01-11 21:59:40 +00:00
|
|
|
|
(defvar frame-creation-function-alist
|
|
|
|
|
|
(list (cons nil
|
|
|
|
|
|
(if (fboundp 'tty-create-frame-with-faces)
|
|
|
|
|
|
'tty-create-frame-with-faces
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(lambda (_parameters)
|
2007-09-20 21:57:23 +00:00
|
|
|
|
(error "Can't create multiple frames without a window system")))))
|
2004-01-11 21:59:40 +00:00
|
|
|
|
"Alist of window-system dependent functions to call to create a new frame.
|
|
|
|
|
|
The window system startup file should add its frame creation
|
|
|
|
|
|
function to this list, which should take an alist of parameters
|
|
|
|
|
|
as its argument.")
|
2004-01-10 12:56:22 +00:00
|
|
|
|
|
2004-04-19 15:39:17 +00:00
|
|
|
|
(defvar window-system-default-frame-alist nil
|
|
|
|
|
|
"Alist of window-system dependent default frame parameters.
|
2009-01-02 14:47:45 +00:00
|
|
|
|
Parameters specified here supersede the values given in
|
|
|
|
|
|
`default-frame-alist'.")
|
2004-04-19 15:39:17 +00:00
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
;; The initial value given here used to ask for a minibuffer.
|
|
|
|
|
|
;; But that's not necessary, because the default is to have one.
|
|
|
|
|
|
;; By not specifying it here, we let an X resource specify it.
|
2010-06-25 19:32:37 +00:00
|
|
|
|
(defcustom initial-frame-alist nil
|
2009-01-02 14:47:45 +00:00
|
|
|
|
"Alist of parameters for the initial X window frame.
|
|
|
|
|
|
You can set this in your init file; for example,
|
|
|
|
|
|
|
|
|
|
|
|
(setq initial-frame-alist
|
|
|
|
|
|
'((top . 1) (left . 1) (width . 80) (height . 55)))
|
|
|
|
|
|
|
|
|
|
|
|
Parameters specified here supersede the values given in
|
|
|
|
|
|
`default-frame-alist'.
|
|
|
|
|
|
|
|
|
|
|
|
If the value calls for a frame without a minibuffer, and you have
|
|
|
|
|
|
not created a minibuffer frame on your own, a minibuffer frame is
|
|
|
|
|
|
created according to `minibuffer-frame-alist'.
|
|
|
|
|
|
|
|
|
|
|
|
You can specify geometry-related options for just the initial
|
|
|
|
|
|
frame by setting this variable in your init file; however, they
|
|
|
|
|
|
won't take effect until Emacs reads your init file, which happens
|
|
|
|
|
|
after creating the initial frame. If you want the initial frame
|
|
|
|
|
|
to have the proper geometry as soon as it appears, you need to
|
|
|
|
|
|
use this three-step process:
|
1994-07-03 20:18:38 +00:00
|
|
|
|
* Specify X resources to give the geometry you want.
|
|
|
|
|
|
* Set `default-frame-alist' to override these options so that they
|
|
|
|
|
|
don't affect subsequent frames.
|
|
|
|
|
|
* Set `initial-frame-alist' in a way that matches the X resources,
|
1998-11-22 15:35:02 +00:00
|
|
|
|
to override what you put in `default-frame-alist'."
|
|
|
|
|
|
:type '(repeat (cons :format "%v"
|
|
|
|
|
|
(symbol :tag "Parameter")
|
|
|
|
|
|
(sexp :tag "Value")))
|
|
|
|
|
|
:group 'frames)
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1999-07-06 18:27:40 +00:00
|
|
|
|
(defcustom minibuffer-frame-alist '((width . 80) (height . 2))
|
2009-05-14 03:50:53 +00:00
|
|
|
|
"Alist of parameters for the initial minibuffer frame.
|
|
|
|
|
|
This is the minibuffer frame created if `initial-frame-alist'
|
|
|
|
|
|
calls for a frame without a minibuffer. The parameters specified
|
|
|
|
|
|
here supersede those given in `default-frame-alist', for the
|
|
|
|
|
|
initial minibuffer frame.
|
|
|
|
|
|
|
2009-01-02 14:47:45 +00:00
|
|
|
|
You can set this in your init file; for example,
|
|
|
|
|
|
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(setq minibuffer-frame-alist
|
2009-01-02 14:47:45 +00:00
|
|
|
|
'((top . 1) (left . 1) (width . 80) (height . 2)))
|
|
|
|
|
|
|
2009-05-14 03:50:53 +00:00
|
|
|
|
It is not necessary to include (minibuffer . only); that is
|
|
|
|
|
|
appended when the minibuffer frame is created."
|
1999-07-06 18:27:40 +00:00
|
|
|
|
:type '(repeat (cons :format "%v"
|
|
|
|
|
|
(symbol :tag "Parameter")
|
|
|
|
|
|
(sexp :tag "Value")))
|
|
|
|
|
|
:group 'frames)
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1994-09-29 04:48:59 +00:00
|
|
|
|
(defun handle-delete-frame (event)
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Handle delete-frame events from the X server."
|
1994-09-29 04:48:59 +00:00
|
|
|
|
(interactive "e")
|
|
|
|
|
|
(let ((frame (posn-window (event-start event)))
|
|
|
|
|
|
(i 0)
|
|
|
|
|
|
(tail (frame-list)))
|
|
|
|
|
|
(while tail
|
|
|
|
|
|
(and (frame-visible-p (car tail))
|
|
|
|
|
|
(not (eq (car tail) frame))
|
|
|
|
|
|
(setq i (1+ i)))
|
|
|
|
|
|
(setq tail (cdr tail)))
|
|
|
|
|
|
(if (> i 0)
|
|
|
|
|
|
(delete-frame frame t)
|
1996-02-28 00:08:58 +00:00
|
|
|
|
;; Gildea@x.org says it is ok to ask questions before terminating.
|
|
|
|
|
|
(save-buffers-kill-emacs))))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1992-07-15 00:32:19 +00:00
|
|
|
|
;;;; Arrangement of frames at startup
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
;; 1) Load the window system startup file from the lisp library and read the
|
|
|
|
|
|
;; high-priority arguments (-q and the like). The window system startup
|
|
|
|
|
|
;; file should create any frames specified in the window system defaults.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; 2) If no frames have been opened, we open an initial text frame.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; 3) Once the init file is done, we apply any newly set parameters
|
|
|
|
|
|
;; in initial-frame-alist to the frame.
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1995-01-26 22:52:10 +00:00
|
|
|
|
;; These are now called explicitly at the proper times,
|
1993-05-13 03:23:40 +00:00
|
|
|
|
;; since that is easier to understand.
|
|
|
|
|
|
;; Actually using hooks within Emacs is bad for future maintenance. --rms.
|
|
|
|
|
|
;; (add-hook 'before-init-hook 'frame-initialize)
|
|
|
|
|
|
;; (add-hook 'window-setup-hook 'frame-notice-user-settings)
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
;; If we create the initial frame, this is it.
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(defvar frame-initial-frame nil)
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1993-07-27 08:34:34 +00:00
|
|
|
|
;; Record the parameters used in frame-initialize to make the initial frame.
|
|
|
|
|
|
(defvar frame-initial-frame-alist)
|
|
|
|
|
|
|
1994-05-05 22:37:47 +00:00
|
|
|
|
(defvar frame-initial-geometry-arguments nil)
|
|
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
;; startup.el calls this function before loading the user's init
|
|
|
|
|
|
;; file - if there is no frame with a minibuffer open now, create
|
|
|
|
|
|
;; one to display messages while loading the init file.
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(defun frame-initialize ()
|
2001-01-29 17:01:52 +00:00
|
|
|
|
"Create an initial frame if necessary."
|
1991-08-15 21:29:06 +00:00
|
|
|
|
;; Are we actually running under a window system at all?
|
2004-01-11 21:59:40 +00:00
|
|
|
|
(if (and initial-window-system
|
|
|
|
|
|
(not noninteractive)
|
|
|
|
|
|
(not (eq initial-window-system 'pc)))
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
(progn
|
|
|
|
|
|
;; If there is no frame with a minibuffer besides the terminal
|
|
|
|
|
|
;; frame, then we need to create the opening frame. Make sure
|
|
|
|
|
|
;; it has a minibuffer, but let initial-frame-alist omit the
|
|
|
|
|
|
;; minibuffer spec.
|
|
|
|
|
|
(or (delq terminal-frame (minibuffer-frame-list))
|
1993-05-25 02:28:39 +00:00
|
|
|
|
(progn
|
1993-07-27 08:34:34 +00:00
|
|
|
|
(setq frame-initial-frame-alist
|
2001-01-30 15:06:47 +00:00
|
|
|
|
(append initial-frame-alist default-frame-alist nil))
|
1994-05-23 09:19:28 +00:00
|
|
|
|
(or (assq 'horizontal-scroll-bars frame-initial-frame-alist)
|
|
|
|
|
|
(setq frame-initial-frame-alist
|
|
|
|
|
|
(cons '(horizontal-scroll-bars . t)
|
|
|
|
|
|
frame-initial-frame-alist)))
|
2004-01-11 21:59:40 +00:00
|
|
|
|
(setq frame-initial-frame-alist
|
|
|
|
|
|
(cons (cons 'window-system initial-window-system)
|
|
|
|
|
|
frame-initial-frame-alist))
|
1993-05-25 02:28:39 +00:00
|
|
|
|
(setq default-minibuffer-frame
|
|
|
|
|
|
(setq frame-initial-frame
|
1997-07-21 05:59:08 +00:00
|
|
|
|
(make-frame frame-initial-frame-alist)))
|
1993-06-02 19:10:31 +00:00
|
|
|
|
;; Delete any specifications for window geometry parameters
|
|
|
|
|
|
;; so that we won't reapply them in frame-notice-user-settings.
|
|
|
|
|
|
;; It would be wrong to reapply them then,
|
|
|
|
|
|
;; because that would override explicit user resizing.
|
1993-07-04 02:20:59 +00:00
|
|
|
|
(setq initial-frame-alist
|
1994-05-04 04:27:18 +00:00
|
|
|
|
(frame-remove-geometry-params initial-frame-alist))))
|
2006-05-26 17:37:25 +00:00
|
|
|
|
;; Copy the environment of the Emacs process into the new frame.
|
|
|
|
|
|
(set-frame-parameter frame-initial-frame 'environment
|
|
|
|
|
|
(frame-parameter terminal-frame 'environment))
|
1995-01-26 22:52:10 +00:00
|
|
|
|
;; At this point, we know that we have a frame open, so we
|
1992-07-15 00:32:19 +00:00
|
|
|
|
;; can delete the terminal frame.
|
|
|
|
|
|
(delete-frame terminal-frame)
|
2004-01-11 21:59:40 +00:00
|
|
|
|
(setq terminal-frame nil))))
|
1995-01-26 22:52:10 +00:00
|
|
|
|
|
2000-01-13 14:46:19 +00:00
|
|
|
|
(defvar frame-notice-user-settings t
|
|
|
|
|
|
"Non-nil means function `frame-notice-user-settings' wasn't run yet.")
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function tool-bar-mode "tool-bar" (&optional arg))
|
|
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
;; startup.el calls this function after loading the user's init
|
|
|
|
|
|
;; file. Now default-frame-alist and initial-frame-alist contain
|
|
|
|
|
|
;; information to which we must react; do what needs to be done.
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(defun frame-notice-user-settings ()
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Act on user's init file settings of frame parameters.
|
2005-09-07 23:11:21 +00:00
|
|
|
|
React to settings of `initial-frame-alist',
|
|
|
|
|
|
`window-system-default-frame-alist' and `default-frame-alist'
|
|
|
|
|
|
there (in decreasing order of priority)."
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
;; Creating and deleting frames may shift the selected frame around,
|
|
|
|
|
|
;; and thus the current buffer. Protect against that. We don't
|
|
|
|
|
|
;; want to use save-excursion here, because that may also try to set
|
|
|
|
|
|
;; the buffer of the selected window, which fails when the selected
|
|
|
|
|
|
;; window is the minibuffer.
|
2005-09-07 23:11:21 +00:00
|
|
|
|
(let ((old-buffer (current-buffer))
|
2007-11-21 20:37:22 +00:00
|
|
|
|
(window-system-frame-alist
|
|
|
|
|
|
(cdr (assq initial-window-system
|
|
|
|
|
|
window-system-default-frame-alist))))
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
|
2000-01-13 14:46:19 +00:00
|
|
|
|
(when (and frame-notice-user-settings
|
|
|
|
|
|
(null frame-initial-frame))
|
2000-10-28 17:18:21 +00:00
|
|
|
|
;; This case happens when we don't have a window system, and
|
|
|
|
|
|
;; also for MS-DOS frames.
|
2010-11-13 18:34:02 +00:00
|
|
|
|
(let ((parms (frame-parameters)))
|
2000-01-13 14:46:19 +00:00
|
|
|
|
;; Don't change the frame names.
|
|
|
|
|
|
(setq parms (delq (assq 'name parms) parms))
|
|
|
|
|
|
;; Can't modify the minibuffer parameter, so don't try.
|
|
|
|
|
|
(setq parms (delq (assq 'minibuffer parms) parms))
|
2010-11-13 18:34:02 +00:00
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
|
nil
|
|
|
|
|
|
(if initial-window-system
|
|
|
|
|
|
parms
|
|
|
|
|
|
;; initial-frame-alist and default-frame-alist were already
|
|
|
|
|
|
;; applied in pc-win.el.
|
|
|
|
|
|
(append initial-frame-alist window-system-frame-alist
|
|
|
|
|
|
default-frame-alist parms nil)))
|
2004-01-11 21:59:40 +00:00
|
|
|
|
(if (null initial-window-system) ;; MS-DOS does this differently in pc-win.el
|
2000-10-28 17:18:21 +00:00
|
|
|
|
(let ((newparms (frame-parameters))
|
|
|
|
|
|
(frame (selected-frame)))
|
|
|
|
|
|
(tty-handle-reverse-video frame newparms)
|
|
|
|
|
|
;; If we changed the background color, we need to update
|
|
|
|
|
|
;; the background-mode parameter, and maybe some faces,
|
|
|
|
|
|
;; too.
|
|
|
|
|
|
(when (assq 'background-color newparms)
|
|
|
|
|
|
(unless (or (assq 'background-mode initial-frame-alist)
|
|
|
|
|
|
(assq 'background-mode default-frame-alist))
|
|
|
|
|
|
(frame-set-background-mode frame))
|
|
|
|
|
|
(face-set-after-frame-default frame))))))
|
2000-01-13 14:46:19 +00:00
|
|
|
|
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
;; If the initial frame is still around, apply initial-frame-alist
|
|
|
|
|
|
;; and default-frame-alist to it.
|
2001-01-30 15:06:47 +00:00
|
|
|
|
(when (frame-live-p frame-initial-frame)
|
|
|
|
|
|
|
|
|
|
|
|
;; When tool-bar has been switched off, correct the frame size
|
|
|
|
|
|
;; by the lines added in x-create-frame for the tool-bar and
|
|
|
|
|
|
;; switch `tool-bar-mode' off.
|
2001-02-02 13:55:42 +00:00
|
|
|
|
(when (display-graphic-p)
|
|
|
|
|
|
(let ((tool-bar-lines (or (assq 'tool-bar-lines initial-frame-alist)
|
2005-09-07 23:11:21 +00:00
|
|
|
|
(assq 'tool-bar-lines window-system-frame-alist)
|
2001-02-02 13:55:42 +00:00
|
|
|
|
(assq 'tool-bar-lines default-frame-alist))))
|
2001-02-23 10:23:08 +00:00
|
|
|
|
(when (and tool-bar-originally-present
|
|
|
|
|
|
(or (null tool-bar-lines)
|
|
|
|
|
|
(null (cdr tool-bar-lines))
|
|
|
|
|
|
(eq 0 (cdr tool-bar-lines))))
|
2001-02-02 13:55:42 +00:00
|
|
|
|
(let* ((char-height (frame-char-height frame-initial-frame))
|
2001-02-23 10:23:08 +00:00
|
|
|
|
(image-height tool-bar-images-pixel-height)
|
2001-02-02 13:55:42 +00:00
|
|
|
|
(margin (cond ((and (consp tool-bar-button-margin)
|
|
|
|
|
|
(integerp (cdr tool-bar-button-margin))
|
|
|
|
|
|
(> tool-bar-button-margin 0))
|
|
|
|
|
|
(cdr tool-bar-button-margin))
|
|
|
|
|
|
((and (integerp tool-bar-button-margin)
|
|
|
|
|
|
(> tool-bar-button-margin 0))
|
|
|
|
|
|
tool-bar-button-margin)
|
|
|
|
|
|
(t 0)))
|
|
|
|
|
|
(relief (if (and (integerp tool-bar-button-relief)
|
|
|
|
|
|
(> tool-bar-button-relief 0))
|
|
|
|
|
|
tool-bar-button-relief 3))
|
2001-11-26 18:20:20 +00:00
|
|
|
|
(lines (/ (+ image-height
|
2001-02-02 13:55:42 +00:00
|
|
|
|
(* 2 margin)
|
|
|
|
|
|
(* 2 relief)
|
|
|
|
|
|
(1- char-height))
|
|
|
|
|
|
char-height))
|
|
|
|
|
|
(height (frame-parameter frame-initial-frame 'height))
|
|
|
|
|
|
(newparms (list (cons 'height (- height lines))))
|
2001-11-26 18:20:20 +00:00
|
|
|
|
(initial-top (cdr (assq 'top
|
2001-02-02 13:55:42 +00:00
|
|
|
|
frame-initial-geometry-arguments)))
|
|
|
|
|
|
(top (frame-parameter frame-initial-frame 'top)))
|
|
|
|
|
|
(when (and (consp initial-top) (eq '- (car initial-top)))
|
2003-12-29 19:17:24 +00:00
|
|
|
|
(let ((adjusted-top
|
|
|
|
|
|
(cond ((and (consp top)
|
|
|
|
|
|
(eq '+ (car top)))
|
|
|
|
|
|
(list '+
|
|
|
|
|
|
(+ (cadr top)
|
|
|
|
|
|
(* lines char-height))))
|
|
|
|
|
|
((and (consp top)
|
|
|
|
|
|
(eq '- (car top)))
|
|
|
|
|
|
(list '-
|
|
|
|
|
|
(- (cadr top)
|
|
|
|
|
|
(* lines char-height))))
|
|
|
|
|
|
(t (+ top (* lines char-height))))))
|
|
|
|
|
|
(setq newparms
|
|
|
|
|
|
(append newparms
|
|
|
|
|
|
`((top . ,adjusted-top))
|
|
|
|
|
|
nil))))
|
2001-02-02 13:55:42 +00:00
|
|
|
|
(modify-frame-parameters frame-initial-frame newparms)
|
|
|
|
|
|
(tool-bar-mode -1)))))
|
2001-01-30 15:06:47 +00:00
|
|
|
|
|
|
|
|
|
|
;; The initial frame we create above always has a minibuffer.
|
|
|
|
|
|
;; If the user wants to remove it, or make it a minibuffer-only
|
|
|
|
|
|
;; frame, then we'll have to delete the current frame and make a
|
|
|
|
|
|
;; new one; you can't remove or add a root window to/from an
|
|
|
|
|
|
;; existing frame.
|
|
|
|
|
|
;;
|
|
|
|
|
|
;; NOTE: default-frame-alist was nil when we created the
|
|
|
|
|
|
;; existing frame. We need to explicitly include
|
|
|
|
|
|
;; default-frame-alist in the parameters of the screen we
|
|
|
|
|
|
;; create here, so that its new value, gleaned from the user's
|
|
|
|
|
|
;; .emacs file, will be applied to the existing screen.
|
2001-01-30 15:18:13 +00:00
|
|
|
|
(if (not (eq (cdr (or (assq 'minibuffer initial-frame-alist)
|
2005-09-07 23:11:21 +00:00
|
|
|
|
(assq 'minibuffer window-system-frame-alist)
|
2001-01-30 15:18:13 +00:00
|
|
|
|
(assq 'minibuffer default-frame-alist)
|
|
|
|
|
|
'(minibuffer . t)))
|
|
|
|
|
|
t))
|
|
|
|
|
|
;; Create the new frame.
|
|
|
|
|
|
(let (parms new)
|
|
|
|
|
|
;; If the frame isn't visible yet, wait till it is.
|
|
|
|
|
|
;; If the user has to position the window,
|
|
|
|
|
|
;; Emacs doesn't know its real position until
|
|
|
|
|
|
;; the frame is seen to be visible.
|
|
|
|
|
|
(while (not (cdr (assq 'visibility
|
|
|
|
|
|
(frame-parameters frame-initial-frame))))
|
|
|
|
|
|
(sleep-for 1))
|
|
|
|
|
|
(setq parms (frame-parameters frame-initial-frame))
|
2001-01-30 15:06:47 +00:00
|
|
|
|
|
2001-11-26 18:20:20 +00:00
|
|
|
|
;; Get rid of `name' unless it was specified explicitly before.
|
2001-01-30 15:18:13 +00:00
|
|
|
|
(or (assq 'name frame-initial-frame-alist)
|
|
|
|
|
|
(setq parms (delq (assq 'name parms) parms)))
|
2008-02-14 21:16:36 +00:00
|
|
|
|
;; An explicit parent-id is a request to XEmbed the frame.
|
|
|
|
|
|
(or (assq 'parent-id frame-initial-frame-alist)
|
|
|
|
|
|
(setq parms (delq (assq 'parent-id parms) parms)))
|
2001-01-30 15:18:13 +00:00
|
|
|
|
|
|
|
|
|
|
(setq parms (append initial-frame-alist
|
2005-09-07 23:11:21 +00:00
|
|
|
|
window-system-frame-alist
|
2001-01-30 15:18:13 +00:00
|
|
|
|
default-frame-alist
|
|
|
|
|
|
parms
|
|
|
|
|
|
nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; Get rid of `reverse', because that was handled
|
|
|
|
|
|
;; when we first made the frame.
|
|
|
|
|
|
(setq parms (cons '(reverse) (delq (assq 'reverse parms) parms)))
|
|
|
|
|
|
|
|
|
|
|
|
(if (assq 'height frame-initial-geometry-arguments)
|
|
|
|
|
|
(setq parms (assq-delete-all 'height parms)))
|
|
|
|
|
|
(if (assq 'width frame-initial-geometry-arguments)
|
|
|
|
|
|
(setq parms (assq-delete-all 'width parms)))
|
|
|
|
|
|
(if (assq 'left frame-initial-geometry-arguments)
|
|
|
|
|
|
(setq parms (assq-delete-all 'left parms)))
|
|
|
|
|
|
(if (assq 'top frame-initial-geometry-arguments)
|
|
|
|
|
|
(setq parms (assq-delete-all 'top parms)))
|
|
|
|
|
|
(setq new
|
|
|
|
|
|
(make-frame
|
|
|
|
|
|
;; Use the geometry args that created the existing
|
|
|
|
|
|
;; frame, rather than the parms we get for it.
|
|
|
|
|
|
(append frame-initial-geometry-arguments
|
|
|
|
|
|
'((user-size . t) (user-position . t))
|
|
|
|
|
|
parms)))
|
|
|
|
|
|
;; The initial frame, which we are about to delete, may be
|
|
|
|
|
|
;; the only frame with a minibuffer. If it is, create a
|
|
|
|
|
|
;; new one.
|
|
|
|
|
|
(or (delq frame-initial-frame (minibuffer-frame-list))
|
|
|
|
|
|
(make-initial-minibuffer-frame nil))
|
|
|
|
|
|
|
|
|
|
|
|
;; If the initial frame is serving as a surrogate
|
|
|
|
|
|
;; minibuffer frame for any frames, we need to wean them
|
|
|
|
|
|
;; onto a new frame. The default-minibuffer-frame
|
|
|
|
|
|
;; variable must be handled similarly.
|
|
|
|
|
|
(let ((users-of-initial
|
|
|
|
|
|
(filtered-frame-list
|
2007-07-25 19:37:21 +00:00
|
|
|
|
(lambda (frame)
|
|
|
|
|
|
(and (not (eq frame frame-initial-frame))
|
|
|
|
|
|
(eq (window-frame
|
|
|
|
|
|
(minibuffer-window frame))
|
|
|
|
|
|
frame-initial-frame))))))
|
|
|
|
|
|
(if (or users-of-initial
|
2001-01-30 15:18:13 +00:00
|
|
|
|
(eq default-minibuffer-frame frame-initial-frame))
|
|
|
|
|
|
|
|
|
|
|
|
;; Choose an appropriate frame. Prefer frames which
|
|
|
|
|
|
;; are only minibuffers.
|
|
|
|
|
|
(let* ((new-surrogate
|
|
|
|
|
|
(car
|
|
|
|
|
|
(or (filtered-frame-list
|
2007-07-25 19:37:21 +00:00
|
|
|
|
(lambda (frame)
|
|
|
|
|
|
(eq (cdr (assq 'minibuffer
|
|
|
|
|
|
(frame-parameters frame)))
|
|
|
|
|
|
'only)))
|
2001-01-30 15:18:13 +00:00
|
|
|
|
(minibuffer-frame-list))))
|
|
|
|
|
|
(new-minibuffer (minibuffer-window new-surrogate)))
|
|
|
|
|
|
|
|
|
|
|
|
(if (eq default-minibuffer-frame frame-initial-frame)
|
|
|
|
|
|
(setq default-minibuffer-frame new-surrogate))
|
|
|
|
|
|
|
|
|
|
|
|
;; Wean the frames using frame-initial-frame as
|
|
|
|
|
|
;; their minibuffer frame.
|
2007-07-25 19:37:21 +00:00
|
|
|
|
(dolist (frame users-of-initial)
|
|
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
|
frame (list (cons 'minibuffer new-minibuffer)))))))
|
|
|
|
|
|
|
|
|
|
|
|
;; Redirect events enqueued at this frame to the new frame.
|
2001-01-30 15:18:13 +00:00
|
|
|
|
;; Is this a good idea?
|
|
|
|
|
|
(redirect-frame-focus frame-initial-frame new)
|
|
|
|
|
|
|
|
|
|
|
|
;; Finally, get rid of the old frame.
|
|
|
|
|
|
(delete-frame frame-initial-frame t))
|
2001-01-30 15:06:47 +00:00
|
|
|
|
|
|
|
|
|
|
;; Otherwise, we don't need all that rigamarole; just apply
|
|
|
|
|
|
;; the new parameters.
|
|
|
|
|
|
(let (newparms allparms tail)
|
|
|
|
|
|
(setq allparms (append initial-frame-alist
|
2005-09-07 23:11:21 +00:00
|
|
|
|
window-system-frame-alist
|
2001-01-30 15:06:47 +00:00
|
|
|
|
default-frame-alist nil))
|
|
|
|
|
|
(if (assq 'height frame-initial-geometry-arguments)
|
|
|
|
|
|
(setq allparms (assq-delete-all 'height allparms)))
|
|
|
|
|
|
(if (assq 'width frame-initial-geometry-arguments)
|
|
|
|
|
|
(setq allparms (assq-delete-all 'width allparms)))
|
|
|
|
|
|
(if (assq 'left frame-initial-geometry-arguments)
|
|
|
|
|
|
(setq allparms (assq-delete-all 'left allparms)))
|
|
|
|
|
|
(if (assq 'top frame-initial-geometry-arguments)
|
|
|
|
|
|
(setq allparms (assq-delete-all 'top allparms)))
|
|
|
|
|
|
(setq tail allparms)
|
|
|
|
|
|
;; Find just the parms that have changed since we first
|
|
|
|
|
|
;; made this frame. Those are the ones actually set by
|
2001-11-26 18:20:20 +00:00
|
|
|
|
;; the init file. For those parms whose values we already knew
|
2001-01-30 15:06:47 +00:00
|
|
|
|
;; (such as those spec'd by command line options)
|
|
|
|
|
|
;; it is undesirable to specify the parm again
|
2001-11-26 18:20:20 +00:00
|
|
|
|
;; once the user has seen the frame and been able to alter it
|
2001-01-30 15:06:47 +00:00
|
|
|
|
;; manually.
|
2010-11-13 18:34:02 +00:00
|
|
|
|
(let (newval oldval)
|
|
|
|
|
|
(dolist (entry tail)
|
|
|
|
|
|
(setq oldval (assq (car entry) frame-initial-frame-alist))
|
|
|
|
|
|
(setq newval (cdr (assq (car entry) allparms)))
|
2001-01-30 15:06:47 +00:00
|
|
|
|
(or (and oldval (eq (cdr oldval) newval))
|
|
|
|
|
|
(setq newparms
|
2010-11-13 18:34:02 +00:00
|
|
|
|
(cons (cons (car entry) newval) newparms)))))
|
2001-01-30 15:06:47 +00:00
|
|
|
|
(setq newparms (nreverse newparms))
|
2010-11-13 18:34:02 +00:00
|
|
|
|
|
|
|
|
|
|
(let ((new-bg (assq 'background-color newparms)))
|
|
|
|
|
|
;; If the `background-color' parameter is changed, apply
|
|
|
|
|
|
;; it first, then make sure that the `background-mode'
|
|
|
|
|
|
;; parameter and other faces are updated, before applying
|
|
|
|
|
|
;; the other parameters.
|
|
|
|
|
|
(when new-bg
|
|
|
|
|
|
(modify-frame-parameters frame-initial-frame
|
|
|
|
|
|
(list new-bg))
|
|
|
|
|
|
(unless (assq 'background-mode newparms)
|
|
|
|
|
|
(frame-set-background-mode frame-initial-frame))
|
|
|
|
|
|
(face-set-after-frame-default frame-initial-frame)
|
|
|
|
|
|
(setq newparms (delq new-bg newparms)))
|
|
|
|
|
|
(modify-frame-parameters frame-initial-frame newparms)))))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
;; Restore the original buffer.
|
|
|
|
|
|
(set-buffer old-buffer)
|
|
|
|
|
|
|
|
|
|
|
|
;; Make sure the initial frame can be GC'd if it is ever deleted.
|
1993-05-18 22:40:43 +00:00
|
|
|
|
;; Make sure frame-notice-user-settings does nothing if called twice.
|
2000-01-13 14:46:19 +00:00
|
|
|
|
(setq frame-notice-user-settings nil)
|
1993-05-18 22:40:43 +00:00
|
|
|
|
(setq frame-initial-frame nil)))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1995-05-30 06:54:44 +00:00
|
|
|
|
(defun make-initial-minibuffer-frame (display)
|
|
|
|
|
|
(let ((parms (append minibuffer-frame-alist '((minibuffer . only)))))
|
|
|
|
|
|
(if display
|
|
|
|
|
|
(make-frame-on-display display parms)
|
|
|
|
|
|
(make-frame parms))))
|
|
|
|
|
|
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
;;;; Creation of additional frames, and other frame miscellanea
|
1992-07-15 00:32:19 +00:00
|
|
|
|
|
2003-07-13 17:48:58 +00:00
|
|
|
|
(defun modify-all-frames-parameters (alist)
|
2004-07-23 12:20:22 +00:00
|
|
|
|
"Modify all current and future frames' parameters according to ALIST.
|
2003-07-13 17:48:58 +00:00
|
|
|
|
This changes `default-frame-alist' and possibly `initial-frame-alist'.
|
2006-03-26 13:57:43 +00:00
|
|
|
|
Furthermore, this function removes all parameters in ALIST from
|
|
|
|
|
|
`window-system-default-frame-alist'.
|
2003-07-13 17:48:58 +00:00
|
|
|
|
See help of `modify-frame-parameters' for more information."
|
2006-03-26 13:57:43 +00:00
|
|
|
|
(dolist (frame (frame-list))
|
|
|
|
|
|
(modify-frame-parameters frame alist))
|
|
|
|
|
|
|
|
|
|
|
|
(dolist (pair alist) ;; conses to add/replace
|
|
|
|
|
|
;; initial-frame-alist needs setting only when
|
|
|
|
|
|
;; frame-notice-user-settings is true.
|
|
|
|
|
|
(and frame-notice-user-settings
|
|
|
|
|
|
(setq initial-frame-alist
|
|
|
|
|
|
(assq-delete-all (car pair) initial-frame-alist)))
|
|
|
|
|
|
(setq default-frame-alist
|
|
|
|
|
|
(assq-delete-all (car pair) default-frame-alist))
|
|
|
|
|
|
;; Remove any similar settings from the window-system specific
|
|
|
|
|
|
;; parameters---they would override default-frame-alist.
|
|
|
|
|
|
(dolist (w window-system-default-frame-alist)
|
|
|
|
|
|
(setcdr w (assq-delete-all (car pair) (cdr w)))))
|
|
|
|
|
|
|
2003-07-13 17:48:58 +00:00
|
|
|
|
(and frame-notice-user-settings
|
|
|
|
|
|
(setq initial-frame-alist (append initial-frame-alist alist)))
|
|
|
|
|
|
(setq default-frame-alist (append default-frame-alist alist)))
|
|
|
|
|
|
|
1992-07-21 06:30:52 +00:00
|
|
|
|
(defun get-other-frame ()
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Return some frame other than the current frame.
|
|
|
|
|
|
Create one if necessary. Note that the minibuffer frame, if separate,
|
|
|
|
|
|
is not considered (see `next-frame')."
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(let ((s (if (equal (next-frame (selected-frame)) (selected-frame))
|
1994-05-04 22:41:02 +00:00
|
|
|
|
(make-frame)
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(next-frame (selected-frame)))))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
s))
|
|
|
|
|
|
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(defun next-multiframe-window ()
|
|
|
|
|
|
"Select the next window, regardless of which frame it is on."
|
1991-08-15 21:29:06 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
|
(select-window (next-window (selected-window)
|
|
|
|
|
|
(> (minibuffer-depth) 0)
|
2004-04-22 21:08:10 +00:00
|
|
|
|
0))
|
2001-08-10 13:47:18 +00:00
|
|
|
|
(select-frame-set-input-focus (selected-frame)))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(defun previous-multiframe-window ()
|
|
|
|
|
|
"Select the previous window, regardless of which frame it is on."
|
1991-08-15 21:29:06 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
|
(select-window (previous-window (selected-window)
|
|
|
|
|
|
(> (minibuffer-depth) 0)
|
2004-04-22 21:08:10 +00:00
|
|
|
|
0))
|
2001-08-10 13:47:18 +00:00
|
|
|
|
(select-frame-set-input-focus (selected-frame)))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
2007-11-22 13:50:36 +00:00
|
|
|
|
(declare-function x-initialize-window-system "term/x-win" ())
|
2008-07-16 02:30:15 +00:00
|
|
|
|
(declare-function ns-initialize-window-system "term/ns-win" ())
|
2008-07-17 02:35:06 +00:00
|
|
|
|
(defvar x-display-name) ; term/x-win
|
2007-11-22 13:50:36 +00:00
|
|
|
|
|
1994-10-25 09:49:53 +00:00
|
|
|
|
(defun make-frame-on-display (display &optional parameters)
|
2008-11-04 16:39:46 +00:00
|
|
|
|
"Make a frame on display DISPLAY.
|
|
|
|
|
|
The optional argument PARAMETERS specifies additional frame parameters."
|
1994-10-25 09:49:53 +00:00
|
|
|
|
(interactive "sMake frame on display: ")
|
2008-11-04 16:39:46 +00:00
|
|
|
|
(cond ((featurep 'ns)
|
|
|
|
|
|
(when (and (boundp 'ns-initialized) (not ns-initialized))
|
|
|
|
|
|
(setq x-display-name display)
|
|
|
|
|
|
(ns-initialize-window-system))
|
|
|
|
|
|
(make-frame `((window-system . ns)
|
|
|
|
|
|
(display . ,display) . ,parameters)))
|
|
|
|
|
|
((eq system-type 'windows-nt)
|
|
|
|
|
|
;; On Windows, ignore DISPLAY.
|
|
|
|
|
|
(make-frame parameters))
|
|
|
|
|
|
(t
|
2008-11-07 14:52:02 +00:00
|
|
|
|
(unless (string-match-p "\\`[^:]*:[0-9]+\\(\\.[0-9]+\\)?\\'" display)
|
2008-11-04 16:39:46 +00:00
|
|
|
|
(error "Invalid display, not HOST:SERVER or HOST:SERVER.SCREEN"))
|
|
|
|
|
|
(when (and (boundp 'x-initialized) (not x-initialized))
|
|
|
|
|
|
(setq x-display-name display)
|
|
|
|
|
|
(x-initialize-window-system))
|
|
|
|
|
|
(make-frame `((window-system . x)
|
|
|
|
|
|
(display . ,display) . ,parameters)))))
|
1994-10-25 09:49:53 +00:00
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-close-connection "xfns.c" (terminal))
|
|
|
|
|
|
|
2007-07-25 19:37:21 +00:00
|
|
|
|
(defun close-display-connection (display)
|
|
|
|
|
|
"Close the connection to a display, deleting all its associated frames.
|
|
|
|
|
|
For DISPLAY, specify either a frame or a display name (a string).
|
|
|
|
|
|
If DISPLAY is nil, that stands for the selected frame's display."
|
|
|
|
|
|
(interactive
|
|
|
|
|
|
(list
|
|
|
|
|
|
(let* ((default (frame-parameter nil 'display))
|
|
|
|
|
|
(display (completing-read
|
|
|
|
|
|
(format "Close display (default %s): " default)
|
|
|
|
|
|
(delete-dups
|
|
|
|
|
|
(mapcar (lambda (frame)
|
|
|
|
|
|
(frame-parameter frame 'display))
|
|
|
|
|
|
(frame-list)))
|
|
|
|
|
|
nil t nil nil
|
|
|
|
|
|
default)))
|
|
|
|
|
|
(if (zerop (length display)) default display))))
|
|
|
|
|
|
(let ((frames (delq nil
|
|
|
|
|
|
(mapcar (lambda (frame)
|
|
|
|
|
|
(if (equal display
|
|
|
|
|
|
(frame-parameter frame 'display))
|
|
|
|
|
|
frame))
|
|
|
|
|
|
(frame-list)))))
|
|
|
|
|
|
(if (and (consp frames)
|
|
|
|
|
|
(not (y-or-n-p (if (cdr frames)
|
|
|
|
|
|
(format "Delete %s frames? " (length frames))
|
|
|
|
|
|
(format "Delete %s ? " (car frames))))))
|
|
|
|
|
|
(error "Abort!")
|
|
|
|
|
|
(mapc 'delete-frame frames)
|
|
|
|
|
|
(x-close-connection display))))
|
|
|
|
|
|
|
1996-06-07 14:52:28 +00:00
|
|
|
|
(defun make-frame-command ()
|
2008-10-22 21:09:48 +00:00
|
|
|
|
"Make a new frame, on the same terminal as the selected frame.
|
|
|
|
|
|
If the terminal is a text-only terminal, this also selects the
|
|
|
|
|
|
new frame."
|
1996-06-07 14:52:28 +00:00
|
|
|
|
(interactive)
|
2008-10-22 21:09:48 +00:00
|
|
|
|
(if (display-graphic-p)
|
1996-06-07 14:52:28 +00:00
|
|
|
|
(make-frame)
|
|
|
|
|
|
(select-frame (make-frame))))
|
|
|
|
|
|
|
1997-03-15 13:23:49 +00:00
|
|
|
|
(defvar before-make-frame-hook nil
|
|
|
|
|
|
"Functions to run before a frame is created.")
|
|
|
|
|
|
|
|
|
|
|
|
(defvar after-make-frame-functions nil
|
|
|
|
|
|
"Functions to run after a frame is created.
|
|
|
|
|
|
The functions are run with one arg, the newly created frame.")
|
|
|
|
|
|
|
2000-11-03 22:15:51 +00:00
|
|
|
|
(defvar after-setting-font-hook nil
|
1999-07-21 21:43:03 +00:00
|
|
|
|
"Functions to run after a frame's font has been changed.")
|
|
|
|
|
|
|
1993-03-18 19:22:48 +00:00
|
|
|
|
;; Alias, kept temporarily.
|
2005-07-20 17:54:26 +00:00
|
|
|
|
(define-obsolete-function-alias 'new-frame 'make-frame "22.1")
|
1992-02-06 02:09:14 +00:00
|
|
|
|
|
2007-10-10 20:44:34 +00:00
|
|
|
|
(defvar frame-inherited-parameters '()
|
2007-10-10 20:18:45 +00:00
|
|
|
|
;; FIXME: Shouldn't we add `font' here as well?
|
|
|
|
|
|
"Parameters `make-frame' copies from the `selected-frame' to the new frame.")
|
|
|
|
|
|
|
1997-03-15 13:23:49 +00:00
|
|
|
|
(defun make-frame (&optional parameters)
|
|
|
|
|
|
"Return a newly created frame displaying the current buffer.
|
2010-07-01 00:14:17 +00:00
|
|
|
|
Optional argument PARAMETERS is an alist of frame parameters for
|
|
|
|
|
|
the new frame. Each element of PARAMETERS should have the
|
|
|
|
|
|
form (NAME . VALUE), for example:
|
1995-01-28 00:32:33 +00:00
|
|
|
|
|
1997-03-15 13:23:49 +00:00
|
|
|
|
(name . STRING) The frame should be named STRING.
|
1992-02-10 05:20:54 +00:00
|
|
|
|
|
1997-03-15 13:23:49 +00:00
|
|
|
|
(width . NUMBER) The frame should be NUMBER characters in width.
|
|
|
|
|
|
(height . NUMBER) The frame should be NUMBER text lines high.
|
1992-02-10 05:20:54 +00:00
|
|
|
|
|
2010-07-01 00:14:17 +00:00
|
|
|
|
You cannot specify either `width' or `height', you must specify
|
|
|
|
|
|
neither or both.
|
1992-02-10 05:20:54 +00:00
|
|
|
|
|
1997-03-15 13:23:49 +00:00
|
|
|
|
(minibuffer . t) The frame should have a minibuffer.
|
|
|
|
|
|
(minibuffer . nil) The frame should have no minibuffer.
|
|
|
|
|
|
(minibuffer . only) The frame should contain only a minibuffer.
|
|
|
|
|
|
(minibuffer . WINDOW) The frame should use WINDOW as its minibuffer window.
|
1992-02-10 05:20:54 +00:00
|
|
|
|
|
2004-01-11 21:59:40 +00:00
|
|
|
|
(window-system . nil) The frame should be displayed on a terminal device.
|
|
|
|
|
|
(window-system . x) The frame should be displayed in an X window.
|
|
|
|
|
|
|
2009-04-04 14:44:10 +00:00
|
|
|
|
(terminal . TERMINAL) The frame should use the terminal object TERMINAL.
|
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
2004-07-04 04:48:55 +00:00
|
|
|
|
|
2010-07-01 00:14:17 +00:00
|
|
|
|
In addition, any parameter specified in `default-frame-alist',
|
|
|
|
|
|
but not present in PARAMETERS, is applied.
|
2004-07-24 21:45:28 +00:00
|
|
|
|
|
2010-07-01 00:14:17 +00:00
|
|
|
|
Before creating the frame (via `frame-creation-function-alist'),
|
|
|
|
|
|
this function runs the hook `before-make-frame-hook'. After
|
|
|
|
|
|
creating the frame, it runs the hook `after-make-frame-functions'
|
|
|
|
|
|
with one arg, the newly created frame.
|
|
|
|
|
|
|
|
|
|
|
|
On graphical displays, this function does not itself make the new
|
|
|
|
|
|
frame the selected frame. However, the window system may select
|
|
|
|
|
|
the new frame according to its own rules."
|
1991-08-15 21:29:06 +00:00
|
|
|
|
(interactive)
|
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
2004-07-04 04:48:55 +00:00
|
|
|
|
(let* ((w (cond
|
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
2005-12-29 18:20:26 +00:00
|
|
|
|
((assq 'terminal parameters)
|
|
|
|
|
|
(let ((type (terminal-live-p (cdr (assq 'terminal parameters)))))
|
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
2004-07-04 04:48:55 +00:00
|
|
|
|
(cond
|
|
|
|
|
|
((eq type t) nil)
|
2007-11-21 20:37:22 +00:00
|
|
|
|
((eq type nil) (error "Terminal %s does not exist"
|
|
|
|
|
|
(cdr (assq 'terminal parameters))))
|
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
2004-07-04 04:48:55 +00:00
|
|
|
|
(t type))))
|
|
|
|
|
|
((assq 'window-system parameters)
|
|
|
|
|
|
(cdr (assq 'window-system parameters)))
|
|
|
|
|
|
(t window-system)))
|
2004-01-11 21:59:40 +00:00
|
|
|
|
(frame-creation-function (cdr (assq w frame-creation-function-alist)))
|
2005-12-29 04:31:04 +00:00
|
|
|
|
(oldframe (selected-frame))
|
2010-07-01 00:14:17 +00:00
|
|
|
|
(params parameters)
|
2004-01-11 21:59:40 +00:00
|
|
|
|
frame)
|
|
|
|
|
|
(unless frame-creation-function
|
|
|
|
|
|
(error "Don't know how to create a frame on window system %s" w))
|
2010-07-01 00:14:17 +00:00
|
|
|
|
;; Add parameters from `window-system-default-frame-alist'.
|
|
|
|
|
|
(dolist (p (cdr (assq w window-system-default-frame-alist)))
|
2010-07-13 17:02:27 +00:00
|
|
|
|
(unless (assq (car p) params)
|
2010-07-01 00:14:17 +00:00
|
|
|
|
(push p params)))
|
|
|
|
|
|
;; Add parameters from `default-frame-alist'.
|
|
|
|
|
|
(dolist (p default-frame-alist)
|
2010-07-13 17:02:27 +00:00
|
|
|
|
(unless (assq (car p) params)
|
2010-07-01 00:14:17 +00:00
|
|
|
|
(push p params)))
|
|
|
|
|
|
;; Now make the frame.
|
2004-01-11 21:59:40 +00:00
|
|
|
|
(run-hooks 'before-make-frame-hook)
|
2010-07-01 00:14:17 +00:00
|
|
|
|
(setq frame (funcall frame-creation-function params))
|
2005-10-23 22:11:22 +00:00
|
|
|
|
(normal-erase-is-backspace-setup-frame frame)
|
2007-10-10 20:18:45 +00:00
|
|
|
|
;; Inherit the original frame's parameters.
|
|
|
|
|
|
(dolist (param frame-inherited-parameters)
|
|
|
|
|
|
(unless (assq param parameters) ;Overridden by explicit parameters.
|
|
|
|
|
|
(let ((val (frame-parameter oldframe param)))
|
|
|
|
|
|
(when val (set-frame-parameter frame param val)))))
|
1997-03-15 13:23:49 +00:00
|
|
|
|
(run-hook-with-args 'after-make-frame-functions frame)
|
|
|
|
|
|
frame))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
(defun filtered-frame-list (predicate)
|
|
|
|
|
|
"Return a list of all live frames which satisfy PREDICATE."
|
2000-09-07 11:39:07 +00:00
|
|
|
|
(let* ((frames (frame-list))
|
|
|
|
|
|
(list frames))
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
(while (consp frames)
|
2000-09-07 11:39:07 +00:00
|
|
|
|
(unless (funcall predicate (car frames))
|
|
|
|
|
|
(setcar frames nil))
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
(setq frames (cdr frames)))
|
2000-09-07 11:39:07 +00:00
|
|
|
|
(delq nil list)))
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
|
|
|
|
|
|
(defun minibuffer-frame-list ()
|
|
|
|
|
|
"Return a list of all frames with their own minibuffers."
|
|
|
|
|
|
(filtered-frame-list
|
2007-07-25 19:37:21 +00:00
|
|
|
|
(lambda (frame)
|
|
|
|
|
|
(eq frame (window-frame (minibuffer-window frame))))))
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
|
2007-09-20 21:57:23 +00:00
|
|
|
|
;; Used to be called `terminal-id' in termdev.el.
|
|
|
|
|
|
(defun get-device-terminal (device)
|
|
|
|
|
|
"Return the terminal corresponding to DEVICE.
|
|
|
|
|
|
DEVICE can be a terminal, a frame, nil (meaning the selected frame's terminal),
|
|
|
|
|
|
the name of an X display device (HOST.SERVER.SCREEN) or a tty device file."
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((or (null device) (framep device))
|
|
|
|
|
|
(frame-terminal device))
|
|
|
|
|
|
((stringp device)
|
|
|
|
|
|
(let ((f (car (filtered-frame-list
|
|
|
|
|
|
(lambda (frame)
|
|
|
|
|
|
(or (equal (frame-parameter frame 'display) device)
|
|
|
|
|
|
(equal (frame-parameter frame 'tty) device)))))))
|
|
|
|
|
|
(or f (error "Display %s does not exist" device))
|
|
|
|
|
|
(frame-terminal f)))
|
|
|
|
|
|
((terminal-live-p device) device)
|
|
|
|
|
|
(t
|
|
|
|
|
|
(error "Invalid argument %s in `get-device-terminal'" device))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun frames-on-display-list (&optional device)
|
|
|
|
|
|
"Return a list of all frames on DEVICE.
|
|
|
|
|
|
|
|
|
|
|
|
DEVICE should be a terminal, a frame,
|
|
|
|
|
|
or a name of an X display or tty (a string of the form
|
2005-11-07 14:17:18 +00:00
|
|
|
|
HOST:SERVER.SCREEN).
|
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
2004-07-04 04:48:55 +00:00
|
|
|
|
|
2007-09-20 21:57:23 +00:00
|
|
|
|
If DEVICE is omitted or nil, it defaults to the selected
|
2005-11-07 14:17:18 +00:00
|
|
|
|
frame's terminal device."
|
2007-09-20 21:57:23 +00:00
|
|
|
|
(let* ((terminal (get-device-terminal device))
|
2000-09-07 11:39:07 +00:00
|
|
|
|
(func #'(lambda (frame)
|
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
2005-12-29 18:20:26 +00:00
|
|
|
|
(eq (frame-terminal frame) terminal))))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(filtered-frame-list func)))
|
|
|
|
|
|
|
Reimplement and extend support for terminal-local environment variables.
* lisp/termdev.el: New file. Move terminal parameter-related functions
here from frame.el.
(terminal-getenv, with-terminal-environment): Reimplement and extend.
(terminal-setenv, terminal-setenv-internal): New functions.
* lisp/frame.el (make-frame-on-tty, framep-on-display, suspend-frame):
Extend doc string, update parameter names.
(terminal-id, terminal-parameter-alist, terminal-parameters)
(terminal-parameter-p, terminal-parameter, set-terminal-parameter)
(terminal-handle-delete-frame, terminal-getenv, terminal-getenv)
(with-terminal-environment): Move to termdev.el.
* lisp/loadup.el: Load termdev as well.
* lisp/Makefile.in (lisp, shortlisp): Add termdev.elc.
* lisp/makefile.MPW (shortlisp): Ditto.
* lisp/ebuff-menu.el (electric-buffer-menu-mode-map): Bind C-z to
`suspend-frame', not `suspend-emacs'.
* lisp/echistory.el (electric-history-map): Ditto.
* lisp/ebrowse.el (ebrowse-electric-list-mode-map): Ditto.
* lisp/ebrowse.el (ebrowse-electric-position-mode-map): Ditto.
* lisp/startup.el (normal-splash-screen): Use `save-buffers-kill-display'
instead of `save-buffers-kill-emacs'.
* lisp/x-win.el (x-initialize-window-system): Add 'global-ok option to
`terminal-getenv'.
* src/term.c (suspend-tty): Update doc string.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-456
2005-12-22 21:02:45 +00:00
|
|
|
|
(defun framep-on-display (&optional terminal)
|
|
|
|
|
|
"Return the type of frames on TERMINAL.
|
|
|
|
|
|
TERMINAL may be a terminal id, a display name or a frame. If it
|
|
|
|
|
|
is a frame, its type is returned. If TERMINAL is omitted or nil,
|
|
|
|
|
|
it defaults to the selected frame's terminal device. All frames
|
|
|
|
|
|
on a given display are of the same type."
|
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
2005-12-29 18:20:26 +00:00
|
|
|
|
(or (terminal-live-p terminal)
|
Reimplement and extend support for terminal-local environment variables.
* lisp/termdev.el: New file. Move terminal parameter-related functions
here from frame.el.
(terminal-getenv, with-terminal-environment): Reimplement and extend.
(terminal-setenv, terminal-setenv-internal): New functions.
* lisp/frame.el (make-frame-on-tty, framep-on-display, suspend-frame):
Extend doc string, update parameter names.
(terminal-id, terminal-parameter-alist, terminal-parameters)
(terminal-parameter-p, terminal-parameter, set-terminal-parameter)
(terminal-handle-delete-frame, terminal-getenv, terminal-getenv)
(with-terminal-environment): Move to termdev.el.
* lisp/loadup.el: Load termdev as well.
* lisp/Makefile.in (lisp, shortlisp): Add termdev.elc.
* lisp/makefile.MPW (shortlisp): Ditto.
* lisp/ebuff-menu.el (electric-buffer-menu-mode-map): Bind C-z to
`suspend-frame', not `suspend-emacs'.
* lisp/echistory.el (electric-history-map): Ditto.
* lisp/ebrowse.el (ebrowse-electric-list-mode-map): Ditto.
* lisp/ebrowse.el (ebrowse-electric-position-mode-map): Ditto.
* lisp/startup.el (normal-splash-screen): Use `save-buffers-kill-display'
instead of `save-buffers-kill-emacs'.
* lisp/x-win.el (x-initialize-window-system): Add 'global-ok option to
`terminal-getenv'.
* src/term.c (suspend-tty): Update doc string.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-456
2005-12-22 21:02:45 +00:00
|
|
|
|
(framep terminal)
|
|
|
|
|
|
(framep (car (frames-on-display-list terminal)))))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
|
1993-07-04 02:20:59 +00:00
|
|
|
|
(defun frame-remove-geometry-params (param-list)
|
|
|
|
|
|
"Return the parameter list PARAM-LIST, but with geometry specs removed.
|
|
|
|
|
|
This deletes all bindings in PARAM-LIST for `top', `left', `width',
|
1994-05-05 22:37:47 +00:00
|
|
|
|
`height', `user-size' and `user-position' parameters.
|
1993-07-04 02:20:59 +00:00
|
|
|
|
Emacs uses this to avoid overriding explicit moves and resizings from
|
|
|
|
|
|
the user during startup."
|
|
|
|
|
|
(setq param-list (cons nil param-list))
|
|
|
|
|
|
(let ((tail param-list))
|
|
|
|
|
|
(while (consp (cdr tail))
|
|
|
|
|
|
(if (and (consp (car (cdr tail)))
|
1994-05-05 22:37:47 +00:00
|
|
|
|
(memq (car (car (cdr tail)))
|
|
|
|
|
|
'(height width top left user-position user-size)))
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(setq frame-initial-geometry-arguments
|
|
|
|
|
|
(cons (car (cdr tail)) frame-initial-geometry-arguments))
|
|
|
|
|
|
(setcdr tail (cdr (cdr tail))))
|
1993-07-04 02:20:59 +00:00
|
|
|
|
(setq tail (cdr tail)))))
|
1994-05-10 07:55:00 +00:00
|
|
|
|
(setq frame-initial-geometry-arguments
|
|
|
|
|
|
(nreverse frame-initial-geometry-arguments))
|
1993-07-04 02:20:59 +00:00
|
|
|
|
(cdr param-list))
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-focus-frame "xfns.c" (frame))
|
|
|
|
|
|
|
2001-08-10 13:47:18 +00:00
|
|
|
|
(defun select-frame-set-input-focus (frame)
|
2008-09-16 08:20:21 +00:00
|
|
|
|
"Select FRAME, raise it, and set input focus, if possible.
|
2009-07-26 19:20:51 +00:00
|
|
|
|
If `mouse-autoselect-window' is non-nil, also move mouse pointer
|
2008-09-16 08:20:21 +00:00
|
|
|
|
to FRAME's selected window. Otherwise, if `focus-follows-mouse'
|
|
|
|
|
|
is non-nil, move mouse cursor to FRAME."
|
2008-09-13 08:28:04 +00:00
|
|
|
|
(select-frame frame)
|
|
|
|
|
|
(raise-frame frame)
|
2008-09-16 08:20:21 +00:00
|
|
|
|
;; Ensure, if possible, that FRAME gets input focus.
|
2008-09-13 08:28:04 +00:00
|
|
|
|
(when (memq (window-system frame) '(x w32 ns))
|
|
|
|
|
|
(x-focus-frame frame))
|
2008-09-16 08:20:21 +00:00
|
|
|
|
;; Move mouse cursor if necessary.
|
|
|
|
|
|
(cond
|
|
|
|
|
|
(mouse-autoselect-window
|
|
|
|
|
|
(let ((edges (window-inside-edges (frame-selected-window frame))))
|
|
|
|
|
|
;; Move mouse cursor into FRAME's selected window to avoid that
|
|
|
|
|
|
;; Emacs mouse-autoselects another window.
|
|
|
|
|
|
(set-mouse-position frame (nth 2 edges) (nth 1 edges))))
|
|
|
|
|
|
(focus-follows-mouse
|
|
|
|
|
|
;; Move mouse cursor into FRAME to avoid that another frame gets
|
|
|
|
|
|
;; selected by the window manager.
|
|
|
|
|
|
(set-mouse-position frame (1- (frame-width frame)) 0))))
|
2001-08-10 13:47:18 +00:00
|
|
|
|
|
1993-08-02 22:18:34 +00:00
|
|
|
|
(defun other-frame (arg)
|
2006-12-08 02:56:08 +00:00
|
|
|
|
"Select the ARGth different visible frame on current display, and raise it.
|
1993-08-02 22:18:34 +00:00
|
|
|
|
All frames are arranged in a cyclic order.
|
|
|
|
|
|
This command selects the frame ARG steps away in that order.
|
2002-02-20 22:28:44 +00:00
|
|
|
|
A negative ARG moves in the opposite order.
|
|
|
|
|
|
|
|
|
|
|
|
To make this command work properly, you must tell Emacs
|
|
|
|
|
|
how the system (or the window manager) generally handles
|
|
|
|
|
|
focus-switching between windows. If moving the mouse onto a window
|
|
|
|
|
|
selects it (gives it focus), set `focus-follows-mouse' to t.
|
|
|
|
|
|
Otherwise, that variable should be nil."
|
1993-08-02 22:18:34 +00:00
|
|
|
|
(interactive "p")
|
|
|
|
|
|
(let ((frame (selected-frame)))
|
|
|
|
|
|
(while (> arg 0)
|
1993-08-03 03:33:14 +00:00
|
|
|
|
(setq frame (next-frame frame))
|
|
|
|
|
|
(while (not (eq (frame-visible-p frame) t))
|
|
|
|
|
|
(setq frame (next-frame frame)))
|
|
|
|
|
|
(setq arg (1- arg)))
|
1993-08-02 22:18:34 +00:00
|
|
|
|
(while (< arg 0)
|
1993-08-03 03:33:14 +00:00
|
|
|
|
(setq frame (previous-frame frame))
|
|
|
|
|
|
(while (not (eq (frame-visible-p frame) t))
|
|
|
|
|
|
(setq frame (previous-frame frame)))
|
1993-08-11 06:02:05 +00:00
|
|
|
|
(setq arg (1+ arg)))
|
2001-08-10 13:47:18 +00:00
|
|
|
|
(select-frame-set-input-focus frame)))
|
1997-12-01 14:22:04 +00:00
|
|
|
|
|
2003-05-24 16:11:17 +00:00
|
|
|
|
(defun iconify-or-deiconify-frame ()
|
|
|
|
|
|
"Iconify the selected frame, or deiconify if it's currently an icon."
|
|
|
|
|
|
(interactive)
|
|
|
|
|
|
(if (eq (cdr (assq 'visibility (frame-parameters))) t)
|
|
|
|
|
|
(iconify-frame)
|
|
|
|
|
|
(make-frame-visible)))
|
|
|
|
|
|
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
(defun suspend-frame ()
|
|
|
|
|
|
"Do whatever is right to suspend the current frame.
|
Reimplement and extend support for terminal-local environment variables.
* lisp/termdev.el: New file. Move terminal parameter-related functions
here from frame.el.
(terminal-getenv, with-terminal-environment): Reimplement and extend.
(terminal-setenv, terminal-setenv-internal): New functions.
* lisp/frame.el (make-frame-on-tty, framep-on-display, suspend-frame):
Extend doc string, update parameter names.
(terminal-id, terminal-parameter-alist, terminal-parameters)
(terminal-parameter-p, terminal-parameter, set-terminal-parameter)
(terminal-handle-delete-frame, terminal-getenv, terminal-getenv)
(with-terminal-environment): Move to termdev.el.
* lisp/loadup.el: Load termdev as well.
* lisp/Makefile.in (lisp, shortlisp): Add termdev.elc.
* lisp/makefile.MPW (shortlisp): Ditto.
* lisp/ebuff-menu.el (electric-buffer-menu-mode-map): Bind C-z to
`suspend-frame', not `suspend-emacs'.
* lisp/echistory.el (electric-history-map): Ditto.
* lisp/ebrowse.el (ebrowse-electric-list-mode-map): Ditto.
* lisp/ebrowse.el (ebrowse-electric-position-mode-map): Ditto.
* lisp/startup.el (normal-splash-screen): Use `save-buffers-kill-display'
instead of `save-buffers-kill-emacs'.
* lisp/x-win.el (x-initialize-window-system): Add 'global-ok option to
`terminal-getenv'.
* src/term.c (suspend-tty): Update doc string.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-456
2005-12-22 21:02:45 +00:00
|
|
|
|
Calls `suspend-emacs' if invoked from the controlling tty device,
|
|
|
|
|
|
`suspend-tty' from a secondary tty device, and
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
`iconify-or-deiconify-frame' from an X frame."
|
|
|
|
|
|
(interactive)
|
|
|
|
|
|
(let ((type (framep (selected-frame))))
|
|
|
|
|
|
(cond
|
2008-07-15 18:15:18 +00:00
|
|
|
|
((memq type '(x ns w32)) (iconify-or-deiconify-frame))
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
((eq type t)
|
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
2005-12-29 18:20:26 +00:00
|
|
|
|
(if (controlling-tty-p)
|
2004-07-10 21:21:04 +00:00
|
|
|
|
(suspend-emacs)
|
|
|
|
|
|
(suspend-tty)))
|
Implemented suspending of emacsclient frames.
lib-src/emacsclient.c (quote_file_name): Renamed to quote_argument.
(unquote_argument, handle_sigcont, handle_sigtstp): New functions.
(out, in): New global variables for communicating with the Emacs process.
(init_signals): Set up handlers for SIGCONT, SIGTSTP and SIGTTOU.
(main): Changed out and in to global variables. Prepend `-eval' or
'-file' to each argument. Use fsync to force sending the strings to Emacs.
Removed obsolete -bad-version code. Support the -suspend command.
Cleaned up newline handling.
lisp/frame.el (suspend-frame): New function.
Substitute key definition of suspend-emacs with suspend-frame.
lisp/server.el (server-log): Cosmetic change in log format.
(server-handle-delete-tty, server-handle-delete-frame): Added logging.
(server-handle-suspend-tty, server-quote-arg): New functions.
(server-start): Install server-handle-suspend-tty.
(server-process-filter): Reorganized source code for clarity.
Implemented -resume, -suspend and -ignore commands.
lisp/term/x-win.el (x-initialize-window-system): Don't change the
binding of C-z.
src/cm.c: Replaced TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT calls with
their macro expansion.
src/dispnew.c: Ditto.
src/frame.c: Ditto.
src/keyboard.c: Ditto.
src/sysdep.c: Ditto.
src/keyboard.c (tty_read_avail_input): Don't read if the terminal is
suspended.
src/sysdep.c (discard_tty_input, init_sys_modes, reset_sys_modes): Ditto.
src/term.c (tty_set_terminal_modes, tty_reset_terminal_modes): Ditto.
src/term.c (Vsuspend_tty_functions, Vresume_tty_functions): New hooks.
(syms_of_term): Defvar them.
(term_init): Don't allow opening a new frame on a suspended tty device.
(Fsuspend_tty, Fresume_tty): New functions.
(syms_of_term): Defsubr them.
src/termchar.c (struct tty_display_info): Update documentation of
input and output.
(TTY_INPUT, TTY_OUTPUT, TTY_TERMSCRIPT): Removed.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-105
2004-02-28 01:23:39 +00:00
|
|
|
|
(t (suspend-emacs)))))
|
|
|
|
|
|
|
1997-12-01 14:22:04 +00:00
|
|
|
|
(defun make-frame-names-alist ()
|
2010-09-19 09:53:28 +00:00
|
|
|
|
;; Only consider the frames on the same display.
|
1997-12-01 14:22:04 +00:00
|
|
|
|
(let* ((current-frame (selected-frame))
|
|
|
|
|
|
(falist
|
|
|
|
|
|
(cons
|
|
|
|
|
|
(cons (frame-parameter current-frame 'name) current-frame) nil))
|
2010-09-19 09:53:28 +00:00
|
|
|
|
(frame (next-frame nil 0)))
|
1997-12-01 14:22:04 +00:00
|
|
|
|
(while (not (eq frame current-frame))
|
|
|
|
|
|
(progn
|
2010-09-19 09:53:28 +00:00
|
|
|
|
(push (cons (frame-parameter frame 'name) frame) falist)
|
|
|
|
|
|
(setq frame (next-frame frame 0))))
|
1997-12-01 14:22:04 +00:00
|
|
|
|
falist))
|
|
|
|
|
|
|
|
|
|
|
|
(defvar frame-name-history nil)
|
|
|
|
|
|
(defun select-frame-by-name (name)
|
2001-09-30 10:47:22 +00:00
|
|
|
|
"Select the frame on the current terminal whose name is NAME and raise it.
|
1997-12-01 14:22:04 +00:00
|
|
|
|
If there is no frame by that name, signal an error."
|
|
|
|
|
|
(interactive
|
1998-04-23 22:15:47 +00:00
|
|
|
|
(let* ((frame-names-alist (make-frame-names-alist))
|
|
|
|
|
|
(default (car (car frame-names-alist)))
|
|
|
|
|
|
(input (completing-read
|
|
|
|
|
|
(format "Select Frame (default %s): " default)
|
|
|
|
|
|
frame-names-alist nil t nil 'frame-name-history)))
|
1997-12-01 14:22:04 +00:00
|
|
|
|
(if (= (length input) 0)
|
|
|
|
|
|
(list default)
|
|
|
|
|
|
(list input))))
|
1998-04-23 22:15:47 +00:00
|
|
|
|
(let* ((frame-names-alist (make-frame-names-alist))
|
|
|
|
|
|
(frame (cdr (assoc name frame-names-alist))))
|
2008-09-16 08:20:21 +00:00
|
|
|
|
(if frame
|
|
|
|
|
|
(select-frame-set-input-focus frame)
|
|
|
|
|
|
(error "There is no frame named `%s'" name))))
|
1992-07-10 02:33:41 +00:00
|
|
|
|
|
1992-07-15 00:32:19 +00:00
|
|
|
|
;;;; Frame configurations
|
|
|
|
|
|
|
|
|
|
|
|
(defun current-frame-configuration ()
|
|
|
|
|
|
"Return a list describing the positions and states of all frames.
|
1993-03-15 08:51:02 +00:00
|
|
|
|
Its car is `frame-configuration'.
|
|
|
|
|
|
Each element of the cdr is a list of the form (FRAME ALIST WINDOW-CONFIG),
|
|
|
|
|
|
where
|
|
|
|
|
|
FRAME is a frame object,
|
|
|
|
|
|
ALIST is an association list specifying some of FRAME's parameters, and
|
|
|
|
|
|
WINDOW-CONFIG is a window configuration object for FRAME."
|
|
|
|
|
|
(cons 'frame-configuration
|
2007-07-25 19:37:21 +00:00
|
|
|
|
(mapcar (lambda (frame)
|
|
|
|
|
|
(list frame
|
|
|
|
|
|
(frame-parameters frame)
|
|
|
|
|
|
(current-window-configuration frame)))
|
1993-03-15 08:51:02 +00:00
|
|
|
|
(frame-list))))
|
1992-07-15 00:32:19 +00:00
|
|
|
|
|
1993-09-07 00:53:48 +00:00
|
|
|
|
(defun set-frame-configuration (configuration &optional nodelete)
|
1992-07-15 00:32:19 +00:00
|
|
|
|
"Restore the frames to the state described by CONFIGURATION.
|
|
|
|
|
|
Each frame listed in CONFIGURATION has its position, size, window
|
1993-09-07 00:53:48 +00:00
|
|
|
|
configuration, and other parameters set as specified in CONFIGURATION.
|
2004-07-23 12:20:22 +00:00
|
|
|
|
However, this function does not restore deleted frames.
|
|
|
|
|
|
|
1993-11-07 08:10:46 +00:00
|
|
|
|
Ordinarily, this function deletes all existing frames not
|
|
|
|
|
|
listed in CONFIGURATION. But if optional second argument NODELETE
|
1993-11-08 13:14:05 +00:00
|
|
|
|
is given and non-nil, the unwanted frames are iconified instead."
|
1993-03-15 08:51:02 +00:00
|
|
|
|
(or (frame-configuration-p configuration)
|
|
|
|
|
|
(signal 'wrong-type-argument
|
|
|
|
|
|
(list 'frame-configuration-p configuration)))
|
|
|
|
|
|
(let ((config-alist (cdr configuration))
|
|
|
|
|
|
frames-to-delete)
|
2007-07-25 19:37:21 +00:00
|
|
|
|
(dolist (frame (frame-list))
|
|
|
|
|
|
(let ((parameters (assq frame config-alist)))
|
|
|
|
|
|
(if parameters
|
|
|
|
|
|
(progn
|
|
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
|
frame
|
|
|
|
|
|
;; Since we can't set a frame's minibuffer status,
|
|
|
|
|
|
;; we might as well omit the parameter altogether.
|
|
|
|
|
|
(let* ((parms (nth 1 parameters))
|
2007-10-15 02:07:53 +00:00
|
|
|
|
(mini (assq 'minibuffer parms))
|
|
|
|
|
|
(name (assq 'name parms))
|
|
|
|
|
|
(explicit-name (cdr (assq 'explicit-name parms))))
|
|
|
|
|
|
(when mini (setq parms (delq mini parms)))
|
|
|
|
|
|
;; Leave name in iff it was set explicitly.
|
|
|
|
|
|
;; This should fix the behavior reported in
|
|
|
|
|
|
;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg01632.html
|
|
|
|
|
|
(when (and name (not explicit-name))
|
|
|
|
|
|
(setq parms (delq name parms)))
|
2007-07-25 19:37:21 +00:00
|
|
|
|
parms))
|
|
|
|
|
|
(set-window-configuration (nth 2 parameters)))
|
|
|
|
|
|
(setq frames-to-delete (cons frame frames-to-delete)))))
|
|
|
|
|
|
(mapc (if nodelete
|
|
|
|
|
|
;; Note: making frames invisible here was tried
|
|
|
|
|
|
;; but led to some strange behavior--each time the frame
|
|
|
|
|
|
;; was made visible again, the window manager asked afresh
|
|
|
|
|
|
;; for where to put it.
|
|
|
|
|
|
'iconify-frame
|
|
|
|
|
|
'delete-frame)
|
|
|
|
|
|
frames-to-delete)))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1992-07-15 00:32:19 +00:00
|
|
|
|
;;;; Convenience functions for accessing and interactively changing
|
|
|
|
|
|
;;;; frame parameters.
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1992-07-21 04:09:28 +00:00
|
|
|
|
(defun frame-height (&optional frame)
|
1992-07-15 00:32:19 +00:00
|
|
|
|
"Return number of lines available for display on FRAME.
|
2009-10-10 23:50:10 +00:00
|
|
|
|
If FRAME is omitted, describe the currently selected frame.
|
|
|
|
|
|
Exactly what is included in the return value depends on the
|
|
|
|
|
|
window-system and toolkit in use - see `frame-pixel-height' for
|
|
|
|
|
|
more details. The lines are in units of the default font height.
|
|
|
|
|
|
|
|
|
|
|
|
The result is roughly related to the frame pixel height via
|
|
|
|
|
|
height in pixels = height in lines * `frame-char-height'.
|
|
|
|
|
|
However, this is only approximate, and is complicated e.g. by the
|
|
|
|
|
|
fact that individual window lines and menu bar lines can have
|
|
|
|
|
|
differing font heights."
|
1992-07-21 04:09:28 +00:00
|
|
|
|
(cdr (assq 'height (frame-parameters frame))))
|
1992-07-15 00:32:19 +00:00
|
|
|
|
|
|
|
|
|
|
(defun frame-width (&optional frame)
|
|
|
|
|
|
"Return number of columns available for display on FRAME.
|
|
|
|
|
|
If FRAME is omitted, describe the currently selected frame."
|
1992-07-21 04:09:28 +00:00
|
|
|
|
(cdr (assq 'width (frame-parameters frame))))
|
1992-07-15 00:32:19 +00:00
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-list-fonts "xfaces.c"
|
|
|
|
|
|
(pattern &optional face frame maximum width))
|
|
|
|
|
|
|
2008-10-03 07:24:54 +00:00
|
|
|
|
(define-obsolete-function-alias 'set-default-font 'set-frame-font "23.1")
|
2003-04-09 17:28:30 +00:00
|
|
|
|
(defun set-frame-font (font-name &optional keep-size)
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Set the font of the selected frame to FONT-NAME.
|
1996-09-01 20:48:03 +00:00
|
|
|
|
When called interactively, prompt for the name of the font to use.
|
2003-04-09 17:28:30 +00:00
|
|
|
|
To get the frame's current default font, use `frame-parameters'.
|
|
|
|
|
|
|
|
|
|
|
|
The default behavior is to keep the numbers of lines and columns in
|
2005-07-20 17:54:26 +00:00
|
|
|
|
the frame, thus may change its pixel size. If optional KEEP-SIZE is
|
2003-04-09 17:28:30 +00:00
|
|
|
|
non-nil (interactively, prefix argument) the current frame size (in
|
|
|
|
|
|
pixels) is kept by adjusting the numbers of the lines and columns."
|
2001-11-26 18:20:20 +00:00
|
|
|
|
(interactive
|
2003-04-09 17:28:30 +00:00
|
|
|
|
(let* ((completion-ignore-case t)
|
|
|
|
|
|
(font (completing-read "Font name: "
|
|
|
|
|
|
;; x-list-fonts will fail with an error
|
|
|
|
|
|
;; if this frame doesn't support fonts.
|
2007-07-25 19:37:21 +00:00
|
|
|
|
(x-list-fonts "*" nil (selected-frame))
|
|
|
|
|
|
nil nil nil nil
|
|
|
|
|
|
(frame-parameter nil 'font))))
|
2003-04-09 17:28:30 +00:00
|
|
|
|
(list font current-prefix-arg)))
|
|
|
|
|
|
(let (fht fwd)
|
|
|
|
|
|
(if keep-size
|
|
|
|
|
|
(setq fht (* (frame-parameter nil 'height) (frame-char-height))
|
|
|
|
|
|
fwd (* (frame-parameter nil 'width) (frame-char-width))))
|
|
|
|
|
|
(modify-frame-parameters (selected-frame)
|
|
|
|
|
|
(list (cons 'font font-name)))
|
|
|
|
|
|
(if keep-size
|
|
|
|
|
|
(modify-frame-parameters
|
|
|
|
|
|
(selected-frame)
|
|
|
|
|
|
(list (cons 'height (round fht (frame-char-height)))
|
|
|
|
|
|
(cons 'width (round fwd (frame-char-width)))))))
|
2000-11-03 22:15:51 +00:00
|
|
|
|
(run-hooks 'after-setting-font-hook 'after-setting-font-hooks))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
(defun set-frame-parameter (frame parameter value)
|
2005-12-06 12:43:47 +00:00
|
|
|
|
"Set frame parameter PARAMETER to VALUE on FRAME.
|
|
|
|
|
|
If FRAME is nil, it defaults to the selected frame.
|
2006-12-08 02:56:08 +00:00
|
|
|
|
See `modify-frame-parameters'."
|
2001-10-12 20:39:54 +00:00
|
|
|
|
(modify-frame-parameters frame (list (cons parameter value))))
|
|
|
|
|
|
|
1993-02-16 06:36:30 +00:00
|
|
|
|
(defun set-background-color (color-name)
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Set the background color of the selected frame to COLOR-NAME.
|
1996-09-01 20:48:03 +00:00
|
|
|
|
When called interactively, prompt for the name of the color to use.
|
|
|
|
|
|
To get the frame's current background color, use `frame-parameters'."
|
2010-10-24 18:43:31 +00:00
|
|
|
|
(interactive (list (read-color "Background color: ")))
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(modify-frame-parameters (selected-frame)
|
2001-11-03 15:55:17 +00:00
|
|
|
|
(list (cons 'background-color color-name)))
|
|
|
|
|
|
(or window-system
|
|
|
|
|
|
(face-set-after-frame-default (selected-frame))))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1993-02-16 06:36:30 +00:00
|
|
|
|
(defun set-foreground-color (color-name)
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Set the foreground color of the selected frame to COLOR-NAME.
|
1996-09-01 20:48:03 +00:00
|
|
|
|
When called interactively, prompt for the name of the color to use.
|
|
|
|
|
|
To get the frame's current foreground color, use `frame-parameters'."
|
2010-10-24 18:43:31 +00:00
|
|
|
|
(interactive (list (read-color "Foreground color: ")))
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(modify-frame-parameters (selected-frame)
|
2001-11-03 15:55:17 +00:00
|
|
|
|
(list (cons 'foreground-color color-name)))
|
|
|
|
|
|
(or window-system
|
|
|
|
|
|
(face-set-after-frame-default (selected-frame))))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
|
|
|
|
|
(defun set-cursor-color (color-name)
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Set the text cursor color of the selected frame to COLOR-NAME.
|
1996-09-01 20:48:03 +00:00
|
|
|
|
When called interactively, prompt for the name of the color to use.
|
|
|
|
|
|
To get the frame's current cursor color, use `frame-parameters'."
|
2010-10-24 18:43:31 +00:00
|
|
|
|
(interactive (list (read-color "Cursor color: ")))
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(modify-frame-parameters (selected-frame)
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
(list (cons 'cursor-color color-name))))
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
1993-03-02 07:06:47 +00:00
|
|
|
|
(defun set-mouse-color (color-name)
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Set the color of the mouse pointer of the selected frame to COLOR-NAME.
|
1996-09-01 20:48:03 +00:00
|
|
|
|
When called interactively, prompt for the name of the color to use.
|
|
|
|
|
|
To get the frame's current mouse color, use `frame-parameters'."
|
2010-10-24 18:43:31 +00:00
|
|
|
|
(interactive (list (read-color "Mouse color: ")))
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(modify-frame-parameters (selected-frame)
|
1999-07-26 19:06:37 +00:00
|
|
|
|
(list (cons 'mouse-color
|
|
|
|
|
|
(or color-name
|
|
|
|
|
|
(cdr (assq 'mouse-color
|
|
|
|
|
|
(frame-parameters))))))))
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
|
1993-03-02 07:06:47 +00:00
|
|
|
|
(defun set-border-color (color-name)
|
1999-07-30 18:39:32 +00:00
|
|
|
|
"Set the color of the border of the selected frame to COLOR-NAME.
|
1996-09-01 20:48:03 +00:00
|
|
|
|
When called interactively, prompt for the name of the color to use.
|
|
|
|
|
|
To get the frame's current border color, use `frame-parameters'."
|
2010-10-24 18:43:31 +00:00
|
|
|
|
(interactive (list (read-color "Border color: ")))
|
1993-03-02 07:06:47 +00:00
|
|
|
|
(modify-frame-parameters (selected-frame)
|
|
|
|
|
|
(list (cons 'border-color color-name))))
|
|
|
|
|
|
|
2010-05-05 02:08:25 +00:00
|
|
|
|
(define-minor-mode auto-raise-mode
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
"Toggle whether or not the selected frame should auto-raise.
|
Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
(custom-comment-tag, custom-face-edit-attribute-tag):
Fix typos in docstrings.
(custom-buffer-done-kill): Remove * from defcustom docstring.
(custom-file): Fix typo in doc of defcustom choice.
* frame.el (display-visual-class): Fix typo in docstring.
(initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
(special-display-frame-alist, show-trailing-whitespace)
(auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Remove * from defcustom docstrings.
* md4.el (md4-buffer): Fix typo in docstring.
(md4, md4-64): Doc fixes.
(md4-pack-int32): Reflow docstring.
* paths.el (rmail-file-name): Remove * from defcustom docstring.
(prune-directory-list, gnus-nntp-service): Fix typos in docstrings.
* rect.el (open-rectangle): Reflow docstring.
(spaces-string): Fix docstring typo. Use "?\s" instead of "? ".
* select.el (x-get-cut-buffer): Fix typo in docstring.
* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
(timezone-time-zone-from-absolute, timezone-leap-year-p):
Fix typos in docstrings.
* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
|
|
|
|
With ARG, turn auto-raise mode on if and only if ARG is positive.
|
1994-06-28 05:15:44 +00:00
|
|
|
|
Note that this controls Emacs's own auto-raise feature.
|
|
|
|
|
|
Some window managers allow you to enable auto-raise for certain windows.
|
|
|
|
|
|
You can use that for Emacs windows if you wish, but if you do,
|
|
|
|
|
|
that is beyond the control of Emacs and this command has no effect on it."
|
2010-05-05 02:08:25 +00:00
|
|
|
|
:variable (frame-parameter nil 'auto-raise)
|
|
|
|
|
|
(if (frame-parameter nil 'auto-raise)
|
|
|
|
|
|
(raise-frame)))
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
|
2010-05-05 02:08:25 +00:00
|
|
|
|
(define-minor-mode auto-lower-mode
|
* frame.el: Clean up initialization code.
(initial-frame-alist): Doc fix.
(minibuffer-frame-alist): New default value, with a reasonable height.
(filtered-frame-list, minibuffer-frame-list): New functions.
(frame-initialize): Use minibuffer-frame-list, instead of writing
it out.
(frame-notice-user-settings): Thoroughly rearranged.
Notice changes to default-frame-alist as well as initial-frame-alist.
Properly handle requests to make the initial frame into a
minibufferless or minibuffer-only frame.
Create a minibuffer-only frame if the initial frame should lack a
minibuffer and there are no other minibuffer frames created by the
user's initialization file.
Fix any frames using the initial frame as a surrogate minibuffer
frame.
Restore the current buffer after creating and deleting all these
frames.
* frame.el (set-default-font, set-frame-background,
set-frame-foreground, set-cursor-color, set-pointer-color,
set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Give these docstrings.
(set-auto-raise, set-auto-lower, set-vertical-bar,
set-horizontal-bar): Make these toggle or look at the prefix
argument, like minor modes.
* frame.el (set-vertical-bar): Use the proper parameter symbol.
(set-horizontal-bar): Signal an error indicating that horizontal
scrollbars are not implemented.
1993-02-14 14:29:30 +00:00
|
|
|
|
"Toggle whether or not the selected frame should auto-lower.
|
Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
(custom-comment-tag, custom-face-edit-attribute-tag):
Fix typos in docstrings.
(custom-buffer-done-kill): Remove * from defcustom docstring.
(custom-file): Fix typo in doc of defcustom choice.
* frame.el (display-visual-class): Fix typo in docstring.
(initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
(special-display-frame-alist, show-trailing-whitespace)
(auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Remove * from defcustom docstrings.
* md4.el (md4-buffer): Fix typo in docstring.
(md4, md4-64): Doc fixes.
(md4-pack-int32): Reflow docstring.
* paths.el (rmail-file-name): Remove * from defcustom docstring.
(prune-directory-list, gnus-nntp-service): Fix typos in docstrings.
* rect.el (open-rectangle): Reflow docstring.
(spaces-string): Fix docstring typo. Use "?\s" instead of "? ".
* select.el (x-get-cut-buffer): Fix typo in docstring.
* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
(timezone-time-zone-from-absolute, timezone-leap-year-p):
Fix typos in docstrings.
* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
|
|
|
|
With ARG, turn auto-lower mode on if and only if ARG is positive.
|
1994-06-28 05:15:44 +00:00
|
|
|
|
Note that this controls Emacs's own auto-lower feature.
|
|
|
|
|
|
Some window managers allow you to enable auto-lower for certain windows.
|
|
|
|
|
|
You can use that for Emacs windows if you wish, but if you do,
|
|
|
|
|
|
that is beyond the control of Emacs and this command has no effect on it."
|
2010-05-05 02:08:25 +00:00
|
|
|
|
:variable (frame-parameter nil 'auto-lower))
|
|
|
|
|
|
|
1997-11-20 15:55:31 +00:00
|
|
|
|
(defun set-frame-name (name)
|
|
|
|
|
|
"Set the name of the selected frame to NAME.
|
|
|
|
|
|
When called interactively, prompt for the name of the frame.
|
|
|
|
|
|
The frame name is displayed on the modeline if the terminal displays only
|
|
|
|
|
|
one frame, otherwise the name is displayed on the frame's caption bar."
|
|
|
|
|
|
(interactive "sFrame name: ")
|
|
|
|
|
|
(modify-frame-parameters (selected-frame)
|
|
|
|
|
|
(list (cons 'name name))))
|
2003-09-24 22:54:55 +00:00
|
|
|
|
|
|
|
|
|
|
(defun frame-current-scroll-bars (&optional frame)
|
|
|
|
|
|
"Return the current scroll-bar settings in frame FRAME.
|
2005-06-10 00:56:04 +00:00
|
|
|
|
Value is a cons (VERTICAL . HORIZ0NTAL) where VERTICAL specifies the
|
2003-09-24 22:54:55 +00:00
|
|
|
|
current location of the vertical scroll-bars (left, right, or nil),
|
2005-06-10 00:56:04 +00:00
|
|
|
|
and HORIZONTAL specifies the current location of the horizontal scroll
|
2003-09-24 22:54:55 +00:00
|
|
|
|
bars (top, bottom, or nil)."
|
|
|
|
|
|
(let ((vert (frame-parameter frame 'vertical-scroll-bars))
|
|
|
|
|
|
(hor nil))
|
|
|
|
|
|
(unless (memq vert '(left right nil))
|
|
|
|
|
|
(setq vert default-frame-scroll-bars))
|
|
|
|
|
|
(cons vert hor)))
|
1992-07-15 00:32:19 +00:00
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
;;;; Frame/display capabilities.
|
Rename `struct device' to `struct terminal'. Rename some terminal-related functions similarly.
* src/termhooks.h (struct device): Rename to `terminal'. Rename member
`next_device' to `next_terminal'.
(device_list): Rename to `terminal_list'.
(FRAME_DEVICE): Rename to `FRAME_TERMINAL'.
(DEVICE_TERMINAL_CODING): Rename to `TERMINAL_TERMINAL_CODING'.
(TERMINAL_KEYBOARD_CODING): Rename to `TERMINAL_KEYBOARD_CODING'.
(DEVICE_ACTIVE_P): Rename to `TERMINAL_ACTIVE_P'.
Update declarations and macro definitions.
* src/termchar.h (tty_display_info): Rename member `device' to `terminal'.
(FRAME_TTY): Update for renames.
* src/xterm.h (x_display_info): Rename member `device' to `terminal'.
* src/frame.h (frame): Rename `device' member to `terminal'.
(FRAME_KBOARD, FRAME_LIVE_P, Qdevice, Qdisplay_live_p):
Update for renames.
* src/lisp.h (set_process_environment): Rename to `set_global_environment'.
(device): Rename to `terminal'.
* src/dispextern.h: Update declarations and macro definitions.
* src/terminal.c (device_list): Rename to `terminal_list'.
(next_device_id): Rename to `next_terminal_id'.
(initial_device): Rename to `initial_terminal'.
(get_device): Rename to `get_terminal'.
(create_device): Rename to `create_terminal'.
(mark_devices): Rename to `mark_terminals'.
(delete_device): Rename to `delete_terminal'.
(Fdelete_display): Rename to `Fdelete_terminal'.
(Fframe_terminal): Move here from frame.c.
(Fdisplay_live_p): Rename to `Fterminal_live_p'.
(Fdisplay_list): Rename to `Fterminal_list'.
(Fdisplay_name): Rename to `Fterminal_name'.
(init_initial_device): Rename to `init_initial_terminal'.
(delete_initial_device): Rename to `delete_initial_terminal'.
(ring_bell, update_begin, update_end, set_terminal_window)
(cursor_to, raw_cursor_to, clear_to_end, clear_frame)
(clear_end_of_line, write_glyphs, insert_glyphs, delete_glyphs)
(ins_del_lines, get_terminal_param, store_terminal_param)
(Fterminal_parameters, Fterminal_parameter)
(Fmodify_terminal_parameters, Fset_terminal_parameter)
(syms_of_terminal): Update for renames.
* src/term.c (get_tty_device): Rename to `get_tty_terminal'. Update.
(Fdisplay_tty_type): Rename to `Ftty_type'.
(Fdisplay_controlling_tty_p): Rename to `Fcontrolling_tty_p'.
(delete_tty, tty_set_terminal_modes, tty_reset_terminal_modes)
(Ftty_display_color_p, Ftty_display_color_cells, get_named_tty)
(Ftty_no_underline, Fsuspend_tty, Fresume_tty, create_tty_output)
(init_tty, maybe_fatal, delete_tty, syms_of_term): Update for rename.
* src/frame.c (Qdevice): Rename to `Qterminal'.
(Qdisplay_live_p): Rename to `Qterminal_live_p'.
(terminal_frame_count): Rename to `tty_frame_count'.
(Fframe_display): Move to terminal.c, rename to `Fframe_terminal'.
(make_frame_without_minibuffer, make_initial_frame)
(make_terminal_frame, Fmodify_frame_parameters)
(do_switch_frame, Fdelete_frame, Fmouse_position)
(Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus, set_term_frame_name, syms_of_frame):
Update for renames.
* src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window, check_x_display_info)
(x_set_scroll_bar_foreground, x_set_scroll_bar_background)
(Fx_create_frame, Fxw_display_color_p, Fx_display_grayscale_p)
(Fx_display_pixel_width, Fx_display_pixel_height)
(Fx_display_planes, Fx_display_color_cells)
(Fx_server_max_request_size, Fx_server_vendor, Fx_server_version)
(Fx_display_screens, Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, x_create_tip_frame):
Update for renames.
* xterm.c (handle_one_xevent): Initialize `f' to NULL.
(x_delete_device): Rename to `x_delete_terminal'.
(x_create_device): Rename to `x_create_terminal'.
(XTset_terminal_modes, XTreset_terminal_modes)
(XTread_socket, x_connection_closed, x_term_init)
(x_term_init, x_delete_display): Update for renames.
* src/dispnew.c (Fredraw_frame, Fsend_string_to_terminal)
(Fsend_string_to_terminal, init_display): Update for renames.
* src/keyboard.c (push_frame_kboard, pop_kboard, pop_kboard)
(kbd_buffer_get_event, read_avail_input, tty_read_avail_input)
(interrupt_signal, Fset_output_flow_control)
(Fset_input_meta_mode, Fset_quit_char, delete_kboard)
(syms_of_keyboard): Update for renames.
* src/alloc.c (mark_devices): Update declaration.
(Fgarbage_collect): Update for renames.
* src/coding.c (Fset_terminal_coding_system_internal)
(Fterminal_coding_system4)
(Fset_keyboard_coding_system_internal)
(Fkeyboard_coding_system): Update for renames.
* src/data.c (Fterminal_local_value, Fset_terminal_local_value):
Update for renames.
* src/minibuf.c (read_minibuf): Update for renames.
* src/sysdep.c (init_sys_modes, reset_sys_modes): Update for renames.
* xselect.c (x_handle_selection_clear): Update for renames.
* lisp/files.el (save-buffers-kill-display): Rename to `save-buffers-kill-terminal'.
(save-buffers-kill-terminal, ctl-x-map): Update for renames.
* frame.el (make-frame): Rename 'device frame parameter to 'terminal. Update.
(frames-on-display-list, framep-on-display, suspend-frame): Update for renames.
(selected-display): Rename to `selected-terminal'.
* server.el (server-save-buffers-kill-display): Rename to
`server-save-buffers-kill-terminal'.
(server-delete-client, server-handle-delete-frame)
(server-handle-suspend-tty, server-process-filter)
(server-switch-buffer): Update for renames.
* startup.el (normal-splash-screen, normal-splash-screen): Update for renames.
* talk.el (talk): Update for renames.
* termdev.el (terminal-id): Update for renames.
* xt-mouse.el (turn-on-xterm-mouse-tracking-on-terminal)
(turn-off-xterm-mouse-tracking-on-terminal)
(xterm-mouse-handle-delete-frame): Update for renames.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-471
2005-12-29 18:20:26 +00:00
|
|
|
|
(defun selected-terminal ()
|
|
|
|
|
|
"Return the terminal that is now selected."
|
|
|
|
|
|
(frame-terminal (selected-frame)))
|
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
2004-07-04 04:48:55 +00:00
|
|
|
|
|
2007-11-22 01:05:55 +00:00
|
|
|
|
(declare-function msdos-mouse-p "dosfns.c")
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-mouse-p (&optional display)
|
|
|
|
|
|
"Return non-nil if DISPLAY has a mouse available.
|
|
|
|
|
|
DISPLAY can be a display name, a frame, or nil (meaning the selected
|
|
|
|
|
|
frame's display)."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((eq frame-type 'pc)
|
|
|
|
|
|
(msdos-mouse-p))
|
|
|
|
|
|
((eq system-type 'windows-nt)
|
2004-08-22 16:54:33 +00:00
|
|
|
|
(with-no-warnings
|
|
|
|
|
|
(> w32-num-mouse-buttons 0)))
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x ns))
|
|
|
|
|
|
t) ;; We assume X and NeXTstep *always* have a pointing device
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(t
|
2000-02-20 12:34:49 +00:00
|
|
|
|
(or (and (featurep 'xt-mouse)
|
|
|
|
|
|
xterm-mouse-mode)
|
|
|
|
|
|
;; t-mouse is distributed with the GPM package. It doesn't have
|
|
|
|
|
|
;; a toggle.
|
|
|
|
|
|
(featurep 't-mouse))))))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
|
|
|
|
|
|
(defun display-popup-menus-p (&optional display)
|
|
|
|
|
|
"Return non-nil if popup menus are supported on DISPLAY.
|
|
|
|
|
|
DISPLAY can be a display name, a frame, or nil (meaning the selected
|
|
|
|
|
|
frame's display).
|
|
|
|
|
|
Support for popup menus requires that the mouse be available."
|
|
|
|
|
|
(and
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
2008-07-27 18:24:48 +00:00
|
|
|
|
(memq frame-type '(x w32 pc ns)))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(display-mouse-p display)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun display-graphic-p (&optional display)
|
|
|
|
|
|
"Return non-nil if DISPLAY is a graphic display.
|
|
|
|
|
|
Graphical displays are those which are capable of displaying several
|
|
|
|
|
|
frames and several different fonts at once. This is true for displays
|
|
|
|
|
|
that use a window system such as X, and false for text-only terminals.
|
|
|
|
|
|
DISPLAY can be a display name, a frame, or nil (meaning the selected
|
|
|
|
|
|
frame's display)."
|
2008-07-27 18:24:48 +00:00
|
|
|
|
(not (null (memq (framep-on-display display) '(x w32 ns)))))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
|
2001-07-17 12:58:19 +00:00
|
|
|
|
(defun display-images-p (&optional display)
|
|
|
|
|
|
"Return non-nil if DISPLAY can display images.
|
|
|
|
|
|
|
|
|
|
|
|
DISPLAY can be a display name, a frame, or nil (meaning the selected
|
|
|
|
|
|
frame's display)."
|
|
|
|
|
|
(and (display-graphic-p display)
|
|
|
|
|
|
(fboundp 'image-mask-p)
|
2002-03-20 21:26:51 +00:00
|
|
|
|
(fboundp 'image-size)))
|
2001-07-17 12:58:19 +00:00
|
|
|
|
|
2000-06-13 13:15:30 +00:00
|
|
|
|
(defalias 'display-multi-frame-p 'display-graphic-p)
|
|
|
|
|
|
(defalias 'display-multi-font-p 'display-graphic-p)
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-selections-p (&optional display)
|
|
|
|
|
|
"Return non-nil if DISPLAY supports selections.
|
|
|
|
|
|
A selection is a way to transfer text or other data between programs
|
2010-09-02 10:17:02 +00:00
|
|
|
|
via special system buffers called `selection' or `clipboard'.
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
DISPLAY can be a display name, a frame, or nil (meaning the selected
|
|
|
|
|
|
frame's display)."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((eq frame-type 'pc)
|
|
|
|
|
|
;; MS-DOG frames support selections when Emacs runs inside
|
|
|
|
|
|
;; the Windows' DOS Box.
|
2004-08-22 16:54:33 +00:00
|
|
|
|
(with-no-warnings
|
|
|
|
|
|
(not (null dos-windows-version))))
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
t) ;; FIXME?
|
|
|
|
|
|
(t
|
|
|
|
|
|
nil))))
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-screens "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-screens (&optional display)
|
|
|
|
|
|
"Return the number of screens associated with DISPLAY."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(x-display-screens display))
|
2005-10-21 08:27:14 +00:00
|
|
|
|
(t
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
1))))
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-pixel-height "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-pixel-height (&optional display)
|
|
|
|
|
|
"Return the height of DISPLAY's screen in pixels.
|
|
|
|
|
|
For character terminals, each character counts as a single pixel."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(x-display-pixel-height display))
|
|
|
|
|
|
(t
|
|
|
|
|
|
(frame-height (if (framep display) display (selected-frame)))))))
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-pixel-width "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-pixel-width (&optional display)
|
|
|
|
|
|
"Return the width of DISPLAY's screen in pixels.
|
|
|
|
|
|
For character terminals, each character counts as a single pixel."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(x-display-pixel-width display))
|
|
|
|
|
|
(t
|
|
|
|
|
|
(frame-width (if (framep display) display (selected-frame)))))))
|
|
|
|
|
|
|
2006-09-06 11:51:57 +00:00
|
|
|
|
(defcustom display-mm-dimensions-alist nil
|
|
|
|
|
|
"Alist for specifying screen dimensions in millimeters.
|
|
|
|
|
|
The dimensions will be used for `display-mm-height' and
|
|
|
|
|
|
`display-mm-width' if defined for the respective display.
|
|
|
|
|
|
|
|
|
|
|
|
Each element of the alist has the form (display . (width . height)),
|
|
|
|
|
|
e.g. (\":0.0\" . (287 . 215)).
|
|
|
|
|
|
|
|
|
|
|
|
If `display' equals t, it specifies dimensions for all graphical
|
|
|
|
|
|
displays not explicitely specified."
|
|
|
|
|
|
:version "22.1"
|
|
|
|
|
|
:type '(alist :key-type (choice (string :tag "Display name")
|
|
|
|
|
|
(const :tag "Default" t))
|
|
|
|
|
|
:value-type (cons :tag "Dimensions"
|
|
|
|
|
|
(integer :tag "Width")
|
|
|
|
|
|
(integer :tag "Height")))
|
|
|
|
|
|
:group 'frames)
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-mm-height "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-mm-height (&optional display)
|
|
|
|
|
|
"Return the height of DISPLAY's screen in millimeters.
|
2008-01-16 16:17:19 +00:00
|
|
|
|
System values can be overridden by `display-mm-dimensions-alist'.
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
If the information is unavailable, value is nil."
|
2008-07-27 18:24:48 +00:00
|
|
|
|
(and (memq (framep-on-display display) '(x w32 ns))
|
2006-09-06 11:51:57 +00:00
|
|
|
|
(or (cddr (assoc (or display (frame-parameter nil 'display))
|
|
|
|
|
|
display-mm-dimensions-alist))
|
|
|
|
|
|
(cddr (assoc t display-mm-dimensions-alist))
|
|
|
|
|
|
(x-display-mm-height display))))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-mm-width "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-mm-width (&optional display)
|
|
|
|
|
|
"Return the width of DISPLAY's screen in millimeters.
|
2008-01-16 16:17:19 +00:00
|
|
|
|
System values can be overridden by `display-mm-dimensions-alist'.
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
If the information is unavailable, value is nil."
|
2008-07-27 18:24:48 +00:00
|
|
|
|
(and (memq (framep-on-display display) '(x w32 ns))
|
2006-09-06 11:51:57 +00:00
|
|
|
|
(or (cadr (assoc (or display (frame-parameter nil 'display))
|
|
|
|
|
|
display-mm-dimensions-alist))
|
|
|
|
|
|
(cadr (assoc t display-mm-dimensions-alist))
|
|
|
|
|
|
(x-display-mm-width display))))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-backing-store "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-backing-store (&optional display)
|
|
|
|
|
|
"Return the backing store capability of DISPLAY's screen.
|
|
|
|
|
|
The value may be `always', `when-mapped', `not-useful', or nil if
|
|
|
|
|
|
the question is inapplicable to a certain kind of display."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(x-display-backing-store display))
|
|
|
|
|
|
(t
|
|
|
|
|
|
'not-useful))))
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-save-under "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-save-under (&optional display)
|
|
|
|
|
|
"Return non-nil if DISPLAY's screen supports the SaveUnder feature."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(x-display-save-under display))
|
|
|
|
|
|
(t
|
|
|
|
|
|
'not-useful))))
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-planes "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-planes (&optional display)
|
|
|
|
|
|
"Return the number of planes supported by DISPLAY."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(x-display-planes display))
|
|
|
|
|
|
((eq frame-type 'pc)
|
|
|
|
|
|
4)
|
|
|
|
|
|
(t
|
|
|
|
|
|
(truncate (log (length (tty-color-alist)) 2))))))
|
|
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-color-cells "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-color-cells (&optional display)
|
|
|
|
|
|
"Return the number of color cells supported by DISPLAY."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(x-display-color-cells display))
|
|
|
|
|
|
((eq frame-type 'pc)
|
|
|
|
|
|
16)
|
|
|
|
|
|
(t
|
Hookified termcap devices, added bootstrap display device, plus many bugfixes.
lisp/frame.el (display-color-cells): Pass display parameter to tty-display-color-cells.
lisp/term/xterm.el (xterm-register-default-colors): Pass the selected-frame to display-color-cells.
src/dispextern.h (set_terminal_modes, reset_terminal_modes): Removed declarations.
(get_named_tty_display): New prototype.
(tty_clear_end_of_line, term_init): Updated to new prototype.
(initial_term_init): Renamed to init_initial_display.
src/dispnew.c (Fredraw_frame): ifdef-out DOS-specific code. Add display parameter to set_terminal_modes call.
(update_frame): Don't flush the tty of there is no tty.
(init_display): Set up a termcap display on the controlling tty and
change the initial frame to use that. Delete the initial display.
src/frame.c (Fframep): Return t for the initial frame.
(make_initial_frame): New function for creating the initial frame during bootstrap. Use init_initial_display, not initial_term_init.
(make_terminal_frame): Removed special cases for creating the initial frame.
src/frame.h (enum output_method): New entry: output_initial for the bootstrap display.
(FRAME_INITIAL_P): New macro.
(make_initial_frame): New prototype.
src/keyboard.c (interrupt_signal): Exit Emacs on SIGINT from the (frameless) controlling tty, if possible. Explain this in a comment.
(init_keyboard): Added comment about exiting on SIGINT.
(Fset_input_mode): A termcap frame is never the initial frame anymore.
src/sysdep.c (init_sys_modes): Update tty_set_terminal_modes call to the new prototype.
(reset_sys_modes): Comment out tty_clear_end_of_line call; it doesn't work anymore. Update tty_reset_terminal_modes call.
src/termchar.h (struct tty_display_info): Added pointer to the display structure, for reset_sys_modes.
src/termhooks.h (struct display): Added display parameter to set_terminal_modes_hook and reset_terminal_modes_hook.
src/term.c (initial_display): New variable.
(tty_ring_bell, tty_update_end, tty_set_terminal_window, tty_cursor_to)
(tty_raw_cursor_to, tty_clear_to_end, tty_clear_frame, tty_clear_end_of_line)
(tty_write_glyphs, tty_insert_glyphs, tty_delete_glyphs, tty_ins_del_lines): New functions.
(ring_bell, update_end, set_terminal_window, cursor_to, raw_cursor_to)
(clear_to_end, clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Removed special casing of termcap displays.
(get_tty_display): New function.
(Ftty_display_color_p, Ftty_display_color_cells): Use it.
(get_named_tty_display): Removed static.
(tty_set_terminal_modes, tty_reset_terminal_modes): Changed to use a display parameter
instead of tty_display_info for hook compatibility.
(set_terminal_modes, reset_terminal_modes): Removed.
(initial_term_init): Renamed to init_initial_display. Set up an
output_initial device, not a termcap display.
(delete_initial_display): New function.
(maybe_fatal): New function, for private use of term_init.
(term_init): New parameter for choosing between fatal and simple errors.
Removed incomprehensible special casing for the second initialization of the
controlling tty. Use maybe_fatal for error handling.
Initialize termcap display hooks in the new device.
Initialize the display pointer in the tty_display_info structure.
(delete_tty): Replace order of reset_sys_modes and delete_display.
src/window.c (init_window_once): Call make_initial_frame instead of make_terminal_frame.
src/xfaces.c (realize_default_face, realize_face): Don't abort on the bootstrap display device.
src/xterm.c (XTset_terminal_modes, XTreset_terminal_modes): Added display parameter.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-48
2004-01-09 18:57:53 +00:00
|
|
|
|
(tty-display-color-cells display)))))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
|
2008-06-12 03:56:20 +00:00
|
|
|
|
(declare-function x-display-visual-class "xfns.c" (&optional terminal))
|
|
|
|
|
|
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(defun display-visual-class (&optional display)
|
Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
(custom-comment-tag, custom-face-edit-attribute-tag):
Fix typos in docstrings.
(custom-buffer-done-kill): Remove * from defcustom docstring.
(custom-file): Fix typo in doc of defcustom choice.
* frame.el (display-visual-class): Fix typo in docstring.
(initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
(special-display-frame-alist, show-trailing-whitespace)
(auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Remove * from defcustom docstrings.
* md4.el (md4-buffer): Fix typo in docstring.
(md4, md4-64): Doc fixes.
(md4-pack-int32): Reflow docstring.
* paths.el (rmail-file-name): Remove * from defcustom docstring.
(prune-directory-list, gnus-nntp-service): Fix typos in docstrings.
* rect.el (open-rectangle): Reflow docstring.
(spaces-string): Fix docstring typo. Use "?\s" instead of "? ".
* select.el (x-get-cut-buffer): Fix typo in docstring.
* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
(timezone-time-zone-from-absolute, timezone-leap-year-p):
Fix typos in docstrings.
* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
|
|
|
|
"Return the visual class of DISPLAY.
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
The value is one of the symbols `static-gray', `gray-scale',
|
|
|
|
|
|
`static-color', `pseudo-color', `true-color', or `direct-color'."
|
|
|
|
|
|
(let ((frame-type (framep-on-display display)))
|
|
|
|
|
|
(cond
|
2008-07-27 18:24:48 +00:00
|
|
|
|
((memq frame-type '(x w32 ns))
|
(frames-on-display-list, framep-on-display): New functions.
(display-mouse-p, display-popup-menus-p, display-graphic-p)
(display-selections-p, display-screens, display-pixel-width)
(display-pixel-height, display-mm-width, display-mm-height)
(display-backing-store, display-save-under, display-planes)
(display-color-cells, display-visual-class): New functions.
2000-02-02 11:35:43 +00:00
|
|
|
|
(x-display-visual-class display))
|
|
|
|
|
|
((and (memq frame-type '(pc t))
|
|
|
|
|
|
(tty-display-color-p display))
|
|
|
|
|
|
'static-color)
|
|
|
|
|
|
(t
|
|
|
|
|
|
'static-gray))))
|
|
|
|
|
|
|
|
|
|
|
|
|
2008-01-03 09:57:40 +00:00
|
|
|
|
;;;; Frame geometry values
|
|
|
|
|
|
|
|
|
|
|
|
(defun frame-geom-value-cons (type value &optional frame)
|
|
|
|
|
|
"Return equivalent geometry value for FRAME as a cons with car `+'.
|
|
|
|
|
|
A geometry value equivalent to VALUE for FRAME is returned,
|
|
|
|
|
|
where the value is a cons with car `+', not numeric.
|
|
|
|
|
|
TYPE is the car of the original geometry spec (TYPE . VALUE).
|
|
|
|
|
|
It is `top' or `left', depending on which edge VALUE is related to.
|
|
|
|
|
|
VALUE is the cdr of a frame geometry spec: (left/top . VALUE).
|
|
|
|
|
|
If VALUE is a number, then it is converted to a cons value, perhaps
|
|
|
|
|
|
relative to the opposite frame edge from that in the original spec.
|
|
|
|
|
|
FRAME defaults to the selected frame.
|
|
|
|
|
|
|
|
|
|
|
|
Examples (measures in pixels) -
|
|
|
|
|
|
Assuming display height/width=1024, frame height/width=600:
|
|
|
|
|
|
300 inside display edge: 300 => (+ 300)
|
|
|
|
|
|
(+ 300) => (+ 300)
|
|
|
|
|
|
300 inside opposite display edge: (- 300) => (+ 124)
|
|
|
|
|
|
-300 => (+ 124)
|
|
|
|
|
|
300 beyond display edge
|
|
|
|
|
|
(= 724 inside opposite display edge): (+ -300) => (+ -300)
|
|
|
|
|
|
300 beyond display edge
|
|
|
|
|
|
(= 724 inside opposite display edge): (- -300) => (+ 724)
|
|
|
|
|
|
|
|
|
|
|
|
In the 3rd, 4th, and 6th examples, the returned value is relative to
|
|
|
|
|
|
the opposite frame edge from the edge indicated in the input spec."
|
|
|
|
|
|
(cond ((and (consp value) (eq '+ (car value))) ; e.g. (+ 300), (+ -300)
|
|
|
|
|
|
value)
|
|
|
|
|
|
((natnump value) (list '+ value)) ; e.g. 300 => (+ 300)
|
|
|
|
|
|
(t ; e.g. -300, (- 300), (- -300)
|
|
|
|
|
|
(list '+ (- (if (eq 'left type) ; => (+ 124), (+ 124), (+ 724)
|
|
|
|
|
|
(x-display-pixel-width)
|
|
|
|
|
|
(x-display-pixel-height))
|
|
|
|
|
|
(if (integerp value) (- value) (cadr value))
|
|
|
|
|
|
(if (eq 'left type)
|
|
|
|
|
|
(frame-pixel-width frame)
|
|
|
|
|
|
(frame-pixel-height frame)))))))
|
|
|
|
|
|
|
|
|
|
|
|
(defun frame-geom-spec-cons (spec &optional frame)
|
|
|
|
|
|
"Return equivalent geometry spec for FRAME as a cons with car `+'.
|
|
|
|
|
|
A geometry specification equivalent to SPEC for FRAME is returned,
|
|
|
|
|
|
where the value is a cons with car `+', not numeric.
|
|
|
|
|
|
SPEC is a frame geometry spec: (left . VALUE) or (top . VALUE).
|
|
|
|
|
|
If VALUE is a number, then it is converted to a cons value, perhaps
|
|
|
|
|
|
relative to the opposite frame edge from that in the original spec.
|
|
|
|
|
|
FRAME defaults to the selected frame.
|
|
|
|
|
|
|
|
|
|
|
|
Examples (measures in pixels) -
|
|
|
|
|
|
Assuming display height=1024, frame height=600:
|
|
|
|
|
|
top 300 below display top: (top . 300) => (top + 300)
|
|
|
|
|
|
(top + 300) => (top + 300)
|
|
|
|
|
|
bottom 300 above display bottom: (top - 300) => (top + 124)
|
|
|
|
|
|
(top . -300) => (top + 124)
|
|
|
|
|
|
top 300 above display top
|
|
|
|
|
|
(= bottom 724 above display bottom): (top + -300) => (top + -300)
|
|
|
|
|
|
bottom 300 below display bottom
|
|
|
|
|
|
(= top 724 below display top): (top - -300) => (top + 724)
|
|
|
|
|
|
|
|
|
|
|
|
In the 3rd, 4th, and 6th examples, the returned value is relative to
|
|
|
|
|
|
the opposite frame edge from the edge indicated in the input spec."
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(cons (car spec) (frame-geom-value-cons (car spec) (cdr spec) frame)))
|
2008-01-03 09:57:40 +00:00
|
|
|
|
|
1992-08-12 12:57:12 +00:00
|
|
|
|
|
2000-01-28 13:22:46 +00:00
|
|
|
|
(defun delete-other-frames (&optional frame)
|
|
|
|
|
|
"Delete all frames except FRAME.
|
2001-04-17 12:02:53 +00:00
|
|
|
|
If FRAME uses another frame's minibuffer, the minibuffer frame is
|
|
|
|
|
|
left untouched. FRAME nil or omitted means use the selected frame."
|
2000-01-28 13:22:46 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
|
(unless frame
|
|
|
|
|
|
(setq frame (selected-frame)))
|
2001-04-17 12:02:53 +00:00
|
|
|
|
(let* ((mini-frame (window-frame (minibuffer-window frame)))
|
|
|
|
|
|
(frames (delq mini-frame (delq frame (frame-list)))))
|
2009-06-04 14:46:23 +00:00
|
|
|
|
;; Only consider frames on the same terminal.
|
|
|
|
|
|
(dolist (frame (prog1 frames (setq frames nil)))
|
|
|
|
|
|
(if (eq (frame-terminal) (frame-terminal frame))
|
|
|
|
|
|
(push frame frames)))
|
2001-04-17 12:02:53 +00:00
|
|
|
|
;; Delete mon-minibuffer-only frames first, because `delete-frame'
|
|
|
|
|
|
;; signals an error when trying to delete a mini-frame that's
|
|
|
|
|
|
;; still in use by another frame.
|
|
|
|
|
|
(dolist (frame frames)
|
|
|
|
|
|
(unless (eq (frame-parameter frame 'minibuffer) 'only)
|
|
|
|
|
|
(delete-frame frame)))
|
|
|
|
|
|
;; Delete minibuffer-only frames.
|
|
|
|
|
|
(dolist (frame frames)
|
|
|
|
|
|
(when (eq (frame-parameter frame 'minibuffer) 'only)
|
|
|
|
|
|
(delete-frame frame)))))
|
2000-01-28 13:22:46 +00:00
|
|
|
|
|
2002-10-02 23:53:37 +00:00
|
|
|
|
;; miscellaneous obsolescence declarations
|
2005-07-20 17:54:26 +00:00
|
|
|
|
(define-obsolete-variable-alias 'delete-frame-hook
|
|
|
|
|
|
'delete-frame-functions "22.1")
|
2002-10-02 23:53:37 +00:00
|
|
|
|
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
;; Highlighting trailing whitespace.
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
|
|
|
|
|
(make-variable-buffer-local 'show-trailing-whitespace)
|
|
|
|
|
|
|
2000-04-24 13:59:25 +00:00
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
;; Scrolling
|
2000-04-24 13:59:25 +00:00
|
|
|
|
|
|
|
|
|
|
(defgroup scrolling nil
|
|
|
|
|
|
"Scrolling windows."
|
|
|
|
|
|
:version "21.1"
|
|
|
|
|
|
:group 'frames)
|
|
|
|
|
|
|
2002-03-03 17:31:45 +00:00
|
|
|
|
(defvaralias 'automatic-hscrolling 'auto-hscroll-mode)
|
2000-04-24 13:59:25 +00:00
|
|
|
|
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
2001-10-12 20:39:54 +00:00
|
|
|
|
;; Blinking cursor
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
|
|
|
|
|
(defgroup cursor nil
|
1999-11-01 15:28:32 +00:00
|
|
|
|
"Displaying text cursors."
|
1999-07-30 18:39:32 +00:00
|
|
|
|
:version "21.1"
|
1999-07-21 21:43:03 +00:00
|
|
|
|
:group 'frames)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom blink-cursor-delay 0.5
|
Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
(custom-comment-tag, custom-face-edit-attribute-tag):
Fix typos in docstrings.
(custom-buffer-done-kill): Remove * from defcustom docstring.
(custom-file): Fix typo in doc of defcustom choice.
* frame.el (display-visual-class): Fix typo in docstring.
(initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
(special-display-frame-alist, show-trailing-whitespace)
(auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Remove * from defcustom docstrings.
* md4.el (md4-buffer): Fix typo in docstring.
(md4, md4-64): Doc fixes.
(md4-pack-int32): Reflow docstring.
* paths.el (rmail-file-name): Remove * from defcustom docstring.
(prune-directory-list, gnus-nntp-service): Fix typos in docstrings.
* rect.el (open-rectangle): Reflow docstring.
(spaces-string): Fix docstring typo. Use "?\s" instead of "? ".
* select.el (x-get-cut-buffer): Fix typo in docstring.
* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
(timezone-time-zone-from-absolute, timezone-leap-year-p):
Fix typos in docstrings.
* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
|
|
|
|
"Seconds of idle time after which cursor starts to blink."
|
1999-07-21 21:43:03 +00:00
|
|
|
|
:type 'number
|
|
|
|
|
|
:group 'cursor)
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom blink-cursor-interval 0.5
|
Fix typos in docstrings.
* cus-edit.el (customize-apropos-options, custom-comment)
(custom-comment-tag, custom-face-edit-attribute-tag):
Fix typos in docstrings.
(custom-buffer-done-kill): Remove * from defcustom docstring.
(custom-file): Fix typo in doc of defcustom choice.
* frame.el (display-visual-class): Fix typo in docstring.
(initial-frame-alist, minibuffer-frame-alist, pop-up-frame-alist)
(special-display-frame-alist, show-trailing-whitespace)
(auto-hscroll-mode, blink-cursor-delay, blink-cursor-interval)
(display-hourglass, hourglass-delay, cursor-in-non-selected-windows):
Remove * from defcustom docstrings.
* md4.el (md4-buffer): Fix typo in docstring.
(md4, md4-64): Doc fixes.
(md4-pack-int32): Reflow docstring.
* paths.el (rmail-file-name): Remove * from defcustom docstring.
(prune-directory-list, gnus-nntp-service): Fix typos in docstrings.
* rect.el (open-rectangle): Reflow docstring.
(spaces-string): Fix docstring typo. Use "?\s" instead of "? ".
* select.el (x-get-cut-buffer): Fix typo in docstring.
* timezone.el (timezone-zone-to-minute, timezone-time-from-absolute)
(timezone-time-zone-from-absolute, timezone-leap-year-p):
Fix typos in docstrings.
* emacs-lisp/assoc.el (asort, aelement, aput, aget, amake):
Fix typos in docstrings.
2008-11-01 01:24:33 +00:00
|
|
|
|
"Length of cursor blink interval in seconds."
|
1999-07-21 21:43:03 +00:00
|
|
|
|
:type 'number
|
|
|
|
|
|
:group 'cursor)
|
|
|
|
|
|
|
|
|
|
|
|
(defvar blink-cursor-idle-timer nil
|
1999-11-01 15:28:32 +00:00
|
|
|
|
"Timer started after `blink-cursor-delay' seconds of Emacs idle time.
|
|
|
|
|
|
The function `blink-cursor-start' is called when the timer fires.")
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
|
|
|
|
|
(defvar blink-cursor-timer nil
|
1999-11-01 15:28:32 +00:00
|
|
|
|
"Timer started from `blink-cursor-start'.
|
2005-02-12 17:58:37 +00:00
|
|
|
|
This timer calls `blink-cursor-timer-function' every
|
|
|
|
|
|
`blink-cursor-interval' seconds.")
|
|
|
|
|
|
|
1999-07-21 21:43:03 +00:00
|
|
|
|
(defun blink-cursor-start ()
|
1999-11-01 15:28:32 +00:00
|
|
|
|
"Timer function called from the timer `blink-cursor-idle-timer'.
|
|
|
|
|
|
This starts the timer `blink-cursor-timer', which makes the cursor blink
|
|
|
|
|
|
if appropriate. It also arranges to cancel that timer when the next
|
|
|
|
|
|
command starts, by installing a pre-command hook."
|
1999-07-21 21:43:03 +00:00
|
|
|
|
(when (null blink-cursor-timer)
|
2006-08-20 14:43:29 +00:00
|
|
|
|
;; Set up the timer first, so that if this signals an error,
|
|
|
|
|
|
;; blink-cursor-end is not added to pre-command-hook.
|
1999-07-21 21:43:03 +00:00
|
|
|
|
(setq blink-cursor-timer
|
|
|
|
|
|
(run-with-timer blink-cursor-interval blink-cursor-interval
|
2006-08-20 14:43:29 +00:00
|
|
|
|
'blink-cursor-timer-function))
|
|
|
|
|
|
(add-hook 'pre-command-hook 'blink-cursor-end)
|
|
|
|
|
|
(internal-show-cursor nil nil)))
|
1999-11-03 15:57:21 +00:00
|
|
|
|
|
|
|
|
|
|
(defun blink-cursor-timer-function ()
|
|
|
|
|
|
"Timer function of timer `blink-cursor-timer'."
|
|
|
|
|
|
(internal-show-cursor nil (not (internal-show-cursor-p))))
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
|
|
|
|
|
(defun blink-cursor-end ()
|
|
|
|
|
|
"Stop cursor blinking.
|
1999-11-01 15:28:32 +00:00
|
|
|
|
This is installed as a pre-command hook by `blink-cursor-start'.
|
2001-11-26 18:20:20 +00:00
|
|
|
|
When run, it cancels the timer `blink-cursor-timer' and removes
|
1999-11-01 15:28:32 +00:00
|
|
|
|
itself as a pre-command hook."
|
1999-07-21 21:43:03 +00:00
|
|
|
|
(remove-hook 'pre-command-hook 'blink-cursor-end)
|
1999-11-03 15:57:21 +00:00
|
|
|
|
(internal-show-cursor nil t)
|
2006-08-22 01:35:45 +00:00
|
|
|
|
(when blink-cursor-timer
|
|
|
|
|
|
(cancel-timer blink-cursor-timer)
|
|
|
|
|
|
(setq blink-cursor-timer nil)))
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
2006-08-22 01:35:45 +00:00
|
|
|
|
(define-minor-mode blink-cursor-mode
|
|
|
|
|
|
"Toggle blinking cursor mode.
|
2007-08-08 07:40:09 +00:00
|
|
|
|
With a numeric argument, turn blinking cursor mode on if ARG is positive,
|
|
|
|
|
|
otherwise turn it off. When blinking cursor mode is enabled, the
|
|
|
|
|
|
cursor of the selected window blinks.
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
2006-08-22 01:35:45 +00:00
|
|
|
|
Note that this command is effective only when Emacs
|
|
|
|
|
|
displays through a window system, because then Emacs does its own
|
|
|
|
|
|
cursor display. On a text-only terminal, this is not implemented."
|
|
|
|
|
|
:init-value (not (or noninteractive
|
|
|
|
|
|
no-blinking-cursor
|
|
|
|
|
|
(eq system-type 'ms-dos)
|
2010-12-06 06:51:06 +00:00
|
|
|
|
(not (memq window-system '(x w32 ns)))))
|
2009-09-13 00:52:55 +00:00
|
|
|
|
:initialize 'custom-initialize-delay
|
2006-08-22 01:35:45 +00:00
|
|
|
|
:group 'cursor
|
|
|
|
|
|
:global t
|
|
|
|
|
|
(if blink-cursor-idle-timer (cancel-timer blink-cursor-idle-timer))
|
|
|
|
|
|
(setq blink-cursor-idle-timer nil)
|
|
|
|
|
|
(blink-cursor-end)
|
|
|
|
|
|
(when blink-cursor-mode
|
|
|
|
|
|
;; Hide the cursor.
|
|
|
|
|
|
;;(internal-show-cursor nil nil)
|
|
|
|
|
|
(setq blink-cursor-idle-timer
|
|
|
|
|
|
(run-with-idle-timer blink-cursor-delay
|
|
|
|
|
|
blink-cursor-delay
|
|
|
|
|
|
'blink-cursor-start))))
|
1999-07-21 21:43:03 +00:00
|
|
|
|
|
2006-08-22 01:35:45 +00:00
|
|
|
|
(define-obsolete-variable-alias 'blink-cursor 'blink-cursor-mode "22.1")
|
2001-11-26 18:20:20 +00:00
|
|
|
|
|
1991-08-15 21:29:06 +00:00
|
|
|
|
|
|
|
|
|
|
;;;; Key bindings
|
|
|
|
|
|
|
1996-06-07 14:52:28 +00:00
|
|
|
|
(define-key ctl-x-5-map "2" 'make-frame-command)
|
2000-01-28 13:22:46 +00:00
|
|
|
|
(define-key ctl-x-5-map "1" 'delete-other-frames)
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(define-key ctl-x-5-map "0" 'delete-frame)
|
1993-08-02 22:18:34 +00:00
|
|
|
|
(define-key ctl-x-5-map "o" 'other-frame)
|
1992-03-16 20:39:07 +00:00
|
|
|
|
|
1992-07-15 00:32:19 +00:00
|
|
|
|
(provide 'frame)
|
1992-05-30 21:11:25 +00:00
|
|
|
|
|
1992-07-15 00:32:19 +00:00
|
|
|
|
;;; frame.el ends here
|