Mercurial > hg > xemacs-beta
view src/EmacsFrame.c @ 4885:6772ce4d982b
Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums
lisp/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Correct the semantics of #'member*, #'eql, #'assoc* in the
presence of bignums; change the integerp byte code to fixnump
semantics.
* bytecomp.el (fixnump, integerp, byte-compile-integerp):
Change the integerp byte code to fixnump; add a byte-compile
method to integerp using fixnump and numberp and avoiding a
funcall most of the time, since in the non-core contexts where
integerp is used, it's mostly distinguishing between fixnums and
things that are not numbers at all.
* byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops)
(byte-compile-side-effect-and-error-free-ops):
Replace the integerp bytecode with fixnump; add fixnump to the
side-effect-free-fns. Add the other extended number type
predicates to the list in passing.
* obsolete.el (floatp-safe): Mark this as obsolete.
* cl.el (eql): Go into more detail in the docstring here. Don't
bother checking whether both arguments are numbers; one is enough,
#'equal will fail correctly if they have distinct types.
(subst): Replace a call to #'integerp (deciding whether to use
#'memq or not) with one to #'fixnump.
Delete most-positive-fixnum, most-negative-fixnum from this file;
they're now always in C, so they can't be modified from Lisp.
* cl-seq.el (member*, assoc*, rassoc*):
Correct these functions in the presence of bignums.
* cl-macs.el (cl-make-type-test): The type test for a fixnum is
now fixnump. Ditch floatp-safe, use floatp instead.
(eql): Correct this compiler macro in the presence of bignums.
(assoc*): Correct this compiler macro in the presence of bignums.
* simple.el (undo):
Change #'integerp to #'fixnump here, since we use #'delq with the
same value as ELT a few lines down.
src/ChangeLog addition:
2010-01-24 Aidan Kehoe <kehoea@parhasard.net>
Fix problems with #'eql, extended number types, and the hash table
implementation; change the Bintegerp bytecode to fixnump semantics
even on bignum builds, since #'integerp can have a fast
implementation in terms of #'fixnump for most of its extant uses,
but not vice-versa.
* lisp.h: Always #include number.h; we want the macros provided in
it, even if the various number types are not available.
* number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its
argument is of non-immediate number type. Equivalent to FLOATP if
WITH_NUMBER_TYPES is not defined.
* elhash.c (lisp_object_eql_equal, lisp_object_eql_hash):
Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP,
giving more correct behaviour in the presence of the extended
number types.
* bytecode.c (Bfixnump, execute_optimized_program):
Rename Bintegerp to Bfixnump; change its semantics to reflect the
new name on builds with bignum support.
* data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data):
Always make #'fixnump available, even on non-BIGNUM builds;
always implement #'integerp in this file, even on BIGNUM builds.
Move most-positive-fixnum, most-negative-fixnum here from
number.c, so they are Lisp constants even on builds without number
types, and attempts to change or bind them error.
Use the NUMBERP and INTEGERP macros even on builds without
extended number types.
* data.c (fixnum_char_or_marker_to_int):
Rename this function from integer_char_or_marker_to_int, to better
reflect the arguments it accepts.
* number.c (Fevenp, Foddp, syms_of_number):
Never provide #'integerp in this file. Remove #'oddp,
#'evenp; their implementations are overridden by those in cl.el.
* number.c (vars_of_number):
most-positive-fixnum, most-negative-fixnum are no longer here.
man/ChangeLog addition:
2010-01-23 Aidan Kehoe <kehoea@parhasard.net>
Generally: be careful to say fixnum, not integer, when talking
about fixed-precision integral types. I'm sure I've missed
instances, both here and in the docstrings, but this is a decent
start.
* lispref/text.texi (Columns):
Document where only fixnums, not integers generally, are accepted.
(Registers):
Remove some ancient char-int confoundance here.
* lispref/strings.texi (Creating Strings, Creating Strings):
Be more exact in describing where fixnums but not integers in
general are accepted.
(Creating Strings): Use a more contemporary example to illustrate
how concat deals with lists including integers about #xFF. Delete
some obsolete documentation on same.
(Char Table Types): Document that only fixnums are accepted as
values in syntax tables.
* lispref/searching.texi (String Search, Search and Replace):
Be exact in describing where fixnums but not integers in general
are accepted.
* lispref/range-tables.texi (Range Tables): Be exact in describing
them; only fixnums are accepted to describe ranges.
* lispref/os.texi (Killing XEmacs, User Identification)
(Time of Day, Time Conversion):
Be more exact about using fixnum where only fixed-precision
integers are accepted.
* lispref/objects.texi (Integer Type): Be more exact (and
up-to-date) about the possible values for
integers. Cross-reference to documentation of the bignum extension.
(Equality Predicates):
(Range Table Type):
(Array Type): Use fixnum, not integer, to describe a
fixed-precision integer.
(Syntax Table Type): Correct some English syntax here.
* lispref/numbers.texi (Numbers): Change the phrasing here to use
fixnum to mean the fixed-precision integers normal in emacs.
Document that our terminology deviates from that of Common Lisp,
and that we're working on it.
(Compatibility Issues): Reiterate the Common Lisp versus Emacs
Lisp compatibility issues.
(Comparison of Numbers, Arithmetic Operations):
* lispref/commands.texi (Command Loop Info, Working With Events):
* lispref/buffers.texi (Modification Time):
Be more exact in describing where fixnums but not integers in
general are accepted.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 24 Jan 2010 15:21:27 +0000 |
| parents | 5460287a3327 |
| children | d0c14ea98592 6f2158fa75ed |
line wrap: on
line source
/* The emacs frame widget. Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. 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. */ /* #### Note to potential hackers: Don't mess with this unless you're sure you know what you're doing! Xt is a lot more subtle than you may think. */ #include <config.h> #include "lisp.h" #include "device-impl.h" #include "faces.h" #include "frame-impl.h" #include "toolbar.h" #include "window.h" #include "console-x-impl.h" #include "glyphs-x.h" #include "objects-x.h" #include <X11/Shell.h> #include <X11/Xmu/CharSet.h> #include "EmacsFrameP.h" #include "EmacsManager.h" /* for EmacsManagerChangeSize */ #include "../lwlib/xt-wrappers.h" static void EmacsFrameClassInitialize (void); static void EmacsFrameInitialize (Widget, Widget, ArgList, Cardinal *); static void EmacsFrameRealize (Widget, XtValueMask*, XSetWindowAttributes*); static void EmacsFrameResize (Widget widget); static Boolean EmacsFrameSetValues (Widget, Widget, Widget, ArgList, Cardinal *); static XtGeometryResult EmacsFrameQueryGeometry (Widget, XtWidgetGeometry*, XtWidgetGeometry*); extern void emacs_Xt_mapping_action (Widget w, XEvent* event); #undef XtOffset #define XtOffset(p_type,field) \ ((Cardinal) (((char *) (&(((p_type)0)->field))) - ((char *)0))) #define offset(field) XtOffset (EmacsFrame, emacs_frame.field) #define res(name,_class,intrepr,type,member,extrepr,value) \ Xt_RESOURCE (name, _class, intrepr, type, offset(member), extrepr, value) static XtResource resources[] = { res (XtNgeometry, XtCGeometry, XtRString, String, geometry, XtRString, 0), res (XtNiconic, XtCIconic, XtRBoolean, Boolean, iconic, XtRImmediate, False), res (XtNemacsFrame, XtCEmacsFrame, XtRPointer, XtPointer, frame, XtRImmediate, 0), res (XtNmenubar, XtCMenubar, XtRBoolean, Boolean, menubar_p, XtRImmediate, True), res (XtNinitiallyUnmapped, XtCInitiallyUnmapped, XtRBoolean, Boolean, initially_unmapped, XtRImmediate, False), res (XtNminibuffer, XtCMinibuffer, XtRBoolean, Boolean, minibuffer, XtRImmediate, True), res (XtNunsplittable, XtCUnsplittable, XtRBoolean, Boolean, unsplittable, XtRImmediate, False), res (XtNinternalBorderWidth, XtCInternalBorderWidth, XtRInt, int, internal_border_width, XtRImmediate, 4), #ifdef HAVE_SCROLLBARS res (XtNscrollBarWidth, XtCScrollBarWidth, XtRInt, int, scrollbar_width, XtRImmediate, -1), res (XtNscrollBarHeight, XtCScrollBarHeight, XtRInt, int, scrollbar_height, XtRImmediate, -1), res (XtNscrollBarPlacement, XtCScrollBarPlacement, XtRScrollBarPlacement, unsigned char, scrollbar_placement, XtRImmediate, #if defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_LUCID) || \ defined (LWLIB_SCROLLBARS_ATHENA3D) XtBOTTOM_RIGHT #else XtBOTTOM_LEFT #endif ), #endif /* HAVE_SCROLLBARS */ #ifdef HAVE_TOOLBARS res (XtNtopToolBarHeight, XtCTopToolBarHeight, XtRInt, int, top_toolbar_height, XtRImmediate, -1), res (XtNbottomToolBarHeight, XtCBottomToolBarHeight, XtRInt, int, bottom_toolbar_height, XtRImmediate, -1), res (XtNleftToolBarWidth, XtCLeftToolBarWidth, XtRInt, int, left_toolbar_width, XtRImmediate, -1), res (XtNrightToolBarWidth, XtCRightToolBarWidth, XtRInt, int, right_toolbar_width, XtRImmediate, -1), res (XtNtopToolBarBorderWidth, XtCTopToolBarBorderWidth, XtRInt, int, top_toolbar_border_width, XtRImmediate, -1), res (XtNbottomToolBarBorderWidth, XtCBottomToolBarBorderWidth, XtRInt, int, bottom_toolbar_border_width, XtRImmediate, -1), res (XtNleftToolBarBorderWidth, XtCLeftToolBarBorderWidth, XtRInt, int, left_toolbar_border_width, XtRImmediate, -1), res (XtNrightToolBarBorderWidth, XtCRightToolBarBorderWidth, XtRInt, int, right_toolbar_border_width, XtRImmediate, -1), res (XtNtoolBarShadowThickness, XtCToolBarShadowThickness, XtRDimension, Dimension, toolbar_shadow_thickness, XtRImmediate, 2), #endif /* HAVE_TOOLBARS */ res (XtNinterline, XtCInterline, XtRInt, int, interline, XtRImmediate, 0), res (XtNfont, XtCFont, XtRFontStruct, XFontStruct *, font, XtRImmediate, 0), res (XtNforeground, XtCForeground, XtRPixel, Pixel, foreground_pixel, XtRString, "Black"), res (XtNbackground, XtCBackground, XtRPixel, Pixel, background_pixel, XtRString, "Gray80"), res (XtNcursorColor, XtCForeground, XtRPixel, Pixel, cursor_color, XtRString, "XtDefaultForeground"), res (XtNbarCursor, XtCBarCursor, XtRBoolean, Boolean, bar_cursor, XtRImmediate, 0), res (XtNvisualBell, XtCVisualBell, XtRBoolean, Boolean, visual_bell, XtRImmediate, 0), res (XtNbellVolume, XtCBellVolume, XtRInt, int, bell_volume, XtRImmediate, 0), res (XtNuseBackingStore, XtCUseBackingStore, XtRBoolean, Boolean, use_backing_store, XtRImmediate, 0), res (XtNpreferredWidth, XtCPreferredWidth, XtRDimension, Dimension, preferred_width, XtRImmediate, 0), res (XtNpreferredHeight, XtCPreferredHeight, XtRDimension, Dimension, preferred_height, XtRImmediate, 0), }; #undef offset /* Xt is stupid and dumb. Xt is stupid and dumb. Xt is stupid and dumb. */ static XtActionsRec emacsFrameActionsTable [] = { { (String) "mapping", (XtActionProc) emacs_Xt_mapping_action}, }; static char emacsFrameTranslations [] = "\ <Mapping>: mapping()\n\ "; /* If we're running under Motif, make this widget a subclass of XmPrimitive. It's not clear this is necessary, but it may make focus behavior work better. */ EmacsFrameClassRec emacsFrameClassRec = { { /* core fields */ #ifdef LWLIB_USES_MOTIF /* superclass */ (WidgetClass) &xmPrimitiveClassRec, #else /* superclass */ &widgetClassRec, #endif /* class_name */ (String) "EmacsFrame", /* widget_size */ sizeof (EmacsFrameRec), /* class_initialize */ EmacsFrameClassInitialize, /* class_part_initialize */ 0, /* class_inited */ FALSE, /* initialize */ EmacsFrameInitialize, /* initialize_hook */ 0, /* realize */ EmacsFrameRealize, /* actions */ emacsFrameActionsTable, /* num_actions */ XtNumber (emacsFrameActionsTable), /* resources */ resources, /* resource_count */ XtNumber (resources), /* xrm_class */ NULLQUARK, /* compress_motion */ TRUE, /* compress_exposure */ TRUE, /* compress_enterleave */ TRUE, /* visible_interest */ FALSE, /* destroy */ NULL, /* resize */ EmacsFrameResize, /* expose */ XtInheritExpose, /* set_values */ EmacsFrameSetValues, /* set_values_hook */ 0, /* set_values_almost */ XtInheritSetValuesAlmost, /* get_values_hook */ 0, /* accept_focus */ XtInheritAcceptFocus, /* version */ XtVersion, /* callback_private */ 0, /* tm_table */ emacsFrameTranslations, /* query_geometry */ EmacsFrameQueryGeometry, /* display_accelerator */ XtInheritDisplayAccelerator, /* extension */ 0 }, #ifdef LWLIB_USES_MOTIF { /* XmPrimitiveClassPart */ (XtWidgetProc) _XtInherit, /* border_highlight */ (XtWidgetProc) _XtInherit, /* border_unhighlight */ /* Setting the following to NULL causes PrimitiveInitialize() not to add traversal (TAB etc. to switch focus) and focus-in/out (border highlight/unhighlight) translations. If you want those translations, use the value XtInheritTranslations instead. Doing this, however, will interfere with Emacs focus handling (which highlights/unhighlights the text cursor), and will lead to strange display results around the border of the widget. */ NULL, /* translations */ NULL, /* arm_and_activate */ NULL, /* get resources */ 0, /* num get_resources */ NULL, /* extension */ }, #endif /* LWLIB_USES_MOTIF */ { 0 } }; WidgetClass emacsFrameClass = (WidgetClass) &emacsFrameClassRec; static void update_various_frame_slots (EmacsFrame ew) { ew->emacs_frame.frame->pixheight = ew->core.height; ew->emacs_frame.frame->pixwidth = ew->core.width; } static void EmacsFrameInitialize (Widget UNUSED (request), Widget new_, ArgList UNUSED (unused1), Cardinal *UNUSED (unused2)) { EmacsFrame ew = (EmacsFrame)new_; struct frame *f = ew->emacs_frame.frame; if (!f) fatal ("can't create an emacs frame widget without a frame."); ew->emacs_frame.frame->internal_border_width = ew->emacs_frame.internal_border_width; } void emacs_Xt_event_handler (Widget wid /* unused */, XtPointer closure /* unused */, XEvent *event, Boolean *continue_to_dispatch /* unused */); static void EmacsFrameRealize (Widget widget, XtValueMask *mask, XSetWindowAttributes *attrs) { EmacsFrame ew = (EmacsFrame) widget; struct frame *f = ew->emacs_frame.frame; Widget shell_widget = FRAME_X_SHELL_WIDGET (f); attrs->event_mask = ExposureMask | VisibilityChangeMask | PropertyChangeMask | StructureNotifyMask | SubstructureNotifyMask | /*SubstructureRedirectMask |*/ /* Only for WMs! */ KeyPressMask | KeyReleaseMask | ButtonPressMask | ButtonReleaseMask | FocusChangeMask | PointerMotionHintMask | PointerMotionMask | LeaveWindowMask | EnterWindowMask; *mask |= CWEventMask; if (ew->emacs_frame.use_backing_store) { attrs->backing_store = Always; *mask |= CWBackingStore; } XtCreateWindow (widget, InputOutput, (Visual *)CopyFromParent, *mask, attrs); /* snarf the events we want. */ XtInsertEventHandler (widget, attrs->event_mask, TRUE, emacs_Xt_event_handler, NULL, XtListHead); /* some events (e.g. map-notify and WM_DELETE_WINDOW) get sent directly to the shell, and the above event handler won't see them. So add a handler to get them. These events don't propagate, so there's no danger of them being seen twice. */ XtInsertEventHandler (shell_widget, EnterWindowMask | LeaveWindowMask | VisibilityChangeMask | StructureNotifyMask | KeyPressMask, TRUE, emacs_Xt_event_handler, NULL, XtListHead); #ifdef EXTERNAL_WIDGET /* #### Not sure if this special case is necessary */ if (!FRAME_X_EXTERNAL_WINDOW_P (f)) #endif /* This is necessary under Motif in order to make it possible to click in a buffer and move focus out of a dialog box or control panel and back into emacs-land; also necessary so that you can still type chars if the cursor is over the menubar or scrollbar. */ lw_set_keyboard_focus (shell_widget, FRAME_X_TEXT_WIDGET (f)); } /* DO NOT CALL THIS FUNCTION! Only Xt is supposed to do this. */ static void EmacsFrameResize (Widget widget) { EmacsFrame ew = (EmacsFrame)widget; struct frame *f = ew->emacs_frame.frame; int columns; int rows; XtWidgetGeometry req, repl; update_various_frame_slots (ew); pixel_to_char_size (f, ew->core.width, ew->core.height, &columns, &rows); change_frame_size (f, rows, columns, 0); /* The code below is just plain wrong. If the EmacsShell or EmacsManager needs to know, they should just ask. If needed information is being updated here, then we should set a dirty flag and have it updated on an as-needed basis. For now, conditionalize so people can get work done if this breaks something. */ if (wedge_metacity) /* cf. x_set_frame_size */ { /* Now we tell the EmacsShell that we've changed the size of the non-fixed portion of the frame. Note that, if the resize occurred as a result of EmacsFrameSetCharSize(), this information will be stored twice. This is not a big deal, as storing this information doesn't actually do anything until the next resize. */ if (FRAME_X_TOP_LEVEL_FRAME_P (f)) x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); /* Kick the manager so that it knows we've changed size. #### No, no, no! If this does anything at all, it will involve changing the manager's size. That's not something that a child widget should initialize as part of a purely informational method!! */ req.request_mode = 0; XtQueryGeometry (FRAME_X_CONTAINER_WIDGET (f), &req, &repl); EmacsManagerChangeSize (FRAME_X_CONTAINER_WIDGET (f), repl.width, repl.height); } } static Boolean EmacsFrameSetValues (Widget cur_widget, Widget UNUSED (req_widget), Widget new_widget, ArgList argv, Cardinal *argc) { EmacsFrame cur = (EmacsFrame) cur_widget; EmacsFrame new_ = (EmacsFrame) new_widget; struct frame *f = new_->emacs_frame.frame; in_resource_setting++; /* This function does not need to do much. Pretty much everything interesting will get done in the resize method, which will (if necessary) get called by Xt when this function returns (see below). */ /* #### This function will not work if it is not called from update_EmacsFrame(), called from SET_FACE_PROPERTY(). The code located there should be moved inside of here instead, so that things work if either SET_FACE_PROPERTY() is called or XtSetValues() is called. */ if (cur->emacs_frame.iconic != new_->emacs_frame.iconic && FRAME_X_TOP_LEVEL_FRAME_P (new_->emacs_frame.frame)) x_wm_set_shell_iconic_p (FRAME_X_SHELL_WIDGET (new_->emacs_frame.frame), new_->emacs_frame.iconic); /* If we got here, then we were likely called as a result of the EditRes protocol, so go ahead and change scrollbar-width and scrollbar-height. Otherwise, we're merely mirroring a change made to scrollbar-width etc. so don't do anything special. */ if (cur->emacs_frame.internal_border_width != new_->emacs_frame.internal_border_width) { f->internal_border_width = new_->emacs_frame.internal_border_width; MARK_FRAME_SIZE_SLIPPED (f); } #ifdef HAVE_SCROLLBARS if (cur->emacs_frame.scrollbar_width != new_->emacs_frame.scrollbar_width) Fadd_spec_to_specifier (Vscrollbar_width, make_int (new_->emacs_frame.scrollbar_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.scrollbar_height != new_->emacs_frame.scrollbar_height) Fadd_spec_to_specifier (Vscrollbar_height, make_int (new_->emacs_frame.scrollbar_height), wrap_frame (f), Qnil, Qnil); #endif /* HAVE_SCROLLBARS */ #ifdef HAVE_TOOLBARS if (cur->emacs_frame.top_toolbar_height != new_->emacs_frame.top_toolbar_height) Fadd_spec_to_specifier (Vtoolbar_size[TOP_TOOLBAR], make_int (new_->emacs_frame.top_toolbar_height), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.bottom_toolbar_height != new_->emacs_frame.bottom_toolbar_height) Fadd_spec_to_specifier (Vtoolbar_size[BOTTOM_TOOLBAR], make_int (new_->emacs_frame.bottom_toolbar_height), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.left_toolbar_width != new_->emacs_frame.left_toolbar_width) Fadd_spec_to_specifier (Vtoolbar_size[LEFT_TOOLBAR], make_int (new_->emacs_frame.left_toolbar_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.right_toolbar_width != new_->emacs_frame.right_toolbar_width) Fadd_spec_to_specifier (Vtoolbar_size[RIGHT_TOOLBAR], make_int (new_->emacs_frame.right_toolbar_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.top_toolbar_border_width != new_->emacs_frame.top_toolbar_border_width) Fadd_spec_to_specifier (Vtoolbar_border_width[TOP_TOOLBAR], make_int (new_->emacs_frame.top_toolbar_border_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.bottom_toolbar_border_width != new_->emacs_frame.bottom_toolbar_border_width) Fadd_spec_to_specifier (Vtoolbar_border_width[BOTTOM_TOOLBAR], make_int (new_->emacs_frame.bottom_toolbar_border_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.left_toolbar_border_width != new_->emacs_frame.left_toolbar_border_width) Fadd_spec_to_specifier (Vtoolbar_border_width[LEFT_TOOLBAR], make_int (new_->emacs_frame.left_toolbar_border_width), wrap_frame (f), Qnil, Qnil); if (cur->emacs_frame.right_toolbar_border_width != new_->emacs_frame.right_toolbar_border_width) Fadd_spec_to_specifier (Vtoolbar_border_width[RIGHT_TOOLBAR], make_int (new_->emacs_frame.right_toolbar_border_width), wrap_frame (f), Qnil, Qnil); #endif /* HAVE_TOOLBARS */ in_resource_setting--; /* If the request was to resize us, but the size has not changed, Xt will do nothing, and won't call our resize callback. Since such a request might be issued as a result of hiding/showing menubar or changing toolbar placement, where we rely on relayout made by the callback, we go ahead and simulate such a call */ if (cur->core.width == new_->core.width && cur->core.height == new_->core.height) { int i; for (i = 0; i < (int) *argc; i++) if (strcmp (argv[i].name, XtNwidth) == 0 || strcmp (argv[i].name, XtNheight) == 0) { EmacsFrameResize (new_widget); break; } } return False; /* Note that if either (a) we return True, or (b) the width or height has changed, an Expose event will be generated. The Xt manual says you should not return True if the width or height has changed, because then two Expose events will be generated. In any case, there is no need to return True because SET_FACE_PROPERTY(), which does the resource setting, automatically forces a redisplay as necessary. */ } static XtGeometryResult EmacsFrameQueryGeometry (Widget widget, XtWidgetGeometry *request, XtWidgetGeometry *result) { EmacsFrame ew = (EmacsFrame) widget; int mask = request->request_mode; Dimension width, height; int ok_width_int, ok_height_int; Dimension ok_width, ok_height; /* We have a definite preference for what size we would like to be. 1) If a preferred size was specified for us, use it. (This is not currently used) 2) If a proposed size was given, round it to the nearest multiple of the default char size and return it. 3) Otherwise, take our current size and round it to the nearest multiple of the default char size. */ width = mask & CWWidth ? request->width : ew->core.width; height = mask & CWHeight ? request->height : ew->core.height; round_size_to_char (ew->emacs_frame.frame, width, height, &ok_width_int, &ok_height_int); ok_width = (Dimension) ok_width_int; ok_height = (Dimension) ok_height_int; if (ew->emacs_frame.preferred_width) ok_width = ew->emacs_frame.preferred_width; if (ew->emacs_frame.preferred_height) ok_height = ew->emacs_frame.preferred_height; result->request_mode |= CWWidth | CWHeight; result->width = ok_width; result->height = ok_height; if (((mask & CWWidth) && ok_width != request->width) || ((mask & CWHeight) && ok_height != request->height)) return XtGeometryAlmost; else return XtGeometryYes; } /* Xt string-to-scrollbar-placement converter */ /* #### Convert this to a `new-style' converter (See XtAddTypeConverter) */ /* This variable cannot be a stack variable. */ static unsigned char cvt_string_scrollbar_placement; /* ARGSUSED */ static void Xt_StringToScrollBarPlacement (XrmValuePtr UNUSED (args), Cardinal *UNUSED (num_args), XrmValuePtr fromVal, XrmValuePtr toVal) { /* !!#### needs work */ XrmQuark q; char *lowerName = (char *) ALLOCA (strlen ((char *) fromVal->addr) + 1); XmuCopyISOLatin1Lowered (lowerName, (char *) fromVal->addr); q = XrmStringToQuark (lowerName); toVal->size = sizeof (cvt_string_scrollbar_placement); toVal->addr = (XPointer) &cvt_string_scrollbar_placement; if (q == XrmStringToQuark ("top-left") || q == XrmStringToQuark ("top_left")) cvt_string_scrollbar_placement = XtTOP_LEFT; else if (q == XrmStringToQuark ("bottom-left") || q == XrmStringToQuark ("bottom_left")) cvt_string_scrollbar_placement = XtBOTTOM_LEFT; else if (q == XrmStringToQuark ("top-right") || q == XrmStringToQuark ("top_right")) cvt_string_scrollbar_placement = XtTOP_RIGHT; else if (q == XrmStringToQuark ("bottom-right") || q == XrmStringToQuark ("bottom_right")) cvt_string_scrollbar_placement = XtBOTTOM_RIGHT; else { XtStringConversionWarning (fromVal->addr, "scrollBarPlacement"); toVal->addr = NULL; toVal->size = 0; } } static void EmacsFrameClassInitialize (void) { XtAddConverter (XtRString, XtRScrollBarPlacement, Xt_StringToScrollBarPlacement, NULL, 0); } /********************* Special entrypoints *******************/ void EmacsFrameRecomputeCellSize (Widget w) { EmacsFrame ew = (EmacsFrame) w; int cw, ch; struct frame *f = ew->emacs_frame.frame; if (! XtIsSubclass (w, emacsFrameClass)) ABORT (); default_face_height_and_width (wrap_frame (f), &ch, &cw); if (FRAME_X_TOP_LEVEL_FRAME_P (f)) x_wm_set_cell_size (FRAME_X_SHELL_WIDGET (f), cw, ch); } /* Set the size of the widget to have the number of rows and columns specified. This both causes the X window to change and the internal frame structures to get modified to match. */ void EmacsFrameSetCharSize (Widget widget, int columns, int rows) { EmacsFrame ew = (EmacsFrame) widget; int pixel_width, pixel_height; struct frame *f = ew->emacs_frame.frame; if (columns < 3) columns = 3; /* no way buddy */ if (rows < 1) rows = 1; char_to_pixel_size (f, columns, rows, &pixel_width, &pixel_height); if (FRAME_X_TOP_LEVEL_FRAME_P (f)) x_wm_set_variable_size (FRAME_X_SHELL_WIDGET (f), columns, rows); { Arg al [2]; Xt_SET_ARG (al [0], XtNwidth, pixel_width); Xt_SET_ARG (al [1], XtNheight, pixel_height); XtSetValues ((Widget) ew, al, countof (al)); } }
