Mercurial > hg > xemacs-beta

diff src/gui.c @ 563:183866b06e0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-05-24 07:50:48 by ben] Makefile.in.in, abbrev.c, alloc.c, buffer.c, bytecode.c, callint.c, callproc.c, casetab.c, chartab.c, cmdloop.c, cmds.c, console-msw.c, console-msw.h, console-stream.c, console-tty.c, console-x.c, console.c, data.c, database.c, debug.c, device-gtk.c, device-msw.c, device-tty.c, device-x.c, device.c, dialog-gtk.c, dialog-msw.c, dialog-x.c, dialog.c, dired-msw.c, dired.c, doc.c, doprnt.c, dragdrop.c, editfns.c, eldap.c, eldap.h, elhash.c, emacs-widget-accessors.c, emacs.c, emodules.c, esd.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, filelock.c, floatfns.c, fns.c, font-lock.c, frame-gtk.c, frame-x.c, frame.c, general-slots.h, glade.c, glyphs-gtk.c, glyphs-msw.c, glyphs-widget.c, glyphs-x.c, glyphs.c, glyphs.h, gpmevent.c, gui-gtk.c, gui-x.c, gui.c, gutter.c, hpplay.c, indent.c, input-method-xlib.c, insdel.c, intl.c, keymap.c, libsst.c, libsst.h, linuxplay.c, lisp.h, lread.c, lstream.c, lstream.h, macros.c, marker.c, md5.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, menubar.c, minibuf.c, miscplay.c, miscplay.h, mule-ccl.c, mule-charset.c, mule-wnnfns.c, mule.c, nas.c, ntplay.c, ntproc.c, objects-gtk.c, objects-msw.c, objects-x.c, objects.c, postgresql.c, print.c, process-nt.c, process-unix.c, process.c, ralloc.c, rangetab.c, redisplay.c, scrollbar.c, search.c, select-gtk.c, select-x.c, select.c, sgiplay.c, sheap.c, sound.c, specifier.c, sunplay.c, symbols.c, symeval.h, symsinit.h, syntax.c, sysdep.c, toolbar-msw.c, toolbar.c, tooltalk.c, ui-byhand.c, ui-gtk.c, undo.c, unexaix.c, unexapollo.c, unexconvex.c, unexec.c, widget.c, win32.c, window.c: -- defsymbol -> DEFSYMBOL. -- add an error type to all errors. -- eliminate the error functions in eval.c that let you just use Qerror as the type. -- redo the error API to be more consistent, sensibly named, and easier to use. -- redo the error hierarchy somewhat. create new errors: structure-formation-error, gui-error, invalid-constant, stack-overflow, out-of-memory, process-error, network-error, sound-error, printing-unreadable-object, base64-conversion- error; coding-system-error renamed to text-conversion error; some others. -- fix Mule problems in error strings in emodules.c, tooltalk.c. -- fix error handling in mswin open-network-stream. -- Mule-ize all sound files and clean up the headers. -- nativesound.h -> sound.h and used for all sound files. -- move some shared stuff into glyphs-shared.c: first attempt at eliminating some of the massive GTK code duplication. xemacs.mak: add glyphs-shared.c. xemacs-faq.texi: document how to debug X errors subr.el: fix doc string to reflect reality
author ben
date Thu, 24 May 2001 07:51:33 +0000
parents d7a9135ec789
children 9cdcb214753f
line wrap: on
line diff
--- a/src/gui.c	Thu May 24 06:30:21 2001 +0000
+++ b/src/gui.c	Thu May 24 07:51:33 2001 +0000
@@ -39,6 +39,8 @@
 static Lisp_Object parse_gui_item_tree_list (Lisp_Object list);
 Lisp_Object find_keyword_in_vector (Lisp_Object vector, Lisp_Object keyword);
 
+Lisp_Object Qgui_error;
+
 #ifdef HAVE_POPUPS
 
 /* count of menus/dboxes currently up */
