Mercurial > emacs
view lisp/eshell/esh-module.el @ 83167:69ebc75cb461
Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
* lisp/frame.el (make-frame-on-display): Update doc.
(make-frame): Handle display-id parameter. Update doc.
(frames-on-display-list): Update for display ids.
(framep-on-display): Ditto.
(suspend-frame): Use display-name, not frame-tty-name.
(selected-display): New function.
* lisp/server.el (server-delete-client): Use delete-display, not delete-tty.
(server-tty-live-p, server-handle-delete-tty): Removed.
(server-handle-delete-frame): Delete tty clients, if needed.
(server-process-filter): Set the display parameter, and use it when appropriate.
(server-handle-suspend-tty): Use the display parameter.
(server-start, server-unload-hook): Removed obsolete delete-tty hook.
* lisp/talk.el (talk): Always use talk-add-display.
(talk-add-tty-frame, talk-handle-delete-tty): Removed.
(talk-handle-delete-frame): New function.
(talk-add-display): Open a new frame only if parameter was not a frame.
* src/dispextern.h (get_display, Fdisplay_tty_type): New prototypes.
(Fframe_tty_type): Removed.
* src/dispnew.c (init_display): Use Fdisplay_tty_type, not Fframe_tty_type.
* src/frame.c (Qdisplay_id, Qdisplay_live_p): New symbols.
(make_terminal_frame): Get display as a parameter.
(Fmake_terminal_frame): Get/create display here; pass it to
make_terminal_frame.
(Fframe_display): New function.
(Fdelete_frame): Stop if the hook deleted the frame.
(syms_of_frame): Register new stuff.
* src/frame.h (Qdisplay_id, Qdisplay_live_p, make_terminal_frame):
Updated prototypes.
* src/keyboard.c (interrupt_signal): Updated comment.
* src/term.c (Vdelete_tty_after_functions): Removed variable.
(Qframe_tty_name, Qframe_tty_type): Removed.
(next_display_id): New var.
(tty_ring_bell): Don't do anything on suspended frames.
(Ftty_display_color_p, Ftty_display_color_cells): Doc update.
(get_display): New function.
(get_tty_display): Use it.
(get_named_tty_display): Ignore suspended displays.
(Fframe_tty_name): Renamed to Fdisplay_name. Handle all kinds of
displays.
(Fframe_tty_type): Renamed to Fdisplay_tty_type.
(init_initial_display): Set display name.
(term_init): Allow more displays on the same device. Set display name.
(Fdelete_tty): Removed.
(delete_tty): Don't run hooks.
(create_display): Set display id.
(delete_display): Free display name.
(Fdelete_display, Fdisplay_live_p, Fdisplay_list): New functions.
(Fsuspend_tty): Call hook with display id. Doc update.
(Fresume_tty): Refuse to resume when there is already an active display
on the same device. Call hook with display id. Doc update.
(syms_of_term): Reflect above changes.
* src/termhooks.h (struct display): Added `id' and `name' members.
(DISPLAY_ACTIVE_P): New macro.
* src/xfns.c (check_x_display_info): Handle display ids.
(Fx_create_frame): Try to get display from `display-id' parameter.
* src/xterm.c (x_term_init): Set display name.
(x_delete_display): Handle the case when `font_table' is NULL.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-207
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 04 Jul 2004 04:48:55 +0000 |
parents | a10d964838a7 |
children | 18a818a2ee7c 4c90ffeb71c5 |
line wrap: on
line source
;;; esh-module.el --- Eshell modules ;; Copyright (C) 1999, 2000, 2004 Free Software Foundation ;; Author: John Wiegley <johnw@gnu.org> ;; Keywords: processes ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; 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 ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. (provide 'esh-module) (eval-when-compile (require 'esh-maint) (require 'cl)) (defgroup eshell-module nil "The `eshell-module' group is for Eshell extension modules, which provide optional behavior which the user can enable or disable by customizing the variable `eshell-modules-list'." :tag "Extension modules" :group 'eshell) ;;; Commentary: (require 'esh-util) (defun eshell-load-defgroups (&optional directory) "Load `defgroup' statements from Eshell's module files." (let ((vc-handled-backends nil)) ; avoid VC fucking things up (with-current-buffer (find-file-noselect (expand-file-name "esh-groups.el" directory)) (erase-buffer) (insert ";;; do not modify this file; it is auto-generated -*- no-byte-compile: t -*-\n\n") (let ((files (directory-files (or directory (car command-line-args-left)) nil "\\`em-.*\\.el\\'"))) (while files (message "Loading defgroup from `%s'" (car files)) (let (defgroup) (catch 'handled (with-current-buffer (find-file-noselect (car files)) (goto-char (point-min)) (while t (forward-sexp) (if (eobp) (throw 'handled t)) (backward-sexp) (let ((begin (point)) (defg (looking-at "(defgroup"))) (forward-sexp) (if defg (setq defgroup (buffer-substring begin (point)))))))) (if defgroup (insert defgroup "\n\n"))) (setq files (cdr files)))) (save-buffer)))) ;; load the defgroup's for the standard extension modules, so that ;; documentation can be provided when the user customize's ;; `eshell-modules-list'. (eval-when-compile (when (and (boundp 'byte-compile-current-file) byte-compile-current-file (or (equal (file-name-nondirectory byte-compile-current-file) "esh-module.el") ;; When eshell file names are expanded from a wildcard ;; or by reading the Eshell directory, e.g. when they ;; say "make recompile" in the lisp directory, Emacs on ;; MS-DOS sees a truncated name "esh-modu.el" instead of ;; "esh-module.el". (and (fboundp 'msdos-long-file-names) (null (msdos-long-file-names)) (equal (file-name-nondirectory byte-compile-current-file) "esh-modu.el")))) (let* ((directory (file-name-directory byte-compile-current-file)) (elc-file (expand-file-name "esh-groups.elc" directory))) (eshell-load-defgroups directory) (if (file-exists-p elc-file) (delete-file elc-file))))) (load "esh-groups" t t) ;;; User Variables: (defcustom eshell-module-unload-hook '(eshell-unload-extension-modules) "*A hook run when `eshell-module' is unloaded." :type 'hook :group 'eshell-module) (defcustom eshell-modules-list '(eshell-alias eshell-banner eshell-basic eshell-cmpl eshell-dirs eshell-glob eshell-hist eshell-ls eshell-pred eshell-prompt eshell-script eshell-term eshell-unix) "*A list of optional add-on modules to be loaded by Eshell. Changes will only take effect in future Eshell buffers." :type (append (list 'set ':tag "Supported modules") (mapcar (function (lambda (modname) (let ((modsym (intern modname))) (list 'const ':tag (format "%s -- %s" modname (get modsym 'custom-tag)) ':link (caar (get modsym 'custom-links)) ':doc (concat "\n" (get modsym 'group-documentation) "\n ") modsym)))) (sort (mapcar 'symbol-name (eshell-subgroups 'eshell-module)) 'string-lessp)) '((repeat :inline t :tag "Other modules" symbol))) :group 'eshell-module) ;;; Code: (defsubst eshell-using-module (module) "Return non-nil if a certain Eshell MODULE is in use. The MODULE should be a symbol corresponding to that module's customization group. Example: `eshell-cmpl' for that module." (memq module eshell-modules-list)) (defun eshell-unload-extension-modules () "Unload any memory resident extension modules." (eshell-for module (eshell-subgroups 'eshell-module) (if (featurep module) (ignore-errors (message "Unloading %s..." (symbol-name module)) (unload-feature module) (message "Unloading %s...done" (symbol-name module)))))) ;;; arch-tag: 97a3fa16-9d08-40e6-bc2c-36bd70986507 ;;; esh-module.el ends here