summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/events.c6
-rw-r--r--src/scrollbar.c22
3 files changed, 12 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index 10c2373..9e2e085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2985,3 +2985,9 @@ Mon Jan 3 11:14:27 PST 2000 Michael Jennings <mej@eterm.org>
menu.
-------------------------------------------------------------------------------
+Mon Jan 3 12:47:59 PST 2000 Michael Jennings <mej@eterm.org>
+
+ Fixed the bug with a solid scrollbar not updating colors when the
+ focus changed. Pointed out by cirin <stevenr@houston.rr.com>.
+
+-------------------------------------------------------------------------------
diff --git a/src/events.c b/src/events.c
index 8be0775..c5e7925 100644
--- a/src/events.c
+++ b/src/events.c
@@ -388,6 +388,9 @@ handle_focus_in(event_t * ev)
}
if (Options & Opt_scrollbar_popup) {
map_scrollbar(Options & Opt_scrollbar);
+ } else {
+ scrollbar_set_focus(TermWin.focus);
+ scrollbar_draw(MODE_SOLID);
}
#ifdef USE_XIM
if (xim_input_context != NULL)
@@ -412,6 +415,9 @@ handle_focus_out(event_t * ev)
}
if (Options & Opt_scrollbar_popup) {
map_scrollbar(0);
+ } else {
+ scrollbar_set_focus(TermWin.focus);
+ scrollbar_draw(MODE_SOLID);
}
#ifdef USE_XIM
if (xim_input_context != NULL)
diff --git a/src/scrollbar.c b/src/scrollbar.c
index fb32eec..8d03817 100644
--- a/src/scrollbar.c
+++ b/src/scrollbar.c
@@ -675,28 +675,6 @@ void
scrollbar_reset(void)
{
D_SCROLLBAR(("scrollbar_reset()\n"));
-#if 0
- if (gc_scrollbar != None) {
- XFreeGC(Xdisplay, gc_scrollbar);
- gc_scrollbar = None;
- }
-# if defined(MOTIF_SCROLLBAR) || defined(NEXT_SCROLLBAR)
- if (gc_top != None) {
- XFreeGC(Xdisplay, gc_top);
- gc_top = None;
- }
- if (gc_bottom != None) {
- XFreeGC(Xdisplay, gc_bottom);
- gc_bottom = None;
- }
-# endif
-# ifdef XTERM_SCROLLBAR
- if (gc_stipple != None) {
- XFreeGC(Xdisplay, gc_stipple);
- gc_stipple = None;
- }
-# endif
-#endif /* 0 */
last_top = last_bot = 0;
scrollbar.init = 0;
}