Mercurial > hg > xemacs-beta
view src/extw-Xt.c @ 5882:bbe4146603db
Reduce regexp usage, now CL-oriented non-regexp code available, core Lisp
lisp/ChangeLog addition:
2015-04-01 Aidan Kehoe <kehoea@parhasard.net>
When calling #'string-match with a REGEXP without regular
expression special characters, call #'search, #'mismatch, #'find,
etc. instead, making our code less likely to side-effect other
functions' match data and a little faster.
* apropos.el (apropos-command):
* apropos.el (apropos):
Call (position ?\n ...) rather than (string-match "\n" ...) here.
* buff-menu.el:
* buff-menu.el (buffers-menu-omit-invisible-buffers):
Don't fire up the regexp engine just to check if a string starts
with a space.
* buff-menu.el (select-buffers-tab-buffers-by-mode):
Don't fire up the regexp engine just to compare mode basenames.
* buff-menu.el (format-buffers-tab-line):
* buff-menu.el (build-buffers-tab-internal): Moved to being a
label within the following.
* buff-menu.el (buffers-tab-items): Use the label.
* bytecomp.el (byte-compile-log-1):
Don't fire up the regexp engine just to look for a newline.
* cus-edit.el (get):
Ditto.
* cus-edit.el (custom-variable-value-create):
Ditto, but for a colon.
* descr-text.el (describe-text-sexp):
Ditto.
* descr-text.el (describe-char-unicode-data):
Use #'split-string-by-char given that we're just looking for a
semicolon.
* descr-text.el (describe-char):
Don't fire up the regexp engine just to look for a newline.
* disass.el (disassemble-internal):
Ditto.
* files.el (file-name-sans-extension):
Implement this using #'position.
* files.el (file-name-extension):
Correct this function's docstring, implement it in terms of
#'position.
* files.el (insert-directory):
Don't fire up the regexp engine to split a string by space; don't
reverse the list of switches, this is actually a longstand bug as
far as I can see.
* gnuserv.el (gnuserv-process-filter):
Use #'position here, instead of consing inside #'split-string
needlessly.
* gtk-file-dialog.el (gtk-file-dialog-update-dropdown):
Use #'split-string-by-char here, don't fire up #'split-string for
directory-sep-char.
* gtk-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* hyper-apropos.el (hyper-apropos-grok-functions):
* hyper-apropos.el (hyper-apropos-grok-variables):
Look for a newline using #'position rather than #'string-match in
these functions.
* info.el (Info-insert-dir):
* info.el (Info-insert-file-contents):
* info.el (Info-follow-reference):
* info.el (Info-extract-menu-node-name):
* info.el (Info-menu):
Look for fixed strings using #'position or #'search as appropriate
in this file.
* ldap.el (ldap-decode-string):
* ldap.el (ldap-encode-string):
#'encode-coding-string, #'decode-coding-string are always
available, don't check if they're fboundp.
* ldap.el (ldap-decode-address):
* ldap.el (ldap-encode-address):
Use #'split-string-by-char in these functions.
* lisp-mnt.el (lm-creation-date):
* lisp-mnt.el (lm-last-modified-date):
Don't fire up the regexp engine just to look for spaces in this file.
* menubar-items.el (default-menubar):
Use (not (mismatch ...)) rather than #'string-match here, for
simple regexp.
Use (search "beta" ...) rather than (string-match "beta" ...)
* menubar-items.el (sort-buffers-menu-alphabetically):
* menubar-items.el (sort-buffers-menu-by-mode-then-alphabetically):
* menubar-items.el (group-buffers-menu-by-mode-then-alphabetically):
Don't fire up the regexp engine to check if a string starts with
a space or an asterisk.
Use the more fine-grained results of #'compare-strings; compare
case-insensitively for the buffer menu.
* menubar-items.el (list-all-buffers):
* menubar-items.el (tutorials-menu-filter):
Use #'equal rather than #'string-equal, which, in this context,
has the drawback of not having a bytecode, and no redeeming
features.
* minibuf.el:
* minibuf.el (un-substitute-in-file-name):
Use #'count, rather than counting the occurences of $ using the
regexp engine.
* minibuf.el (read-file-name-internal-1):
Don't fire up the regexp engine to search for ?=.
* mouse.el (mouse-eval-sexp):
Check for newline with #'find.
* msw-font-menu.el (mswindows-reset-device-font-menus):
Split a string by newline with #'split-string-by-char.
* mule/japanese.el:
* mule/japanese.el ("Japanese"):
Use #'search rather than #'string-match; canoncase before
comparing; fix a bug I had introduced where I had been making case
insensitive comparisons where the case mattered.
* mule/korea-util.el (default-korean-keyboard):
Look for ?3 using #'find, not #'string-march.
* mule/korea-util.el (quail-hangul-switch-hanja):
Search for a fixed string using #'search.
* mule/mule-cmds.el (set-locale-for-language-environment):
#'position, #'substitute rather than #'string-match,
#'replace-in-string.
* newcomment.el (comment-make-extra-lines):
Use #'search rather than #'string-match for a simple string.
* package-get.el (package-get-remote-filename):
Use #'position when looking for ?@
* process.el (setenv):
* process.el (read-envvar-name):
Use #'position when looking for ?=.
* replace.el (map-query-replace-regexp):
Use #'split-string-by-char instead of using an inline
implementation of it.
* select.el (select-convert-from-cf-text):
* select.el (select-convert-from-cf-unicodetext):
Use #'position rather than #'string-match in these functions.
* setup-paths.el (paths-emacs-data-root-p):
Use #'search when looking for simple string.
* sound.el (load-sound-file):
Use #'split-string-by-char rather than an inline reimplementation
of same.
* startup.el (splash-screen-window-body):
* startup.el (splash-screen-tty-body):
Search for simple strings using #'search.
* version.el (emacs-version):
Ditto.
* x-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* x-font-menu.el (x-reset-device-font-menus-core):
Use #'split-string-by-char here.
* x-init.el (x-initialize-keyboard):
Search for a simple string using #'search.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 01 Apr 2015 14:28:20 +0100 |
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; }