[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.342 by root, Mon Dec 15 02:04:02 2014 UTC vs.
Revision 1.344 by sf-exg, Tue Jun 16 11:58:26 2015 UTC

 #include <limits>
 #include <signal.h>
 #include <fcntl.h>
+#ifdef HAVE_XMU
+# include <X11/Xmu/CurUtil.h>
+#endif
 #ifdef HAVE_XSETLOCALE
 # define X_LOCALE
 # include <X11/Xlocale.h>
 #else
 }
 void
 rxvt_term::set_icon (const char *file)
 {
-#if HAVE_PIXBUF
+#if HAVE_PIXBUF && ENABLE_EWMH
   GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
   if (!pixbuf)
     {
       rxvt_warn ("Loading image icon failed, continuing without.\n");
       return;
                 | ExposureMask | StructureNotifyMask);
   termwin_ev.start (display, top);
   /* vt cursor: Black-on-White is standard, but this is more popular */
+  unsigned int shape = XC_xterm;
+#ifdef HAVE_XMU
+  if (rs[Rs_pointerShape])
+    {
+      int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
+      if (stmp >= 0)
+        shape = stmp;
+    }
+#endif
-  TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
+  TermWin_cursor = XCreateFontCursor (dpy, shape);
   /* the vt window */
   vt = XCreateSimpleWindow (dpy, top,
                             window_vt_x, window_vt_y,
                             vt_width, vt_height,

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