Mercurial > hg > xemacs-beta
view src/EmacsManager.c @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 01:02:40 -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); } }