Mercurial > hg > xemacs-beta
view src/devslots.h @ 4908:b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* compiler.h:
Create a USED() macro to force unused-var warnings to go away,
in certain cases where it's inconvenient to do otherwise (e.g.
when THIS_IS_GTK in redisplay-xlike-inc.c).
* console-x.h:
Remove unneeded decls, make some static.
* redisplay-xlike-inc.c:
* console-xlike-inc.h: New file. Include defns from
redisplay-xlike-inc.c that may be useful in other XLIKE files.
Correct the handling of colors and font-style setting functions
in the xlike defns. Lots of fixes in the GTK-specific defns.
* depend: Regenerate.
* event-xlike-inc.c:
* event-xlike-inc.c (USE_UNICODE_MAP):
* event-xlike-inc.c (endif):
* gccache-gtk.c:
* gtk-glue.c (xemacs_list_to_gtklist):
* gtk-glue.c (xemacs_gtklist_to_list):
* gtk-glue.c (FROB):
* gtk-glue.c (face_to_gc):
* gtk-glue.c (face_to_style):
* gtk-glue.c (gdk_event_to_emacs_event):
* gtk-xemacs.h (struct _GtkXEmacs):
* gtk-xemacs.h (struct _GtkXEmacsClass):
* objects-xlike-inc.c:
Cosmetic, comment fixes.
* glyphs.c (pixmap_to_lisp_data):
Unused var fixes.
* gtk-glue.c:
* gccache-gtk.c:
* gtk-xemacs.c:
* gtk-xemacs.h:
* objects-xlike-inc.c:
* ui-gtk.c:
* ui-gtk.h:
* xgccache.c:
* xgccache.c (GC_CACHE_SIZE):
* xgccache.h:
Misc include-file fixes.
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xlistfonts_checking_charset):
Combine some ifdeffed stuff using defs in console-xlike-inc.h.
* redisplay-gtk.c:
* redisplay-gtk.c (THIS_IS_GTK):
* redisplay-gtk.c (XLIKE_bevel_area):
* redisplay-gtk.c (XLIKE_ring_bell):
* redisplay-gtk.c (gdk_draw_text_image):
Fix numerous compile problems. Delete gtk_output_shadows(),
which mostly duplicates generic bevel_modeline(). Fix up
gtk_bevel_modeline() into XLIKE_bevel_area() and make use of
the style var properly to set the appropriate GTK constant.
* redisplay-x.c:
* redisplay-x.c (XLIKE_window_output_begin):
* redisplay-x.c (XLIKE_window_output_end):
* redisplay-x.c (XLIKE_bevel_area):
* redisplay-x.c (x_output_shadows):
* redisplay-x.c (XLIKE_ring_bell):
Make x_output_shadows be static. Change the defn of various
functions to look like XLIKE_foo() so it matches the calling
convention elsewhere.
* redisplay-xlike-inc.c:
* redisplay-xlike-inc.c (NEED_GCCACHE_H):
* redisplay-xlike-inc.c (XLIKE_text_width):
* redisplay-xlike-inc.c (XLIKE_get_gc):
* redisplay-xlike-inc.c (XLIKE_text_width_single_run):
* redisplay-xlike-inc.c (XFT_FROB_LISP_COLOR):
* redisplay-xlike-inc.c (XLIKE_output_xlike_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_pixmap):
* redisplay-xlike-inc.c (XLIKE_output_vertical_divider):
* redisplay-xlike-inc.c (XLIKE_flash):
Lots of header fixes. Lots of stuff moved to console-xlike-inc.h.
Use XFUN() to generate function names instead of directly
calling XLIKE_PASTE(). Remove unnecessary prototypes.
Unify calls to text_width funs. Make XLIKE_get_gc non-static
since it's called from gtk. Change the color-function calls
and fill-style-setting calls to match the changes in
console-xlike-inc.h. Use USED() to avoid some warnings.
* symsinit.h:
Sort the prototypes, and add a fun `sort-symsinit' in a comment
that does the sorting (using sort-regexp-fields).
* symsinit.h (init_number):
* sysgtk.h: New file, wraps the various GTK headers.
* sysgdkx.h: New file, wraps <gtk/gdkx.h>. Keep this separate to
* event-gtk.h: Delete. Combine stuff into console-gtk.h.
help isolate X-specific code from GTK.
* device-gtk.c:
* event-gtk.c:
* console-gtk.h:
* frame-gtk.c:
* gccache-gtk.c:
* gccache-gtk.h:
* glyphs-gtk.c (gtk_colorize_image_instance):
* glyphs-gtk.h:
* gtk-xemacs.h:
* objects-gtk.c:
* objects-gtk.c (MAX_FONT_COUNT):
* ui-gtk.h:
Use sysgtk.h or sysgdkx.h instead of directly including GTK
headers. Don't include event-gtk.h.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 02:15:28 -0600 |
parents | e22b0213b713 |
children | 8b2f75cecb89 |
line wrap: on
line source
/* Definitions of marked slots in consoles Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. Copyright (C) 2002 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. */ /* We define the Lisp_Objects in the device structure in a separate file because there are numerous places we want to iterate over them, such as when defining them in the structure, initializing them, or marking them. To use, define MARKED_SLOT before including this file. No need to undefine; that happens automatically. */ /* Name of this device, for resourcing and printing purposes. If not explicitly given, it's initialized in a device-specific manner. */ MARKED_SLOT (name) /* What this device is connected to */ MARKED_SLOT (connection) /* A canonical name for the connection that is used to determine whether `make-device' is being called on an existing device. */ MARKED_SLOT (canon_connection) /* List of frames on this device. */ MARKED_SLOT (frame_list) /* The console this device is on. */ MARKED_SLOT (console) /* Frame which is "currently selected". This is what `selected-frame' returns and is the default frame for many operations. This may not be the same as frame_with_focus `select-frame' changes the selected_frame but not the frame_with_focus. However, eventually either the two values will be the same, or frame_with_focus will be nil: right before waiting for an event, the focus is changed to point to the selected_frame if XEmacs currently has the focus on this device. Note that frame_with_focus may be nil (none of the frames on this device have the window-system focus), but selected_frame will never be nil if there are any frames on the device. */ MARKED_SLOT (selected_frame) /* Frame that currently contains the window-manager focus, or none. Note that we've split frame_with_focus into two variables. frame_with_focus_real is the value we use most of the time, but frame_with_focus_for_hooks is used for running the select-frame-hook and deselect-frame-hook. We do this because we split the focus handling into two parts: one part (deals with drawing the solid/box cursor) runs as soon as a focus event is received the other (running the hooks) runs after any pending sit-for/sleep-for/accept-process-output calls are done. */ MARKED_SLOT (frame_with_focus_real) MARKED_SLOT (frame_with_focus_for_hooks) /* If we have recently issued a request to change the focus as a result of select-frame having been called, the following variable records the frame we are trying to focus on. The reason for this is that the window manager may not grant our request to change the focus (so we can't just change frame_with_focus), and we don't want to keep sending requests again and again to the window manager. This variable is reset whenever a focus-change event is seen. */ MARKED_SLOT (frame_that_ought_to_have_focus) /* Color class of this device. */ MARKED_SLOT (device_class) /* Alist of values for user-defined tags in this device. */ MARKED_SLOT (user_defined_tags) /* Hash tables for device-specific objects (fonts, colors, etc). These are key-weak hash tables (or hash tables containing key-weak hash tables) so that they disappear when the key goes away. */ /* This is a simple key-weak hash table hashing color names to instances. */ MARKED_SLOT (color_instance_cache) /* This is a simple key-weak hash table hashing font names to instances. */ MARKED_SLOT (font_instance_cache) #ifdef MULE /* This is a bi-level cache, where the hash table in this slot here indexes charset objects to key-weak hash tables, which in turn index font names to more specific font names that match the given charset's registry. This speeds up the horrendously slow XListFonts() operation that needs to be done in order to determine an appropriate font. */ MARKED_SLOT (charset_font_cache_stage_1) /* Similar cache for stage 2, if it exists. See objects.c. */ MARKED_SLOT (charset_font_cache_stage_2) #endif /* This is a bi-level cache, where the hash table in this slot here indexes image-instance-type masks (there are currently 6 image-instance types and thus 64 possible masks) to key-weak hash tables like the one for colors. */ MARKED_SLOT (image_instance_cache) #undef MARKED_SLOT