Mercurial > hg > xemacs-beta
view src/frameslots.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 | 01c57eb70ae9 |
children | 308d34e9f07d |
line wrap: on
line source
/* Definitions of marked slots in frames Copyright (C) 1988, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1996, 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: FSF 19.30. Split out of frame.h. */ /* We define the Lisp_Objects in the frame 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. In the structure definition, you also need to define FRAME_SLOT_DECLARATION. No need to undefine either value; that happens automatically. */ #ifndef MARKED_SLOT_ARRAY #ifdef FRAME_SLOT_DECLARATION #define MARKED_SLOT_ARRAY(slot, size) MARKED_SLOT(slot[size]) #else #define MARKED_SLOT_ARRAY(slot, size) do { \ int mslotidx; \ for (mslotidx = 0; mslotidx < size; mslotidx++) \ { \ MARKED_SLOT (slot[mslotidx]) \ } \ } while (0); #endif #endif /* not MARKED_SLOT_ARRAY */ /* device frame belongs to. */ MARKED_SLOT (device) /* Name of this frame: a Lisp string. NOT the same as the frame's title, even though FSF bogusly confuses the two. The frame's name is used for resourcing and lookup purposes and is something you can count on having a specific value, while the frame's title may vary depending on the user's choice of `frame-title-format'. */ MARKED_SLOT (name) /* The frame which should receive keystrokes that occur in this frame, or nil if they should go to the frame itself. This is usually nil, but if the frame is minibufferless, we can use this to redirect keystrokes to a surrogate minibuffer frame when needed. Note that a value of nil is different than having the field point to the frame itself. Whenever the Fselect_frame function is used to shift from one frame to the other, any redirections to the original frame are shifted to the newly selected frame; if focus_frame is nil, Fselect_frame will leave it alone. */ MARKED_SLOT (focus_frame) /* This frame's root window. Every frame has one. If the frame has only a minibuffer window, this is it. Otherwise, if the frame has a minibuffer window, this is its sibling. */ MARKED_SLOT (root_window) /* This frame's selected window. Each frame has its own window hierarchy and one of the windows in it is selected within the frame. The selected window of the selected frame is Emacs's selected window. */ MARKED_SLOT (selected_window) /* This frame's minibuffer window. Most frames have their own minibuffer windows, but only the selected frame's minibuffer window can actually appear to exist. */ MARKED_SLOT (minibuffer_window) /* The most recently selected nonminibuf window. This is used by things like the toolbar code, which doesn't want the toolbar to change when moving to the minibuffer. This will only be a minibuf window if we are a minibuf-only frame. */ MARKED_SLOT (last_nonminibuf_window) /* This frame's root window mirror. This structure exactly mirrors the frame's window structure but contains only pointers to the display structures. */ MARKED_SLOT (root_mirror) /* frame property list */ MARKED_SLOT (plist) /* buffer_alist at last redisplay. */ MARKED_SLOT (old_buffer_alist) /* A copy of the global Vbuffer_list, to maintain a per-frame buffer ordering. The Vbuffer_list variable and the buffer_list slot of each frame contain exactly the same data, just in different orders. */ MARKED_SLOT (buffer_alist) /* Predicate for selecting buffers for other-buffer. */ MARKED_SLOT (buffer_predicate) /* The current mouse pointer for the frame. This is set by calling `set-frame-pointer'. */ MARKED_SLOT (pointer) /* The current icon for the frame. */ MARKED_SLOT (icon) /* specifier values cached in the struct frame: */ #ifdef HAVE_MENUBARS MARKED_SLOT (menubar_visible_p) #endif #ifdef HAVE_SCROLLBARS /* Width and height of the scrollbars. */ MARKED_SLOT (scrollbar_width) MARKED_SLOT (scrollbar_height) /* Whether the scrollbars are visible */ MARKED_SLOT (horizontal_scrollbar_visible_p) MARKED_SLOT (vertical_scrollbar_visible_p) /* Scrollbars location */ MARKED_SLOT (scrollbar_on_left_p) MARKED_SLOT (scrollbar_on_top_p) #endif #ifdef HAVE_TOOLBARS /* The following three don't really need to be cached except that we need to know when they've changed. */ MARKED_SLOT (default_toolbar_width) MARKED_SLOT (default_toolbar_height) MARKED_SLOT (default_toolbar_visible_p) MARKED_SLOT (default_toolbar_border_width) MARKED_SLOT (toolbar_shadow_thickness) /* List of toolbar buttons of current toolbars */ MARKED_SLOT_ARRAY (toolbar_buttons, 4) /* Size of the toolbars. The frame-local toolbar space is subtracted before the windows are arranged. Window and buffer local toolbars overlay their windows. */ MARKED_SLOT_ARRAY (toolbar_size, 4) /* Visibility of the toolbars. This acts as a valve for toolbar_size. */ MARKED_SLOT_ARRAY (toolbar_visible_p, 4) /* Thickness of the border around the toolbar. */ MARKED_SLOT_ARRAY (toolbar_border_width, 4) #endif /* Cache of subwindow instances for this frame */ MARKED_SLOT (subwindow_instance_cache) /* Possible frame-local default for outside margin widths. */ MARKED_SLOT (left_margin_width) MARKED_SLOT (right_margin_width) #undef MARKED_SLOT #undef MARKED_SLOT_ARRAY #undef FRAME_SLOT_DECLARATION