[ViewVC] Diff of: cvs/rxvt-unicode/src/scrollbar.C

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.69 by sf-exg, Thu Aug 25 18:01:28 2011 UTC vs.
Revision 1.73 by sf-exg, Tue Aug 30 16:39:03 2011 UTC

 /*----------------------------------------------------------------------*/
 /*
  * Map or unmap a scrollbar.  Returns non-zero upon change of state
  */
-int
+void
 scrollBar_t::map (int map)
 {
-  int change = 0;
   if (map)
     {
       state = STATE_IDLE;
       if (!win)
         resize ();
+      else
+        XMapWindow (term->dpy, win);
+    }
+  else
+    {
+      state = STATE_OFF;
       if (win)
-        {
-          XMapWindow (term->dpy, win);
-          change = 1;
-        }
-    }
-  else
-    {
-      state = STATE_OFF;
-      XUnmapWindow (term->dpy, win);
+        XUnmapWindow (term->dpy, win);
-      change = 1;
     }
-  return change;
 }
 void
 scrollBar_t::resize ()
 {
 }
 void
 scrollBar_t::setup (rxvt_term *term)
 {
-  int             i;
+  int i;
-  short           width;
   const char *scrollalign, *scrollstyle, *thickness;
-  enum sb_style style;
   this->term = term;
   scrollalign = term->rs[Rs_scrollBar_align];
   scrollstyle = term->rs[Rs_scrollstyle];
   thickness = term->rs[Rs_scrollBar_thickness];
 # ifdef RXVT_SCROLLBAR
   if (! term->option (Opt_scrollBar_floating) && style == R_SB_RXVT)
     shadow = SHADOW_WIDTH;
 # endif
-  this->style = style;
-  this->width = width;
   /* align = R_SB_ALIGN_CENTRE; */
   if (scrollalign)
     {
       if (strncasecmp (scrollalign, "top", 3) == 0)
         align = R_SB_ALIGN_TOP;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines