"Act on user's init file settings of frame parameters.
React to settings of `default-frame-alist', `initial-frame-alist' there."
;; Make menu-bar-mode and default-frame-alist consistent.
- (if (boundp 'menu-bar-mode)
- (let ((default (assq 'menu-bar-lines default-frame-alist)))
- (if default
- (setq menu-bar-mode (not (eq (cdr default) 0)))
- (setq default-frame-alist
- (cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))
- default-frame-alist)))))
+ (when (boundp 'menu-bar-mode)
+ (let ((default (assq 'menu-bar-lines default-frame-alist)))
+ (if default
+ (setq menu-bar-mode (not (eq (cdr default) 0)))
+ (setq default-frame-alist
+ (cons (cons 'menu-bar-lines (if menu-bar-mode 1 0))
+ default-frame-alist)))))
+
+ ;; Make tool-bar-mode and default-frame-alist consistent. Don't do
+ ;; it in batch mode since that would leave a tool-bar-lines
+ ;; parameter in default-frame-alist in a dumped Emacs, which is not
+ ;; what we want. For some reason, menu-bar-mode is not bound
+ ;; in this case, but tool-bar-mode is.
+ (when (and (boundp 'tool-bar-mode)
+ (not noninteractive))
+ (let ((default (assq 'tool-bar-lines default-frame-alist)))
+ (if default
+ (setq tool-bar-mode (not (eq (cdr default) 0)))
+ (setq default-frame-alist
+ (cons (cons 'tool-bar-lines (if tool-bar-mode 1 0))
+ default-frame-alist)))))
;; Creating and deleting frames may shift the selected frame around,
;; and thus the current buffer. Protect against that. We don't
(when (and frame-notice-user-settings
(null frame-initial-frame))
- ;; This case happens when we don't have a window system.
+ ;; This case happens when we don't have a window system, and
+ ;; also for MS-DOS frames.
(let ((parms (frame-parameters frame-initial-frame)))
;; 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))
(modify-frame-parameters nil
- (append initial-frame-alist
- default-frame-alist
- parms
- nil))))
+ (if (null window-system)
+ (append initial-frame-alist
+ default-frame-alist
+ parms
+ nil)
+ ;; initial-frame-alist and
+ ;; default-frame-alist were already
+ ;; applied in pc-win.el.
+ parms))
+ (if (null window-system) ;; MS-DOS does this differently in pc-win.el
+ (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))))))
;; If the initial frame is still around, apply initial-frame-alist
;; and default-frame-alist to it.
;; the new parameters.
(let (newparms allparms tail)
(setq allparms (append initial-frame-alist
- default-frame-alist))
+ 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)
(when (assq 'background-color newparms)
(unless (assq 'background-mode newparms)
(frame-set-background-mode frame-initial-frame))
- (face-set-after-frame-default frame-initial-frame))
- (if (assq 'font newparms)
- (frame-update-faces frame-initial-frame)))))
+ (face-set-after-frame-default frame-initial-frame)))))
;; Restore the original buffer.
(set-buffer old-buffer)
"Functions to run after a frame is created.
The functions are run with one arg, the newly created frame.")
-(defvar after-setting-font-hooks nil
+(defvar after-setting-font-hook nil
"Functions to run after a frame's font has been changed.")
;; Alias, kept temporarily.
(defun filtered-frame-list (predicate)
"Return a list of all live frames which satisfy PREDICATE."
- (let ((frames (frame-list))
- good-frames)
+ (let* ((frames (frame-list))
+ (list frames))
(while (consp frames)
- (if (funcall predicate (car frames))
- (setq good-frames (cons (car frames) good-frames)))
+ (unless (funcall predicate (car frames))
+ (setcar frames nil))
(setq frames (cdr frames)))
- good-frames))
+ (delq nil list)))
(defun minibuffer-frame-list ()
"Return a list of all frames with their own minibuffers."
"Return a list of all frames on DISPLAY.
DISPLAY is a name of a display, a string of the form HOST:SERVER.SCREEN.
If DISPLAY is omitted or nil, it defaults to the selected frame's display."
- (let* ((display (or display
- (cdr (assoc 'display (frame-parameters)))))
- (func
- (function (lambda (frame)
- (eq (cdr (assoc 'display (frame-parameters frame)))
- display)))))
+ (let* ((display (or display (frame-parameter nil 'display)))
+ (func #'(lambda (frame)
+ (eq (frame-parameter frame 'display) display))))
(filtered-frame-list func)))
(defun framep-on-display (&optional display)
(while (not (eq (frame-visible-p frame) t))
(setq frame (previous-frame frame)))
(setq arg (1+ arg)))
- (raise-frame frame)
(select-frame frame)
+ (raise-frame frame)
;; Ensure, if possible, that frame gets input focus.
- (if (eq window-system 'w32)
- (w32-focus-frame frame)
- (when focus-follows-mouse
- (set-mouse-position (selected-frame) (1- (frame-width)) 0)))))
+ (when (eq window-system 'w32)
+ (w32-focus-frame frame))
+ (cond (focus-follows-mouse
+ (unless (eq window-system 'w32)
+ (set-mouse-position (selected-frame) (1- (frame-width)) 0)))
+ (t
+ (when (eq window-system 'x)
+ (x-focus-frame frame))))))
(defun make-frame-names-alist ()
(let* ((current-frame (selected-frame))
;;;; Convenience functions for accessing and interactively changing
;;;; frame parameters.
-(defun frame-parameter (frame parameter)
- "Return FRAME's value for parameter PARAMETER.
-If FRAME is nil, describe the currently selected frame."
- (cdr (assq parameter (frame-parameters frame))))
-
(defun frame-height (&optional frame)
"Return number of lines available for display on FRAME.
If FRAME is omitted, describe the currently selected frame."
"Set the font of the selected frame to FONT-NAME.
When called interactively, prompt for the name of the font to use.
To get the frame's current default font, use `frame-parameters'."
- (interactive "sFont name: ")
+ (interactive
+ (list
+ (let ((completion-ignore-case t))
+ (completing-read "Font name: "
+ (mapcar #'list
+ ;; x-list-fonts will fail with an error
+ ;; if this frame doesn't support fonts.
+ (x-list-fonts "*" nil (selected-frame)))))))
(modify-frame-parameters (selected-frame)
(list (cons 'font font-name)))
- ;; Update faces that want a bold or italic version of the default font.
- (frame-update-faces (selected-frame))
- (run-hooks 'after-setting-font-hooks))
+ (run-hooks 'after-setting-font-hook 'after-setting-font-hooks))
(defun set-background-color (color-name)
"Set the background color of the selected frame to COLOR-NAME.
To get the frame's current background color, use `frame-parameters'."
(interactive (list (facemenu-read-color)))
(modify-frame-parameters (selected-frame)
- (list (cons 'background-color color-name)))
- (frame-update-face-colors (selected-frame)))
+ (list (cons 'background-color color-name))))
(defun set-foreground-color (color-name)
"Set the foreground color of the selected frame to COLOR-NAME.
To get the frame's current foreground color, use `frame-parameters'."
(interactive (list (facemenu-read-color)))
(modify-frame-parameters (selected-frame)
- (list (cons 'foreground-color color-name)))
- (frame-update-face-colors (selected-frame)))
+ (list (cons 'foreground-color color-name))))
(defun set-cursor-color (color-name)
"Set the text cursor color of the selected frame to COLOR-NAME.
frame's display)."
(not (null (memq (framep-on-display display) '(x w32 mac)))))
+(defalias 'display-multi-frame-p 'display-graphic-p)
+(defalias 'display-multi-font-p 'display-graphic-p)
+
(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
(mapcar 'delete-frame (delq frame (frame-list))))
-(make-obsolete 'screen-height 'frame-height)
-(make-obsolete 'screen-width 'frame-width)
-(make-obsolete 'set-screen-width 'set-frame-width)
-(make-obsolete 'set-screen-height 'set-frame-height)
+(make-obsolete 'screen-height 'frame-height) ;before 19.15
+(make-obsolete 'screen-width 'frame-width) ;before 19.15
+(make-obsolete 'set-screen-width 'set-frame-width) ;before 19.15
+(make-obsolete 'set-screen-height 'set-frame-height) ;before 19.15
\f
;;; Highlighting trailing whitespace.
:group 'font-lock)
+\f
+;;; Scrolling
+
+(defgroup scrolling nil
+ "Scrolling windows."
+ :version "21.1"
+ :group 'frames)
+
+(defcustom automatic-hscrolling t
+ "*Allow or disallow autmatic scrolling windows horizontally.
+If non-nil, windows are automatically scrolled horizontally to make
+point visible."
+ :version "21.1"
+ :type 'boolean
+ :group 'scrolling)
+
\f
;;; Blinking cursor
(if on-p
(progn
;; Hide the cursor.
- (internal-show-cursor nil nil)
+ ;(internal-show-cursor nil nil)
(setq blink-cursor-idle-timer
(run-with-idle-timer blink-cursor-delay
blink-cursor-delay
'blink-cursor-start))
- (setq blink-cursor-mode t)))))
+ (setq blink-cursor-mode t))
+ (internal-show-cursor nil t))))
+
+;; Note that this is really initialized from startup.el before
+;; the init-file is read.
-(defcustom blink-cursor (not (eq system-type 'ms-dos))
+(defcustom blink-cursor nil
"*Non-nil means blinking cursor mode is active."
+ :group 'cursor
:tag "Blinking cursor"
:type 'boolean
- :group 'cursor
:set #'(lambda (symbol value)
(set-default symbol value)
(blink-cursor-mode (or value 0))))
(defcustom busy-cursor-delay-seconds 1
"*Seconds to wait before displaying a busy-cursor."
:tag "Busy-cursor delay"
- :type 'integer
+ :type 'number
:group 'cursor
:get #'(lambda (symbol) busy-cursor-delay)
:set #'(lambda (symbol value)
\f
(defcustom show-cursor-in-non-selected-windows t
"*Non-nil means show a hollow box cursor in non-selected-windows.
-If nil, don't show a cursor except in the selected window."
+If nil, don't show a cursor except in the selected window.
+Setting this variable directly has no effect; use custom instead."
:tag "Cursor in non-selected windows"
:type 'boolean
:group 'cursor
(provide 'frame)
;;; frame.el ends here
-(frame-notice-user-settings):