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

Comparing rxvt-unicode/src/scrollbar-rxvt.C (file contents):
Revision 1.41 by root, Mon Feb 21 07:41:04 2011 UTC vs.
Revision 1.43 by sf-exg, Thu Sep 1 08:11:27 2011 UTC

   Display *dpy = sb->term->dpy;
   sz = sb->width;
   sz2 = sz / 2;
-  if ((dirn == UP && sb->state == STATE_UP)
+  if ((dirn == UP && sb->state == SB_STATE_UP)
-      || (dirn == DN && sb->state == STATE_DOWN))
+      || (dirn == DN && sb->state == SB_STATE_DOWN))
     {
       top = sb->botShadowGC;
       bot = sb->topShadowGC;
     }
   else
 int
 scrollBar_t::show_rxvt (int update)
 {
   int sbwidth = (int)width;
-  if ((init & R_SB_RXVT) == 0)
+  if ((init & SB_STYLE_RXVT) == 0)
     {
       XGCValues gcvalue;
-      init |= R_SB_RXVT;
+      init |= SB_STYLE_RXVT;
       gcvalue.foreground = term->pix_colors[Color_topShadow];
       topShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
       gcvalue.foreground = term->pix_colors[Color_bottomShadow];
       botShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
       gcvalue.foreground = term->pix_colors[ (term->depth <= 2 ? Color_fg : Color_scroll)];
       scrollbarGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
-      if (!term->option (Opt_scrollBar_floating))
+      if (shadow)
         {
-          shadow = SHADOW_WIDTH;
           XSetWindowBackground (term->dpy, win, term->pix_colors_focused[Color_trough]);
           XClearWindow (term->dpy, win);
         }
     }
   else

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