Mercurial > hg > xemacs-beta
view lwlib/lwlib.h @ 5136:0f66906b6e37
Undo Assert-equal, Assert=, etc.; make `Assert' handle this automatically
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-03-12 Ben Wing <ben@xemacs.org>
* test-harness.el (test-harness-from-buffer):
Undo change of e.g. (Assert (equalp ...)) to (Assert-equalp ...).
Get rid of `Assert-equalp' and friends, `Assert-test', and
`Assert-test-not'. Instead, make `Assert' smart enough to do the
equivalent functionality when an expression like (Assert (equalp ...))
is seen.
tests/ChangeLog addition:
2010-03-12 Ben Wing <ben@xemacs.org>
* automated/base64-tests.el (bt-base64-encode-string):
* automated/base64-tests.el (bt-base64-decode-string):
* automated/base64-tests.el (for):
* automated/byte-compiler-tests.el:
* automated/byte-compiler-tests.el (before-and-after-compile-equal):
* automated/case-tests.el (downcase-string):
* automated/case-tests.el (uni-mappings):
* automated/ccl-tests.el (ccl-test-normal-expr):
* automated/ccl-tests.el (ccl-test-map-instructions):
* automated/ccl-tests.el (ccl-test-suites):
* automated/database-tests.el (delete-database-files):
* automated/extent-tests.el (let):
* automated/extent-tests.el (insert):
* automated/extent-tests.el (props):
* automated/file-tests.el:
* automated/file-tests.el (for):
* automated/hash-table-tests.el (test):
* automated/hash-table-tests.el (for):
* automated/hash-table-tests.el (ht):
* automated/hash-table-tests.el (iterations):
* automated/hash-table-tests.el (h1):
* automated/hash-table-tests.el (equal):
* automated/hash-table-tests.el (=):
* automated/lisp-tests.el:
* automated/lisp-tests.el (eq):
* automated/lisp-tests.el (test-setq):
* automated/lisp-tests.el (my-vector):
* automated/lisp-tests.el (x):
* automated/lisp-tests.el (equal):
* automated/lisp-tests.el (y):
* automated/lisp-tests.el (featurep):
* automated/lisp-tests.el (=):
* automated/lisp-tests.el (six):
* automated/lisp-tests.el (three):
* automated/lisp-tests.el (one):
* automated/lisp-tests.el (two):
* automated/lisp-tests.el (five):
* automated/lisp-tests.el (test1):
* automated/lisp-tests.el (division-test):
* automated/lisp-tests.el (for):
* automated/lisp-tests.el (check-function-argcounts):
* automated/lisp-tests.el (z):
* automated/lisp-tests.el (eql):
* automated/lisp-tests.el (test-harness-risk-infloops):
* automated/lisp-tests.el (erase-buffer):
* automated/lisp-tests.el (sym):
* automated/lisp-tests.el (new-char):
* automated/lisp-tests.el (new-load-file-name):
* automated/lisp-tests.el (cl-floor):
* automated/lisp-tests.el (foo):
* automated/md5-tests.el (lambda):
* automated/md5-tests.el (large-string):
* automated/md5-tests.el (mapcar):
* automated/md5-tests.el (insert):
* automated/mule-tests.el:
* automated/mule-tests.el (test-chars):
* automated/mule-tests.el (existing-file-name):
* automated/mule-tests.el (featurep):
* automated/query-coding-tests.el (featurep):
* automated/regexp-tests.el:
* automated/regexp-tests.el (insert):
* automated/regexp-tests.el (Assert):
* automated/regexp-tests.el (=):
* automated/regexp-tests.el (featurep):
* automated/regexp-tests.el (text):
* automated/regexp-tests.el (text1):
* automated/regexp-tests.el ("aáa"):
* automated/regexp-tests.el (eql):
* automated/search-tests.el (insert):
* automated/search-tests.el (featurep):
* automated/search-tests.el (let):
* automated/search-tests.el (boundp):
* automated/symbol-tests.el:
* automated/symbol-tests.el (name):
* automated/symbol-tests.el (check-weak-list-unique):
* automated/symbol-tests.el (string):
* automated/symbol-tests.el (list):
* automated/symbol-tests.el (foo):
* automated/symbol-tests.el (eq):
* automated/symbol-tests.el (fresh-keyword-name):
* automated/symbol-tests.el (print-gensym):
* automated/symbol-tests.el (mysym):
* automated/syntax-tests.el (test-forward-word):
* automated/syntax-tests.el (test-backward-word):
* automated/syntax-tests.el (test-syntax-table):
* automated/syntax-tests.el (with-syntax-table):
* automated/syntax-tests.el (Skip-Test-Unless):
* automated/syntax-tests.el (with):
* automated/tag-tests.el (testfile):
* automated/weak-tests.el (w):
* automated/weak-tests.el (p):
* automated/weak-tests.el (a):
Undo change of e.g. (Assert (equalp ...)) to (Assert-equalp ...).
Get rid of `Assert-equalp' and friends, `Assert-test', and
`Assert-test-not'. Instead, make `Assert' smart enough to do the
equivalent functionality when an expression like (Assert (equalp ...))
is seen.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 12 Mar 2010 18:27:51 -0600 |
parents | 726060ee587c |
children | ade4c7e2c6cb |
line wrap: on
line source
#ifndef INCLUDED_lwlib_h_ #define INCLUDED_lwlib_h_ #include <X11/Intrinsic.h> #include "xt-wrappers.h" #if defined (LWLIB_MENUBARS_LUCID) || defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_MENUBARS_ATHENA) #define NEED_MENUBARS #endif #if defined (LWLIB_SCROLLBARS_LUCID) || defined (LWLIB_SCROLLBARS_MOTIF) || defined (LWLIB_SCROLLBARS_ATHENA) #define NEED_SCROLLBARS #endif #if defined (LWLIB_DIALOGS_LUCID) || defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_DIALOGS_ATHENA) #define NEED_DIALOGS #endif /* ** Widget values depend on the Widget type: ** ** widget: (name value key enabled data contents/selected) ** ** label: ("name" "string" NULL NULL NULL NULL) ** BUTTON: ("name" "string" "key" T/F data <default-button-p>) ** CASCADE (button w/menu): ** ("name" "string" "key" T/F data (label|button|button w/menu...)) ** INCREMENTAL (button w/menu construction callback): ** ("name" "string" NULL T/F <opaque pointer>) ** menubar: ("name" NULL NULL T/F data (button w/menu)) ** scrollbar:("name" NULL NULL T/F NULL NULL) ** selectable thing: ** ("name" "string" "key" T/F data T/F) ** checkbox: selectable thing ** radio: ("name" NULL NULL T/F data (selectable thing...)) ** strings: ("name" NULL NULL T/F data (selectable thing...)) ** TEXT: ("name" "string" <ign> T/F data) ** ** Note that the above is EXTREMELY bogus. The "type" of the various entities ** that a widget_value structure can represent is implicit in the contents of ** half a dozen slots, instead of there simply being a type field. This ** should all be rethunk. I've added a type field, but for now it's only used ** by the new xlwmenu code. */ typedef unsigned long LWLIB_ID; typedef enum _change_type { NO_CHANGE = 0, INVISIBLE_CHANGE = 1, VISIBLE_CHANGE = 2, STRUCTURAL_CHANGE = 3 } change_type; typedef enum _widget_value_type { UNSPECIFIED_TYPE = 0, BUTTON_TYPE = 1, TOGGLE_TYPE = 2, RADIO_TYPE = 3, TEXT_TYPE = 4, SEPARATOR_TYPE = 5, CASCADE_TYPE = 6, PUSHRIGHT_TYPE = 7, INCREMENTAL_TYPE = 8 } widget_value_type; typedef enum _scroll_action { SCROLLBAR_LINE_UP = 0, SCROLLBAR_LINE_DOWN = 1, SCROLLBAR_PAGE_UP = 2, SCROLLBAR_PAGE_DOWN = 3, SCROLLBAR_DRAG = 4, SCROLLBAR_CHANGE = 5, SCROLLBAR_TOP = 6, SCROLLBAR_BOTTOM = 7 } scroll_action; typedef struct _scroll_event { scroll_action action; int slider_value; Time time; } scroll_event; typedef struct _scrollbar_values { int line_increment; int page_increment; int minimum; int maximum; int slider_size; int slider_position; int scrollbar_width, scrollbar_height; int scrollbar_x, scrollbar_y; } scrollbar_values; typedef struct _widget_args { /* some things are only possible at creation time. args are applied to widgets at creation time. */ ArgList args; int nargs; /* Copying args is impossible so we make the caller give us heap allocated args and free them when no one wants them any more. */ int ref_count; /* Since we are reference counting we need to be able to determine when something has changed. */ Boolean args_changed; } widget_args; typedef struct _widget_value { /* This slot is only partially utilized right now. */ widget_value_type type; /* name of widget */ char* name; /* value (meaning BOGUSLY depends on widget type) */ char* value; /* keyboard equivalent. no implications for XtTranslations */ char* key; /* accelerator key. For XEmacs, this should be a Lisp_Object holding a char or symbol suitable for passing to event_matches_key_specifier_p. Outside of emacs, this can be anything: an X KeySym is a good idea. lwlib provides support functions for keyboard traversal of menus. Actual implementation of those accelerators is up to the application. */ XtPointer accel; /* true if enabled */ Boolean enabled; /* true if selected */ Boolean selected; /* true if was edited (maintained by get_value) */ Boolean edited; /* true if has changed (maintained by lw library) */ change_type change; /* Contents of sub-widgets, also selected slot for checkbox */ struct _widget_value* contents; /* data passed to callback */ XtPointer call_data; /* next in the list of siblings */ struct _widget_value* next; /* slot for the toolkit dependent part. Always initialize to NULL. */ void* toolkit_data; /* tell us if we should free the toolkit data slot when freeing the widget_value itself. */ Boolean free_toolkit_data; /* data defining a scrollbar; only valid if type == "scrollbar" */ scrollbar_values *scrollbar_data; /* A reference counted arg structure. */ struct _widget_args *args; /* we resource the widget_value structures; this points to the next one on the free list if this one has been deallocated. */ struct _widget_value *free_list; } widget_value; typedef void (*lw_callback) (Widget w, LWLIB_ID id, XtPointer data); /* menu stuff */ /* maybe this should go into a generic lwmenu.h */ extern int lw_menu_active; #if defined (LWLIB_MENUBARS_LUCID) #include "xlwmenu.h" #define lw_set_menu xlw_set_menu #define lw_push_menu xlw_push_menu #define lw_pop_menu xlw_pop_menu #define lw_set_item xlw_set_item #define lw_map_menu xlw_map_menu #define lw_display_menu xlw_display_menu #define lw_kill_menus xlw_kill_menus #define lw_get_entries xlw_get_entries #define lw_menu_level xlw_menu_level #else /* LWLIB_MENUBARS_LUCID */ /* do this for the other toolkits too */ #endif /* LWLIB_MENUBARS_LUCID */ #if defined (LWLIB_TABS_LUCID) #include "xlwtabs.h" #endif void lw_register_widget (const char* type, const char* name, LWLIB_ID id, widget_value* val, lw_callback pre_activate_cb, lw_callback selection_cb, lw_callback post_activate_cb); Widget lw_get_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); Widget lw_make_widget (LWLIB_ID id, Widget parent, Boolean pop_up_p); Widget lw_create_widget (const char* type, const char* name, LWLIB_ID id, widget_value* val, Widget parent, Boolean pop_up_p, lw_callback pre_activate_cb, lw_callback selection_cb, lw_callback post_activate_cb); LWLIB_ID lw_get_widget_id (Widget w); int lw_map_widget_values (LWLIB_ID id, int (*mapfunc) (widget_value *value, void *closure), void *closure); void lw_modify_all_widgets (LWLIB_ID id, widget_value* val, Boolean deep_p); void lw_destroy_widget (Widget w); void lw_destroy_all_widgets (LWLIB_ID id); void lw_destroy_everything (void); void lw_destroy_all_pop_ups (void); Widget lw_raise_all_pop_up_widgets (void); widget_value* lw_get_all_values (LWLIB_ID id); Boolean lw_get_some_values (LWLIB_ID id, widget_value* val); void lw_pop_up_all_widgets (LWLIB_ID id); void lw_pop_down_all_widgets (LWLIB_ID id); void lw_add_value_args_to_args (widget_value* wv, ArgList addto, int* offset); void lw_add_widget_value_arg (widget_value* wv, String name, XtArgVal value); XtArgVal lw_get_value_arg (widget_value* wv, String name); void lw_copy_widget_value_args (widget_value* copy, widget_value* val); widget_value * copy_widget_value_tree (widget_value *val, change_type change); widget_value *malloc_widget_value (void); void free_widget_value (widget_value *); void free_widget_value_tree (widget_value *wv); widget_value *replace_widget_value_tree (widget_value*, widget_value*); void lw_popup_menu (Widget, XEvent *); /* Toolkit independent way of focusing on a Widget at the Xt level. */ void lw_set_keyboard_focus (Widget parent, Widget w); /* Silly Energize hack to invert the "sheet" button */ void lw_show_busy (Widget w, Boolean busy); void lw_remove_accelerator_spec (char *val); #endif /* INCLUDED_lwlib_h_ */