Mercurial > emacs
comparison src/keyboard.c @ 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 | 4aa172a45af1 |
children | 82c3b4da43ca |
comparison
equal
deleted
inserted
replaced
83013:e77d1a63471b | 83014:f5cadabb36dd |
---|---|
10501 stop_polling (); | 10501 stop_polling (); |
10502 #endif | 10502 #endif |
10503 | 10503 |
10504 #ifndef DOS_NT | 10504 #ifndef DOS_NT |
10505 /* this causes startup screen to be restored and messes with the mouse */ | 10505 /* this causes startup screen to be restored and messes with the mouse */ |
10506 if (FRAME_TERMCAP_P (SELECTED_FRAME ())) | 10506 reset_all_sys_modes (); |
10507 reset_sys_modes (CURTTY ()); | |
10508 #endif | 10507 #endif |
10509 | 10508 |
10510 #ifdef SIGIO | 10509 #ifdef SIGIO |
10511 /* Note SIGIO has been undef'd if FIONREAD is missing. */ | 10510 /* Note SIGIO has been undef'd if FIONREAD is missing. */ |
10512 if (FRAME_DISPLAY (SELECTED_FRAME ())->read_socket_hook) | 10511 if (FRAME_DISPLAY (SELECTED_FRAME ())->read_socket_hook) |
10540 tty->meta_key = 1; | 10539 tty->meta_key = 1; |
10541 else | 10540 else |
10542 tty->meta_key = 2; | 10541 tty->meta_key = 2; |
10543 } | 10542 } |
10544 | 10543 |
10545 if (FRAME_TERMCAP_P (XFRAME (selected_frame)) && !NILP (quit)) | 10544 if (!NILP (quit)) |
10546 /* Don't let this value be out of range. */ | 10545 /* Don't let this value be out of range. */ |
10547 quit_char = XINT (quit) & (CURTTY ()->meta_key ? 0377 : 0177); | 10546 quit_char = XINT (quit) & (NILP (meta) ? 0177 : 0377); |
10548 | 10547 |
10549 #ifndef DOS_NT | 10548 #ifndef DOS_NT |
10550 if (FRAME_TERMCAP_P (XFRAME (selected_frame)) && CURTTY ()->type) | 10549 init_all_sys_modes (); |
10551 init_sys_modes (CURTTY ()); | |
10552 #endif | 10550 #endif |
10553 | 10551 |
10554 #ifdef POLL_FOR_INPUT | 10552 #ifdef POLL_FOR_INPUT |
10555 poll_suppress_count = 1; | 10553 poll_suppress_count = 1; |
10556 start_polling (); | 10554 start_polling (); |