--- rxvt-unicode/src/rxvt.h	2011/04/07 12:19:41	1.439
+++ rxvt-unicode/src/rxvt.h	2011/12/18 02:14:59	1.455
@@ -129,10 +129,6 @@
 # define EXIT_FAILURE           1       /* exit function failure */
 #endif
 
-#ifndef PATH_MAX
-# define PATH_MAX 16384
-#endif
-
 /****************************************************************************/
 
 // exception thrown on fatal (per-instance) errors
@@ -163,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;
@@ -310,33 +306,28 @@
 # define NSCREENS               1
 #endif
 
-/* special (internal) prefix for font commands */
-#define FONT_CMD                '#'
-#define FONT_DN                 "#-"
-#define FONT_UP                 "#+"
-
-/* flags for rxvt_scr_gotorc () */
+/* flags for rxvt_term::scr_gotorc () */
 enum {
   C_RELATIVE = 1,       /* col movement is relative */
   R_RELATIVE = 2,       /* row movement is relative */
   RELATIVE   = C_RELATIVE | R_RELATIVE,
 };
 
-/* modes for rxvt_scr_insdel_chars (), rxvt_scr_insdel_lines () */
+/* modes for rxvt_term::scr_insdel_chars (), rxvt_term::scr_insdel_lines () */
 enum {
   INSERT = -1,				/* don't change these values */
   DELETE = +1,
   ERASE  = +2,
 };
 
-/* modes for rxvt_scr_page () - scroll page. used by scrollbar window */
+/* modes for rxvt_term::scr_page () - scroll page. used by scrollbar window */
 enum page_dirn {
   UP,
   DN,
   NO_DIR,
 };
 
-/* arguments for rxvt_scr_change_screen () */
+/* arguments for rxvt_term::scr_change_screen () */
 enum {
   PRIMARY = 0,
   SECONDARY,
@@ -678,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)))
@@ -992,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               */
@@ -1110,9 +1101,10 @@
 
     BG_EFFECTS_FLAGS     = BG_NEEDS_TINT | BG_NEEDS_BLUR,
 
-    BG_PROP_SCALE        = 1 <<  3,
+    BG_KEEP_ASPECT       = 1 <<  3,
     BG_ROOT_ALIGN        = 1 <<  4,
-    BG_GEOMETRY_FLAGS    = BG_PROP_SCALE | BG_ROOT_ALIGN,
+    BG_TILE              = 1 << 14,
+    BG_GEOMETRY_FLAGS    = BG_KEEP_ASPECT | BG_ROOT_ALIGN | BG_TILE,
 
     BG_TINT_SET          = 1 <<  5,
     BG_TINT_BITAND       = 1 <<  6,
@@ -1326,12 +1318,6 @@
   void tt_write (const char *data, unsigned int len);
   void pty_write ();
 
-  void init (stringvec *argv, stringvec *envv)
-  {
-    this->argv = argv;
-    init (argv->size (), argv->begin (), envv);
-  }
-
   void make_current () const // make this the "currently active" urxvt instance
   {
     SET_R (this);
@@ -1352,10 +1338,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
@@ -1398,9 +1384,11 @@
   void process_terminal_mode (int mode, int priv, unsigned int nargs, const int *arg);
   void process_sgr_mode (unsigned int nargs, const int *arg);
   // init.C
+  void init (stringvec *argv, stringvec *envv);
+  void init (int argc, const char *const *argv, const char *const *envv);
+  void init2 (int argc, const char *const *argv);
   void init_vars ();
   const char **init_resources (int argc, const char *const *argv);
-  void init (int argc, const char *const *argv, stringvec *envv);
   void init_env ();
   void set_locale (const char *locale);
   void init_xlocale ();
@@ -1473,7 +1461,7 @@
 # if ENABLE_STYLES
         && option (Opt_intensityStyles)
 # endif
-        && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
+        && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
 #endif
     return base;
@@ -1487,7 +1475,7 @@
 # if ENABLE_STYLES
         && option (Opt_intensityStyles)
 # endif
-        && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
+        && IN_RANGE_EXC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
 #endif
     return base;
@@ -1500,14 +1488,6 @@
 
   void set_option (uint8_t opt, bool set = true) NOTHROW;
 
-  void set_privmode (unsigned bit, int set) NOTHROW
-  {
-    if (set)
-      priv_modes |= bit;
-    else
-      priv_modes &= ~bit;
-  }
-
   // modifies first argument(!)
   void tt_paste (char *data, unsigned int len) NOTHROW;
   void paste (char *data, unsigned int len) NOTHROW;
@@ -1587,10 +1567,11 @@
   void selection_rotate (int x, int y) NOTHROW;
 
   // xdefaults.C
-  void get_options (int argc, const char *const *argv);
+  const char **get_options (int argc, const char *const *argv);
   int parse_keysym (const char *str, const char *arg);
   const char *x_resource (const char *name);
   void extract_resources ();
+  void extract_keysym_resources ();
 };
 
 #endif /* _RXVT_H_ */