X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fgui.c;h=2b4e6dfa083b0d3b91f4480d4b592a3abbf23076;hp=47e21a5114676ab8c4d3ceca45780a0a8444f012;hb=414b512c0774e67ba8e160b605447d862d3be166;hpb=76759ab036458c54499a454399e19602b8ae6ce3 diff --git a/src/gui.c b/src/gui.c index 47e21a5..2b4e6df 100644 --- a/src/gui.c +++ b/src/gui.c @@ -23,6 +23,9 @@ Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ +/* This file not quite Mule-ized yet but will be when merged with my + Mule workspace. --ben */ + #include #include "lisp.h" #include "gui.h" @@ -30,12 +33,11 @@ Boston, MA 02111-1307, USA. */ #include "buffer.h" #include "bytecode.h" -Lisp_Object Q_active, Q_suffix, Q_keys, Q_style, Q_selected; -Lisp_Object Q_filter, Q_config, Q_included, Q_key_sequence; -Lisp_Object Q_accelerator, Q_label, Q_callback, Q_callback_ex, Q_value; -Lisp_Object Qtoggle, Qradio; +Lisp_Object Qmenu_no_selection_hook; +Lisp_Object Vmenu_no_selection_hook; static Lisp_Object parse_gui_item_tree_list (Lisp_Object list); +Lisp_Object find_keyword_in_vector (Lisp_Object vector, Lisp_Object keyword); #ifdef HAVE_POPUPS @@ -53,10 +55,10 @@ See `popup-menu' and `popup-dialog-box'. #endif /* HAVE_POPUPS */ int -separator_string_p (const char *s) +separator_string_p (const Bufbyte *s) { - const char *p; - char first; + const Bufbyte *p; + Bufbyte first; if (!s || s[0] == '\0') return 0; @@ -110,39 +112,63 @@ get_gui_callback (Lisp_Object data, Lisp_Object *fn, Lisp_Object *arg) * structure. If KEY is not a keyword, or is an unknown keyword, then * error is signaled. */ -void +int 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); + int retval = 0; if (!KEYWORDP (key)) - signal_simple_error_2 ("Non-keyword in gui item", key, pgui_item->name); - - if (EQ (key, Q_suffix)) pgui_item->suffix = val; - else if (EQ (key, Q_active)) pgui_item->active = val; - else if (EQ (key, Q_included)) pgui_item->included = val; - else if (EQ (key, Q_config)) pgui_item->config = val; - else if (EQ (key, Q_filter)) pgui_item->filter = val; - 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 if (EQ (key, Q_callback)) pgui_item->callback = val; - else if (EQ (key, Q_callback_ex)) pgui_item->callback_ex = val; - else if (EQ (key, Q_value)) pgui_item->value = val; + syntax_error_2 ("Non-keyword in gui item", key, pgui_item->name); + + if (EQ (key, Q_descriptor)) + { + if (!EQ (pgui_item->name, val)) + { + retval = 1; + pgui_item->name = val; + } + } +#define FROB(slot) \ + else if (EQ (key, Q_##slot)) \ + { \ + if (!EQ (pgui_item->slot, val)) \ + { \ + retval = 1; \ + pgui_item->slot = val; \ + } \ + } + FROB (suffix) + FROB (active) + FROB (included) + FROB (config) + FROB (filter) + FROB (style) + FROB (selected) + FROB (keys) + FROB (callback) + FROB (callback_ex) + FROB (value) +#undef FROB 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); + if (!EQ (pgui_item->accelerator, val)) + { + retval = 1; + if (SYMBOLP (val) || CHARP (val)) + pgui_item->accelerator = val; + else if (ERRB_EQ (errb, ERROR_ME)) + syntax_error ("Bad keyboard accelerator", val); + } } else if (ERRB_EQ (errb, ERROR_ME)) - signal_simple_error_2 ("Unknown keyword in gui item", key, + syntax_error_2 ("Unknown keyword in gui item", key, pgui_item->name); + return retval; } void @@ -198,7 +224,7 @@ make_gui_item_from_keywords_internal (Lisp_Object item, contents = XVECTOR_DATA (item); if (length < 1) - signal_simple_error ("GUI item descriptors must be at least 1 elts long", item); + syntax_error ("GUI item descriptors must be at least 1 elts long", item); /* length 1: [ "name" ] length 2: [ "name" callback ] @@ -233,7 +259,7 @@ make_gui_item_from_keywords_internal (Lisp_Object item, { int i; if ((length - start) & 1) - signal_simple_error ( + syntax_error ( "GUI item descriptor has an odd number of keywords and values", item); @@ -247,6 +273,69 @@ make_gui_item_from_keywords_internal (Lisp_Object item, return gui_item; } +/* This will only work with descriptors in the new format. */ +Lisp_Object +widget_gui_parse_item_keywords (Lisp_Object item) +{ + int i, length; + Lisp_Object *contents; + Lisp_Object gui_item = allocate_gui_item (); + Lisp_Object desc = find_keyword_in_vector (item, Q_descriptor); + + CHECK_VECTOR (item); + length = XVECTOR_LENGTH (item); + contents = XVECTOR_DATA (item); + + if (!NILP (desc) && !STRINGP (desc) && !VECTORP (desc)) + syntax_error ("Invalid GUI item descriptor", item); + + if (length & 1) + { + if (!SYMBOLP (contents [0])) + syntax_error ("Invalid GUI item descriptor", item); + contents++; /* Ignore the leading symbol. */ + length--; + } + + for (i = 0; i < length;) + { + Lisp_Object key = contents [i++]; + Lisp_Object val = contents [i++]; + gui_item_add_keyval_pair (gui_item, key, val, ERROR_ME_NOT); + } + + return gui_item; +} + +/* Update a gui item from a partial descriptor. */ +int +update_gui_item_keywords (Lisp_Object gui_item, Lisp_Object item) +{ + int i, length, retval = 0; + Lisp_Object *contents; + + CHECK_VECTOR (item); + length = XVECTOR_LENGTH (item); + contents = XVECTOR_DATA (item); + + if (length & 1) + { + if (!SYMBOLP (contents [0])) + syntax_error ("Invalid GUI item descriptor", item); + contents++; /* Ignore the leading symbol. */ + length--; + } + + for (i = 0; i < length;) + { + Lisp_Object key = contents [i++]; + Lisp_Object val = contents [i++]; + if (gui_item_add_keyval_pair (gui_item, key, val, ERROR_ME_NOT)) + retval = 1; + } + return retval; +} + Lisp_Object gui_parse_item_keywords (Lisp_Object item) { @@ -357,6 +446,19 @@ gui_item_selected_p (Lisp_Object gui_item) || !NILP (Feval (XGUI_ITEM (gui_item)->selected))); } +Lisp_Object +gui_item_list_find_selected (Lisp_Object gui_item_list) +{ + /* This function can GC. */ + Lisp_Object rest; + LIST_LOOP (rest, gui_item_list) + { + if (gui_item_selected_p (XCAR (rest))) + return XCAR (rest); + } + return XCAR (gui_item_list); +} + /* * Decide whether a GUI item is included by evaluating its :included * form if given, and testing its :config form against supplied CONFLIST @@ -384,7 +486,7 @@ gui_item_included_p (Lisp_Object gui_item, Lisp_Object conflist) static DOESNT_RETURN signal_too_long_error (Lisp_Object name) { - signal_simple_error ("GUI item produces too long displayable string", name); + syntax_error ("GUI item produces too long displayable string", name); } #ifdef HAVE_WINDOW_SYSTEM @@ -544,8 +646,8 @@ gui_item_id_hash (Lisp_Object hashtable, Lisp_Object gitem, int slot) return id; } -static int -gui_item_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) +int +gui_item_equal_sans_selected (Lisp_Object obj1, Lisp_Object obj2, int depth) { Lisp_Gui_Item *p1 = XGUI_ITEM (obj1); Lisp_Gui_Item *p2 = XGUI_ITEM (obj2); @@ -568,8 +670,6 @@ gui_item_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) && EQ (p1->style, p2->style) && - EQ (p1->selected, p2->selected) - && EQ (p1->accelerator, p2->accelerator) && EQ (p1->keys, p2->keys) @@ -579,6 +679,19 @@ gui_item_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) return 1; } +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 (!(gui_item_equal_sans_selected (obj1, obj2, depth) + && + EQ (p1->selected, p2->selected))) + return 0; + return 1; +} + static void print_gui_item (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { @@ -593,7 +706,7 @@ print_gui_item (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) write_c_string (buf, printcharfun); } -static Lisp_Object +Lisp_Object copy_gui_item (Lisp_Object gui_item) { Lisp_Object ret = allocate_gui_item (); @@ -632,7 +745,7 @@ copy_gui_item_tree (Lisp_Object arg) } else if (GUI_ITEMP (arg)) return copy_gui_item (arg); - else + else return arg; } @@ -658,7 +771,7 @@ parse_gui_item_tree_item (Lisp_Object entry) CHECK_STRING (entry); } else - signal_simple_error ("item must be a vector or a string", entry); + syntax_error ("item must be a vector or a string", entry); RETURN_UNGCPRO (ret); } @@ -715,23 +828,7 @@ 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"); - defkeyword (&Q_callback_ex, ":callback-ex"); - defkeyword (&Q_value, ":value"); - - defsymbol (&Qtoggle, "toggle"); - defsymbol (&Qradio, "radio"); + DEFSYMBOL (Qmenu_no_selection_hook); #ifdef HAVE_POPUPS DEFSUBR (Fpopup_up_p); @@ -741,4 +838,9 @@ syms_of_gui (void) void vars_of_gui (void) { + DEFVAR_LISP ("menu-no-selection-hook", &Vmenu_no_selection_hook /* +Function or functions to call when a menu or dialog box is dismissed +without a selection having been made. +*/ ); + Vmenu_no_selection_hook = Qnil; }