Mercurial > hg > xemacs-beta
view src/EmacsManager.c @ 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 | 726060ee587c |
children | 308d34e9f07d |
line wrap: on
line source
/* Emacs manager 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. */ /* Written by Ben Wing, May, 1994. */ #include <config.h> #include <X11/StringDefs.h> #include "EmacsManagerP.h" #ifdef LWLIB_MENUBARS_MOTIF #include "xmotif.h" #include <Xm/RowColumn.h> #endif /* LWLIB_MENUBARS_MOTIF */ #include "compiler.h" #include "../lwlib/xt-wrappers.h" /* For I, Emacs, am a kind god. Unlike the goddess Athena and the Titan Motif, I require no ritual sacrifices to placate the lesser daemons of geometry management. */ static XtResource resources[] = { #define offset(field) XtOffset(EmacsManagerWidget, emacs_manager.field) #define res(name,_class,intrepr,size,member,extrepr,value) \ Xt_RESOURCE (name, _class, intrepr, size, offset(member), extrepr, value) res (XtNresizeCallback, XtCCallback, XtRCallback, XtCallbackList, resize_callback, XtRImmediate, 0), res (XtNqueryGeometryCallback, XtCCallback, XtRCallback, XtCallbackList, query_geometry_callback, XtRImmediate, 0), res (XtNuserData, XtCUserData, XtRPointer, XtPointer, user_data, XtRImmediate, 0), }; /**************************************************************** * * Full class record constant * ****************************************************************/ static XtGeometryResult QueryGeometry (Widget wid, XtWidgetGeometry *request, XtWidgetGeometry *reply); static void Resize (Widget w); static XtGeometryResult GeometryManager (Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply); static void ChangeManaged (Widget w); static void Realize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes); static void ClassInitialize (void); EmacsManagerClassRec emacsManagerClassRec = { { /* core_class fields */ #ifdef LWLIB_USES_MOTIF /* superclass */ (WidgetClass) &xmManagerClassRec, #else /* superclass */ (WidgetClass) &compositeClassRec, #endif /* class_name */ (String) "EmacsManager", /* widget_size */ sizeof (EmacsManagerRec), /* class_initialize */ ClassInitialize, /* class_part_init */ NULL, /* class_inited */ FALSE, /* initialize */ NULL, /* initialize_hook */ NULL, /* realize */ Realize, /* actions */ NULL, /* num_actions */ 0, /* resources */ resources, /* num_resources */ XtNumber(resources), /* xrm_class */ NULLQUARK, /* compress_motion */ TRUE, /* compress_exposure */ XtExposeCompressMaximal | XtExposeNoRegion, /* compress_enterleave*/ TRUE, /* visible_interest */ FALSE, /* destroy */ NULL, /* resize */ Resize, /* expose */ NULL, /* set_values */ NULL, /* set_values_hook */ NULL, /* set_values_almost */ XtInheritSetValuesAlmost, /* get_values_hook */ NULL, /* accept_focus */ NULL, /* version */ XtVersion, /* callback_private */ NULL, /* tm_table */ XtInheritTranslations, /* query_geometry */ QueryGeometry, /* display_accelerator*/ XtInheritDisplayAccelerator, /* extension */ NULL }, { /* composite_class fields */ /* geometry_manager */ GeometryManager, /* change_managed */ ChangeManaged, /* insert_child */ XtInheritInsertChild, /* delete_child */ XtInheritDeleteChild, /* extension */ NULL }, #ifdef LWLIB_USES_MOTIF { /* constraint_class fields */ NULL, /* resource list */ 0, /* num resources */ 0, /* constraint size */ (XtInitProc)NULL, /* init proc */ (XtWidgetProc)NULL, /* destroy proc */ (XtSetValuesFunc)NULL, /* set values proc */ NULL, /* extension */ }, { /* manager_class fields */ XtInheritTranslations, /* translations */ NULL, /* syn_resources */ 0, /* num_syn_resources */ NULL, /* syn_cont_resources */ 0, /* num_syn_cont_resources */ XmInheritParentProcess, /* parent_process */ NULL, /* extension */ }, #endif { /* emacs_manager_class fields */ /* empty */ 0, } }; WidgetClass emacsManagerWidgetClass = (WidgetClass)&emacsManagerClassRec; /* What is my preferred size? A suggested size may be given. */ static XtGeometryResult QueryGeometry (Widget w, XtWidgetGeometry *request, XtWidgetGeometry *reply) { EmacsManagerWidget emw = (EmacsManagerWidget) w; EmacsManagerQueryGeometryStruct struc; int request_mode = request->request_mode; struc.request_mode = request_mode; struc.proposed_width = (request_mode & CWWidth) ? request->width : 0; struc.proposed_height = (request_mode & CWHeight) ? request->height : 0; XtCallCallbackList (w, emw->emacs_manager.query_geometry_callback, &struc); reply->request_mode = CWWidth | CWHeight; reply->width = struc.proposed_width; reply->height = struc.proposed_height; if (((request_mode & CWWidth) && (request->width != reply->width)) || ((request_mode & CWHeight) && (request->height != reply->height))) return XtGeometryAlmost; return XtGeometryYes; } static void Resize (Widget w) { EmacsManagerWidget emw = (EmacsManagerWidget) w; EmacsManagerResizeStruct struc; struc.width = w->core.width; struc.height = w->core.height; XtCallCallbackList (w, emw->emacs_manager.resize_callback, &struc); } static XtGeometryResult GeometryManager (Widget w, XtWidgetGeometry *request, XtWidgetGeometry *UNUSED (reply)) { /* Sure, any changes are fine. */ #ifdef LWLIB_MENUBARS_MOTIF /* The Motif menubar will merrily request a new size every time a child is added or deleted. Blow it off because it doesn't know what it's talking about. */ if (XtClass (w) != xmRowColumnWidgetClass) #endif /* LWLIB_MENUBARS_MOTIF */ { if (request->request_mode & CWWidth) w->core.width = request->width; if (request->request_mode & CWHeight) w->core.height = request->height; } if (request->request_mode & CWBorderWidth) w->core.border_width = request->border_width; if (request->request_mode & CWX) w->core.x = request->x; if (request->request_mode & CWY) w->core.y = request->y; return XtGeometryYes; } static void ChangeManaged (Widget w) { if (!XtIsRealized (w)) { XtWidgetGeometry request, reply; /* find out how big we'd like to be ... */ request.request_mode = 0; XtQueryGeometry (w, &request, &reply); EmacsManagerChangeSize (w, reply.width, reply.height); } } static void Realize (Widget w, Mask *valueMask, XSetWindowAttributes *attributes) { attributes->bit_gravity = NorthWestGravity; *valueMask |= CWBitGravity; XtCreateWindow (w, (unsigned) InputOutput, (Visual *) CopyFromParent, *valueMask, attributes); } static void ClassInitialize (void) { return; } void EmacsManagerChangeSize (Widget w, Dimension width, Dimension height) { if (width == 0) width = w->core.width; if (height == 0) height = w->core.height; /* #### AFAICT this gets called in two places. One is in ChangeManaged(), above. The other is in EmacsFrameResize(). Perhaps ChangeManaged() should initiate resize requests, but EmacsFrameResize() should not. Unfortunately, I've tried making this conditional on whether we're called from EmacsFrameResize() or not, but that results in an infloop via the callback to x_layout_widgets() in Resize(). Whee! */ /* do nothing if we're already that size */ if (w->core.width != width || w->core.height != height) { XtGeometryResult result = XtMakeResizeRequest (w, width, height, &w->core.width, &w->core.height); if (result == XtGeometryNo) return; if (result == XtGeometryAlmost) XtMakeResizeRequest (w, w->core.width, w->core.height, NULL, NULL); Resize (w); } }