Mercurial > hg > xemacs-beta
view src/balloon-x.c @ 5529:3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
src/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* console.c:
* console.c (allocate_console):
* console.c (vars_of_console):
* console.c (complex_vars_of_console):
* lisp.h:
Add a new keymap variable, function-key-map-parent; use it as the
parent of each console-specific function-key-map. This is
appropriate for things like x-compose processing.
lisp/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* gtk-init.el:
* gtk-init.el (make-device-late-gtk-entry-point):
* gtk-init.el (gtk-initialize-compose): Removed.
* keymap.el:
* keymap.el (function-key-map-parent):
* x-init.el (x-initialize-compose): Removed.
* x-init.el (make-device-late-x-entry-point):
Make the bindings for dead-acute and friends in
function-key-map-parent, rather than function-key-map; do this in
keymap.el rather than in window-system-specific code, since the
compose processing is generally useful and not X11-specific.
It's probably reasonable to rename x-compose.el to compose.el at
this point, but I haven't done that.
man/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* lispref/os.texi (Translating Input):
Document the just-added function-key-map-parent.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 25 Jun 2011 14:00:48 +0100 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* Copyright (c) 1997 Douglas Keller 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 "device-impl.h" #include "console-x-impl.h" #include "balloon_help.h" /* #### start of hack */ static unsigned long alloc_color (Display* dpy, const char* colorname, int light) { Colormap cmap = DEVICE_X_COLORMAP (XDEVICE (get_default_device (Qx))); unsigned long pixel = 0; XColor color; if (XParseColor(dpy, cmap, colorname, &color) && XAllocColor(dpy, cmap, &color)) { pixel = color.pixel; } else { if (light) { printf ("Warning: could not allocate color \"%s\", using \"white\"\n", colorname); pixel = alloc_color (dpy, "white", True); } else { printf ("Warning: could not allocate color \"%s\", using \"black\"\n", colorname); pixel = alloc_color (dpy, "black", True); } } return pixel; } static XFontStruct * open_font (Display* dpy, const char* font_name) { XFontStruct* fontStruct = NULL; fontStruct = XLoadQueryFont (dpy, font_name ? font_name : "fixed"); if (fontStruct == NULL) { printf ("Warning: could not load font \"%s\", using \"fixed\".\n", font_name); fontStruct = XLoadQueryFont (dpy, "fixed"); assert (fontStruct != NULL); } return fontStruct; } static void init (void) { static int init_p = 0; if (!init_p) { Pixel fg, bg, shine, shadow; XFontStruct* font; Display *dpy = DEVICE_X_DISPLAY (XDEVICE (get_default_device (Qx))); fg = alloc_color (dpy, "grey60", 1); bg = alloc_color (dpy, "black", 0); shine = alloc_color (dpy, "grey80", 1); shadow = alloc_color (dpy, "grey40", 0); font = open_font (dpy, "-adobe-helvetica-medium-r-normal--12-*"); balloon_help_create (dpy, bg, fg, shine, shadow, font); init_p = 1; } } /* #### end of hack */ DEFUN ("show-balloon-help", Fshow_balloon_help, 1, 1, 0, /* Show balloon help. */ (string)) { char *p; CHECK_STRING (string); p = (char *) XSTRING_DATA (string); init (); balloon_help_show (p); return Qnil; } DEFUN ("hide-balloon-help", Fhide_balloon_help, 0, 0, 0, /* Hide balloon help. */ ()) { init (); balloon_help_hide (); return Qnil; } DEFUN ("balloon-help-move-to-pointer", Fballoon_help_move_to_pointer, 0, 0, 0, /* Move the balloon help to the place where the pointer currently resides. */ ()) { init (); balloon_help_move_to_pointer (); return Qnil; } /************************************************************************/ /* initialization */ /************************************************************************/ void syms_of_balloon_x (void) { DEFSUBR (Fshow_balloon_help); DEFSUBR (Fhide_balloon_help); DEFSUBR (Fballoon_help_move_to_pointer); } void vars_of_balloon_x (void) { Fprovide (intern ("c-balloon-help")); }