X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=src%2Fgui.c;h=5ec1628e29dcb7d24f67ce9f32db7be9204695ba;hp=d1a546e33e8273837fa7a39e391c00959af9e972;hb=34360e98c9689b0a7eedab93e14df13281141bbd;hpb=2fd9701a4f902054649dde9143a3f77809afee8f diff --git a/src/gui.c b/src/gui.c index d1a546e..5ec1628 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,10 +33,8 @@ 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; -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); @@ -53,10 +54,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; @@ -74,11 +75,17 @@ separator_string_p (const char *s) void get_gui_callback (Lisp_Object data, Lisp_Object *fn, Lisp_Object *arg) { - if (SYMBOLP (data) - || (COMPILED_FUNCTIONP (data) - && XCOMPILED_FUNCTION (data)->flags.interactivep) - || (CONSP (data) && (EQ (XCAR (data), Qlambda)) - && !NILP (Fassq (Qinteractive, Fcdr (Fcdr (data)))))) + if (EQ (data, Qquit)) + { + *fn = Qeval; + *arg = list3 (Qsignal, list2 (Qquote, Qquit), Qnil); + Vquit_flag = Qt; + } + else if (SYMBOLP (data) + || (COMPILED_FUNCTIONP (data) + && XCOMPILED_FUNCTION (data)->flags.interactivep) + || (CONSP (data) && (EQ (XCAR (data), Qlambda)) + && !NILP (Fassq (Qinteractive, Fcdr (Fcdr (data)))))) { *fn = Qcall_interactively; *arg = data; @@ -112,7 +119,7 @@ gui_item_add_keyval_pair (Lisp_Object gui_item, 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); + syntax_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; @@ -122,7 +129,9 @@ gui_item_add_keyval_pair (Lisp_Object gui_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 if (EQ (key, Q_callback)) pgui_item->callback = 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; 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)) @@ -130,10 +139,10 @@ gui_item_add_keyval_pair (Lisp_Object gui_item, if (SYMBOLP (val) || CHARP (val)) pgui_item->accelerator = val; else if (ERRB_EQ (errb, ERROR_ME)) - signal_simple_error ("Bad keyboard accelerator", val); + 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); } @@ -144,6 +153,7 @@ gui_item_init (Lisp_Object gui_item) lp->name = Qnil; lp->callback = Qnil; + lp->callback_ex = Qnil; lp->suffix = Qnil; lp->active = Qt; lp->included = Qt; @@ -153,6 +163,7 @@ gui_item_init (Lisp_Object gui_item) lp->selected = Qnil; lp->keys = Qnil; lp->accelerator = Qnil; + lp->value = Qnil; } Lisp_Object @@ -188,7 +199,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 ] @@ -223,7 +234,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); @@ -257,6 +268,8 @@ gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item) if (!NILP (pgui_item->callback)) Fplist_put (plist, Q_callback, pgui_item->callback); + if (!NILP (pgui_item->callback_ex)) + Fplist_put (plist, Q_callback_ex, pgui_item->callback_ex); if (!NILP (pgui_item->suffix)) Fplist_put (plist, Q_suffix, pgui_item->suffix); if (!NILP (pgui_item->active)) @@ -275,6 +288,8 @@ gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item) Fplist_put (plist, Q_keys, pgui_item->keys); if (!NILP (pgui_item->accelerator)) Fplist_put (plist, Q_accelerator, pgui_item->accelerator); + if (!NILP (pgui_item->value)) + Fplist_put (plist, Q_value, pgui_item->value); } /* @@ -343,6 +358,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 @@ -370,7 +398,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 @@ -482,6 +510,7 @@ mark_gui_item (Lisp_Object obj) mark_object (p->name); mark_object (p->callback); + mark_object (p->callback_ex); mark_object (p->config); mark_object (p->suffix); mark_object (p->active); @@ -492,50 +521,34 @@ mark_gui_item (Lisp_Object obj) mark_object (p->selected); mark_object (p->keys); mark_object (p->accelerator); + mark_object (p->value); return Qnil; } static unsigned long -gui_item_hash_internal (Lisp_Object obj, int depth) +gui_item_hash (Lisp_Object obj, int depth) { Lisp_Gui_Item *p = XGUI_ITEM (obj); - return HASH2 (HASH5 (internal_hash (p->name, depth + 1), + return HASH2 (HASH6 (internal_hash (p->name, depth + 1), internal_hash (p->callback, depth + 1), + internal_hash (p->callback_ex, 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), + HASH6 (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))); -} - -static unsigned long -gui_item_hash (Lisp_Object obj, int depth) -{ - Lisp_Gui_Item *p = XGUI_ITEM (obj); - - /* Note that this evaluates the active and selected slots so that - the hash changes when the result of these changes. */ - return HASH2 (HASH5 (internal_hash (p->name, depth + 1), - internal_hash (p->callback, depth + 1), - internal_hash (p->suffix, depth + 1), - gui_item_active_p (obj), - 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), - gui_item_selected_p (obj), - internal_hash (p->keys, depth + 1))); + internal_hash (p->keys, depth + 1), + internal_hash (p->value, depth + 1))); } int gui_item_id_hash (Lisp_Object hashtable, Lisp_Object gitem, int slot) { - int hashid = gui_item_hash_internal (gitem, 0); + int hashid = gui_item_hash (gitem, 0); int id = GUI_ITEM_ID_BITS (hashid, slot); while (!NILP (Fgethash (make_int (id), hashtable, Qnil))) @@ -545,8 +558,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); @@ -555,6 +568,8 @@ gui_item_equal (Lisp_Object obj1, Lisp_Object obj2, int depth) && internal_equal (p1->callback, p2->callback, depth + 1) && + internal_equal (p1->callback_ex, p2->callback_ex, depth + 1) + && EQ (p1->suffix, p2->suffix) && EQ (p1->active, p2->active) @@ -567,11 +582,24 @@ 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))) + EQ (p1->keys, p2->keys) + && + EQ (p1->value, p2->value))) + return 0; + 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; } @@ -590,6 +618,49 @@ print_gui_item (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) write_c_string (buf, printcharfun); } +static Lisp_Object +copy_gui_item (Lisp_Object gui_item) +{ + Lisp_Object ret = allocate_gui_item (); + Lisp_Gui_Item *lp, *g = XGUI_ITEM (gui_item); + + lp = XGUI_ITEM (ret); + lp->name = g->name; + lp->callback = g->callback; + lp->callback_ex = g->callback_ex; + lp->suffix = g->suffix; + lp->active = g->active; + lp->included = g->included; + lp->config = g->config; + lp->filter = g->filter; + lp->style = g->style; + lp->selected = g->selected; + lp->keys = g->keys; + lp->accelerator = g->accelerator; + lp->value = g->value; + + return ret; +} + +Lisp_Object +copy_gui_item_tree (Lisp_Object arg) +{ + if (CONSP (arg)) + { + Lisp_Object rest = arg = Fcopy_sequence (arg); + while (CONSP (rest)) + { + XCAR (rest) = copy_gui_item_tree (XCAR (rest)); + rest = XCDR (rest); + } + return arg; + } + else if (GUI_ITEMP (arg)) + return copy_gui_item (arg); + else + return arg; +} + /* 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 @@ -612,7 +683,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); } @@ -669,21 +740,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"); - - defsymbol (&Qtoggle, "toggle"); - defsymbol (&Qradio, "radio"); + DEFSYMBOL (Qmenu_no_selection_hook); #ifdef HAVE_POPUPS DEFSUBR (Fpopup_up_p); @@ -693,4 +750,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; }