Mercurial > emacs
view src/w32reg.c @ 83525:b2e7507b55c6
Fix C-x 5 2 on the controlling tty; fix some possible crash conditions and a memory leak.
* src/frame.c (make_terminal_frame): Don't create frames on a terminal
that is being deleted.
* src/xfns.c (Fx_create_frame, x_create_tip_frame): Ditto.
* src/keyboard.c (tty_read_avail_input): Don't read from a terminal that
is being deleted.
* src/term.c (get_named_tty): Abort if tty name is NULL. Simplify accordingly.
* src/term.c (Ftty_type): Return nil if terminal is not on a tty instead
of throwing an error. Doc update.
* src/term.c (init_tty): Set name before calling `get_named_tty'.
* src/term.c (delete_tty): Let delete_terminal delete the frames. Plug
memory leak caused by tty->name. Remove reference to `deleting_tty'.
* src/term.c (syms_of_term) <Vsuspend_tty_functions, Vresume_tty_functions>: Doc update.
* src/termhooks.h (terminal) <name>: Explain why identifying terminals by
name is a bad idea.
* src/terminal.c (delete_terminal): Doc update.
* src/xterm.c (XTread_socket): Disable loop on all X displays.
* src/xterm.c (x_delete_display): Doc update to reflect changes in
delete_terminal.
* src/xterm.c (x_delete_terminal): Don't set terminal->deleted and let
delete_terminal delete the frames on the terminal.
* src/xterm.h (x_display_info) <terminal>: Move member earlier in the struct.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-565
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 20 May 2006 17:12:43 +0000 |
parents | 3bd95f4f2941 |
children | e90d04cd455a c5406394f567 |
line wrap: on
line source
/* Emulate the X Resource Manager through the registry. Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004, 2005, 2006 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. */ /* Written by Kevin Gallo */ #include <config.h> #include "lisp.h" #include "w32term.h" #include "blockinput.h" #include <stdio.h> #include <string.h> #define REG_ROOT "SOFTWARE\\GNU\\Emacs" /* Default system colors from the Display Control Panel settings. */ #define SYSTEM_DEFAULT_RESOURCES \ "emacs.foreground:SystemWindowText\0" \ "emacs.background:SystemWindow\0" \ "emacs.tooltip.attributeForeground:SystemInfoText\0" \ "emacs.tooltip.attributeBackground:SystemInfoWindow\0" \ "emacs.tool-bar.attributeForeground:SystemButtonText\0" \ "emacs.tool-bar.attributeBackground:SystemButtonFace\0" \ "emacs.menu.attributeForeground:SystemMenuText\0" \ "emacs.menu.attributeBackground:SystemMenu\0" \ "emacs.scroll-bar.attributeForeground:SystemScrollbar" /* Other possibilities for default faces: region: Could use SystemHilight, but interferes with our ability to see most syntax highlighting through the region face. modeline: Could use System(In)ActiveTitle, gradient versions (not supported on 95 and NT), but modeline is more like a status bar really (which don't appear to be configurable in Windows). highlight: Could use SystemHotTrackingColor, but it is not supported on Windows 95 or NT, and other apps only seem to use it for menus anyway. */ static char * w32_get_rdb_resource (rdb, resource) char *rdb; char *resource; { char *value = rdb; int len = strlen (resource); while (*value) { /* Comparison is case-insensitive because registry searches are too. */ if ((strnicmp (value, resource, len) == 0) && (value[len] == ':')) return xstrdup (&value[len + 1]); value = strchr (value, '\0') + 1; } return NULL; } LPBYTE w32_get_string_resource (name, class, dwexptype) char *name, *class; DWORD dwexptype; { LPBYTE lpvalue = NULL; HKEY hrootkey = NULL; DWORD dwType; DWORD cbData; BOOL ok = FALSE; HKEY hive = HKEY_CURRENT_USER; trykey: BLOCK_INPUT; /* Check both the current user and the local machine to see if we have any resources */ if (RegOpenKeyEx (hive, REG_ROOT, 0, KEY_READ, &hrootkey) == ERROR_SUCCESS) { char *keyname; if (RegQueryValueEx (hrootkey, name, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS && dwType == dwexptype) { keyname = name; } else if (RegQueryValueEx (hrootkey, class, NULL, &dwType, NULL, &cbData) == ERROR_SUCCESS && dwType == dwexptype) { keyname = class; } else { keyname = NULL; } ok = (keyname && (lpvalue = (LPBYTE) xmalloc (cbData)) != NULL && RegQueryValueEx (hrootkey, keyname, NULL, NULL, lpvalue, &cbData) == ERROR_SUCCESS); RegCloseKey (hrootkey); } UNBLOCK_INPUT; if (!ok) { if (lpvalue) { xfree (lpvalue); lpvalue = NULL; } if (hive == HKEY_CURRENT_USER) { hive = HKEY_LOCAL_MACHINE; goto trykey; } /* Check if there are Windows specific defaults defined. */ return w32_get_rdb_resource (SYSTEM_DEFAULT_RESOURCES, name); } return (lpvalue); } /* Retrieve the string resource specified by NAME with CLASS from database RDB. */ char * x_get_string_resource (rdb, name, class) XrmDatabase rdb; char *name, *class; { if (rdb) { char *resource; if (resource = w32_get_rdb_resource (rdb, name)) return resource; if (resource = w32_get_rdb_resource (rdb, class)) return resource; } return (w32_get_string_resource (name, class, REG_SZ)); } /* arch-tag: 755fce25-42d7-4acb-874f-2fb42336823d (do not change this comment) */