Mercurial > hg > xemacs-beta
annotate src/glyphs-gtk.h @ 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 | 308d34e9f07d |
children |
rev | line source |
---|---|
462 | 1 /* Gtk-specific glyphs and related. |
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
4 Copyright (C) 1995, 1996 Ben Wing | |
5 Copyright (C) 1995 Sun Microsystems, Inc. | |
6 | |
7 This file is part of XEmacs. | |
8 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4908
diff
changeset
|
9 XEmacs is free software: you can redistribute it and/or modify it |
462 | 10 under the terms of the GNU General Public License as published by the |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4908
diff
changeset
|
11 Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4908
diff
changeset
|
12 option) any later version. |
462 | 13 |
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
17 for more details. | |
18 | |
19 You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4908
diff
changeset
|
20 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
462 | 21 |
22 /* Synched up with: Not in FSF. */ | |
23 /* Gtk version by William Perry */ | |
24 | |
25 #ifndef _XEMACS_GLYPHS_GTK_H_ | |
26 #define _XEMACS_GLYPHS_GTK_H_ | |
27 | |
28 #include "glyphs.h" | |
4908
b3ce27ca7647
various fixes related to gtk, redisplay-xlike-inc.c
Ben Wing <ben@xemacs.org>
parents:
3087
diff
changeset
|
29 #include "sysgtk.h" |
462 | 30 |
31 #ifdef HAVE_GTK | |
32 | |
33 /**************************************************************************** | |
34 * Image-Instance Object * | |
35 ****************************************************************************/ | |
36 | |
37 struct gtk_image_instance_data | |
38 { | |
39 GdkPixmap **pixmaps; | |
40 GdkCursor *cursor; | |
41 | |
42 /* If depth>0, then that means that other colors were allocated when | |
43 this pixmap was loaded. These are they; we need to free them when | |
44 finalizing the image instance. */ | |
45 GdkColormap *colormap; | |
46 unsigned long *pixels; | |
47 int npixels; | |
48 | |
49 /* Should we hang on to the extra info from the XpmAttributes, like | |
50 the textual color table and the comments? Is that useful? */ | |
51 }; | |
52 | |
53 struct gtk_subwindow_data | |
54 { | |
55 union | |
56 { | |
57 struct | |
58 { | |
59 GtkWidget *parent_window; | |
60 GtkWidget *clip_window; | |
61 } sub; | |
62 struct | |
63 { | |
64 GtkWidget *clip_window; | |
65 Lisp_Object widget; | |
66 guint x_offset; | |
67 guint y_offset; | |
68 gboolean added_to_fixed; | |
69 } wid; | |
70 } data; | |
71 }; | |
72 | |
73 void init_image_instance_from_gdk_pixmap (struct Lisp_Image_Instance *ii, | |
74 struct device *device, | |
75 GdkPixmap *gdk_pixmap, | |
76 int dest_mask, | |
77 Lisp_Object instantiator); | |
78 | |
79 #define GTK_IMAGE_INSTANCE_DATA(i) ((struct gtk_image_instance_data *) (i)->data) | |
80 | |
81 #define IMAGE_INSTANCE_GTK_PIXMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[0]) | |
82 #define IMAGE_INSTANCE_GTK_PIXMAP_SLICE(i,slice) \ | |
83 (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps[slice]) | |
84 #define IMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ | |
85 (GTK_IMAGE_INSTANCE_DATA (i)->pixmaps) | |
3087 | 86 #define IMAGE_INSTANCE_GTK_MASK(i) ((GdkPixmap*)(IMAGE_INSTANCE_PIXMAP_MASK (i))) |
462 | 87 #define IMAGE_INSTANCE_GTK_CURSOR(i) (GTK_IMAGE_INSTANCE_DATA (i)->cursor) |
88 #define IMAGE_INSTANCE_GTK_COLORMAP(i) (GTK_IMAGE_INSTANCE_DATA (i)->colormap) | |
89 #define IMAGE_INSTANCE_GTK_PIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->pixels) | |
90 #define IMAGE_INSTANCE_GTK_NPIXELS(i) (GTK_IMAGE_INSTANCE_DATA (i)->npixels) | |
91 | |
92 #define XIMAGE_INSTANCE_GTK_PIXMAP(i) \ | |
93 IMAGE_INSTANCE_GTK_PIXMAP (XIMAGE_INSTANCE (i)) | |
94 #define XIMAGE_INSTANCE_GTK_PIXMAP_SLICE(i) \ | |
95 IMAGE_INSTANCE_GTK_PIXMAP_SLICE (XIMAGE_INSTANCE (i)) | |
96 #define XIMAGE_INSTANCE_GTK_PIXMAP_SLICES(i) \ | |
97 IMAGE_INSTANCE_GTK_PIXMAP_SLICES (XIMAGE_INSTANCE (i)) | |
98 #define XIMAGE_INSTANCE_GTK_MASK(i) \ | |
99 IMAGE_INSTANCE_GTK_MASK (XIMAGE_INSTANCE (i)) | |
100 #define XIMAGE_INSTANCE_GTK_CURSOR(i) \ | |
101 IMAGE_INSTANCE_GTK_CURSOR (XIMAGE_INSTANCE (i)) | |
102 #define XIMAGE_INSTANCE_GTK_PIXELS(i) \ | |
103 IMAGE_INSTANCE_GTK_PIXELS (XIMAGE_INSTANCE (i)) | |
104 #define XIMAGE_INSTANCE_GTK_NPIXELS(i) \ | |
105 IMAGE_INSTANCE_GTK_NPIXELS (XIMAGE_INSTANCE (i)) | |
106 | |
107 /* Subwindow / widget stuff */ | |
108 #define GTK_SUBWINDOW_INSTANCE_DATA(i) ((struct gtk_subwindow_data *) (i)->data) | |
109 | |
110 #define IMAGE_INSTANCE_GTK_SUBWINDOW_PARENT(i) \ | |
111 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.sub.parent_window) | |
112 #define IMAGE_INSTANCE_GTK_CLIPWINDOW(i) \ | |
113 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.sub.clip_window) | |
114 #define IMAGE_INSTANCE_GTK_WIDGET_XOFFSET(i) \ | |
115 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.x_offset) | |
116 #define IMAGE_INSTANCE_GTK_WIDGET_YOFFSET(i) \ | |
117 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.y_offset) | |
118 #define IMAGE_INSTANCE_GTK_WIDGET_LWID(i) \ | |
119 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.id) | |
120 #define IMAGE_INSTANCE_GTK_CLIPWIDGET(i) \ | |
121 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.clip_window) | |
122 #define IMAGE_INSTANCE_GTK_ALREADY_PUT(i) \ | |
123 (GTK_SUBWINDOW_INSTANCE_DATA (i)->data.wid.added_to_fixed) | |
124 #define IMAGE_INSTANCE_GTK_SUBWINDOW_ID(i) \ | |
125 ((GdkWindow *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
126 #define IMAGE_INSTANCE_GTK_WIDGET_ID(i) \ | |
127 ((GtkWidget *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
128 | |
129 #define XIMAGE_INSTANCE_GTK_SUBWINDOW_PARENT(i) \ | |
130 IMAGE_INSTANCE_GTK_SUBWINDOW_PARENT (XIMAGE_INSTANCE (i)) | |
131 #define XIMAGE_INSTANCE_GTK_SUBWINDOW_DISPLAY(i) \ | |
132 IMAGE_INSTANCE_GTK_SUBWINDOW_DISPLAY (XIMAGE_INSTANCE (i)) | |
133 #define XIMAGE_INSTANCE_GTK_WIDGET_XOFFSET(i) \ | |
134 IMAGE_INSTANCE_GTK_WIDGET_XOFFSET (XIMAGE_INSTANCE (i)) | |
135 #define XIMAGE_INSTANCE_GTK_WIDGET_YOFFSET(i) \ | |
136 IMAGE_INSTANCE_GTK_WIDGET_YOFFSET (XIMAGE_INSTANCE (i)) | |
137 #define XIMAGE_INSTANCE_GTK_WIDGET_LWID(i) \ | |
138 IMAGE_INSTANCE_GTK_WIDGET_LWID (XIMAGE_INSTANCE (i)) | |
139 #define XIMAGE_INSTANCE_GTK_CLIPWIDGET(i) \ | |
140 IMAGE_INSTANCE_GTK_CLIPWIDGET (XIMAGE_INSTANCE (i)) | |
141 #define XIMAGE_INSTANCE_GTK_CLIPWINDOW(i) \ | |
142 IMAGE_INSTANCE_GTK_CLIPWINDOW (XIMAGE_INSTANCE (i)) | |
143 #define XIMAGE_INSTANCE_GTK_WIDGET_ID(i) \ | |
144 IMAGE_INSTANCE_GTK_WIDGET_ID (XIMAGE_INSTANCE (i)) | |
145 | |
146 #define DOMAIN_GTK_WIDGET(domain) \ | |
147 ((IMAGE_INSTANCEP (domain) && \ | |
148 GTK_SUBWINDOW_INSTANCE_DATA (XIMAGE_INSTANCE (domain))) ? \ | |
149 XIMAGE_INSTANCE_GTK_WIDGET_ID (domain) : \ | |
150 FRAME_GTK_CONTAINER_WIDGET (f) (DOMAIN_XFRAME (domain))) | |
151 | |
152 #endif /* HAVE_GTK */ | |
153 #endif /* _XEMACS_GLYPHS_GTK_H_ */ |