Mercurial > hg > xemacs-beta
view src/menubar-msw.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 07 Feb 2011 12:01:24 +0000 |
parents | 635f4b506855 |
children | 308d34e9f07d |
line wrap: on
line source
/* Implements an elisp-programmable menubar -- Win32 Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Tinker Systems and INS Engineering Corp. Copyright (C) 1997 Kirill M. Katsnelson <kkm@kis.ru>. Copyright (C) 2000, 2001, 2002, 2003 Ben Wing. This file is part of XEmacs. XEmacs 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 2, or (at your option) any later version. XEmacs 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 XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* This function mostly Mule-ized (except perhaps some Unicode splitting). 5-2000. */ /* Author: Initially written by kkm 12/24/97, peeking into and copying stuff from menubar-x.c */ /* Algorithm for handling menus is as follows. When window's menubar * is created, current-menubar is not traversed in depth. Rather, only * top level items, both items and pulldowns, are added to the * menubar. Each pulldown is initially empty. When a pulldown is * selected and about to open, corresponding element of * current-menubar is found, and the newly open pulldown is * populated. This is made again in the same non-recursive manner. * * This algorithm uses hash tables to find out element of the menu * descriptor list given menu handle. The key is an opaque ptr data * type, keeping menu handle, and the value is a list of strings * representing the path from the root of the menu to the item * descriptor. Each frame has an associated hash table. * * Leaf items are assigned a unique id based on item's hash. When an * item is selected, Windows sends back the id. Unfortunately, only * low 16 bit of the ID are sent, and there's no way to get the 32-bit * value. Yes, Win32 is just a different set of bugs than X! Aside * from this blame, another hashing mechanism is required to map menu * ids to commands (which are actually Lisp_Object's). This mapping is * performed in the same hash table, as the lifetime of both maps is * exactly the same. This is unambigous, as menu handles are * represented by lisp opaques, while command ids are by lisp * integers. The additional advantage for this is that command forms * are automatically GC-protected, which is important because these * may be transient forms generated by :filter functions. * * The hash table is not allowed to grow too much; it is pruned * whenever this is safe to do. This is done by re-creating the menu * bar, and clearing and refilling the hash table from scratch. * * Popup menus are handled identically to pulldowns. A static hash * table is used for popup menus, and lookup is made not in * current-menubar but in a lisp form supplied to the `popup' * function. * * Another Windows weirdness is that there's no way to tell that a * popup has been dismissed without making selection. We need to know * that to cleanup the popup menu hash table, but this is not honestly * doable using *documented* sequence of messages. Sticking to * particular knowledge is bad because this may break in Windows NT * 5.0, or Windows 98, or other future version. Instead, I allow the * hash tables to hang around, and not clear them, unless WM_COMMAND is * received. This is worth some memory but more safe. Hacks welcome, * anyways! * */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "commands.h" #include "console-msw-impl.h" #include "elhash.h" #include "events.h" #include "frame-impl.h" #include "gui.h" #include "lisp.h" #include "menubar.h" #include "opaque.h" #include "window-impl.h" /* #### */ #define REPLACE_ME_WITH_GLOBAL_VARIABLE_WHICH_CONTROLS_RIGHT_FLUSH 0 #define EMPTY_ITEM_ID ((UINT)STORE_LISP_IN_VOID (Qunbound)) #define EMPTY_ITEM_NAME "(empty)" /* WARNING: uses of this need XETEXT */ /* Current menu (bar or popup) descriptor. gcpro'ed */ static Lisp_Object current_menudesc; /* Current menubar or popup hash table. gcpro'ed */ static Lisp_Object current_hash_table; /* This is used to allocate unique ids to menu items. Items ids are in MENU_ITEM_ID_MIN to MENU_ITEM_ID_MAX. Allocation checks that the item is not already in the TOP_LEVEL_MENU */ /* #### defines go to gui-msw.h, as the range is shared with toolbars (If only toolbars will be implemented as common controls) */ #define MENU_ITEM_ID_MIN 0x8000 #define MENU_ITEM_ID_MAX 0xFFFF #define MENU_ITEM_ID_BITS(x) (((x) & 0x7FFF) | 0x8000) static HMENU top_level_menu; /* * This returns Windows-style menu item string: * "Left Flush\tRight Flush" */ static Lisp_Object displayable_menu_item (Lisp_Object gui_item, int bar_p, Ichar *accel) { Lisp_Object left, right = Qnil; /* Left flush part of the string */ left = gui_item_display_flush_left (gui_item); left = mswindows_translate_menu_or_dialog_item (left, accel); /* Right flush part, unless we're at the top-level where it's not allowed */ if (!bar_p) right = gui_item_display_flush_right (gui_item); if (!NILP (right)) return concat3 (left, build_ascstring ("\t"), right); else return left; } /* * hmenu_to_lisp_object() returns an opaque ptr given menu handle. */ static Lisp_Object hmenu_to_lisp_object (HMENU hmenu) { return make_opaque_ptr (hmenu); } /* * Allocation tries a hash based on item's path and name first. This * almost guarantees that the same item will override its old value in * the hash table rather than abandon it. */ static Lisp_Object allocate_menu_item_id (Lisp_Object path, Lisp_Object name, Lisp_Object suffix) { UINT id = MENU_ITEM_ID_BITS (HASH3 (internal_hash (path, 0, 0), internal_hash (name, 0, 0), internal_hash (suffix, 0, 0))); do { id = MENU_ITEM_ID_BITS (id + 1); } while (GetMenuState (top_level_menu, id, MF_BYCOMMAND) != 0xFFFFFFFF); return make_int (id); } static HMENU create_empty_popup_menu (void) { return CreatePopupMenu (); } static void empty_menu (HMENU menu, int add_empty_p) { while (DeleteMenu (menu, 0, MF_BYPOSITION)); if (add_empty_p) qxeAppendMenu (menu, MF_STRING | MF_GRAYED, EMPTY_ITEM_ID, XETEXT (EMPTY_ITEM_NAME)); } /* * The idea of checksumming is that we must hash minimal object * which is necessarily changes when the item changes. For separator * this is a constant, for grey strings and submenus these are hashes * of names, since submenus are unpopulated until opened so always * equal otherwise. For items, this is a full hash value of a callback, * because a callback may me a form which can be changed only somewhere * in depth. */ static unsigned long checksum_menu_item (Lisp_Object item) { if (STRINGP (item)) { /* Separator or unselectable text - hash as a string + 13 */ if (separator_string_p (XSTRING_DATA (item))) return 13; else return internal_hash (item, 0, 0) + 13; } else if (CONSP (item)) { /* Submenu - hash by its string name + 0 */ return internal_hash (XCAR (item), 0, 0); } else if (VECTORP (item)) { /* An ordinary item - hash its name and callback form. */ return HASH2 (internal_hash (XVECTOR_DATA(item)[0], 0, 0), internal_hash (XVECTOR_DATA(item)[1], 0, 0)); } /* An error - will be caught later */ return 0; } static void populate_menu_add_item (HMENU menu, Lisp_Object path, Lisp_Object hash_tab, Lisp_Object item, Lisp_Object *accel_list, int flush_right, int bar_p) { MENUITEMINFOW item_info; item_info.cbSize = sizeof (item_info); item_info.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID; item_info.fState = 0; item_info.wID = 0; item_info.fType = 0; if (STRINGP (item)) { /* Separator or unselectable text */ if (separator_string_p (XSTRING_DATA (item))) item_info.fType = MFT_SEPARATOR; else { item_info.fType = MFT_STRING; item_info.fState = MFS_DISABLED; item_info.dwTypeData = (XELPTSTR) LISP_STRING_TO_TSTR (item); } } else if (CONSP (item)) { /* Submenu */ HMENU submenu; Lisp_Object gui_item = allocate_gui_item (); Lisp_Gui_Item *pgui_item = XGUI_ITEM (gui_item); struct gcpro gcpro1, gcpro2, gcpro3; Ichar accel; GCPRO3 (gui_item, path, *accel_list); menu_parse_submenu_keywords (item, gui_item); if (!STRINGP (pgui_item->name)) invalid_argument ("Menu name (first element) must be a string", item); if (!gui_item_included_p (gui_item, Vmenubar_configuration)) { UNGCPRO; goto done; } if (!gui_item_active_p (gui_item)) item_info.fState = MFS_GRAYED; /* Temptation is to put 'else' right here. Although, the displayed item won't have an arrow indicating that it is a popup. So we go ahead a little bit more and create a popup */ submenu = create_empty_popup_menu (); item_info.fMask |= MIIM_SUBMENU; item_info.dwTypeData = (XELPTSTR) LISP_STRING_TO_TSTR (displayable_menu_item (gui_item, bar_p, &accel)); item_info.hSubMenu = submenu; if (accel && bar_p) *accel_list = Fcons (make_char (accel), *accel_list); if (!(item_info.fState & MFS_GRAYED)) { /* Now add the full submenu path as a value to the hash table, keyed by menu handle */ if (NILP(path)) path = list1 (pgui_item->name); else { Lisp_Object arg[2]; arg[0] = path; arg[1] = list1 (pgui_item->name); path = Fappend (2, arg); } Fputhash (hmenu_to_lisp_object (submenu), path, hash_tab); } UNGCPRO; } else if (VECTORP (item)) { /* An ordinary item */ Lisp_Object style, id; Lisp_Object gui_item = gui_parse_item_keywords (item); Lisp_Gui_Item *pgui_item = XGUI_ITEM (gui_item); struct gcpro gcpro1, gcpro2; Ichar accel; GCPRO2 (gui_item, *accel_list); if (!gui_item_included_p (gui_item, Vmenubar_configuration)) { UNGCPRO; goto done; } if (!STRINGP (pgui_item->name)) pgui_item->name = IGNORE_MULTIPLE_VALUES (Feval (pgui_item->name)); if (!gui_item_active_p (gui_item)) item_info.fState = MFS_GRAYED; style = (NILP (pgui_item->selected) || NILP (Feval (pgui_item->selected)) ? Qnil : pgui_item->style); if (EQ (style, Qradio)) { item_info.fType |= MFT_RADIOCHECK; item_info.fState |= MFS_CHECKED; } else if (EQ (style, Qtoggle)) item_info.fState |= MFS_CHECKED; id = allocate_menu_item_id (path, pgui_item->name, pgui_item->suffix); Fputhash (id, pgui_item->callback, hash_tab); item_info.wID = (UINT) XINT (id); item_info.fType |= MFT_STRING; item_info.dwTypeData = (XELPTSTR) LISP_STRING_TO_TSTR (displayable_menu_item (gui_item, bar_p, &accel)); if (accel && bar_p) *accel_list = Fcons (make_char (accel), *accel_list); UNGCPRO; } else sferror ("Malformed menu item descriptor", item); if (flush_right) item_info.fType |= MFT_RIGHTJUSTIFY; qxeInsertMenuItem (menu, UINT_MAX, TRUE, &item_info); done:; } /* * This function is called from populate_menu and checksum_menu. * When called to populate, MENU is a menu handle, PATH is a * list of strings representing menu path from root to this submenu, * DESCRIPTOR is a menu descriptor, HASH_TAB is a hash table associated * with root menu, BAR_P indicates whether this called for a menubar or * a popup, and POPULATE_P is non-zero. Return value must be ignored. * When called to checksum, DESCRIPTOR has the same meaning, POPULATE_P * is zero, PATH must be Qnil, and the rest of parameters is ignored. * Return value is the menu checksum. */ static unsigned long populate_or_checksum_helper (HMENU menu, Lisp_Object path, Lisp_Object desc, Lisp_Object hash_tab, int bar_p, int populate_p) { int deep_p, flush_right; struct gcpro gcpro1, gcpro2, gcpro3; unsigned long checksum; Lisp_Object gui_item = allocate_gui_item (); Lisp_Object accel_list = Qnil; Lisp_Gui_Item *pgui_item = XGUI_ITEM (gui_item); GCPRO3 (gui_item, accel_list, desc); /* We are sometimes called with the menubar unchanged, and with changed right flush. We have to update the menubar in this case, so account for the compliance setting in the hash value */ checksum = REPLACE_ME_WITH_GLOBAL_VARIABLE_WHICH_CONTROLS_RIGHT_FLUSH; /* Will initially contain only "(empty)" */ if (populate_p) empty_menu (menu, 1); /* PATH set to nil indicates top-level popup or menubar */ deep_p = !NILP (path); /* Fetch keywords prepending the item list */ desc = menu_parse_submenu_keywords (desc, gui_item); /* Check that menu name is specified when expected */ if (NILP (pgui_item->name) && deep_p) sferror ("Menu must have a name", desc); /* Apply filter if specified */ if (!NILP (pgui_item->filter)) desc = call1 (pgui_item->filter, desc); /* Loop thru the desc's CDR and add items for each entry */ flush_right = 0; { EXTERNAL_LIST_LOOP_2 (elt, desc) { if (NILP (elt)) { /* Do not flush right menubar items when MS style compliant */ if (bar_p && !REPLACE_ME_WITH_GLOBAL_VARIABLE_WHICH_CONTROLS_RIGHT_FLUSH) flush_right = 1; if (!populate_p) checksum = HASH2 (checksum, LISP_HASH (Qnil)); } else if (populate_p) populate_menu_add_item (menu, path, hash_tab, elt, &accel_list, flush_right, bar_p); else checksum = HASH2 (checksum, checksum_menu_item (elt)); } } if (populate_p) { /* Remove the "(empty)" item, if there are other ones */ if (GetMenuItemCount (menu) > 1) RemoveMenu (menu, EMPTY_ITEM_ID, MF_BYCOMMAND); /* Add the header to the popup, if told so. The same as in X - an insensitive item, and a separator (Seems to me, there were two separators in X... In Windows this looks ugly, anyways.) */ if (!bar_p && !deep_p && popup_menu_titles && !NILP (pgui_item->name)) { qxeInsertMenu (menu, 0, MF_BYPOSITION | MF_STRING | MF_DISABLED, 0, LISP_STRING_TO_TSTR (displayable_menu_item (gui_item, bar_p, NULL))); qxeInsertMenu (menu, 1, MF_BYPOSITION | MF_SEPARATOR, 0, NULL); SetMenuDefaultItem (menu, 0, MF_BYPOSITION); } } if (bar_p) Fputhash (Qt, accel_list, hash_tab); UNGCPRO; return checksum; } static void populate_menu (HMENU menu, Lisp_Object path, Lisp_Object desc, Lisp_Object hash_tab, int bar_p) { populate_or_checksum_helper (menu, path, desc, hash_tab, bar_p, 1); } static unsigned long checksum_menu (Lisp_Object desc) { return populate_or_checksum_helper (NULL, Qnil, desc, Qunbound, 0, 0); } static void update_frame_menubar_maybe (struct frame *f) { HMENU menubar = GetMenu (FRAME_MSWINDOWS_HANDLE (f)); struct window *w = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f)); Lisp_Object desc = (!NILP (w->menubar_visible_p) ? symbol_value_in_buffer (Qcurrent_menubar, w->buffer) : Qnil); struct gcpro gcpro1; GCPRO1 (desc); /* it's safest to do this, just in case some filter or something changes the value of current-menubar */ top_level_menu = menubar; if (NILP (desc) && menubar != NULL) { /* Menubar has gone */ FRAME_MSWINDOWS_MENU_HASH_TABLE (f) = Qnil; SetMenu (FRAME_MSWINDOWS_HANDLE (f), NULL); DestroyMenu (menubar); DrawMenuBar (FRAME_MSWINDOWS_HANDLE (f)); UNGCPRO; return; } if (!NILP (desc) && menubar == NULL) { /* Menubar has appeared */ menubar = CreateMenu (); goto populate; } if (NILP (desc)) { /* We did not have the bar and are not going to */ UNGCPRO; return; } /* Now we bail out if the menubar has not changed */ if (FRAME_MSWINDOWS_MENU_CHECKSUM (f) == checksum_menu (desc)) { UNGCPRO; return; } populate: /* Come with empty hash table */ if (NILP (FRAME_MSWINDOWS_MENU_HASH_TABLE (f))) FRAME_MSWINDOWS_MENU_HASH_TABLE (f) = make_lisp_hash_table (50, HASH_TABLE_NON_WEAK, Qequal); else Fclrhash (FRAME_MSWINDOWS_MENU_HASH_TABLE (f)); Fputhash (hmenu_to_lisp_object (menubar), Qnil, FRAME_MSWINDOWS_MENU_HASH_TABLE (f)); populate_menu (menubar, Qnil, desc, FRAME_MSWINDOWS_MENU_HASH_TABLE (f), 1); SetMenu (FRAME_MSWINDOWS_HANDLE (f), menubar); DrawMenuBar (FRAME_MSWINDOWS_HANDLE (f)); FRAME_MSWINDOWS_MENU_CHECKSUM (f) = checksum_menu (desc); UNGCPRO; } static void prune_menubar (struct frame *f) { HMENU menubar = GetMenu (FRAME_MSWINDOWS_HANDLE (f)); Lisp_Object desc = current_frame_menubar (f); struct gcpro gcpro1; if (menubar == NULL) return; /* #### If a filter function has set desc to Qnil, this ABORT() triggers. To resolve, we must prevent filters explicitly from mangling with the active menu. In apply_filter probably? Is copy-tree on the whole menu too expensive? */ if (NILP (desc)) /* ABORT(); */ return; GCPRO1 (desc); /* just to be safe -- see above */ /* We do the trick by removing all items and re-populating top level */ empty_menu (menubar, 0); assert (HASH_TABLEP (FRAME_MSWINDOWS_MENU_HASH_TABLE (f))); Fclrhash (FRAME_MSWINDOWS_MENU_HASH_TABLE (f)); Fputhash (hmenu_to_lisp_object (menubar), Qnil, FRAME_MSWINDOWS_MENU_HASH_TABLE (f)); populate_menu (menubar, Qnil, desc, FRAME_MSWINDOWS_MENU_HASH_TABLE (f), 1); UNGCPRO; } /* * This is called when cleanup is possible. It is better not to * clean things up at all than do it too early! */ static void menu_cleanup (struct frame *f) { /* This function can GC */ current_menudesc = Qnil; current_hash_table = Qnil; prune_menubar (f); } int mswindows_char_is_accelerator (struct frame *f, Ichar ch) { Lisp_Object hash = FRAME_MSWINDOWS_MENU_HASH_TABLE (f); if (NILP (hash)) return 0; return !NILP (memq_no_quit (make_char (DOWNCASE (WINDOW_XBUFFER (FRAME_SELECTED_XWINDOW (f)), ch)), Fgethash (Qt, hash, Qnil))); } /*------------------------------------------------------------------------*/ /* Message handlers */ /*------------------------------------------------------------------------*/ static Lisp_Object unsafe_handle_wm_initmenupopup_1 (HMENU menu, struct frame *UNUSED (f)) { /* This function can call lisp, beat dogs and stick chewing gum to everything! */ Lisp_Object path, desc; struct gcpro gcpro1; /* Find which guy is going to explode */ path = Fgethash (hmenu_to_lisp_object (menu), current_hash_table, Qunbound); assert (!UNBOUNDP (path)); #ifdef DEBUG_XEMACS /* Allow to continue in a debugger after assert - not so fatal */ if (UNBOUNDP (path)) signal_error (Qinternal_error, "internal menu error", Qunbound); #endif /* Now find a desc chunk for it. If none, then probably menu open hook has played too much games around stuff */ desc = Fmenu_find_real_submenu (current_menudesc, path); if (NILP (desc)) invalid_state ("This menu does not exist any more", path); /* Now, stuff it */ /* DESC may be generated by filter, so we have to gcpro it */ GCPRO1 (desc); populate_menu (menu, path, desc, current_hash_table, 0); UNGCPRO; return Qt; } static Lisp_Object unsafe_handle_wm_initmenu_1 (struct frame *f) { /* This function can call lisp */ /* NOTE: This is called for the bar only, WM_INITMENU for popups is filtered out */ /* #### - this menubar update mechanism is expensively anti-social and the activate-menubar-hook is now mostly obsolete. */ /* We simply ignore return value. In any case, we construct the bar on the fly */ run_hook_trapping_problems (Qmenubar, Qactivate_menubar_hook, INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION); update_frame_menubar_maybe (f); current_menudesc = current_frame_menubar (f); current_hash_table = FRAME_MSWINDOWS_MENU_HASH_TABLE (f); assert (HASH_TABLEP (current_hash_table)); return Qt; } /* * Return value is Qt if we have dispatched the command, * or Qnil if id has not been mapped to a callback. * Window procedure may try other targets to route the * command if we return nil */ Lisp_Object mswindows_handle_wm_command (struct frame *f, WORD id) { /* Try to map the command id through the proper hash table */ Lisp_Object data, fn, arg, frame; struct gcpro gcpro1; if (NILP (current_hash_table)) return Qnil; data = Fgethash (make_int (id), current_hash_table, Qunbound); if (UNBOUNDP (data)) { menu_cleanup (f); return Qnil; } /* Need to gcpro because the hash table may get destroyed by menu_cleanup(), and will not gcpro the data any more */ GCPRO1 (data); menu_cleanup (f); /* Ok, this is our one. Enqueue it. */ get_gui_callback (data, &fn, &arg); frame = wrap_frame (f); /* this used to call mswindows_enqueue_misc_user_event but that breaks customize because the misc_event gets eval'ed in some circumstances. Don't change it back unless you can fix the customize problem also. */ mswindows_enqueue_misc_user_event (frame, fn, arg); UNGCPRO; /* data */ return Qt; } /*------------------------------------------------------------------------*/ /* Message handling proxies */ /*------------------------------------------------------------------------*/ struct handle_wm_initmenu { HMENU menu; struct frame *frame; }; static Lisp_Object unsafe_handle_wm_initmenupopup (void *arg) { struct handle_wm_initmenu *z = (struct handle_wm_initmenu *) arg; return unsafe_handle_wm_initmenupopup_1 (z->menu, z->frame); } static Lisp_Object unsafe_handle_wm_initmenu (void *arg) { struct handle_wm_initmenu *z = (struct handle_wm_initmenu *) arg; return unsafe_handle_wm_initmenu_1 (z->frame); } Lisp_Object mswindows_handle_wm_initmenupopup (HMENU hmenu, struct frame *frm) { struct handle_wm_initmenu z; int depth = internal_bind_int (&in_menu_callback, 1); Lisp_Object retval; z.menu = hmenu; z.frame = frm; /* [[ Allow runaway filter code, e.g. custom, to be aborted. We are usually called from next_event_internal(), which has turned off quit checking to read the C-g as an event.]] #### This is bogus because by the very act of calling event_stream_protect_modal_loop(), we disable event retrieval! */ retval = event_stream_protect_modal_loop ("Error during menu handling", unsafe_handle_wm_initmenupopup, &z, UNINHIBIT_QUIT); unbind_to (depth); return retval; } Lisp_Object mswindows_handle_wm_initmenu (HMENU hmenu, struct frame *f) { /* Handle only frame menubar, ignore if from popup or system menu */ if (GetMenu (FRAME_MSWINDOWS_HANDLE (f)) == hmenu) { struct handle_wm_initmenu z; z.frame = f; return event_stream_protect_modal_loop ("Error during menu handling", unsafe_handle_wm_initmenu, &z, UNINHIBIT_QUIT); } return Qt; } /*------------------------------------------------------------------------*/ /* Methods */ /*------------------------------------------------------------------------*/ static void mswindows_update_frame_menubars (struct frame *f) { update_frame_menubar_maybe (f); } static void mswindows_free_frame_menubars (struct frame *f) { FRAME_MSWINDOWS_MENU_HASH_TABLE (f) = Qnil; } static void mswindows_popup_menu (Lisp_Object menu_desc, Lisp_Object event) { struct frame *f = selected_frame (); Lisp_Event *eev = NULL; HMENU menu; POINT pt; int ok; struct gcpro gcpro1; GCPRO1 (menu_desc); /* to be safe -- see above */ if (!NILP (event)) { CHECK_LIVE_EVENT (event); eev = XEVENT (event); if (eev->event_type != button_press_event && eev->event_type != button_release_event) wrong_type_argument (Qmouse_event_p, event); } else if (!NILP (Vthis_command_keys)) { /* if an event wasn't passed, use the last event of the event sequence currently being executed, if that event is a mouse event */ eev = XEVENT (Vthis_command_keys); /* last event first */ if (eev->event_type != button_press_event && eev->event_type != button_release_event) eev = NULL; } popup_up_p++; /* Default is to put the menu at the point (10, 10) in frame */ if (eev) { pt.x = EVENT_BUTTON_X (eev); pt.y = EVENT_BUTTON_Y (eev); ClientToScreen (FRAME_MSWINDOWS_HANDLE (f), &pt); } else pt.x = pt.y = 10; if (SYMBOLP (menu_desc)) menu_desc = Fsymbol_value (menu_desc); CHECK_CONS (menu_desc); CHECK_STRING (XCAR (menu_desc)); menu_cleanup (f); current_menudesc = menu_desc; current_hash_table = make_lisp_hash_table (10, HASH_TABLE_NON_WEAK, Qequal); menu = create_empty_popup_menu (); Fputhash (hmenu_to_lisp_object (menu), Qnil, current_hash_table); top_level_menu = menu; /* see comments in menubar-x.c */ if (zmacs_regions) zmacs_region_stays = 1; ok = TrackPopupMenu (menu, TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_RIGHTBUTTON, pt.x, pt.y, 0, FRAME_MSWINDOWS_HANDLE (f), NULL); DestroyMenu (menu); /* A WM_COMMAND is not issued until TrackPopupMenu returns. This makes setting popup_up_p fairly pointless since we cannot keep the menu up and dispatch events. Furthermore, we seem to have little control over what happens to the menu when we click. */ popup_up_p--; /* Signal a signal if caught by Track...() modal loop. */ /* I think this is pointless, the code hasn't actually put us in a modal loop at this time -- andyp. */ mswindows_unmodalize_signal_maybe (); /* This is probably the only real reason for failure */ if (!ok) { menu_cleanup (f); invalid_operation ("Cannot track popup menu while in menu", menu_desc); } UNGCPRO; } /*------------------------------------------------------------------------*/ /* Initialization */ /*------------------------------------------------------------------------*/ void syms_of_menubar_mswindows (void) { } void console_type_create_menubar_mswindows (void) { CONSOLE_HAS_METHOD (mswindows, update_frame_menubars); CONSOLE_HAS_METHOD (mswindows, free_frame_menubars); CONSOLE_HAS_METHOD (mswindows, popup_menu); } void vars_of_menubar_mswindows (void) { current_menudesc = Qnil; current_hash_table = Qnil; staticpro (¤t_menudesc); staticpro (¤t_hash_table); }