-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathwindow-tool-bar.el
623 lines (563 loc) · 25.5 KB
/
window-tool-bar.el
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
;;; window-tool-bar.el --- Add tool bars inside windows -*- lexical-binding: t -*-
;; Copyright (C) 2023-2024 Free Software Foundation, Inc.
;; Author: Jared Finder <[email protected]>
;; Created: Nov 21, 2023
;; Version: 0.3
;; Keywords: mouse
;; URL: http://github.com/chaosemer/window-tool-bar
;; Package-Requires: ((emacs "27.1") (compat "29.1"))
;; This is a GNU ELPA :core package. Avoid adding functionality that
;; is not available in the version of Emacs recorded above or any of
;; the package dependencies.
;; This file is part of GNU Emacs.
;; GNU Emacs 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.
;; GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;
;; This package puts a tool bar in each window. This allows you to see
;; multiple tool bars simultaneously directly next to the buffer it
;; acts on which feels much more intuitive. Emacs "browsing" modes
;; generally have sensible tool bars, for example: *info*, *help*, and
;; *eww* have them.
;;
;; It does this while being mindful of screen real estate. If
;; `tool-bar-map' is nil, then this package will not take up any space
;; for an empty tool bar. Most modes do not define a custom tool bar,
;; so calling (setq tool-bar-map nil) in your init file will make most
;; buffers not take up space for a tool bar.
;;
;; To get the default behavior, run (global-window-tool-bar-mode 1) or
;; enable via M-x customize-group RET window-tool-bar RET. This uses
;; the per-window tab line to show the tool bar.
;;
;; If you want to share space with an existing tab line, mode line, or
;; header line, add (:eval (window-tool-bar-string)) to
;; `tab-line-format', `mode-line-format', or `header-line-format'.
;;
;; For additional documentation, see info node `(emacs)Window Tool
;; Bar'
;;; Known issues:
;;
;; On GNU Emacs 29.1 and earlier, terminals dragging to resize windows
;; will error with message "<tab-line> <mouse-movement> is undefined".
;; This is a bug in GNU Emacs,
;; <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67457>.
;;
;; On GNU Emacs 29 and earlier, performance in terminals is lower than
;; on graphical frames. This is due to a workaround, see "Workaround
;; for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68334", below.
;;
;; Dragging empty space on the tab-line (which this package uses to
;; display the window tool bar) doesn't resize windows. This is
;; unlike the mode line, where dragging empty space resizes the
;; window.
;;; Todo:
;;
;; Not all features planned are implemented yet. Eventually I would
;; like to also generally make tool bars better.
;;
;; Post 1.0 work:
;;
;; * Clean up Emacs tool bars
;; * Default: Remove default tool-bar entirely
;; * grep, vc: Remove default tool-bar inherited
;; * info: Remove Next / Prev / Up, which is already in the header
;; * smerge: Add tool bar for next/prev
;;; Code:
(require 'compat)
(require 'mwheel)
(require 'tab-line)
(require 'tool-bar)
;;; Benchmarking code
;;
;; Refreshing the tool bar is computationally simple, but generates a
;; lot of garbage. So this benchmarking focuses on garbage
;; generation. Since it has to run after most commands, generating
;; significantly more garbage will cause noticeable performance
;; degradation.
;;
;; The refresh has two steps:
;;
;; Step 1: Look up the <tool-bar> map.
;; Step 2: Generate a Lisp string using text properties for the tool
;; bar string.
;;
;; Additionally, we keep track of the percentage of commands that
;; actually created a refresh.
(defvar window-tool-bar--memory-use-delta-step1 (make-list 7 0)
"Absolute delta of memory use counters during step 1.
This is a list in the same structure as `memory-use-counts'.")
(defvar window-tool-bar--memory-use-delta-step2 (make-list 7 0)
"Absolute delta of memory use counters during step 2.
This is a list in the same structure as `memory-use-counts'.")
(defvar window-tool-bar--refresh-done-count 0
"Number of tool bar string refreshes run.
The total number of requests is the sum of this and
`window-tool-bar--refresh-skipped-count'.")
(defvar window-tool-bar--refresh-skipped-count 0
"Number of tool bar string refreshes that were skipped.
The total number of requests is the sum of this and
`window-tool-bar--refresh-done-count'.")
(defun window-tool-bar--memory-use-avg-step1 ()
"Return average memory use delta during step 1."
(mapcar (lambda (elt) (/ (float elt) window-tool-bar--refresh-done-count))
window-tool-bar--memory-use-delta-step1))
(defun window-tool-bar--memory-use-avg-step2 ()
"Return average memory use delta during step 2."
(mapcar (lambda (elt) (/ (float elt) window-tool-bar--refresh-done-count))
window-tool-bar--memory-use-delta-step2))
(declare-function time-stamp-string "time-stamp")
(defun window-tool-bar-debug-show-memory-use ()
"Development-only command to show memory used by `window-tool-bar-string'."
(interactive)
(require 'time-stamp)
(save-selected-window
(pop-to-buffer "*WTB Memory Report*")
(unless (derived-mode-p 'special-mode)
(special-mode))
(goto-char (point-max))
(let ((inhibit-read-only t))
(insert (propertize (concat "Function: window-tool-bar-string "
(time-stamp-string))
'face 'underline 'font-lock-face 'underline)
"\n\n")
(window-tool-bar--insert-memory-use
"Step 1" (window-tool-bar--memory-use-avg-step1))
(window-tool-bar--insert-memory-use
"Step 2" (window-tool-bar--memory-use-avg-step2))
(insert (format "Refresh count %d\n" window-tool-bar--refresh-done-count)
(format "Refresh executed percent %.2f\n"
(/ (float window-tool-bar--refresh-done-count)
(+ window-tool-bar--refresh-done-count
window-tool-bar--refresh-skipped-count)))
"\n"))))
(defun window-tool-bar--insert-memory-use (label avg-memory-use)
"Insert memory use into current buffer.
LABEL is a prefix string to be in front of the data.
AVG-MEMORY-USE is a list of averages, with the same meaning as
`memory-use-counts'."
(let* ((label-len (length label))
(padding (make-string label-len ?\s)))
(cl-loop for usage in avg-memory-use
for usage-label in '("Conses" "Floats" "Vector cells" "Symbols"
"String chars" "Intervals" "Strings")
for idx from 0
do (insert (format "%s %8.2f %s\n"
(if (= idx 0) label padding)
usage
usage-label)))))
(defgroup window-tool-bar nil
"Tool bars per-window."
:group 'convenience
:prefix "window-tool-bar-")
(defvar-keymap window-tool-bar--button-keymap
:doc "Keymap used by `window-tool-bar--keymap-entry-to-string'."
"<follow-link>" 'mouse-face
;; Follow link on all clicks of mouse-1 and mouse-2 since the tool
;; bar is not a place the point can travel to.
"<tab-line> <mouse-1>" #'window-tool-bar--call-button
"<tab-line> <double-mouse-1>" #'window-tool-bar--call-button
"<tab-line> <triple-mouse-1>" #'window-tool-bar--call-button
"<tab-line> <mouse-2>" #'window-tool-bar--call-button
"<tab-line> <double-mouse-2>" #'window-tool-bar--call-button
"<tab-line> <triple-mouse-2>" #'window-tool-bar--call-button
;; Mouse down events do nothing. A binding is needed so isearch
;; does not exit when the tab bar is clicked.
"<tab-line> <down-mouse-1>" #'window-tool-bar--ignore
"<tab-line> <double-down-mouse-1>" #'window-tool-bar--ignore
"<tab-line> <triple-down-mouse-1>" #'window-tool-bar--ignore
"<tab-line> <down-mouse-2>" #'window-tool-bar--ignore
"<tab-line> <double-down-mouse-2>" #'window-tool-bar--ignore
"<tab-line> <triple-down-mouse-2>" #'window-tool-bar--ignore)
(fset 'window-tool-bar--button-keymap window-tool-bar--button-keymap) ; So it can be a keymap property
;; Register bindings that stay in isearch. Technically, these
;; commands don't pop up a menu but they act very similar in that they
;; are caused by mouse input and may call commands via
;; `call-interactively'.
(push 'window-tool-bar--call-button isearch-menu-bar-commands)
(push 'window-tool-bar--ignore isearch-menu-bar-commands)
(defvar-local window-tool-bar-string--cache nil
"Cache for previous result of `window-tool-bar-string'.")
;;;###autoload
(defun window-tool-bar-string ()
"Return a (propertized) string for the tool bar.
This is for when you want more customizations than the command
`window-tool-bar-mode' provides. Commonly added to the variable
`tab-line-format', `header-line-format', or `mode-line-format'"
(if (or (null window-tool-bar-string--cache)
(window-tool-bar--last-command-triggers-refresh-p))
(let* ((mem0 (memory-use-counts))
(toolbar-menu (window-tool-bar--get-keymap))
(mem1 (memory-use-counts))
(strs (mapcar #'window-tool-bar--keymap-entry-to-string
(cdr toolbar-menu))) ;Skip 'keymap
(result (mapconcat #'identity
(delete nil strs)
;; Without spaces between the text, hovering
;; highlights all adjacent buttons.
(if (eq 'text (window-tool-bar--style)) " "
(propertize " " 'invisible t))))
(mem2 (memory-use-counts)))
(cl-mapl (lambda (l-init l0 l1)
(cl-incf (car l-init) (- (car l1) (car l0))))
window-tool-bar--memory-use-delta-step1 mem0 mem1)
(cl-mapl (lambda (l-init l1 l2)
(cl-incf (car l-init) (- (car l2) (car l1))))
window-tool-bar--memory-use-delta-step2 mem1 mem2)
(setf window-tool-bar-string--cache
(concat
;; The tool bar face by default puts boxes around the
;; buttons. However, this box is not displayed if the
;; box starts at the leftmost pixel of the tab-line.
;; Add a single space in this case so the box displays
;; correctly.
(and (display-supports-face-attributes-p
'(:box (line-width 1)))
(propertize " " 'display '(space :width (1))))
result))
(cl-incf window-tool-bar--refresh-done-count))
(cl-incf window-tool-bar--refresh-skipped-count))
window-tool-bar-string--cache)
(defconst window-tool-bar--graphical-separator
(concat
(propertize " " 'display '(space :width (4)))
(propertize " " 'display '(space :width (1) face (:inverse-video t)))
(propertize " " 'display '(space :width (4)))))
(defun window-tool-bar--keymap-entry-to-string (menu-item)
"Convert MENU-ITEM into a (propertized) string representation.
MENU-ITEM is a menu item to convert. See info node `(elisp)Tool Bar'."
(pcase-exhaustive menu-item
;; Separators
((or `(,_ "--")
`(,_ menu-item ,(and (pred stringp)
(pred (string-prefix-p "--")))))
(if (eq 'text (window-tool-bar--style)) "|"
window-tool-bar--graphical-separator))
;; Menu item, turn into propertized string button
(`(,key menu-item ,name-expr ,binding . ,plist)
(let* ((visible-entry (plist-member plist :visible))
(visible (or (null visible-entry) ;Default is visible
(eval (cadr visible-entry))))
(wrap (plist-get plist :wrap))
(filter (plist-get plist :filter)))
(when filter
(setf binding
;; You would expect this to use `funcall', but existing
;; code in `parse_tool_bar_item' uses `eval'.
(eval `(,filter ',binding))))
(when (and binding
visible
(null wrap))
(let* ((name (eval name-expr))
(str (upcase-initials (or (plist-get plist :label)
(string-trim-right name "\\.+"))))
(len (length str))
(enable-form (plist-get plist :enable))
(enabled (or (not enable-form)
(eval enable-form)))
(button-spec (plist-get plist :button))
(button-selected (eval (cdr-safe button-spec)))
(vert-only (plist-get plist :vert-only))
image-start
image-end)
;; Depending on style, Images can be displayed to the
;; left, to the right, or in place of the text
(pcase-exhaustive (window-tool-bar--style)
('image
(setf image-start 0
image-end len))
('text
;; Images shouldn't be available
)
((or 'both 'both-horiz)
(if vert-only
(setf image-start 0 image-end len)
(setf str (concat " " str)
image-start 0
image-end 1
len (1+ len))))
('text-image-horiz
(if vert-only
(setf image-start 0 image-end len)
(setf str (concat str " ")
image-start len
image-end (1+ len)
len (1+ len)))))
(cond
((and enabled button-selected)
(add-text-properties 0 len
'(mouse-face
window-tool-bar-button-checked-hover
keymap window-tool-bar--button-keymap
face window-tool-bar-button-checked)
str))
(enabled
(add-text-properties 0 len
'(mouse-face window-tool-bar-button-hover
keymap window-tool-bar--button-keymap
face window-tool-bar-button)
str))
(t
(put-text-property 0 len
'face
'window-tool-bar-button-disabled
str)))
(when-let ((spec (and image-start image-end
(plist-get menu-item :image))))
(put-text-property image-start image-end
'display
(append spec
(if enabled '(:margin 2 :ascent center)
'(:margin 2 :ascent center
:conversion disabled)))
str))
(let ((help-text (or (plist-get plist :help) name))
(keys (where-is-internal binding nil t)))
(put-text-property 0 len
'help-echo
(if keys
(concat help-text
" ("
(key-description keys)
")")
help-text)
str))
(put-text-property 0 len 'tool-bar-key key str)
str))))))
(defun window-tool-bar--call-button ()
"Call the button that was clicked on in the tab line."
(interactive)
(when (mouse-event-p last-command-event)
(let ((posn (event-start last-command-event)))
;; Commands need to execute with the right buffer and window
;; selected. The selection needs to be permanent for isearch.
(select-window (posn-window posn))
(let* ((str (posn-string posn))
(key (get-text-property (cdr str) 'tool-bar-key (car str)))
(cmd (lookup-key (window-tool-bar--get-keymap) (vector key))))
(call-interactively cmd)))))
(defun window-tool-bar--ignore ()
"Internal command so isearch does not exit on button-down events."
(interactive)
nil)
;; static-if was added in Emacs 30, but this packages supports earlier
;; versions.
(defmacro window-tool-bar--static-if (condition then-form &rest else-forms)
"A conditional compilation macro.
Evaluate CONDITION at macro-expansion time. If it is non-nil,
expand the macro to THEN-FORM. Otherwise expand it to ELSE-FORMS
enclosed in a `progn' form. ELSE-FORMS may be empty."
(declare (indent 2)
(debug (sexp sexp &rest sexp)))
(if (eval condition lexical-binding)
then-form
(cons 'progn else-forms)))
(defvar window-tool-bar--ignored-event-types
(let ((list (append
'(mouse-movement pinch
wheel-down wheel-up wheel-left wheel-right)
;; Prior to emacs 30, wheel events could also surface as
;; mouse-<NUM> buttons.
(window-tool-bar--static-if (version< emacs-version "30")
(list
mouse-wheel-down-event mouse-wheel-up-event
mouse-wheel-left-event mouse-wheel-right-event
(bound-and-true-p mouse-wheel-down-alternate-event)
(bound-and-true-p mouse-wheel-up-alternate-event)
(bound-and-true-p mouse-wheel-left-alternate-event)
(bound-and-true-p mouse-wheel-right-alternate-event))
nil))))
(delete-dups (delete nil list)))
"Cache for `window-tool-bar--last-command-triggers-refresh-p'.")
(defun window-tool-bar--last-command-triggers-refresh-p ()
"Test if the recent command or event should trigger a tool bar refresh."
(let ((type (event-basic-type last-command-event)))
(and
;; Assume that key presses and button presses are the only user
;; interactions that can alter the tool bar. Specifically, this
;; excludes mouse movement, mouse wheel scroll, and pinch.
(not (member type window-tool-bar--ignored-event-types))
;; Assume that any command that triggers shift select can't alter
;; the tool bar. This excludes pure navigation commands.
(not (window-tool-bar--command-triggers-shift-select-p last-command))
;; Assume that self-insert-command won't alter the tool bar.
;; This is the most commonly executed command.
(not (eq last-command 'self-insert-command)))))
(defun window-tool-bar--command-triggers-shift-select-p (command)
"Test if COMMAND would trigger shift select."
(let* ((form (interactive-form command))
(spec (car-safe (cdr-safe form))))
(and (eq (car-safe form) 'interactive)
(stringp spec)
(seq-position spec ?^))))
;;;###autoload
(define-minor-mode window-tool-bar-mode
"Toggle display of the tool bar in the tab line of the current buffer."
:global nil
(let ((should-display (and window-tool-bar-mode
tool-bar-map))
(default-value '(:eval (window-tool-bar-string))))
;; Preserve existing tab-line set outside of this mode
(if (or (null tab-line-format)
(equal tab-line-format default-value))
(if should-display
(setq tab-line-format default-value)
(setq tab-line-format nil))
(message
"tab-line-format set outside of window-tool-bar-mode, currently `%S'"
tab-line-format))))
;;;###autoload
(define-globalized-minor-mode global-window-tool-bar-mode
window-tool-bar-mode window-tool-bar--turn-on
:group 'window-tool-bar
:package-version '(window-tool-bar . "0.1")
(add-hook 'isearch-mode-hook #'window-tool-bar--turn-on)
(add-hook 'isearch-mode-end-hook #'window-tool-bar--turn-on))
(defun window-tool-bar--turn-on ()
"Internal function called by the command `global-window-tool-bar-mode'."
(when global-window-tool-bar-mode
(window-tool-bar-mode 1)))
(defun window-tool-bar--style ()
"Return the effective style based on `window-tool-bar-style'.
This also takes into account frame capabilities. If the current
frame can not display images (see `dislay-images-p'), then this
will always return text."
(if (not (display-images-p))
'text
(let ((style window-tool-bar-style))
(when (eq style 'tool-bar-style)
(setf style tool-bar-style))
(unless (memq style '(image text both both-horiz text-image-horiz))
(setf style (if (fboundp 'tool-bar-get-system-style)
(tool-bar-get-system-style)
'image)))
style)))
;;; Display styling:
(defcustom window-tool-bar-style 'image
"Tool bar style to use for window tool bars.
The meanining is the same as for `tool-bar-style', which see. If
set to the symbol `tool-bar-style', then use the value of
`tool-bar-style' instead.
When images can not be displayed (see `display-images-p'), text
is used."
:type '(choice (const :tag "Images" :value image)
(const :tag "Text" :value text)
;; This option would require multiple tool bar lines.
;;(const :tag "Both" :value both)
(const :tag "Both-horiz" :value both-horiz)
(const :tag "Text-image-horiz" :value text-image-horiz)
(const :tag "Inherit tool-bar-style" :value tool-bar-style)
(const :tag "System default" :value nil))
:group 'window-tool-bar
:package-version '(window-tool-bar . "0.3"))
(defface window-tool-bar-button
'((default
:inherit tab-line)
(((class color) (min-colors 88) (supports :box t))
:box (:line-width -1 :style released-button)
:background "grey85")
;; If the box is not supported, dim the button background a bit.
(((class color) (min-colors 88))
:background "grey70")
(t
:inverse-video t))
"Face used for buttons when the mouse is not hovering over the button."
:group 'window-tool-bar
:package-version '(window-tool-bar . "0.2"))
(defface window-tool-bar-button-hover
'((default
:inherit tab-line)
(((class color) (min-colors 88))
:box (:line-width -1 :style released-button)
:background "grey95")
(t
:inverse-video t))
"Face used for buttons when the mouse is hovering over the button."
:group 'window-tool-bar
:package-version '(window-tool-bar . "0.2"))
(defface window-tool-bar-button-disabled
'((default
:inherit tab-line)
(((class color) (min-colors 88))
:box (:line-width -1 :style released-button)
:background "grey50"
:foreground "grey70")
(t
:inverse-video t
:background "brightblack"))
"Face used for buttons when the button is disabled."
:group 'window-tool-bar
:package-version '(window-tool-bar . "0.2"))
(defface window-tool-bar-button-checked
'((default
:inherit tab-line)
(((supports :box t))
:box (:line-width -1 :style pressed-button)
:background "grey85")
(((class color))
:background "blue"
:foreground "white")
(t
:inverse-video t))
"Face used for buttons when they are toggled."
:group 'window-tool-bar
:package-version '(window-tool-bar . "0.3"))
(defface window-tool-bar-button-checked-hover
'((default
:inherit tab-line)
(((class color) (min-colors 88) (supports :box t))
:box (:line-width -1 :style pressed-button)
:background "grey95")
(((class color))
:background "brightblue"
:foreground "white")
(t
:inverse-video t))
"Face used for buttons when the mouse is hovering over the button."
:group 'window-tool-bar
:package-version '(window-tool-bar . "0.3"))
;;; Workaround for https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68334.
;; This special variable is added in Emacs 30.1.
(defvar tool-bar-always-show-default)
(defun window-tool-bar--get-keymap ()
"Return the tool bar keymap."
(let ((tool-bar-always-show-default nil))
(if (and (version< emacs-version "30")
(eq 'text (window-tool-bar--style)))
;; This code path is a less efficient workaround.
(window-tool-bar--make-keymap-1)
(keymap-global-lookup "<tool-bar>"))))
(declare-function image-mask-p "image.c" (spec &optional frame))
(defun window-tool-bar--make-keymap-1 ()
"Patched copy of `tool-bar-make-keymap-1'."
(mapcar (lambda (bind)
(let (image-exp plist)
(when (and (eq (car-safe (cdr-safe bind)) 'menu-item)
;; For the format of menu-items, see node
;; `Extended Menu Items' in the Elisp manual.
(setq plist (nthcdr (if (consp (nth 4 bind)) 5 4)
bind))
(setq image-exp (plist-get plist :image))
(consp image-exp)
(not (eq (car image-exp) 'image))
(fboundp (car image-exp)))
(let ((image (and (display-images-p)
(eval image-exp))))
(unless (and image (image-mask-p image))
(setq image (append image '(:mask heuristic))))
(setq bind (copy-sequence bind)
plist (nthcdr (if (consp (nth 4 bind)) 5 4)
bind))
(plist-put plist :image image)))
bind))
tool-bar-map))
(provide 'window-tool-bar)
;;; window-tool-bar.el ends here