Mercurial > emacs
comparison src/xterm.c @ 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 | dbcd0af66869 |
children | 22658e29bd48 |
comparison
equal
deleted
inserted
replaced
83166:1b6966337091 | 83167:69ebc75cb461 |
---|---|
10334 x_display_name_list); | 10334 x_display_name_list); |
10335 dpyinfo->name_list_element = XCAR (x_display_name_list); | 10335 dpyinfo->name_list_element = XCAR (x_display_name_list); |
10336 | 10336 |
10337 dpyinfo->display = dpy; | 10337 dpyinfo->display = dpy; |
10338 | 10338 |
10339 /* Set the name of the display. */ | |
10340 display->name = (char *) xmalloc (SBYTES (display_name) + 1); | |
10341 strncpy (display->name, SDATA (display_name), SBYTES (display_name)); | |
10342 display->name[SBYTES (display_name)] = 0; | |
10343 | |
10339 #if 0 | 10344 #if 0 |
10340 XSetAfterFunction (x_current_display, x_trace_wire); | 10345 XSetAfterFunction (x_current_display, x_trace_wire); |
10341 #endif /* ! 0 */ | 10346 #endif /* ! 0 */ |
10342 | 10347 |
10343 dpyinfo->x_id_name | 10348 dpyinfo->x_id_name |
10707 if (dpyinfo->font_table[i].name != dpyinfo->font_table[i].full_name) | 10712 if (dpyinfo->font_table[i].name != dpyinfo->font_table[i].full_name) |
10708 xfree (dpyinfo->font_table[i].full_name); | 10713 xfree (dpyinfo->font_table[i].full_name); |
10709 xfree (dpyinfo->font_table[i].name); | 10714 xfree (dpyinfo->font_table[i].name); |
10710 } | 10715 } |
10711 | 10716 |
10712 if (dpyinfo->font_table->font_encoder) | 10717 if (dpyinfo->font_table && dpyinfo->font_table->font_encoder) |
10713 xfree (dpyinfo->font_table->font_encoder); | 10718 xfree (dpyinfo->font_table->font_encoder); |
10714 | 10719 |
10715 xfree (dpyinfo->font_table); | 10720 if (dpyinfo->font_table) |
10721 xfree (dpyinfo->font_table); | |
10716 xfree (dpyinfo->x_id_name); | 10722 xfree (dpyinfo->x_id_name); |
10717 xfree (dpyinfo->color_cells); | 10723 xfree (dpyinfo->color_cells); |
10718 xfree (dpyinfo); | 10724 xfree (dpyinfo); |
10719 } | 10725 } |
10720 | 10726 |