[Emacs-diffs] trunk r114234: * xterm.c (x_set_scroll_bar_thumb) [USE_LUCID && !HAVE_XAW3D]: Clip

[Dmitry Antipov]

------------------------------------------------------------
revno: 114234
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-09-12 10:29:13 +0400
message:
  * xterm.c (x_set_scroll_bar_thumb) [USE_LUCID && !HAVE_XAW3D]: Clip
  scroll bar values to prevent thumb from disappear and update comment.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xterm.c                    xterm.c-20091113204419-o5vbwnq5f7feedwu-244

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-11 17:31:29 +0000
+++ b/src/ChangeLog     2013-09-12 06:29:13 +0000
@@ -1,3 +1,8 @@
+2013-09-12  Dmitry Antipov  <address@hidden>
+
+       * xterm.c (x_set_scroll_bar_thumb) [USE_LUCID && !HAVE_XAW3D]: Clip
+       scroll bar values to prevent thumb from disappear and update comment.
+
 2013-09-11  Glenn Morris  <address@hidden>
 
        * emacs.c (usage_message): Possessive apostrophe tweak.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2013-09-11 13:35:28 +0000
+++ b/src/xterm.c       2013-09-12 06:29:13 +0000
@@ -4798,12 +4798,21 @@
       top = max (0, min (1, top));
     else
       top = old_top;
+#if ! defined (HAVE_XAW3D)
+    /* With Xaw, 'top' values too closer to 1.0 may
+       cause the thumb to disappear.  Fix that.  */
+    top = min (top, 0.99f);
+#endif
     /* Keep two pixels available for moving the thumb down.  */
     shown = max (0, min (1 - top - (2.0f / height), shown));
+#if ! defined (HAVE_XAW3D)
+    /* Likewise with too small 'shown'.  */
+    shown = max (shown, 0.01f);
+#endif
 
-    /* If the call to XawScrollbarSetThumb below doesn't seem to work,
-       check that your system's configuration file contains a define
-       for `NARROWPROTO'.  See s/freebsd.h for an example.  */
+    /* If the call to XawScrollbarSetThumb below doesn't seem to
+       work, check that 'NARROWPROTO' is defined in src/config.h.
+       If this is not so, most likely you need to fix configure.  */
     if (top != old_top || shown != old_shown)
       {
        if (bar->dragging == -1)