Mercurial > hg > xemacs-beta
view src/dialog.c @ 5639:1d1f385c9149
Call XKeysymToString() much less, it leaks.
src/ChangeLog addition:
2012-01-08 Aidan Kehoe <kehoea@parhasard.net>
* device-x.c:
* device-x.c (syms_of_device_x):
Move #'x-keysym-on-keyboard{,-sans-modifiers}-p to Lisp, the hash
table no longer stores the X keysyms, so we need to manipulate any
strings we have been handed.
* event-Xt.c (x_has_keysym):
Don't call XKeysymToString() here, it leaks; trust
x_keysym_to_emacs_keysym() instead.
* event-Xt.c (x_keysym_to_emacs_keysym):
No longer leak when looking up the strings for keysyms of the form
UABCD.
lisp/ChangeLog addition:
2012-01-08 Aidan Kehoe <kehoea@parhasard.net>
* x-init.el:
* x-init.el (pseudo-canonicalize-keysym): New.
* x-init.el: Move #'x-keysym-on-keyboard-sans-modifiers-p,
#'x-keysym-on-keyboard-p here from device-x.c, some string
manipulation it now needs to do is far easier in Lisp.
* x-win-xfree86.el:
* x-win-xfree86.el (x-win-init-xfree86):
No longer call #'x-keysym-on-keyboard{,-sans-modifiers}-p,
implement it ourselves cheaply.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 08 Jan 2012 20:41:37 +0000 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Implements elisp-programmable dialog boxes -- generic. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Tinker Systems and INS Engineering Corp. Copyright (C) 2000 Ben Wing. This file is part of XEmacs. XEmacs 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 3 of the License, or (at your option) any later version. XEmacs 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 XEmacs. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ #include <config.h> #include "lisp.h" #include "frame-impl.h" Lisp_Object Vdelete_dialog_box_hook; Lisp_Object Qdelete_dialog_box_hook; DEFUN ("make-dialog-box-internal", Fmake_dialog_box_internal, 2, 2, 0, /* Internal helper function for `make-dialog-box'. This handles all dialog-box types except `general'. TYPE is the same as the first argument to `make-dialog-box', and KEYS a list of the remaining arguments. */ (type, keys)) { struct frame *f = selected_frame (); CHECK_SYMBOL (type); if (!HAS_FRAMEMETH_P (f, make_dialog_box_internal)) signal_error (Qunimplemented, "Device does not support dialogs", FRAME_DEVICE (f)); return FRAMEMETH (f, make_dialog_box_internal, (f, type, keys)); } void syms_of_dialog (void) { DEFSUBR (Fmake_dialog_box_internal); DEFSYMBOL (Qdelete_dialog_box_hook); } void vars_of_dialog (void) { Fprovide (intern ("dialog")); DEFVAR_LISP ("delete-dialog-box-hook", &Vdelete_dialog_box_hook /* Function or functions to call when a dialog box is about to be deleted. One arg, the dialog box id. */ ); Vdelete_dialog_box_hook = Qnil; }