@@ -121,7 +123,7 @@
   int retval = 0;
 
   if (!KEYWORDP (key))
-    syntax_error_2 ("Non-keyword in gui item", key, pgui_item->name);
+    sferror_2 ("Non-keyword in gui item", key, pgui_item->name);
 
   if (EQ (key, Q_descriptor))
     {
@@ -162,11 +164,11 @@
 	  if (SYMBOLP (val) || CHARP (val))
 	    pgui_item->accelerator = val;
 	  else if (ERRB_EQ (errb, ERROR_ME))
-	    syntax_error ("Bad keyboard accelerator", val);
+	    invalid_argument ("Bad keyboard accelerator", val);
 	}
     }
   else if (ERRB_EQ (errb, ERROR_ME))
-    syntax_error_2 ("Unknown keyword in gui item", key,
+    invalid_argument_2 ("Unknown keyword in gui item", key,
 			   pgui_item->name);
   return retval;
 }
@@ -224,7 +226,7 @@
   contents = XVECTOR_DATA (item);
 
   if (length < 1)
-    syntax_error ("GUI item descriptors must be at least 1 elts long", item);
+    sferror ("GUI item descriptors must be at least 1 elts long", item);
 
   /* length 1:     		[ "name" ]
      length 2:		[ "name" callback ]
@@ -259,7 +261,7 @@
     {
       int i;
       if ((length - start) & 1)
-	syntax_error (
+	sferror (
 		"GUI item descriptor has an odd number of keywords and values",
 			     item);
 
@@ -287,12 +289,12 @@
   contents = XVECTOR_DATA (item);
 
   if (!NILP (desc) && !STRINGP (desc) && !VECTORP (desc))
-    syntax_error ("Invalid GUI item descriptor", item);
+    sferror ("Invalid GUI item descriptor", item);
 
   if (length & 1)
     {
       if (!SYMBOLP (contents [0]))
-	syntax_error ("Invalid GUI item descriptor", item);
+	sferror ("Invalid GUI item descriptor", item);
       contents++;			/* Ignore the leading symbol. */
       length--;
     }
@@ -321,7 +323,7 @@
  if (length & 1)
     {
       if (!SYMBOLP (contents [0]))
-	syntax_error ("Invalid GUI item descriptor", item);
+	sferror ("Invalid GUI item descriptor", item);
       contents++;			/* Ignore the leading symbol. */
       length--;
     }
@@ -486,7 +488,7 @@
 static DOESNT_RETURN
 signal_too_long_error (Lisp_Object name)
 {
-  syntax_error ("GUI item produces too long displayable string", name);
+  invalid_argument ("GUI item produces too long displayable string", name);
 }
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -699,7 +701,7 @@
   char buf[20];
 
   if (print_readably)
-    error ("printing unreadable object #<gui-item 0x%x>", g->header.uid);
+    printing_unreadable_object ("#<gui-item 0x%x>", g->header.uid);
 
   write_c_string ("#<gui-item ", printcharfun);
   sprintf (buf, "0x%x>", g->header.uid);
@@ -771,7 +773,7 @@
       CHECK_STRING (entry);
     }
   else
-    syntax_error ("item must be a vector or a string", entry);
+    sferror ("item must be a vector or a string", entry);
 
   RETURN_UNGCPRO (ret);
 }
@@ -823,6 +825,13 @@
 			       0,
 			       Lisp_Gui_Item);
 
+
+DOESNT_RETURN
+gui_error (const char *reason, Lisp_Object frob)
+{
+  signal_error (Qgui_error, reason, frob);
+}
+
 void
 syms_of_gui (void)
 {
@@ -830,6 +839,8 @@
 
   DEFSYMBOL (Qmenu_no_selection_hook);
 
+  DEFERROR_STANDARD (Qgui_error, Qio_error);
+
 #ifdef HAVE_POPUPS
   DEFSUBR (Fpopup_up_p);
 #endif