Mercurial > hg > xemacs-beta
view src/dump-data.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
/* Static array to put the dumped data in and its management Copyright (C) 2003 Olivier Galibert 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. */ /* Mule-ized? Mwahahahahahaha */ /* Magic values by Larry McVoy to prevent every known compiler, including an especially perverse HP-UX one, from putting the array in BSS. */ #include <config.h> #include "lisp.h" #include "dump-data.h" /* 4 bytes for the data size, 4096 for alignment */ static Rawbyte dumped_data[MAX_SIZE+4096+4] = { 255, 6, 1, 2, 3, 4, 255, 3, 9, 62, 255, 10, 4, 61, 255 }; size_t dumped_data_size (void) { return dumped_data[0] | (dumped_data[1] << 8) | (dumped_data[2] << 16) | (dumped_data[3] << 24); } size_t dumped_data_max_size (void) { return MAX_SIZE; } size_t dumped_data_align_offset (void) { EMACS_INT iptr = (EMACS_INT) dumped_data; EMACS_INT iptr2; iptr2 = (iptr + 4 + 4095) & ~(EMACS_INT) 4095; return iptr2 - iptr; } Rawbyte * dumped_data_get (void) { EMACS_INT iptr = (EMACS_INT) dumped_data; iptr = (iptr + 4 + 4095) & ~(EMACS_INT) 4095; return (Rawbyte *) iptr; }