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

Comparing rxvt-unicode/src/scrollbar-rxvt.C (file contents):
Revision 1.34 by ayin, Mon Dec 31 15:45:29 2007 UTC vs.
Revision 1.45 by root, Thu May 22 18:54:33 2014 UTC

  * File:	scrollbar-rxvt.C
  *----------------------------------------------------------------------*
  *
  * Copyright (c) 1997,1998 mj olesen <olesen@me.QueensU.CA>
  * Copyright (c) 1999-2001 Geoff Wing <gcw@pobox.com>
- * Copyright (c) 2004-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 /*----------------------------------------------------------------------*/
 #if defined(RXVT_SCROLLBAR)
 static void
-draw_shadow (rxvt_term *term, int x, int y, int w, int h)
+draw_shadow (scrollBar_t *sb, int x, int y, int w, int h)
 {
   int shadow;
+  Drawable d = sb->win;
+  Display *dpy = sb->term->dpy;
   shadow = (w == 0 || h == 0) ? 1 : SHADOW_WIDTH;
   w += x - 1;
   h += y - 1;
   for (; shadow-- > 0; x++, y++, w--, h--)
     {
-      XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, w    , y    );
+      XDrawLine (dpy, d, sb->topShadowGC, x, y, w    , y    );
-      XDrawLine (term->dpy, term->scrollBar.win, term->topShadowGC, x, y, x    , h    );
+      XDrawLine (dpy, d, sb->topShadowGC, x, y, x    , h    );
-      XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, w    , y + 1);
+      XDrawLine (dpy, d, sb->botShadowGC, w, h, w    , y + 1);
-      XDrawLine (term->dpy, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h    );
+      XDrawLine (dpy, d, sb->botShadowGC, w, h, x + 1, h    );
     }
 }
 /* draw triangular button with a shadow of 2 pixels */
 static void
