From: root <root>
Date: Mon, 9 Oct 2006 23:12:45 +0000 (+0000)
Subject: misc fixes inspired by an idiot
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a5498462f03e50a5e9c3e91a6d0dc3b581dad246;p=dana%2Furxvt.git

misc fixes inspired by an idiot
---

diff --git a/src/keyboard.C b/src/keyboard.C
index 53f8fdae..0951eace 100644
--- a/src/keyboard.C
+++ b/src/keyboard.C
@@ -238,7 +238,7 @@ keyboard_manager::register_user_translation (KeySym keysym, unsigned int state,
               key->type  = keysym_t::LIST;
               key->range = suffix - middle - 1;
 
-              strcpy (translation, translation + 4);
+              memmove (translation, translation + 4, strlen (translation + 4) + 1);
             }
           else
             rxvt_warn ("cannot parse list-type keysym '%s', treating as normal keysym.\n", translation);
diff --git a/src/screen.C b/src/screen.C
index bc532106..28089c0f 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -411,7 +411,7 @@ rxvt_term::scr_reset ()
 
   tabs = (char *)rxvt_malloc (ncol * sizeof (char));
 
-  for (int col = ncol; col--; )
+  for (int col = ncol; --col; )
     tabs [col] = col % TABSIZE == 0;
 
   if (current_screen != PRIMARY)
@@ -2351,9 +2351,7 @@ rxvt_term::scr_refresh () NOTHROW
            */
           rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
 
-          if (back == fore)
-            font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
-          else if (back == Color_bg && have_bg)
+          if (back == Color_bg && have_bg)
             {
               // this is very ugly, maybe push it into ->draw?