| … | |
… | |
| 30 | |
30 | |
| 31 | /* |
31 | /* |
| 32 | * Map or unmap a scrollbar. Returns non-zero upon change of state |
32 | * Map or unmap a scrollbar. Returns non-zero upon change of state |
| 33 | */ |
33 | */ |
| 34 | int |
34 | int |
| 35 | rxvt_term::scrollbar_mapping (int map) |
35 | scrollBar_t::map (int map) |
| 36 | { |
36 | { |
| 37 | int change = 0; |
37 | int change = 0; |
| 38 | |
38 | |
| 39 | if (map) |
39 | if (map) |
| 40 | { |
40 | { |
| 41 | scrollBar.state = STATE_IDLE; |
41 | state = STATE_IDLE; |
| 42 | |
42 | |
| 43 | if (!scrollBar.win) |
43 | if (!win) |
| 44 | resize_scrollbar (); |
44 | resize (); |
| 45 | |
45 | |
| 46 | if (scrollBar.win) |
46 | if (win) |
| 47 | { |
47 | { |
| 48 | XMapWindow (dpy, scrollBar.win); |
48 | XMapWindow (term->dpy, win); |
| 49 | change = 1; |
49 | change = 1; |
| 50 | } |
50 | } |
| 51 | } |
51 | } |
| 52 | else |
52 | else |
| 53 | { |
53 | { |
| 54 | scrollBar.state = 0; |
54 | state = 0; |
| 55 | XUnmapWindow (dpy, scrollBar.win); |
55 | XUnmapWindow (term->dpy, win); |
| 56 | change = 1; |
56 | change = 1; |
| 57 | } |
57 | } |
| 58 | |
58 | |
| 59 | return change; |
59 | return change; |
| 60 | } |
60 | } |
| 61 | |
61 | |
| 62 | void |
62 | void |
| 63 | rxvt_term::resize_scrollbar () |
63 | scrollBar_t::resize () |
| 64 | { |
64 | { |
| 65 | int delayed_init = 0; |
65 | int delayed_init = 0; |
| 66 | int window_sb_x = 0; |
66 | int window_sb_x = 0; |
| 67 | |
67 | |
| 68 | if (option (Opt_scrollBar_right)) |
68 | if (term->option (Opt_scrollBar_right)) |
| 69 | window_sb_x = szHint.width - scrollBar.total_width (); |
69 | window_sb_x = term->szHint.width - total_width (); |
| 70 | |
70 | |
| 71 | scrollBar.update_data (); |
71 | update_data (); |
| 72 | |
72 | |
| 73 | if (!scrollBar.win) |
73 | if (!win) |
| 74 | { |
74 | { |
| 75 | /* create the scrollbar window */ |
75 | /* create the scrollbar window */ |
| 76 | scrollBar.win = XCreateSimpleWindow (dpy, |
76 | win = XCreateSimpleWindow (term->dpy, |
| 77 | parent[0], |
77 | term->parent[0], |
| 78 | window_sb_x, 0, |
78 | window_sb_x, 0, |
| 79 | scrollBar.total_width (), |
79 | total_width (), |
| 80 | szHint.height, |
80 | term->szHint.height, |
| 81 | 0, |
81 | 0, |
| 82 | pix_colors[Color_fg], |
82 | term->pix_colors[Color_fg], |
| 83 | pix_colors[Color_border]); |
83 | term->pix_colors[Color_border]); |
| 84 | XDefineCursor (dpy, scrollBar.win, scrollBar.leftptr_cursor); |
84 | XDefineCursor (term->dpy, win, leftptr_cursor); |
| 85 | |
85 | |
| 86 | XSelectInput (dpy, scrollBar.win, |
86 | XSelectInput (term->dpy, win, |
| 87 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
87 | ExposureMask | ButtonPressMask | ButtonReleaseMask |
| 88 | | Button1MotionMask | Button2MotionMask |
88 | | Button1MotionMask | Button2MotionMask |
| 89 | | Button3MotionMask); |
89 | | Button3MotionMask); |
| 90 | scrollbar_ev.start (display, scrollBar.win); |
90 | term->scrollbar_ev.start (term->display, win); |
| 91 | |
91 | |
| 92 | delayed_init = 1; |
92 | delayed_init = 1; |
| 93 | } |
93 | } |
| 94 | else |
94 | else |
| 95 | XMoveResizeWindow (dpy, scrollBar.win, |
95 | XMoveResizeWindow (term->dpy, win, |
| 96 | window_sb_x, 0, |
96 | window_sb_x, 0, |
| 97 | scrollBar.total_width (), szHint.height); |
97 | total_width (), term->szHint.height); |
| 98 | |
98 | |
| 99 | scrollbar_show (1); |
99 | show (1); |
| 100 | |
100 | |
| 101 | if (delayed_init) |
101 | if (delayed_init) |
| 102 | XMapWindow (dpy, scrollBar.win); |
102 | XMapWindow (term->dpy, win); |
| 103 | } |
103 | } |
| 104 | |
104 | |
| 105 | /* |
105 | /* |
| 106 | * Update current scrollbar view w.r.t. slider heights, etc. |
106 | * Update current scrollbar view w.r.t. slider heights, etc. |
| 107 | */ |
107 | */ |
| 108 | int |
108 | int |
| 109 | rxvt_term::scrollbar_show (int refresh) |
109 | scrollBar_t::show (int refresh) |
| 110 | { |
110 | { |
| 111 | int ret; |
111 | int ret; |
| 112 | |
112 | |
| 113 | if (!scrollBar.state) |
113 | if (!state) |
| 114 | return 0; |
114 | return 0; |
| 115 | |
115 | |
| 116 | if (refresh) |
116 | if (refresh) |
| 117 | { |
117 | { |
| 118 | int sb_top = view_start - top_row; |
118 | int sb_top = term->view_start - term->top_row; |
| 119 | int sb_bot = sb_top + (nrow - 1); |
119 | int sb_bot = sb_top + (term->nrow - 1); |
| 120 | int sb_len = max (nrow - 1 - top_row, 1); |
120 | int sb_len = max (term->nrow - 1 - term->top_row, 1); |
| 121 | int sb_size = (sb_bot - sb_top) * scrollBar.size (); |
121 | int sb_size = (sb_bot - sb_top) * size (); |
| 122 | |
122 | |
| 123 | scrollBar.top = (scrollBar.beg + (sb_top * scrollBar.size ()) / sb_len); |
123 | top = beg + (sb_top * size ()) / sb_len; |
| 124 | scrollBar.len = sb_size / sb_len + scrollBar.min_height () + (sb_size % sb_len > 0); |
124 | len = sb_size / sb_len + min_height () + (sb_size % sb_len > 0); |
| 125 | scrollBar.bot = (scrollBar.top + scrollBar.len); |
125 | bot = top + len; |
| 126 | /* no change */ |
126 | /* no change */ |
| 127 | if (scrollBar.top == scrollBar.last_top |
127 | if (top == last_top |
| 128 | && scrollBar.bot == scrollBar.last_bot |
128 | && bot == last_bot |
| 129 | && (scrollBar.state == scrollBar.last_state |
129 | && (state == last_state |
| 130 | || !(scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN))) |
130 | || !(state == STATE_UP || state == STATE_DOWN))) |
| 131 | return 0; |
131 | return 0; |
| 132 | } |
132 | } |
| 133 | |
133 | |
| 134 | ret = (this->*scrollBar.update) (refresh, scrollBar.last_top, scrollBar.last_bot, scrollBar.len); |
134 | ret = (term->*update) (refresh, last_top, last_bot, len); |
| 135 | |
135 | |
| 136 | scrollBar.last_top = scrollBar.top; |
136 | last_top = top; |
| 137 | scrollBar.last_bot = scrollBar.bot; |
137 | last_bot = bot; |
| 138 | scrollBar.last_state = scrollBar.state; |
138 | last_state = state; |
| 139 | |
139 | |
| 140 | return ret; |
140 | return ret; |
| 141 | } |
141 | } |
| 142 | |
142 | |
| 143 | void |
143 | void |
