[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvttoolkit.h

Comparing rxvt-unicode/src/rxvttoolkit.h (file contents):
Revision 1.64 by root, Thu Jun 7 16:04:31 2012 UTC vs.
Revision 1.69 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

 #endif
 #if USE_XIM
   XA_WM_LOCALE_NAME,
   XA_XIM_SERVERS,
 #endif
-#if ENABLE_TRANSPARENCY
+#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
   XA_XROOTPMAP_ID,
   XA_ESETROOT_PMAP_ID,
 #endif
 #if ENABLE_XEMBED
   XA_XEMBED,
   void select_visual (int id);
   void select_depth (int bitdepth); // select visual by depth
   void clear ();
 };
-enum {
+enum
+{
   DISPLAY_HAS_RENDER      = 1 << 0,
-  DISPLAY_HAS_RENDER_10   = 1 << 1,
-  DISPLAY_HAS_RENDER_MUL  = 1 << 2,
-  DISPLAY_HAS_RENDER_CONV = 1 << 3,
+  DISPLAY_HAS_RENDER_CONV = 1 << 1,
 };
 struct rxvt_display : refcounted
 {
   event_vec<xevent_watcher> xw;
 typedef unsigned long Pixel;
 struct rgba
 {
-  unsigned short r, g, b, a;
+  uint16_t r, g, b, a;
   enum { MIN_CC = 0x0000, MAX_CC  = 0xffff };
   rgba ()
   { }
-  rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
+  rgba (uint16_t r, uint16_t g, uint16_t b, uint16_t a = MAX_CC)
   : r(r), g(g), b(b), a(a)
   { }
 };
 struct rxvt_color
   }
   bool alloc (rxvt_screen *screen, const rgba &color);
   void free (rxvt_screen *screen);
+  operator rgba () const
+  {
+    rgba c;
+    get (c);
+    return c;
+  }
   void get (rgba &color) const;
   void get (XColor &color) const;
   bool set (rxvt_screen *screen, const char *name);
   bool set (rxvt_screen *screen, const rgba &color);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines