Mercurial > emacs
view admin/alloc-colors.c @ 83374:0b75ace4f7ad
Fix crash after y-or-n-p prompt triggered by emacsclient. (Reported by Han Boetes, analysis by Kalle Olavi Niemitalo.)
* src/keyboard.c (temporarily_switch_to_single_kboard)
(record_single_kboard_state, restore_kboard_configuration): New functions.
(timer_check): Use record_single_kboard_state instead of
naive single_kboard state management.
* src/fns.c: Include termhooks.h.
(Fy_or_n_p): Use temporarily_switch_to_single_kboard to prevent crashes
caused by bogus longjmps in read_char.
* src/callint.c (Fcall_interactively): Use
temporarily_switch_to_single_kboard instead of single_kboard_state.
Make sure it is correctly unwinded.
* src/keyboard.c (recursive_edit_unwind): Remove single_kboard stuff.
(Frecursive_edit): Use temporarily_switch_to_single_kboard for
single_kboard state management.
* src/minibuf.c (read_minibuf): Use temporarily_switch_to_single_kboard
instead of simply calling single_kboard_state.
* src/keyboard.c (push_device_kboard): Remove function.
(push_kboard): New function.
(push_frame_kboard): Use it.
(pop_frame_kboard): Rename to pop_kboard.
* src/xdisp.c (display_mode_line, Fformat_mode_line): Update uses.
* src/data.c: Include termhooks.h.
(Fterminal_local_value, Fset_terminal_local_value): Update.
* src/Makefile.in (data.o, fns.o): Add termhooks.h dependency.
* src/keyboard.h (push_device_kboard, pop_frame_kboard): Remove declarations.
(push_kboard, pop_kboard, temporarily_switch_to_single_kboard)
(record_single_kboard_state): New declarations.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-414
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sun, 11 Sep 2005 06:42:03 +0000 |
parents | c53a9463c31a |
children | a8b22f12b3dc f9a65d7ebd29 |
line wrap: on
line source
/* Allocate X colors. Used for testing with dense colormaps. Copyright (C) 2001 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include <X11/Xlib.h> #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include <unistd.h> void fatal (const char *fmt, ...) { va_list ap; va_start (ap, fmt); vfprintf (stderr, fmt, ap); fputc ('\n', stderr); va_end (ap); exit (1); } void usage (const char *progname) { fprintf (stderr, "Usage %s options\n", progname); fprintf (stderr, "-n NCOLORS allcoate NCOLORS colors\n"); exit (1); } int main (int argc, char **argv) { Display *dpy; int opt, ncolors = 0, i; XColor *allocated; int nallocated; XColor color; Colormap cmap; while ((opt = getopt (argc, argv, "n:")) != EOF) switch (opt) { case 'n': ncolors = atoi (optarg); break; case '?': usage (argv[0]); } if (ncolors == 0) usage (argv[0]); dpy = XOpenDisplay (""); if (dpy == NULL) fatal ("Cannot open display"); cmap = DefaultColormap (dpy, 0); allocated = malloc (ncolors * sizeof *allocated); nallocated = 0; memset (&color, 0, sizeof color); while (nallocated < ncolors && color.red < 65536) { allocated[nallocated] = color; if (XAllocColor (dpy, cmap, &allocated[nallocated])) { for (i = 0; i < nallocated; ++i) if (allocated[i].red == allocated[nallocated].red && allocated[i].green == allocated[nallocated].green && allocated[i].blue == allocated[nallocated].blue) break; if (i == nallocated) { printf ("allocated %d/%d/%d\n", allocated[nallocated].red, allocated[nallocated].green, allocated[nallocated].blue); ++nallocated; } } ++color.red; ++color.green; ++color.blue; } fprintf (stderr, "Waiting. Press ^C to stop.\n"); while (1) sleep (10); XCloseDisplay (dpy); return 0; } /* arch-tag: f1be90ac-5b70-43c2-835e-5a6432a25145 (do not change this comment) */