comparison lisp/faces.el @ 83014:f5cadabb36dd

Support for opening X frames from a tty session. lisp/cus-face.el (custom-declare-face): Handle multiple concurrent display methods correctly. lisp/faces.el (x-create-frame-with-faces): Set the window-system frame parameter instead of frame-creation-function. (tty-create-frame-with-faces): Ditto. lisp/frame.el (frame-creation-function): Removed. (frame-creation-function-alist): New variable. (frame-initialize): Use initial-window-system instead of window-system. Add window-system parameter to initial-frame-alist. Removed tty initialization, it was moved to frame-creation-function-alist. (frame-notice-user-settings): Use initial-window-system instead of window-system. (make-frame-on-display): Make sure term/x-win is loaded. Added window-system parameter for make-frame. (make-frame-on-tty): Removed unnecessary autoload declaration. Added window-system parameter for make-frame. (make-frame): Use frame-creation-function-alist to determine the function to use depending on the specified window system. (select-frame-by-name): Use the window-system function instead of the variable. lisp/startup.el (window-system): New variable (previously built-in, now frame-local). (normal-top-level, command-line): Use initial-window-system instead of window-system. lisp/loadup.el: Load startup.el before faces.el, for the window-system variable. lisp/term/x-win.el: Check for the x-create-frame function instead of window-system to see if X is available. Don't exit Emacs if the display can not be opened when X is not the initial display method. Set up frame-creation-function-alist instead of frame-creation-function. Provide the x-win feature. src/dispnew.c (Vwindow_system): Renamed to Vinitial_window_system. (init_display, syms_of_display): Updated to use Vinitial_window_system instead of Vwindow_system. src/emacs.c (shut_down_emacs): Updated to use Vinitial_window_system instead of Vwindow_system. src/keyboard.c (Fset_input_mode): Call reset_all_sys_modes, not reset_sys_modes. Ditto for init_all_sys_modes. Process the quit parameter correctly. src/sysdep.c (init_sys_modes, reset_sys_modes): Unconditionally set up the terminal. We don't get called if there is nothing to do anymore. (sys_select): Use Vinitial_window_system, not Vwindow_system. src/window.h (Vwindow_system): Renamed to Vinitial_window_system. src/xfns.c (Fx_create_frame): Don't check_x. We initialize it anyway. (x_display_info_for_name, Fx_open_connection): Don't look at Vinitial_window_system. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-54
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 11 Jan 2004 21:59:40 +0000
parents b2b37c85b00a
children 1d7467694692
comparison
equal deleted inserted replaced
83013:e77d1a63471b 83014:f5cadabb36dd
1656 the X resource ``reverseVideo'' is present, handle that. 1656 the X resource ``reverseVideo'' is present, handle that.
1657 Value is the new frame created." 1657 Value is the new frame created."
1658 (setq parameters (x-handle-named-frame-geometry parameters)) 1658 (setq parameters (x-handle-named-frame-geometry parameters))
1659 (let ((visibility-spec (assq 'visibility parameters)) 1659 (let ((visibility-spec (assq 'visibility parameters))
1660 (frame-list (frame-list)) 1660 (frame-list (frame-list))
1661 (frame (x-create-frame `((frame-creation-function . x-create-frame-with-faces) 1661 (frame (x-create-frame `((window-system . x) (visibility . nil) . ,parameters)))
1662 (visibility . nil) . ,parameters)))
1663 success) 1662 success)
1664 (unwind-protect 1663 (unwind-protect
1665 (progn 1664 (progn
1666 (x-handle-reverse-video frame parameters) 1665 (x-handle-reverse-video frame parameters)
1667 (frame-set-background-mode frame) 1666 (frame-set-background-mode frame)
1743 "Create a frame from optional frame parameters PARAMETERS. 1742 "Create a frame from optional frame parameters PARAMETERS.
1744 Parameters not specified by PARAMETERS are taken from 1743 Parameters not specified by PARAMETERS are taken from
1745 `default-frame-alist'. If either PARAMETERS or `default-frame-alist' 1744 `default-frame-alist'. If either PARAMETERS or `default-frame-alist'
1746 contains a `reverse' parameter, handle that. Value is the new frame 1745 contains a `reverse' parameter, handle that. Value is the new frame
1747 created." 1746 created."
1748 (let ((frame (make-terminal-frame `((frame-creation-function . tty-create-frame-with-faces) . 1747 (let ((frame (make-terminal-frame `((window-system . nil) . ,parameters)))
1749 ,parameters)))
1750 success) 1748 success)
1751 (unwind-protect 1749 (unwind-protect
1752 (progn 1750 (progn
1753 (tty-handle-reverse-video frame (frame-parameters frame)) 1751 (tty-handle-reverse-video frame (frame-parameters frame))
1754 (frame-set-background-mode frame) 1752 (frame-set-background-mode frame)