Mercurial > hg > xemacs-beta
view src/EmacsFrame.h @ 5090:0ca81354c4c7
Further frame-geometry cleanups
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Intro to Window and Frame Geometry):
* internals/internals.texi (The Paned Area):
* internals/internals.texi (The Displayable Area):
Update to make note of e.g. the fact that the bottom gutter is
actually above the minibuffer.
src/ChangeLog addition:
2010-03-03 Ben Wing <ben@xemacs.org>
* emacs.c:
* emacs.c (assert_equal_failed):
* lisp.h:
* lisp.h (assert_equal):
New fun assert_equal, asserting that two values == each other, and
printing out both values upon failure.
* frame-gtk.c (gtk_initialize_frame_size):
* frame-impl.h:
* frame-impl.h (FRAME_TOP_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_BOTTOM_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_LEFT_INTERNAL_BORDER_START):
* frame-impl.h (FRAME_PANED_TOP_EDGE):
* frame-impl.h (FRAME_NONPANED_SIZE):
* frame-x.c (x_initialize_frame_size):
* frame.c:
* gutter.c (get_gutter_coords):
* gutter.c (calculate_gutter_size):
* gutter.h:
* gutter.h (WINDOW_REAL_TOP_GUTTER_BOUNDS):
* gutter.h (FRAME_TOP_GUTTER_BOUNDS):
* input-method-xlib.c:
* input-method-xlib.c (XIM_SetGeometry):
* redisplay-output.c (clear_left_border):
* redisplay-output.c (clear_right_border):
* redisplay-output.c (redisplay_output_pixmap):
* redisplay-output.c (redisplay_clear_region):
* redisplay-output.c (redisplay_clear_top_of_window):
* redisplay-output.c (redisplay_clear_to_window_end):
* redisplay-xlike-inc.c (XLIKE_clear_frame):
* redisplay.c:
* redisplay.c (UPDATE_CACHE_RETURN):
* redisplay.c (pixel_to_glyph_translation):
* toolbar.c (update_frame_toolbars_geometry):
* window.c (Fwindow_pixel_edges):
Get rid of some redundant macros. Consistently use the
FRAME_TOP_*_START, FRAME_RIGHT_*_END, etc. format. Rename
FRAME_*_BORDER_* to FRAME_*_INTERNAL_BORDER_*. Comment out
FRAME_BOTTOM_* for gutters and the paned area due to the
uncertainty over where the paned area actually begins. (Eventually
we should probably move the gutters outside the minibuffer so that
the paned area is contiguous.) Use FRAME_PANED_* more often in the
code to make things clearer.
Update the diagram to show that the bottom gutter is inside the
minibuffer (!) and that there are "junk boxes" when you have left
and/or right gutters (dead boxes that are mistakenly left uncleared,
unlike the corresponding scrollbar dead boxes). Update the text
appropriately to cover the bottom gutter position, etc.
Rewrite gutter-geometry code to use the FRAME_*_GUTTER_* in place of
equivalent expressions referencing other frame elements, to make the
code more portable in case we move around the gutter location.
Cleanup FRAME_*_GUTTER_BOUNDS() in gutter.h.
Add some #### GEOM! comments where I think code is incorrect --
typically, it wasn't fixed up properly when the gutter was added.
Some cosmetic changes.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 03 Mar 2010 05:07:47 -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_ */