From 2246281fb0e2ab610d14efa7166a9ceb02597643 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Sun, 11 Jan 2004 21:59:40 +0000 Subject: 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 --- lisp/loadup.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index bd90fb7c53a..26f7b34108a 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -67,6 +67,8 @@ (setq load-source-file-function 'load-with-code-conversion) (load "files") +(load "startup") + (load "cus-face") (load "faces") ; after here, `defface' may be used. @@ -146,7 +148,6 @@ (message "%s" (garbage-collect)) (load "menu-bar") (load "paths.el") ;Don't get confused if someone compiled paths by mistake. -(load "startup") (load "emacs-lisp/lisp") (load "textmodes/page") (load "register") -- cgit v1.2.1 From e9cda8277618ce4e2644e852539474b7b67f09e3 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Thu, 22 Jan 2004 02:36:55 +0000 Subject: Romain Francoise's and Ami Fischman's bugfixes. src/term.c (create_tty_output): Fix syntax error. Reported by Ami Fischman (ami at fischman dot org). lisp/loadup.el: Load term/x-win.el if X is available. lisp/startup.el (handle-args-function-alist) (window-system-initialization-alist): New variables. (command-line): Don't load term/x-win.el, use the above variables. lisp/x-win.el: (x-initialize-window-system): New function, move X initialization here. (x-initialized): New variable. lisp/frame.el (make-frame-on-display): Don't initialize X twice, and make sure to pass the correct display parameter to x-open-connection. Reported by Romain Francoise (romain at orebokech dot com). git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-58 --- lisp/loadup.el | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 26f7b34108a..c64df547582 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -190,6 +190,13 @@ (load "emacs-lisp/float-sup"))) (message "%s" (garbage-collect)) +(when (fboundp 'x-create-frame) + (load "mouse") + (load "international/fontset") + (load "term/x-win")) + +(message "%s" (garbage-collect)) + (load "vc-hooks") (load "ediff-hook") (message "%s" (garbage-collect)) -- cgit v1.2.1 From da8e11156a5a22f6e4cdab41b4b797aaee10bd6e Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Sun, 25 Jan 2004 00:43:38 +0000 Subject: Removed %T in mode-line-format. Trivial documentation changes. lisp/bindings.el (mode-line-buffer-identification): Use the conditional formatting feature instead of builtin support. src/buffer.c (Vmode_line_format): Removed %T documentation. src/xdisp.c (decode_mode_spec): Removed %T processing. lib-src/emacsclient.c (pass_signal_to_emacs, init_signals): Added comment. src/cm.c: Cosmetic changes. src/termchar.h: Ditto. src/keyboard.c (interrupt_signal, handle_interrupt): Updated documentation. src/process.c (add_keyboard_wait_descriptor): Added docs. src/sysdep.c (init_all_sys_modes, init_sys_modes) (reset_all_sys_modes): Added docs. src/term.c (tty_ring_bell, tty_set_terminal_modes) (tty_reset_terminal_modes, tty_update_end, set_terminal_window) (tty_set_terminal_window, clear_to_end, tty_clear_to_end) (tty_clear_frame, tty_clear_end_of_line, write_glyphs) (tty_write_glyphs, insert_glyphs, tty_insert_glyphs, delete_glyphs) (tty_delete_glyphs, tty_ins_del_lines, get_named_tty_display) (init_initial_display, delete_tty): Added docs. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-65 --- lisp/loadup.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index c64df547582..07ed6e8d463 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -190,6 +190,7 @@ (load "emacs-lisp/float-sup"))) (message "%s" (garbage-collect)) +;; Load auxiliary settings for X displays if we support them. (when (fboundp 'x-create-frame) (load "mouse") (load "international/fontset") -- cgit v1.2.1 From 35dfa9b69ea92e3383a5dd325e54fa05e469cc1c Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Tue, 18 May 2004 19:58:00 +0000 Subject: Fix fatal error during startup (rep. by Friedrich Delgado Friedrichs) lisp/loadup.el: Unconditionally preload server. lisp/server.el: Change server-getenv to a simple defun. src/Makefile.in (lisp, shortlisp): Added server.elc. mac/makefile.MPW (LispSource): Ditto. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-164 --- lisp/loadup.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 36b9904f4f1..bb00fe8fbbb 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -163,6 +163,7 @@ (load "vmsproc"))) (load "abbrev") (load "buff-menu") +(load "server") ; server-getenv is used throughout the terminal initialization code (if (eq system-type 'vax-vms) (progn (load "vms-patch"))) -- cgit v1.2.1 From 774a8da14bb2520b6adad223ab13f0b64f002872 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Mon, 18 Apr 2005 14:32:14 +0000 Subject: Fix bootstrap error during loadup. * lisp/loadup.el: Load dnd.el before x-dnd.el. * src/Makefile.in (SOME_MACHINE_LISP): Add dnd.elc. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-329 --- lisp/loadup.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 8ada4710400..0685caf78aa 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -196,6 +196,7 @@ (when (fboundp 'x-create-frame) (load "mouse") (load "international/fontset") + (load "dnd") (load "x-dnd") (load "term/x-win")) -- cgit v1.2.1 From 9d488d86232cc9bf9537707c464773369a5fda87 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Mon, 7 Nov 2005 15:06:11 +0000 Subject: Fix some of the bootstrap problems. * lisp/loadup.el: Reorganize order of loading x-dnd vs. term/x-win. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-438 --- lisp/loadup.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 1df6065cb17..affc735ecd0 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -175,9 +175,8 @@ (load "dnd") (load "mwheel") (load "tool-bar") + (load "x-dnd") (load "term/x-win"))) -(if (featurep 'x) - (load "x-dnd")) (message "%s" (garbage-collect)) (if (eq system-type 'vax-vms) -- cgit v1.2.1 From 59e085e04d44b0331620b55a64eb94bf99cf81b1 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Sat, 19 Nov 2005 19:17:56 +0000 Subject: Store client's environment in terminal parameters, not server parameters. * lisp/loadup.el: Don't load server. * lisp/ldefs-boot.el: Update. * lib-src/emacsclient.c (main): Send environment only when a new display is created. * lisp/server.el (server-save-buffers-kill-display): Add autoload cookie. Move stuff not specific to server into `save-buffers-kill-display'. * lisp/files.el (save-buffers-kill-display): New function. (ctl-x-map): Bind it to C-x C-c. * lisp/frame.el (terminal-getenv): New function. * lisp/international/mule-cmds.el (set-locale-environment): Use it. * lisp/frame.el (with-terminal-environment): New macro. * lisp/server.el (server-getenv, server-with-client-environment): Remove. (server-getenv-from, server-with-environment): New functions. (server-process-filter): Change syntax of environment variables. Put environment into terminal parameters, not client parameters. * lisp/term/rxvt.el: Don't require server. (rxvt-set-background-mode): Use terminal-getenv, not server-getenv. * lisp/term/x-win.el (x-initialize-window-system): Ditto. * lisp/term/xterm.el (terminal-init-xterm): Ditto. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-443 --- lisp/loadup.el | 1 - 1 file changed, 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 9b3cae5ba37..370eeb8aa30 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -167,7 +167,6 @@ (load "vmsproc"))) (load "abbrev") (load "buff-menu") -(load "server") ; server-getenv is used throughout the terminal initialization code (if (fboundp 'x-create-frame) (progn -- cgit v1.2.1 From f35ca2fe35859b40b1b0ff15a1751aab4805d392 Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Thu, 22 Dec 2005 21:02:45 +0000 Subject: 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 --- lisp/loadup.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index a8e23c41db7..e5bcf2447ff 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -132,6 +132,7 @@ (load "indent") (load "window") (load "frame") +(load "termdev") (load "term/tty-colors") (load "font-core") ;; facemenu must be loaded before font-lock, because `facemenu-keymap' -- cgit v1.2.1 From 911650d26b9ce191925ec23545b0c072cdab351f Mon Sep 17 00:00:00 2001 From: Karoly Lorentey Date: Fri, 3 Feb 2006 14:44:51 +0000 Subject: Fix bootstrapping problem. (Reported by "mace".) * lisp/loadup.el: Delay loading env; mule-conf gets confused by cl during bootstrap. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-505 --- lisp/loadup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index e5bcf2447ff..5e1f455ab05 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -60,10 +60,10 @@ (load "widget") (load "custom") (load "emacs-lisp/map-ynp") -(load "env") (load "cus-start") (load "international/mule") (load "international/mule-conf.el") ;Don't get confused if someone compiled this by mistake. +(load "env") (load "format") (load "bindings") (setq load-source-file-function 'load-with-code-conversion) -- cgit v1.2.1 From ddaa805750df7e6694596a052fe78583d7316f9d Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Tue, 15 May 2007 23:21:42 +0000 Subject: Only load x-dnd and x-win when X is compiled in. Load w32-win and dependencies on windows-nt. --- lisp/loadup.el | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 1ee27ed427a..b20b40bc6c2 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -179,9 +179,12 @@ (load "international/fontset") (load "dnd") (load "mwheel") - (load "tool-bar") + (load "tool-bar"))) +(if (featurep 'x) + (progn (load "x-dnd") (load "term/x-win"))) + (message "%s" (garbage-collect)) (if (eq system-type 'vax-vms) @@ -189,6 +192,9 @@ (load "vms-patch"))) (if (eq system-type 'windows-nt) (progn + (load "international/ccl") + (load "international/code-pages") + (load "term/w32-win") (load "ls-lisp") (load "disp-table") ; needed to setup ibm-pc char set, see internal.el (load "dos-w32") -- cgit v1.2.1 From 80ca7302d820bd3460a06db39165bbc35144c684 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 19 May 2007 19:08:02 +0000 Subject: * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here. * termhooks.h (union display_info): Add mac_display_info. * term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD is defined. * macterm.h (struct mac_display_info): Add terminal. * w32term.c (w32_initialize): Make static. * macterm.c (XTset_terminal_modes): Add a terminal parameter. (XTreset_terminal_modes): Likewise. (x_clear_frame): Add a frame parameter. (note_mouse_movement): Get rif from the frame. (mac_term_init): Initialize the terminal. (mac_initialize): Make static and move terminal initialization ... (mac_create_terminal): ... in this new function. * macmenu.c: Reorder includes. (Fx_popup_menu): Use terminal specific mouse_position_hook. * macfns.c (x_set_mouse_color): Get rif from the frame. (x_set_tool_bar_lines): Don't use updating_frame. (mac_window): Add 2 new parameters for consistency with other systems. (Fx_create_frame): Fix doc string. Rename the parameter. (Fx_create_frame): Set the frame parameters following what is done in X11 and w32. (Fx_open_connection): Remove window-system check. (start_hourglass): Likewise. (x_create_tip_frame): Get the keyboard from the terminal. * w32fns.c (Fx_create_frame): Use kboard from the terminal. * term/mac-win.el: Provide mac-win. (mac-initialized): New variable. (mac-initialize-window-system): New function. Move global setup here. (handle-args-function-alist, frame-creation-function-alist): (window-system-initialization-alist): Add mac entries. * loadup.el: Load mac-win on a Mac. --- lisp/loadup.el | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index b20b40bc6c2..8c03610043d 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -212,6 +212,9 @@ (if (eq system-type 'macos) (progn (load "ls-lisp"))) +(if (eq system-type 'darwin) + (progn + (load "term/mac-win"))) (if (fboundp 'atan) ; preload some constants and (progn ; floating pt. functions if we have float support. (load "emacs-lisp/float-sup"))) -- cgit v1.2.1 From caf49fb0438e9493456b59cf9eab845e0e568e2a Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sat, 19 May 2007 23:12:46 +0000 Subject: * loadup.el: Load mac-win on a Mac. Avoid loading both x-win and mac-win. * term/mac-win.el: (mac-initialize-window-system): New function. Move global setup here. * s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here. (SYSTEM_PURESIZE_EXTRA): Only define on Carbon. * emacsclient.c (decode_options): Don't use a tty on mac carbon. --- lisp/loadup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 8c03610043d..d9362158380 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -212,7 +212,7 @@ (if (eq system-type 'macos) (progn (load "ls-lisp"))) -(if (eq system-type 'darwin) +(if (and (eq system-type 'darwin) (not (featurep 'x))) (progn (load "term/mac-win"))) (if (fboundp 'atan) ; preload some constants and -- cgit v1.2.1 From 88acaaf20b2fd0af64eea1b5d4f8fa8227c32e86 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 4 Jun 2007 02:16:32 +0000 Subject: * term.c (init_tty): Use terminal specific mouse_position_hook. * macterm.c (mac_create_terminal): Indent and rearrange to be more similar to the X11 version. * config.in: Disable multi-keyboard support on a mac. * loadup.el: Use a better feature test on a mac. --- lisp/loadup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index d9362158380..8cadd734cb8 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -212,7 +212,7 @@ (if (eq system-type 'macos) (progn (load "ls-lisp"))) -(if (and (eq system-type 'darwin) (not (featurep 'x))) +(if (featurep 'mac-carbon) (progn (load "term/mac-win"))) (if (fboundp 'atan) ; preload some constants and -- cgit v1.2.1 From d4e9f06737f102f454c400f2918e6fc228871350 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 23 Aug 2007 00:07:49 +0000 Subject: Add "button" loading after "faces" and move "startup" to load after "button". --- lisp/loadup.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index b6464372a41..1b96afd5486 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -69,11 +69,12 @@ (setq load-source-file-function 'load-with-code-conversion) (load "files") -(load "startup") - (load "cus-face") (load "faces") ; after here, `defface' may be used. +(load "button") +(load "startup") + (message "Lists of integers (garbage collection statistics) are normal output") (message "while building Emacs; they do not indicate a problem.") (message "%s" (garbage-collect)) -- cgit v1.2.1 From b7185a731cf3b899cd001e35e886467cb1ee8318 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Mon, 3 Sep 2007 16:48:04 +0000 Subject: * loadup.el: Fix merge problem, only load "button" once. --- lisp/loadup.el | 1 - 1 file changed, 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index f9ba4a8164f..1b96afd5486 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -82,7 +82,6 @@ (message "%s" (garbage-collect)) (load "simple") -(load "button") (load "help") (load "jka-cmpr-hook") -- cgit v1.2.1 From 8db04dd25be86ad9a27f65f5732c4cc7fa729309 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 21 Sep 2007 02:38:05 +0000 Subject: Remove termdev. --- lisp/loadup.el | 1 - 1 file changed, 1 deletion(-) (limited to 'lisp/loadup.el') diff --git a/lisp/loadup.el b/lisp/loadup.el index 1b96afd5486..d015f6a1c6d 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -134,7 +134,6 @@ (load "indent") (load "window") (load "frame") -(load "termdev") (load "term/tty-colors") (load "font-core") ;; facemenu must be loaded before font-lock, because `facemenu-keymap' -- cgit v1.2.1