-- Leo's gemini proxy

-- Connecting to git.thebackupbox.net:1965...

-- Connected

-- Sending request

-- Meta line: 20 text/gemini

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

commit ddb0fc463aa08e470865f736c0ac2409a391da5d
Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
Date:   Sun Dec 19 00:49:32 2010 +0000

    Simplify.

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

--- a/src/background.C
+++ b/src/background.C
@@ -1415,9 +1415,9 @@ bgPixmap_t::make_transparency_pixmap ()
 void
 bgPixmap_t::set_root_pixmap ()
 {
-  Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
+  Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
   if (new_root_pixmap == None)
-    new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
+    new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);

   root_pixmap = new_root_pixmap;
 }
diff --git a/src/main.C b/src/main.C

--- a/src/main.C
+++ b/src/main.C
@@ -1644,27 +1644,23 @@ rxvt_term::get_window_origin (int &x, int &y)
 }

 Pixmap
-rxvt_term::get_pixmap_property (int prop_id)
+rxvt_term::get_pixmap_property (Atom property)
 {
   Pixmap pixmap = None;

-  if (prop_id > 0 && prop_id < NUM_XA)
-    if (xa[prop_id])
-      {
-        int aformat;
-        unsigned long nitems, bytes_after;
-        Atom atype;
-        unsigned char *prop;
-        int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
-                                         0L, 1L, False, XA_PIXMAP, &atype, &aformat,
-                                         &nitems, &bytes_after, &prop);
-        if (result == Success)
-          {
-            if (atype == XA_PIXMAP)
-              pixmap = *(Pixmap *)prop;
-            XFree (prop);
-          }
-      }
+  int aformat;
+  unsigned long nitems, bytes_after;
+  Atom atype;
+  unsigned char *prop;
+  int result = XGetWindowProperty (dpy, display->root, property,
+                                   0L, 1L, False, XA_PIXMAP, &atype, &aformat,
+                                   &nitems, &bytes_after, &prop);
+  if (result == Success)
+    {
+      if (atype == XA_PIXMAP)
+        pixmap = *(Pixmap *)prop;
+      XFree (prop);
+    }

   return pixmap;
 }
diff --git a/src/rxvt.h b/src/rxvt.h

--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1336,7 +1336,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
   void alias_color (int dst, int src);
   void set_widthheight (unsigned int newwidth, unsigned int newheight);
   void get_window_origin (int &x, int &y);
-  Pixmap get_pixmap_property (int prop_id);
+  Pixmap get_pixmap_property (Atom property);

   // screen.C

-- Response ended

-- Page fetched on Sun Jun 2 13:34:53 2024