Mercurial > hg > xemacs-beta
view src/glyphs-msw.h @ 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
/* mswindows-specific glyphs and related. Copyright (C) 1998 Andy Piper 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. */ #ifndef INCLUDED_glyphs_msw_h_ #define INCLUDED_glyphs_msw_h_ #ifdef HAVE_MS_WINDOWS #include "syswindows.h" #include "glyphs.h" /**************************************************************************** * Image-Instance Object * ****************************************************************************/ struct mswindows_image_instance_data { HBITMAP *bitmaps; HICON icon; int real_width, real_height; }; #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \ ((struct mswindows_image_instance_data *) (i)->data) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[0]) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice]) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps) #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \ (* (HBITMAP *) &(IMAGE_INSTANCE_PIXMAP_MASK (i))) /* Make it lvalue */ #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_width) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_height) #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i, slice) \ IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i, slice)) #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \ IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \ IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i)) int mswindows_resize_dibitmap_instance (Lisp_Image_Instance *ii, struct frame *f, int newx, int newy); HBITMAP mswindows_create_resized_bitmap (Lisp_Image_Instance *ii, struct frame *f, int newx, int newy); HBITMAP mswindows_create_resized_mask (Lisp_Image_Instance *ii, struct frame *f, int newx, int newy); void mswindows_initialize_image_instance_icon (Lisp_Image_Instance *image, int cursor); #define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i)) #define XWIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ WIDGET_INSTANCE_MSWINDOWS_HANDLE (XIMAGE_INSTANCE (i)) struct mswindows_subwindow_data { HWND clip_window; }; #define MSWINDOWS_SUBWINDOW_DATA(i) \ ((struct mswindows_subwindow_data *) (i)->data) #define IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \ (MSWINDOWS_SUBWINDOW_DATA (i)->clip_window) #define XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA(i) \ MSWINDOWS_SUBWINDOW_DATA (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \ IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (XIMAGE_INSTANCE (i)) #define DOMAIN_MSWINDOWS_HANDLE(domain) \ ((IMAGE_INSTANCEP (domain) && \ XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA (domain)) ? \ XWIDGET_INSTANCE_MSWINDOWS_HANDLE (domain) : \ FRAME_MSWINDOWS_HANDLE (DOMAIN_XFRAME (domain))) #endif /* HAVE_MS_WINDOWS */ #endif /* INCLUDED_glyphs_msw_h_ */