Mercurial > hg > xemacs-beta
view lisp/generic-widgets.el @ 826:6728e641994e
[xemacs-hg @ 2002-05-05 11:30:15 by ben]
syntax cache, 8-bit-format, lots of code cleanup
README.packages: Update info about --package-path.
i.c: Create an inheritable event and pass it on to XEmacs, so that ^C
can be handled properly. Intercept ^C and signal the event.
"Stop Build" in VC++ now works.
bytecomp-runtime.el: Doc string changes.
compat.el: Some attempts to redo this to
make it truly useful and fix the "multiple versions interacting
with each other" problem. Not yet done. Currently doesn't work.
files.el: Use with-obsolete-variable to avoid warnings in new revert-buffer code.
xemacs.mak: Split up CFLAGS into a version without flags specifying the C
library. The problem seems to be that minitar depends on zlib,
which depends specifically on libc.lib, not on any of the other C
libraries. Unless you compile with libc.lib, you get errors --
specifically, no _errno in the other libraries, which must make it
something other than an int. (#### But this doesn't seem to obtain
in XEmacs, which also uses zlib, and can be linked with any of the
C libraries. Maybe zlib is used differently and doesn't need
errno, or maybe XEmacs provides an int errno; ... I don't
understand.
Makefile.in.in: Fix so that packages are around when testing.
abbrev.c, alloc.c, buffer.c, buffer.h, bytecode.c, callint.c, casefiddle.c, casetab.c, casetab.h, charset.h, chartab.c, chartab.h, cmds.c, console-msw.h, console-stream.c, console-x.c, console.c, console.h, data.c, device-msw.c, device.c, device.h, dialog-msw.c, dialog-x.c, dired-msw.c, dired.c, doc.c, doprnt.c, dumper.c, editfns.c, elhash.c, emacs.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, events.h, extents.c, extents.h, faces.c, file-coding.c, file-coding.h, fileio.c, fns.c, font-lock.c, frame-gtk.c, frame-msw.c, frame-x.c, frame.c, frame.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-msw.h, glyphs-x.c, glyphs.c, glyphs.h, gui-msw.c, gui-x.c, gui.h, gutter.h, hash.h, indent.c, insdel.c, intl-win32.c, intl.c, keymap.c, lisp-disunion.h, lisp-union.h, lisp.h, lread.c, lrecord.h, lstream.c, lstream.h, marker.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, mule-ccl.c, mule-charset.c, mule-coding.c, mule-wnnfns.c, nas.c, objects-msw.c, objects-x.c, opaque.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, process.h, profile.c, rangetab.c, redisplay-gtk.c, redisplay-msw.c, redisplay-output.c, redisplay-x.c, redisplay.c, redisplay.h, regex.c, regex.h, scrollbar-msw.c, search.c, select-x.c, specifier.c, specifier.h, symbols.c, symsinit.h, syntax.c, syntax.h, syswindows.h, tests.c, text.c, text.h, tooltalk.c, ui-byhand.c, ui-gtk.c, unicode.c, win32.c, window.c: Another big Ben patch.
-- FUNCTIONALITY CHANGES:
add partial support for 8-bit-fixed, 16-bit-fixed, and
32-bit-fixed formats. not quite done yet. (in particular, needs
functions to actually convert the buffer.) NOTE: lots of changes
to regex.c here. also, many new *_fmt() inline funs that take an
Internal_Format argument.
redo syntax cache code. make the cache per-buffer; keep the cache
valid across calls to functions that use it. also keep it valid
across insertions/deletions and extent changes, as much as is
possible. eliminate the junky regex-reentrancy code by passing in
the relevant lisp info to the regex routines as local vars.
add general mechanism in extents code for signalling extent changes.
fix numerous problems with the case-table implementation; yoshiki
never properly transferred many algorithms from old-style to
new-style case tables.
redo char tables to support a default argument, so that mapping
only occurs over changed args. change many chartab functions to
accept Lisp_Object instead of Lisp_Char_Table *.
comment out the code in font-lock.c by default, because
font-lock.el no longer uses it. we should consider eliminating it
entirely.
Don't output bell as ^G in console-stream when not a TTY.
add -mswindows-termination-handle to interface with i.c, so we can
properly kill a build.
add more error-checking to buffer/string macros.
add some additional buffer_or_string_() funs.
-- INTERFACE CHANGES AFFECTING MORE CODE:
switch the arguments of write_c_string and friends to be
consistent with write_fmt_string, which must have printcharfun
first.
change BI_* macros to BYTE_* for increased clarity; similarly for
bi_* local vars.
change VOID_TO_LISP to be a one-argument function. eliminate
no-longer-needed CVOID_TO_LISP.
-- char/string macro changes:
rename MAKE_CHAR() to make_emchar() for slightly less confusion
with make_char(). (The former generates an Emchar, the latter a
Lisp object. Conceivably we should rename make_char() -> wrap_char()
and similarly for make_int(), make_float().)
Similar changes for other *CHAR* macros -- we now consistently use
names with `emchar' whenever we are working with Emchars. Any
remaining name with just `char' always refers to a Lisp object.
rename macros with XSTRING_* to string_* except for those that
reference actual fields in the Lisp_String object, following
conventions used elsewhere.
rename set_string_{data,length} macros (the only ones to work with
a Lisp_String_* instead of a Lisp_Object) to set_lispstringp_*
to make the difference clear.
try to be consistent about caps vs. lowercase in macro/inline-fun
names for chars and such, which wasn't the case before. we now
reserve caps either for XFOO_ macros that reference object fields
(e.g. XSTRING_DATA) or for things that have non-function semantics,
e.g. directly modifying an arg (BREAKUP_EMCHAR) or evaluating an
arg (any arg) more than once. otherwise, use lowercase.
here is a summary of most of the macros/inline funs changed by all
of the above changes:
BYTE_*_P -> byte_*_p
XSTRING_BYTE -> string_byte
set_string_data/length -> set_lispstringp_data/length
XSTRING_CHAR_LENGTH -> string_char_length
XSTRING_CHAR -> string_emchar
INTBYTE_FIRST_BYTE_P -> intbyte_first_byte_p
INTBYTE_LEADING_BYTE_P -> intbyte_leading_byte_p
charptr_copy_char -> charptr_copy_emchar
LEADING_BYTE_* -> leading_byte_*
CHAR_* -> EMCHAR_*
*_CHAR_* -> *_EMCHAR_*
*_CHAR -> *_EMCHAR
CHARSET_BY_ -> charset_by_*
BYTE_SHIFT_JIS* -> byte_shift_jis*
BYTE_BIG5* -> byte_big5*
REP_BYTES_BY_FIRST_BYTE -> rep_bytes_by_first_byte
char_to_unicode -> emchar_to_unicode
valid_char_p -> valid_emchar_p
Change intbyte_strcmp -> qxestrcmp_c (duplicated functionality).
-- INTERFACE CHANGES AFFECTING LESS CODE:
use DECLARE_INLINE_HEADER in various places.
remove '#ifdef emacs' from XEmacs-only files.
eliminate CHAR_TABLE_VALUE(), which duplicated the functionality
of get_char_table().
add BUFFER_TEXT_LOOP to simplify iterations over buffer text.
define typedefs for signed and unsigned types of fixed sizes
(INT_32_BIT, UINT_32_BIT, etc.).
create ALIGN_FOR_TYPE as a higher-level interface onto ALIGN_SIZE;
fix code to use it.
add charptr_emchar_len to return the text length of the character
pointed to by a ptr; use it in place of
charcount_to_bytecount(..., 1). add emchar_len to return the text
length of a given character.
add types Bytexpos and Charxpos to generalize Bytebpos/Bytecount
and Charbpos/Charcount, in code (particularly, the extents code
and redisplay code) that works with either kind of index. rename
redisplay struct params with names such as `charbpos' to
e.g. `charpos' when they are e.g. a Charxpos, not a Charbpos.
eliminate xxDEFUN in place of DEFUN; no longer necessary with
changes awhile back to doc.c.
split up big ugly combined list of EXFUNs in lisp.h on a
file-by-file basis, since other prototypes are similarly split.
rewrite some "*_UNSAFE" macros as inline funs and eliminate the
_UNSAFE suffix.
move most string code from lisp.h to text.h; the string code and
text.h code is now intertwined in such a fashion that they need
to be in the same place and partially interleaved. (you can't
create forward references for inline funs)
automated/lisp-tests.el, automated/symbol-tests.el, automated/test-harness.el: Fix test harness to output FAIL messages to stderr when in
batch mode.
Fix up some problems in lisp-tests/symbol-tests that were
causing spurious failures.
author | ben |
---|---|
date | Sun, 05 May 2002 11:33:57 +0000 |
parents | 7039e6323819 |
children | 308d34e9f07d |
line wrap: on
line source
;;; generic-widgets.el --- Generic UI building ;; Copyright (C) 2000 Free Software Foundation ;; Maintainer: William Perry <wmperry@gnu.org> ;; Keywords: extensions, dumped ;; 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 ;;; Commentary: ;; This file is dumped with XEmacs. (globally-declare-fboundp '(gtk-label-new gtk-widget-show-all gtk-signal-connect gtk-window-new gtk-container-add gtk-vbox-new gtk-hbox-new gtk-box-pack-start gtk-notebook-new gtk-notebook-set-homogeneous-tabs gtk-notebook-set-scrollable gtk-notebook-set-show-tabs gtk-notebook-set-tab-pos gtk-notebook-append-page gtk-text-new gtk-text-set-editable gtk-text-set-word-wrap gtk-text-set-line-wrap gtk-widget-set-style gtk-text-insert gtk-label-set-line-wrap gtk-label-set-justify gtk-radio-button-new gtk-radio-button-group gtk-check-button-new gtk-toggle-button-new gtk-button-new gtk-progress-bar-new gtk-progress-bar-set-orientation gtk-progress-bar-set-bar-style)) (defun build-ui (ui) (if (null ui) (gtk-label-new "[empty]") (let ((builder-func (intern-soft (format "build-ui::%s" (car ui)))) (widget nil)) (if (and builder-func (fboundp builder-func)) (progn (setq widget (funcall builder-func ui)) (setcdr ui (plist-put (cdr ui) :x-internal-widget widget)) widget) (error "Unknown ui element: %s" (car ui)))))) (defun show-ui (ui) (let ((widget (plist-get (cdr ui) :x-internal-widget))) (if (not widget) (error "Attempting to show unrealized UI")) (gtk-widget-show-all widget) (gtk-signal-connect widget 'destroy (lambda (widget ui) (setcdr ui (plist-put (cdr ui) :x-internal-widget nil))) ui))) (defun build-ui::window (spec) "Create a top-level window for containing other widgets. Properties: :items list A list of child UI specs. Only the first is used. :type toplevel/dialog/popup What type of window to create. Window managers can (and usually do) treat each type differently. " (let ((plist (cdr spec)) (window nil) (child nil)) (setq window (gtk-window-new (plist-get plist :type 'toplevel)) child (build-ui (car (plist-get plist :items)))) (gtk-container-add window child) window)) (defun build-ui::box (spec) "Create a box for containing other widgets. Properties: :items list A list of child UI specs. :homogeneous t/nil Whether all children are the same width/height. :spacing number Spacing between children. :orientation horizontal/vertical How the widgets are stacked. Additional properties on child widgets: :expand t/nil Whether the new child is to be given extra space allocated to box. The extra space will be divided evenly between all children of box that use this option. :fill t/nil Whether space given to child by the expand option is actually allocated to child, rather than just padding it. This parameter has no effect if :expand is set to nil. A child is always allocated the full height of a horizontal box and the full width of a vertical box. This option affects the other dimension. :padding number Extra padding around this widget. " (let* ((plist (cdr spec)) (orientation (plist-get plist :orientation 'horizontal)) (children (plist-get plist :items)) (box nil) (child-widget nil) (child-plist nil)) (case orientation (vertical (setq box (gtk-vbox-new (plist-get plist :homogeneous) (plist-get plist :spacing)))) (horizontal (setq box (gtk-hbox-new (plist-get plist :homogeneous) (plist-get plist :spacing)))) (otherwise (error "Unknown orientation for box: %s" orientation))) (mapc (lambda (child) (setq child-plist (cdr child) child-widget (build-ui child)) (if (listp child-widget) (mapc (lambda (w) (gtk-box-pack-start box w (plist-get child-plist :expand) (plist-get child-plist :fill) (plist-get child-plist :padding))) child-widget) (gtk-box-pack-start box child-widget (plist-get child-plist :expand) (plist-get child-plist :fill) (plist-get child-plist :padding)))) children) box)) (defun build-ui::tab-control (spec) "Create a notebook widget. Properties: :items list A list of UI specs to use as notebook pages. :homogeneous t/nil Whether all tabs are the same width. :orientation top/bottom/left/right Position of tabs :show-tabs t/nil Show the tabs on screen? :scrollable t/nil Allow scrolling to view all tab widgets? Additional properties on child widgets: :tab-label ui A UI spec to use for the tab label. " (let* ((plist (cdr spec)) (notebook (gtk-notebook-new)) (children (plist-get plist :items)) (page-counter 1) (label-widget nil) (child-widget nil) (child-plist nil)) ;; Set all the properties (gtk-notebook-set-homogeneous-tabs notebook (plist-get plist :homogeneous)) (gtk-notebook-set-scrollable notebook (plist-get plist :scrollable t)) (gtk-notebook-set-show-tabs notebook (plist-get plist :show-tabs t)) (gtk-notebook-set-tab-pos notebook (plist-get plist :orientation 'top)) ;; Now fill in the tabs (mapc (lambda (child) (setq child-plist (cdr child) child-widget (build-ui child) label-widget (build-ui (plist-get child-plist :tab-label (list 'label :text (format "tab %d" page-counter)))) page-counter (1+ page-counter)) (gtk-notebook-append-page notebook child-widget label-widget)) children) notebook)) (defun build-ui::text (spec) "Create a multi-line text widget. Properties: :editable t/nil Whether the user can change the contents :word-wrap t/nil Automatic word wrapping? :line-wrap t/nil Automatic line wrapping? :text string Initial contents of the widget :file filename File for initial contents (takes precedence over :text) :face facename XEmacs face to use in the widget. " (let* ((plist (cdr spec)) (text (gtk-text-new nil nil)) (face (plist-get plist :face 'default)) (info (plist-get plist :text)) (file (plist-get plist :file))) (gtk-text-set-editable text (plist-get plist :editable)) (gtk-text-set-word-wrap text (plist-get plist :word-wrap)) (gtk-text-set-line-wrap text (plist-get plist :line-wrap)) (gtk-widget-set-style text 'default) ;; Possible convert the file portion (if (and file (not (stringp file))) (setq file (eval file))) (if (and info (not (stringp info))) (setq info (eval info))) (if (and file (file-exists-p file) (file-readable-p file)) (save-excursion (set-buffer (get-buffer-create " *improbable buffer name*")) (insert-file-contents file) (setq info (buffer-string)))) (gtk-text-insert text (face-font face) (face-foreground face) (face-background face) info (length info)) text)) (defun build-ui::label (spec) "Create a label widget. Properties: :text string Text inside the label :face facename XEmacs face to use in the widget. :justification right/left/center How to justify the text. " (let* ((plist (cdr spec)) (label (gtk-label-new (plist-get plist :text)))) (gtk-label-set-line-wrap label t) (gtk-label-set-justify label (plist-get plist :justification)) (gtk-widget-set-style label (plist-get plist :face 'default)) label)) (defun build-ui::pixmap (spec) "Create a multi-line text widget. Properties: :text string Text inside the label :face facename XEmacs face to use in the widget. :justification right/left/center How to justify the text. " (let* ((plist (cdr spec)) (label (gtk-label-new (plist-get plist :text)))) (gtk-label-set-line-wrap label t) (gtk-label-set-justify label (plist-get plist :justification)) (gtk-widget-set-style label (plist-get plist :face 'default)) label)) (defun build-ui::radio-group (spec) "A convenience when specifying a group of radio buttons." (declare (special build-ui::radio-group)) (let ((build-ui::radio-group nil)) (mapcar 'build-ui (plist-get (cdr spec) :items)))) (defun build-ui::button (spec) "Create a button widget. Properties: :type radio/check/toggle/nil What type of button to create. :text string Text in the button. :glyph glyph Image in the button. :label ui A UI spec to use for the label. :relief normal/half/none How to draw button edges. NOTE: Radio buttons must be in a radio-group object for them to work. " (declare (special build-ui::radio-group)) (let* ((plist (cdr spec)) (button nil) (button-type (plist-get plist :type 'normal))) (case button-type (radio (if (not (boundp 'build-ui::radio-group)) (error "Attempt to use a radio button outside a radio-group")) (setq button (gtk-radio-button-new build-ui::radio-group) build-ui::radio-group (gtk-radio-button-group button))) (check (setq button (gtk-check-button-new))) (toggle (setq button (gtk-toggle-button-new))) (normal (setq button (gtk-button-new))) (otherwise (error "Unknown button type: %s" button-type))) (gtk-container-add button (build-ui (plist-get plist :label (list 'label :text (plist-get plist :text (format "%s button" button-type)))))) button)) (defun build-ui::progress-gauge (spec) "Create a progress meter. Properties: :orientation left-to-right/right-to-left/top-to-bottom/bottom-to-top :type discrete/continuous " (let ((plist (cdr spec)) (gauge (gtk-progress-bar-new))) (gtk-progress-bar-set-orientation gauge (plist-get plist :orientation 'left-to-right)) (gtk-progress-bar-set-bar-style gauge (plist-get plist :type 'continuous)) gauge)) (provide 'generic-widgets) (when (featurep 'gtk) ; just loading this file should be OK (gtk-widget-show-all (build-ui '(window :type dialog :items ((tab-control :homogeneous t :orientation bottom :items ((box :orientation vertical :tab-label (label :text "vertical") :items ((label :text "Vertical") (progress-gauge) (label :text "Box stacking"))) (box :orientation horizontal :spacing 10 :items ((label :text "Horizontal box") (label :text "stacking"))) (box :orientation vertical :items ((radio-group :items ((button :type radio :expand nil :fill nil :text "Item 1") (button :type radio :expand nil :fill nil :text "Item 2") (button :type radio :expand nil :fill nil :text "Item 3") (button :type radio :expand nil :fill nil))))) (box :orientation vertical :items ((button :type check :text "Item 1") (button :type check :text "Item 2") (button :type normal :text "Item 3") (button :type toggle))) (text :editable t :word-wrap t :file (locate-data-file "COPYING")) (text :editable t :face display-time-mail-balloon-enhance-face :word-wrap t :text "Text with a face on it"))))))) )