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

Comparing rxvt-unicode/src/scrollbar.C (file contents):
Revision 1.54 by ayin, Sun Feb 17 12:21:45 2008 UTC vs.
Revision 1.56 by ayin, Mon Feb 18 09:58:27 2008 UTC

 void
 rxvt_term::resize_scrollbar ()
 {
   int delayed_init = 0;
+  int window_sb_x = 0;
+  if (option (Opt_scrollBar_right))
+    window_sb_x = szHint.width - scrollBar.total_width ();
 #define R_SCROLLBEG_XTERM	0
 #define R_SCROLLEND_XTERM	szHint.height
 #define R_SCROLLBEG_NEXT	0
 #define R_SCROLLEND_NEXT	szHint.height - (SB_BUTTON_TOTAL_HEIGHT + \
                    | Button3MotionMask);
       scrollbar_ev.start (display, scrollBar.win);
       delayed_init = 1;
     }
+  else
+    XMoveResizeWindow (dpy, scrollBar.win,
+                       window_sb_x, 0,
+                       scrollBar.total_width (), szHint.height);
   scrollbar_show (1);
   if (delayed_init)
     XMapWindow (dpy, scrollBar.win);
   if (update)
     {
       int top = view_start - top_row;
       int bot = top + (nrow - 1);
       int len = max (nrow - 1 - top_row, 1);
-      int adj = (((bot - top) * scrollBar.size ()) % len) > 0 ? 1 : 0;
+      int size = (bot - top) * scrollBar.size ();
       scrollBar.top = (scrollBar.beg + (top * scrollBar.size ()) / len);
-      scrollBar.len = ((bot - top) * scrollBar.size ()) / len +
+      scrollBar.len = size / len + scrollBar.min_height () + (size % len > 0);
-                      scrollBar.min_height () + adj;
       scrollBar.bot = (scrollBar.top + scrollBar.len);
       /* no change */
       if (scrollBar.top == scrollBar.last_top
           && scrollBar.bot == scrollBar.last_bot
           && (scrollBar.state == scrollBar.last_state

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