From: root <root>
Date: Tue, 31 Jan 2006 20:07:18 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=ea141c7137cfd1844a192d237487cf33cbad86c2;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/Changes b/Changes
index 984d9174..012fd9dc 100644
--- a/Changes
+++ b/Changes
@@ -16,12 +16,15 @@ THINK: struct passwd *userinfo; /* defined in pwd.h + if ((userinfo = getpwuid(g
 
 TODO: xim "how to" faq entry
 TODO: reorganize faq
-TODO: support +xxx option syntax (e.g. -tint red +tint)
 TODO: scrollstyle -next, raised/sunken, maybe extra pixels(?) w. halfshadow
 
 	- changed interpretation of [alpha] colour prefix.
+        - +option now really sets the option to default, instead of using the
+          resource value.
         - further round trip eliminations in the !XFT case by remembering
           the colour components.
+        - plain scrollbar works better with -sr.
+        - fixed half-shadow scrollbar look.
 
 7.5  Tue Jan 31 15:15:43 CET 2006
         - further improvements to the careful mode detection, and font width
diff --git a/configure.ac b/configure.ac
index f8886044..39b517c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -276,12 +276,6 @@ AC_ARG_ENABLE(plain-scroll,
     support_scroll_plain=$enableval
   fi])
 
-dnl AC_ARG_ENABLE(half-shadow,
-dnl   [  --enable-half-shadow    use half width/height shadow on rxvt scrollbar],
-dnl   [if test x$enableval = xyes; then
-dnl     AC_DEFINE(HALFSHADOW, 1, Define if you want the depth of scrollbars and menus to be less)
-dnl   fi])
-
 AC_ARG_WITH(codesets,
   [  --with-codesets=NAME,.. compile in additional codesets (jp,jp_ext,kr,zh,zh_ext,all)],
   [codesets="$withval"])
@@ -994,17 +988,6 @@ if test x$support_xim = xyes -a x$rxvt_cv_func_xlocale = xno; then
   echo ".----------------------------------------------------------------."
 fi
 
-echo "  *** Optionally check src/feature.h for further options ***"
-echo
-
-echo ".----------------------------------------------------------------."
-echo ". NOTE: some features are disabled by default, try               ."
-echo ". configure --help to get an idea of the optional features,      ."
-echo ". or read ./README.configure                                     ."
-echo ".                                                                ."
-echo ". The script ./reconf gives a reasonable baseline, try it if     ."
-echo ". you do not want to read documentation and still want some      ."
-echo ". useful features.                                               ."
-echo ".----------------------------------------------------------------."
+echo "*** Optionally check src/feature.h for further, rarely used options ***"
 echo
 
diff --git a/src/feature.h b/src/feature.h
index 52f40aba..a0cbc33d 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -299,6 +299,11 @@
 #define SB_WIDTH_MINIMUM 	5
 #define SB_WIDTH_MAXIMUM 	100
 
+/*
+ * rxvt scrollbar shadow width in pixels, must be 1 or 2
+ */
+#define SHADOW_WIDTH 1
+
 /*
  * When using Rxvt scrollbar, clicking above or below the slider will move
  * 1/4 of the screen height, if possible.  Setting RXVT_SCROLL_FULL will move
diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
index 65288da1..2bf6935d 100644
--- a/src/scrollbar-rxvt.C
+++ b/src/scrollbar-rxvt.C
@@ -27,8 +27,6 @@
 /*----------------------------------------------------------------------*/
 #if defined(RXVT_SCROLLBAR)
 
-#define SHADOW_WIDTH 1
-
 static void
 draw_shadow (rxvt_term *term, int x, int y, int w, int h)
 {
@@ -40,10 +38,10 @@ draw_shadow (rxvt_term *term, int x, int y, int w, int h)
 
   for (; shadow-- > 0; x++, y++, w--, h--)
     {
-      XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, w, y);
-      XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, x, h);
-      XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, w, y + 1);
-      XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h);
+      XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, w    , y    );
+      XDrawLine (term->xdisp, term->scrollBar.win, term->topShadowGC, x, y, x    , h    );
+      XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, w    , y + 1);
+      XDrawLine (term->xdisp, term->scrollBar.win, term->botShadowGC, w, h, x + 1, h    );
     }
 }
 
@@ -57,6 +55,7 @@ draw_button (rxvt_term *term, int x, int y, int state, int dirn)
 
   sz = term->scrollBar.width;
   sz2 = sz / 2;
+
   switch (state)
     {
       case +1:
@@ -76,6 +75,7 @@ draw_button (rxvt_term *term, int x, int y, int state, int dirn)
   pt[0].x = x;
   pt[1].x = x + sz - 1;
   pt[2].x = x + sz2;
+
   if (dirn == UP)
     {
       pt[0].y = pt[1].y = y + sz - 1;
diff --git a/src/scrollbar.C b/src/scrollbar.C
index ab97a36c..bb426366 100644
--- a/src/scrollbar.C
+++ b/src/scrollbar.C
@@ -34,7 +34,7 @@
 int
 rxvt_term::scrollbar_mapping (int map)
 {
-  int             change = 0;
+  int change = 0;
 
 #ifdef HAVE_SCROLLBARS
   if (map)
@@ -57,6 +57,7 @@ rxvt_term::scrollbar_mapping (int map)
       change = 1;
     }
 #endif
+
   return change;
 }
 
@@ -230,7 +231,7 @@ rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, co
 
 # ifdef RXVT_SCROLLBAR
   if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
-    sb_shadow = 2;
+    sb_shadow = SHADOW_WIDTH;
 # endif
 
   scrollBar.style = style;