Mercurial > hg > xemacs-beta
view src/redisplay-gtk.c @ 5014:c2e0c3af5fe3
cleanups to debug-print, try harder to make it work during GC
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_failed):
Fix comments about when inhibit_non_essential_printing_operations
is set and how used. Increment/decrement in assert_failed rather
than just setting/resetting to avoid hosing things in case we're
called when the value is already non-zero. Similarly increment/
decrement in_assert_failed.
* gc.c (gc_prepare):
* gc.c (gc_finish):
Increment/decrement inhibit_non_essential_printing_operations
rather than setting/resetting.
* print.c:
* print.c (debug_out):
* print.c (write_string_to_alternate_debugging_output):
* print.c (restore_inhibit_non_essential_conversion_operations):
* print.c (debug_print_exit):
* print.c (debug_print_enter):
* print.c (debug_prin1):
* print.c (debug_p4):
* print.c (ext_print_begin):
* print.c (ext_print_end):
* print.c (external_debug_print):
* print.c (debug_p3):
* print.c (debug_backtrace):
* print.c (debug_short_backtrace):
* print.c (vars_of_print):
Lots of cleanup. Fix debug_out() so it binds
inhibit_non_essential_printing_operations around it to ensure no
conversion. Remove many other places that set the same var since
the lower-level functions now all do it. A few other places, add
inhibit_non_essential_printing_operations bindings.Extract the
code out that sets up and resets lots of bindings in debug_prin1()
so that debug_backtrace() can use it, and rewrite it to use the
new STORE_VOID_IN_LISP() rather than having to have a single
static opaque structure holding all the bindings (and not handling
reentrancy). Fix raw `char' to be `CIbyte' in the declaration of
`alternate_do_string'.
* signal.c (check_what_happened):
Fix bug: Don't try to check for QUIT when
inhibit_non_essential_printing_operations or we may screw things
up if QUIT happens during debug printing.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 07:00:24 -0600 |
parents | b3ce27ca7647 |
children | 308d34e9f07d |
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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* 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); }