--- rxvt-unicode/src/rxvt.h	2011/05/01 13:54:27	1.442
+++ rxvt-unicode/src/rxvt.h	2011/08/09 18:41:31	1.446
@@ -159,8 +159,8 @@
 void             rxvt_vlog                        (const char *fmt, va_list arg_ptr) NOTHROW;
 void             rxvt_log                         (const char *fmt,...) NOTHROW;
 void             rxvt_warn                        (const char *fmt,...) NOTHROW;
-void             rxvt_fatal                       (const char *fmt, ...) THROW ((class rxvt_failure_exception)) NORETURN;
-void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception)) NORETURN;
+void             rxvt_fatal                       (const char *fmt, ...) THROW ((class rxvt_failure_exception)) ecb_noreturn;
+void             rxvt_exit_failure                () THROW ((class rxvt_failure_exception)) ecb_noreturn;
 
 char           * rxvt_strtrim                     (char *str) NOTHROW;
 char          ** rxvt_strsplit                    (char delim, const char *str) NOTHROW;
@@ -669,7 +669,7 @@
 // return attributes defining the background, encoding doesn't matter
 // depends on RS_fgShift > RS_bgShift
 #define GET_BGATTR(x)                                      \
-  (expect_false ((x) & RS_RVid)                            \
+  (ecb_unlikely ((x) & RS_RVid)                            \
     ? (((x) & (RS_attrMask & ~RS_RVid))                    \
       | (((x) & RS_fgMask) >> (RS_fgShift - RS_bgShift)))  \
     : ((x) & (RS_attrMask | RS_bgMask)))
@@ -983,7 +983,7 @@
   XSizeHints      szHint;
   rxvt_color     *pix_colors;
   Cursor          TermWin_cursor;       /* cursor for vt window */
-  line_t         *row_buf;      // all lines, scrollback + terminal, circular, followed by temp_buf
+  line_t         *row_buf;      // all lines, scrollback + terminal, circular
   line_t         *drawn_buf;    // text on screen
   line_t         *swap_buf;     // lines for swap buffer
   char           *tabs;         /* per location: 1 == tab-stop               */
@@ -1103,7 +1103,8 @@
 
     BG_PROP_SCALE        = 1 <<  3,
     BG_ROOT_ALIGN        = 1 <<  4,
-    BG_GEOMETRY_FLAGS    = BG_PROP_SCALE | BG_ROOT_ALIGN,
+    BG_TILE              = 1 << 14,
+    BG_GEOMETRY_FLAGS    = BG_PROP_SCALE | BG_ROOT_ALIGN | BG_TILE,
 
     BG_TINT_SET          = 1 <<  5,
     BG_TINT_BITAND       = 1 <<  6,
@@ -1343,10 +1344,10 @@
   void im_set_color (unsigned long &fg, unsigned long &bg);
   void im_set_preedit_area (XRectangle &preedit_rect, XRectangle &status_rect, const XRectangle &needed_rect);
 
-  bool IMisRunning ();
-  void IMSendSpot ();
-  bool IM_get_IC (const char *modifiers);
-  void IMSetPosition ();
+  bool im_is_running ();
+  void im_send_spot ();
+  bool im_get_ic (const char *modifiers);
+  void im_set_position ();
 #endif
 
   // command.C