annotate tests/glyph-test.el @ 872:79c6ff3eef26

[xemacs-hg @ 2002-06-20 21:18:01 by ben] font changes etc.; some 21.4 changes mule/mule-msw-init-late.el: Specify charset->windows-registry conversion. mule/mule-x-init.el: Delete extra mule font additions here. Put them in faces.c. cl-macs.el: Document better. font-lock.el: Move Lisp function regexp to lisp-mode.el. lisp-mode.el: Various indentation fixes: Handle flet functions better. Handle argument lists in defuns and flets. Handle quoted lists, e.g. property lists -- don't indent like function calls. Distinguish between lambdas and other lists. lisp-mode.el: Handle this form. faces.el, font-menu.el, font.el, gtk-faces.el, msw-faces.el, msw-font-menu.el, x-faces.el, x-init.el: Major overhaul of face-handling code: -- Fix lots of bogus code in msw-faces.el, msw-font-menu.el, font-menu.el that was "truenaming" font specs -- i.e. in the process of frobbing a particular field in a general user-specified font spec with wildcarded fields, sticking in particular values for all the remaining wildcarded fields. This bug was rampant everywhere except in x-faces.el (the oldest and only correctly written code). This also means that we need to work with font names at all times and not font instances, because a font instance is essentially a truenamed font. -- Total rewrite of extremely junky code in msw-faces.el. Work with names as well as font instances, and return names; stop truenaming when canonicalizing and frobbing; fix handling of the combined style field, i.e. weight/slant (also fixed in font.el). -- Totally rewrite the frobbing functions in faces.el. This time, we frob all the instantiators rather than just computing a single instance value and working backwards. That way, e.g., `bold' will work for all charsets that have bold available, rather than only for whatever charset was part of the computed font instance (another example of the truename virus). Also fix up code to look at the fallbacks (all of them) when no global value present, so we don't need to put something in the global value. Intelligently handle a request to frob a buffer locale, rather than signalling an error. When frobbing instantiators, try hard to figure out what device type is associated with them, and frob each according to its own proper device type. Correctly handle inheritance vectors given as instantiators. Preserve existing tags when putting back frobbed instantiators. Extract out general specifier-frobbing code into specifier.el. Document everything cleanly. Do lots of other things better, etc. -- Don't duplicatively set a global specification for the default font -- it's already in the fallback and we no longer need a default global specification present. Delete various code in x-faces.el and msw-faces.el that duplicated the lists of fonts in faces.c. -- init-global-faces was not being called at all under MS Windows! Major bogosity. That caused device-specific values to get stuck into all the fonts, making it very hard to change them -- setting global specs caused nothing to happen. -- Correct weight names in font.el. -- Lots more font fixups in objects*.c. Printer.el: Warning fix. specifier.el: Add more args to map-specifier. Add various "heuristic" specifier functions to aid in creation of specifier-munging code such as in faces.el. subr.el: New functions. lwlib.c: Fix warning. config.inc.samp: Clean up, add args to control fastcall (not yet supported! the changes needed are in another ws of mine), profile support, vc6 support, union-type. xemacs.dsp, xemacs.mak: Semi-major overhaul. Fix bug where dump-id was always getting recomputed, forcing a redump even when nothing changed. Add support for fastcall. Support edit-and-continue (on by default) with vc6. Use incremental linking when doing a debug compilation. Add support for profiling. Consolidate the various debug flags. Partial support for "batch-compiling" -- compiling many files on a single invocation of the compiler. Doesn't seem to help that much for me, so it's not finished or enabled by default. Remove HAVE_MSW_C_DIRED, we always do. Correct some sloppy use of directories. s/cygwin32.h: Allow pdump to work under Cygwin (mmap is broken, so need to undefine HAVE_MMAP). s/win32-common.h, s/windowsnt.h: Support for fastcall. Add WIN32_ANY for identifying all Win32 variants (Cygwin, native, MinGW). Both of these are properly used in another ws. alloc.c, balloon-x.c, buffer.c, bytecode.c, callint.c, cm.c, cmdloop.c, cmds.c, console-gtk.c, console-gtk.h, console-msw.c, console-msw.h, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console-x.h, console.c, console.h, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, device.h, devslots.h, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, editfns.c, emacs.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, event-unixoid.c, events.c, extents.c, extents.h, faces.c, fileio.c, fns.c, frame-gtk.c, frame-msw.c, frame-tty.c, frame-x.c, frame.c, frame.h, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gui-gtk.c, gui-msw.c, gui-x.c, gui.c, gutter.c, input-method-xlib.c, intl-encap-win32.c, intl-win32.c, keymap.c, lisp.h, macros.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h, minibuf.c, mule-charset.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-msw.h, objects-tty.c, objects-tty.h, objects-x.c, objects-x.h, objects.c, objects.h, postgresql.c, print.c, process.h, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-tty.c, redisplay-x.c, redisplay.c, redisplay.h, scrollbar-gtk.c, scrollbar-msw.c, scrollbar-x.c, scrollbar.c, select-gtk.c, select-msw.c, select-x.c, select.c, signal.c, sound.c, specifier.c, symbols.c, syntax.c, sysdep.c, syssignal.h, syswindows.h, toolbar-common.c, toolbar-gtk.c, toolbar-msw.c, toolbar-x.c, toolbar.c, unicode.c, window.c, window.h: The following are the major changes made: (1) Separation of various header files into an external and an internal version, similar to the existing separation of process.h and procimpl.h. Eventually this should be done for all Lisp objects. The external version has the same name as currently; the internal adds -impl. The external file has XFOO() macros for objects, but the structure is opaque and defined only in the internal file. It's now reasonable to move all prototypes in lisp.h into the appropriate external file, and this should be done. Currently, separation has been done on extents.h, objects*.h, console.h, device.h, frame.h, and window.h. For c/d/f/w, the most basic properties are available in the external header file, with the macros resolving to functions. In the internal header file, the macros are redefined to directly access the structure. Also, the global MARK_FOO_CHANGED macros have been made into functions so that they can be accessed without needing to include lots of -impl headers -- they are used in almost exclusively in non-time-critical functions, and take up enough time that the function overhead will be negligible. Similarly, the function overhead from making the basic properties mentioned above into functions is negligible, and code that does heavy accessing of c/d/f/w structures inevitably ends up needing the internal header files, anyway. (2) More face changes. -- Major rewrite of objects-msw.c. Now handles wildcard specs properly, rather than "truenaming" (or even worse, signalling an error, which previously happened with some of the fallbacks if you tried to use them in make-font-instance!). -- Split charset matching of fonts into two stages -- one to find a font specifically designed for a particular charset (by examining its registry), the second to find a Unicode font that can support the charset. This needs to proceed as two complete, separate instantiations in order to work properly (otherwise many of the fonts in the HELLO page look wrong). This should also make it easy to support iso10646 (Unicode) fonts under X. -- All default values for fonts are now completely specified in the fallbacks. Stuff from mule-x-init.el has all been moved here, merged with the existing specs, and totally rethought so you get sensible results. (HELLO now looks much better!). -- Generalize the "default X/GTK device" stuff into a per-device-type "default device". -- Add mswindows-{set-}charset-registry. In time, charset<->code-page conversion functions will be removed. -- Wrap protective code around calls to compute device specifier tags, and do this computation before calling the face initialization code because the latter may need these tags to be correctly updated. (3) Other changes. EmacsFrame.c, glyphs-msw.c, eval.c, gui-x.c, intl-encap-win32.c, search.c, signal.c, toolbar-msw.c, unicode.c: Warning fixes. config.h.in: #undefs meant to be frobbed by configure *MUST* go inside of #ifndef WIN32_NO_CONFIGURE, and everything else *MUST* go outside! eval.c: Let detailed backtraces be detailed. specifier.c: Don't override user's print-string-length/print-length settings. glyphs.c: New function image-instance-instantiator. config.h.in, sysdep.c: Changes for fastcall. sysdep.c, nt.c: Fix up a previous botched patch that tried to add support for both EEXIST and EACCES. IF THE BOTCHED PATCH WENT INTO 21.4, THIS FIXUP NEEDS TO GO IN, TOO. search.c: Fix *evil* crash due to incorrect synching of syntax-cache code with 21.1. THIS SHOULD GO INTO 21.4.
author ben
date Thu, 20 Jun 2002 21:19:10 +0000
parents 0784d089fdc9
children 8a653fbe5c27
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
2 (make-extent (point) (point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
3 (setq im (make-glyph [xbm :file "xemacsicon.xbm"])))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
5 (set-extent-begin-glyph
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
6 (make-extent (point) (point))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
7 (make-glyph [string :data "xemacs"]))
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
8
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 (defun foo ()
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 (interactive)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 (setq ok-select (not ok-select)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 (defun fee () (interactive) (message "hello"))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 ;; button in a group
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 (setq ok-select nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 (make-extent (point) (point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
19 (make-glyph
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
20 (setq radio-button1
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
21 [button :face widget
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
22 :descriptor ["ok1" (setq ok-select t)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 :style radio :selected ok-select]])))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 ;; button in a group
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 (make-extent (point) (point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
27 (make-glyph
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
28 (setq radio-button2
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
29 [button :descriptor ["ok2" (setq ok-select nil) :style radio
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 :selected (not ok-select)]])))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 ;; toggle button
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 (make-extent (point) (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 (setq tbutton
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
35 (make-glyph [button :descriptor ["ok3" (setq ok-select nil)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 :style toggle
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 :selected (not ok-select)]])))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 (make-extent (point) (point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
40 (make-glyph
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
41 (setq toggle-button
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
42 [button :descriptor ["ok4" :style toggle
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
43 :callback
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
44 (setq ok-select (not ok-select))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
45 :selected ok-select]])))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 ;; normal pushbutton
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 (make-extent (point) (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 (setq push-button
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 (make-glyph [button :width 10 :height 2
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 :face modeline-mousable
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
53 :descriptor "ok" :callback foo
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 :selected t])))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 ;; tree view
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 (make-extent (point) (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58 (setq tree (make-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 [tree-view :width 10
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 :descriptor "My Tree"
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
61 :items (["One" foo]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
62 (["Two" foo]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
63 ["Four" foo]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
64 "Six")
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
65 "Three")])))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 ;; tab control
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
68 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
69 (make-extent (point) (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
70 (setq tab (make-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
71 [tab-control :descriptor "My Tab"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
72 :face highlight
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
73 :orientation right
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
74 :items (["One" foo :selected t]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
75 ["Two" fee :selected nil]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
76 ["Three" foo :selected nil])])))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
77
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
78 ;; progress gauge
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
79 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
80 (make-extent (point) (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
81 (setq pgauge (make-glyph
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
82 [progress-gauge :width 10 :height 2 :value 0
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
83 :descriptor "ok"])))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
84 ;; progress the progress ...
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
85 (let ((x 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
86 (while (<= x 100)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
87 (set-glyph-image pgauge `[progress-gauge :width 10 :height 2
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
88 :descriptor "ok" :value ,x])
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
89 (setq x (+ x 5))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
90 (sit-for 0.1)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
91
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
92 ;; progress gauge in the modeline
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
93 (setq global-mode-string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
94 (cons (make-extent nil nil)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
95 (setq pg (make-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
96 [progress-gauge :width 5 :pixel-height 16
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
97 :descriptor "ok"]))))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
98 ;; progress the progress ...
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
99 (let ((x 0))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
100 (while (<= x 100)
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
101 (set-glyph-image pg
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
102 `[progress-gauge :width 5 :pixel-height 16
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
103 :descriptor "ok" :value ,x])
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
104 (setq x (+ x 5))
462
0784d089fdc9 Import from CVS: tag r21-2-46
cvs
parents: 442
diff changeset
105 (redisplay-frame)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
106 (sit-for 0.1)))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
107
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
108 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
109 (make-extent (point) (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
110 (make-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
111 [button :face modeline-mousable
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
112 :descriptor "ok" :callback foo
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
113 :image [xpm :file "../etc/xemacs-icon.xpm"]]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
114
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
115 ;; normal pushbutton
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
116 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
117 (make-extent (point) (point))
438
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
118 (setq pbutton
84b14dcb0985 Import from CVS: tag r21-2-27
cvs
parents: 434
diff changeset
119 (make-glyph [button :descriptor ["A Big Button" foo ]])))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
120
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
121 ;; edit box
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
122 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
123 (make-extent (point) (point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
124 (make-glyph (setq edit-field [edit-field :pixel-width 50 :pixel-height 30
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
125 :face bold-italic
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
126 :descriptor ["Hello"]])))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
127 ;; combo box
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
128 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
129 (make-extent (point) (point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
130 (make-glyph (setq combo-box
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
131 [combo-box :width 10 :descriptor ["Hello"]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
132 :items ("One" "Two" "Three")])))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
133
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
134 ;; label
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
135 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
136 (make-extent (point) (point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
137 (make-glyph (setq label [label :pixel-width 150 :descriptor "Hello"])))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
138
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
139 ;; string
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
140 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
141 (make-extent (point) (point))
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
142 (make-glyph
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
143 (setq str
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
144 [string :data "Hello There"])))
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
145
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
146 ;; scrollbar
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
147 ;(set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
148 ; (make-extent (point) (point))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
149 ; (make-glyph [scrollbar :width 50 :height 20 :descriptor ["Hello"]]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
150
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
151 ;; generic subwindow
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
152 (setq sw (make-glyph [subwindow :pixel-width 50 :pixel-height 70]))
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
153 (set-extent-begin-glyph (make-extent (point) (point)) sw)
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
154
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
155 ;; layout
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
156 (setq layout
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
157 (make-glyph
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
158 `[layout :descriptor "The Layout"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
159 :orientation vertical
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
160 :justify left
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
161 :border [string :data "Hello There Mrs"]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
162 :items ([layout :orientation horizontal
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
163 :items (,radio-button1 ,radio-button2)]
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
164 ,edit-field ,toggle-button ,label ,str)]))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
165 ;(set-glyph-face layout 'gui-element)
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
166 (set-extent-begin-glyph
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
167 (make-extent (point) (point)) layout)
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
168
442
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
169 ;; another test layout
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
170 (set-extent-begin-glyph
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
171 (make-extent (point) (point))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
172 (setq layout-2
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
173 (make-glyph `[layout :descriptor "The Layout"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
174 :orientation vertical
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
175 :items ([progress-gauge :value 0 :width 10 :height 2
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
176 :descriptor "ok"])])))
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
177
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
178 (set-glyph-image layout-2 `[layout :descriptor "The Layout"
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
179 :orientation vertical
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
180 :items ([progress-gauge :value 4 :width 10 :height 2
abe6d1db359e Import from CVS: tag r21-2-36
cvs
parents: 438
diff changeset
181 :descriptor "ok"])])
434
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
182 (setq test-toggle-widget nil)
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
183
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
184 (defun test-toggle (widget)
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
185 (set-extent-begin-glyph
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
186 (make-extent (point) (point))
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
187 (make-glyph (vector 'button
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
188 :descriptor "ok"
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
189 :style 'toggle
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
190 :selected `(funcall test-toggle-value
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
191 ,widget)
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
192 :callback `(funcall test-toggle-action
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
193 ,widget)))))
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
194
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
195 (defun test-toggle-action (widget &optional event)
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
196 (if widget
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
197 (message "Widget is t")
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
198 (message "Widget is nil")))
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
199
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
200 (defun test-toggle-value (widget)
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
201 (setq widget (not widget))
9d177e8d4150 Import from CVS: tag r21-2-25
cvs
parents: 428
diff changeset
202 (not widget))