annotate lisp/talk.el @ 83220:fe1db7935e1a

Fix core dump in redisplay window. (Reported by Yoshiaki Kasahara.) Plus cleanups. * src/xdisp.c (handle_single_display_prop): Use FRAME_WINDOW_P instead of checking against specific frame types. Ignore images on non-window frames. (echo_area_display): Use FRAME_INITIAL_P to check for initial frame. (redisplay_preserve_echo_area): Update for multi-tty support. (redisplay_window): Don't bother with toolbars, fringe bitmaps or vertical borders on tty frames. (display_line): Remove superflous #ifdefs. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-260
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 14 Oct 2004 14:58:43 +0000
parents 69ebc75cb461
children 6c13700d1c13
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38414
67b464da13ec Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 18383
diff changeset
1 ;;; talk.el --- allow several users to talk to each other through Emacs
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
2
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3 ;; Copyright (C) 1995 Free Software Foundation, Inc.
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
4
45078
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 38414
diff changeset
5 ;; Maintainer: FSF
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
6 ;; Keywords: comm, frames
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
7
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
9
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; any later version.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
23 ;; Boston, MA 02111-1307, USA.
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25 ;;; Commentary:
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
27 ;; This is a multi-user talk package that runs in Emacs.
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 12461
diff changeset
28 ;; Use talk-connect to bring a new person into the conversation.
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
29
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
30 ;;; Code:
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
31
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32 (defvar talk-display-alist nil
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
33 "Alist of displays on which Emacs talk is now running.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
34 Each element has the form (DISPLAY FRAME BUFFER).")
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
36 ;;;###autoload
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
37 (defun talk-connect (display)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38 "Connect to display DISPLAY for the Emacs talk group."
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
39 (interactive "sTalk to display: ")
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
40 ;; Make sure we have an entry for the current display.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
41 (let ((mydisp (cdr (assq 'display (frame-parameters (selected-frame))))))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
42 (talk-add-display mydisp))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
43 ;; Make sure we have an entry for the specified display.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 (talk-add-display display)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45 ;; Add the new buffers to all talk frames.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46 (talk-update-buffers))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47
82997
af2d6b850383 Added multi-tty support for talk.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
48 ;;;###autoload
af2d6b850383 Added multi-tty support for talk.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
49 (defun talk ()
af2d6b850383 Added multi-tty support for talk.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
50 "Connect to the Emacs talk group from the current X display or tty frame."
af2d6b850383 Added multi-tty support for talk.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
51 (interactive)
83167
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
52 (let ((type (frame-live-p (selected-frame)))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
53 (display (frame-display (selected-frame))))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
54 (cond
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
55 ((eq type t)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
56 (talk-add-display (selected-frame)))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
57 ((eq type 'x)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
58 (talk-add-display (frame-display (selected-frame))))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
59 (t
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
60 (error "Unknown frame type"))))
82997
af2d6b850383 Added multi-tty support for talk.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
61 (talk-update-buffers))
af2d6b850383 Added multi-tty support for talk.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
62
83167
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
63 (defun talk-add-display (frame)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
64 (let* ((display (if (frame-live-p frame)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
65 (frame-display frame)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
66 frame))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
67 (elt (assoc display talk-display-alist))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
68 (name (concat "*talk-" (display-name display) "*"))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
69 buffer)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
70 (unless (frame-live-p frame)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
71 (setq frame (make-frame-on-display display (list (cons 'name name)))))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
72 (if (and elt (frame-live-p (nth 1 elt)))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
73 (setq frame (nth 1 elt)))
12461
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
74 (if (not (and elt (buffer-name (get-buffer (setq buffer (nth 2 elt))))))
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
75 (setq buffer (get-buffer-create name)))
83167
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
76 (add-to-list 'delete-frame-functions 'talk-handle-delete-frame)
12461
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
77 (setq talk-display-alist
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
78 (cons (list display frame buffer) (delq elt talk-display-alist)))))
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
79
83167
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
80 (defun talk-handle-delete-frame (frame)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
81 (dolist (d talk-display-alist)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
82 (when (eq (nth 1 d) frame)
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
83 (setq talk-display-alist (delq d talk-display-alist))
69ebc75cb461 Implemented display ids for multiple emacsclients on the same tty. Plus assorted bugfixes.
Karoly Lorentey <lorentey@elte.hu>
parents: 82999
diff changeset
84 (talk-update-buffers))))
82997
af2d6b850383 Added multi-tty support for talk.el.
Karoly Lorentey <lorentey@elte.hu>
parents: 52401
diff changeset
85
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
86 (defun talk-disconnect ()
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
87 "Disconnect this display from the Emacs talk group."
12461
578abe49e2d3 (talk-disconnect): Make it interactive.
Richard M. Stallman <rms@gnu.org>
parents: 11684
diff changeset
88 (interactive)
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
89 (let* ((mydisp (cdr (assq 'display (frame-parameters (selected-frame)))))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90 (elt (assoc mydisp talk-display-alist)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
91 (delete-frame (nth 1 elt))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
92 (kill-buffer (nth 2 elt))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
93 (setq talk-display-alist (delq elt talk-display-alist))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
94 (talk-update-buffers)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
96 (defun talk-update-buffers ()
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
97 "Update all the talk frames so that each shows all the talk buffers."
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
98 (let ((tail talk-display-alist))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
99 (while tail
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100 (let ((frame (nth 1 (car tail)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
101 (this-buffer (nth 2 (car tail)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
102 (buffers
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
103 (mapcar (function (lambda (elt) (nth 2 elt)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
104 talk-display-alist)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
105 ;; Put this display's own talk buffer
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
106 ;; at the front of the list.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
107 (setq buffers (cons this-buffer (delq this-buffer buffers)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
108 (talk-split-up-frame frame buffers))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
109 (setq tail (cdr tail)))))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
110
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
111 (defun talk-split-up-frame (frame buffers)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
112 "Split FRAME into equal-sized windows displaying the buffers in BUFFERS.
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
113 Select the first of these windows, displaying the first of the buffers."
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
114 (let ((lines-per-buffer (/ (frame-height frame) (length buffers)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
115 (old-frame (selected-frame)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
116 (unwind-protect
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
117 (progn
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
118 (select-frame frame)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
119 (select-window (frame-first-window frame))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
120 (delete-other-windows)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
121 (while (progn
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
122 (switch-to-buffer (car buffers))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
123 (setq buffers (cdr buffers)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
124 (split-window-vertically lines-per-buffer)
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
125 (other-window 1))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
126 (select-window (frame-first-window frame)))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
127 (select-frame old-frame))))
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
128
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
129 (provide 'talk)
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
130
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 45078
diff changeset
131 ;;; arch-tag: 7ab0ad88-1788-4886-a44c-ae685e6f8a1a
11684
b59ad1e42981 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
132 ;;; talk.el ends here