#include <config.h>
#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, Q_key_sequence;
-Lisp_Object Q_accelerator, Q_label;
+Lisp_Object Q_accelerator, Q_label, Q_callback;
Lisp_Object Qtoggle, Qradio;
#ifdef HAVE_POPUPS
{
return popup_up_p ? Qt : Qnil;
}
+#endif /* HAVE_POPUPS */
int
separator_string_p (CONST char *s)
*/
void
gui_item_add_keyval_pair (struct gui_item *pgui_item,
- Lisp_Object key, Lisp_Object val)
+ Lisp_Object key, Lisp_Object val,
+ Error_behavior errb)
{
if (!KEYWORDP (key))
signal_simple_error_2 ("Non-keyword in gui item", key, pgui_item->name);
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_key_sequence)) ; /* ignored for FSF compatability */
else if (EQ (key, Q_label)) ; /* ignored for 21.0 implement in 21.2 */
- else
+ else if (ERRB_EQ (errb, ERROR_ME))
signal_simple_error_2 ("Unknown keyword in gui item", key, pgui_item->name);
}
* 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 void
+gui_parse_item_keywords_internal (Lisp_Object item, struct gui_item *pgui_item,
+ Error_behavior errb)
{
- int length, plist_p;
+ int length, plist_p, start;
Lisp_Object *contents;
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 */
/* 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 (pgui_item, key, val, errb);
}
}
}
+void
+gui_parse_item_keywords (Lisp_Object item, struct gui_item *pgui_item)
+{
+ gui_parse_item_keywords_internal (item, pgui_item, ERROR_ME);
+}
+
+void
+gui_parse_item_keywords_no_errors (Lisp_Object item, struct gui_item *pgui_item)
+{
+ gui_parse_item_keywords_internal (item, pgui_item, ERROR_ME_NOT);
+}
+
/*
* Decide whether a GUI item is active by evaluating its :active form
* if any
}
/*
+ * Decide whether a GUI item is selected by evaluating its :selected form
+ * if any
+ */
+int
+gui_item_selected_p (CONST struct gui_item *pgui_item)
+{
+ /* This function can call lisp */
+
+ /* Shortcut to avoid evaluating Qt each time */
+ return (EQ (pgui_item->selected, Qt)
+ || !NILP (Feval (pgui_item->selected)));
+}
+
+/*
* Decide whether a GUI item is included by evaluating its :included
* form if given, and testing its :config form against supplied CONFLIST
* configuration variable
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
/* No keys - no right flush display */
return 0;
}
+#endif /* HAVE_WINDOW_SYSTEM */
-#endif /* HAVE_POPUPS */
+Lisp_Object
+mark_gui_item (struct gui_item* p, void (*markobj) (Lisp_Object))
+{
+ markobj (p->name);
+ markobj (p->callback);
+ markobj (p->suffix);
+ markobj (p->active);
+ markobj (p->included);
+ markobj (p->config);
+ markobj (p->filter);
+ markobj (p->style);
+ markobj (p->selected);
+ markobj (p->keys);
+
+ return Qnil;
+}
+
+int
+gui_item_hash (Lisp_Object hashtable, struct gui_item* g, int slot)
+{
+ int hashid = HASH2 (internal_hash (g->callback, 0), internal_hash (g->name, 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;
+}
void
syms_of_gui (void)
defkeyword (&Q_included, ":included");
defkeyword (&Q_accelerator, ":accelerator");
defkeyword (&Q_label, ":label");
+ defkeyword (&Q_callback, ":callback");
defsymbol (&Qtoggle, "toggle");
defsymbol (&Qradio, "radio");
projects / chise / xemacs-chise.git.1 / blobdiff