Mercurial > hg > xemacs-beta
view src/redisplay-gtk.c @ 5692:be87f507f510
Handle interactive command remapping a little better than 7371081ce8f7, keymap.c
src/ChangeLog addition:
2012-11-06 Aidan Kehoe <kehoea@parhasard.net>
* keymap.c (event_binding):
Do command remapping here for interactive lookups; avoids a
relatively expensive repeated call to get_relevant_keymaps(), as
was necessary in 7371081ce8f7 (which changeset has been backed
out).
lisp/ChangeLog addition:
2012-10-14 Aidan Kehoe <kehoea@parhasard.net>
* help.el:
* help.el (describe-function-1):
Add some newlines here when dealing with remapped commands, thank
you Robert Pluim.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Tue, 06 Nov 2012 22:27:15 +0000 |
parents | 308d34e9f07d |
children | 574f0cded429 |
line wrap: on
line source
/* GTK output and frame manipulation routines. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1994 Lucid, Inc. Copyright (C) 1995 Sun Microsystems, Inc. Copyright (C) 2002, 2003 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. */ #define THIS_IS_GTK #include "redisplay-xlike-inc.c" /***************************************************************************** Draw a shadow around the given area using the standard theme engine routines. ****************************************************************************/ static void XLIKE_bevel_area (struct window *w, face_index UNUSED (findex), int x, int y, int width, int height, int shadow_thickness, int UNUSED (edges), enum edge_style style) { struct frame *f = XFRAME (w->frame); GdkWindow *x_win = GET_GTK_WIDGET_WINDOW (FRAME_GTK_TEXT_WIDGET (f)); GtkStyle *gstyle = FRAME_GTK_TEXT_WIDGET (f)->style; GtkShadowType stype; if (shadow_thickness == 0) stype = GTK_SHADOW_NONE; else switch (style) { case EDGE_BEVEL_IN: style = GTK_SHADOW_IN; break; case EDGE_BEVEL_OUT: style = GTK_SHADOW_OUT; break; case EDGE_ETCHED_IN: style = GTK_SHADOW_ETCHED_IN; break; case EDGE_ETCHED_OUT: style = GTK_SHADOW_ETCHED_OUT; break; default: ABORT (); style = GTK_SHADOW_OUT; } /* Do we want to have some magic constants to set GTK_SHADOW_ETCHED_IN or GTK_SHADOW_ETCHED_OUT? */ gtk_paint_shadow (gstyle, x_win, GTK_STATE_NORMAL, stype, NULL, FRAME_GTK_TEXT_WIDGET (f), "modeline", x, y, width, height); } /* Make audible bell. */ static void XLIKE_ring_bell (struct device *UNUSED (d), int volume, int UNUSED (pitch), int UNUSED (duration)) { /* Gdk does not allow us to control the duration / pitch / volume */ if (volume > 0) { gdk_beep (); } } /* This makes me feel incredibly dirty... but there is no other way to get this done right other than calling clear_area before every single $#!%@ing piece of text, which I do NOT want to do. */ #define USE_X_SPECIFIC_DRAW_ROUTINES 1 #include "sysgdkx.h" static void gdk_draw_text_image (GdkDrawable *drawable, GdkFont *font, GdkGC *gc, gint x, gint y, const gchar *text, gint text_length) { #if !USE_X_SPECIFIC_DRAW_ROUTINES int width = gdk_text_measure (font, text, text_length); int height = gdk_text_height (font, text, text_length); gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height); gdk_draw_text (drawable, font, gc, x, y, text, text_length); #else GdkWindowPrivate *drawable_private; GdkFontPrivate *font_private; GdkGCPrivate *gc_private; g_return_if_fail (drawable != NULL); g_return_if_fail (font != NULL); g_return_if_fail (gc != NULL); g_return_if_fail (text != NULL); drawable_private = (GdkWindowPrivate*) drawable; if (drawable_private->destroyed) return; gc_private = (GdkGCPrivate*) gc; font_private = (GdkFontPrivate*) font; if (font->type == GDK_FONT_FONT) { XFontStruct *xfont = (XFontStruct *) font_private->xfont; XSetFont(drawable_private->xdisplay, gc_private->xgc, xfont->fid); if ((xfont->min_byte1 == 0) && (xfont->max_byte1 == 0)) { XDrawImageString (drawable_private->xdisplay, drawable_private->xwindow, gc_private->xgc, x, y, text, text_length); } else { XDrawImageString16 (drawable_private->xdisplay, drawable_private->xwindow, gc_private->xgc, x, y, (XChar2b *) text, text_length / 2); } } else if (font->type == GDK_FONT_FONTSET) { XFontSet fontset = (XFontSet) font_private->xfont; XmbDrawImageString (drawable_private->xdisplay, drawable_private->xwindow, fontset, gc_private->xgc, x, y, text, text_length); } else g_error("undefined font type\n"); #endif } static void our_draw_bitmap (GdkDrawable *drawable, GdkGC *gc, GdkPixmap *src, gint xsrc, gint ysrc, gint xdest, gint ydest, gint width, gint height) { GdkWindowPrivate *drawable_private; GdkWindowPrivate *src_private; GdkGCPrivate *gc_private; g_return_if_fail (drawable != NULL); g_return_if_fail (src != NULL); g_return_if_fail (gc != NULL); drawable_private = (GdkWindowPrivate*) drawable; src_private = (GdkWindowPrivate*) src; if (drawable_private->destroyed || src_private->destroyed) return; gc_private = (GdkGCPrivate*) gc; if (width == -1) width = src_private->width; if (height == -1) height = src_private->height; XCopyPlane (drawable_private->xdisplay, src_private->xwindow, drawable_private->xwindow, gc_private->xgc, xsrc, ysrc, width, height, xdest, ydest, 1L); }