--- rxvt-unicode/src/rxvt.h	2005/02/21 19:26:07	1.153
+++ rxvt-unicode/src/rxvt.h	2005/06/18 09:02:37	1.158
@@ -24,6 +24,7 @@
 #if ENABLE_FRILLS
 # define ENABLE_XEMBED 1
 # define ENABLE_EWMH   1
+# define CURSOR_BLINK  1
 #endif
 
 /*
@@ -138,7 +139,7 @@
 /* If we're using either the rxvt scrollbar or menu bars, keep the
  * scrollColor resource.
  */
-#if defined(RXVT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
+#if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(MENUBAR) || defined(PLAIN_SCROLLBAR)
 # define KEEP_SCROLLCOLOR 1
 #else
 # undef KEEP_SCROLLCOLOR
@@ -268,10 +269,10 @@
 #define R_SB_ALIGN_TOP          1
 #define R_SB_ALIGN_BOTTOM       2
 
-#define R_SB_RXVT               0
 #define R_SB_NEXT               1
 #define R_SB_XTERM              2
 #define R_SB_PLAIN              4
+#define R_SB_RXVT               8
 
 #define SB_WIDTH_NEXT           19
 #define SB_WIDTH_XTERM          15
@@ -645,6 +646,10 @@
   Rs_borderLess,
   Rs_lineSpace,
   Rs_pty_fd,
+  Rs_cursorUnderline,
+#endif
+#if CURSOR_BLINK
+  Rs_cursorBlink,
 #endif
 #if ENABLE_XEMBED
   Rs_embed,
@@ -654,7 +659,6 @@
   Rs_answerbackstring,
   Rs_tripleclickwords,
   Rs_insecure,
-  Rs_cursorBlink,
   Rs_pointerBlank,
   Rs_pointerBlankDelay,
   Rs_imLocale,
@@ -1225,6 +1229,7 @@
                         text_t text,
                         rend_t rend = OVERLAY_RSTYLE);
   void scr_overlay_set (int x, int y, const char *s);
+  void scr_overlay_set (int x, int y, const wchar_t *s);
 #endif
 
   vector<void *> allocated;           // free these memory blocks with free()
@@ -1476,7 +1481,11 @@
   void scr_refresh (unsigned char refresh_type);
   bool scr_refresh_rend (rend_t mask, rend_t value);
   void scr_erase_screen (int mode);
+#if ENABLE_FRILLS
   void scr_erase_savelines ();
+  void scr_backindex ();
+  void scr_forwardindex ();
+#endif
   void scr_touch (bool refresh);
   void scr_expose (int x, int y, int width, int height, bool refresh);
   rxvt_fontset *scr_find_fontset (rend_t r = DEFAULT_RSTYLE);
@@ -1493,8 +1502,6 @@
   void scr_add_lines (const unicode_t *str, int nlines, int len);
   void scr_backspace ();
   void scr_tab (int count, bool ht = false);
-  void scr_backindex ();
-  void scr_forwardindex ();
   void scr_gotorc (int row, int col, int relative);
   void scr_index (enum page_dirn direction);
   void scr_erase_line (int mode);