Mercurial > hg > xemacs-beta
view src/EmacsFrame.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 | 8de8e3f6228a |
| children | 308d34e9f07d |
line wrap: on
line source
/* Public header for the Emacs frame widget. Copyright (C) 1993-1995 Sun Microsystems, Inc. Copyright (C) 1995 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. */ #ifndef INCLUDED_EmacsFrame_h_ #define INCLUDED_EmacsFrame_h_ #ifndef XtNminibuffer #define XtNminibuffer "minibuffer" #endif #ifndef XtCMinibuffer #define XtCMinibuffer "Minibuffer" #endif #ifndef XtNunsplittable #define XtNunsplittable "unsplittable" #endif #ifndef XtCUnsplittable #define XtCUnsplittable "Unsplittable" #endif #ifndef XtNinternalBorderWidth #define XtNinternalBorderWidth "internalBorderWidth" #endif #ifndef XtCInternalBorderWidth #define XtCInternalBorderWidth "InternalBorderWidth" #endif #ifndef XtNscrollBarWidth #define XtNscrollBarWidth "scrollBarWidth" #endif #ifndef XtCScrollBarWidth #define XtCScrollBarWidth "ScrollBarWidth" #endif #ifndef XtNscrollBarHeight #define XtNscrollBarHeight "scrollBarHeight" #endif #ifndef XtCScrollBarHeight #define XtCScrollBarHeight "ScrollBarHeight" #endif #ifndef XtNtopToolBarHeight #define XtNtopToolBarHeight "topToolBarHeight" #endif #ifndef XtCTopToolBarHeight #define XtCTopToolBarHeight "TopToolBarHeight" #endif #ifndef XtNbottomToolBarHeight #define XtNbottomToolBarHeight "bottomToolBarHeight" #endif #ifndef XtCBottomToolBarHeight #define XtCBottomToolBarHeight "BottomToolBarHeight" #endif #ifndef XtNleftToolBarWidth #define XtNleftToolBarWidth "leftToolBarWidth" #endif #ifndef XtCLeftToolBarWidth #define XtCLeftToolBarWidth "LeftToolBarWidth" #endif #ifndef XtNrightToolBarWidth #define XtNrightToolBarWidth "rightToolBarWidth" #endif #ifndef XtCRightToolBarWidth #define XtCRightToolBarWidth "RightToolBarWidth" #endif #ifndef XtNtopToolBarBorderWidth #define XtNtopToolBarBorderWidth "topToolBarBorderWidth" #endif #ifndef XtCTopToolBarBorderWidth #define XtCTopToolBarBorderWidth "TopToolBarBorderWidth" #endif #ifndef XtNbottomToolBarBorderWidth #define XtNbottomToolBarBorderWidth "bottomToolBarBorderWidth" #endif #ifndef XtCBottomToolBarBorderWidth #define XtCBottomToolBarBorderWidth "BottomToolBarBorderWidth" #endif #ifndef XtNleftToolBarBorderWidth #define XtNleftToolBarBorderWidth "leftToolBarBorderWidth" #endif #ifndef XtCLeftToolBarBorderWidth #define XtCLeftToolBarBorderWidth "LeftToolBarBorderWidth" #endif #ifndef XtNrightToolBarBorderWidth #define XtNrightToolBarBorderWidth "rightToolBarBorderWidth" #endif #ifndef XtCRightToolBarBorderWidth #define XtCRightToolBarBorderWidth "RightToolBarBorderWidth" #endif #ifndef XtNtopToolBarShadowColor #define XtNtopToolBarShadowColor "topToolBarShadowColor" #endif #ifndef XtCTopToolBarShadowColor #define XtCTopToolBarShadowColor "TopToolBarShadowColor" #endif #ifndef XtNbottomToolBarShadowColor #define XtNbottomToolBarShadowColor "bottomToolBarShadowColor" #endif #ifndef XtCBottomToolBarShadowColor #define XtCBottomToolBarShadowColor "BottomToolBarShadowColor" #endif #ifndef XtNbackgroundToolBarColor #define XtNbackgroundToolBarColor "backgroundToolBarColor" #endif #ifndef XtCBackgroundToolBarColor #define XtCBackgroundToolBarColor "BackgroundToolBarColor" #endif #ifndef XtNforegroundToolBarColor #define XtNforegroundToolBarColor "foregroundToolBarColor" #endif #ifndef XtCForegroundToolBarColor #define XtCForegroundToolBarColor "ForegroundToolBarColor" #endif #ifndef XtNtopToolBarShadowPixmap #define XtNtopToolBarShadowPixmap "topToolBarShadowPixmap" #endif #ifndef XtCTopToolBarShadowPixmap #define XtCTopToolBarShadowPixmap "TopToolBarShadowPixmap" #endif #ifndef XtNbottomToolBarShadowPixmap #define XtNbottomToolBarShadowPixmap "bottomToolBarShadowPixmap" #endif #ifndef XtCBottomToolBarShadowPixmap #define XtCBottomToolBarShadowPixmap "BottomToolBarShadowPixmap" #endif #ifndef XtNtoolBarShadowThickness #define XtNtoolBarShadowThickness "toolBarShadowThickness" #endif #ifndef XtCToolBarShadowThickness #define XtCToolBarShadowThickness "ToolBarShadowThickness" #endif #ifndef XtNscrollBarPlacement #define XtNscrollBarPlacement "scrollBarPlacement" #endif #ifndef XtCScrollBarPlacement #define XtCScrollBarPlacement "ScrollBarPlacement" #endif #ifndef XtRScrollBarPlacement #define XtRScrollBarPlacement "ScrollBarPlacement" #endif #ifndef XtNinterline #define XtNinterline "interline" #endif #ifndef XtCInterline #define XtCInterline "Interline" #endif #ifndef XtNfont #define XtNfont "font" #endif #ifndef XtCFont #define XtCFont "Font" #endif #ifndef XtNforeground #define XtNforeground "foreground" #endif #ifndef XtCForeground #define XtCForeground "Foreground" #endif #ifndef XtNbackground #define XtNbackground "background" #endif #ifndef XtCBackground #define XtCBackground "Background" #endif #ifndef XtNiconic #define XtNiconic "iconic" #endif #ifndef XtCIconic #define XtCIconic "Iconic" #endif #ifndef XtNcursorColor #define XtNcursorColor "cursorColor" #endif #ifndef XtCCursorColor #define XtCCursorColor "CursorColor" #endif #ifndef XtNbarCursor #define XtNbarCursor "barCursor" #endif #ifndef XtCBarCursor #define XtCBarCursor "BarCursor" #endif #ifndef XtNvisualBell #define XtNvisualBell "visualBell" #endif #ifndef XtCVisualBell #define XtCVisualBell "VisualBell" #endif #ifndef XtNbellVolume #define XtNbellVolume "bellVolume" #endif #ifndef XtCBellVolume #define XtCBellVolume "BellVolume" #endif #ifndef XtNpointerBackground #define XtNpointerBackground "pointerBackground" #endif #ifndef XtNpointerColor #define XtNpointerColor "pointerColor" #endif #ifndef XtNtextPointer #define XtNtextPointer "textPointer" #endif #ifndef XtNspacePointer #define XtNspacePointer "spacePointer" #endif #ifndef XtNmodeLinePointer #define XtNmodeLinePointer "modePointer" #endif #ifndef XtNgcPointer #define XtNgcPointer "gcPointer" #endif #ifndef XtNemacsFrame #define XtNemacsFrame "emacsFrame" #endif #ifndef XtCEmacsFrame #define XtCEmacsFrame "EmacsFrame" #endif #ifndef XtNgeometry #define XtNgeometry "geometry" #endif #ifndef XtCGeometry #define XtCGeometry "Geometry" #endif #ifndef XtNinitialGeometry #define XtNinitialGeometry "initialGeometry" #endif #ifndef XtCInitialGeometry #define XtCInitialGeometry "InitialGeometry" #endif #ifndef XtNmenubar #define XtNmenubar "menubar" #endif #ifndef XtCMenubar #define XtCMenubar "Menubar" #endif #ifndef XtNinitiallyUnmapped #define XtNinitiallyUnmapped "initiallyUnmapped" #endif #ifndef XtCInitiallyUnmapped #define XtCInitiallyUnmapped "InitiallyUnmapped" #endif #ifndef XtNpreferredWidth #define XtNpreferredWidth "preferredWidth" #endif #ifndef XtCPreferredWidth #define XtCPreferredWidth "PreferredWidth" #endif #ifndef XtNpreferredHeight #define XtNpreferredHeight "preferredHeight" #endif #ifndef XtCPreferredHeight #define XtCPreferredHeight "PreferredHeight" #endif #ifndef XtNuseBackingStore #define XtNuseBackingStore "useBackingStore" #endif #ifndef XtCUseBackingStore #define XtCUseBackingStore "UseBackingStore" #endif #define XtNximStyles "ximStyles" #define XtCXimStyles "XimStyles" #define XtRXimStyles "XimStyles" #define XtNximForeground "ximForeground" #define XtNximBackground "ximBackground" /* scrollbar placement types; like in ScrolledW.h */ #define EM_TOP 1 #define EM_BOTTOM 0 #define EM_LEFT 2 #define EM_RIGHT 0 #define XtTOP_LEFT (EM_TOP | EM_LEFT) #define XtBOTTOM_LEFT (EM_BOTTOM | EM_LEFT) #define XtTOP_RIGHT (EM_TOP | EM_RIGHT) #define XtBOTTOM_RIGHT (EM_BOTTOM | EM_RIGHT) /* structures */ typedef struct _EmacsFrameRec *EmacsFrame; typedef struct _EmacsFrameClassRec *EmacsFrameClass; extern WidgetClass emacsFrameClass; extern struct _DisplayContext* display_context; /* Special entrypoints */ void EmacsFrameRecomputeCellSize (Widget widget); void EmacsFrameSetCharSize (Widget widget, int rows, int cols); #endif /* INCLUDED_EmacsFrame_h_ */