--- rxvt-unicode/src/rxvt.h	2013/01/13 22:30:47	1.518
+++ rxvt-unicode/src/rxvt.h	2013/10/01 13:30:04	1.525
@@ -79,6 +79,7 @@
 
 #if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
 # define HAVE_BG_PIXMAP 1
+# define HAVE_IMG 1
 #endif
 
 #if HAVE_BG_PIXMAP
@@ -402,9 +403,9 @@
 
 /* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
 enum page_dirn {
-  UP,
-  DN,
-  NO_DIR,
+  DN     = -1,
+  NO_DIR =  0,
+  UP     =  1,
 };
 
 /* arguments for rxvt_term::scr_change_screen () */
@@ -1145,7 +1146,6 @@
 /* ---------- */
 #ifdef SELECTION_SCROLLING
   int             scroll_selection_lines;
-  enum page_dirn  scroll_selection_dir;
   int             selection_save_x,
                   selection_save_y,
                   selection_save_state;
@@ -1200,8 +1200,6 @@
   void render_root_image ();
 # endif
 
-  void tint_image (rxvt_img *img, rxvt_color &tint, bool tint_set, int shade);
-
   ev_tstamp bg_valid_since;
 
   bool bg_window_size_sensitive ();
@@ -1404,6 +1402,7 @@
   int privcases (int mode, unsigned long bit);
   void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
   void process_sgr_mode (unsigned int nargs, const int *arg);
+  void set_cursor_style (int style);
   // init.C
   void init (stringvec *argv, stringvec *envv);
   void init (int argc, const char *const *argv, const char *const *envv);
@@ -1487,6 +1486,7 @@
   void scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW;
   void scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW;
   void scr_kill_char (line_t &l, int col) const NOTHROW;
+  void scr_set_char_rend (line_t &l, int col, rend_t rend);
   int scr_scroll_text (int row1, int row2, int count) NOTHROW;
   void copy_line (line_t &dst, line_t &src);
   void scr_reset ();
@@ -1537,7 +1537,11 @@
   void scr_charset_choose (int set) NOTHROW;
   void scr_charset_set (int set, unsigned int ch) NOTHROW;
   void scr_move_to (int y, int len) NOTHROW;
-  bool scr_page (enum page_dirn direction, int nlines) NOTHROW;
+  bool scr_page (int nlines) NOTHROW;
+  bool scr_page (enum page_dirn direction, int nlines) NOTHROW
+  {
+    scr_page (direction * nlines);
+  }
   bool scr_changeview (int new_view_start) NOTHROW;
   void scr_bell () NOTHROW;
   void scr_printscreen (int fullhist) NOTHROW;
@@ -1547,6 +1551,7 @@
   void scr_dump (int fd) NOTHROW;
 
   void selection_check (int check_more) NOTHROW;
+  void selection_changed () NOTHROW; /* sets want_refresh, corrects coordinates */
   void selection_request (Time tm, int selnum = Sel_Primary) NOTHROW;
   void selection_clear (bool clipboard = false) NOTHROW;
   void selection_make (Time tm);