repo: rxvt-unicode-sixel
action: commit
revision: 
path_from: 
revision_from: 0ab0152657b614deb766c6faae7df6d8f8f0741b:
path_to: 
revision_to: 

commit 0ab0152657b614deb766c6faae7df6d8f8f0741b
Author: Marc Lehmann 
Date:   Sat Dec 13 09:50:43 2014 +0000

    indent

diff --git a/src/main.C b/src/main.C

--- a/src/main.C
+++ b/src/main.C
@@ -293,6 +293,8 @@ rxvt_term::~rxvt_term ()
 #ifndef NO_RESOURCES
   XrmDestroyDatabase (option_db);
 #endif
+
+  SET_R ((rxvt_term *)0);
 }

 // child has exited, usually destroys
@@ -390,97 +392,97 @@ rxvt_emergency_cleanup ()
 static void ecb_cold
 print_x_error (Display *dpy, XErrorEvent *event)
 {
-    char buffer[BUFSIZ];
-    char mesg[BUFSIZ];
-    char number[32];
+  char buffer[BUFSIZ];
+  char mesg[BUFSIZ];
+  char number[32];

-    rxvt_warn ("An X Error occurred, trying to continue after report.\n");
+  rxvt_warn ("An X Error occurred, trying to continue after report.\n");

-    XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
-    snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
+  XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
+  snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);

-    XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
-    XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
-    rxvt_warn ("+ %s: %s\n", mesg, buffer);
+  XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
+  XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
+  rxvt_warn ("+ %s: %s\n", mesg, buffer);

-    XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
-    snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
+  XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
+  snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);

-    if (event->request_code >= 128)
-      {
+  if (event->request_code >= 128)
+    {
 #if 0
-        /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
-        int nexts;
-        char **exts = XListExtensions (dpy, &nexts);
+      /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
+      int nexts;
+      char **exts = XListExtensions (dpy, &nexts);

-        while (nexts)
-          {
-            char *extname = exts [nexts - 1];
-            int major, first_event, first_error;
+      while (nexts)
+        {
+          char *extname = exts [nexts - 1];
+          int major, first_event, first_error;

-            if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
-              {
-                XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
-                rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
+          if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
+            {
+              XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
+              rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);

-                snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
-                XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
-                rxvt_warn ("+ (which is %s)\n", buffer);
+              snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
+              XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
+              rxvt_warn ("+ (which is %s)\n", buffer);

-                break;
-              }
+              break;
+            }

-            printf ("nextss %d %s\n", nexts, extname);//D
-            --nexts;
-            ++exts;
-          }
+          printf ("nextss %d %s\n", nexts, extname);//D
+          --nexts;
+          ++exts;
+        }
 #else
-        int nexts = 0;
-        char **exts = 0;
+      int nexts = 0;
+      char **exts = 0;
 #endif

-        if (!nexts)
-          {
-            rxvt_warn ("+ (which is an unknown extension)\n", buffer);
+      if (!nexts)
+        {
+          rxvt_warn ("+ (which is an unknown extension)\n", buffer);

-            XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
-            snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
+          XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
+          snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);

 #if 0
-            sprintf (number, "RENDER.%d", event->minor_code);
-            XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
-            rxvt_warn ("+ (which is %s)\n", buffer);
+          sprintf (number, "RENDER.%d", event->minor_code);
+          XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
+          rxvt_warn ("+ (which is %s)\n", buffer);
 #endif
-          }
+        }

-        XFreeExtensionList (exts);
-      }
-    else
-      {
-        sprintf (number, "%d", event->request_code);
-        XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
-        rxvt_warn ("+ (which is %s)\n", buffer);
-      }
+      XFreeExtensionList (exts);
+    }
+  else
+    {
+      sprintf (number, "%d", event->request_code);
+      XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
+      rxvt_warn ("+ (which is %s)\n", buffer);
+    }

-    if (event->error_code == BadWindow
-        || event->error_code == BadPixmap
-        || event->error_code == BadCursor
-        || event->error_code == BadFont
-        || event->error_code == BadDrawable
-        || event->error_code == BadColor
-        || event->error_code == BadGC
-        || event->error_code == BadIDChoice
-        || event->error_code == BadValue
-        || event->error_code == BadAtom)
-      {
-        if (event->error_code == BadValue)
-          XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
-        else if (event->error_code == BadAtom)
-          XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
-        else
-          XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
-
-        snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
+  if (event->error_code == BadWindow
+      || event->error_code == BadPixmap
+      || event->error_code == BadCursor
+      || event->error_code == BadFont
+      || event->error_code == BadDrawable
+      || event->error_code == BadColor
+      || event->error_code == BadGC
+      || event->error_code == BadIDChoice
+      || event->error_code == BadValue
+      || event->error_code == BadAtom)
+    {
+      if (event->error_code == BadValue)
+        XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
+      else if (event->error_code == BadAtom)
+        XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
+      else
+        XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
+
+      snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
     }
 }
 #endif
@@ -488,7 +490,7 @@ print_x_error (Display *dpy, XErrorEvent *event)
 int ecb_cold
 rxvt_xerror_handler (Display *display, XErrorEvent *event)
 {
-  if (GET_R->allowedxerror == -1)
+  if (GET_R && GET_R->allowedxerror == -1)
     GET_R->allowedxerror = event->error_code;
   else
     {

-----END OF PAGE-----