Mercurial > hg > xemacs-beta
view src/extw-Xt.c @ 5634:2014ff433daf
Support hash COLLECTIONs, #'{all,try}-completion{s,}; add #'test-completion
src/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
Add #'test-completion, API from GNU.
Accept hash table COLLECTIONs in it and in the other
completion-oriented functions, #'try-completion,
#'all-completions, and those Lisp functions implemented in terms
of them.
* lisp.h: Update the prototype of map_obarray(), making FN
compatible with the FUNCTION argument of elisp_maphash();
* abbrev.c (abbrev_match_mapper):
* abbrev.c (record_symbol):
* doc.c (verify_doc_mapper):
* symbols.c (mapatoms_1):
* symbols.c (apropos_mapper):
Update these mapper functions to reflect the new argument to
map_obarray().
* symbols.c (map_obarray):
Call FN with two arguments, the string name of the symbol, and the
symbol itself, for API (mapper) compatibility with
elisp_maphash().
* minibuf.c (map_completion): New. Map a maphash_function_t across
a non function COLLECTION, as appropriate for #'try-completion and
friends.
* minibuf.c (map_completion_list): New. Map a maphash_function_t
across a pseudo-alist, as appropriate for the completion
functions.
* minibuf.c (ignore_completion_p): PRED needs to be called with
two args if and only if the collection is a hash table. Implement
this.
* minibuf.c (try_completion_mapper): New. The loop body of
#'try-completion, refactored out.
* minibuf.c (Ftry_completion): Use try_completion_mapper(),
map_completion().
* minibuf.c (all_completions_mapper): New. The loop body of
#'all-completions, refactored out.
* minibuf.c (Fall_completions): Use all_completions_mapper(),
map_completion().
* minibuf.c (test_completion_mapper): New. The loop body of
#'test-completion.
* minibuf.c (Ftest_completion): New, API from GNU.
* minibuf.c (syms_of_minibuf): Make Ftest_completion available.
tests/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
* automated/completion-tests.el: New.
Test #'try-completion, #'all-completion and #'test-completion with
list, vector and hash-table COLLECTION arguments.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 01 Jan 2012 15:18:52 +0000 |
parents | 2aa9cd456ae7 |
children |
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 General Public License as published by the Free Software Foundation, either version 3 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 General Public License for more details. You should have received a copy of the GNU General Public License along with this library. If not, see <http://www.gnu.org/licenses/>. */ /* 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; }