Mercurial > hg > xemacs-beta
annotate lisp/widgets-gtk.el @ 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 ;;; widgets-gtk.el --- Embedded widget support for XEmacs w/GTK primitives |
2 | |
3 ;; Copyright (C) 2001 Free Software Foundation, Inc. | |
4 | |
5 ;; Maintainer: William M. Perry <wmperry@gnu.org> | |
6 ;; Keywords: extensions, internal, dumped | |
7 | |
8 ;; This file is part of XEmacs. | |
9 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
10 ;; XEmacs is free software: you can redistribute it and/or modify it |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
11 ;; under the terms of the GNU General Public License as published by the |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
12 ;; 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:
2367
diff
changeset
|
13 ;; option) any later version. |
462 | 14 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
15 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
16 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
17 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2367
diff
changeset
|
18 ;; for more details. |
462 | 19 |
20 ;; 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:
2367
diff
changeset
|
21 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
462 | 22 |
23 ;;; Synched up with: Not in FSF. | |
24 | |
25 ;;; Commentary: | |
26 | |
27 ;; This file is dumped with XEmacs (when embedded widgets are compiled in). | |
28 | |
502 | 29 (globally-declare-fboundp |
30 '(gtk-button-new-with-label | |
31 gtk-signal-connect | |
32 gtk-radio-button-new-with-label gtk-radio-button-group | |
33 gtk-toggle-button-set-active gtk-check-button-new-with-label | |
34 gtk-widget-show-all gtk-notebook-new gtk-notebook-append-page | |
35 gtk-vbox-new gtk-label-new gtk-adjustment-new | |
36 gtk-progress-bar-new-with-adjustment gtk-adjustment-set-value | |
37 gtk-entry-new gtk-entry-set-text gtk-widget-set-style | |
38 gtk-widget-get-style)) | |
39 | |
738 | 40 (defun gtk-widget-get-callback (widget plist instance) |
41 (let ((cb (plist-get plist :callback)) | |
42 (ex (plist-get plist :callback-ex)) | |
43 (real-cb nil)) | |
44 (cond | |
45 (ex | |
46 (gtk-signal-connect widget 'button-release-event | |
47 (lambda (widget event data) | |
48 (put widget 'last-event event))) | |
49 `(lambda (widget &rest ignored) | |
50 (funcall ,ex ,instance (get widget 'last-event)))) | |
51 (cb | |
52 `(lambda (widget &rest ignored) | |
53 (if (functionp ,real-cb) | |
54 (funcall ,real-cb) | |
55 (eval ,real-cb)))) | |
56 (t | |
57 nil)))) | |
462 | 58 |
738 | 59 (defun gtk-widget-instantiate-button-internal (plist instance) |
462 | 60 (let* ((type (or (plist-get plist :style) 'button)) |
61 (label (or (plist-get plist :descriptor) (symbol-name type))) | |
62 (widget nil)) | |
63 (case type | |
64 (button | |
65 (setq widget (gtk-button-new-with-label label)) | |
738 | 66 (gtk-signal-connect widget 'clicked |
67 (gtk-widget-get-callback widget plist instance))) | |
462 | 68 (radio |
69 (let ((aux nil) | |
70 (selected-p (plist-get plist :selected))) | |
71 (setq widget (gtk-radio-button-new-with-label nil label) | |
72 aux (gtk-radio-button-new-with-label | |
73 (gtk-radio-button-group widget) | |
74 "bogus sibling")) | |
75 (gtk-toggle-button-set-active widget (eval selected-p)) | |
76 (gtk-signal-connect widget 'toggled | |
738 | 77 (gtk-widget-get-callback widget plist instance) aux))) |
462 | 78 (otherwise |
79 ;; Check boxes | |
80 (setq widget (gtk-check-button-new-with-label label)) | |
81 (gtk-toggle-button-set-active widget | |
82 (eval (plist-get plist :selected))) | |
83 (gtk-signal-connect widget 'toggled | |
738 | 84 (gtk-widget-get-callback widget plist instance)))) |
462 | 85 (gtk-widget-show-all widget) |
86 widget)) | |
87 | |
738 | 88 (defun gtk-widget-instantiate-notebook-internal (plist instance) |
462 | 89 (let ((widget (gtk-notebook-new)) |
2367 | 90 ;(items (plist-get plist :items)) |
91 ) | |
2168 | 92 ; (while items |
93 ; (gtk-notebook-append-page widget | |
94 ; (gtk-vbox-new nil 3) | |
95 ; (gtk-label-new (aref (car items) 0))) | |
96 ; (setq items (cdr items))) | |
462 | 97 widget)) |
98 | |
738 | 99 (defun gtk-widget-instantiate-progress-internal (plist instance) |
462 | 100 (let* ((adj (gtk-adjustment-new 0.0 0.0 100.0 1.0 5.0 5.0)) |
101 (widget (gtk-progress-bar-new-with-adjustment adj))) | |
102 (gtk-adjustment-set-value adj (or (plist-get plist :value) 0.0)) | |
103 widget)) | |
104 | |
738 | 105 (defun gtk-widget-instantiate-entry-internal (plist instance) |
462 | 106 (let* ((widget (gtk-entry-new)) |
107 (default (plist-get plist :descriptor))) | |
108 (cond | |
109 ((stringp default) | |
110 nil) | |
111 ((sequencep default) | |
112 (setq default (mapconcat 'identity default ""))) | |
113 (t | |
114 (error "Invalid default value: %S" default))) | |
115 (gtk-entry-set-text widget default) | |
116 widget)) | |
117 | |
118 (put 'button 'instantiator 'gtk-widget-instantiate-button-internal) | |
119 (put 'tab-control 'instantiator 'gtk-widget-instantiate-notebook-internal) | |
120 (put 'progress-gauge 'instantiator 'gtk-widget-instantiate-progress-internal) | |
121 (put 'tree-view 'instantiator 'ignore) | |
122 (put 'edit-field 'instantiator 'gtk-widget-instantiate-entry-internal) | |
123 (put 'combo-box 'instantiator 'ignore) | |
124 (put 'label 'instantiator 'ignore) | |
125 (put 'layout 'instantiator 'ignore) | |
126 | |
127 (defun gtk-widget-instantiate-internal (instance | |
128 instantiator | |
129 pointer-fg | |
130 pointer-bg | |
131 domain) | |
132 "The lisp side of widget/glyph instantiation code." | |
133 (let* ((type (aref instantiator 0)) | |
134 (plist (cdr (map 'list 'identity instantiator))) | |
135 (widget (funcall (or (get type 'instantiator) 'ignore) | |
738 | 136 plist instance))) |
2168 | 137 ; (add-timeout 0.1 (lambda (obj) |
138 ; (gtk-widget-set-style obj | |
139 ; (gtk-widget-get-style | |
140 ; (frame-property nil 'text-widget)))) | |
141 ; widget) | |
462 | 142 widget)) |
143 | |
144 (defun gtk-widget-property-internal () | |
145 nil) | |
146 | |
147 (defun gtk-widget-redisplay-internal () | |
148 nil) | |
149 | |
150 (provide 'widgets-gtk) |