2001-07-15 16:15:35 +00:00
|
|
|
|
;;; server.el --- Lisp code for GNU Emacs running as server process
|
1992-05-30 21:11:25 +00:00
|
|
|
|
|
2005-08-06 22:13:43 +00:00
|
|
|
|
;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
2008-01-03 21:56:36 +00:00
|
|
|
|
;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
1992-07-22 03:58:44 +00:00
|
|
|
|
|
1992-07-15 21:31:44 +00:00
|
|
|
|
;; Author: William Sommerfeld <wesommer@athena.mit.edu>
|
1997-05-27 15:32:03 +00:00
|
|
|
|
;; Maintainer: FSF
|
1992-07-17 20:24:00 +00:00
|
|
|
|
;; Keywords: processes
|
1992-07-15 21:31:44 +00:00
|
|
|
|
|
1990-02-22 10:44:55 +00:00
|
|
|
|
;; Changes by peck@sun.com and by rms.
|
2004-05-18 19:58:00 +00:00
|
|
|
|
;; Overhaul by Karoly Lorentey <lorentey@elte.hu> for multi-tty support.
|
1990-02-22 10:44:55 +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
|
1990-02-22 10:44:55 +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.
|
1990-02-22 10:44:55 +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/>.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1992-07-15 21:31:44 +00:00
|
|
|
|
;;; Commentary:
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; This Lisp code is run in Emacs when it is to operate as
|
|
|
|
|
;; a server for other processes.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; Load this library and do M-x server-edit to enable Emacs as a server.
|
2002-09-27 17:43:29 +00:00
|
|
|
|
;; Emacs opens up a socket for communication with clients. If there are no
|
|
|
|
|
;; client buffers to edit, server-edit acts like (switch-to-buffer
|
|
|
|
|
;; (other-buffer))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; When some other program runs "the editor" to edit a file,
|
|
|
|
|
;; "the editor" can be the Emacs client program ../lib-src/emacsclient.
|
|
|
|
|
;; This program transmits the file names to Emacs through
|
|
|
|
|
;; the server subprocess, and Emacs visits them and lets you edit them.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2004-10-10 16:41:15 +00:00
|
|
|
|
;; Note that any number of clients may dispatch files to Emacs to be edited.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; When you finish editing a Server buffer, again call server-edit
|
2003-01-13 16:44:07 +00:00
|
|
|
|
;; to mark that buffer as done for the client and switch to the next
|
|
|
|
|
;; Server buffer. When all the buffers for a client have been edited
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; and exited with server-edit, the client "editor" will return
|
2003-01-13 16:44:07 +00:00
|
|
|
|
;; to the program that invoked it.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; Your editing commands and Emacs's display output go to and from
|
|
|
|
|
;; the terminal in the usual way. Thus, server operation is possible
|
|
|
|
|
;; only when Emacs can talk to the terminal at the time you invoke
|
|
|
|
|
;; the client. This is possible in four cases:
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 1. On a window system, where Emacs runs in one window and the
|
|
|
|
|
;; program that wants to use "the editor" runs in another.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 2. On a multi-terminal system, where Emacs runs on one terminal and the
|
|
|
|
|
;; program that wants to use "the editor" runs on another.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 3. When the program that wants to use "the editor" is running
|
|
|
|
|
;; as a subprocess of Emacs.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; 4. On a system with job control, when Emacs is suspended, the program
|
|
|
|
|
;; that wants to use "the editor" will stop and display
|
|
|
|
|
;; "Waiting for Emacs...". It can then be suspended, and Emacs can be
|
|
|
|
|
;; brought into the foreground for editing. When done editing, Emacs is
|
|
|
|
|
;; suspended again, and the client program is brought into the foreground.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2003-01-13 16:44:07 +00:00
|
|
|
|
;; The buffer local variable "server-buffer-clients" lists
|
|
|
|
|
;; the clients who are waiting for this buffer to be edited.
|
1996-01-14 07:34:30 +00:00
|
|
|
|
;; The global variable "server-clients" lists all the waiting clients,
|
|
|
|
|
;; and which files are yet to be edited for each.
|
1992-07-15 21:31:44 +00:00
|
|
|
|
|
2007-10-09 04:22:36 +00:00
|
|
|
|
;; Todo:
|
|
|
|
|
|
|
|
|
|
;; - handle command-line-args-left.
|
|
|
|
|
;; - move most of the args processing and decision making from emacsclient.c
|
|
|
|
|
;; to here.
|
|
|
|
|
;; - fix up handling of the client's environment (place it in the terminal?).
|
|
|
|
|
|
1992-07-15 21:31:44 +00:00
|
|
|
|
;;; Code:
|
2002-09-18 02:10:18 +00:00
|
|
|
|
|
|
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
|
1997-08-18 20:01:25 +00:00
|
|
|
|
(defgroup server nil
|
|
|
|
|
"Emacs running as a server process."
|
|
|
|
|
:group 'external)
|
|
|
|
|
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(defcustom server-use-tcp nil
|
|
|
|
|
"If non-nil, use TCP sockets instead of local sockets."
|
|
|
|
|
:set #'(lambda (sym val)
|
|
|
|
|
(unless (featurep 'make-network-process '(:family local))
|
|
|
|
|
(setq val t)
|
|
|
|
|
(unless load-in-progress
|
|
|
|
|
(message "Local sockets unsupported, using TCP sockets")))
|
|
|
|
|
(when val (random t))
|
|
|
|
|
(set-default sym val))
|
|
|
|
|
:group 'server
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:version "22.1")
|
|
|
|
|
|
|
|
|
|
(defcustom server-host nil
|
|
|
|
|
"The name or IP address to use as host address of the server process.
|
|
|
|
|
If set, the server accepts remote connections; otherwise it is local."
|
|
|
|
|
:group 'server
|
|
|
|
|
:type '(choice
|
|
|
|
|
(string :tag "Name or IP address")
|
|
|
|
|
(const :tag "Local" nil))
|
|
|
|
|
:version "22.1")
|
|
|
|
|
(put 'server-host 'risky-local-variable t)
|
|
|
|
|
|
2008-10-24 09:39:27 +00:00
|
|
|
|
(defcustom server-auth-dir (locate-user-emacs-file "server/")
|
2006-10-30 23:24:18 +00:00
|
|
|
|
"Directory for server authentication files."
|
|
|
|
|
:group 'server
|
|
|
|
|
:type 'directory
|
|
|
|
|
:version "22.1")
|
|
|
|
|
(put 'server-auth-dir 'risky-local-variable t)
|
|
|
|
|
|
2006-11-10 09:46:51 +00:00
|
|
|
|
(defcustom server-raise-frame t
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"If non-nil, raise frame when switching to a buffer."
|
2006-11-10 09:46:51 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:version "22.1")
|
|
|
|
|
|
1997-08-18 20:01:25 +00:00
|
|
|
|
(defcustom server-visit-hook nil
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Hook run when visiting a file for the Emacs server."
|
1997-08-18 20:01:25 +00:00
|
|
|
|
:group 'server
|
2002-09-25 19:54:13 +00:00
|
|
|
|
:type 'hook)
|
1997-08-18 20:01:25 +00:00
|
|
|
|
|
|
|
|
|
(defcustom server-switch-hook nil
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Hook run when switching to a buffer for the Emacs server."
|
1997-08-18 20:01:25 +00:00
|
|
|
|
:group 'server
|
2002-09-25 19:54:13 +00:00
|
|
|
|
:type 'hook)
|
1997-08-18 20:01:25 +00:00
|
|
|
|
|
|
|
|
|
(defcustom server-done-hook nil
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Hook run when done editing a buffer for the Emacs server."
|
1997-08-18 20:01:25 +00:00
|
|
|
|
:group 'server
|
2002-09-25 19:54:13 +00:00
|
|
|
|
:type 'hook)
|
1994-05-20 23:48:12 +00:00
|
|
|
|
|
2003-01-13 16:44:07 +00:00
|
|
|
|
(defvar server-process nil
|
|
|
|
|
"The current server process.")
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
(defvar server-clients nil
|
|
|
|
|
"List of current server clients.
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
Each element is a process.")
|
Bugfix festival.
lib-src/emacsclient.c (main_argc, main_argv): New variables.
(main): Initialize them.
(fail): Use them.
(window_change, copy_from_to): Don't kill if emacs_pid is zero.
(pty_conversation): Watch the command socket, too. Read emacs_pid
here. Emacs and emacsclient could deadlock if Emacs tried to do a
reset_sys_modes before sending its pid.
lisp/server.el: Automatically delete the client frame when done editing.
(server-frames): New variable.
(server-process-filter, server-sentinel, server-buffer-done): Use it.
(server-process-filter): Do a redisplay before evaluating other
parameters. (Prevents "emacsclient -h -e '(delete-frame)'" from
messing up the system.
src/dispextern.h: Update prototypes.
src/dispnew.c (window_change_signal): Do nothing if !term_initted.
(init_display): Set the frame size from the tty data after term_init.
src/emacs.c (main): Make sure things that init_sys_modes needs are
initialized before init_display (which calls init_sys_modes now).
(sort_args): Use xfree, not free.
(shut_down_emacs) [!EMACS_HAVE_TTY_PGRP]: Use reset_all_sys_modes
instead of reset_sys_modes.
src/frame.c (make_terminal_frame): Sigh. Move terminal initialization
back to the middle of frame setup. Handle errors by making sure that
the delete_tty() called from term_init() will see and delete this
frame.
(Fdelete_frame): Kill the frame before calling delete_tty(). Fix
condition for tty deletion.
src/keyboard.c (Fset_input_mode): Use reset_sys_modes on the current
terminal only.
src/lisp.h: Remove duplicate prototypes.
src/msdos.c (croak): use reset_all_sys_modes().
src/sysdeps.c (init_baud_rate): Added tty parameter, use it instead of CURTTY.
(child_setup_tty): Reset sigio on stdin, not CURTTY().
(reset_sigio): Added fd parameter, put explicit fcntl there.
(request_sigio, unrequest_sigio)[FASYNC]: Simply block/unblock the
SIGIO signal, don't touch the file params. There are multiple ttys
now, and we can't disable the SIGIO from emacsclient.
(get_tty_size)[VMS]: Use tty_out instead of CURTTY().
(reset_sys_modes): Don't call cursor_to, clear_end_of_line; call
cmgoto and tty_clear_end_of_line instead. The frame may already be
dead. Updated reset_sigio call.
src/term.c (clear_and_of_line): Separate tty-dependent stuff to
tty_clear_end_of_line() for reset_sys_modes.
(tty_clear_end_of_line): New function.
(term_init): Added frame parameter, don't use selected_frame.
Set the frame's output_data.tty value (in case there is an error
later). Set the frame size in Wcm, not in the frame. Only free the
termcap buffer if there is a termcap-related error. Call
init_sys_modes last, not first.
(deleting_tty): New variable.
(delete_tty): Use it for handling recursive calls. Free deleted tty,
except its Wcm (there is still a dangling reference somewhere).
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-19
2003-12-29 07:16:26 +00:00
|
|
|
|
|
1990-02-22 10:44:55 +00:00
|
|
|
|
(defvar server-buffer-clients nil
|
2006-02-23 02:59:27 +00:00
|
|
|
|
"List of client processes requesting editing of current buffer.")
|
1994-03-03 19:23:59 +00:00
|
|
|
|
(make-variable-buffer-local 'server-buffer-clients)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
;; Changing major modes should not erase this local.
|
|
|
|
|
(put 'server-buffer-clients 'permanent-local t)
|
|
|
|
|
|
2003-01-15 17:49:32 +00:00
|
|
|
|
(defcustom server-window nil
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Specification of the window to use for selecting Emacs server buffers.
|
1993-06-11 18:28:44 +00:00
|
|
|
|
If nil, use the selected window.
|
2002-11-02 05:29:13 +00:00
|
|
|
|
If it is a function, it should take one argument (a buffer) and
|
2003-01-15 17:49:32 +00:00
|
|
|
|
display and select it. A common value is `pop-to-buffer'.
|
|
|
|
|
If it is a window, use that.
|
|
|
|
|
If it is a frame, use the frame's selected window.
|
|
|
|
|
|
|
|
|
|
It is not meaningful to set this to a specific frame or window with Custom.
|
|
|
|
|
Only programs can do so."
|
|
|
|
|
:group 'server
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2003-01-15 17:49:32 +00:00
|
|
|
|
:type '(choice (const :tag "Use selected window"
|
|
|
|
|
:match (lambda (widget value)
|
|
|
|
|
(not (functionp value)))
|
|
|
|
|
nil)
|
2007-07-31 13:14:33 +00:00
|
|
|
|
(function-item :tag "Display in new frame" switch-to-buffer-other-frame)
|
2003-01-15 17:49:32 +00:00
|
|
|
|
(function-item :tag "Use pop-to-buffer" pop-to-buffer)
|
|
|
|
|
(function :tag "Other function")))
|
1993-06-11 18:28:44 +00:00
|
|
|
|
|
1997-08-18 20:01:25 +00:00
|
|
|
|
(defcustom server-temp-file-regexp "^/tmp/Re\\|/draft$"
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Regexp matching names of temporary files.
|
2003-01-15 17:49:32 +00:00
|
|
|
|
These are deleted and reused after each edit by the programs that
|
|
|
|
|
invoke the Emacs server."
|
1997-08-18 20:01:25 +00:00
|
|
|
|
:group 'server
|
|
|
|
|
:type 'regexp)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2000-08-21 15:26:01 +00:00
|
|
|
|
(defcustom server-kill-new-buffers t
|
2006-11-27 20:58:37 +00:00
|
|
|
|
"Whether to kill buffers when done with them.
|
2000-08-21 15:26:01 +00:00
|
|
|
|
If non-nil, kill a buffer unless it already existed before editing
|
2007-10-06 01:44:51 +00:00
|
|
|
|
it with the Emacs server. If nil, kill only buffers as specified by
|
2000-08-21 15:26:01 +00:00
|
|
|
|
`server-temp-file-regexp'.
|
2007-10-06 01:44:51 +00:00
|
|
|
|
Please note that only buffers that still have a client are killed,
|
|
|
|
|
i.e. buffers visited with \"emacsclient --no-wait\" are never killed in
|
2000-08-21 15:26:01 +00:00
|
|
|
|
this way."
|
|
|
|
|
:group 'server
|
|
|
|
|
:type 'boolean
|
|
|
|
|
:version "21.1")
|
|
|
|
|
|
1990-02-22 10:44:55 +00:00
|
|
|
|
(or (assq 'server-buffer-clients minor-mode-alist)
|
2006-11-01 21:37:11 +00:00
|
|
|
|
(push '(server-buffer-clients " Server") minor-mode-alist))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2000-08-21 15:26:01 +00:00
|
|
|
|
(defvar server-existing-buffer nil
|
2002-09-18 12:19:57 +00:00
|
|
|
|
"Non-nil means the buffer existed before the server was asked to visit it.
|
2001-11-11 17:56:23 +00:00
|
|
|
|
This means that the server should not kill the buffer when you say you
|
2002-09-18 12:19:57 +00:00
|
|
|
|
are done with it in the server.")
|
2000-08-21 15:26:01 +00:00
|
|
|
|
(make-variable-buffer-local 'server-existing-buffer)
|
|
|
|
|
|
2004-03-11 18:35:20 +00:00
|
|
|
|
(defvar server-name "server")
|
|
|
|
|
|
2008-04-05 17:55:00 +00:00
|
|
|
|
(defvar server-socket-dir (format "/tmp/emacs%d" (user-uid))
|
|
|
|
|
"The directory in which to place the server socket.")
|
2002-09-25 19:54:13 +00:00
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(defun server-clients-with (property value)
|
|
|
|
|
"Return a list of clients with PROPERTY set to VALUE."
|
|
|
|
|
(let (result)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(dolist (proc server-clients result)
|
|
|
|
|
(when (equal value (process-get proc property))
|
|
|
|
|
(push proc result)))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
|
|
|
|
(defun server-add-client (proc)
|
|
|
|
|
"Create a client for process PROC, if it doesn't already have one.
|
|
|
|
|
New clients have no properties."
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(add-to-list 'server-clients proc))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
(defmacro server-with-environment (env vars &rest body)
|
|
|
|
|
"Evaluate BODY with environment variables VARS set to those in ENV.
|
2004-10-10 18:11:21 +00:00
|
|
|
|
The environment variables are then restored to their previous values.
|
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
VARS should be a list of strings.
|
|
|
|
|
ENV should be in the same format as `process-environment'."
|
2004-10-10 18:11:21 +00:00
|
|
|
|
(declare (indent 2))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(let ((var (make-symbol "var"))
|
|
|
|
|
(value (make-symbol "value")))
|
|
|
|
|
`(let ((process-environment process-environment))
|
2005-11-19 19:17:56 +00:00
|
|
|
|
(dolist (,var ,vars)
|
2007-09-21 07:10:07 +00:00
|
|
|
|
(let ((,value (getenv-internal ,var ,env)))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(push (if (null ,value)
|
|
|
|
|
,var
|
|
|
|
|
(concat ,var "=" ,value))
|
|
|
|
|
process-environment)))
|
|
|
|
|
(progn ,@body))))
|
2004-10-10 18:11:21 +00:00
|
|
|
|
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(defun server-delete-client (proc &optional noframe)
|
2007-10-28 15:17:08 +00:00
|
|
|
|
"Delete PROC, including its buffers, terminals and frames.
|
2004-04-19 14:21:37 +00:00
|
|
|
|
If NOFRAME is non-nil, let the frames live. (To be used from
|
2006-02-23 02:59:27 +00:00
|
|
|
|
`delete-frame-functions'.)"
|
2007-12-10 03:51:25 +00:00
|
|
|
|
(server-log (concat "server-delete-client" (if noframe " noframe")) proc)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; Force a new lookup of client (prevents infinite recursion).
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(when (memq proc server-clients)
|
|
|
|
|
(let ((buffers (process-get proc 'buffers)))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
2006-02-23 02:59:27 +00:00
|
|
|
|
;; Kill the client's buffers.
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(dolist (buf buffers)
|
2004-04-19 14:16:10 +00:00
|
|
|
|
(when (buffer-live-p buf)
|
|
|
|
|
(with-current-buffer buf
|
|
|
|
|
;; Kill the buffer if necessary.
|
2006-02-23 02:59:27 +00:00
|
|
|
|
(when (and (equal server-buffer-clients
|
|
|
|
|
(list proc))
|
2004-04-19 14:16:10 +00:00
|
|
|
|
(or (and server-kill-new-buffers
|
|
|
|
|
(not server-existing-buffer))
|
2006-02-23 02:59:27 +00:00
|
|
|
|
(server-temp-file-p))
|
|
|
|
|
(not (buffer-modified-p)))
|
|
|
|
|
(let (flag)
|
|
|
|
|
(unwind-protect
|
|
|
|
|
(progn (setq server-buffer-clients nil)
|
|
|
|
|
(kill-buffer (current-buffer))
|
|
|
|
|
(setq flag t))
|
|
|
|
|
(unless flag
|
|
|
|
|
;; Restore clients if user pressed C-g in `kill-buffer'.
|
|
|
|
|
(setq server-buffer-clients (list proc)))))))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
2006-01-02 07:50:53 +00:00
|
|
|
|
;; Delete the client's frames.
|
|
|
|
|
(unless noframe
|
|
|
|
|
(dolist (frame (frame-list))
|
|
|
|
|
(when (and (frame-live-p frame)
|
|
|
|
|
(equal proc (frame-parameter frame 'client)))
|
|
|
|
|
;; Prevent `server-handle-delete-frame' from calling us
|
|
|
|
|
;; recursively.
|
|
|
|
|
(set-frame-parameter frame 'client nil)
|
|
|
|
|
(delete-frame frame))))
|
|
|
|
|
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(setq server-clients (delq proc server-clients))
|
2006-02-23 02:59:27 +00:00
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; Delete the client's tty.
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(let ((terminal (process-get proc 'terminal)))
|
2007-09-28 16:55:00 +00:00
|
|
|
|
;; Only delete the terminal if it is non-nil.
|
|
|
|
|
(when (and terminal (eq (terminal-live-p terminal) 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
|
|
|
|
(delete-terminal terminal)))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
|
|
|
|
;; Delete the client's process.
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(if (eq (process-status proc) 'open)
|
|
|
|
|
(delete-process proc))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
|
|
|
|
(server-log "Deleted" proc))))
|
|
|
|
|
|
2008-01-21 12:06:59 +00:00
|
|
|
|
(defvar server-log-time-function 'current-time-string
|
2008-01-27 22:47:58 +00:00
|
|
|
|
"Function to generate timestamps for `server-buffer'.")
|
2008-01-21 12:06:59 +00:00
|
|
|
|
|
2008-01-26 21:54:44 +00:00
|
|
|
|
(defconst server-buffer " *server*"
|
|
|
|
|
"Buffer used internally by Emacs's server.
|
|
|
|
|
One use is to log the I/O for debugging purposes (see `server-log'),
|
|
|
|
|
the other is to provide a current buffer in which the process filter can
|
2008-01-27 22:47:58 +00:00
|
|
|
|
safely let-bind buffer-local variables like `default-directory'.")
|
2008-01-26 21:54:44 +00:00
|
|
|
|
|
|
|
|
|
(defvar server-log nil
|
|
|
|
|
"If non-nil, log the server's inputs and outputs in the `server-buffer'.")
|
|
|
|
|
|
2002-09-18 02:10:18 +00:00
|
|
|
|
(defun server-log (string &optional client)
|
2008-01-26 21:54:44 +00:00
|
|
|
|
"If `server-log' is non-nil, log STRING to `server-buffer'.
|
2007-10-28 15:17:08 +00:00
|
|
|
|
If CLIENT is non-nil, add a description of it to the logged message."
|
2008-01-26 21:54:44 +00:00
|
|
|
|
(when server-log
|
|
|
|
|
(with-current-buffer (get-buffer-create server-buffer)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(goto-char (point-max))
|
2008-01-21 12:06:59 +00:00
|
|
|
|
(insert (funcall server-log-time-function)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(cond
|
2008-01-21 12:06:59 +00:00
|
|
|
|
((null client) " ")
|
|
|
|
|
((listp client) (format " %s: " (car client)))
|
|
|
|
|
(t (format " %s: " client)))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
string)
|
|
|
|
|
(or (bolp) (newline)))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
(defun server-sentinel (proc msg)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
"The process sentinel for Emacs server connections."
|
2005-10-24 11:06:03 +00:00
|
|
|
|
;; If this is a new client process, set the query-on-exit flag to nil
|
|
|
|
|
;; for this process (it isn't inherited from the server process).
|
|
|
|
|
(when (and (eq (process-status proc) 'open)
|
|
|
|
|
(process-query-on-exit-flag proc))
|
|
|
|
|
(set-process-query-on-exit-flag proc nil))
|
2006-11-02 23:46:14 +00:00
|
|
|
|
;; Delete the associated connection file, if applicable.
|
|
|
|
|
;; This is actually problematic: the file may have been overwritten by
|
|
|
|
|
;; another Emacs server in the mean time, so it's not ours any more.
|
|
|
|
|
;; (and (process-contact proc :server)
|
|
|
|
|
;; (eq (process-status proc) 'closed)
|
|
|
|
|
;; (ignore-errors (delete-file (process-get proc :server-file))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(server-log (format "Status changed to %s: %s" (process-status proc) msg) proc)
|
|
|
|
|
(server-delete-client proc))
|
2002-09-25 19:54:13 +00:00
|
|
|
|
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(defun server-select-display (display)
|
|
|
|
|
;; If the current frame is on `display' we're all set.
|
2007-10-17 16:22:48 +00:00
|
|
|
|
;; Similarly if we are unable to open a frames on other displays, there's
|
|
|
|
|
;; nothing more we can do.
|
|
|
|
|
(unless (or (not (fboundp 'make-frame-on-display))
|
|
|
|
|
(equal (frame-parameter (selected-frame) 'display) display))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; Otherwise, look for an existing frame there and select it.
|
|
|
|
|
(dolist (frame (frame-list))
|
|
|
|
|
(when (equal (frame-parameter frame 'display) display)
|
|
|
|
|
(select-frame frame)))
|
|
|
|
|
;; If there's no frame on that display yet, create and select one.
|
|
|
|
|
(unless (equal (frame-parameter (selected-frame) 'display) display)
|
|
|
|
|
(let* ((buffer (generate-new-buffer " *server-dummy*"))
|
|
|
|
|
(frame (make-frame-on-display
|
|
|
|
|
display
|
|
|
|
|
;; Make it display (and remember) some dummy buffer, so
|
|
|
|
|
;; we can detect later if the frame is in use or not.
|
2007-12-10 03:51:25 +00:00
|
|
|
|
`((server-dummy-buffer . ,buffer)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; This frame may be deleted later (see
|
|
|
|
|
;; server-unselect-display) so we want it to be as
|
|
|
|
|
;; unobtrusive as possible.
|
|
|
|
|
(visibility . nil)))))
|
|
|
|
|
(select-frame frame)
|
|
|
|
|
(set-window-buffer (selected-window) buffer)
|
|
|
|
|
frame))))
|
|
|
|
|
|
|
|
|
|
(defun server-unselect-display (frame)
|
|
|
|
|
(when (frame-live-p frame)
|
|
|
|
|
;; If the temporary frame is in use (displays something real), make it
|
|
|
|
|
;; visible. If not (which can happen if the user's customizations call
|
|
|
|
|
;; pop-to-buffer etc.), delete it to avoid preserving the connection after
|
|
|
|
|
;; the last real frame is deleted.
|
|
|
|
|
(if (and (eq (frame-first-window frame)
|
|
|
|
|
(next-window (frame-first-window frame) 'nomini))
|
|
|
|
|
(eq (window-buffer (frame-first-window frame))
|
|
|
|
|
(frame-parameter frame 'server-dummy-buffer)))
|
|
|
|
|
;; The temp frame still only shows one buffer, and that is the
|
|
|
|
|
;; internal temp buffer.
|
|
|
|
|
(delete-frame frame)
|
|
|
|
|
(set-frame-parameter frame 'visibility t))
|
|
|
|
|
(kill-buffer (frame-parameter frame 'server-dummy-buffer))
|
|
|
|
|
(set-frame-parameter frame 'server-dummy-buffer nil)))
|
|
|
|
|
|
2004-02-19 23:55:51 +00:00
|
|
|
|
(defun server-handle-delete-frame (frame)
|
|
|
|
|
"Delete the client connection when the emacsclient frame is deleted."
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(let ((proc (frame-parameter frame 'client)))
|
2005-07-06 01:41:56 +00:00
|
|
|
|
(when (and (frame-live-p frame)
|
|
|
|
|
proc
|
2006-01-02 07:50:53 +00:00
|
|
|
|
;; See if this is the last frame for this client.
|
2006-01-02 09:07:22 +00:00
|
|
|
|
(>= 1 (let ((frame-num 0))
|
2006-01-02 08:35:45 +00:00
|
|
|
|
(dolist (f (frame-list))
|
2006-01-02 07:50:53 +00:00
|
|
|
|
(when (eq proc (frame-parameter f 'client))
|
|
|
|
|
(setq frame-num (1+ frame-num))))
|
|
|
|
|
frame-num)))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(server-log (format "server-handle-delete-frame, frame %s" frame) proc)
|
2004-04-19 14:21:37 +00:00
|
|
|
|
(server-delete-client proc 'noframe)))) ; Let delete-frame delete the frame later.
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
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 server-handle-suspend-tty (terminal)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
"Notify the emacsclient process to suspend itself when its tty device is suspended."
|
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
|
|
|
|
(dolist (proc (server-clients-with 'terminal terminal))
|
|
|
|
|
(server-log (format "server-handle-suspend-tty, terminal %s" terminal) proc)
|
2004-10-10 16:41:15 +00:00
|
|
|
|
(condition-case err
|
2005-02-04 13:56:51 +00:00
|
|
|
|
(server-send-string proc "-suspend \n")
|
2007-09-19 02:00:54 +00:00
|
|
|
|
(file-error ;The pipe/socket was closed.
|
|
|
|
|
(ignore-errors (server-delete-client proc))))))
|
2002-09-27 17:43:29 +00:00
|
|
|
|
|
2002-09-25 19:54:13 +00:00
|
|
|
|
(defun server-unquote-arg (arg)
|
2005-02-04 13:56:51 +00:00
|
|
|
|
"Remove &-quotation from ARG.
|
|
|
|
|
See `server-quote-arg' and `server-process-filter'."
|
2002-09-25 19:54:13 +00:00
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"&." (lambda (s)
|
|
|
|
|
(case (aref s 1)
|
|
|
|
|
(?& "&")
|
|
|
|
|
(?- "-")
|
|
|
|
|
(?n "\n")
|
|
|
|
|
(t " ")))
|
|
|
|
|
arg t t))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
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 server-quote-arg (arg)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
"In ARG, insert a & before each &, each space, each newline, 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
|
|
|
|
Change spaces to underscores, too, so that the return value never
|
2005-02-04 13:56:51 +00:00
|
|
|
|
contains a space.
|
|
|
|
|
|
|
|
|
|
See `server-unquote-arg' and `server-process-filter'."
|
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
|
|
|
|
(replace-regexp-in-string
|
|
|
|
|
"[-&\n ]" (lambda (s)
|
|
|
|
|
(case (aref s 0)
|
|
|
|
|
(?& "&&")
|
|
|
|
|
(?- "&-")
|
|
|
|
|
(?\n "&n")
|
|
|
|
|
(?\s "&_")))
|
|
|
|
|
arg t t))
|
|
|
|
|
|
2005-02-04 13:56:51 +00:00
|
|
|
|
(defun server-send-string (proc string)
|
|
|
|
|
"A wrapper around `proc-send-string' for logging."
|
|
|
|
|
(server-log (concat "Sent " string) proc)
|
|
|
|
|
(process-send-string proc string))
|
|
|
|
|
|
2003-04-12 19:04:11 +00:00
|
|
|
|
(defun server-ensure-safe-dir (dir)
|
|
|
|
|
"Make sure DIR is a directory with no race-condition issues.
|
|
|
|
|
Creates the directory if necessary and makes sure:
|
|
|
|
|
- there's no symlink involved
|
|
|
|
|
- it's owned by us
|
|
|
|
|
- it's not readable/writable by anybody else."
|
|
|
|
|
(setq dir (directory-file-name dir))
|
|
|
|
|
(let ((attrs (file-attributes dir)))
|
|
|
|
|
(unless attrs
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(letf (((default-file-modes) ?\700)) (make-directory dir t))
|
2003-04-12 19:04:11 +00:00
|
|
|
|
(setq attrs (file-attributes dir)))
|
|
|
|
|
;; Check that it's safe for use.
|
2007-01-10 03:51:24 +00:00
|
|
|
|
(unless (and (eq t (car attrs)) (eql (nth 2 attrs) (user-uid))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(or (eq system-type 'windows-nt)
|
|
|
|
|
(zerop (logand ?\077 (file-modes dir)))))
|
2003-04-12 19:04:11 +00:00
|
|
|
|
(error "The directory %s is unsafe" dir))))
|
|
|
|
|
|
1991-05-09 21:50:34 +00:00
|
|
|
|
;;;###autoload
|
1990-02-22 10:44:55 +00:00
|
|
|
|
(defun server-start (&optional leave-dead)
|
|
|
|
|
"Allow this Emacs process to be a server for client processes.
|
|
|
|
|
This starts a server communications subprocess through which
|
2004-10-10 16:41:15 +00:00
|
|
|
|
client \"editors\" can send your editing commands to this Emacs
|
|
|
|
|
job. To use the server, set up the program `emacsclient' in the
|
1990-02-22 10:44:55 +00:00
|
|
|
|
Emacs distribution as your standard \"editor\".
|
|
|
|
|
|
2007-01-27 19:03:43 +00:00
|
|
|
|
Optional argument LEAVE-DEAD (interactively, a prefix arg) means just
|
|
|
|
|
kill any existing server communications subprocess."
|
1990-02-22 10:44:55 +00:00
|
|
|
|
(interactive "P")
|
2004-06-08 01:33:48 +00:00
|
|
|
|
(when (or
|
|
|
|
|
(not server-clients)
|
|
|
|
|
(yes-or-no-p
|
|
|
|
|
"The current server still has clients; delete them? "))
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(when server-process
|
|
|
|
|
;; kill it dead!
|
|
|
|
|
(ignore-errors (delete-process server-process)))
|
2004-06-08 01:33:48 +00:00
|
|
|
|
;; Delete the socket files made by previous server invocations.
|
|
|
|
|
(condition-case ()
|
|
|
|
|
(delete-file (expand-file-name server-name server-socket-dir))
|
|
|
|
|
(error nil))
|
|
|
|
|
;; If this Emacs already had a server, clear out associated status.
|
|
|
|
|
(while server-clients
|
|
|
|
|
(server-delete-client (car server-clients)))
|
2006-05-17 18:05:02 +00:00
|
|
|
|
;; Now any previous server is properly stopped.
|
2004-06-08 01:33:48 +00:00
|
|
|
|
(if leave-dead
|
|
|
|
|
(progn
|
|
|
|
|
(server-log (message "Server stopped"))
|
|
|
|
|
(setq server-process nil))
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
|
|
|
|
|
(server-file (expand-file-name server-name server-dir)))
|
|
|
|
|
;; Make sure there is a safe directory in which to place the socket.
|
|
|
|
|
(server-ensure-safe-dir server-dir)
|
|
|
|
|
;; Remove any leftover socket or authentication file.
|
|
|
|
|
(ignore-errors (delete-file server-file))
|
|
|
|
|
(when server-process
|
|
|
|
|
(server-log (message "Restarting server")))
|
|
|
|
|
(letf (((default-file-modes) ?\700))
|
2007-09-04 23:28:49 +00:00
|
|
|
|
(add-hook 'suspend-tty-functions 'server-handle-suspend-tty)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(add-hook 'delete-frame-functions 'server-handle-delete-frame)
|
|
|
|
|
(add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function)
|
|
|
|
|
(add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
|
2007-11-07 00:27:13 +00:00
|
|
|
|
(add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(setq server-process
|
|
|
|
|
(apply #'make-network-process
|
|
|
|
|
:name server-name
|
|
|
|
|
:server t
|
|
|
|
|
:noquery t
|
|
|
|
|
:sentinel 'server-sentinel
|
|
|
|
|
:filter 'server-process-filter
|
|
|
|
|
;; We must receive file names without being decoded.
|
|
|
|
|
;; Those are decoded by server-process-filter according
|
2008-04-23 15:37:07 +00:00
|
|
|
|
;; to file-name-coding-system. Also don't get
|
|
|
|
|
;; confused by CRs since we don't quote them.
|
|
|
|
|
:coding 'raw-text-unix
|
2008-01-26 21:54:44 +00:00
|
|
|
|
;; The other args depend on the kind of socket used.
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(if server-use-tcp
|
|
|
|
|
(list :family nil
|
|
|
|
|
:service t
|
|
|
|
|
:host (or server-host 'local)
|
|
|
|
|
:plist '(:authenticated nil))
|
|
|
|
|
(list :family 'local
|
|
|
|
|
:service server-file
|
|
|
|
|
:plist '(:authenticated t)))))
|
|
|
|
|
(unless server-process (error "Could not start server process"))
|
|
|
|
|
(when server-use-tcp
|
|
|
|
|
(let ((auth-key
|
|
|
|
|
(loop
|
2007-10-17 08:15:04 +00:00
|
|
|
|
;; The auth key is a 64-byte string of random chars in the
|
|
|
|
|
;; range `!'..`~'.
|
|
|
|
|
for i below 64
|
|
|
|
|
collect (+ 33 (random 94)) into auth
|
|
|
|
|
finally return (concat auth))))
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(process-put server-process :auth-key auth-key)
|
|
|
|
|
(with-temp-file server-file
|
|
|
|
|
(set-buffer-multibyte nil)
|
|
|
|
|
(setq buffer-file-coding-system 'no-conversion)
|
|
|
|
|
(insert (format-network-address
|
|
|
|
|
(process-contact server-process :local))
|
|
|
|
|
" " (int-to-string (emacs-pid))
|
|
|
|
|
"\n" auth-key)))))))))
|
2003-01-15 17:49:32 +00:00
|
|
|
|
|
2007-09-19 02:00:54 +00:00
|
|
|
|
(defun server-running-p (&optional name)
|
|
|
|
|
"Test whether server NAME is running."
|
|
|
|
|
(interactive
|
|
|
|
|
(list (if current-prefix-arg
|
|
|
|
|
(read-string "Server name: " nil nil server-name))))
|
|
|
|
|
(unless name (setq name server-name))
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(progn
|
|
|
|
|
(delete-process
|
|
|
|
|
(make-network-process
|
|
|
|
|
:name "server-client-test" :family 'local :server nil :noquery t
|
|
|
|
|
:service (expand-file-name name server-socket-dir)))
|
|
|
|
|
t)
|
|
|
|
|
(file-error nil)))
|
|
|
|
|
|
2003-01-15 17:49:32 +00:00
|
|
|
|
;;;###autoload
|
|
|
|
|
(define-minor-mode server-mode
|
|
|
|
|
"Toggle Server mode.
|
|
|
|
|
With ARG, turn Server mode on if ARG is positive, off otherwise.
|
|
|
|
|
Server mode runs a process that accepts commands from the
|
|
|
|
|
`emacsclient' program. See `server-start' and Info node `Emacs server'."
|
|
|
|
|
:global t
|
|
|
|
|
:group 'server
|
2005-02-09 15:50:47 +00:00
|
|
|
|
:version "22.1"
|
2003-01-15 17:49:32 +00:00
|
|
|
|
;; Fixme: Should this check for an existing server socket and do
|
|
|
|
|
;; nothing if there is one (for multiple Emacs sessions)?
|
|
|
|
|
(server-start (not server-mode)))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(defun server-eval-and-print (expr proc)
|
|
|
|
|
"Eval EXPR and send the result back to client PROC."
|
|
|
|
|
(let ((v (eval (car (read-from-string expr)))))
|
|
|
|
|
(when (and v proc)
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(let ((standard-output (current-buffer)))
|
|
|
|
|
(pp v)
|
|
|
|
|
(let ((text (buffer-substring-no-properties
|
|
|
|
|
(point-min) (point-max))))
|
|
|
|
|
(server-send-string
|
|
|
|
|
proc (format "-print %s\n"
|
|
|
|
|
(server-quote-arg text)))))))))
|
|
|
|
|
|
|
|
|
|
(defun server-create-tty-frame (tty type proc)
|
2007-10-10 20:43:22 +00:00
|
|
|
|
(add-to-list 'frame-inherited-parameters 'client)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(let ((frame
|
|
|
|
|
(server-with-environment (process-get proc 'env)
|
|
|
|
|
'("LANG" "LC_CTYPE" "LC_ALL"
|
|
|
|
|
;; For tgetent(3); list according to ncurses(3).
|
|
|
|
|
"BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
|
|
|
|
|
"NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
|
|
|
|
|
"NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
|
2007-10-28 15:17:08 +00:00
|
|
|
|
"TERMINFO_DIRS" "TERMPATH"
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; rxvt wants these
|
|
|
|
|
"COLORFGBG" "COLORTERM")
|
|
|
|
|
(make-frame-on-tty tty type
|
|
|
|
|
;; Ignore nowait here; we always need to
|
|
|
|
|
;; clean up opened ttys when the client dies.
|
|
|
|
|
`((client . ,proc)
|
2007-10-10 20:43:22 +00:00
|
|
|
|
;; This is a leftover from an earlier
|
|
|
|
|
;; attempt at making it possible for process
|
|
|
|
|
;; run in the server process to use the
|
|
|
|
|
;; environment of the client process.
|
|
|
|
|
;; It has no effect now and to make it work
|
|
|
|
|
;; we'd need to decide how to make
|
|
|
|
|
;; process-environment interact with client
|
|
|
|
|
;; envvars, and then to change the
|
|
|
|
|
;; C functions `child_setup' and
|
|
|
|
|
;; `getenv_internal' accordingly.
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(environment . ,(process-get proc 'env)))))))
|
2007-10-28 15:17:08 +00:00
|
|
|
|
|
2007-09-21 07:10:07 +00:00
|
|
|
|
;; ttys don't use the `display' parameter, but callproc.c does to set
|
|
|
|
|
;; the DISPLAY environment on subprocesses.
|
|
|
|
|
(set-frame-parameter frame 'display
|
|
|
|
|
(getenv-internal "DISPLAY" (process-get proc 'env)))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(select-frame frame)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(process-put proc 'frame frame)
|
|
|
|
|
(process-put proc 'terminal (frame-terminal frame))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
|
|
|
|
;; Display *scratch* by default.
|
|
|
|
|
(switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
|
|
|
|
|
|
|
|
|
|
;; Reply with our pid.
|
|
|
|
|
(server-send-string proc (concat "-emacs-pid "
|
|
|
|
|
(number-to-string (emacs-pid)) "\n"))
|
|
|
|
|
frame))
|
|
|
|
|
|
|
|
|
|
(defun server-create-window-system-frame (display nowait proc)
|
2007-10-10 20:43:22 +00:00
|
|
|
|
(add-to-list 'frame-inherited-parameters 'client)
|
2007-09-21 07:10:07 +00:00
|
|
|
|
(if (not (fboundp 'make-frame-on-display))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(progn
|
|
|
|
|
;; This emacs does not support X.
|
|
|
|
|
(server-log "Window system unsupported" proc)
|
|
|
|
|
(server-send-string proc "-window-system-unsupported \n")
|
|
|
|
|
nil)
|
|
|
|
|
;; Flag frame as client-created, but use a dummy client.
|
|
|
|
|
;; This will prevent the frame from being deleted when
|
|
|
|
|
;; emacsclient quits while also preventing
|
|
|
|
|
;; `server-save-buffers-kill-terminal' from unexpectedly
|
|
|
|
|
;; killing emacs on that frame.
|
|
|
|
|
(let* ((params `((client . ,(if nowait 'nowait proc))
|
2007-10-10 20:43:22 +00:00
|
|
|
|
;; This is a leftover, see above.
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(environment . ,(process-get proc 'env))))
|
|
|
|
|
(frame (make-frame-on-display
|
|
|
|
|
(or display
|
|
|
|
|
(frame-parameter nil 'display)
|
|
|
|
|
(getenv "DISPLAY")
|
|
|
|
|
(error "Please specify display"))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
params)))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(server-log (format "%s created" frame) proc)
|
|
|
|
|
(select-frame frame)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(process-put proc 'frame frame)
|
|
|
|
|
(process-put proc 'terminal (frame-terminal frame))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
|
|
|
|
;; Display *scratch* by default.
|
|
|
|
|
(switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
|
|
|
|
|
frame)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun server-goto-toplevel (proc)
|
|
|
|
|
(condition-case nil
|
|
|
|
|
;; If we're running isearch, we must abort it to allow Emacs to
|
|
|
|
|
;; display the buffer and switch to it.
|
|
|
|
|
(dolist (buffer (buffer-list))
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(when (bound-and-true-p isearch-mode)
|
|
|
|
|
(isearch-cancel))))
|
|
|
|
|
;; Signaled by isearch-cancel.
|
|
|
|
|
(quit (message nil)))
|
|
|
|
|
(when (> (recursion-depth) 0)
|
|
|
|
|
;; We're inside a minibuffer already, so if the emacs-client is trying
|
|
|
|
|
;; to open a frame on a new display, we might end up with an unusable
|
|
|
|
|
;; frame because input from that display will be blocked (until exiting
|
|
|
|
|
;; the minibuffer). Better exit this minibuffer right away.
|
|
|
|
|
;; Similarly with recursive-edits such as the splash screen.
|
|
|
|
|
(run-with-timer 0 nil (lexical-let ((proc proc))
|
|
|
|
|
(lambda () (server-execute-continuation proc))))
|
|
|
|
|
(top-level)))
|
|
|
|
|
|
|
|
|
|
;; We use various special properties on process objects:
|
|
|
|
|
;; - `env' stores the info about the environment of the emacsclient process.
|
|
|
|
|
;; - `continuation' is a no-arg function that we need to execute. It contains
|
|
|
|
|
;; commands we wanted to execute in some earlier invocation of the process
|
|
|
|
|
;; filter but that we somehow were unable to process at that time
|
|
|
|
|
;; (e.g. because we first need to throw to the toplevel).
|
|
|
|
|
|
|
|
|
|
(defun server-execute-continuation (proc)
|
|
|
|
|
(let ((continuation (process-get proc 'continuation)))
|
|
|
|
|
(process-put proc 'continuation nil)
|
|
|
|
|
(if continuation (ignore-errors (funcall continuation)))))
|
|
|
|
|
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(defun* server-process-filter (proc string)
|
2003-01-15 17:49:32 +00:00
|
|
|
|
"Process a request from the server to edit some files.
|
2005-02-04 13:56:51 +00:00
|
|
|
|
PROC is the server process. STRING consists of a sequence of
|
|
|
|
|
commands prefixed by a dash. Some commands have arguments; these
|
|
|
|
|
are &-quoted and need to be decoded by `server-unquote-arg'. The
|
|
|
|
|
filter parses and executes these commands.
|
|
|
|
|
|
|
|
|
|
To illustrate the protocol, here is an example command that
|
|
|
|
|
emacsclient sends to create a new X frame (note that the whole
|
|
|
|
|
sequence is sent on a single line):
|
|
|
|
|
|
|
|
|
|
-env HOME /home/lorentey
|
|
|
|
|
-env DISPLAY :0.0
|
|
|
|
|
... lots of other -env commands
|
|
|
|
|
-display :0.0
|
|
|
|
|
-window-system
|
|
|
|
|
|
|
|
|
|
The following commands are accepted by the server:
|
|
|
|
|
|
2006-12-03 15:03:30 +00:00
|
|
|
|
`-auth AUTH-STRING'
|
|
|
|
|
Authenticate the client using the secret authentication string
|
2007-06-12 08:21:13 +00:00
|
|
|
|
AUTH-STRING.
|
2006-12-03 15:03:30 +00:00
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
`-env NAME=VALUE'
|
2005-02-04 13:56:51 +00:00
|
|
|
|
An environment variable on the client side.
|
|
|
|
|
|
2006-03-26 16:34:35 +00:00
|
|
|
|
`-dir DIRNAME'
|
|
|
|
|
The current working directory of the client process.
|
|
|
|
|
|
2005-09-10 23:51:08 +00:00
|
|
|
|
`-current-frame'
|
|
|
|
|
Forbid the creation of new frames.
|
|
|
|
|
|
2005-02-04 13:56:51 +00:00
|
|
|
|
`-nowait'
|
|
|
|
|
Request that the next frame created should not be
|
|
|
|
|
associated with this client.
|
|
|
|
|
|
|
|
|
|
`-display DISPLAY'
|
|
|
|
|
Set the display name to open X frames on.
|
|
|
|
|
|
|
|
|
|
`-position LINE[:COLUMN]'
|
|
|
|
|
Go to the given line and column number
|
|
|
|
|
in the next file opened.
|
|
|
|
|
|
|
|
|
|
`-file FILENAME'
|
|
|
|
|
Load the given file in the current frame.
|
|
|
|
|
|
|
|
|
|
`-eval EXPR'
|
|
|
|
|
Evaluate EXPR as a Lisp expression and return the
|
|
|
|
|
result in -print commands.
|
|
|
|
|
|
|
|
|
|
`-window-system'
|
|
|
|
|
Open a new X frame.
|
|
|
|
|
|
|
|
|
|
`-tty DEVICENAME TYPE'
|
|
|
|
|
Open a new tty frame at the client.
|
|
|
|
|
|
|
|
|
|
`-suspend'
|
|
|
|
|
Suspend this tty frame. The client sends this string in
|
|
|
|
|
response to SIGTSTP and SIGTTOU. The server must cease all I/O
|
|
|
|
|
on this tty until it gets a -resume command.
|
|
|
|
|
|
2006-03-26 16:34:35 +00:00
|
|
|
|
`-resume'
|
2007-10-28 15:17:08 +00:00
|
|
|
|
Resume this tty frame. The client sends this string when it
|
2006-03-26 16:34:35 +00:00
|
|
|
|
gets the SIGCONT signal and it is the foreground process on its
|
|
|
|
|
controlling tty.
|
|
|
|
|
|
2005-02-04 13:56:51 +00:00
|
|
|
|
`-ignore COMMENT'
|
|
|
|
|
Do nothing, but put the comment in the server
|
|
|
|
|
log. Useful for debugging.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The following commands are accepted by the client:
|
|
|
|
|
|
|
|
|
|
`-emacs-pid PID'
|
|
|
|
|
Describes the process id of the Emacs process;
|
|
|
|
|
used to forward window change signals to it.
|
|
|
|
|
|
|
|
|
|
`-window-system-unsupported'
|
2007-10-28 15:17:08 +00:00
|
|
|
|
Signals that the server does not support creating X frames;
|
|
|
|
|
the client must try again with a tty frame.
|
2005-02-04 13:56:51 +00:00
|
|
|
|
|
|
|
|
|
`-print STRING'
|
|
|
|
|
Print STRING on stdout. Used to send values
|
|
|
|
|
returned by -eval.
|
|
|
|
|
|
|
|
|
|
`-error DESCRIPTION'
|
|
|
|
|
Signal an error (but continue processing).
|
|
|
|
|
|
|
|
|
|
`-suspend'
|
2007-10-28 15:17:08 +00:00
|
|
|
|
Suspend this terminal, i.e., stop the client process.
|
|
|
|
|
Sent when the user presses C-z."
|
2005-02-04 13:56:51 +00:00
|
|
|
|
(server-log (concat "Received " string) proc)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
;; First things first: let's check the authentication
|
|
|
|
|
(unless (process-get proc :authenticated)
|
2008-01-25 15:43:05 +00:00
|
|
|
|
(if (and (string-match "-auth \\([!-~]+\\)\n?" string)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(equal (match-string 1 string) (process-get proc :auth-key)))
|
|
|
|
|
(progn
|
|
|
|
|
(setq string (substring string (match-end 0)))
|
|
|
|
|
(process-put proc :authenticated t)
|
|
|
|
|
(server-log "Authentication successful" proc))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(server-log "Authentication failed" proc)
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(server-send-string
|
|
|
|
|
proc (concat "-error " (server-quote-arg "Authentication failed")))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(delete-process proc)
|
|
|
|
|
;; We return immediately
|
|
|
|
|
(return-from server-process-filter)))
|
2003-02-10 21:44:24 +00:00
|
|
|
|
(let ((prev (process-get proc 'previous-string)))
|
|
|
|
|
(when prev
|
|
|
|
|
(setq string (concat prev string))
|
|
|
|
|
(process-put proc 'previous-string nil)))
|
2004-02-20 01:22:10 +00:00
|
|
|
|
(condition-case err
|
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
|
|
|
|
(progn
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(server-add-client proc)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(if (not (string-match "\n" string))
|
|
|
|
|
;; Save for later any partial line that remains.
|
|
|
|
|
(when (> (length string) 0)
|
|
|
|
|
(process-put proc 'previous-string string))
|
2007-10-28 15:17:08 +00:00
|
|
|
|
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; In earlier versions of server.el (where we used an `emacsserver'
|
|
|
|
|
;; process), there could be multiple lines. Nowadays this is not
|
|
|
|
|
;; supported any more.
|
|
|
|
|
(assert (eq (match-end 0) (length string)))
|
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
|
|
|
|
(let ((request (substring string 0 (match-beginning 0)))
|
|
|
|
|
(coding-system (and default-enable-multibyte-characters
|
|
|
|
|
(or file-name-coding-system
|
|
|
|
|
default-file-name-coding-system)))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
nowait ; t if emacsclient does not want to wait for us.
|
|
|
|
|
frame ; The frame that was opened for the client (if any).
|
2005-11-19 19:17:56 +00:00
|
|
|
|
display ; Open the frame on this display.
|
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
|
|
|
|
dontkill ; t if the client should not be killed.
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(commands ())
|
2006-03-26 16:34:35 +00:00
|
|
|
|
dir
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(tty-name nil) ;nil, `window-system', or the tty name.
|
|
|
|
|
tty-type ;string.
|
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
|
|
|
|
(files nil)
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(filepos nil)
|
2007-11-23 23:59:19 +00:00
|
|
|
|
command-line-args-left
|
|
|
|
|
arg)
|
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
|
|
|
|
;; Remove this line from STRING.
|
|
|
|
|
(setq string (substring string (match-end 0)))
|
2007-11-23 23:59:19 +00:00
|
|
|
|
(setq command-line-args-left
|
|
|
|
|
(mapcar 'server-unquote-arg (split-string request " " t)))
|
|
|
|
|
(while (setq arg (pop command-line-args-left))
|
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
|
|
|
|
(cond
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; -version CLIENT-VERSION: obsolete at birth.
|
2007-11-23 23:59:19 +00:00
|
|
|
|
((and (equal "-version" arg) command-line-args-left)
|
|
|
|
|
(pop command-line-args-left))
|
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
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; -nowait: Emacsclient won't wait for a result.
|
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
|
|
|
|
((equal "-nowait" arg) (setq nowait t))
|
|
|
|
|
|
2005-09-10 23:51:08 +00:00
|
|
|
|
;; -current-frame: Don't create frames.
|
2007-09-16 04:53:39 +00:00
|
|
|
|
((equal "-current-frame" arg) (setq tty-name nil))
|
2005-09-10 23:51:08 +00:00
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; -display DISPLAY:
|
2005-11-19 19:17:56 +00:00
|
|
|
|
;; Open X frames on the given display instead of the default.
|
2007-11-23 23:59:19 +00:00
|
|
|
|
((and (equal "-display" arg) command-line-args-left)
|
2007-12-10 03:51:25 +00:00
|
|
|
|
(setq display (pop command-line-args-left))
|
|
|
|
|
(if (zerop (length display)) (setq display nil)))
|
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
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; -window-system: Open a new X 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
|
|
|
|
((equal "-window-system" arg)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(setq dontkill t)
|
|
|
|
|
(setq tty-name 'window-system))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
|
|
|
|
;; -resume: Resume a suspended tty 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
|
|
|
|
((equal "-resume" arg)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(lexical-let ((terminal (process-get proc 'terminal)))
|
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
|
|
|
|
(setq dontkill t)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(push (lambda ()
|
|
|
|
|
(when (eq (terminal-live-p terminal) t)
|
|
|
|
|
(resume-tty terminal)))
|
|
|
|
|
commands)))
|
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
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; -suspend: Suspend the client's frame. (In case we
|
|
|
|
|
;; get out of sync, and a C-z sends a SIGTSTP to
|
|
|
|
|
;; emacsclient.)
|
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
|
|
|
|
((equal "-suspend" arg)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(lexical-let ((terminal (process-get proc 'terminal)))
|
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
|
|
|
|
(setq dontkill t)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(push (lambda ()
|
|
|
|
|
(when (eq (terminal-live-p terminal) t)
|
|
|
|
|
(suspend-tty terminal)))
|
|
|
|
|
commands)))
|
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
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; -ignore COMMENT: Noop; useful for debugging emacsclient.
|
|
|
|
|
;; (The given comment appears in the server log.)
|
2007-11-23 23:59:19 +00:00
|
|
|
|
((and (equal "-ignore" arg) command-line-args-left
|
|
|
|
|
(setq dontkill t)
|
|
|
|
|
(pop command-line-args-left)))
|
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
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; -tty DEVICE-NAME TYPE: Open a new tty frame at the client.
|
2007-09-16 04:53:39 +00:00
|
|
|
|
((and (equal "-tty" arg)
|
2007-11-23 23:59:19 +00:00
|
|
|
|
(cdr command-line-args-left))
|
|
|
|
|
(setq tty-name (pop command-line-args-left)
|
|
|
|
|
tty-type (pop command-line-args-left)
|
|
|
|
|
dontkill t))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
|
|
|
|
;; -position LINE[:COLUMN]: Set point to the given
|
|
|
|
|
;; position in the next file.
|
|
|
|
|
((and (equal "-position" arg)
|
2007-11-23 23:59:19 +00:00
|
|
|
|
command-line-args-left
|
|
|
|
|
(string-match "\\+\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?"
|
|
|
|
|
(car command-line-args-left)))
|
|
|
|
|
(setq arg (pop command-line-args-left))
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(setq filepos
|
|
|
|
|
(cons (string-to-number (match-string 1 arg))
|
|
|
|
|
(string-to-number (or (match-string 2 arg) "")))))
|
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
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; -file FILENAME: Load the given file.
|
2007-09-16 04:53:39 +00:00
|
|
|
|
((and (equal "-file" arg)
|
2007-11-23 23:59:19 +00:00
|
|
|
|
command-line-args-left)
|
|
|
|
|
(let ((file (pop command-line-args-left)))
|
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
|
|
|
|
(if coding-system
|
|
|
|
|
(setq file (decode-coding-string file coding-system)))
|
|
|
|
|
(setq file (command-line-normalize-file-name file))
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(push (cons file filepos) files)
|
|
|
|
|
(server-log (format "New file: %s %s"
|
|
|
|
|
file (or filepos "")) proc))
|
|
|
|
|
(setq filepos nil))
|
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
|
|
|
|
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; -eval EXPR: Evaluate a Lisp expression.
|
2007-09-16 04:53:39 +00:00
|
|
|
|
((and (equal "-eval" arg)
|
2007-11-23 23:59:19 +00:00
|
|
|
|
command-line-args-left)
|
|
|
|
|
(lexical-let ((expr (pop command-line-args-left)))
|
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
|
|
|
|
(if coding-system
|
|
|
|
|
(setq expr (decode-coding-string expr coding-system)))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(push (lambda () (server-eval-and-print expr proc))
|
|
|
|
|
commands)
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(setq filepos nil)))
|
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
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
;; -env NAME=VALUE: An environment variable.
|
2007-11-23 23:59:19 +00:00
|
|
|
|
((and (equal "-env" arg) command-line-args-left)
|
|
|
|
|
(let ((var (pop command-line-args-left)))
|
2005-12-29 04:31:04 +00:00
|
|
|
|
;; XXX Variables should be encoded as in getenv/setenv.
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(process-put proc 'env
|
|
|
|
|
(cons var (process-get proc 'env)))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
|
2006-03-26 16:34:35 +00:00
|
|
|
|
;; -dir DIRNAME: The cwd of the emacsclient process.
|
2007-11-23 23:59:19 +00:00
|
|
|
|
((and (equal "-dir" arg) command-line-args-left)
|
|
|
|
|
(setq dir (pop command-line-args-left))
|
2006-03-26 16:34:35 +00:00
|
|
|
|
(if coding-system
|
|
|
|
|
(setq dir (decode-coding-string dir coding-system)))
|
|
|
|
|
(setq dir (command-line-normalize-file-name dir)))
|
|
|
|
|
|
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
|
|
|
|
;; Unknown command.
|
2007-11-23 23:59:19 +00:00
|
|
|
|
(t (error "Unknown command: %s" arg))))
|
2007-10-28 15:17:08 +00:00
|
|
|
|
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(setq frame
|
|
|
|
|
(case tty-name
|
|
|
|
|
((nil) (if display (server-select-display display)))
|
|
|
|
|
((window-system)
|
|
|
|
|
(server-create-window-system-frame display nowait proc))
|
|
|
|
|
(t (server-create-tty-frame tty-name tty-type proc))))
|
|
|
|
|
|
2008-01-26 21:54:44 +00:00
|
|
|
|
(process-put
|
|
|
|
|
proc 'continuation
|
|
|
|
|
(lexical-let ((proc proc)
|
|
|
|
|
(files files)
|
|
|
|
|
(nowait nowait)
|
|
|
|
|
(commands commands)
|
|
|
|
|
(dontkill dontkill)
|
|
|
|
|
(frame frame)
|
|
|
|
|
(dir dir)
|
|
|
|
|
(tty-name tty-name))
|
|
|
|
|
(lambda ()
|
|
|
|
|
(with-current-buffer (get-buffer-create server-buffer)
|
|
|
|
|
;; Use the same cwd as the emacsclient, if possible, so
|
|
|
|
|
;; relative file names work correctly, even in `eval'.
|
|
|
|
|
(let ((default-directory
|
2008-01-27 22:47:58 +00:00
|
|
|
|
(if (and dir (file-directory-p dir))
|
|
|
|
|
dir default-directory)))
|
2008-01-26 21:54:44 +00:00
|
|
|
|
(server-execute proc files nowait commands
|
|
|
|
|
dontkill frame tty-name))))))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
|
|
|
|
|
(when (or frame files)
|
|
|
|
|
(server-goto-toplevel proc))
|
|
|
|
|
|
|
|
|
|
(server-execute-continuation proc))))
|
2004-02-20 01:22:10 +00:00
|
|
|
|
;; condition-case
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(error (server-return-error proc err))))
|
|
|
|
|
|
|
|
|
|
(defun server-execute (proc files nowait commands dontkill frame tty-name)
|
|
|
|
|
(condition-case err
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(let* ((buffers
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(when files
|
|
|
|
|
(run-hooks 'pre-command-hook)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(prog1 (server-visit-files files proc nowait)
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(run-hooks 'post-command-hook)))))
|
|
|
|
|
|
|
|
|
|
(mapc 'funcall (nreverse commands))
|
2007-10-28 15:17:08 +00:00
|
|
|
|
|
2007-09-16 04:53:39 +00:00
|
|
|
|
;; Delete the client if necessary.
|
|
|
|
|
(cond
|
|
|
|
|
(nowait
|
|
|
|
|
;; Client requested nowait; return immediately.
|
|
|
|
|
(server-log "Close nowait client" proc)
|
|
|
|
|
(server-delete-client proc))
|
|
|
|
|
((and (not dontkill) (null buffers))
|
|
|
|
|
;; This client is empty; get rid of it immediately.
|
|
|
|
|
(server-log "Close empty client" proc)
|
|
|
|
|
(server-delete-client proc)))
|
|
|
|
|
(cond
|
|
|
|
|
((or isearch-mode (minibufferp))
|
|
|
|
|
nil)
|
|
|
|
|
((and frame (null buffers))
|
|
|
|
|
(message "%s" (substitute-command-keys
|
|
|
|
|
"When done with this frame, type \\[delete-frame]")))
|
|
|
|
|
((not (null buffers))
|
2008-09-06 17:17:05 +00:00
|
|
|
|
(server-switch-buffer (car buffers) nil (cdr (car files)))
|
2007-09-16 04:53:39 +00:00
|
|
|
|
(run-hooks 'server-switch-hook)
|
|
|
|
|
(unless nowait
|
|
|
|
|
(message "%s" (substitute-command-keys
|
|
|
|
|
"When done with a buffer, type \\[server-edit]")))))
|
|
|
|
|
(when (and frame (null tty-name))
|
|
|
|
|
(server-unselect-display frame)))
|
|
|
|
|
(error (server-return-error proc err))))
|
|
|
|
|
|
|
|
|
|
(defun server-return-error (proc err)
|
|
|
|
|
(ignore-errors
|
|
|
|
|
(server-send-string
|
|
|
|
|
proc (concat "-error " (server-quote-arg
|
|
|
|
|
(error-message-string err))))
|
|
|
|
|
(server-log (error-message-string err) proc)
|
|
|
|
|
(delete-process proc)))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(defun server-goto-line-column (line-col)
|
|
|
|
|
"Move point to the position indicated in LINE-COL.
|
|
|
|
|
LINE-COL should be a pair (LINE . COL)."
|
|
|
|
|
(when line-col
|
|
|
|
|
(goto-line (car line-col))
|
|
|
|
|
(let ((column-number (cdr line-col)))
|
|
|
|
|
(when (> column-number 0)
|
|
|
|
|
(move-to-column (1- column-number))))))
|
2002-08-15 20:13:48 +00:00
|
|
|
|
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(defun server-visit-files (files proc &optional nowait)
|
2004-07-10 20:56:57 +00:00
|
|
|
|
"Find FILES and return a list of buffers created.
|
2008-01-16 16:21:08 +00:00
|
|
|
|
FILES is an alist whose elements are (FILENAME . FILEPOS)
|
|
|
|
|
where FILEPOS can be nil or a pair (LINENUMBER . COLUMNNUMBER).
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
PROC is the client that requested this operation.
|
1996-08-28 23:26:13 +00:00
|
|
|
|
NOWAIT non-nil means this client is not waiting for the results,
|
|
|
|
|
so don't mark these buffers specially, just visit them normally."
|
1994-05-28 17:22:31 +00:00
|
|
|
|
;; Bind last-nonmenu-event to force use of keyboard, not mouse, for queries.
|
2002-09-27 17:43:29 +00:00
|
|
|
|
(let ((last-nonmenu-event t) client-record)
|
1993-08-09 05:56:29 +00:00
|
|
|
|
;; Restore the current buffer afterward, but not using save-excursion,
|
|
|
|
|
;; because we don't want to save point in this buffer
|
|
|
|
|
;; if it happens to be one of those specified by the server.
|
2002-09-27 17:43:29 +00:00
|
|
|
|
(save-current-buffer
|
|
|
|
|
(dolist (file files)
|
|
|
|
|
;; If there is an existing buffer modified or the file is
|
|
|
|
|
;; modified, revert it. If there is an existing buffer with
|
|
|
|
|
;; deleted file, offer to write it.
|
2006-11-12 05:36:52 +00:00
|
|
|
|
(let* ((minibuffer-auto-raise (or server-raise-frame
|
2006-12-03 15:03:30 +00:00
|
|
|
|
minibuffer-auto-raise))
|
2006-11-11 14:11:13 +00:00
|
|
|
|
(filen (car file))
|
2002-09-27 17:43:29 +00:00
|
|
|
|
(obuf (get-file-buffer filen)))
|
2006-05-05 23:37:55 +00:00
|
|
|
|
(add-to-history 'file-name-history filen)
|
2008-01-16 16:21:08 +00:00
|
|
|
|
(if (null obuf)
|
|
|
|
|
(set-buffer (find-file-noselect filen))
|
|
|
|
|
(set-buffer obuf)
|
|
|
|
|
(cond ((file-exists-p filen)
|
|
|
|
|
(when (not (verify-visited-file-modtime obuf))
|
|
|
|
|
(revert-buffer t nil)))
|
|
|
|
|
(t
|
|
|
|
|
(when (y-or-n-p
|
|
|
|
|
(concat "File no longer exists: " filen
|
|
|
|
|
", write buffer to file? "))
|
|
|
|
|
(write-file filen))))
|
|
|
|
|
(unless server-buffer-clients
|
|
|
|
|
(setq server-existing-buffer t)))
|
|
|
|
|
(server-goto-line-column (cdr file))
|
|
|
|
|
(run-hooks 'server-visit-hook))
|
2002-09-27 17:43:29 +00:00
|
|
|
|
(unless nowait
|
|
|
|
|
;; When the buffer is killed, inform the clients.
|
|
|
|
|
(add-hook 'kill-buffer-hook 'server-kill-buffer nil t)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(push proc server-buffer-clients))
|
2004-07-10 20:56:57 +00:00
|
|
|
|
(push (current-buffer) client-record)))
|
|
|
|
|
(unless nowait
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(process-put proc 'buffers
|
|
|
|
|
(nconc (process-get proc 'buffers) client-record)))
|
2004-07-10 20:56:57 +00:00
|
|
|
|
client-record))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
1997-05-10 00:37:24 +00:00
|
|
|
|
(defun server-buffer-done (buffer &optional for-killing)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
"Mark BUFFER as \"done\" for its client(s).
|
1995-03-11 20:32:48 +00:00
|
|
|
|
This buries the buffer, then returns a list of the form (NEXT-BUFFER KILLED).
|
|
|
|
|
NEXT-BUFFER is another server buffer, as a suggestion for what to select next,
|
2002-09-18 02:10:18 +00:00
|
|
|
|
or nil. KILLED is t if we killed BUFFER (typically, because it was visiting
|
|
|
|
|
a temp file).
|
|
|
|
|
FOR-KILLING if non-nil indicates that we are called from `kill-buffer'."
|
2002-09-25 19:54:13 +00:00
|
|
|
|
(let ((next-buffer nil)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(killed nil))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(dolist (proc server-clients)
|
|
|
|
|
(let ((buffers (process-get proc 'buffers)))
|
2002-09-18 02:10:18 +00:00
|
|
|
|
(or next-buffer
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(setq next-buffer (nth 1 (memq buffer buffers))))
|
|
|
|
|
(when buffers ; Ignore bufferless clients.
|
|
|
|
|
(setq buffers (delq buffer buffers))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
;; Delete all dead buffers from PROC.
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(dolist (b buffers)
|
|
|
|
|
(and (bufferp b)
|
|
|
|
|
(not (buffer-live-p b))
|
|
|
|
|
(setq buffers (delq b buffers))))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(process-put proc 'buffers buffers)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
;; If client now has no pending buffers,
|
|
|
|
|
;; tell it that it is done, and forget it entirely.
|
|
|
|
|
(unless buffers
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(server-log "Close" proc)
|
2008-09-24 20:12:02 +00:00
|
|
|
|
(if for-killing
|
|
|
|
|
;; `server-delete-client' might delete the client's
|
|
|
|
|
;; frames, which might change the current buffer. We
|
|
|
|
|
;; don't want that (bug#640).
|
|
|
|
|
(save-current-buffer
|
|
|
|
|
(server-delete-client proc))
|
|
|
|
|
(server-delete-client proc))))))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(when (and (bufferp buffer) (buffer-name buffer))
|
|
|
|
|
;; We may or may not kill this buffer;
|
|
|
|
|
;; if we do, do not call server-buffer-done recursively
|
|
|
|
|
;; from kill-buffer-hook.
|
|
|
|
|
(let ((server-kill-buffer-running t))
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(setq server-buffer-clients nil)
|
|
|
|
|
(run-hooks 'server-done-hook))
|
|
|
|
|
;; Notice whether server-done-hook killed the buffer.
|
|
|
|
|
(if (null (buffer-name buffer))
|
|
|
|
|
(setq killed t)
|
|
|
|
|
;; Don't bother killing or burying the buffer
|
|
|
|
|
;; when we are called from kill-buffer.
|
|
|
|
|
(unless for-killing
|
|
|
|
|
(when (and (not killed)
|
|
|
|
|
server-kill-new-buffers
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(not server-existing-buffer)))
|
1998-05-05 00:39:35 +00:00
|
|
|
|
(setq killed t)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(bury-buffer buffer)
|
|
|
|
|
(kill-buffer buffer))
|
|
|
|
|
(unless killed
|
|
|
|
|
(if (server-temp-file-p buffer)
|
|
|
|
|
(progn
|
|
|
|
|
(kill-buffer buffer)
|
|
|
|
|
(setq killed t))
|
|
|
|
|
(bury-buffer buffer)))))))
|
1995-03-11 20:32:48 +00:00
|
|
|
|
(list next-buffer killed)))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(defun server-temp-file-p (&optional buffer)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
"Return non-nil if BUFFER contains a file considered temporary.
|
|
|
|
|
These are files whose names suggest they are repeatedly
|
|
|
|
|
reused to pass information to another program.
|
|
|
|
|
|
|
|
|
|
The variable `server-temp-file-regexp' controls which filenames
|
|
|
|
|
are considered temporary."
|
|
|
|
|
(and (buffer-file-name buffer)
|
|
|
|
|
(string-match server-temp-file-regexp (buffer-file-name buffer))))
|
|
|
|
|
|
|
|
|
|
(defun server-done ()
|
1992-11-03 21:08:55 +00:00
|
|
|
|
"Offer to save current buffer, mark it as \"done\" for clients.
|
2001-11-13 03:14:23 +00:00
|
|
|
|
This kills or buries the buffer, then returns a list
|
|
|
|
|
of the form (NEXT-BUFFER KILLED). NEXT-BUFFER is another server buffer,
|
|
|
|
|
as a suggestion for what to select next, or nil.
|
|
|
|
|
KILLED is t if we killed BUFFER, which happens if it was created
|
|
|
|
|
specifically for the clients and did not exist before their request for it."
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(when server-buffer-clients
|
|
|
|
|
(if (server-temp-file-p)
|
|
|
|
|
;; For a temp file, save, and do make a non-numeric backup
|
|
|
|
|
;; (unless make-backup-files is nil).
|
|
|
|
|
(let ((version-control nil)
|
|
|
|
|
(buffer-backed-up nil))
|
|
|
|
|
(save-buffer))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(when (and (buffer-modified-p)
|
|
|
|
|
buffer-file-name
|
|
|
|
|
(y-or-n-p (concat "Save file " buffer-file-name "? ")))
|
|
|
|
|
(save-buffer)))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(server-buffer-done (current-buffer))))
|
1994-03-03 19:23:59 +00:00
|
|
|
|
|
1994-11-10 16:13:30 +00:00
|
|
|
|
;; Ask before killing a server buffer.
|
|
|
|
|
;; It was suggested to release its client instead,
|
|
|
|
|
;; but I think that is dangerous--the client would proceed
|
|
|
|
|
;; using whatever is on disk in that file. -- rms.
|
1994-04-20 20:26:25 +00:00
|
|
|
|
(defun server-kill-buffer-query-function ()
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
"Ask before killing a server buffer."
|
1994-04-20 20:26:25 +00:00
|
|
|
|
(or (not server-buffer-clients)
|
2004-01-10 12:56:22 +00:00
|
|
|
|
(let ((res t))
|
|
|
|
|
(dolist (proc server-buffer-clients res)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(when (and (memq proc server-clients)
|
|
|
|
|
(eq (process-status proc) 'open))
|
|
|
|
|
(setq res nil))))
|
1994-04-20 20:26:25 +00:00
|
|
|
|
(yes-or-no-p (format "Buffer `%s' still has clients; kill it? "
|
|
|
|
|
(buffer-name (current-buffer))))))
|
|
|
|
|
|
|
|
|
|
(defun server-kill-emacs-query-function ()
|
2007-10-28 15:17:08 +00:00
|
|
|
|
"Ask before exiting Emacs if it has live clients."
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(or (not server-clients)
|
|
|
|
|
(let (live-client)
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(dolist (proc server-clients live-client)
|
|
|
|
|
(when (memq t (mapcar 'buffer-live-p (process-get
|
|
|
|
|
proc 'buffers)))
|
2006-12-03 15:03:30 +00:00
|
|
|
|
(setq live-client t))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(yes-or-no-p "This Emacs session has clients; exit anyway? ")))
|
1997-05-10 00:37:24 +00:00
|
|
|
|
|
1997-05-31 00:31:40 +00:00
|
|
|
|
(defvar server-kill-buffer-running nil
|
1998-05-05 00:39:35 +00:00
|
|
|
|
"Non-nil while `server-kill-buffer' or `server-buffer-done' is running.")
|
1997-05-31 00:31:40 +00:00
|
|
|
|
|
1997-05-10 00:37:24 +00:00
|
|
|
|
(defun server-kill-buffer ()
|
2004-10-10 16:41:15 +00:00
|
|
|
|
"Remove the current buffer from its clients' buffer list.
|
|
|
|
|
Designed to be added to `kill-buffer-hook'."
|
1997-05-31 00:31:40 +00:00
|
|
|
|
;; Prevent infinite recursion if user has made server-done-hook
|
|
|
|
|
;; call kill-buffer.
|
|
|
|
|
(or server-kill-buffer-running
|
1998-05-05 00:39:35 +00:00
|
|
|
|
(and server-buffer-clients
|
|
|
|
|
(let ((server-kill-buffer-running t))
|
|
|
|
|
(when server-process
|
|
|
|
|
(server-buffer-done (current-buffer) t))))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
|
|
|
|
(defun server-edit (&optional arg)
|
|
|
|
|
"Switch to next server editing buffer; say \"Done\" for current buffer.
|
|
|
|
|
If a server buffer is current, it is marked \"done\" and optionally saved.
|
2001-11-13 03:14:23 +00:00
|
|
|
|
The buffer is also killed if it did not exist before the clients asked for it.
|
1990-02-22 10:44:55 +00:00
|
|
|
|
When all of a client's buffers are marked as \"done\", the client is notified.
|
|
|
|
|
|
|
|
|
|
Temporary files such as MH <draft> files are always saved and backed up,
|
1993-07-15 04:01:14 +00:00
|
|
|
|
no questions asked. (The variable `make-backup-files', if nil, still
|
|
|
|
|
inhibits a backup; you can set it locally in a particular buffer to
|
|
|
|
|
prevent a backup for it.) The variable `server-temp-file-regexp' controls
|
1990-02-22 10:44:55 +00:00
|
|
|
|
which filenames are considered temporary.
|
|
|
|
|
|
2003-01-13 16:44:07 +00:00
|
|
|
|
If invoked with a prefix argument, or if there is no server process running,
|
1990-02-22 10:44:55 +00:00
|
|
|
|
starts server process and that is all. Invoked by \\[server-edit]."
|
|
|
|
|
(interactive "P")
|
2006-06-11 18:59:31 +00:00
|
|
|
|
(cond
|
2006-11-02 01:31:39 +00:00
|
|
|
|
((or arg
|
|
|
|
|
(not server-process)
|
|
|
|
|
(memq (process-status server-process) '(signal exit)))
|
|
|
|
|
(server-mode 1))
|
|
|
|
|
(server-clients (apply 'server-switch-buffer (server-done)))
|
|
|
|
|
(t (message "No server editing buffers exist"))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2008-09-06 17:17:05 +00:00
|
|
|
|
(defun server-switch-buffer (&optional next-buffer killed-one filepos)
|
1990-02-22 10:44:55 +00:00
|
|
|
|
"Switch to another buffer, preferably one that has a client.
|
2004-10-10 16:41:15 +00:00
|
|
|
|
Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it.
|
|
|
|
|
|
|
|
|
|
KILLED-ONE is t in a recursive call if we have already killed one
|
|
|
|
|
temp-file server buffer. This means we should avoid the final
|
|
|
|
|
\"switch to some other buffer\" since we've already effectively
|
2008-09-06 17:17:05 +00:00
|
|
|
|
done that.
|
|
|
|
|
|
|
|
|
|
FILEPOS specifies a new buffer position for NEXT-BUFFER, if we
|
|
|
|
|
visit NEXT-BUFFER in an existing window. If non-nil, it should
|
|
|
|
|
be a cons cell (LINENUMBER . COLUMNNUMBER)."
|
2002-09-18 12:19:57 +00:00
|
|
|
|
(if (null next-buffer)
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(progn
|
|
|
|
|
(let ((rest server-clients))
|
|
|
|
|
(while (and rest (not next-buffer))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(let ((proc (car rest)))
|
2008-04-20 08:32:11 +00:00
|
|
|
|
;; Only look at frameless clients, or those in the selected
|
|
|
|
|
;; frame.
|
|
|
|
|
(when (or (not (process-get proc 'frame))
|
|
|
|
|
(eq (process-get proc 'frame) (selected-frame)))
|
(server-clients): Only keep procs, no properties any more.
(server-client): Remove.
(server-client-get, server-client-set): Remove, replace all callers by
process-get and process-put resp.
(server-clients-with, server-add-client, server-delete-client)
(server-create-tty-frame, server-create-window-system-frame)
(server-process-filter, server-execute, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer)
(server-save-buffers-kill-terminal): Update accordingly.
2007-09-16 05:16:42 +00:00
|
|
|
|
(setq next-buffer (car (process-get proc 'buffers))))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(setq rest (cdr rest)))))
|
|
|
|
|
(and next-buffer (server-switch-buffer next-buffer killed-one))
|
|
|
|
|
(unless (or next-buffer killed-one (window-dedicated-p (selected-window)))
|
|
|
|
|
;; (switch-to-buffer (other-buffer))
|
2002-10-29 18:17:46 +00:00
|
|
|
|
(message "No server buffers remain to edit")))
|
Another server.el overhaul.
lib-src/emacsclient.c (xstrdup): New function.
(quote_argument): Use xmalloc, not malloc.
(main): Send environment variable values.
lisp/server.el (server-clients): Documentation update.
(server-ttys, server-frames): Removed.
(server-client, server-client-get, server-client-set)
(server-clients-with, server-add-client)
(server-delete-client): New functions.
(server-sentinel, server-handle-suspend-tty)
(server-handle-delete-tty, server-handle-delete-frame)
(server-start, server-process-filter, server-visit-files)
(server-buffer-done, server-kill-buffer-query-function)
(server-kill-emacs-query-function, server-switch-buffer): Use them.
(server-log): Handle both kinds of client references.
(server-start): Set up all hooks here.
(server-process-filter): Cleanup. Store version in client.
Handle -env commands for passing environment variable values.
(server-buffer-done): Don't close clients that were created bufferless.
(server-switch-buffer): Only look at frameless clients.
Don't switch away from current buffer if there is no next-buffer.
(server-unload-hook): Remove frame/tty hooks, too.
lisp/server.el (server-quote-arg, server-unquote-arg)
(server-process-filter, server-kill-buffer-query-function)
(server-kill-emacs-query-function): Doc update.
(server-buffer-done, server-switch-buffer): Use buffer-live-p, not
buffer-name.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-143
2004-04-18 01:34:11 +00:00
|
|
|
|
(if (not (buffer-live-p next-buffer))
|
2002-09-18 12:19:57 +00:00
|
|
|
|
;; If NEXT-BUFFER is a dead buffer, remove the server records for it
|
1990-02-22 10:44:55 +00:00
|
|
|
|
;; and try the next surviving server buffer.
|
2002-09-18 12:19:57 +00:00
|
|
|
|
(apply 'server-switch-buffer (server-buffer-done next-buffer))
|
|
|
|
|
;; OK, we know next-buffer is live, let's display and select it.
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(if (functionp server-window)
|
|
|
|
|
(funcall server-window next-buffer)
|
|
|
|
|
(let ((win (get-buffer-window next-buffer 0)))
|
|
|
|
|
(if (and win (not server-window))
|
2008-09-06 17:17:05 +00:00
|
|
|
|
;; The buffer is already displayed: just reuse the
|
|
|
|
|
;; window. If FILEPOS is non-nil, use it to replace the
|
|
|
|
|
;; window's own value of point.
|
2006-11-10 09:46:51 +00:00
|
|
|
|
(progn
|
|
|
|
|
(select-window win)
|
2008-09-06 17:17:05 +00:00
|
|
|
|
(set-buffer next-buffer)
|
|
|
|
|
(when filepos
|
|
|
|
|
(server-goto-line-column filepos)))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
;; Otherwise, let's find an appropriate window.
|
2007-06-11 00:23:06 +00:00
|
|
|
|
(cond ((window-live-p server-window)
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(select-window server-window))
|
|
|
|
|
((framep server-window)
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(unless (frame-live-p server-window)
|
|
|
|
|
(setq server-window (make-frame)))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
(select-window (frame-selected-window server-window))))
|
2006-10-30 23:24:18 +00:00
|
|
|
|
(when (window-minibuffer-p (selected-window))
|
|
|
|
|
(select-window (next-window nil 'nomini 0)))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
;; Move to a non-dedicated window, if we have one.
|
|
|
|
|
(when (window-dedicated-p (selected-window))
|
|
|
|
|
(select-window
|
|
|
|
|
(get-window-with-predicate
|
|
|
|
|
(lambda (w)
|
|
|
|
|
(and (not (window-dedicated-p w))
|
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
|
|
|
|
(equal (frame-terminal (window-frame w))
|
|
|
|
|
(frame-terminal (selected-frame)))))
|
2002-11-02 05:29:13 +00:00
|
|
|
|
'nomini 'visible (selected-window))))
|
|
|
|
|
(condition-case nil
|
|
|
|
|
(switch-to-buffer next-buffer)
|
|
|
|
|
;; After all the above, we might still have ended up with
|
|
|
|
|
;; a minibuffer/dedicated-window (if there's no other).
|
2006-11-10 09:46:51 +00:00
|
|
|
|
(error (pop-to-buffer next-buffer)))))))
|
|
|
|
|
(when server-raise-frame
|
|
|
|
|
(select-frame-set-input-focus (window-frame (selected-window))))))
|
1990-02-22 10:44:55 +00:00
|
|
|
|
|
2005-11-19 19:17:56 +00:00
|
|
|
|
;;;###autoload
|
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 server-save-buffers-kill-terminal (proc &optional arg)
|
2007-12-23 22:46:07 +00:00
|
|
|
|
;; Called from save-buffers-kill-terminal in files.el.
|
2005-11-19 19:17:56 +00:00
|
|
|
|
"Offer to save each buffer, then kill PROC.
|
2004-08-16 19:54:16 +00:00
|
|
|
|
|
2005-02-10 21:23:33 +00:00
|
|
|
|
With prefix arg, silently save all file-visiting buffers, then kill.
|
|
|
|
|
|
|
|
|
|
If emacsclient was started with a list of filenames to edit, then
|
|
|
|
|
only these files will be asked to be saved."
|
2007-12-23 22:46:07 +00:00
|
|
|
|
;; save-buffers-kill-terminal occasionally calls us with proc set
|
|
|
|
|
;; to `nowait' (comes from the value of the `client' frame parameter).
|
|
|
|
|
(when (processp proc)
|
|
|
|
|
(let ((buffers (process-get proc 'buffers)))
|
|
|
|
|
;; If client is bufferless, emulate a normal Emacs session
|
|
|
|
|
;; exit and offer to save all buffers. Otherwise, offer to
|
|
|
|
|
;; save only the buffers belonging to the client.
|
|
|
|
|
(save-some-buffers arg
|
|
|
|
|
(if buffers
|
|
|
|
|
(lambda () (memq (current-buffer) buffers))
|
|
|
|
|
t))
|
|
|
|
|
(server-delete-client proc))))
|
2004-08-16 19:54:16 +00:00
|
|
|
|
|
2005-07-16 11:58:10 +00:00
|
|
|
|
(define-key ctl-x-map "#" 'server-edit)
|
2001-12-18 16:42:38 +00:00
|
|
|
|
|
2007-10-29 00:51:51 +00:00
|
|
|
|
(defun server-unload-function ()
|
2004-10-10 16:41:15 +00:00
|
|
|
|
"Unload the server library."
|
2006-05-16 06:53:01 +00:00
|
|
|
|
(server-mode -1)
|
2007-10-30 00:20:02 +00:00
|
|
|
|
(substitute-key-definition 'server-edit nil ctl-x-map)
|
2007-10-29 00:51:51 +00:00
|
|
|
|
(save-current-buffer
|
|
|
|
|
(dolist (buffer (buffer-list))
|
|
|
|
|
(set-buffer buffer)
|
|
|
|
|
(remove-hook 'kill-buffer-hook 'server-kill-buffer t)))
|
|
|
|
|
;; continue standard unloading
|
|
|
|
|
nil)
|
2004-10-17 06:55:07 +00:00
|
|
|
|
|
1992-09-04 21:49:15 +00:00
|
|
|
|
|
|
|
|
|
(provide 'server)
|
1992-05-30 21:11:25 +00:00
|
|
|
|
|
2006-05-16 06:53:01 +00:00
|
|
|
|
;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6
|
1992-05-30 21:11:25 +00:00
|
|
|
|
;;; server.el ends here
|