Mercurial > hg > xemacs-beta
view src/extw-Xt.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 | 4fbcce3f6097 |
children | 2aa9cd456ae7 |
line wrap: on
line source
/* Common code between client and shell widgets -- Xt only. Copyright (C) 1993, 1994 Sun Microsystems, Inc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; 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, September 1993. */ #ifdef emacs #include <config.h> #ifndef EXTERNAL_WIDGET ERROR! This ought not be getting compiled if EXTERNAL_WIDGET is undefined #endif EXTERN_C void fatal (const char *fmt, ...); #else /* not emacs */ static void fatal (char *msg); #endif #include <X11/Intrinsic.h> #include <X11/IntrinsicP.h> #include <stdlib.h> #include <stdio.h> #include "compiler.h" #include "extw-Xt.h" #ifdef DEBUG_WIDGET static int geom_masks[] = { CWX, CWY, CWWidth, CWHeight, CWBorderWidth, CWSibling, CWStackMode, XtCWQueryOnly }; static char *geom_mask_strings[] = { "CWX", "CWY", "CWWidth", "CWHeight", "CWBorderWidth", "CWSibling", "CWStackMode", "XtCWQueryOnly" }; static int stack_modes[] = { Below, TopIf, BottomIf, Opposite, XtSMDontChange }; static char *stack_mode_strings[] = { "Below", "TopIf", "BottomIf", "Opposite", "XtSMDontChange" }; static void print_geometry_structure(XtWidgetGeometry *xwg) { int num = sizeof(geom_masks)/sizeof(int); int i; printf (" masks:"); for (i=0; i<num; i++) if (xwg->request_mode & geom_masks[i]) printf (" %s", geom_mask_strings[i]); printf ("\n"); printf (" x:%d y:%d\n", xwg->x, xwg->y); printf (" width:%d height:%d border_width:%d\n", xwg->width, xwg->height, xwg->border_width); printf (" sibling: %x\n", xwg->sibling); printf (" stack_mode: "); for (i=0, num=sizeof(stack_modes)/sizeof(int); i<num; i++) if (xwg->stack_mode == stack_modes[i]) { printf ("%s", stack_mode_strings[i]); break; } printf ("\n"); } static void print_geometry_result (XtGeometryResult res) { printf ("result: %s\n", res == XtGeometryYes ? "XtGeometryYes" : res == XtGeometryNo ? "XtGeometryNo" : res == XtGeometryAlmost ? "XtGeometryAlmost" : res == XtGeometryDone ? "XtGeometryDone" : "unknown"); } #endif #ifndef emacs static void fatal (char *msg) { fprintf (stderr, "%s", msg); exit (1); } #endif /* put a geometry specification in the specified property on the window of the specified widget, and send a notification message to tell the client-side widget about this. */ void extw_send_geometry_value(Display *display, Window win, Atom property, en_extw_notify type, XtWidgetGeometry *xwg, long data0) { if (xwg != NULL) XChangeProperty(display, win, property, a_EXTW_WIDGET_GEOMETRY, 32, PropModeReplace, (unsigned char *) xwg, sizeof(*xwg)/sizeof(int)); extw_send_notify_3(display, win, type, data0, 0, 0); } /* get the geometry specification stored in the specified property of the specified widget's window. */ void extw_get_geometry_value(Display *display, Window win, Atom property, XtWidgetGeometry *xwg) { Atom dummy; int format; unsigned long nitems, bytes_after; unsigned char *prop; if (XGetWindowProperty(display, win, property, 0, sizeof(*xwg)/4, False, a_EXTW_WIDGET_GEOMETRY, &dummy, &format, &nitems, &bytes_after, &prop) != Success) goto error; if (format != 8*sizeof(int) || bytes_after) { XFree((char *) prop); goto error; } *xwg = * (XtWidgetGeometry *) prop; return; error: fatal("Unable to retrieve property for widget-geometry"); #if 0 XtAppErrorMsg(XtWidgetToApplicationContext((Widget)w), "invalidProperty","get_geometry_value",XtCXtToolkitError, "Unable to retrieve property for widget-geometry", (String *)NULL, (Cardinal *)NULL); #endif } typedef struct { Widget w; unsigned long request_num; en_extw_notify type; } QueryStruct; /* check if an event is of the sort we're looking for */ static Bool isMine(XEvent *event, QueryStruct *q) { Widget w = q->w; if ( (event->xany.display != XtDisplay(w)) || (event->xany.window != XtWindow(w)) ) { return FALSE; } if (event->xany.serial >= q->request_num) { if (event->type == ClientMessage && event->xclient.message_type == a_EXTW_NOTIFY && event->xclient.data.l[0] == 1 - extw_which_side && event->xclient.data.l[1] == (int) q->type) { return TRUE; } } return FALSE; } void responseTimeOut(XtPointer clientData, XtIntervalId * UNUSED (id)) { Bool *expired=(Bool *)clientData; *expired=TRUE; } /* wait for a ClientMessage of the specified type from the other widget, or time-out. isMine() determines whether an event matches. Took out the call to _XtWaitForSomething and replaced it with public Xt api's. */ Bool extw_wait_for_response (Widget w, XEvent *event, unsigned long request_num, en_extw_notify type, unsigned long timeout) { XtAppContext app = XtWidgetToApplicationContext(w); XtInputMask inputMask; QueryStruct q; Bool expired; XtIntervalId id; q.w = w; q.request_num = request_num; q.type = type; expired=FALSE; id=XtAppAddTimeOut(app, timeout, responseTimeOut,&expired); while (!expired) { inputMask=XtAppPending(app); if (inputMask & XtIMXEvent) { XtAppNextEvent(app, event); if (isMine(event,&q)) { if (!expired) XtRemoveTimeOut(id); return True; } else { /* Do Nothing and go back to waiting */ } } if (inputMask & XtIMTimer) { /* Process the expired timer */ XtAppProcessEvent(app,XtIMTimer); } } /* Must have expired */ return False; }