X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgui.c;h=00012a64468f0c6a28bc396c6d5e09ce84fc0ccf;hb=2bf45e07013c281a55bc509b24f5e83568f3d0fd;hp=2d4fb6d5663af1b0bf328c9b55116fc52cdc8a61;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1 diff --git a/src/gui.c b/src/gui.c index 2d4fb6d..00012a6 100644 --- a/src/gui.c +++ b/src/gui.c @@ -26,13 +26,16 @@ Boston, MA 02111-1307, USA. */ #include #include "lisp.h" #include "gui.h" -#include "bytecode.h" /* for struct Lisp_Compiled_Function */ +#include "elhash.h" +#include "bytecode.h" Lisp_Object Q_active, Q_suffix, Q_keys, Q_style, Q_selected; -Lisp_Object Q_filter, Q_config, Q_included; -Lisp_Object Q_accelerator; +Lisp_Object Q_filter, Q_config, Q_included, Q_key_sequence; +Lisp_Object Q_accelerator, Q_label, Q_callback; Lisp_Object Qtoggle, Qradio; +static Lisp_Object parse_gui_item_tree_list (Lisp_Object list); + #ifdef HAVE_POPUPS /* count of menus/dboxes currently up */ @@ -46,11 +49,12 @@ See `popup-menu' and `popup-dialog-box'. { return popup_up_p ? Qt : Qnil; } +#endif /* HAVE_POPUPS */ int -separator_string_p (CONST char *s) +separator_string_p (const char *s) { - CONST char *p; + const char *p; char first; if (!s || s[0] == '\0') @@ -72,7 +76,7 @@ get_gui_callback (Lisp_Object data, Lisp_Object *fn, Lisp_Object *arg) if (SYMBOLP (data) || (COMPILED_FUNCTIONP (data) && XCOMPILED_FUNCTION (data)->flags.interactivep) - || (EQ (XCAR (data), Qlambda) + || (CONSP (data) && (EQ (XCAR (data), Qlambda)) && !NILP (Fassq (Qinteractive, Fcdr (Fcdr (data)))))) { *fn = Qcall_interactively; @@ -95,34 +99,17 @@ get_gui_callback (Lisp_Object data, Lisp_Object *fn, Lisp_Object *arg) } /* - * Initialize the gui_item structure by setting all (GC-protected) - * fields to their default values. The defaults are t for :active and - * :included values, and nil for others. - */ -void -gui_item_init (struct gui_item *pgui_item) -{ - pgui_item->name = Qnil; - pgui_item->callback = Qnil; - pgui_item->suffix = Qnil; - pgui_item->active = Qt; - pgui_item->included = Qt; - pgui_item->config = Qnil; - pgui_item->filter = Qnil; - pgui_item->style = Qnil; - pgui_item->selected = Qnil; - pgui_item->keys = Qnil; -} - -/* * Add a value VAL associated with keyword KEY into PGUI_ITEM * structure. If KEY is not a keyword, or is an unknown keyword, then * error is signaled. */ void -gui_item_add_keyval_pair (struct gui_item *pgui_item, - Lisp_Object key, Lisp_Object val) +gui_item_add_keyval_pair (Lisp_Object gui_item, + Lisp_Object key, Lisp_Object val, + Error_behavior errb) { + Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); + if (!KEYWORDP (key)) signal_simple_error_2 ("Non-keyword in gui item", key, pgui_item->name); @@ -134,38 +121,93 @@ gui_item_add_keyval_pair (struct gui_item *pgui_item, else if (EQ (key, Q_style)) pgui_item->style = val; else if (EQ (key, Q_selected)) pgui_item->selected = val; else if (EQ (key, Q_keys)) pgui_item->keys = val; - else + else if (EQ (key, Q_callback)) pgui_item->callback = val; + else if (EQ (key, Q_key_sequence)) ; /* ignored for FSF compatibility */ + else if (EQ (key, Q_label)) ; /* ignored for 21.0 implement in 21.2 */ + else if (EQ (key, Q_accelerator)) + { + if (SYMBOLP (val) || CHARP (val)) + pgui_item->accelerator = val; + else if (ERRB_EQ (errb, ERROR_ME)) + signal_simple_error ("Bad keyboard accelerator", val); + } + else if (ERRB_EQ (errb, ERROR_ME)) signal_simple_error_2 ("Unknown keyword in gui item", key, pgui_item->name); } +void +gui_item_init (Lisp_Object gui_item) +{ + Lisp_Gui_Item *lp = XGUI_ITEM (gui_item); + + lp->name = Qnil; + lp->callback = Qnil; + lp->suffix = Qnil; + lp->active = Qt; + lp->included = Qt; + lp->config = Qnil; + lp->filter = Qnil; + lp->style = Qnil; + lp->selected = Qnil; + lp->keys = Qnil; + lp->accelerator = Qnil; +} + +Lisp_Object +allocate_gui_item (void) +{ + Lisp_Gui_Item *lp = alloc_lcrecord_type (Lisp_Gui_Item, &lrecord_gui_item); + Lisp_Object val; + + zero_lcrecord (lp); + XSETGUI_ITEM (val, lp); + + gui_item_init (val); + + return val; +} + /* * ITEM is a lisp vector, describing a menu item or a button. The * function extracts the description of the item into the PGUI_ITEM * structure. */ -void -gui_parse_item_keywords (Lisp_Object item, struct gui_item *pgui_item) +static Lisp_Object +make_gui_item_from_keywords_internal (Lisp_Object item, + Error_behavior errb) { - int length, plist_p; + int length, plist_p, start; Lisp_Object *contents; + Lisp_Object gui_item = allocate_gui_item (); + Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); CHECK_VECTOR (item); length = XVECTOR_LENGTH (item); contents = XVECTOR_DATA (item); - if (length < 2) - signal_simple_error ("GUI item descriptors must be at least 2 elts long", item); + if (length < 1) + signal_simple_error ("GUI item descriptors must be at least 1 elts long", item); - /* length 2: [ "name" callback ] + /* length 1: [ "name" ] + length 2: [ "name" callback ] length 3: [ "name" callback active-p ] + or [ "name" keyword value ] length 4: [ "name" callback active-p suffix ] or [ "name" callback keyword value ] length 5+: [ "name" callback [ keyword value ]+ ] + or [ "name" [ keyword value ]+ ] */ - plist_p = (length >= 5 || (length > 2 && KEYWORDP (contents [2]))); + plist_p = (length > 2 && (KEYWORDP (contents [1]) + || KEYWORDP (contents [2]))); pgui_item->name = contents [0]; - pgui_item->callback = contents [1]; + if (length > 1 && !KEYWORDP (contents [1])) + { + pgui_item->callback = contents [1]; + start = 2; + } + else + start =1; if (!plist_p && length > 2) /* the old way */ @@ -178,18 +220,59 @@ gui_parse_item_keywords (Lisp_Object item, struct gui_item *pgui_item) /* the new way */ { int i; - if (length & 1) + if ((length - start) & 1) signal_simple_error ( "GUI item descriptor has an odd number of keywords and values", item); - for (i = 2; i < length;) + for (i = start; i < length;) { Lisp_Object key = contents [i++]; Lisp_Object val = contents [i++]; - gui_item_add_keyval_pair (pgui_item, key, val); + gui_item_add_keyval_pair (gui_item, key, val, errb); } } + return gui_item; +} + +Lisp_Object +gui_parse_item_keywords (Lisp_Object item) +{ + return make_gui_item_from_keywords_internal (item, ERROR_ME); +} + +Lisp_Object +gui_parse_item_keywords_no_errors (Lisp_Object item) +{ + return make_gui_item_from_keywords_internal (item, ERROR_ME_NOT); +} + +/* convert a gui item into plist properties */ +void +gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item) +{ + Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); + + if (!NILP (pgui_item->callback)) + Fplist_put (plist, Q_callback, pgui_item->callback); + if (!NILP (pgui_item->suffix)) + Fplist_put (plist, Q_suffix, pgui_item->suffix); + if (!NILP (pgui_item->active)) + Fplist_put (plist, Q_active, pgui_item->active); + if (!NILP (pgui_item->included)) + Fplist_put (plist, Q_included, pgui_item->included); + if (!NILP (pgui_item->config)) + Fplist_put (plist, Q_config, pgui_item->config); + if (!NILP (pgui_item->filter)) + Fplist_put (plist, Q_filter, pgui_item->filter); + if (!NILP (pgui_item->style)) + Fplist_put (plist, Q_style, pgui_item->style); + if (!NILP (pgui_item->selected)) + Fplist_put (plist, Q_selected, pgui_item->selected); + if (!NILP (pgui_item->keys)) + Fplist_put (plist, Q_keys, pgui_item->keys); + if (!NILP (pgui_item->accelerator)) + Fplist_put (plist, Q_accelerator, pgui_item->accelerator); } /* @@ -197,13 +280,62 @@ gui_parse_item_keywords (Lisp_Object item, struct gui_item *pgui_item) * if any */ int -gui_item_active_p (CONST struct gui_item *pgui_item) +gui_item_active_p (Lisp_Object gui_item) { /* This function can call lisp */ /* Shortcut to avoid evaluating Qt each time */ - return (EQ (pgui_item->active, Qt) - || !NILP (Feval (pgui_item->active))); + return (EQ (XGUI_ITEM (gui_item)->active, Qt) + || !NILP (Feval (XGUI_ITEM (gui_item)->active))); +} + +/* set menu accelerator key to first underlined character in menu name */ +Lisp_Object +gui_item_accelerator (Lisp_Object gui_item) +{ + Lisp_Gui_Item* pgui = XGUI_ITEM (gui_item); + + if (!NILP (pgui->accelerator)) + return pgui->accelerator; + + else + return gui_name_accelerator (pgui->name); +} + +Lisp_Object +gui_name_accelerator (Lisp_Object nm) +{ + /* !!#### This function has not been Mule-ized */ + char* name = (char*)XSTRING_DATA (nm); + + while (*name) { + if (*name=='%') { + ++name; + if (!(*name)) + return Qnil; + if (*name=='_' && *(name+1)) + { + int accelerator = (int) (unsigned char) (*(name+1)); + return make_char (tolower (accelerator)); + } + } + ++name; + } + return Qnil; +} + +/* + * Decide whether a GUI item is selected by evaluating its :selected form + * if any + */ +int +gui_item_selected_p (Lisp_Object gui_item) +{ + /* This function can call lisp */ + + /* Shortcut to avoid evaluating Qt each time */ + return (EQ (XGUI_ITEM (gui_item)->selected, Qt) + || !NILP (Feval (XGUI_ITEM (gui_item)->selected))); } /* @@ -212,9 +344,10 @@ gui_item_active_p (CONST struct gui_item *pgui_item) * configuration variable */ int -gui_item_included_p (CONST struct gui_item *pgui_item, Lisp_Object conflist) +gui_item_included_p (Lisp_Object gui_item, Lisp_Object conflist) { /* This function can call lisp */ + Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); /* Evaluate :included first. Shortcut to avoid evaluating Qt each time */ if (!EQ (pgui_item->included, Qt) @@ -235,6 +368,7 @@ signal_too_long_error (Lisp_Object name) signal_simple_error ("GUI item produces too long displayable string", name); } +#ifdef HAVE_WINDOW_SYSTEM /* * Format "left flush" display portion of an item into BUF, guarded by * maximum buffer size BUF_LEN. BUF_LEN does not count for terminating @@ -245,11 +379,13 @@ signal_too_long_error (Lisp_Object name) * buffer. */ unsigned int -gui_item_display_flush_left (CONST struct gui_item *pgui_item, +gui_item_display_flush_left (Lisp_Object gui_item, char* buf, Bytecount buf_len) { + /* This function can call lisp */ char *p = buf; Bytecount len; + Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); /* Copy item name first */ CHECK_STRING (pgui_item->name); @@ -292,14 +428,17 @@ gui_item_display_flush_left (CONST struct gui_item *pgui_item, * buffer. */ unsigned int -gui_item_display_flush_right (CONST struct gui_item *pgui_item, +gui_item_display_flush_right (Lisp_Object gui_item, char* buf, Bytecount buf_len) { + Lisp_Gui_Item* pgui_item = XGUI_ITEM (gui_item); *buf = 0; +#ifdef HAVE_MENUBARS /* Have keys? */ if (!menubar_show_keybindings) return 0; +#endif /* Try :keys first */ if (!NILP (pgui_item->keys)) @@ -307,7 +446,7 @@ gui_item_display_flush_right (CONST struct gui_item *pgui_item, CHECK_STRING (pgui_item->keys); if (XSTRING_LENGTH (pgui_item->keys) > buf_len) signal_too_long_error (pgui_item->name); - strcpy (buf, (CONST char *) XSTRING_DATA (pgui_item->keys)); + strcpy (buf, (const char *) XSTRING_DATA (pgui_item->keys)); return XSTRING_LENGTH (pgui_item->keys); } @@ -328,21 +467,178 @@ gui_item_display_flush_right (CONST struct gui_item *pgui_item, /* No keys - no right flush display */ return 0; } +#endif /* HAVE_WINDOW_SYSTEM */ -#endif /* HAVE_POPUPS */ +static Lisp_Object +mark_gui_item (Lisp_Object obj) +{ + Lisp_Gui_Item *p = XGUI_ITEM (obj); + + mark_object (p->name); + mark_object (p->callback); + mark_object (p->config); + mark_object (p->suffix); + mark_object (p->active); + mark_object (p->included); + mark_object (p->config); + mark_object (p->filter); + mark_object (p->style); + mark_object (p->selected); + mark_object (p->keys); + mark_object (p->accelerator); + + return Qnil; +} + +static unsigned long +gui_item_hash (Lisp_Object obj, int depth) +{ + Lisp_Gui_Item *p = XGUI_ITEM (obj); + + return HASH2 (HASH5 (internal_hash (p->name, depth + 1), + internal_hash (p->callback, depth + 1), + internal_hash (p->suffix, depth + 1), + internal_hash (p->active, depth + 1), + internal_hash (p->included, depth + 1)), + HASH5 (internal_hash (p->config, depth + 1), + internal_hash (p->filter, depth + 1), + internal_hash (p->style, depth + 1), + internal_hash (p->selected, depth + 1), + internal_hash (p->keys, depth + 1))); +} + +int +gui_item_id_hash (Lisp_Object hashtable, Lisp_Object gitem, int slot) +{ + int hashid = gui_item_hash (gitem, 0); + int id = GUI_ITEM_ID_BITS (hashid, slot); + while (!NILP (Fgethash (make_int (id), + hashtable, Qnil))) + { + id = GUI_ITEM_ID_BITS (id + 1, slot); + } + return id; +} + +static int +gui_item_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +{ + Lisp_Gui_Item *p1 = XGUI_ITEM (obj1); + Lisp_Gui_Item *p2 = XGUI_ITEM (obj2); + + if (!(internal_equal (p1->name, p2->name, depth + 1) + && + internal_equal (p1->callback, p2->callback, depth + 1) + && + EQ (p1->suffix, p2->suffix) + && + EQ (p1->active, p2->active) + && + EQ (p1->included, p2->included) + && + EQ (p1->config, p2->config) + && + EQ (p1->filter, p2->filter) + && + EQ (p1->style, p2->style) + && + EQ (p1->selected, p2->selected) + && + EQ (p1->accelerator, p2->accelerator) + && + EQ (p1->keys, p2->keys))) + return 0; + return 1; +} + +static void +print_gui_item (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) +{ + Lisp_Gui_Item *g = XGUI_ITEM (obj); + char buf[20]; + + if (print_readably) + error ("printing unreadable object #", g->header.uid); + + write_c_string ("#", g->header.uid); + write_c_string (buf, printcharfun); +} + +/* parse a glyph descriptor into a tree of gui items. + + The gui_item slot of an image instance can be a single item or an + arbitrarily nested hierarchy of item lists. */ + +static Lisp_Object parse_gui_item_tree_item (Lisp_Object entry) +{ + Lisp_Object ret = entry; + if (VECTORP (entry)) + { + ret = gui_parse_item_keywords_no_errors (entry); + } + else if (STRINGP (entry)) + { + CHECK_STRING (entry); + } + else + signal_simple_error ("item must be a vector or a string", entry); + + return ret; +} + +Lisp_Object parse_gui_item_tree_children (Lisp_Object list) +{ + Lisp_Object rest, ret = Qnil; + CHECK_CONS (list); + /* recursively add items to the tree view */ + LIST_LOOP (rest, list) + { + Lisp_Object sub; + if (CONSP (XCAR (rest))) + sub = parse_gui_item_tree_list (XCAR (rest)); + else + sub = parse_gui_item_tree_item (XCAR (rest)); + + ret = Fcons (sub, ret); + } + /* make the order the same as the items we have parsed */ + return Fnreverse (ret); +} + +static Lisp_Object parse_gui_item_tree_list (Lisp_Object list) +{ + Lisp_Object ret; + CHECK_CONS (list); + /* first one can never be a list */ + ret = parse_gui_item_tree_item (XCAR (list)); + return Fcons (ret, parse_gui_item_tree_children (XCDR (list))); +} + +DEFINE_LRECORD_IMPLEMENTATION ("gui-item", gui_item, + mark_gui_item, print_gui_item, + 0, gui_item_equal, + gui_item_hash, + 0, + Lisp_Gui_Item); void syms_of_gui (void) { + INIT_LRECORD_IMPLEMENTATION (gui_item); + defkeyword (&Q_active, ":active"); defkeyword (&Q_suffix, ":suffix"); defkeyword (&Q_keys, ":keys"); + defkeyword (&Q_key_sequence,":key-sequence"); defkeyword (&Q_style, ":style"); defkeyword (&Q_selected, ":selected"); defkeyword (&Q_filter, ":filter"); defkeyword (&Q_config, ":config"); defkeyword (&Q_included, ":included"); defkeyword (&Q_accelerator, ":accelerator"); + defkeyword (&Q_label, ":label"); + defkeyword (&Q_callback, ":callback"); defsymbol (&Qtoggle, "toggle"); defsymbol (&Qradio, "radio");