Mercurial > hg > xemacs-beta
view tests/glyph-test.el @ 1268:fffe735e63ee
[xemacs-hg @ 2003-02-07 11:50:50 by ben]
fixes for menu crashes + better preemption behavior
This contains two related changes:
(1) Fix problems with reentrant calling of lwlib and associated
crashes when selecting menu items.
(2) Improve redisplay handling of preemption. Turn on lazy lock
and hold down page-down or page-up and you'll see what I mean.
They are related because they both touch on the code that retrieves
events and handles the internal queues.
console-msw.h, event-msw.c, event-stream.c, events.h, menubar-msw.c, menubar-x.c, menubar.h: mswindows_protect_modal_loop() has been generalized to
event_stream_protect_modal_loop(), and moved to event-stream.c.
mswindows_in_modal_loop ->in_modal_loop likewise. Changes in
event-msw.c and menubar-msw.c for the new names and calling format
(use structures instead of static variables in menubar-msw.c).
Delete former in_menu_callback and use in_modal_loop in its place.
Remove emacs_mswindows_quit_check_disallowed_p(), superseded by
in_modal_loop. Use event_stream_protect_modal_loop() in
pre_activate_callback() so that we get no lwlib reentrancy.
Rearrange some of the code in event-msw.c to be grouped better.
Make mswindows_drain_windows_queue() respect in_modal_loop and
do nothing if so.
cmdloop.c, event-stream.c: Don't conditionalize on LWLIB_MENUBARS_LUCID when giving error when
in_modal_loop, and give better error.
event-Xt.c, event-gtk.c: If in_modal_loop, only retrieve process and timeout events.
Don't retrieve any X events because processing them can lead
to reentrancy in lwlib -> death.
event-stream.c: Remove unused parameter to check_event_stream_ok() and change
all callers.
lisp.h, event-stream.c: Rearrange some functions for increased clarity -- in particular,
group all the input-pending/QUIT-related stuff together, and
put right next to next-event stuff, to which it's related.
Add the concept of "HOW_MANY" -- when asking whether user input
is pending, you can ask if at least HOW_MANY events are pending,
not just if any are. Add parameter to detect_input_pending()
for this. Change recursive_sit_for from a Lisp_Object (which
could only be Qt or Qnil) to an int, like it should be.
event-Xt.c, event-gtk.c, event-xlike-inc.c: New file.
Abstract out similar code in event_{Xt/gtk}_pending_p() and write
only once, using include-file tricks. Rewrite this function to
implement HOW_MANY and only process events when not in_modal_loop.
event-msw.c: Implement HOW_MANY and only process events when not in_modal_loop.
event-tty.c: Implement HOW_MANY.
redisplay.c: Add var `max-preempts' to control maximum number of preempts.
(#### perhaps not useful) Rewrite preemption check so that,
rather than preempting when any user events are available, only
preempt when a certain number (currently 4) of them are backed up.
This effectively allows redisplay to proceed to completion in the
presence of a fast auto-repeat (usually the auto-repeating is
generated dynamically as necessary), and you get much better
display behavior with lazy-lock active.
event-unixoid.c: Comment changes.
event-stream.c: Rewrite discard-input much more simply and safely using the
drain-queue functions. I think the old version might loop
forever if called when in_modal_loop.
SEMI-UNRELATED CHANGES:
-----------------------
event-stream.c: Turn QUIT-checking back on when running the pre-idle hook so it
can be quit out of.
indent.c: Document exact functioning of `vertical-motion' better, and its
differences from GNU Emacs.
author | ben |
---|---|
date | Fri, 07 Feb 2003 11:50:54 +0000 |
parents | 0784d089fdc9 |
children | 8a653fbe5c27 |
line wrap: on
line source
(set-extent-begin-glyph (make-extent (point) (point)) (setq im (make-glyph [xbm :file "xemacsicon.xbm"]))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph [string :data "xemacs"])) (defun foo () (interactive) (setq ok-select (not ok-select))) (defun fee () (interactive) (message "hello")) ;; button in a group (setq ok-select nil) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq radio-button1 [button :face widget :descriptor ["ok1" (setq ok-select t) :style radio :selected ok-select]]))) ;; button in a group (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq radio-button2 [button :descriptor ["ok2" (setq ok-select nil) :style radio :selected (not ok-select)]]))) ;; toggle button (set-extent-begin-glyph (make-extent (point) (point)) (setq tbutton (make-glyph [button :descriptor ["ok3" (setq ok-select nil) :style toggle :selected (not ok-select)]]))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq toggle-button [button :descriptor ["ok4" :style toggle :callback (setq ok-select (not ok-select)) :selected ok-select]]))) ;; normal pushbutton (set-extent-begin-glyph (make-extent (point) (point)) (setq push-button (make-glyph [button :width 10 :height 2 :face modeline-mousable :descriptor "ok" :callback foo :selected t]))) ;; tree view (set-extent-begin-glyph (make-extent (point) (point)) (setq tree (make-glyph [tree-view :width 10 :descriptor "My Tree" :items (["One" foo] (["Two" foo] ["Four" foo] "Six") "Three")]))) ;; tab control (set-extent-begin-glyph (make-extent (point) (point)) (setq tab (make-glyph [tab-control :descriptor "My Tab" :face highlight :orientation right :items (["One" foo :selected t] ["Two" fee :selected nil] ["Three" foo :selected nil])]))) ;; progress gauge (set-extent-begin-glyph (make-extent (point) (point)) (setq pgauge (make-glyph [progress-gauge :width 10 :height 2 :value 0 :descriptor "ok"]))) ;; progress the progress ... (let ((x 0)) (while (<= x 100) (set-glyph-image pgauge `[progress-gauge :width 10 :height 2 :descriptor "ok" :value ,x]) (setq x (+ x 5)) (sit-for 0.1))) ;; progress gauge in the modeline (setq global-mode-string (cons (make-extent nil nil) (setq pg (make-glyph [progress-gauge :width 5 :pixel-height 16 :descriptor "ok"])))) ;; progress the progress ... (let ((x 0)) (while (<= x 100) (set-glyph-image pg `[progress-gauge :width 5 :pixel-height 16 :descriptor "ok" :value ,x]) (setq x (+ x 5)) (redisplay-frame) (sit-for 0.1))) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph [button :face modeline-mousable :descriptor "ok" :callback foo :image [xpm :file "../etc/xemacs-icon.xpm"]])) ;; normal pushbutton (set-extent-begin-glyph (make-extent (point) (point)) (setq pbutton (make-glyph [button :descriptor ["A Big Button" foo ]]))) ;; edit box (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq edit-field [edit-field :pixel-width 50 :pixel-height 30 :face bold-italic :descriptor ["Hello"]]))) ;; combo box (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq combo-box [combo-box :width 10 :descriptor ["Hello"] :items ("One" "Two" "Three")]))) ;; label (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq label [label :pixel-width 150 :descriptor "Hello"]))) ;; string (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (setq str [string :data "Hello There"]))) ;; scrollbar ;(set-extent-begin-glyph ; (make-extent (point) (point)) ; (make-glyph [scrollbar :width 50 :height 20 :descriptor ["Hello"]])) ;; generic subwindow (setq sw (make-glyph [subwindow :pixel-width 50 :pixel-height 70])) (set-extent-begin-glyph (make-extent (point) (point)) sw) ;; layout (setq layout (make-glyph `[layout :descriptor "The Layout" :orientation vertical :justify left :border [string :data "Hello There Mrs"] :items ([layout :orientation horizontal :items (,radio-button1 ,radio-button2)] ,edit-field ,toggle-button ,label ,str)])) ;(set-glyph-face layout 'gui-element) (set-extent-begin-glyph (make-extent (point) (point)) layout) ;; another test layout (set-extent-begin-glyph (make-extent (point) (point)) (setq layout-2 (make-glyph `[layout :descriptor "The Layout" :orientation vertical :items ([progress-gauge :value 0 :width 10 :height 2 :descriptor "ok"])]))) (set-glyph-image layout-2 `[layout :descriptor "The Layout" :orientation vertical :items ([progress-gauge :value 4 :width 10 :height 2 :descriptor "ok"])]) (setq test-toggle-widget nil) (defun test-toggle (widget) (set-extent-begin-glyph (make-extent (point) (point)) (make-glyph (vector 'button :descriptor "ok" :style 'toggle :selected `(funcall test-toggle-value ,widget) :callback `(funcall test-toggle-action ,widget))))) (defun test-toggle-action (widget &optional event) (if widget (message "Widget is t") (message "Widget is nil"))) (defun test-toggle-value (widget) (setq widget (not widget)) (not widget))