From c54d14fa0ea21fe1b3c8961a6c8352ca60a71935 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Tue, 31 Jan 2006 19:53:30 +0000
Subject: [PATCH] *** empty log message ***

---
 src/command.C         |  4 ++--
 src/init.C            |  4 ++--
 src/main.C            |  2 +-
 src/rxvt.h            | 10 ++++++++--
 src/rxvttoolkit.C     |  4 ++--
 src/rxvttoolkit.h     |  2 +-
 src/scrollbar-plain.C |  4 ++--
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/command.C b/src/command.C
index 993f8e7f..ace499a5 100644
--- a/src/command.C
+++ b/src/command.C
@@ -2543,7 +2543,7 @@ rxvt_term::check_our_parents ()
               int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
 
               rgba c;
-              pix_colors_focused [Color_tint].get (this, c);
+              pix_colors_focused [Color_tint].get (c);
 
               ShadeXImage (this, image, shade, c.r, c.g, c.b);
             }
@@ -3721,7 +3721,7 @@ rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
   if (str[0] == '?' && !str[1])
     {
       rgba c;
-      pix_colors_focused[color].get (this, c);
+      pix_colors_focused[color].get (c);
 
 #if XFT
       if (c.a != rgba::MAX_CC)
diff --git a/src/init.C b/src/init.C
index 9140de27..2ee0016c 100644
--- a/src/init.C
+++ b/src/init.C
@@ -311,12 +311,12 @@ rxvt_term::init_resources (int argc, const char *const *argv)
 
   extract_resources ();
 
+  free (r_argv);
+
   for (int i = NUM_RESOURCES; i--; )
     if (rs [i] == resval_undef)
       rs [i] = 0;
 
-  free (r_argv);
-
 #if ENABLE_PERL
   if (!rs[Rs_perl_ext_1])
     rs[Rs_perl_ext_1] = "default";
diff --git a/src/main.C b/src/main.C
index 6de57b82..996562ee 100644
--- a/src/main.C
+++ b/src/main.C
@@ -934,7 +934,7 @@ done:
   if (rs[Rs_fade])
     {
       rgba c;
-      pix_colors [Color_fade].get (this, c);
+      pix_colors [Color_fade].get (c);
       pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
     }
 #endif
diff --git a/src/rxvt.h b/src/rxvt.h
index 11ee312a..35747b5e 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -890,11 +890,17 @@ extern class rxvt_composite_vec rxvt_composite;
 /****************************************************************************/
 
 #ifdef KEYSYM_RESOURCE
-  class keyboard_manager;
+class keyboard_manager;
 #endif
 
 struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
-  log_callback   *log_hook;               // log error messages through this hook, if != 0
+
+  // special markers with magic addresses
+  static const char resval_undef [];    // options specifically unset
+  static const char resval_on [];       // boolean options switched on
+  static const char resval_off [];      // or off
+  
+  log_callback   *log_hook;             // log error messages through this hook, if != 0
   getfd_callback *getfd_hook;           // convert remote to local fd, if != 0
 #if ENABLE_PERL
   rxvt_perl_term  perl;
diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index 16c7ab56..01c9dde6 100644
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -721,7 +721,7 @@ rxvt_color::set (rxvt_screen *screen, const rgba &color)
 }
 
 void
-rxvt_color::get (rxvt_screen *screen, rgba &color)
+rxvt_color::get (rgba &color)
 {
 #if XFT
   color.r = c.color.red;
@@ -750,7 +750,7 @@ void
 rxvt_color::fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to)
 {
   rgba c;
-  get (screen, c);
+  get (c);
 
   result.set (
     screen,
diff --git a/src/rxvttoolkit.h b/src/rxvttoolkit.h
index f358dcae..879c0316 100644
--- a/src/rxvttoolkit.h
+++ b/src/rxvttoolkit.h
@@ -252,7 +252,7 @@ struct rxvt_color {
   bool alloc (rxvt_screen *screen, const rgba &color);
   void free (rxvt_screen *screen);
 
-  void get (rxvt_screen *screen, rgba &color);
+  void get (rgba &color);
  
   bool set (rxvt_screen *screen, const char *name);
   bool set (rxvt_screen *screen, const rgba &color);
diff --git a/src/scrollbar-plain.C b/src/scrollbar-plain.C
index 262b8569..c236212b 100644
--- a/src/scrollbar-plain.C
+++ b/src/scrollbar-plain.C
@@ -50,12 +50,12 @@ rxvt_term::scrollbar_show_plain (int update, int last_top, int last_bot, int scr
       if (last_top < scrollBar.top)
         XClearArea (xdisp, scrollBar.win,
                     sb_shadow, last_top,
-                    sbwidth + 1, (scrollBar.top - last_top), False);
+                    sbwidth + 1, scrollBar.top - last_top, False);
 
       if (scrollBar.bot < last_bot)
         XClearArea (xdisp, scrollBar.win,
                     sb_shadow, scrollBar.bot,
-                    sbwidth + 1, (last_bot - scrollBar.bot), False);
+                    sbwidth + 1, last_bot - scrollBar.bot, False);
     }
   else
     XClearWindow (xdisp, scrollBar.win);
-- 
2.34.1