From: ayin <ayin>
Date: Fri, 23 Nov 2007 11:17:37 +0000 (+0000)
Subject: Add 'xrm' option.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=80b66cf975b78a4b6fc562ba517b7bb8bbb19806;p=dana%2Furxvt.git

Add 'xrm' option.
---

diff --git a/src/xdefaults.C b/src/xdefaults.C
index a3d0afc1..0331a73d 100644
--- a/src/xdefaults.C
+++ b/src/xdefaults.C
@@ -264,9 +264,6 @@ optList[] = {
 #ifdef HAVE_AFTERIMAGE
               STRG (Rs_blendtype, "blendType", "blt", "string", "background image blending type - alpha, tint, etc..."),
               STRG (Rs_blurradius, "blurRadius", "blr", "HxV", "Gaussian Blur radii to apply to the root background"),
-#endif
-#ifndef NO_RESOURCES
-              INFO ("xrm", "string", "X resource"),
 #endif
               INFO ("e", "command arg ...", "command to execute")
             };
@@ -563,6 +560,13 @@ rxvt_term::get_options (int argc, const char *const *argv)
                 rs[optList[entry].doff] = flag;
             }
         }
+#ifndef NO_RESOURCES
+      else if (!strcmp (opt, "xrm"))
+        {
+          if (i+1 < argc)
+            XrmPutLineResource (&option_db, argv[++i]);
+        }
+#endif
 #ifdef KEYSYM_RESOURCE
       else if (!strncmp (opt, "keysym.", sizeof ("keysym.") - 1))
         {