-draw_button (rxvt_term *term, int x, int y, int state, int dirn)
+draw_button (scrollBar_t *sb, int x, int y, int dirn)
 {
   unsigned int sz, sz2;
   XPoint pt[3];
   GC top, bot;
+  Drawable d = sb->win;
+  Display *dpy = sb->term->dpy;
-  sz = term->scrollBar.width;
+  sz = sb->width;
   sz2 = sz / 2;
-  switch (state)
+  if ((dirn == UP && sb->state == SB_STATE_UP)
+      || (dirn == DN && sb->state == SB_STATE_DOWN))
     {
-      case +1:
-        top = term->topShadowGC;
-        bot = term->botShadowGC;
-        break;
-      case -1:
-        top = term->botShadowGC;
+      top = sb->botShadowGC;
-        bot = term->topShadowGC;
+      bot = sb->topShadowGC;
-        break;
+    }
-      default:
+  else
-        top = bot = term->scrollbarGC;
+    {
-        break;
+      top = sb->topShadowGC;
+      bot = sb->botShadowGC;
     }
   /* fill triangle */
   pt[0].x = x;
   pt[1].x = x + sz - 1;
     {
       pt[0].y = pt[1].y = y;
       pt[2].y = y + sz - 1;
     }
-  XFillPolygon (term->dpy, term->scrollBar.win, term->scrollbarGC,
+  XFillPolygon (dpy, d, sb->scrollbarGC,
                 pt, 3, Convex, CoordModeOrigin);
   /* draw base */
-  XDrawLine (term->dpy, term->scrollBar.win, (dirn == UP ? bot : top),
+  XDrawLine (dpy, d, (dirn == UP ? bot : top),
              pt[0].x, pt[0].y, pt[1].x, pt[1].y);
   /* draw shadow on left */
   pt[1].x = x + sz2 - 1;
   pt[1].y = y + (dirn == UP ? 0 : sz - 1);
-  XDrawLine (term->dpy, term->scrollBar.win, top,
+  XDrawLine (dpy, d, top,
              pt[0].x, pt[0].y, pt[1].x, pt[1].y);
 #if SHADOW_WIDTH > 1
   /* doubled */
   pt[0].x++;
     {
       pt[0].y++;
       pt[1].y--;
     }
-  XDrawLine (term->dpy, term->scrollBar.win, top,
+  XDrawLine (dpy, d, top,
              pt[0].x, pt[0].y, pt[1].x, pt[1].y);
 #endif
   /* draw shadow on right */
   pt[1].x = x + sz - 1;
   /*  pt[2].x = x + sz2; */
   pt[1].y = y + (dirn == UP ? sz - 1 : 0);
   pt[2].y = y + (dirn == UP ? 0 : sz - 1);
-  XDrawLine (term->dpy, term->scrollBar.win, bot,
+  XDrawLine (dpy, d, bot,
              pt[2].x, pt[2].y, pt[1].x, pt[1].y);
 #if SHADOW_WIDTH > 1
   /* doubled */
   pt[1].x--;
     {
       pt[2].y--;
       pt[1].y++;
     }
-  XDrawLine (term->dpy, term->scrollBar.win, bot,
+  XDrawLine (dpy, d, bot,
              pt[2].x, pt[2].y, pt[1].x, pt[1].y);
 #endif
 }
 int
-rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scrollbar_len)
+scrollBar_t::show_rxvt (int update)
 {
-  int sbshadow = scrollBar.shadow;
-  int sbwidth = (int)scrollBar.width;
+  int sbwidth = (int)width;
-  if ((scrollBar.init & R_SB_RXVT) == 0)
+  if ((init & SB_STYLE_RXVT) == 0)
     {
       XGCValues gcvalue;
-      scrollBar.init |= R_SB_RXVT;
+      init |= SB_STYLE_RXVT;
-      gcvalue.foreground = pix_colors[Color_topShadow];
+      gcvalue.foreground = term->pix_colors[Color_topShadow];
-      topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
+      topShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
-      gcvalue.foreground = pix_colors[Color_bottomShadow];
+      gcvalue.foreground = term->pix_colors[Color_bottomShadow];
-      botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
+      botShadowGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
-      gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
+      gcvalue.foreground = term->pix_colors[ (term->depth <= 2 ? Color_fg : Color_scroll)];
-      scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
+      scrollbarGC = XCreateGC (term->dpy, term->vt, GCForeground, &gcvalue);
-      if (sbshadow)
-        {
-          XSetWindowBackground (dpy, scrollBar.win, pix_colors_focused[Color_trough]);
-          XClearWindow (dpy, scrollBar.win);
-        }
     }
   else
     {
       if (update)
         {
-          if (last_top < scrollBar.top)
+          if (last_top < top)
-            XClearArea (dpy, scrollBar.win,
+            XClearArea (term->dpy, win,
-                        sbshadow, last_top,
+                        shadow, last_top,
-                        sbwidth, (scrollBar.top - last_top),
+                        sbwidth, (top - last_top),
                         False);
-          if (scrollBar.bot < last_bot)
+          if (bot < last_bot)
-            XClearArea (dpy, scrollBar.win,
+            XClearArea (term->dpy, win,
-                        sbshadow, scrollBar.bot,
+                        shadow, bot,
-                        sbwidth, (last_bot - scrollBar.bot),
+                        sbwidth, (last_bot - bot),
                         False);
         }
       else
-        XClearWindow (dpy, scrollBar.win);
+        XClearWindow (term->dpy, win);
     }
   /* scrollbar slider */
 #ifdef SB_BORDER
   {
     int xofs;
-    if (option (Opt_scrollBar_right))
+    if (term->option (Opt_scrollBar_right))
       xofs = 0;
     else
-      xofs = sbshadow ? sbwidth : sbwidth - 1;
+      xofs = shadow ? sbwidth : sbwidth - 1;
-    XDrawLine (dpy, scrollBar.win, botShadowGC,
+    XDrawLine (term->dpy, win, botShadowGC,
-               xofs, 0, xofs, scrollBar.end + sbwidth);
+               xofs, 0, xofs, end + sbwidth);
   }
 #endif
-  XFillRectangle (dpy, scrollBar.win, scrollbarGC,
+  XFillRectangle (term->dpy, win, scrollbarGC,
-                  sbshadow, scrollBar.top, sbwidth,
+                  shadow, top, sbwidth,
-                  scrollbar_len);
+                  bot - top);
-  if (sbshadow)
+  if (shadow)
     /* trough shadow */
-    draw_shadow (this, 0, 0, sbwidth + 2 * sbshadow, scrollBar.end + (sbwidth + 1) + sbshadow);
+    draw_shadow (this, 0, 0, sbwidth + 2 * shadow, end + (sbwidth + 1) + shadow);
   /* shadow for scrollbar slider */
-  draw_shadow (this, sbshadow, scrollBar.top, sbwidth, scrollbar_len);
+  draw_shadow (this, shadow, top, sbwidth, bot - top);
   /* Redraw scrollbar arrows */
-  draw_button (this, sbshadow, sbshadow,          (scrollbar_isUp () ? -1 : +1), UP);
+  draw_button (this, shadow, shadow, UP);
-  draw_button (this, sbshadow, scrollBar.end + 1, (scrollbar_isDn () ? -1 : +1), DN);
+  draw_button (this, shadow, end + 1,  DN);
   return 1;
 }
 #endif /* RXVT_SCROLLBAR */
 /*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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

Comparing rxvt-unicode/src/scrollbar-rxvt.C (file contents): Revision 1.34 by ayin, Mon Dec 31 15:45:29 2007 UTC vs. Revision 1.45 by root, Thu May 22 18:54:33 2014 UTC

Diff Legend

Comparing rxvt-unicode/src/scrollbar-rxvt.C (file contents):
Revision 1.34 by ayin, Mon Dec 31 15:45:29 2007 UTC vs.
Revision 1.45 by root, Thu May 22 18:54:33 2014 UTC