From 984cba66df449aed5419d5969dc180a800f443d6 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sun, 26 Apr 2009 01:51:20 +0000
Subject: [PATCH] *** empty log message ***

---
 Changes       | 11 ++++++++++-
 src/command.C |  2 +-
 src/init.C    |  4 ++--
 src/main.C    | 11 ++++-------
 src/rxvt.h    |  2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Changes b/Changes
index 2fac325..ccee63b 100644
--- a/Changes
+++ b/Changes
@@ -19,8 +19,12 @@ WISH: load system-wide config file even if we don't have one
 WISH: look into XAddConnectionWatch, does anybody need that?
 DUMB: support tex fonts
 
+TODO: `/etc/udev/rules.d/41-mythtv-permissions.rules'
 TODO: exg-- patch
 TODO: selection_beg/end should set screen, or so
+TODO:        - upgrade to libev-xx
+TODO: -rv interacts badly with popups.
+TODO:	- gcc-4.4/const/Milos Jakubicek.
         - the binary search algorithm to find precomposed characters
           was faulty, skipping some possible combinations (found by
           Mikachu).
@@ -31,7 +35,12 @@ TODO: selection_beg/end should set screen, or so
         - correctly reset the mbstate after an illegal
           input sequence when handling terminal output (Emanuele Giaquinta).
         - avoid redrawing wide characters with combining enabled on every
-          refresgh (reported by Mikachu).
+          refresh (reported by Mikachu).
+        - fix a typo preventing the ISO-646.1991 character set from being
+          recognized (http://achurch.org/patch-pile/).
+        - better warning for x11 font encoding detection failures, also,
+          try to decude encoding from both font properties and name
+          (adapted from http://achurch.org/patch-pile/).
 
 9.06 Sat Nov  8 17:47:18 CET 2008
 	- NOTICE: this release updates terminfo/termcap.
diff --git a/src/command.C b/src/command.C
index 8e25578..d7576f4 100644
--- a/src/command.C
+++ b/src/command.C
@@ -3287,7 +3287,7 @@ rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
  * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
  */
 void
-rxvt_term::process_xterm_seq (int op, const char *str, char resp)
+rxvt_term::process_xterm_seq (int op, char *str, char resp)
 {
   int color;
   char *buf, *name;
diff --git a/src/init.C b/src/init.C
index 6c9e640..33247f2 100644
--- a/src/init.C
+++ b/src/init.C
@@ -1126,8 +1126,8 @@ rxvt_term::create_windows (int argc, const char *const *argv)
   old_width = szHint.width;
   old_height = szHint.height;
 
-  process_xterm_seq (XTerm_title,    rs[Rs_title],    CHAR_ST);
-  process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
+  set_title     (rs [Rs_title]);
+  set_icon_name (rs [Rs_iconName]);
 
   classHint.res_name  = (char *)rs[Rs_name];
   classHint.res_class = (char *)RESCLASS;
diff --git a/src/main.C b/src/main.C
index d35671c..b8a9d5e 100644
--- a/src/main.C
+++ b/src/main.C
@@ -992,9 +992,7 @@ rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, in
     }
 
   if (fix_screen || old_height == 0)
-    {
-      scr_reset ();
-    }
+    scr_reset ();
 
   // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
   //scr_touch (false);
@@ -1079,18 +1077,17 @@ rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
 bool
 rxvt_term::IMisRunning ()
 {
-  char *p;
   Atom atom;
   Window win;
   char server[IMBUFSIZ];
 
   /* get current locale modifier */
-  if ((p = XSetLocaleModifiers (NULL)) != NULL)
+  if (char *p = XSetLocaleModifiers (0))
     {
       strcpy (server, "@server=");
-      strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
+      strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
 
-      if ((p = strchr (server + 1, '@')) != NULL)      /* first one only */
+      if (p = strchr (server + 1, '@'))      /* first one only */
         *p = '\0';
 
       atom = XInternAtom (dpy, server, False);
diff --git a/src/rxvt.h b/src/rxvt.h
index 0a3427a..c59b727 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1256,7 +1256,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen
   void process_dcs_seq ();
   void process_osc_seq ();
   void process_color_seq (int report, int color, const char *str, char resp);
-  void process_xterm_seq (int op, const char *str, char resp);
+  void process_xterm_seq (int op, char *str, char resp);
   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);
-- 
1.9.1