Mercurial > emacs
view lib-src/emacsclient.c @ 1776:20c6f4aa5843
Make scrollbar structures into lisp objects, so that they can be
GC'd; this allows windows and scrollbars can refer to each other
without worrying about dangling pointers.
* xterm.h (struct x_display): vertical_scrollbars and
judge_timestamp members deleted.
(struct scrollbar): Redesigned to be a template for a Lisp_Vector.
(SCROLLBAR_VEC_SIZE, XSCROLLBAR, SCROLLBAR_PACK, SCROLLBAR_UNPACK,
SCROLLBAR_X_WINDOW, SET_SCROLLBAR_X_WINDOW,
VERTICAL_SCROLLBAR_INSIDE_WIDTH, VERTICAL_SCROLLBAR_TOP_RANGE,
VERTICAL_SCROLLBAR_INSIDE_HEIGHT, VERTICAL_SCROLLBAR_MIN_HANDLE):
New macros, to help deal with the lispy structures, and deal with
the graphics.
* frame.h (WINDOW_VERTICAL_SCROLLBAR): Macro deleted.
(struct frame): New fields `scrollbars' and
`condemned_scrollbars', for use by the scrollbar implementation.
[MULTI_FRAME and not MULTI_FRAME] (FRAME_SCROLLBARS,
FRAME_CONDEMNED_SCROLLBARS): Accessors for the new field.
* window.h (struct window): Doc fix for vertical_scrollbar field.
* frame.c (make_frame): Initialize the `scrollbars' and
`condemned_scrollbars' fields of the new frame.
* alloc.c (mark_object): Mark the `scrollbars' and
`condemned_scrollbars' slots of frames.
* xterm.c (x_window_to_scrollbar): Scrollbars are chained on
frames' scrollbar field, not their x.display->vertical_scrollbars
field.
(x_scrollbar_create, x_scrollbar_set_handle, x_scrollbar_move,
x_scrollbar_remove, XTset_vertical_scrollbar,
XTcondemn_scrollbars, XTredeem_scrollbar, XTjudge_scrollbars,
x_scrollbar_expose, x_scrollbar_handle_click,
x_scrollbar_handle_motion): Substantially rewritten to correct
typos and brainos, and to accomodate the lispy structures.
* frame.h (FRAME_SAMPLE_VISIBILITY): Make sure frame is marked as
garbaged whenever it goes from invisible to visible.
* dispextern.h (frame_garbaged): Move extern declaration from here...
* frame.h (frame_garbaged): ... to here. The FRAME_SAMPLE_VISIBILITY
macro uses it now, and this seems to be just as modular. Make a
new page, just for this and message_buf_print.
(struct frame): Doc fix for the `visible' field.
* process.c: #include "frame.h" instead of "dispextern.h"; the
only thing we care about from it is the frame_garbaged
declaration.
* ymakefile: Note dependency change.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Thu, 14 Jan 1993 15:09:51 +0000 |
parents | 2b11e85880d3 |
children | e10f7473d2e3 |
line wrap: on
line source
/* Client process that communicates with GNU Emacs acting as server. Copyright (C) 1986, 1987 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 1, 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, 675 Mass Ave, Cambridge, MA 02139, USA. */ #define NO_SHORTNAMES #include "../src/config.h" #undef read #undef write #undef open #ifdef close #undef close #endif #if !defined(HAVE_SOCKETS) && !defined(HAVE_SYSVIPC) #include <stdio.h> 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 or System V IPC.\n"); exit (1); } #else /* HAVE_SOCKETS or HAVE_SYSVIPC */ #if ! defined (HAVE_SYSVIPC) /* BSD code is very different from SYSV IPC code */ #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> #include <sys/stat.h> #include <stdio.h> #include <errno.h> extern int sys_nerr; extern char *sys_errlist[]; extern int errno; main (argc, argv) int argc; char **argv; { char system_name[32]; int s, i; FILE *out; struct sockaddr_un server; char *homedir, *cwd, *str; char string[BUFSIZ]; char *getenv (), *getwd (); int geteuid (); if (argc < 2) { fprintf (stderr, "Usage: %s [+linenumber] filename\n", argv[0]); 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"); exit (1); } server.sun_family = AF_UNIX; #ifndef SERVER_HOME_DIR { struct stat statbfr; gethostname (system_name, sizeof (system_name)); sprintf (server.sun_path, "/tmp/esrv%d-%s", geteuid (), system_name); if (stat (server.sun_path, &statbfr) == -1) { if (errno == ENOENT) fprintf (stderr, "Can't find socket; have you started the server?\n"); else perror ("stat"); exit (1); } if (statbfr.st_uid != geteuid()) { fprintf (stderr, "Illegal socket owner\n"); exit (1); } } #else if ((homedir = getenv ("HOME")) == NULL) { fprintf (stderr, "%s: No home directory\n", argv[0]); exit (1); } strcpy (server.sun_path, homedir); strcat (server.sun_path, "/.emacs_server"); #endif if (connect (s, &server, strlen (server.sun_path) + 2) < 0) { fprintf (stderr, "%s: ", argv[0]); perror ("connect"); exit (1); } if ((out = fdopen (s, "r+")) == NULL) { fprintf (stderr, "%s: ", argv[0]); perror ("fdopen"); exit (1); } cwd = getwd (string); if (cwd == 0) { /* getwd puts message in STRING if it fails. */ fprintf (stderr, "%s: %s (%s)\n", argv[0], string, (errno < sys_nerr) ? sys_errlist[errno] : "unknown error"); exit (1); } for (i = 1; i < argc; i++) { if (*argv[i] == '+') { char *p = argv[i] + 1; while (*p >= '0' && *p <= '9') p++; if (*p != 0) fprintf (out, "%s/", cwd); } else if (*argv[i] != '/') fprintf (out, "%s/", cwd); fprintf (out, "%s ", argv[i]); } fprintf (out, "\n"); fflush (out); printf ("Waiting for Emacs..."); fflush (stdout); rewind (out); /* re-read the output */ str = fgets (string, BUFSIZ, out); /* Now, wait for an answer and print any messages. */ while (str = fgets (string, BUFSIZ, out)) printf ("%s", str); exit (0); } #else /* This is the SYSV IPC section */ #include <sys/types.h> #include <sys/ipc.h> #include <sys/msg.h> #include <stdio.h> main (argc, argv) int argc; char **argv; { int s; key_t key; struct msgbuf * msgp = (struct msgbuf *) malloc (sizeof *msgp + BUFSIZ); struct msqid_ds * msg_st; char *homedir, buf[BUFSIZ]; char gwdirb[BUFSIZ]; char *cwd; char *temp; char *getwd (), *getcwd (), *getenv (); if (argc < 2) { fprintf (stderr, "Usage: %s [+linenumber] filename\n", argv[0]); exit (1); } /* * Create a message queue using ~/.emacs_server as the path for ftok */ if ((homedir = getenv ("HOME")) == NULL) { fprintf (stderr, "%s: No home directory\n", argv[0]); exit (1); } strcpy (buf, homedir); strcat (buf, "/.emacs_server"); creat (buf, 0600); key = ftok (buf, 1); /* unlikely to be anyone else using it */ s = msgget (key, 0600 | IPC_CREAT); if (s == -1) { fprintf (stderr, "%s: ", argv[0]); perror ("msgget"); exit (1); } /* Determine working dir, so we can prefix it to all the arguments. */ #ifdef BSD temp = getwd (gwdirb); #else temp = getcwd (gwdirb, sizeof gwdirb); #endif cwd = gwdirb; if (temp != 0) { /* On some systems, cwd can look like `@machine/...'; ignore everything before the first slash in such a case. */ while (*cwd && *cwd != '/') cwd++; strcat (cwd, "/"); } else { fprintf (stderr, cwd); exit (1); } msgp->mtext[0] = 0; argc--; argv++; while (argc) { if (*argv[0] == '+') { char *p = argv[0] + 1; while (*p >= '0' && *p <= '9') p++; if (*p != 0) strcat (msgp->mtext, cwd); } else if (*argv[0] != '/') strcat (msgp->mtext, cwd); strcat (msgp->mtext, argv[0]); strcat (msgp->mtext, " "); argv++; argc--; } strcat (msgp->mtext, "\n"); msgp->mtype = 1; if (msgsnd (s, msgp, strlen (msgp->mtext)+1, 0) < 0) { fprintf (stderr, "%s: ", argv[0]); perror ("msgsnd"); exit (1); } /* * Now, wait for an answer */ printf ("Waiting for Emacs..."); fflush (stdout); msgrcv (s, msgp, BUFSIZ, getpid (), 0); /* wait for anything back */ strcpy (buf, msgp->mtext); printf ("\n%s\n", buf); exit (0); } #endif /* HAVE_SYSVIPC */ #endif /* HAVE_SOCKETS or HAVE_SYSVIPC */