Mercurial > emacs
view lib-src/emacsclient.c @ 83004:7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.
lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.
lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell). Use tty-create-frame-with-faces,
not make-terminal-frame.
src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.
src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.
src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.
src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, 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): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init. Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info. Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.
src/dispextern.h: Updated prototypes.
src/dispnew.c: Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.
src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.
src/process.c: Include frame.h before termhooks.h.
src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here. Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.
src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error.
src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X.
src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.
src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.
src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.
src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.
src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.
src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 05 Jan 2004 05:54:35 +0000 |
parents | 039bd6989d29 |
children | 0b195559ccf5 |
line wrap: on
line source
/* Client process that communicates with GNU Emacs acting as server. Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. 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. */ #define NO_SHORTNAMES #ifdef HAVE_CONFIG_H #include <config.h> #endif #undef signal #include <ctype.h> #include <stdio.h> #include <getopt.h> #ifdef HAVE_UNISTD_H #include <unistd.h> #endif #ifdef VMS # include "vms-pwd.h" #else # include <pwd.h> #endif /* not VMS */ #include <signal.h> #include <errno.h> char *getenv (), *getwd (); char *getcwd (); /* This is defined with -D from the compilation command, which extracts it from ../lisp/version.el. */ #ifndef VERSION #define VERSION "unspecified" #endif /* Name used to invoke this program. */ char *progname; /* The first argument to main. */ int main_argc; /* The second argument to main. */ char **main_argv; /* Nonzero means don't wait for a response from Emacs. --no-wait. */ int nowait = 0; /* Nonzero means args are expressions to be evaluated. --eval. */ int eval = 0; /* The display on which Emacs should work. --display. */ char *display = NULL; /* Nonzero means open a new Emacs frame on the current terminal. */ int frame = 0; /* If non-NULL, the name of an editor to fallback to if the server is not running. --alternate-editor. */ const char * alternate_editor = NULL; /* If non-NULL, the filename of the UNIX socket. */ char *socket_name = NULL; void print_help_and_exit (); struct option longopts[] = { { "no-wait", no_argument, NULL, 'n' }, { "eval", no_argument, NULL, 'e' }, { "help", no_argument, NULL, 'H' }, { "version", no_argument, NULL, 'V' }, { "tty", no_argument, NULL, 't' }, { "alternate-editor", required_argument, NULL, 'a' }, { "socket-name", required_argument, NULL, 's' }, { "display", required_argument, NULL, 'd' }, { 0, 0, 0, 0 } }; /* Decode the options from argv and argc. The global variable `optind' will say how many arguments we used up. */ void decode_options (argc, argv) int argc; char **argv; { while (1) { int opt = getopt_long (argc, argv, "VHnea:s:d:t", longopts, 0); if (opt == EOF) break; alternate_editor = getenv ("ALTERNATE_EDITOR"); switch (opt) { case 0: /* If getopt returns 0, then it has already processed a long-named option. We should do nothing. */ break; case 'a': alternate_editor = optarg; break; case 's': socket_name = optarg; break; case 'd': display = optarg; break; case 'n': nowait = 1; break; case 'e': eval = 1; break; case 'V': printf ("emacsclient %s\n", VERSION); exit (0); break; case 't': frame = 1; break; case 'H': print_help_and_exit (); break; default: fprintf (stderr, "Try `%s --help' for more information\n", progname); exit (1); break; } } if (frame) { nowait = 0; display = 0; } } void print_help_and_exit () { printf ( "Usage: %s [OPTIONS] FILE...\n\ Tell the Emacs server to visit the specified files.\n\ Every FILE can be either just a FILENAME or [+LINE[:COLUMN]] FILENAME.\n\ \n\ The following OPTIONS are accepted:\n\ -V, --version Just print a version info and return\n\ -H, --help Print this usage information message\n\ -t, --tty Open a new Emacs frame on the current terminal\n\ -n, --no-wait Don't wait for the server to return\n\ -e, --eval Evaluate the FILE arguments as ELisp expressions\n\ -d, --display=DISPLAY Visit the file in the given display\n\ -s, --socket-name=FILENAME\n\ Set the filename of the UNIX socket for communication\n\ -a, --alternate-editor=EDITOR\n\ Editor to fallback to if the server is not running\n\ \n\ Report bugs to bug-gnu-emacs@gnu.org.\n", progname); exit (0); } /* In NAME, insert a & before each &, each space, each newline, and any initial -. Change spaces to underscores, too, so that the return value never contains a space. */ void quote_file_name (name, stream) char *name; FILE *stream; { char *copy = (char *) malloc (strlen (name) * 2 + 1); char *p, *q; p = name; q = copy; while (*p) { if (*p == ' ') { *q++ = '&'; *q++ = '_'; p++; } else if (*p == '\n') { *q++ = '&'; *q++ = 'n'; p++; } else { if (*p == '&' || (*p == '-' && p == name)) *q++ = '&'; *q++ = *p++; } } *q++ = 0; fprintf (stream, copy); free (copy); } /* Like malloc but get fatal error if memory is exhausted. */ long * xmalloc (size) unsigned int size; { long *result = (long *) malloc (size); if (result == NULL) { perror ("malloc"); exit (1); } return result; } /* Try to run a different command, or --if no alternate editor is defined-- exit with an errorcode. */ void fail (void) { if (alternate_editor) { int i = optind - 1; execvp (alternate_editor, main_argv + i); return; } else { exit (1); } } int emacs_pid; #ifdef nec_ews_svr4 extern char *_sobuf ; #else #if defined (USG) || defined (DGUX) unsigned char _sobuf[BUFSIZ+8]; #else char _sobuf[BUFSIZ]; #endif #endif SIGTYPE pass_signal_to_emacs (int signalnum) { int old_errno = errno; if (emacs_pid) kill (emacs_pid, signalnum); signal (signalnum, pass_signal_to_emacs); errno = old_errno; } void init_signals (void) { /* Set up signal handlers. */ signal (SIGWINCH, pass_signal_to_emacs); signal (SIGINT, pass_signal_to_emacs); signal (SIGQUIT, pass_signal_to_emacs); } #if !defined (HAVE_SOCKETS) || defined (NO_SOCKETS_IN_FILE_SYSTEM) int main (argc, argv) int argc; char **argv; { fprintf (stderr, "%s: Sorry, the Emacs server is supported only\n", argv[0]); fprintf (stderr, "on systems with Berkeley sockets.\n"); fail (); } #else /* HAVE_SOCKETS */ #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> #include <sys/stat.h> #include <errno.h> extern char *strerror (); extern int errno; /* Three possibilities: 2 - can't be `stat'ed (sets errno) 1 - isn't owned by us 0 - success: none of the above */ static int socket_status (socket_name) char *socket_name; { struct stat statbfr; if (stat (socket_name, &statbfr) == -1) return 2; if (statbfr.st_uid != geteuid ()) return 1; return 0; } /* Returns 1 if PREFIX is a prefix of STRING. */ static int strprefix (char *prefix, char *string) { int i; if (! prefix) return 1; if (!string) return 0; for (i = 0; prefix[i]; i++) if (!string[i] || string[i] != prefix[i]) return 0; return 1; } int main (argc, argv) int argc; char **argv; { char *system_name; int system_name_length; int s, i, needlf = 0; FILE *out, *in; struct sockaddr_un server; char *cwd, *str; char string[BUFSIZ]; main_argc = argc; main_argv = argv; progname = argv[0]; /* Process options. */ decode_options (argc, argv); if ((argc - optind < 1) && !eval && !frame) { fprintf (stderr, "%s: file name or argument required\n", progname); fprintf (stderr, "Try `%s --help' for more information\n", progname); exit (1); } /* * Open up an AF_UNIX socket in this person's home directory */ if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) { fprintf (stderr, "%s: ", argv[0]); perror ("socket"); fail (); } server.sun_family = AF_UNIX; { char *dot; system_name_length = 32; while (1) { system_name = (char *) xmalloc (system_name_length + 1); /* system_name must be null-terminated string. */ system_name[system_name_length] = '\0'; if (gethostname (system_name, system_name_length) == 0) break; free (system_name); system_name_length *= 2; } /* We always use the non-dotted host name, for simplicity. */ dot = index (system_name, '.'); if (dot) *dot = '\0'; } { int sock_status = 0; int oerrno = 0; if (! socket_name) { socket_name = alloca (system_name_length + 100); sprintf (socket_name, "/tmp/emacs%d-%s/server", (int) geteuid (), system_name); } if (strlen (socket_name) < sizeof (server.sun_path)) strcpy (server.sun_path, socket_name); else { fprintf (stderr, "%s: socket-name %s too long", argv[0], socket_name); fail (); } /* See if the socket exists, and if it's owned by us. */ sock_status = socket_status (server.sun_path); oerrno = errno; if (sock_status) { /* Failing that, see if LOGNAME or USER exist and differ from our euid. If so, look for a socket based on the UID associated with the name. This is reminiscent of the logic that init_editfns uses to set the global Vuser_full_name. */ char *user_name = (char *) getenv ("LOGNAME"); if (!user_name) user_name = (char *) getenv ("USER"); if (user_name) { struct passwd *pw = getpwnam (user_name); if (pw && (pw->pw_uid != geteuid ())) { /* We're running under su, apparently. */ sprintf (server.sun_path, "/tmp/esrv%d-%s", (int) pw->pw_uid, system_name); sock_status = socket_status (server.sun_path); oerrno = errno; } } } switch (sock_status) { case 1: /* There's a socket, but it isn't owned by us. This is OK if we are root. */ if (0 != geteuid ()) { fprintf (stderr, "%s: Invalid socket owner\n", argv[0]); fail (); } break; case 2: /* `stat' failed */ if (errno == ENOENT) fprintf (stderr, "%s: Can't find socket; have you started the server?\n\ To start the server in Emacs, type \"M-x server-start\".\n", argv[0]); else fprintf (stderr, "%s: Can't stat %s: %s\n", argv[0], server.sun_path, strerror (oerrno)); fail (); break; } } if (connect (s, (struct sockaddr *) &server, strlen (server.sun_path) + 2) < 0) { fprintf (stderr, "%s: ", argv[0]); perror ("connect"); fail (); } /* We use the stream OUT to send our command to the server. */ if ((out = fdopen (s, "r+")) == NULL) { fprintf (stderr, "%s: ", argv[0]); perror ("fdopen"); fail (); } /* We use the stream IN to read the response. We used to use just one stream for both output and input on the socket, but reversing direction works nonportably: on some systems, the output appears as the first input; on other systems it does not. */ if ((in = fdopen (s, "r+")) == NULL) { fprintf (stderr, "%s: ", argv[0]); perror ("fdopen"); fail (); } #ifdef HAVE_GETCWD cwd = getcwd (string, sizeof string); #else cwd = getwd (string); #endif if (cwd == 0) { /* getwd puts message in STRING if it fails. */ #ifdef HAVE_GETCWD fprintf (stderr, "%s: %s (%s)\n", argv[0], "Cannot get current working directory", strerror (errno)); #else fprintf (stderr, "%s: %s (%s)\n", argv[0], string, strerror (errno)); #endif fail (); } if (nowait) fprintf (out, "-nowait "); if (eval) fprintf (out, "-eval "); if (display) { fprintf (out, "-display "); quote_file_name (display, out); fprintf (out, " "); } if (frame) { char *tty_name = ttyname (fileno (stdin)); if (! tty_name) fail (); init_signals (); fprintf (out, "-tty "); quote_file_name (tty_name, out); fprintf (out, " "); quote_file_name (getenv("TERM"), out); fprintf (out, " "); } if ((argc - optind > 0)) { for (i = optind; i < argc; i++) { if (eval) ; /* Don't prepend any cwd or anything like that. */ else if (*argv[i] == '+') { char *p = argv[i] + 1; while (isdigit ((unsigned char) *p) || *p == ':') p++; if (*p != 0) { quote_file_name (cwd, out); fprintf (out, "/"); } } else if (*argv[i] != '/') { quote_file_name (cwd, out); fprintf (out, "/"); } quote_file_name (argv[i], out); fprintf (out, " "); } } else { if (!frame) { while ((str = fgets (string, BUFSIZ, stdin))) { quote_file_name (str, out); } fprintf (out, " "); } } fprintf (out, "\n"); fflush (out); /* Maybe wait for an answer. */ if (nowait) { return 0; } if (!eval && !frame) { printf ("Waiting for Emacs..."); needlf = 2; } fflush (stdout); /* Now, wait for an answer and print any messages. */ while ((str = fgets (string, BUFSIZ, in))) { if (frame) { if (strprefix ("emacs-pid ", str)) { emacs_pid = strtol (string + strlen ("emacs-pid"), NULL, 10); } } else { if (needlf == 2) printf ("\n"); printf ("%s", str); needlf = str[0] == '\0' ? needlf : str[strlen (str) - 1] != '\n'; } } if (needlf) printf ("\n"); fflush (stdout); return 0; } #endif /* HAVE_SOCKETS */ #ifndef HAVE_STRERROR char * strerror (errnum) int errnum; { extern char *sys_errlist[]; extern int sys_nerr; if (errnum >= 0 && errnum < sys_nerr) return sys_errlist[errnum]; return (char *) "Unknown error"; } #endif /* ! HAVE_STRERROR */ /* arch-tag: f39bb9c4-73eb-477e-896d-50832e2ca9a7 (do not change this comment) */