… | |
… | |
47 | /* ------------------------------------------------------------------------- * |
47 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
49 | * ------------------------------------------------------------------------- */ |
50 | #define ZERO_SCROLLBACK() \ |
50 | #define ZERO_SCROLLBACK() \ |
51 | if (options & Opt_scrollTtyOutput) \ |
51 | if (options & Opt_scrollTtyOutput) \ |
52 | TermWin.view_start = 0 |
52 | view_start = 0 |
53 | #define CLEAR_SELECTION() \ |
53 | #define CLEAR_SELECTION() \ |
54 | selection.beg.row = selection.beg.col \ |
54 | selection.beg.row = selection.beg.col \ |
55 | = selection.end.row = selection.end.col = 0 |
55 | = selection.end.row = selection.end.col = 0 |
56 | #define CLEAR_ALL_SELECTION() \ |
56 | #define CLEAR_ALL_SELECTION() \ |
57 | selection.beg.row = selection.beg.col \ |
57 | selection.beg.row = selection.beg.col \ |
… | |
… | |
88 | /* |
88 | /* |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
89 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
91 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
92 | */ |
92 | */ |
93 | #define drawBuffer TermWin.vt |
93 | #define drawBuffer vt |
94 | |
94 | |
95 | #define CLEAR_ROWS(row, num) \ |
95 | #define CLEAR_ROWS(row, num) \ |
96 | if (TermWin.mapped) \ |
96 | if (mapped) \ |
97 | XClearArea (display->display, drawBuffer, 0, \ |
97 | XClearArea (display->display, drawBuffer, 0, \ |
98 | Row2Pixel (row), (unsigned int)TermWin.width, \ |
98 | Row2Pixel (row), (unsigned int)width, \ |
99 | (unsigned int)Height2Pixel (num), False) |
99 | (unsigned int)Height2Pixel (num), False) |
100 | |
100 | |
101 | #define CLEAR_CHARS(x, y, num) \ |
101 | #define CLEAR_CHARS(x, y, num) \ |
102 | if (TermWin.mapped) \ |
102 | if (mapped) \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
103 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | (unsigned int)Width2Pixel (num), \ |
104 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Height2Pixel (1), False) |
105 | (unsigned int)Height2Pixel (1), False) |
106 | |
106 | |
107 | #define ERASE_ROWS(row, num) \ |
107 | #define ERASE_ROWS(row, num) \ |
108 | XFillRectangle (display->display, drawBuffer, TermWin.gc, \ |
108 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | 0, Row2Pixel (row), \ |
109 | 0, Row2Pixel (row), \ |
110 | (unsigned int)TermWin.width, \ |
110 | (unsigned int)width, \ |
111 | (unsigned int)Height2Pixel (num)) |
111 | (unsigned int)Height2Pixel (num)) |
112 | |
112 | |
113 | /* ------------------------------------------------------------------------- * |
113 | /* ------------------------------------------------------------------------- * |
114 | * SCREEN `COMMON' ROUTINES * |
114 | * SCREEN `COMMON' ROUTINES * |
115 | * ------------------------------------------------------------------------- */ |
115 | * ------------------------------------------------------------------------- */ |
116 | |
116 | |
117 | /* Fill part/all of a line with blanks. */ |
117 | /* Fill part/all of a line with blanks. */ |
118 | void |
118 | void |
119 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
119 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | { |
120 | { |
121 | efs &= ~RS_baseattrMask; |
121 | efs &= ~RS_baseattrMask; |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
123 | |
123 | |
|
|
124 | text_t *et = l.t + col; |
|
|
125 | rend_t *er = l.r + col; |
|
|
126 | |
124 | while (width--) |
127 | while (width--) |
125 | { |
128 | { |
126 | *et++ = ' '; |
129 | *et++ = ' '; |
127 | *er++ = efs; |
130 | *er++ = efs; |
128 | } |
131 | } |
129 | } |
132 | } |
130 | |
133 | |
131 | /* ------------------------------------------------------------------------- */ |
134 | /* ------------------------------------------------------------------------- */ |
132 | /* Fill a full line with blanks - make sure it is allocated first */ |
135 | /* Fill a full line with blanks - make sure it is allocated first */ |
133 | void |
136 | void |
134 | rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) |
137 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
135 | { |
138 | { |
136 | #ifdef DEBUG_STRICT |
139 | if (!l.t) |
137 | assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL)); |
140 | lalloc (l); |
138 | #endif |
|
|
139 | if (tp[row] == NULL) |
|
|
140 | { |
|
|
141 | tp[row] = (text_t *)talloc->alloc (); |
|
|
142 | rp[row] = (rend_t *)ralloc->alloc (); |
|
|
143 | } |
|
|
144 | |
141 | |
145 | scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); |
142 | scr_blank_line (l, 0, ncol, efs); |
146 | } |
143 | } |
147 | |
144 | |
148 | /* ------------------------------------------------------------------------- * |
145 | /* ------------------------------------------------------------------------- * |
149 | * SCREEN INITIALISATION * |
146 | * SCREEN INITIALISATION * |
150 | * ------------------------------------------------------------------------- */ |
147 | * ------------------------------------------------------------------------- */ |
151 | void |
148 | void |
152 | rxvt_term::scr_reset () |
149 | rxvt_term::scr_reset () |
153 | { |
150 | { |
154 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
|
|
155 | unsigned int p, q; |
151 | unsigned int p, q; |
156 | int k; |
152 | int k; |
157 | rend_t setrstyle; |
|
|
158 | |
153 | |
159 | #if ENABLE_OVERLAY |
154 | #if ENABLE_OVERLAY |
160 | scr_overlay_off (); |
155 | scr_overlay_off (); |
161 | #endif |
156 | #endif |
162 | |
157 | |
163 | TermWin.view_start = 0; |
158 | view_start = 0; |
164 | num_scr = 0; |
159 | num_scr = 0; |
165 | |
160 | |
166 | if (TermWin.ncol == 0) |
161 | if (ncol == 0) |
167 | TermWin.ncol = 80; |
162 | ncol = 80; |
168 | |
163 | |
169 | if (TermWin.nrow == 0) |
164 | if (nrow == 0) |
170 | TermWin.nrow = 24; |
165 | nrow = 24; |
171 | |
|
|
172 | ncol = TermWin.ncol; |
|
|
173 | nrow = TermWin.nrow; |
|
|
174 | |
166 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
167 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
168 | return; |
177 | |
169 | |
178 | // we need at least two lines for wrapping to work correctly |
170 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + TermWin.saveLines < 2) |
171 | if (nrow + saveLines < 2) |
180 | { |
172 | { |
181 | TermWin.saveLines++; |
173 | saveLines++; |
182 | prev_nrow--; |
174 | prev_nrow--; |
183 | TermWin.nscrolled++; |
175 | nscrolled++; |
184 | } |
176 | } |
185 | |
177 | |
186 | want_refresh = 1; |
178 | want_refresh = 1; |
187 | |
179 | |
188 | prev_total_rows = prev_nrow + TermWin.saveLines; |
180 | int prev_total_rows = prev_nrow + saveLines; |
189 | total_rows = nrow + TermWin.saveLines; |
181 | int total_rows = nrow + saveLines; |
190 | |
182 | |
191 | screen.tscroll = 0; |
183 | screen.tscroll = 0; |
192 | screen.bscroll = nrow - 1; |
184 | screen.bscroll = nrow - 1; |
193 | |
185 | |
194 | if (!talloc) |
186 | if (!save) |
195 | { |
|
|
196 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
197 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
198 | } |
|
|
199 | |
|
|
200 | if (!screen.text) |
|
|
201 | { |
187 | { |
202 | /* |
188 | /* |
203 | * first time called so just malloc everything: don't rely on realloc |
189 | * first time called so just malloc everything: don't rely on realloc |
204 | * Note: this is still needed so that all the scrollback lines are NULL |
190 | * Note: this is still needed so that all the scrollback lines are NULL |
205 | */ |
191 | */ |
|
|
192 | nscrolled = 0; /* no saved lines */ |
|
|
193 | term_start = 0; |
|
|
194 | nsaved = 0; |
|
|
195 | |
|
|
196 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
197 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
198 | |
|
|
199 | save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
200 | buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
201 | drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
|
|
202 | swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); |
|
|
203 | |
206 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
204 | screen.line = (line_t **)rxvt_calloc (nrow, sizeof (line_t *)); |
207 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
|
|
208 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
|
|
209 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
|
|
210 | |
205 | |
211 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
206 | scr_update_term (); |
212 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
|
|
213 | |
207 | |
214 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
215 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
216 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
|
|
217 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
|
|
218 | |
|
|
219 | for (p = 0; p < nrow; p++) |
208 | for (p = nrow; p--; ) |
220 | { |
209 | { |
221 | q = p + TermWin.saveLines; |
|
|
222 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
210 | scr_blank_screen_mem (*screen.line[p], DEFAULT_RSTYLE); |
223 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
211 | scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
224 | screen.tlen[q] = swap.tlen[p] = 0; |
|
|
225 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
226 | } |
213 | } |
227 | |
214 | |
228 | memset (charsets, 'B', sizeof (charsets)); |
215 | memset (charsets, 'B', sizeof (charsets)); |
229 | TermWin.nscrolled = 0; /* no saved lines */ |
|
|
230 | rstyle = DEFAULT_RSTYLE; |
216 | rstyle = DEFAULT_RSTYLE; |
231 | screen.flags = Screen_DefaultFlags; |
217 | screen.flags = Screen_DefaultFlags; |
232 | screen.cur.row = screen.cur.col = 0; |
218 | screen.cur.row = screen.cur.col = 0; |
233 | screen.charset = 0; |
219 | screen.charset = 0; |
234 | current_screen = PRIMARY; |
220 | current_screen = PRIMARY; |
… | |
… | |
254 | else |
240 | else |
255 | { |
241 | { |
256 | /* |
242 | /* |
257 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
258 | */ |
244 | */ |
259 | setrstyle = DEFAULT_RSTYLE; |
245 | |
|
|
246 | rxvt_salloc *old_ta; |
|
|
247 | rxvt_salloc *old_ra; |
260 | |
248 | |
261 | if (nrow < prev_nrow) |
249 | if (nrow < prev_nrow) |
262 | { |
250 | { |
263 | /* delete rows */ |
251 | /* delete rows */ |
264 | k = min (TermWin.nscrolled, prev_nrow - nrow); |
252 | k = min (nscrolled, prev_nrow - nrow); |
|
|
253 | // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO |
265 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
254 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
266 | |
255 | |
267 | for (p = nrow; p < prev_nrow; p++) |
256 | for (p = nrow; p < prev_nrow; p++) |
268 | { |
257 | { |
269 | q = p + TermWin.saveLines; |
258 | lfree (save[p + saveLines]); |
270 | |
|
|
271 | if (screen.text[q]) |
|
|
272 | { |
|
|
273 | #ifdef DEBUG_STRICT |
|
|
274 | assert (screen.rend[q]); |
|
|
275 | #endif |
|
|
276 | talloc->free (screen.text[q]); |
|
|
277 | ralloc->free (screen.rend[q]); |
|
|
278 | } |
|
|
279 | |
|
|
280 | if (swap.text[p]) |
259 | lfree (swap_save[p]); |
281 | { |
|
|
282 | #ifdef DEBUG_STRICT |
|
|
283 | assert (swap.rend[p]); |
|
|
284 | #endif |
|
|
285 | talloc->free (swap.text[p]); |
|
|
286 | ralloc->free (swap.rend[p]); |
|
|
287 | } |
|
|
288 | |
|
|
289 | #ifdef DEBUG_STRICT |
|
|
290 | assert (drawn_text[p] && drawn_rend[p]); |
|
|
291 | #endif |
|
|
292 | talloc->free (drawn_text[p]); |
260 | lfree (drawn[p]); |
293 | ralloc->free (drawn_rend[p]); |
|
|
294 | } |
261 | } |
295 | |
262 | |
296 | /* we have fewer rows so fix up cursor position */ |
263 | /* we have fewer rows so fix up cursor position */ |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
264 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
298 | |
265 | |
… | |
… | |
301 | else if (nrow > prev_nrow) |
268 | else if (nrow > prev_nrow) |
302 | { |
269 | { |
303 | /* add rows */ |
270 | /* add rows */ |
304 | scr_reset_realloc (); /* realloc _first_ */ |
271 | scr_reset_realloc (); /* realloc _first_ */ |
305 | |
272 | |
|
|
273 | int ocol = ncol; |
306 | TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
274 | ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this |
307 | |
275 | |
308 | k = min (TermWin.nscrolled, nrow - prev_nrow); |
276 | k = min (nscrolled, nrow - prev_nrow); |
309 | |
277 | |
310 | for (p = prev_total_rows; p < total_rows; p++) |
278 | for (p = prev_total_rows; p < total_rows; p++) |
311 | { |
279 | save[p].clear (); |
312 | screen.tlen[p] = 0; |
|
|
313 | screen.text[p] = NULL; |
|
|
314 | screen.rend[p] = NULL; |
|
|
315 | } |
|
|
316 | |
280 | |
317 | for (p = prev_total_rows; p < total_rows - k; p++) |
281 | for (p = prev_total_rows; p < total_rows - k; p++) |
318 | scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle); |
282 | scr_blank_screen_mem (save[p], DEFAULT_RSTYLE); |
|
|
283 | |
|
|
284 | scr_update_term (); |
319 | |
285 | |
320 | for (p = prev_nrow; p < nrow; p++) |
286 | for (p = prev_nrow; p < nrow; p++) |
321 | { |
287 | { |
322 | swap.tlen[p] = 0; |
288 | swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); |
323 | swap.text[p] = NULL; |
289 | drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); |
324 | swap.rend[p] = NULL; |
|
|
325 | drawn_text[p] = NULL; |
|
|
326 | drawn_rend[p] = NULL; |
|
|
327 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
|
|
328 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
|
|
329 | } |
290 | } |
330 | |
291 | |
331 | if (k > 0) |
292 | if (k > 0) |
332 | { |
293 | { |
333 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
294 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
334 | screen.cur.row += k; |
295 | screen.cur.row += k; |
335 | screen.s_cur.row += k; |
296 | screen.s_cur.row += k; |
336 | TermWin.nscrolled -= k; |
297 | nscrolled -= k; |
337 | } |
298 | } |
338 | |
299 | |
339 | #ifdef DEBUG_STRICT |
300 | #ifdef DEBUG_STRICT |
340 | assert (screen.cur.row < TermWin.nrow); |
301 | assert (screen.cur.row < nrow); |
341 | #else /* drive with your eyes closed */ |
302 | #else /* drive with your eyes closed */ |
342 | MIN_IT (screen.cur.row, nrow - 1); |
303 | MIN_IT (screen.cur.row, nrow - 1); |
343 | #endif |
304 | #endif |
344 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
305 | ncol = ocol; // save b/c scr_blank_screen_mem uses this |
345 | } |
306 | } |
346 | |
307 | |
347 | /* resize columns */ |
308 | /* resize columns */ |
348 | if (ncol != prev_ncol) |
309 | if (ncol != prev_ncol) |
349 | { |
310 | { |
350 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
311 | old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
351 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
312 | old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
352 | |
313 | |
353 | for (p = 0; p < total_rows; p++) |
314 | for (p = total_rows; p--; ) |
|
|
315 | lresize (save[p]); |
|
|
316 | |
|
|
317 | for (p = nrow; p--; ) |
354 | { |
318 | { |
355 | if (screen.text[p]) |
319 | lresize (drawn[p]); |
|
|
320 | lresize (swap_save[p]); |
|
|
321 | } |
|
|
322 | |
|
|
323 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
|
|
324 | |
|
|
325 | delete old_ta; |
|
|
326 | delete old_ra; |
|
|
327 | } |
|
|
328 | |
|
|
329 | #if 0 |
|
|
330 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
|
|
331 | // to come up with a lean and mean algorithm. |
|
|
332 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
333 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
334 | |
|
|
335 | text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
|
|
336 | rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
|
|
337 | tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t)); |
|
|
338 | |
|
|
339 | for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
|
|
340 | |
|
|
341 | p = prev_total_rows; |
|
|
342 | q = total_rows; |
|
|
343 | |
|
|
344 | while (p > 0 && q > 0) |
|
|
345 | { |
|
|
346 | --p; |
|
|
347 | |
|
|
348 | printf ("pq %d:%d\n", p, q); |
|
|
349 | if (save[p].t) |
|
|
350 | { |
|
|
351 | int llen = save[p].l; |
|
|
352 | |
|
|
353 | assert (llen >= 0); |
|
|
354 | |
|
|
355 | while (p && save[p - 1].l < 0) |
356 | { |
356 | { |
357 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
357 | --p; |
358 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
359 | |
|
|
360 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
|
|
361 | |
|
|
362 | if (ncol > prev_ncol) |
358 | llen += prev_ncol; |
363 | scr_blank_line (&screen.text[p][prev_ncol], |
359 | } |
364 | &screen.rend[p][prev_ncol], |
360 | |
365 | ncol - prev_ncol, setrstyle); |
361 | int qlines = llen / ncol + 1; |
|
|
362 | int lofs = 0; |
|
|
363 | |
|
|
364 | q -= qlines; |
|
|
365 | |
|
|
366 | int qrow = q; |
|
|
367 | |
|
|
368 | printf ("QL %d llen %d\n", qlines, llen);//D |
|
|
369 | for (; qlines--; qrow++) |
|
|
370 | { |
|
|
371 | if (qrow >= 0) |
|
|
372 | { |
|
|
373 | tp [qrow] = (text_t *)ta->alloc (); |
|
|
374 | rp [qrow] = (rend_t *)ra->alloc (); |
|
|
375 | tl [qrow] = LINE_CONT1; |
|
|
376 | |
|
|
377 | int qcol = 0; |
|
|
378 | |
|
|
379 | for (;;) |
|
|
380 | { |
|
|
381 | int prow = lofs / prev_ncol + p; |
|
|
382 | int pcol = lofs % prev_ncol; |
|
|
383 | |
|
|
384 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
|
|
385 | |
|
|
386 | printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); |
|
|
387 | |
|
|
388 | if (len <= 0) |
|
|
389 | { |
|
|
390 | tl [qrow] = qcol; |
|
|
391 | |
|
|
392 | TODO |
|
|
393 | scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol, |
|
|
394 | ncol - qcol, DEFAULT_RSTYLE); |
|
|
395 | |
|
|
396 | break; |
|
|
397 | } |
|
|
398 | |
|
|
399 | assert (lofs < 1000); |
|
|
400 | |
|
|
401 | memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); |
|
|
402 | memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); |
|
|
403 | |
|
|
404 | lofs += len; |
|
|
405 | qcol += len; |
|
|
406 | |
|
|
407 | if (qcol == ncol) |
|
|
408 | break; |
|
|
409 | } |
|
|
410 | } |
|
|
411 | else |
|
|
412 | lofs += ncol; |
366 | } |
413 | } |
367 | } |
414 | } |
368 | |
|
|
369 | for (p = 0; p < nrow; p++) |
|
|
370 | { |
|
|
371 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
|
|
372 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
|
|
373 | |
|
|
374 | if (ncol > prev_ncol) |
|
|
375 | scr_blank_line (&drawn_text[p][prev_ncol], |
|
|
376 | &drawn_rend[p][prev_ncol], |
|
|
377 | ncol - prev_ncol, setrstyle); |
|
|
378 | |
|
|
379 | if (swap.text[p]) |
|
|
380 | { |
|
|
381 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
|
|
382 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
|
|
383 | |
|
|
384 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
|
|
385 | |
|
|
386 | if (ncol > prev_ncol) |
|
|
387 | scr_blank_line (&swap.text[p][prev_ncol], |
|
|
388 | &swap.rend[p][prev_ncol], |
|
|
389 | ncol - prev_ncol, setrstyle); |
|
|
390 | } |
|
|
391 | |
|
|
392 | } |
415 | } |
393 | |
416 | |
394 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
417 | free (screen.text); screen.text = tp; |
|
|
418 | free (screen.rend); screen.rend = rp; |
|
|
419 | free (screen.tlen); screen.tlen = tl; |
395 | |
420 | |
396 | delete talloc; talloc = ta; |
421 | for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D |
397 | delete ralloc; ralloc = ra; |
422 | #endif |
398 | } |
|
|
399 | |
423 | |
400 | if (tabs) |
424 | if (tabs) |
401 | free (tabs); |
425 | free (tabs); |
402 | } |
426 | } |
403 | |
427 | |
… | |
… | |
413 | } |
437 | } |
414 | |
438 | |
415 | void |
439 | void |
416 | rxvt_term::scr_reset_realloc () |
440 | rxvt_term::scr_reset_realloc () |
417 | { |
441 | { |
418 | unsigned int total_rows, nrow; |
442 | unsigned int total_rows = nrow + saveLines; |
419 | |
443 | |
420 | nrow = TermWin.nrow; |
|
|
421 | total_rows = nrow + TermWin.saveLines; |
|
|
422 | /* *INDENT-OFF* */ |
|
|
423 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
444 | screen.line = (line_t **)rxvt_realloc (screen.line, nrow * sizeof (line_t *)); |
424 | buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *)); |
|
|
425 | drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *)); |
|
|
426 | swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *)); |
445 | swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t)); |
427 | |
446 | drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t)); |
428 | screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t)); |
447 | save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t)); |
429 | swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t)); |
448 | buf = (line_t *) rxvt_realloc (buf , total_rows * sizeof (line_t)); |
430 | |
|
|
431 | screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *)); |
|
|
432 | buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *)); |
|
|
433 | drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *)); |
|
|
434 | swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *)); |
|
|
435 | /* *INDENT-ON* */ |
|
|
436 | } |
449 | } |
437 | |
450 | |
438 | /* ------------------------------------------------------------------------- */ |
451 | /* ------------------------------------------------------------------------- */ |
439 | /* |
452 | /* |
440 | * Free everything. That way malloc debugging can find leakage. |
453 | * Free everything. That way malloc debugging can find leakage. |
441 | */ |
454 | */ |
442 | void |
455 | void |
443 | rxvt_term::scr_release () |
456 | rxvt_term::scr_release () |
444 | { |
457 | { |
445 | unsigned int total_rows; |
458 | unsigned int total_rows; |
446 | int i; |
|
|
447 | |
459 | |
448 | total_rows = TermWin.nrow + TermWin.saveLines; |
460 | total_rows = nrow + saveLines; |
449 | |
461 | |
450 | delete talloc; talloc = 0; |
462 | delete talloc; talloc = 0; |
451 | delete ralloc; ralloc = 0; |
463 | delete ralloc; ralloc = 0; |
452 | |
464 | |
453 | free (screen.text); |
|
|
454 | free (screen.tlen); |
465 | free (screen.line); |
455 | free (screen.rend); |
466 | free (save); |
|
|
467 | free (swap_save); |
456 | free (drawn_text); |
468 | free (drawn); |
457 | free (drawn_rend); |
|
|
458 | free (swap.text); |
|
|
459 | free (swap.tlen); |
|
|
460 | free (swap.rend); |
|
|
461 | free (buf_text); |
469 | free (buf); |
462 | free (buf_rend); |
|
|
463 | free (tabs); |
470 | free (tabs); |
464 | |
|
|
465 | /* NULL these so if anything tries to use them, we'll know about it */ |
|
|
466 | screen.text = drawn_text = swap.text = NULL; |
|
|
467 | screen.rend = drawn_rend = swap.rend = NULL; |
|
|
468 | screen.tlen = swap.tlen = NULL; |
|
|
469 | buf_text = NULL; |
|
|
470 | buf_rend = NULL; |
|
|
471 | tabs = NULL; |
|
|
472 | } |
471 | } |
473 | |
472 | |
474 | /* ------------------------------------------------------------------------- */ |
473 | /* ------------------------------------------------------------------------- */ |
475 | /* |
474 | /* |
476 | * Hard reset |
475 | * Hard reset |
… | |
… | |
527 | set_font_style (); |
526 | set_font_style (); |
528 | break; |
527 | break; |
529 | } |
528 | } |
530 | |
529 | |
531 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
530 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
532 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
531 | MIN_IT (s->cur.row, nrow - 1); |
533 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
532 | MIN_IT (s->cur.col, ncol - 1); |
534 | #ifdef DEBUG_STRICT |
533 | #ifdef DEBUG_STRICT |
535 | assert (s->cur.row >= 0); |
534 | assert (s->cur.row >= 0); |
536 | assert (s->cur.col >= 0); |
535 | assert (s->cur.col >= 0); |
537 | #else /* drive with your eyes closed */ |
536 | #else /* drive with your eyes closed */ |
538 | MAX_IT (s->cur.row, 0); |
537 | MAX_IT (s->cur.row, 0); |
… | |
… | |
554 | int offset; |
553 | int offset; |
555 | #endif |
554 | #endif |
556 | |
555 | |
557 | want_refresh = 1; |
556 | want_refresh = 1; |
558 | |
557 | |
559 | TermWin.view_start = 0; |
558 | view_start = 0; |
560 | |
559 | |
561 | if (current_screen == scrn) |
560 | if (current_screen == scrn) |
562 | return scrn; |
561 | return scrn; |
563 | |
562 | |
564 | selection_check (2); /* check for boundary cross */ |
563 | selection_check (2); /* check for boundary cross */ |
… | |
… | |
574 | |
573 | |
575 | #if NSCREENS |
574 | #if NSCREENS |
576 | if (options & Opt_secondaryScreen) |
575 | if (options & Opt_secondaryScreen) |
577 | { |
576 | { |
578 | num_scr = 0; |
577 | num_scr = 0; |
579 | offset = TermWin.saveLines; |
578 | offset = saveLines; |
580 | |
579 | |
581 | for (i = prev_nrow; i--;) |
580 | for (i = prev_nrow; i--;) |
582 | { |
|
|
583 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
|
|
584 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
581 | SWAP_IT (*(screen.line[i]), swap_save[i], line_t); |
585 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
|
|
586 | } |
|
|
587 | |
582 | |
588 | SWAP_IT (screen.charset, swap.charset, int16_t); |
583 | SWAP_IT (screen.charset, swap.charset, int16_t); |
589 | SWAP_IT (screen.flags, swap.flags, int); |
584 | SWAP_IT (screen.flags, swap.flags, int); |
590 | screen.flags |= Screen_VisibleCursor; |
585 | screen.flags |= Screen_VisibleCursor; |
591 | swap.flags |= Screen_VisibleCursor; |
586 | swap.flags |= Screen_VisibleCursor; |
… | |
… | |
609 | |
604 | |
610 | screen.cur.col = 0; |
605 | screen.cur.col = 0; |
611 | |
606 | |
612 | if (screen.cur.row == screen.bscroll) |
607 | if (screen.cur.row == screen.bscroll) |
613 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
608 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
614 | else if (screen.cur.row < TermWin.nrow - 1) |
609 | else if (screen.cur.row < nrow - 1) |
615 | screen.cur.row++; |
610 | screen.cur.row++; |
616 | } |
611 | } |
617 | |
612 | |
618 | /* ------------------------------------------------------------------------- */ |
613 | /* ------------------------------------------------------------------------- */ |
619 | /* |
614 | /* |
… | |
… | |
644 | rstyle = DEFAULT_RSTYLE; |
639 | rstyle = DEFAULT_RSTYLE; |
645 | else |
640 | else |
646 | rstyle &= ~style; |
641 | rstyle &= ~style; |
647 | } |
642 | } |
648 | |
643 | |
|
|
644 | // set screen.line pointers to the actual lines in the save buffer |
|
|
645 | void |
|
|
646 | rxvt_term::scr_update_term () |
|
|
647 | { |
|
|
648 | for (int i = nrow; i--; ) |
|
|
649 | screen.line[i] = save + saveLines + i; |
|
|
650 | } |
|
|
651 | |
649 | /* ------------------------------------------------------------------------- */ |
652 | /* ------------------------------------------------------------------------- */ |
650 | /* |
653 | /* |
651 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
654 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
652 | * count positive ==> scroll up |
655 | * count positive ==> scroll up |
653 | * count negative ==> scroll down |
656 | * count negative ==> scroll down |
… | |
… | |
655 | */ |
658 | */ |
656 | int |
659 | int |
657 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
660 | rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) |
658 | { |
661 | { |
659 | int i, j; |
662 | int i, j; |
660 | long nscrolled; |
|
|
661 | |
663 | |
662 | if (count == 0 || (row1 > row2)) |
664 | if (count == 0 || (row1 > row2)) |
663 | return 0; |
665 | return 0; |
664 | |
666 | |
665 | want_refresh = 1; |
667 | want_refresh = 1; |
666 | |
668 | |
667 | if (row1 == 0 && count > 0 |
669 | if (row1 == 0 && count > 0 |
668 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
670 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
669 | { |
671 | { |
670 | nscrolled = (long)TermWin.nscrolled + (long)count; |
672 | nscrolled += count; |
671 | |
673 | |
672 | if (nscrolled > (long)TermWin.saveLines) |
674 | if (nscrolled > saveLines) |
673 | TermWin.nscrolled = TermWin.saveLines; |
675 | nscrolled = saveLines; |
674 | else |
|
|
675 | TermWin.nscrolled = (unsigned int)nscrolled; |
|
|
676 | |
676 | |
677 | if ((options & Opt_scrollWithBuffer) |
677 | if ((options & Opt_scrollWithBuffer) |
678 | && TermWin.view_start != 0 |
678 | && view_start != 0 |
679 | && TermWin.view_start != TermWin.saveLines) |
679 | && view_start != saveLines) |
680 | scr_page (UP, count); |
680 | scr_page (UP, count); |
681 | } |
681 | } |
682 | else if (!spec) |
682 | else if (!spec) |
683 | row1 += TermWin.saveLines; |
683 | row1 += saveLines; |
684 | |
684 | |
685 | row2 += TermWin.saveLines; |
685 | row2 += saveLines; |
686 | |
686 | |
687 | if (selection.op && current_screen == selection.screen) |
687 | if (selection.op && current_screen == selection.screen) |
688 | { |
688 | { |
689 | i = selection.beg.row + TermWin.saveLines; |
689 | i = selection.beg.row + saveLines; |
690 | j = selection.end.row + TermWin.saveLines; |
690 | j = selection.end.row + saveLines; |
|
|
691 | |
691 | if ((i < row1 && j > row1) |
692 | if ((i < row1 && j > row1) |
692 | || (i < row2 && j > row2) |
693 | || (i < row2 && j > row2) |
693 | || (i - count < row1 && i >= row1) |
694 | || (i - count < row1 && i >= row1) |
694 | || (i - count > row2 && i <= row2) |
695 | || (i - count > row2 && i <= row2) |
695 | || (j - count < row1 && j >= row1) |
696 | || (j - count < row1 && j >= row1) |
… | |
… | |
705 | selection.end.row -= count; |
706 | selection.end.row -= count; |
706 | selection.mark.row -= count; |
707 | selection.mark.row -= count; |
707 | } |
708 | } |
708 | } |
709 | } |
709 | |
710 | |
710 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
711 | selection_check (0); /* _after_ nscrolled update */ |
711 | |
712 | |
712 | num_scr += count; |
713 | num_scr += count; |
713 | j = count; |
714 | j = count; |
714 | |
715 | |
715 | if (count < 0) |
716 | if (count < 0) |
… | |
… | |
721 | if (j > 0) |
722 | if (j > 0) |
722 | { |
723 | { |
723 | /* scroll up */ |
724 | /* scroll up */ |
724 | |
725 | |
725 | /* Copy lines that will get clobbered by the rotation */ |
726 | /* Copy lines that will get clobbered by the rotation */ |
726 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
727 | memcpy (buf, save + row1, count * sizeof (line_t)); |
727 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
|
|
728 | |
728 | |
729 | /* Rotate lines */ |
729 | /* Rotate lines */ |
730 | i = row2 - row1 - count + 1; |
730 | i = row2 - row1 - count + 1; |
731 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
731 | memmove (save + row1, save + row1 + count, i * sizeof (line_t)); |
732 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
|
|
733 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
|
|
734 | |
732 | |
735 | j = row2 - count + 1, i = count; |
733 | j = row2 - count + 1, i = count; |
736 | } |
734 | } |
737 | else /* if (j < 0) */ |
735 | else /* if (j < 0) */ |
738 | { |
736 | { |
739 | /* scroll down */ |
737 | /* scroll down */ |
740 | |
738 | |
741 | /* Copy lines that will get clobbered by the rotation */ |
739 | /* Copy lines that will get clobbered by the rotation */ |
742 | for (i = 0, j = row2; i < count; i++, j--) |
740 | for (i = 0, j = row2; i < count; i++, j--) |
743 | { |
741 | buf[i] = save[j]; |
744 | buf_text[i] = screen.text[j]; |
|
|
745 | buf_rend[i] = screen.rend[j]; |
|
|
746 | } |
|
|
747 | |
742 | |
748 | /* Rotate lines */ |
743 | /* Rotate lines */ |
749 | for (j = row2, i = j - count; i >= row1; i--, j--) |
744 | for (j = row2, i = j - count; i >= row1; i--, j--) |
750 | { |
745 | save[j] = save[i]; |
751 | screen.tlen[j] = screen.tlen[i]; |
|
|
752 | screen.text[j] = screen.text[i]; |
|
|
753 | screen.rend[j] = screen.rend[i]; |
|
|
754 | } |
|
|
755 | |
746 | |
756 | j = row1, i = count; |
747 | j = row1, i = count; |
757 | count = -count; |
748 | count = -count; |
758 | } |
749 | } |
759 | |
750 | |
760 | /* Resurrect lines */ |
751 | /* Resurrect lines */ |
761 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
|
|
762 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
752 | memcpy (save + j, buf, i * sizeof (line_t)); |
763 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
753 | |
|
|
754 | scr_update_term (); |
|
|
755 | |
764 | if (!spec) /* line length may not equal TermWin.ncol */ |
756 | if (!spec) /* line length may not equal ncol */ |
765 | for (; i--; j++) |
757 | for (; i--; j++) |
766 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
758 | scr_blank_screen_mem (save[j], rstyle); |
767 | |
759 | |
768 | return count; |
760 | return count; |
769 | } |
761 | } |
770 | |
762 | |
771 | /* ------------------------------------------------------------------------- */ |
763 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
773 | * Add text given in <str> of length <len> to screen struct |
765 | * Add text given in <str> of length <len> to screen struct |
774 | */ |
766 | */ |
775 | void |
767 | void |
776 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
768 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
777 | { |
769 | { |
|
|
770 | if (len <= 0) /* sanity */ |
|
|
771 | return; |
|
|
772 | |
778 | unsigned char checksel; |
773 | unsigned char checksel; |
779 | unicode_t c; |
774 | unicode_t c; |
780 | int i, row, last_col; |
775 | int row, last_col; |
781 | text_t *stp; |
776 | const unicode_t *strend = str + len; |
782 | rend_t *srp; |
|
|
783 | |
|
|
784 | if (len <= 0) /* sanity */ |
|
|
785 | return; |
|
|
786 | |
777 | |
787 | want_refresh = 1; |
778 | want_refresh = 1; |
788 | ZERO_SCROLLBACK (); |
779 | ZERO_SCROLLBACK (); |
789 | last_col = TermWin.ncol; |
780 | last_col = ncol; |
790 | |
781 | |
791 | if (nlines > 0) |
782 | if (nlines > 0) |
792 | { |
783 | { |
793 | nlines += screen.cur.row - screen.bscroll; |
784 | nlines += screen.cur.row - screen.bscroll; |
794 | if ((nlines > 0) |
785 | if ((nlines > 0) |
795 | && (screen.tscroll == 0) |
786 | && (screen.tscroll == 0) |
796 | && (screen.bscroll == (TermWin.nrow - 1))) |
787 | && (screen.bscroll == (nrow - 1))) |
797 | { |
788 | { |
798 | /* _at least_ this many lines need to be scrolled */ |
789 | /* _at least_ this many lines need to be scrolled */ |
799 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
790 | scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); |
800 | screen.cur.row -= nlines; |
791 | screen.cur.row -= nlines; |
801 | } |
792 | } |
802 | } |
793 | } |
803 | |
794 | |
804 | #ifdef DEBUG_STRICT |
795 | #ifdef DEBUG_STRICT |
805 | assert (screen.cur.col < last_col); |
796 | assert (screen.cur.col < last_col); |
806 | assert ((screen.cur.row < TermWin.nrow) |
797 | assert ((screen.cur.row < nrow) |
807 | && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); |
798 | && (screen.cur.row >= - (int32_t)nscrolled)); |
808 | #else /* drive with your eyes closed */ |
799 | #else /* drive with your eyes closed */ |
809 | MIN_IT (screen.cur.col, last_col - 1); |
800 | MIN_IT (screen.cur.col, last_col - 1); |
810 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
801 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
811 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
802 | MAX_IT (screen.cur.row, - (int32_t)nscrolled); |
812 | #endif |
803 | #endif |
813 | row = screen.cur.row + TermWin.saveLines; |
804 | row = screen.cur.row + saveLines; |
814 | |
805 | |
815 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
806 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
816 | |
807 | |
817 | stp = screen.text[row]; |
808 | line_t *line = save + row; |
818 | srp = screen.rend[row]; |
|
|
819 | |
809 | |
820 | while (len--) |
810 | while (str < strend) |
821 | { |
811 | { |
822 | c = *str++; |
812 | c = *str++; |
823 | |
813 | |
824 | if (c < 0x20) |
814 | if (c < 0x20) |
825 | switch (c) |
815 | if (c == C0_LF) |
|
|
816 | { |
|
|
817 | if (!line->is_longer ()) /* XXX: think about this */ |
|
|
818 | MAX_IT (line->l, screen.cur.col); |
|
|
819 | |
|
|
820 | screen.flags &= ~Screen_WrapNext; |
|
|
821 | |
|
|
822 | if (screen.cur.row == screen.bscroll) |
|
|
823 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
824 | else if (screen.cur.row < (nrow - 1)) |
|
|
825 | row = (++screen.cur.row) + saveLines; |
|
|
826 | |
|
|
827 | line = save + row; /* _must_ refresh */ |
|
|
828 | continue; |
|
|
829 | } |
|
|
830 | else if (c == C0_CR) |
826 | { |
831 | { |
827 | case C0_HT: |
832 | if (!line->is_longer ()) /* XXX: think about this */ |
828 | scr_tab (1, true); |
|
|
829 | continue; |
|
|
830 | |
|
|
831 | case C0_LF: |
|
|
832 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
833 | MAX_IT (screen.tlen[row], screen.cur.col); |
833 | MAX_IT (line->l, screen.cur.col); |
834 | |
834 | |
835 | screen.flags &= ~Screen_WrapNext; |
835 | screen.flags &= ~Screen_WrapNext; |
836 | |
|
|
837 | if (screen.cur.row == screen.bscroll) |
|
|
838 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
839 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
840 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
841 | |
|
|
842 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
843 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
844 | continue; |
|
|
845 | |
|
|
846 | case C0_CR: |
|
|
847 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
848 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
849 | |
|
|
850 | screen.flags &= ~Screen_WrapNext; |
|
|
851 | screen.cur.col = 0; |
836 | screen.cur.col = 0; |
852 | continue; |
837 | continue; |
|
|
838 | } |
|
|
839 | else if (c == C0_HT) |
|
|
840 | { |
|
|
841 | scr_tab (1, true); |
|
|
842 | continue; |
853 | } |
843 | } |
854 | |
844 | |
855 | if (checksel /* see if we're writing within selection */ |
845 | if (checksel /* see if we're writing within selection */ |
856 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
846 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
857 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
847 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
… | |
… | |
865 | CLEAR_SELECTION (); |
855 | CLEAR_SELECTION (); |
866 | } |
856 | } |
867 | |
857 | |
868 | if (screen.flags & Screen_WrapNext) |
858 | if (screen.flags & Screen_WrapNext) |
869 | { |
859 | { |
870 | screen.tlen[row] = -1; |
860 | line->set_is_longer (); |
871 | |
861 | |
872 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
862 | scr_do_wrap (); |
873 | |
|
|
874 | stp = screen.text[row]; /* _must_ refresh */ |
|
|
875 | srp = screen.rend[row]; /* _must_ refresh */ |
|
|
876 | } |
863 | |
|
|
864 | row = screen.cur.row + saveLines; |
|
|
865 | line = save + row; /* _must_ refresh */ |
|
|
866 | } |
|
|
867 | |
|
|
868 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
|
|
869 | if (IN_RANGE (c, 0xd800, 0xdfff)) |
|
|
870 | c = 0xfffd; |
877 | |
871 | |
878 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
872 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
879 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
873 | // do wcwidth before further replacements, as wcwidth might return -1 |
880 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
874 | // for the line drawing characters below as they might be invalid in the current |
|
|
875 | // locale. |
881 | int width = c < 0x100 ? 1 : wcwidth (c); |
876 | int width = c < 0x100 ? 1 : wcwidth (c); |
882 | |
877 | |
883 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
878 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
884 | { |
879 | { |
885 | // vt100 special graphics and line drawing |
880 | // vt100 special graphics and line drawing |
886 | // 5f-7e standard vt100 |
881 | // 5f-7e standard vt100 |
887 | // 40-5e rxvt extension for extra curses acs chars |
882 | // 40-5e rxvt extension for extra curses acs chars |
888 | static uint16_t vt100_0[63] = { // 40 .. 7e |
883 | static uint16_t vt100_0[62] = { // 41 .. 7e |
889 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
884 | 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! |
890 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
885 | 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f |
891 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
886 | 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 |
892 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
887 | 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f |
893 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
888 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
894 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
889 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
895 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
890 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
896 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
891 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
897 | }; |
892 | }; |
898 | |
893 | |
899 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
894 | if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) |
900 | { |
895 | { |
901 | c = vt100_0[c - 0x40]; |
896 | c = vt100_0[c - 0x41]; |
902 | width = 1; |
897 | width = 1; // vt100 line drawing characters are always single-width |
903 | } |
898 | } |
904 | } |
899 | } |
905 | |
900 | |
906 | if (screen.flags & Screen_Insert) |
901 | if (screen.flags & Screen_Insert) |
907 | scr_insdel_chars (width, INSERT); |
902 | scr_insdel_chars (width, INSERT); |
908 | |
903 | |
909 | if (width != 0) |
904 | if (width != 0) |
910 | { |
905 | { |
911 | // some utf-8 decoders decode surrogate characters. |
|
|
912 | if (0xd800 <= c && c <= 0xdfff) |
|
|
913 | c = 0xfffd; |
|
|
914 | |
|
|
915 | #if !UNICODE_3 |
906 | #if !UNICODE_3 |
916 | // trim characters we can't store directly :( |
907 | // trim characters we can't store directly :( |
917 | if (c >= 0x10000) |
908 | if (c >= 0x10000) |
918 | # if ENABLE_COMBINING |
909 | # if ENABLE_COMBINING |
919 | c = rxvt_composite.compose (c); // map to lower 16 bits |
910 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
921 | c = 0xfffd; |
912 | c = 0xfffd; |
922 | # endif |
913 | # endif |
923 | #endif |
914 | #endif |
924 | |
915 | |
925 | // nuke the character at this position, if required |
916 | // nuke the character at this position, if required |
926 | if (stp[screen.cur.col] == NOCHAR |
917 | if (line->t[screen.cur.col] == NOCHAR |
927 | || (screen.cur.col < TermWin.ncol - 1 |
918 | || (screen.cur.col < ncol - 1 |
928 | && stp[screen.cur.col + 1] == NOCHAR)) |
919 | && line->t[screen.cur.col + 1] == NOCHAR)) |
929 | { |
920 | { |
930 | int col = screen.cur.col; |
921 | int col = screen.cur.col; |
931 | |
922 | |
932 | // find begin |
923 | // find begin |
933 | while (col > 0 && stp[col] == NOCHAR) |
924 | while (col > 0 && line->t[col] == NOCHAR) |
934 | col--; |
925 | col--; |
935 | |
926 | |
936 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
927 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
937 | |
928 | |
938 | // found begin, nuke |
929 | // found begin, nuke |
939 | do { |
930 | do { |
940 | stp[col] = ' '; |
931 | line->t[col] = ' '; |
941 | srp[col] = rend; |
932 | line->r[col] = rend; |
942 | col++; |
933 | col++; |
943 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
934 | } while (col < ncol && line->t[col] == NOCHAR); |
944 | } |
935 | } |
945 | |
936 | |
946 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
937 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
938 | |
|
|
939 | // if the character doesn't fit into the remaining columns... |
|
|
940 | if (screen.cur.col > last_col - width && last_col >= width) |
|
|
941 | { |
|
|
942 | // ...output spaces |
|
|
943 | c = ' '; |
|
|
944 | // and try the same character next loop iteration |
|
|
945 | --str; |
|
|
946 | } |
947 | |
947 | |
948 | do |
948 | do |
949 | { |
949 | { |
950 | stp[screen.cur.col] = c; |
950 | line->t[screen.cur.col] = c; |
951 | srp[screen.cur.col] = rend; |
951 | line->r[screen.cur.col] = rend; |
952 | |
952 | |
953 | if (screen.cur.col < last_col - 1) |
953 | if (screen.cur.col < last_col - 1) |
954 | screen.cur.col++; |
954 | screen.cur.col++; |
955 | else |
955 | else |
956 | { |
956 | { |
957 | screen.tlen[row] = last_col; |
957 | line->l = last_col; |
958 | if (screen.flags & Screen_Autowrap) |
958 | if (screen.flags & Screen_Autowrap) |
959 | screen.flags |= Screen_WrapNext; |
959 | screen.flags |= Screen_WrapNext; |
960 | break; |
960 | break; |
961 | } |
961 | } |
962 | |
962 | |
… | |
… | |
964 | } |
964 | } |
965 | while (--width > 0); |
965 | while (--width > 0); |
966 | |
966 | |
967 | // pad with spaces when overwriting wide character with smaller one |
967 | // pad with spaces when overwriting wide character with smaller one |
968 | if (!width) |
968 | if (!width) |
969 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
969 | for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) |
970 | { |
970 | { |
971 | stp[c] = ' '; |
971 | line->t[c] = ' '; |
972 | srp[c] = rend; |
972 | line->r[c] = rend; |
973 | } |
973 | } |
974 | } |
974 | } |
975 | else if (width == 0) |
975 | else // width == 0 |
976 | { |
976 | { |
977 | #if ENABLE_COMBINING |
977 | #if ENABLE_COMBINING |
978 | // handle combining characters |
978 | // handle combining characters |
979 | // we just tag the accent on the previous on-screen character. |
979 | // we just tag the accent on the previous on-screen character. |
980 | // this is arguably not correct, but also arguably not wrong. |
980 | // this is arguably not correct, but also arguably not wrong. |
981 | // we don't handle double-width characters nicely yet. |
981 | // we don't handle double-width characters nicely yet. |
982 | |
|
|
983 | text_t *tp; |
982 | text_t *tp; |
984 | rend_t *rp; |
983 | rend_t *rp; |
985 | |
984 | |
986 | if (screen.cur.col > 0) |
985 | if (screen.cur.col > 0) |
987 | { |
986 | { |
988 | tp = stp + screen.cur.col - 1; |
987 | tp = line->t + screen.cur.col - 1; |
989 | rp = srp + screen.cur.col - 1; |
988 | rp = line->r + screen.cur.col - 1; |
990 | |
989 | |
991 | while (*tp == NOCHAR && tp > stp) |
990 | while (*tp == NOCHAR && tp > line->t) |
992 | tp--, rp--; |
991 | tp--, rp--; |
993 | } |
992 | } |
994 | else if (screen.cur.row > 0 |
993 | else if (screen.cur.row > 0 |
995 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
994 | && save [screen.cur.row - 1 + saveLines].is_longer ()) |
996 | { |
995 | { |
997 | int line = screen.cur.row - 1 + TermWin.saveLines; |
996 | line_t *line = save + (screen.cur.row - 1 + saveLines); |
998 | |
997 | |
999 | tp = screen.text[line] + last_col - 1; |
998 | tp = line->t + last_col - 1; |
1000 | rp = screen.rend[line] + last_col - 1; |
999 | rp = line->r + last_col - 1; |
1001 | |
1000 | |
1002 | while (*tp == NOCHAR && tp > screen.text[line]) |
1001 | while (*tp == NOCHAR && tp > line->t) |
1003 | tp--, rp--; |
1002 | tp--, rp--; |
1004 | } |
1003 | } |
1005 | else |
1004 | else |
1006 | continue; |
1005 | continue; |
1007 | |
1006 | |
… | |
… | |
1014 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1013 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
1015 | #endif |
1014 | #endif |
1016 | } |
1015 | } |
1017 | } |
1016 | } |
1018 | |
1017 | |
1019 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1018 | if (!line->is_longer ()) /* XXX: think about this */ |
1020 | MAX_IT (screen.tlen[row], screen.cur.col); |
1019 | MAX_IT (line->l, screen.cur.col); |
1021 | |
1020 | |
1022 | #ifdef DEBUG_STRICT |
1021 | #ifdef DEBUG_STRICT |
1023 | assert (screen.cur.row >= 0); |
1022 | assert (screen.cur.row >= 0); |
1024 | #else /* drive with your eyes closed */ |
1023 | #else /* drive with your eyes closed */ |
1025 | MAX_IT (screen.cur.row, 0); |
1024 | MAX_IT (screen.cur.row, 0); |
… | |
… | |
1039 | if (screen.cur.col == 0) |
1038 | if (screen.cur.col == 0) |
1040 | { |
1039 | { |
1041 | if (screen.cur.row > 0) |
1040 | if (screen.cur.row > 0) |
1042 | { |
1041 | { |
1043 | #ifdef TERMCAP_HAS_BW |
1042 | #ifdef TERMCAP_HAS_BW |
1044 | screen.cur.col = TermWin.ncol - 1; |
1043 | screen.cur.col = ncol - 1; |
1045 | screen.cur.row--; |
1044 | screen.cur.row--; |
1046 | return; |
1045 | return; |
1047 | #endif |
1046 | #endif |
1048 | } |
1047 | } |
1049 | } |
1048 | } |
… | |
… | |
1069 | |
1068 | |
1070 | if (count == 0) |
1069 | if (count == 0) |
1071 | return; |
1070 | return; |
1072 | else if (count > 0) |
1071 | else if (count > 0) |
1073 | { |
1072 | { |
1074 | int row = TermWin.saveLines + screen.cur.row; |
1073 | int row = saveLines + screen.cur.row; |
1075 | text_t *tp = screen.text[row]; |
1074 | |
1076 | rend_t *rp = screen.rend[row]; |
1075 | line_t &l = save[row]; |
1077 | rend_t base_rend = rp[i]; |
1076 | rend_t base_rend = l.r[i]; |
1078 | ht &= tp[i] == ' '; |
1077 | ht &= l.t[i] == ' '; |
1079 | |
1078 | |
1080 | for (; ++i < TermWin.ncol; ) |
1079 | for (; ++i < ncol; ) |
1081 | if (tabs[i]) |
1080 | if (tabs[i]) |
1082 | { |
1081 | { |
1083 | x = i; |
1082 | x = i; |
1084 | if (!--count) |
1083 | if (!--count) |
1085 | break; |
1084 | break; |
1086 | } |
1085 | } |
1087 | else |
1086 | else |
1088 | ht &= tp[i] == ' ' |
1087 | ht &= l.t[i] == ' ' |
1089 | && RS_SAME (rp[i], base_rend); |
1088 | && RS_SAME (l.r[i], base_rend); |
1090 | |
1089 | |
1091 | if (count) |
1090 | if (count) |
1092 | x = TermWin.ncol - 1; |
1091 | x = ncol - 1; |
1093 | |
1092 | |
1094 | // store horizontal tab commands as characters inside the text |
1093 | // store horizontal tab commands as characters inside the text |
1095 | // buffer so they can be selected and pasted. |
1094 | // buffer so they can be selected and pasted. |
1096 | if (ht && options & Opt_pastableTabs) |
1095 | if (ht && options & Opt_pastableTabs) |
1097 | { |
1096 | { |
1098 | base_rend = SET_FONT (base_rend, 0); |
1097 | base_rend = SET_FONT (base_rend, 0); |
1099 | |
1098 | |
1100 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1099 | if (!l.is_longer ()) /* XXX: think about this */ |
1101 | MAX_IT (screen.tlen[row], x); |
1100 | MAX_IT (l.l, x); |
1102 | |
1101 | |
1103 | i = screen.cur.col; |
1102 | i = screen.cur.col; |
1104 | |
1103 | |
1105 | tp[i] = '\t'; |
1104 | l.t[i] = '\t'; |
1106 | rp[i] = base_rend; |
1105 | l.r[i] = base_rend; |
1107 | |
1106 | |
1108 | while (++i < x) |
1107 | while (++i < x) |
1109 | { |
1108 | { |
1110 | tp[i] = NOCHAR; |
1109 | l.t[i] = NOCHAR; |
1111 | rp[i] = base_rend; |
1110 | l.r[i] = base_rend; |
1112 | } |
1111 | } |
1113 | } |
1112 | } |
1114 | } |
1113 | } |
1115 | else /* if (count < 0) */ |
1114 | else /* if (count < 0) */ |
1116 | { |
1115 | { |
… | |
… | |
1143 | { |
1142 | { |
1144 | if (screen.cur.col > 0) |
1143 | if (screen.cur.col > 0) |
1145 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1144 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1146 | else |
1145 | else |
1147 | { |
1146 | { |
1148 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1147 | if (!save[screen.cur.row + saveLines].l) |
1149 | return; /* um, yeah? */ |
1148 | return; /* um, yeah? */ |
1150 | |
1149 | |
1151 | scr_insdel_chars (1, INSERT); |
1150 | scr_insdel_chars (1, INSERT); |
1152 | } |
1151 | } |
1153 | } |
1152 | } |
… | |
… | |
1163 | void |
1162 | void |
1164 | rxvt_term::scr_forwardindex () |
1163 | rxvt_term::scr_forwardindex () |
1165 | { |
1164 | { |
1166 | int row; |
1165 | int row; |
1167 | |
1166 | |
1168 | if (screen.cur.col < TermWin.ncol - 1) |
1167 | if (screen.cur.col < ncol - 1) |
1169 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1168 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1170 | else |
1169 | else |
1171 | { |
1170 | { |
1172 | row = screen.cur.row + TermWin.saveLines; |
1171 | row = screen.cur.row + saveLines; |
1173 | |
1172 | |
1174 | if (screen.tlen[row] == 0) |
1173 | if (!save[row].l) |
1175 | return; /* um, yeah? */ |
1174 | return; /* um, yeah? */ |
1176 | else if (screen.tlen[row] == -1) |
1175 | |
1177 | screen.tlen[row] = TermWin.ncol; |
1176 | if (save[row].is_longer ()) //TODO//FIXME//LEN |
|
|
1177 | save[row].l = ncol; |
1178 | |
1178 | |
1179 | scr_gotorc (0, 0, R_RELATIVE); |
1179 | scr_gotorc (0, 0, R_RELATIVE); |
1180 | scr_insdel_chars (1, DELETE); |
1180 | scr_insdel_chars (1, DELETE); |
1181 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1181 | scr_gotorc (0, ncol - 1, R_RELATIVE); |
1182 | } |
1182 | } |
1183 | } |
1183 | } |
1184 | #endif |
1184 | #endif |
1185 | |
1185 | |
1186 | /* ------------------------------------------------------------------------- */ |
1186 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1193 | want_refresh = 1; |
1193 | want_refresh = 1; |
1194 | ZERO_SCROLLBACK (); |
1194 | ZERO_SCROLLBACK (); |
1195 | |
1195 | |
1196 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1196 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1197 | MAX_IT (screen.cur.col, 0); |
1197 | MAX_IT (screen.cur.col, 0); |
1198 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1198 | MIN_IT (screen.cur.col, (int32_t)ncol - 1); |
1199 | |
1199 | |
1200 | screen.flags &= ~Screen_WrapNext; |
1200 | screen.flags &= ~Screen_WrapNext; |
1201 | |
1201 | |
1202 | if (relative & R_RELATIVE) |
1202 | if (relative & R_RELATIVE) |
1203 | { |
1203 | { |
… | |
… | |
1228 | else |
1228 | else |
1229 | screen.cur.row = row; |
1229 | screen.cur.row = row; |
1230 | } |
1230 | } |
1231 | |
1231 | |
1232 | MAX_IT (screen.cur.row, 0); |
1232 | MAX_IT (screen.cur.row, 0); |
1233 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1233 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
1234 | } |
1234 | } |
1235 | |
1235 | |
1236 | /* ------------------------------------------------------------------------- */ |
1236 | /* ------------------------------------------------------------------------- */ |
1237 | /* |
1237 | /* |
1238 | * direction should be UP or DN |
1238 | * direction should be UP or DN |
… | |
… | |
1254 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1254 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1255 | else |
1255 | else |
1256 | screen.cur.row += dirn; |
1256 | screen.cur.row += dirn; |
1257 | |
1257 | |
1258 | MAX_IT (screen.cur.row, 0); |
1258 | MAX_IT (screen.cur.row, 0); |
1259 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1259 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
1260 | selection_check (0); |
1260 | selection_check (0); |
1261 | } |
1261 | } |
1262 | |
1262 | |
1263 | /* ------------------------------------------------------------------------- */ |
1263 | /* ------------------------------------------------------------------------- */ |
1264 | /* |
1264 | /* |
… | |
… | |
1275 | want_refresh = 1; |
1275 | want_refresh = 1; |
1276 | ZERO_SCROLLBACK (); |
1276 | ZERO_SCROLLBACK (); |
1277 | |
1277 | |
1278 | selection_check (1); |
1278 | selection_check (1); |
1279 | |
1279 | |
1280 | row = TermWin.saveLines + screen.cur.row; |
1280 | row = saveLines + screen.cur.row; |
|
|
1281 | |
1281 | switch (mode) |
1282 | switch (mode) |
1282 | { |
1283 | { |
1283 | case 0: /* erase to end of line */ |
1284 | case 0: /* erase to end of line */ |
1284 | col = screen.cur.col; |
1285 | col = screen.cur.col; |
1285 | num = TermWin.ncol - col; |
1286 | num = ncol - col; |
1286 | MIN_IT (screen.tlen[row], (int16_t)col); |
1287 | MIN_IT (save[row].l, (int16_t)col); |
1287 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1288 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1288 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1289 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1289 | CLEAR_SELECTION (); |
1290 | CLEAR_SELECTION (); |
1290 | break; |
1291 | break; |
1291 | case 1: /* erase to beginning of line */ |
1292 | case 1: /* erase to beginning of line */ |
… | |
… | |
1295 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1296 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1296 | CLEAR_SELECTION (); |
1297 | CLEAR_SELECTION (); |
1297 | break; |
1298 | break; |
1298 | case 2: /* erase whole line */ |
1299 | case 2: /* erase whole line */ |
1299 | col = 0; |
1300 | col = 0; |
1300 | num = TermWin.ncol; |
1301 | num = ncol; |
1301 | screen.tlen[row] = 0; |
1302 | save[row].l = 0; |
1302 | if (selection.beg.row <= screen.cur.row |
1303 | if (selection.beg.row <= screen.cur.row |
1303 | && selection.end.row >= screen.cur.row) |
1304 | && selection.end.row >= screen.cur.row) |
1304 | CLEAR_SELECTION (); |
1305 | CLEAR_SELECTION (); |
1305 | break; |
1306 | break; |
1306 | default: |
1307 | default: |
1307 | return; |
1308 | return; |
1308 | } |
1309 | } |
1309 | |
1310 | |
1310 | if (screen.text[row]) |
1311 | if (save[row].t) |
1311 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
1312 | scr_blank_line (save[row], col, num, rstyle); |
1312 | else |
1313 | else |
1313 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1314 | scr_blank_screen_mem (save[row], rstyle); |
1314 | } |
1315 | } |
1315 | |
1316 | |
1316 | /* ------------------------------------------------------------------------- */ |
1317 | /* ------------------------------------------------------------------------- */ |
1317 | /* |
1318 | /* |
1318 | * Erase part of whole of the screen |
1319 | * Erase part of whole of the screen |
… | |
… | |
1329 | XGCValues gcvalue; |
1330 | XGCValues gcvalue; |
1330 | |
1331 | |
1331 | want_refresh = 1; |
1332 | want_refresh = 1; |
1332 | ZERO_SCROLLBACK (); |
1333 | ZERO_SCROLLBACK (); |
1333 | |
1334 | |
1334 | row_offset = (int32_t)TermWin.saveLines; |
1335 | row_offset = (int32_t)saveLines; |
1335 | |
1336 | |
1336 | switch (mode) |
1337 | switch (mode) |
1337 | { |
1338 | { |
1338 | case 0: /* erase to end of screen */ |
1339 | case 0: /* erase to end of screen */ |
1339 | selection_check (1); |
1340 | selection_check (1); |
1340 | scr_erase_line (0); |
1341 | scr_erase_line (0); |
1341 | row = screen.cur.row + 1; /* possible OOB */ |
1342 | row = screen.cur.row + 1; /* possible OOB */ |
1342 | num = TermWin.nrow - row; |
1343 | num = nrow - row; |
1343 | break; |
1344 | break; |
1344 | case 1: /* erase to beginning of screen */ |
1345 | case 1: /* erase to beginning of screen */ |
1345 | selection_check (3); |
1346 | selection_check (3); |
1346 | scr_erase_line (1); |
1347 | scr_erase_line (1); |
1347 | row = 0; |
1348 | row = 0; |
1348 | num = screen.cur.row; |
1349 | num = screen.cur.row; |
1349 | break; |
1350 | break; |
1350 | case 2: /* erase whole screen */ |
1351 | case 2: /* erase whole screen */ |
1351 | selection_check (3); |
1352 | selection_check (3); |
1352 | row = 0; |
1353 | row = 0; |
1353 | num = TermWin.nrow; |
1354 | num = nrow; |
1354 | break; |
1355 | break; |
1355 | default: |
1356 | default: |
1356 | return; |
1357 | return; |
1357 | } |
1358 | } |
1358 | |
1359 | |
… | |
… | |
1360 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1361 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1361 | || (selection.end.row >= row |
1362 | || (selection.end.row >= row |
1362 | && selection.end.row <= row + num))) |
1363 | && selection.end.row <= row + num))) |
1363 | CLEAR_SELECTION (); |
1364 | CLEAR_SELECTION (); |
1364 | |
1365 | |
1365 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1366 | if (row >= nrow) /* Out Of Bounds */ |
1366 | return; |
1367 | return; |
1367 | |
1368 | |
1368 | MIN_IT (num, (TermWin.nrow - row)); |
1369 | MIN_IT (num, (nrow - row)); |
1369 | |
1370 | |
1370 | if (rstyle & (RS_RVid | RS_Uline)) |
1371 | if (rstyle & (RS_RVid | RS_Uline)) |
1371 | ren = (rend_t) ~RS_None; |
1372 | ren = (rend_t) ~RS_None; |
1372 | else if (GET_BASEBG (rstyle) == Color_bg) |
1373 | else if (GET_BASEBG (rstyle) == Color_bg) |
1373 | { |
1374 | { |
… | |
… | |
1376 | } |
1377 | } |
1377 | else |
1378 | else |
1378 | { |
1379 | { |
1379 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1380 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1380 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1381 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1381 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1382 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1382 | ERASE_ROWS (row, num); |
1383 | ERASE_ROWS (row, num); |
1383 | gcvalue.foreground = pix_colors[Color_fg]; |
1384 | gcvalue.foreground = pix_colors[Color_fg]; |
1384 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1385 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1385 | } |
1386 | } |
1386 | |
1387 | |
1387 | for (; num--; row++) |
1388 | for (; num--; row++) |
1388 | { |
1389 | { |
1389 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1390 | scr_blank_screen_mem (save[row + row_offset], rstyle); |
1390 | screen.tlen[row + row_offset] = 0; |
1391 | save[row + row_offset].l = 0; |
1391 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1392 | scr_blank_line (drawn[row], 0, ncol, ren); |
1392 | } |
1393 | } |
1393 | } |
1394 | } |
1394 | |
1395 | |
1395 | #if ENABLE_FRILLS |
1396 | #if ENABLE_FRILLS |
1396 | void |
1397 | void |
1397 | rxvt_term::scr_erase_savelines () |
1398 | rxvt_term::scr_erase_savelines () |
1398 | { |
1399 | { |
1399 | want_refresh = 1; |
1400 | want_refresh = 1; |
1400 | ZERO_SCROLLBACK (); |
1401 | ZERO_SCROLLBACK (); |
1401 | |
1402 | |
1402 | TermWin.nscrolled = 0; |
1403 | nscrolled = 0; |
1403 | } |
1404 | } |
1404 | #endif |
1405 | #endif |
1405 | |
1406 | |
1406 | /* ------------------------------------------------------------------------- */ |
1407 | /* ------------------------------------------------------------------------- */ |
1407 | /* |
1408 | /* |
… | |
… | |
1419 | |
1420 | |
1420 | num_scr_allow = 0; |
1421 | num_scr_allow = 0; |
1421 | selection_check (3); |
1422 | selection_check (3); |
1422 | |
1423 | |
1423 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1424 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1424 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1425 | for (k = saveLines, i = nrow; i--; k++) |
1425 | { |
1426 | { |
1426 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1427 | line_t &line = save[k]; |
|
|
1428 | |
1427 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1429 | fill_text (line.t, 'E', ncol); |
|
|
1430 | |
1428 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1431 | for (r1 = line.r, j = ncol; j--; ) |
1429 | *r1++ = fs; |
1432 | *r1++ = fs; |
|
|
1433 | |
|
|
1434 | line.l = ncol; /* make the `E's selectable */ |
1430 | } |
1435 | } |
1431 | } |
1436 | } |
1432 | |
1437 | |
1433 | /* ------------------------------------------------------------------------- */ |
1438 | /* ------------------------------------------------------------------------- */ |
1434 | /* |
1439 | /* |
… | |
… | |
1467 | void |
1472 | void |
1468 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1473 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1469 | { |
1474 | { |
1470 | int col, row; |
1475 | int col, row; |
1471 | rend_t tr; |
1476 | rend_t tr; |
1472 | text_t *stp; |
|
|
1473 | rend_t *srp; |
|
|
1474 | int16_t *slp; |
|
|
1475 | |
1477 | |
1476 | want_refresh = 1; |
1478 | want_refresh = 1; |
1477 | ZERO_SCROLLBACK (); |
1479 | ZERO_SCROLLBACK (); |
1478 | |
1480 | |
1479 | if (count <= 0) |
1481 | if (count <= 0) |
1480 | return; |
1482 | return; |
1481 | |
1483 | |
1482 | scr_do_wrap (); |
1484 | scr_do_wrap (); |
1483 | |
1485 | |
1484 | selection_check (1); |
1486 | selection_check (1); |
1485 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1487 | MIN_IT (count, (ncol - screen.cur.col)); |
1486 | |
1488 | |
1487 | row = screen.cur.row + TermWin.saveLines; |
1489 | row = screen.cur.row + saveLines; |
1488 | |
1490 | |
1489 | stp = screen.text[row]; |
1491 | line_t *line = save + row; |
1490 | srp = screen.rend[row]; |
|
|
1491 | slp = &screen.tlen[row]; |
|
|
1492 | |
1492 | |
1493 | switch (insdel) |
1493 | switch (insdel) |
1494 | { |
1494 | { |
1495 | case INSERT: |
1495 | case INSERT: |
1496 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1496 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1497 | { |
1497 | { |
1498 | stp[col] = stp[col - count]; |
1498 | line->t[col] = line->t[col - count]; |
1499 | srp[col] = srp[col - count]; |
1499 | line->r[col] = line->r[col - count]; |
1500 | } |
1500 | } |
1501 | |
1501 | |
1502 | if (*slp != -1) |
1502 | if (!line->is_longer ()) |
1503 | { |
1503 | { |
1504 | *slp += count; |
1504 | line->l += count; |
1505 | MIN_IT (*slp, TermWin.ncol); |
1505 | MIN_IT (line->l, ncol); |
1506 | } |
1506 | } |
1507 | |
1507 | |
1508 | if (selection.op && current_screen == selection.screen |
1508 | if (selection.op && current_screen == selection.screen |
1509 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1509 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1510 | { |
1510 | { |
1511 | if (selection.end.row != screen.cur.row |
1511 | if (selection.end.row != screen.cur.row |
1512 | || (selection.end.col + count >= TermWin.ncol)) |
1512 | || (selection.end.col + count >= ncol)) |
1513 | CLEAR_SELECTION (); |
1513 | CLEAR_SELECTION (); |
1514 | else |
1514 | else |
1515 | { /* shift selection */ |
1515 | { /* shift selection */ |
1516 | selection.beg.col += count; |
1516 | selection.beg.col += count; |
1517 | selection.mark.col += count; /* XXX: yes? */ |
1517 | selection.mark.col += count; /* XXX: yes? */ |
1518 | selection.end.col += count; |
1518 | selection.end.col += count; |
1519 | } |
1519 | } |
1520 | } |
1520 | } |
1521 | |
1521 | |
1522 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1522 | scr_blank_line (save[row], screen.cur.col, count, rstyle); |
1523 | (unsigned int)count, rstyle); |
|
|
1524 | break; |
1523 | break; |
1525 | |
1524 | |
1526 | case ERASE: |
1525 | case ERASE: |
1527 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1526 | screen.cur.col += count; /* don't worry if > ncol */ |
1528 | selection_check (1); |
1527 | selection_check (1); |
1529 | screen.cur.col -= count; |
1528 | screen.cur.col -= count; |
1530 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1529 | scr_blank_line (save[row], screen.cur.col, count, rstyle); |
1531 | (unsigned int)count, rstyle); |
|
|
1532 | break; |
1530 | break; |
1533 | |
1531 | |
1534 | case DELETE: |
1532 | case DELETE: |
1535 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1533 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1536 | |
1534 | |
1537 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1535 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1538 | { |
1536 | { |
1539 | stp[col] = stp[col + count]; |
1537 | line->t[col] = line->t[col + count]; |
1540 | srp[col] = srp[col + count]; |
1538 | line->r[col] = line->r[col + count]; |
1541 | } |
1539 | } |
1542 | |
1540 | |
1543 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1541 | scr_blank_line (*line, ncol - count, count, tr); |
1544 | (unsigned int)count, tr); |
|
|
1545 | |
1542 | |
1546 | if (*slp == -1) /* break line continuation */ |
1543 | if (line->is_longer ()) /* break line continuation */ |
1547 | *slp = TermWin.ncol; |
1544 | line->l = ncol; |
1548 | |
1545 | |
1549 | *slp -= count; |
1546 | line->l -= count; |
1550 | MAX_IT (*slp, 0); |
1547 | MAX_IT (line->l, 0); |
1551 | |
1548 | |
1552 | if (selection.op && current_screen == selection.screen |
1549 | if (selection.op && current_screen == selection.screen |
1553 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1550 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1554 | { |
1551 | { |
1555 | if (selection.end.row != screen.cur.row |
1552 | if (selection.end.row != screen.cur.row |
1556 | || (screen.cur.col >= selection.beg.col - count) |
1553 | || (screen.cur.col >= selection.beg.col - count) |
1557 | || selection.end.col >= TermWin.ncol) |
1554 | || selection.end.col >= ncol) |
1558 | CLEAR_SELECTION (); |
1555 | CLEAR_SELECTION (); |
1559 | else |
1556 | else |
1560 | { |
1557 | { |
1561 | /* shift selection */ |
1558 | /* shift selection */ |
1562 | selection.beg.col -= count; |
1559 | selection.beg.col -= count; |
… | |
… | |
1576 | */ |
1573 | */ |
1577 | void |
1574 | void |
1578 | rxvt_term::scr_scroll_region (int top, int bot) |
1575 | rxvt_term::scr_scroll_region (int top, int bot) |
1579 | { |
1576 | { |
1580 | MAX_IT (top, 0); |
1577 | MAX_IT (top, 0); |
1581 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1578 | MIN_IT (bot, (int)nrow - 1); |
1582 | |
1579 | |
1583 | if (top > bot) |
1580 | if (top > bot) |
1584 | return; |
1581 | return; |
1585 | |
1582 | |
1586 | screen.tscroll = top; |
1583 | screen.tscroll = top; |
… | |
… | |
1665 | */ |
1662 | */ |
1666 | void |
1663 | void |
1667 | rxvt_term::scr_set_tab (int mode) |
1664 | rxvt_term::scr_set_tab (int mode) |
1668 | { |
1665 | { |
1669 | if (mode < 0) |
1666 | if (mode < 0) |
1670 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1667 | memset (tabs, 0, ncol * sizeof (char)); |
1671 | else if (screen.cur.col < TermWin.ncol) |
1668 | else if (screen.cur.col < ncol) |
1672 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1669 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1673 | } |
1670 | } |
1674 | |
1671 | |
1675 | /* ------------------------------------------------------------------------- */ |
1672 | /* ------------------------------------------------------------------------- */ |
1676 | /* |
1673 | /* |
… | |
… | |
1691 | if (bgPixmap.pixmap == None) |
1688 | if (bgPixmap.pixmap == None) |
1692 | #endif |
1689 | #endif |
1693 | #if TRANSPARENT |
1690 | #if TRANSPARENT |
1694 | if (! (options & Opt_transparent) || am_transparent == 0) |
1691 | if (! (options & Opt_transparent) || am_transparent == 0) |
1695 | #endif |
1692 | #endif |
1696 | XSetWindowBackground (display->display, TermWin.vt, |
1693 | XSetWindowBackground (display->display, vt, |
1697 | pix_colors[Color_bg]); |
1694 | pix_colors[Color_bg]); |
1698 | |
1695 | |
1699 | gcvalue.foreground = pix_colors[Color_fg]; |
1696 | gcvalue.foreground = pix_colors[Color_fg]; |
1700 | gcvalue.background = pix_colors[Color_bg]; |
1697 | gcvalue.background = pix_colors[Color_bg]; |
1701 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1698 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1702 | &gcvalue); |
1699 | &gcvalue); |
1703 | scr_clear (); |
1700 | scr_clear (); |
1704 | scr_touch (true); |
1701 | scr_touch (true); |
1705 | } |
1702 | } |
1706 | } |
1703 | } |
… | |
… | |
1787 | bool |
1784 | bool |
1788 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1785 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1789 | { |
1786 | { |
1790 | bool found = false; |
1787 | bool found = false; |
1791 | |
1788 | |
1792 | for (int i = 0; i < TermWin.nrow; i++) |
1789 | for (int i = 0; i < nrow; i++) |
1793 | { |
1790 | { |
1794 | int col = 0; |
1791 | int col = 0; |
1795 | rend_t *drp = drawn_rend [i]; |
1792 | rend_t *drp = drawn[i].r; |
1796 | |
1793 | |
1797 | for (; col < TermWin.ncol; col++, drp++) |
1794 | for (; col < ncol; col++, drp++) |
1798 | if ((*drp & mask) == value) |
1795 | if ((*drp & mask) == value) |
1799 | { |
1796 | { |
1800 | found = true; |
1797 | found = true; |
1801 | *drp = ~value; |
1798 | *drp = ~value; |
1802 | } |
1799 | } |
… | |
… | |
1813 | PART_END, |
1810 | PART_END, |
1814 | RC_COUNT |
1811 | RC_COUNT |
1815 | }; |
1812 | }; |
1816 | |
1813 | |
1817 | void |
1814 | void |
1818 | rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) |
1815 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1819 | { |
1816 | { |
1820 | int i; |
1817 | int i; |
1821 | row_col_t rc[RC_COUNT]; |
1818 | row_col_t rc[RC_COUNT]; |
1822 | |
1819 | |
1823 | if (drawn_text == NULL) /* sanity check */ |
1820 | if (!drawn) /* sanity check */ |
1824 | return; |
1821 | return; |
1825 | |
1822 | |
1826 | #ifndef NO_SLOW_LINK_SUPPORT |
1823 | #ifndef NO_SLOW_LINK_SUPPORT |
1827 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1824 | if (refresh_type == FAST_REFRESH && !display->is_local) |
1828 | { |
1825 | { |
1829 | y = 0; |
1826 | y = 0; |
1830 | height = TermWin.height; |
1827 | eheight = height; |
1831 | } |
1828 | } |
1832 | #endif |
1829 | #endif |
1833 | |
1830 | |
1834 | #ifdef DEBUG_STRICT |
1831 | #ifdef DEBUG_STRICT |
1835 | x = max (x, 0); |
1832 | x = max (x, 0); |
1836 | x = min (x, (int)TermWin.width); |
1833 | x = min (x, (int)width); |
1837 | y = max (y, 0); |
1834 | y = max (y, 0); |
1838 | y = min (y, (int)TermWin.height); |
1835 | y = min (y, (int)height); |
1839 | #endif |
1836 | #endif |
1840 | |
1837 | |
1841 | /* round down */ |
1838 | /* round down */ |
1842 | rc[PART_BEG].col = Pixel2Col (x); |
1839 | rc[PART_BEG].col = Pixel2Col (x); |
1843 | rc[PART_BEG].row = Pixel2Row (y); |
1840 | rc[PART_BEG].row = Pixel2Row (y); |
1844 | /* round up */ |
1841 | /* round up */ |
1845 | rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); |
1842 | rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); |
1846 | rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); |
1843 | rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); |
1847 | |
1844 | |
1848 | /* sanity checks */ |
1845 | /* sanity checks */ |
1849 | for (i = PART_BEG; i < RC_COUNT; i++) |
1846 | for (i = PART_BEG; i < RC_COUNT; i++) |
1850 | { |
1847 | { |
1851 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1848 | MIN_IT (rc[i].col, ncol - 1); |
1852 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1849 | MIN_IT (rc[i].row, nrow - 1); |
1853 | } |
1850 | } |
1854 | |
1851 | |
1855 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1852 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1856 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1853 | fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1857 | |
1854 | |
1858 | if (refresh) |
1855 | if (refresh) |
1859 | scr_refresh (SLOW_REFRESH); |
1856 | scr_refresh (SLOW_REFRESH); |
1860 | } |
1857 | } |
1861 | |
1858 | |
… | |
… | |
1864 | * Refresh the entire screen |
1861 | * Refresh the entire screen |
1865 | */ |
1862 | */ |
1866 | void |
1863 | void |
1867 | rxvt_term::scr_touch (bool refresh) |
1864 | rxvt_term::scr_touch (bool refresh) |
1868 | { |
1865 | { |
1869 | scr_expose (0, 0, TermWin.width, TermWin.height, refresh); |
1866 | scr_expose (0, 0, width, height, refresh); |
1870 | } |
1867 | } |
1871 | |
1868 | |
1872 | /* ------------------------------------------------------------------------- */ |
1869 | /* ------------------------------------------------------------------------- */ |
1873 | /* |
1870 | /* |
1874 | * Move the display so that the line represented by scrollbar value Y is at |
1871 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1878 | rxvt_term::scr_move_to (int y, int len) |
1875 | rxvt_term::scr_move_to (int y, int len) |
1879 | { |
1876 | { |
1880 | long p = 0; |
1877 | long p = 0; |
1881 | unsigned int oldviewstart; |
1878 | unsigned int oldviewstart; |
1882 | |
1879 | |
1883 | oldviewstart = TermWin.view_start; |
1880 | oldviewstart = view_start; |
1884 | |
1881 | |
1885 | if (y < len) |
1882 | if (y < len) |
1886 | { |
1883 | { |
1887 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1884 | p = (nrow + nscrolled) * (len - y) / len; |
1888 | p -= (long) (TermWin.nrow - 1); |
1885 | p -= (long) (nrow - 1); |
1889 | p = max (p, 0); |
1886 | p = max (p, 0); |
1890 | } |
1887 | } |
1891 | |
1888 | |
1892 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1889 | view_start = (unsigned int)min (p, nscrolled); |
1893 | |
1890 | |
1894 | return scr_changeview (oldviewstart); |
1891 | return scr_changeview (oldviewstart); |
1895 | } |
1892 | } |
1896 | |
1893 | |
1897 | /* ------------------------------------------------------------------------- */ |
1894 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1903 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1900 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1904 | { |
1901 | { |
1905 | int n; |
1902 | int n; |
1906 | unsigned int oldviewstart; |
1903 | unsigned int oldviewstart; |
1907 | |
1904 | |
1908 | oldviewstart = TermWin.view_start; |
1905 | oldviewstart = view_start; |
1909 | |
1906 | |
1910 | if (direction == UP) |
1907 | if (direction == UP) |
1911 | { |
1908 | { |
1912 | n = TermWin.view_start + nlines; |
1909 | n = view_start + nlines; |
1913 | TermWin.view_start = min (n, TermWin.nscrolled); |
1910 | view_start = min (n, nscrolled); |
1914 | } |
1911 | } |
1915 | else |
1912 | else |
1916 | { |
1913 | { |
1917 | n = TermWin.view_start - nlines; |
1914 | n = view_start - nlines; |
1918 | TermWin.view_start = max (n, 0); |
1915 | view_start = max (n, 0); |
1919 | } |
1916 | } |
1920 | |
1917 | |
1921 | return scr_changeview (oldviewstart); |
1918 | return scr_changeview (oldviewstart); |
1922 | } |
1919 | } |
1923 | |
1920 | |
1924 | int |
1921 | int |
1925 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1922 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1926 | { |
1923 | { |
1927 | if (TermWin.view_start != oldviewstart) |
1924 | if (view_start != oldviewstart) |
1928 | { |
1925 | { |
1929 | want_refresh = 1; |
1926 | want_refresh = 1; |
1930 | num_scr -= (TermWin.view_start - oldviewstart); |
1927 | num_scr -= (view_start - oldviewstart); |
1931 | } |
1928 | } |
1932 | |
1929 | |
1933 | return (int) (TermWin.view_start - oldviewstart); |
1930 | return (int) (view_start - oldviewstart); |
1934 | } |
1931 | } |
1935 | |
1932 | |
1936 | /* ------------------------------------------------------------------------- */ |
1933 | /* ------------------------------------------------------------------------- */ |
1937 | void |
1934 | void |
1938 | rxvt_term::scr_bell () |
1935 | rxvt_term::scr_bell () |
1939 | { |
1936 | { |
1940 | #ifndef NO_BELL |
1937 | #ifndef NO_BELL |
|
|
1938 | |
1941 | # ifndef NO_MAPALERT |
1939 | # ifndef NO_MAPALERT |
1942 | # ifdef MAPALERT_OPTION |
1940 | # ifdef MAPALERT_OPTION |
1943 | if (options & Opt_mapAlert) |
1941 | if (options & Opt_mapAlert) |
1944 | # endif |
1942 | # endif |
1945 | XMapWindow (display->display, TermWin.parent[0]); |
1943 | XMapWindow (display->display, parent[0]); |
1946 | # endif |
1944 | # endif |
|
|
1945 | |
1947 | if (options & Opt_visualBell) |
1946 | if (options & Opt_visualBell) |
1948 | { |
1947 | { |
1949 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1948 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1949 | rxvt_usleep (VISUAL_BELL_DURATION); |
1950 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1950 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1951 | } |
1951 | } |
1952 | else |
1952 | else |
1953 | XBell (display->display, 0); |
1953 | XBell (display->display, 0); |
|
|
1954 | |
1954 | #endif |
1955 | #endif |
1955 | } |
1956 | } |
1956 | |
1957 | |
1957 | /* ------------------------------------------------------------------------- */ |
1958 | /* ------------------------------------------------------------------------- */ |
1958 | /* ARGSUSED */ |
1959 | /* ARGSUSED */ |
… | |
… | |
1964 | FILE *fd; |
1965 | FILE *fd; |
1965 | |
1966 | |
1966 | if ((fd = popen_printer ()) == NULL) |
1967 | if ((fd = popen_printer ()) == NULL) |
1967 | return; |
1968 | return; |
1968 | |
1969 | |
1969 | nrows = TermWin.nrow; |
1970 | nrows = nrow; |
1970 | row_offset = TermWin.saveLines; |
1971 | row_offset = saveLines; |
1971 | |
1972 | |
1972 | if (!fullhist) |
1973 | if (!fullhist) |
1973 | row_offset -= TermWin.view_start; |
1974 | row_offset -= view_start; |
1974 | else |
1975 | else |
1975 | { |
1976 | { |
1976 | nrows += TermWin.nscrolled; |
1977 | nrows += nscrolled; |
1977 | row_offset -= TermWin.nscrolled; |
1978 | row_offset -= nscrolled; |
1978 | } |
1979 | } |
1979 | |
1980 | |
1980 | wctomb (0, 0); |
1981 | wctomb (0, 0); |
1981 | |
1982 | |
1982 | for (r1 = 0; r1 < nrows; r1++) |
1983 | for (r1 = 0; r1 < nrows; r1++) |
1983 | { |
1984 | { |
1984 | text_t *tp = screen.text[r1 + row_offset]; |
1985 | text_t *tp = save[r1 + row_offset].t; |
1985 | int len = screen.tlen[r1 + row_offset]; |
1986 | int len = save[r1 + row_offset].l; |
1986 | |
1987 | |
1987 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1988 | for (i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1988 | { |
1989 | { |
1989 | char mb[MB_LEN_MAX]; |
1990 | char mb[MB_LEN_MAX]; |
1990 | text_t t = *tp++; |
1991 | text_t t = *tp++; |
1991 | if (t == NOCHAR) |
1992 | if (t == NOCHAR) |
1992 | continue; |
1993 | continue; |
… | |
… | |
2013 | /* |
2014 | /* |
2014 | * Refresh the screen |
2015 | * Refresh the screen |
2015 | * drawn_text/drawn_rend contain the screen information before the update. |
2016 | * drawn_text/drawn_rend contain the screen information before the update. |
2016 | * screen.text/screen.rend contain what the screen will change to. |
2017 | * screen.text/screen.rend contain what the screen will change to. |
2017 | */ |
2018 | */ |
2018 | |
|
|
2019 | #define FONT_WIDTH(X, Y) \ |
|
|
2020 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
|
|
2021 | #define FONT_RBEAR(X, Y) \ |
|
|
2022 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
|
|
2023 | #define FONT_LBEAR(X, Y) \ |
|
|
2024 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
|
|
2025 | #define IS_FONT_CHAR(X, Y) \ |
|
|
2026 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
|
|
2027 | |
|
|
2028 | void |
2019 | void |
2029 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2020 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2030 | { |
2021 | { |
2031 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2022 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2032 | showcursor; /* show the cursor */ |
2023 | showcursor; /* show the cursor */ |
… | |
… | |
2039 | #endif |
2030 | #endif |
2040 | rend_t *crp; // cursor rendition pointer |
2031 | rend_t *crp; // cursor rendition pointer |
2041 | |
2032 | |
2042 | want_refresh = 0; /* screen is current */ |
2033 | want_refresh = 0; /* screen is current */ |
2043 | |
2034 | |
2044 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
2035 | if (refresh_type == NO_REFRESH || !mapped) |
2045 | return; |
2036 | return; |
2046 | |
2037 | |
2047 | /* |
2038 | /* |
2048 | * A: set up vars |
2039 | * A: set up vars |
2049 | */ |
2040 | */ |
2050 | must_clear = 0; |
2041 | must_clear = 0; |
2051 | refresh_count = 0; |
2042 | refresh_count = 0; |
2052 | |
2043 | |
2053 | row_offset = TermWin.saveLines - TermWin.view_start; |
2044 | row_offset = saveLines - view_start; |
2054 | |
2045 | |
2055 | #if XPM_BACKGROUND |
2046 | #if XPM_BACKGROUND |
2056 | must_clear |= (bgPixmap.pixmap != None); |
2047 | must_clear |= bgPixmap.pixmap != None; |
2057 | #endif |
2048 | #endif |
2058 | #if TRANSPARENT |
2049 | #if TRANSPARENT |
2059 | must_clear |= ((options & Opt_transparent) && am_transparent); |
2050 | must_clear |= (options & Opt_transparent) && am_transparent; |
2060 | #endif |
2051 | #endif |
2061 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2052 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2062 | |
2053 | |
2063 | /* |
2054 | /* |
2064 | * B: reverse any characters which are selected |
2055 | * B: reverse any characters which are selected |
… | |
… | |
2081 | |
2072 | |
2082 | if (showcursor) |
2073 | if (showcursor) |
2083 | { |
2074 | { |
2084 | int col = screen.cur.col; |
2075 | int col = screen.cur.col; |
2085 | |
2076 | |
2086 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
2077 | while (col && screen.line[screen.cur.row]->t[col] == NOCHAR) |
2087 | col--; |
2078 | col--; |
2088 | |
2079 | |
2089 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
2080 | crp = &screen.line[screen.cur.row]->r[col]; |
2090 | |
2081 | |
2091 | if (showcursor && TermWin.focus) |
2082 | if (showcursor && focus) |
2092 | { |
2083 | { |
|
|
2084 | if (options & Opt_cursorUnderline) |
|
|
2085 | *crp ^= RS_Uline; |
|
|
2086 | else |
|
|
2087 | { |
2093 | *crp ^= RS_RVid; |
2088 | *crp ^= RS_RVid; |
|
|
2089 | |
2094 | #ifndef NO_CURSORCOLOR |
2090 | #ifndef NO_CURSORCOLOR |
2095 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2091 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2096 | if (ISSET_PIXCOLOR (Color_cursor)) |
2092 | if (ISSET_PIXCOLOR (Color_cursor)) |
2097 | ccol1 = Color_cursor; |
2093 | ccol1 = Color_cursor; |
2098 | else |
2094 | else |
2099 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2095 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2100 | ccol1 = GET_FGCOLOR (rstyle); |
2096 | ccol1 = GET_FGCOLOR (rstyle); |
2101 | #else |
2097 | #else |
2102 | ccol1 = Color_fg; |
2098 | ccol1 = Color_fg; |
2103 | #endif |
2099 | #endif |
2104 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2100 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2105 | ccol2 = Color_cursor2; |
2101 | ccol2 = Color_cursor2; |
2106 | else |
2102 | else |
2107 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2103 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2108 | ccol2 = GET_BGCOLOR (rstyle); |
2104 | ccol2 = GET_BGCOLOR (rstyle); |
2109 | #else |
2105 | #else |
2110 | ccol2 = Color_bg; |
2106 | ccol2 = Color_bg; |
2111 | #endif |
2107 | #endif |
2112 | *crp = SET_FGCOLOR (*crp, ccol1); |
2108 | *crp = SET_FGCOLOR (*crp, ccol1); |
2113 | *crp = SET_BGCOLOR (*crp, ccol2); |
2109 | *crp = SET_BGCOLOR (*crp, ccol2); |
2114 | #endif |
2110 | #endif |
|
|
2111 | } |
2115 | } |
2112 | } |
2116 | } |
2113 | } |
2117 | |
2114 | |
2118 | /* make sure no outline cursor is left around */ |
2115 | /* make sure no outline cursor is left around */ |
2119 | setoldcursor = 0; |
2116 | setoldcursor = 0; |
2120 | if (ocrow != -1) |
2117 | if (ocrow != -1) |
2121 | { |
2118 | { |
2122 | if (screen.cur.row + TermWin.view_start != ocrow |
2119 | if (screen.cur.row + view_start != ocrow |
2123 | || screen.cur.col != oldcursor.col) |
2120 | || screen.cur.col != oldcursor.col) |
2124 | { |
2121 | { |
2125 | if (ocrow < TermWin.nrow |
2122 | if (ocrow < nrow |
2126 | && oldcursor.col < TermWin.ncol) |
2123 | && oldcursor.col < ncol) |
2127 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2124 | drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2128 | |
2125 | |
2129 | if (TermWin.focus || !showcursor) |
2126 | if (focus || !showcursor) |
2130 | oldcursor.row = -1; |
2127 | oldcursor.row = -1; |
2131 | else |
2128 | else |
2132 | setoldcursor = 1; |
2129 | setoldcursor = 1; |
2133 | } |
2130 | } |
2134 | } |
2131 | } |
2135 | else if (!TermWin.focus) |
2132 | else if (!focus) |
2136 | setoldcursor = 1; |
2133 | setoldcursor = 1; |
2137 | |
2134 | |
2138 | if (setoldcursor) |
2135 | if (setoldcursor) |
2139 | { |
2136 | { |
2140 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2137 | if (screen.cur.row + view_start >= nrow) |
2141 | oldcursor.row = -1; |
2138 | oldcursor.row = -1; |
2142 | else |
2139 | else |
2143 | { |
2140 | { |
2144 | oldcursor.row = screen.cur.row + TermWin.view_start; |
2141 | oldcursor.row = screen.cur.row + view_start; |
2145 | oldcursor.col = screen.cur.col; |
2142 | oldcursor.col = screen.cur.col; |
2146 | } |
2143 | } |
2147 | } |
2144 | } |
2148 | } |
2145 | } |
2149 | |
2146 | |
2150 | #if ENABLE_OVERLAY |
2147 | #if ENABLE_OVERLAY |
2151 | scr_swap_overlay (); |
2148 | scr_swap_overlay (); |
2152 | #endif |
2149 | #endif |
2153 | |
|
|
2154 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2155 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2156 | |
2150 | |
2157 | #ifndef NO_SLOW_LINK_SUPPORT |
2151 | #ifndef NO_SLOW_LINK_SUPPORT |
2158 | /* |
2152 | /* |
2159 | * D: CopyArea pass - very useful for slower links |
2153 | * D: CopyArea pass - very useful for slower links |
2160 | * This has been deliberately kept simple. |
2154 | * This has been deliberately kept simple. |
2161 | */ |
2155 | */ |
2162 | i = num_scr; |
2156 | i = num_scr; |
2163 | if (!display->is_local |
2157 | if (!display->is_local |
2164 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2158 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2165 | && abs (i) < TermWin.nrow && !must_clear) |
2159 | && abs (i) < nrow && !must_clear) |
2166 | { |
2160 | { |
2167 | int16_t nits; |
2161 | int16_t nits; |
2168 | int j; |
2162 | int j; |
2169 | int len, wlen; |
2163 | int len, wlen; |
2170 | |
2164 | |
2171 | j = TermWin.nrow; |
2165 | j = nrow; |
2172 | wlen = len = -1; |
2166 | wlen = len = -1; |
2173 | row = i > 0 ? 0 : j - 1; |
2167 | row = i > 0 ? 0 : j - 1; |
2174 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2168 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2175 | { |
2169 | { |
2176 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2170 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2177 | { |
2171 | { |
2178 | text_t *stp = screen.text[row + row_offset]; |
2172 | line_t s = save[row + row_offset]; |
2179 | rend_t *srp = screen.rend[row + row_offset]; |
|
|
2180 | text_t *dtp = drawn_text[row]; |
2173 | line_t d = drawn[row]; |
2181 | text_t *dtp2 = drawn_text[row + i]; |
2174 | line_t d2 = drawn[row + i]; |
2182 | rend_t *drp = drawn_rend[row]; |
|
|
2183 | rend_t *drp2 = drawn_rend[row + i]; |
|
|
2184 | |
2175 | |
2185 | for (nits = 0, col = TermWin.ncol; col--; ) |
2176 | for (nits = 0, col = ncol; col--; ) |
2186 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2177 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2187 | nits--; |
2178 | nits--; |
2188 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2179 | else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) |
2189 | nits++; |
2180 | nits++; |
2190 | |
2181 | |
2191 | if (nits > 8) /* XXX: arbitrary choice */ |
2182 | if (nits > 8) /* XXX: arbitrary choice */ |
2192 | { |
2183 | { |
2193 | for (col = TermWin.ncol; col--; ) |
2184 | for (col = ncol; col--; ) |
2194 | { |
2185 | { |
2195 | *dtp++ = *dtp2++; |
2186 | *d.t++ = *d2.t++; |
2196 | *drp++ = *drp2++; |
2187 | *d.r++ = *d2.r++; |
2197 | } |
2188 | } |
2198 | |
2189 | |
2199 | if (len == -1) |
2190 | if (len == -1) |
2200 | len = row; |
2191 | len = row; |
2201 | |
2192 | |
… | |
… | |
2208 | { |
2199 | { |
2209 | /* also comes here at end if needed because of >= above */ |
2200 | /* also comes here at end if needed because of >= above */ |
2210 | if (wlen < len) |
2201 | if (wlen < len) |
2211 | SWAP_IT (wlen, len, int); |
2202 | SWAP_IT (wlen, len, int); |
2212 | |
2203 | |
2213 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2204 | XCopyArea (display->display, vt, vt, |
2214 | TermWin.gc, 0, Row2Pixel (len + i), |
2205 | gc, 0, Row2Pixel (len + i), |
2215 | (unsigned int)TermWin_TotalWidth (), |
2206 | (unsigned int)TermWin_TotalWidth (), |
2216 | (unsigned int)Height2Pixel (wlen - len + 1), |
2207 | (unsigned int)Height2Pixel (wlen - len + 1), |
2217 | 0, Row2Pixel (len)); |
2208 | 0, Row2Pixel (len)); |
2218 | len = -1; |
2209 | len = -1; |
2219 | } |
2210 | } |
… | |
… | |
2222 | #endif |
2213 | #endif |
2223 | |
2214 | |
2224 | /* |
2215 | /* |
2225 | * E: main pass across every character |
2216 | * E: main pass across every character |
2226 | */ |
2217 | */ |
2227 | for (row = 0; row < TermWin.nrow; row++) |
2218 | for (row = 0; row < nrow; row++) |
2228 | { |
2219 | { |
2229 | text_t *stp = screen.text[row + row_offset]; |
2220 | text_t *stp = save[row + row_offset].t; |
2230 | rend_t *srp = screen.rend[row + row_offset]; |
2221 | rend_t *srp = save[row + row_offset].r; |
2231 | text_t *dtp = drawn_text[row]; |
2222 | text_t *dtp = drawn[row].t; |
2232 | rend_t *drp = drawn_rend[row]; |
2223 | rend_t *drp = drawn[row].r; |
2233 | |
2224 | |
2234 | /* |
2225 | /* |
2235 | * E2: OK, now the real pass |
2226 | * E2: OK, now the real pass |
2236 | */ |
2227 | */ |
2237 | int ypixel = (int)Row2Pixel (row); |
2228 | int ypixel = (int)Row2Pixel (row); |
2238 | |
2229 | |
2239 | for (col = 0; col < TermWin.ncol; col++) |
2230 | for (col = 0; col < ncol; col++) |
2240 | { |
2231 | { |
2241 | /* compare new text with old - if exactly the same then continue */ |
2232 | /* compare new text with old - if exactly the same then continue */ |
2242 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2233 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2243 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2234 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2244 | || (stp[col] == ' ' /* space w/ no background change */ |
2235 | || (stp[col] == ' ' /* space w/ no background change */ |
… | |
… | |
2258 | dtp[col] = stp[col]; |
2249 | dtp[col] = stp[col]; |
2259 | drp[col] = rend; |
2250 | drp[col] = rend; |
2260 | |
2251 | |
2261 | int xpixel = Col2Pixel (col); |
2252 | int xpixel = Col2Pixel (col); |
2262 | |
2253 | |
2263 | for (i = 0; ++col < TermWin.ncol; ) |
2254 | for (i = 0; ++col < ncol; ) |
2264 | { |
2255 | { |
2265 | if (stp[col] == NOCHAR) |
2256 | if (stp[col] == NOCHAR) |
2266 | { |
2257 | { |
2267 | dtp[col] = stp[col]; |
2258 | dtp[col] = stp[col]; |
2268 | drp[col] = rend; |
2259 | drp[col] = rend; |
… | |
… | |
2296 | |
2287 | |
2297 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2288 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2298 | while (i && text[count] == NOCHAR) |
2289 | while (i && text[count] == NOCHAR) |
2299 | count++, i--; |
2290 | count++, i--; |
2300 | |
2291 | |
2301 | #if ENABLE_STYLES |
|
|
2302 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2303 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2304 | drp[col + 1] = ~srp[col + 1]; |
|
|
2305 | |
|
|
2306 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2307 | while (text > stp |
|
|
2308 | && srp[text - stp - 1] & RS_Careful |
|
|
2309 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2310 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2311 | #endif |
|
|
2312 | |
|
|
2313 | /* |
2292 | /* |
2314 | * Determine the attributes for the string |
2293 | * Determine the attributes for the string |
2315 | */ |
2294 | */ |
2316 | int fore = GET_FGCOLOR (rend); // desired foreground |
2295 | int fore = GET_FGCOLOR (rend); // desired foreground |
2317 | int back = GET_BGCOLOR (rend); // desired background |
2296 | int back = GET_BGCOLOR (rend); // desired background |
2318 | |
2297 | |
2319 | // only do special processing if ana attributes are set, which is rare |
2298 | // only do special processing if any attributes are set, which is rare |
2320 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2299 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2321 | { |
2300 | { |
|
|
2301 | #if ENABLE_STYLES |
|
|
2302 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2303 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2304 | drp[col + 1] = ~srp[col + 1]; |
|
|
2305 | |
|
|
2306 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2307 | while (text > stp |
|
|
2308 | && srp[text - stp - 1] & RS_Careful |
|
|
2309 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2310 | text--, count++, xpixel -= fwidth; |
|
|
2311 | #endif |
|
|
2312 | |
2322 | bool invert = rend & RS_RVid; |
2313 | bool invert = rend & RS_RVid; |
2323 | |
2314 | |
2324 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2315 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2325 | if (rend & RS_Bold |
2316 | if (rend & RS_Bold |
2326 | && fore == Color_fg) |
2317 | && fore == Color_fg) |
… | |
… | |
2353 | SWAP_IT (fore, back, int); |
2344 | SWAP_IT (fore, back, int); |
2354 | |
2345 | |
2355 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2346 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2356 | if (ISSET_PIXCOLOR (Color_RV)) |
2347 | if (ISSET_PIXCOLOR (Color_RV)) |
2357 | back = Color_RV; |
2348 | back = Color_RV; |
|
|
2349 | |
|
|
2350 | if (fore == back) |
|
|
2351 | { |
|
|
2352 | fore = Color_bg; |
|
|
2353 | back = Color_fg; |
|
|
2354 | } |
2358 | #endif |
2355 | #endif |
2359 | } |
2356 | } |
2360 | |
2357 | |
2361 | #ifdef TEXT_BLINK |
2358 | #ifdef TEXT_BLINK |
2362 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2359 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
… | |
… | |
2373 | } |
2370 | } |
2374 | |
2371 | |
2375 | /* |
2372 | /* |
2376 | * Actually do the drawing of the string here |
2373 | * Actually do the drawing of the string here |
2377 | */ |
2374 | */ |
2378 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2375 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2379 | |
2376 | |
2380 | if (back == fore) |
2377 | if (back == fore) |
2381 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2378 | font->clear_rect (*drawable, xpixel, ypixel, |
2382 | TermWin.fwidth * count, TermWin.fheight, |
2379 | fwidth * count, fheight, |
2383 | back); |
2380 | back); |
2384 | else if (back == Color_bg) |
2381 | else if (back == Color_bg) |
2385 | { |
2382 | { |
2386 | if (must_clear) |
2383 | if (must_clear) |
2387 | { |
2384 | { |
2388 | CLEAR_CHARS (xpixel, ypixel, count); |
2385 | CLEAR_CHARS (xpixel, ypixel, count); |
2389 | |
2386 | |
2390 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2387 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2391 | if (text[i] != ' ') |
2388 | if (text[i] != ' ') |
2392 | { |
2389 | { |
2393 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); |
2390 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2394 | break; |
2391 | break; |
2395 | } |
2392 | } |
2396 | } |
2393 | } |
2397 | else |
2394 | else |
2398 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2395 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2399 | } |
2396 | } |
2400 | else |
2397 | else |
2401 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2398 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2402 | |
2399 | |
2403 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2400 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2404 | { |
2401 | { |
2405 | #if ENABLE_FRILLS |
2402 | #if ENABLE_FRILLS |
2406 | if (ISSET_PIXCOLOR (Color_underline)) |
2403 | if (ISSET_PIXCOLOR (Color_underline)) |
2407 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
2404 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2408 | else |
2405 | else |
2409 | #endif |
2406 | #endif |
2410 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2407 | XSetForeground (display->display, gc, pix_colors[fore]); |
2411 | |
2408 | |
2412 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2409 | XDrawLine (display->display, drawBuffer, gc, |
2413 | xpixel, ypixel + font->ascent + 1, |
2410 | xpixel, ypixel + font->ascent + 1, |
2414 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2411 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2415 | } |
2412 | } |
2416 | } /* for (col....) */ |
2413 | } /* for (col....) */ |
2417 | } /* for (row....) */ |
2414 | } /* for (row....) */ |
… | |
… | |
2423 | /* |
2420 | /* |
2424 | * G: cleanup cursor and display outline cursor if necessary |
2421 | * G: cleanup cursor and display outline cursor if necessary |
2425 | */ |
2422 | */ |
2426 | if (showcursor) |
2423 | if (showcursor) |
2427 | { |
2424 | { |
2428 | if (TermWin.focus) |
2425 | if (focus) |
|
|
2426 | { |
|
|
2427 | if (options & Opt_cursorUnderline) |
|
|
2428 | *crp ^= RS_Uline; |
|
|
2429 | else |
2429 | { |
2430 | { |
2430 | *crp ^= RS_RVid; |
2431 | *crp ^= RS_RVid; |
2431 | #ifndef NO_CURSORCOLOR |
2432 | #ifndef NO_CURSORCOLOR |
2432 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2433 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2433 | #endif |
2434 | #endif |
|
|
2435 | } |
2434 | } |
2436 | } |
2435 | else if (oldcursor.row >= 0) |
2437 | else if (oldcursor.row >= 0) |
2436 | { |
2438 | { |
|
|
2439 | int cursorwidth = 1; |
|
|
2440 | int col = oldcursor.col; |
|
|
2441 | |
|
|
2442 | while (col && save[screen.cur.row + saveLines].t[col] == NOCHAR) |
|
|
2443 | col--; |
|
|
2444 | |
|
|
2445 | while (col + cursorwidth < ncol |
|
|
2446 | && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
|
|
2447 | cursorwidth++; |
|
|
2448 | |
2437 | #ifndef NO_CURSORCOLOR |
2449 | #ifndef NO_CURSORCOLOR |
2438 | if (ISSET_PIXCOLOR (Color_cursor)) |
2450 | if (ISSET_PIXCOLOR (Color_cursor)) |
2439 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2451 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2440 | #endif |
2452 | #endif |
2441 | int cursorwidth = 1; |
|
|
2442 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2443 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2444 | cursorwidth++; |
|
|
2445 | |
2453 | |
2446 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2454 | XDrawRectangle (display->display, drawBuffer, gc, |
2447 | Col2Pixel (oldcursor.col), |
2455 | Col2Pixel (col), |
2448 | Row2Pixel (oldcursor.row), |
2456 | Row2Pixel (oldcursor.row), |
2449 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2457 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2450 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2458 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2451 | } |
2459 | } |
2452 | } |
2460 | } |
2453 | |
2461 | |
2454 | /* |
2462 | /* |
2455 | * H: cleanup selection |
2463 | * H: cleanup selection |
… | |
… | |
2462 | num_scr = 0; |
2470 | num_scr = 0; |
2463 | num_scr_allow = 1; |
2471 | num_scr_allow = 1; |
2464 | } |
2472 | } |
2465 | |
2473 | |
2466 | void |
2474 | void |
2467 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2475 | rxvt_term::scr_remap_chars (const line_t &l) |
2468 | { |
2476 | { |
2469 | if (!rp || !tp) |
2477 | if (!l.t) |
2470 | return; |
2478 | return; |
2471 | |
2479 | |
2472 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2480 | for (int i = ncol; i--; ) |
2473 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2481 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2474 | } |
2482 | } |
2475 | |
2483 | |
2476 | void |
2484 | void |
2477 | rxvt_term::scr_remap_chars () |
2485 | rxvt_term::scr_remap_chars () |
2478 | { |
2486 | { |
2479 | for (int i = TermWin.nrow + TermWin.saveLines; i--; ) |
2487 | for (int i = nrow + saveLines; i--; ) |
2480 | scr_remap_chars (screen.text[i], screen.rend[i]); |
2488 | scr_remap_chars (save[i]); |
2481 | |
2489 | |
2482 | for (int i = TermWin.nrow; i--; ) |
2490 | for (int i = nrow; i--; ) |
2483 | { |
2491 | { |
2484 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2492 | scr_remap_chars (drawn[i]); |
2485 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2493 | scr_remap_chars (swap_save[i]); |
2486 | } |
2494 | } |
2487 | } |
2495 | } |
2488 | |
2496 | |
2489 | void |
2497 | void |
2490 | rxvt_term::scr_recolour () |
2498 | rxvt_term::scr_recolour () |
… | |
… | |
2496 | #if XPM_BACKGROUND |
2504 | #if XPM_BACKGROUND |
2497 | && !bgPixmap.pixmap |
2505 | && !bgPixmap.pixmap |
2498 | #endif |
2506 | #endif |
2499 | ) |
2507 | ) |
2500 | { |
2508 | { |
2501 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
2509 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2502 | XClearWindow (display->display, TermWin.parent[0]); |
2510 | XClearWindow (display->display, parent[0]); |
2503 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
2511 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2504 | #if HAVE_SCROLLBARS |
2512 | #if HAVE_SCROLLBARS |
2505 | if (scrollBar.win) |
2513 | if (scrollBar.win) |
2506 | { |
2514 | { |
2507 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2515 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2508 | scrollBar.setIdle (); |
2516 | scrollBar.setIdle (); |
… | |
… | |
2518 | |
2526 | |
2519 | /* ------------------------------------------------------------------------- */ |
2527 | /* ------------------------------------------------------------------------- */ |
2520 | void |
2528 | void |
2521 | rxvt_term::scr_clear (bool really) |
2529 | rxvt_term::scr_clear (bool really) |
2522 | { |
2530 | { |
2523 | if (!TermWin.mapped) |
2531 | if (!mapped) |
2524 | return; |
2532 | return; |
2525 | |
2533 | |
2526 | num_scr_allow = 0; |
2534 | num_scr_allow = 0; |
2527 | want_refresh = 1; |
2535 | want_refresh = 1; |
2528 | |
2536 | |
2529 | #if TRANSPARENT |
|
|
2530 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
|
|
2531 | { |
|
|
2532 | int i; |
|
|
2533 | |
|
|
2534 | if (!(options & Opt_transparent_all)) |
|
|
2535 | i = 0; |
|
|
2536 | else |
|
|
2537 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
|
|
2538 | |
|
|
2539 | while (i--) |
|
|
2540 | if (TermWin.parent[i] != None) |
|
|
2541 | XClearWindow (display->display, TermWin.parent[i]); |
|
|
2542 | } |
|
|
2543 | #endif |
|
|
2544 | |
|
|
2545 | if (really) |
2537 | if (really) |
2546 | XClearWindow (display->display, TermWin.vt); |
2538 | XClearWindow (display->display, vt); |
2547 | } |
2539 | } |
2548 | |
2540 | |
2549 | /* ------------------------------------------------------------------------- */ |
2541 | /* ------------------------------------------------------------------------- */ |
2550 | void |
2542 | void |
2551 | rxvt_term::scr_reverse_selection () |
2543 | rxvt_term::scr_reverse_selection () |
2552 | { |
2544 | { |
2553 | if (selection.op && current_screen == selection.screen) |
2545 | if (selection.op && current_screen == selection.screen) |
2554 | { |
2546 | { |
2555 | int end_row = TermWin.saveLines - TermWin.view_start; |
2547 | int end_row = saveLines - view_start; |
2556 | int i = selection.beg.row + TermWin.saveLines; |
2548 | int i = selection.beg.row + saveLines; |
2557 | int col, row = selection.end.row + TermWin.saveLines; |
2549 | int col, row = selection.end.row + saveLines; |
2558 | rend_t *srp; |
2550 | rend_t *srp; |
2559 | |
2551 | |
2560 | #if ENABLE_FRILLS |
2552 | #if ENABLE_FRILLS |
2561 | if (selection.rect) |
2553 | if (selection.rect) |
2562 | { |
2554 | { |
2563 | end_row += TermWin.nrow; |
2555 | end_row += nrow; |
2564 | |
2556 | |
2565 | for (; i <= row && i <= end_row; i++) |
2557 | for (; i <= row && i <= end_row; i++) |
2566 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
2558 | for (srp = save[i].r, col = selection.beg.col; col < selection.end.col; col++) |
2567 | srp[col] ^= RS_RVid; |
2559 | srp[col] ^= RS_RVid; |
2568 | } |
2560 | } |
2569 | else |
2561 | else |
2570 | #endif |
2562 | #endif |
2571 | { |
2563 | { |
… | |
… | |
2575 | { |
2567 | { |
2576 | col = 0; |
2568 | col = 0; |
2577 | i = end_row; |
2569 | i = end_row; |
2578 | } |
2570 | } |
2579 | |
2571 | |
2580 | end_row += TermWin.nrow; |
2572 | end_row += nrow; |
2581 | |
2573 | |
2582 | for (; i < row && i < end_row; i++, col = 0) |
2574 | for (; i < row && i < end_row; i++, col = 0) |
2583 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2575 | for (srp = save[i].r; col < ncol; col++) |
2584 | srp[col] ^= RS_RVid; |
2576 | srp[col] ^= RS_RVid; |
2585 | |
2577 | |
2586 | if (i == row && i < end_row) |
2578 | if (i == row && i < end_row) |
2587 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2579 | for (srp = save[i].r; col < selection.end.col; col++) |
2588 | srp[col] ^= RS_RVid; |
2580 | srp[col] ^= RS_RVid; |
2589 | } |
2581 | } |
2590 | } |
2582 | } |
2591 | } |
2583 | } |
2592 | |
2584 | |
… | |
… | |
2601 | { |
2593 | { |
2602 | int row, wrote; |
2594 | int row, wrote; |
2603 | unsigned int width, towrite; |
2595 | unsigned int width, towrite; |
2604 | char r1[] = "\n"; |
2596 | char r1[] = "\n"; |
2605 | |
2597 | |
2606 | for (row = TermWin.saveLines - TermWin.nscrolled; |
2598 | for (row = saveLines - nscrolled; |
2607 | row < TermWin.saveLines + TermWin.nrow - 1; row++) |
2599 | row < saveLines + nrow - 1; row++) |
2608 | { |
2600 | { |
2609 | width = screen.tlen[row] >= 0 ? screen.tlen[row] |
2601 | width = save[row].l >= 0 ? save[row].l |
2610 | : TermWin.ncol; |
2602 | : ncol; |
2611 | for (towrite = width; towrite; towrite -= wrote) |
2603 | for (towrite = width; towrite; towrite -= wrote) |
2612 | { |
2604 | { |
2613 | wrote = write (fd, & (screen.text[row][width - towrite]), |
2605 | wrote = write (fd, & (save[row].t[width - towrite]), |
2614 | towrite); |
2606 | towrite); |
2615 | if (wrote < 0) |
2607 | if (wrote < 0) |
2616 | return; /* XXX: death, no report */ |
2608 | return; /* XXX: death, no report */ |
2617 | } |
2609 | } |
2618 | if (screen.tlen[row] >= 0) |
2610 | if (save[row].l >= 0) |
2619 | if (write (fd, r1, 1) <= 0) |
2611 | if (write (fd, r1, 1) <= 0) |
2620 | return; /* XXX: death, no report */ |
2612 | return; /* XXX: death, no report */ |
2621 | } |
2613 | } |
2622 | } |
2614 | } |
2623 | #endif |
2615 | #endif |
… | |
… | |
2625 | /* ------------------------------------------------------------------------- * |
2617 | /* ------------------------------------------------------------------------- * |
2626 | * CHARACTER SELECTION * |
2618 | * CHARACTER SELECTION * |
2627 | * ------------------------------------------------------------------------- */ |
2619 | * ------------------------------------------------------------------------- */ |
2628 | |
2620 | |
2629 | /* |
2621 | /* |
2630 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2622 | * -nscrolled <= (selection row) <= nrow - 1 |
2631 | */ |
2623 | */ |
2632 | void |
2624 | void |
2633 | rxvt_term::selection_check (int check_more) |
2625 | rxvt_term::selection_check (int check_more) |
2634 | { |
2626 | { |
2635 | row_col_t pos; |
2627 | row_col_t pos; |
2636 | |
2628 | |
2637 | if (!selection.op) |
2629 | if (!selection.op) |
2638 | return; |
2630 | return; |
2639 | |
2631 | |
2640 | pos.row = pos.col = 0; |
2632 | pos.row = pos.col = 0; |
2641 | if ((selection.beg.row < - (int32_t)TermWin.nscrolled) |
2633 | if ((selection.beg.row < - (int32_t)nscrolled) |
2642 | || (selection.beg.row >= TermWin.nrow) |
2634 | || (selection.beg.row >= nrow) |
2643 | || (selection.mark.row < - (int32_t)TermWin.nscrolled) |
2635 | || (selection.mark.row < - (int32_t)nscrolled) |
2644 | || (selection.mark.row >= TermWin.nrow) |
2636 | || (selection.mark.row >= nrow) |
2645 | || (selection.end.row < - (int32_t)TermWin.nscrolled) |
2637 | || (selection.end.row < - (int32_t)nscrolled) |
2646 | || (selection.end.row >= TermWin.nrow) |
2638 | || (selection.end.row >= nrow) |
2647 | || (check_more == 1 |
2639 | || (check_more == 1 |
2648 | && current_screen == selection.screen |
2640 | && current_screen == selection.screen |
2649 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2641 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2650 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2642 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2651 | || (check_more == 2 |
2643 | || (check_more == 2 |
… | |
… | |
2653 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2645 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2654 | || (check_more == 3 |
2646 | || (check_more == 3 |
2655 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2647 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2656 | || (check_more == 4 /* screen width change */ |
2648 | || (check_more == 4 /* screen width change */ |
2657 | && (selection.beg.row != selection.end.row |
2649 | && (selection.beg.row != selection.end.row |
2658 | || selection.end.col > TermWin.ncol))) |
2650 | || selection.end.col > ncol))) |
2659 | CLEAR_SELECTION (); |
2651 | CLEAR_SELECTION (); |
2660 | } |
2652 | } |
2661 | |
2653 | |
2662 | /* ------------------------------------------------------------------------- */ |
2654 | /* ------------------------------------------------------------------------- */ |
2663 | /* |
2655 | /* |
… | |
… | |
2872 | * EXT: button 2 release |
2864 | * EXT: button 2 release |
2873 | */ |
2865 | */ |
2874 | void |
2866 | void |
2875 | rxvt_term::selection_request (Time tm, int x, int y) |
2867 | rxvt_term::selection_request (Time tm, int x, int y) |
2876 | { |
2868 | { |
2877 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2869 | if (x < 0 || x >= width || y < 0 || y >= height) |
2878 | return; /* outside window */ |
2870 | return; /* outside window */ |
2879 | |
2871 | |
2880 | if (selection.text) |
2872 | if (selection.text) |
2881 | { /* internal selection */ |
2873 | { /* internal selection */ |
2882 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2874 | char *str = rxvt_wcstombs (selection.text, selection.len); |
… | |
… | |
2924 | sel = xa[XA_CLIPBOARD]; |
2916 | sel = xa[XA_CLIPBOARD]; |
2925 | |
2917 | |
2926 | if (XGetSelectionOwner (display->display, sel) != None) |
2918 | if (XGetSelectionOwner (display->display, sel) != None) |
2927 | { |
2919 | { |
2928 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2920 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2929 | TermWin.vt, selection_request_time); |
2921 | vt, selection_request_time); |
2930 | return 1; |
2922 | return 1; |
2931 | } |
2923 | } |
2932 | |
2924 | |
2933 | return 0; |
2925 | return 0; |
2934 | } |
2926 | } |
… | |
… | |
2980 | selection.op = SELECTION_DONE; |
2972 | selection.op = SELECTION_DONE; |
2981 | |
2973 | |
2982 | if (selection.clicks == 4) |
2974 | if (selection.clicks == 4) |
2983 | return; /* nothing selected, go away */ |
2975 | return; /* nothing selected, go away */ |
2984 | |
2976 | |
2985 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2977 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2986 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2978 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2987 | |
2979 | |
2988 | col = selection.beg.col; |
2980 | col = selection.beg.col; |
2989 | row = selection.beg.row + TermWin.saveLines; |
2981 | row = selection.beg.row + saveLines; |
2990 | end_row = selection.end.row + TermWin.saveLines; |
2982 | end_row = selection.end.row + saveLines; |
2991 | int ofs = 0; |
2983 | int ofs = 0; |
2992 | int extra = 0; |
2984 | int extra = 0; |
2993 | |
2985 | |
2994 | for (; row <= end_row; row++, col = 0) |
2986 | for (; row <= end_row; row++, col = 0) |
2995 | { |
2987 | { |
2996 | end_col = screen.tlen[row]; |
|
|
2997 | |
|
|
2998 | #if ENABLE_FRILLS |
2988 | #if ENABLE_FRILLS |
2999 | if (selection.rect) |
2989 | if (selection.rect) |
3000 | { |
2990 | { |
3001 | col = selection.beg.col; |
2991 | col = selection.beg.col; |
3002 | end_col = TermWin.ncol + 1; |
2992 | end_col = ncol + 1; |
3003 | } |
2993 | } |
|
|
2994 | else |
3004 | #endif |
2995 | #endif |
|
|
2996 | end_col = save[row].is_longer () ? ncol : save[row].l; //TODO//FIXME//LEN |
3005 | |
2997 | |
3006 | MAX_IT (col, 0); |
2998 | MAX_IT (col, 0); |
3007 | |
|
|
3008 | if (end_col == -1) |
|
|
3009 | end_col = TermWin.ncol; |
|
|
3010 | |
2999 | |
3011 | if (row == end_row || selection.rect) |
3000 | if (row == end_row || selection.rect) |
3012 | MIN_IT (end_col, selection.end.col); |
3001 | MIN_IT (end_col, selection.end.col); |
3013 | |
3002 | |
3014 | t = &screen.text[row][col]; |
3003 | t = save[row].t + col; |
3015 | for (; col < end_col; col++) |
3004 | for (; col < end_col; col++) |
3016 | { |
3005 | { |
3017 | if (*t == NOCHAR) |
3006 | if (*t == NOCHAR) |
3018 | t++; |
3007 | t++; |
3019 | #if ENABLE_COMBINING |
3008 | #if ENABLE_COMBINING |
… | |
… | |
3035 | #endif |
3024 | #endif |
3036 | else |
3025 | else |
3037 | new_selection_text[ofs++] = *t++; |
3026 | new_selection_text[ofs++] = *t++; |
3038 | } |
3027 | } |
3039 | |
3028 | |
3040 | if (screen.tlen[row] != -1 && row != end_row) |
3029 | if (!save[row].is_longer () && row != end_row) |
3041 | new_selection_text[ofs++] = C0_LF; |
3030 | new_selection_text[ofs++] = C0_LF; |
3042 | } |
3031 | } |
3043 | |
3032 | |
3044 | if (end_col != selection.end.col) |
3033 | if (end_col != selection.end.col) |
3045 | new_selection_text[ofs++] = C0_LF; |
3034 | new_selection_text[ofs++] = C0_LF; |
… | |
… | |
3056 | |
3045 | |
3057 | // we usually allocate much more than necessary, so realloc it smaller again |
3046 | // we usually allocate much more than necessary, so realloc it smaller again |
3058 | selection.len = ofs; |
3047 | selection.len = ofs; |
3059 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3048 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
3060 | |
3049 | |
3061 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
3050 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3062 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
3051 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3063 | display->set_selection_owner (this); |
3052 | display->set_selection_owner (this); |
3064 | else |
3053 | else |
3065 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3054 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
3066 | |
3055 | |
3067 | #if 0 |
3056 | #if 0 |
… | |
… | |
3090 | |
3079 | |
3091 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3080 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3092 | |
3081 | |
3093 | if (clicks == 2 || clicks == 3) |
3082 | if (clicks == 2 || clicks == 3) |
3094 | selection_extend_colrow (selection.mark.col, |
3083 | selection_extend_colrow (selection.mark.col, |
3095 | selection.mark.row + TermWin.view_start, |
3084 | selection.mark.row + view_start, |
3096 | 0, /* button 3 */ |
3085 | 0, /* button 3 */ |
3097 | 1, /* button press */ |
3086 | 1, /* button press */ |
3098 | 0); /* click change */ |
3087 | 0); /* click change */ |
3099 | } |
3088 | } |
3100 | |
3089 | |
… | |
… | |
3105 | void |
3094 | void |
3106 | rxvt_term::selection_start_colrow (int col, int row) |
3095 | rxvt_term::selection_start_colrow (int col, int row) |
3107 | { |
3096 | { |
3108 | want_refresh = 1; |
3097 | want_refresh = 1; |
3109 | selection.mark.col = col; |
3098 | selection.mark.col = col; |
3110 | selection.mark.row = row - TermWin.view_start; |
3099 | selection.mark.row = row - view_start; |
3111 | |
3100 | |
3112 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
3101 | MAX_IT (selection.mark.row, - (int32_t)nscrolled); |
3113 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
3102 | MIN_IT (selection.mark.row, (int32_t)nrow - 1); |
3114 | MAX_IT (selection.mark.col, 0); |
3103 | MAX_IT (selection.mark.col, 0); |
3115 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
3104 | MIN_IT (selection.mark.col, (int32_t)ncol - 1); |
3116 | |
3105 | |
3117 | while (selection.mark.col > 0 |
3106 | while (selection.mark.col > 0 |
3118 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
3107 | && save[selection.mark.row + saveLines].t[selection.mark.col] == NOCHAR) |
3119 | --selection.mark.col; |
3108 | --selection.mark.col; |
3120 | |
3109 | |
3121 | if (selection.op) |
3110 | if (selection.op) |
3122 | { /* clear the old selection */ |
3111 | { /* clear the old selection */ |
3123 | selection.beg.row = selection.end.row = selection.mark.row; |
3112 | selection.beg.row = selection.end.row = selection.mark.row; |
… | |
… | |
3147 | text_t *stp; |
3136 | text_t *stp; |
3148 | rend_t *srp; |
3137 | rend_t *srp; |
3149 | |
3138 | |
3150 | if (dirn == UP) |
3139 | if (dirn == UP) |
3151 | { |
3140 | { |
3152 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
3141 | bound.row = saveLines - nscrolled - 1; |
3153 | bound.col = 0; |
3142 | bound.col = 0; |
3154 | dirnadd = -1; |
3143 | dirnadd = -1; |
3155 | } |
3144 | } |
3156 | else |
3145 | else |
3157 | { |
3146 | { |
3158 | bound.row = TermWin.saveLines + TermWin.nrow; |
3147 | bound.row = saveLines + nrow; |
3159 | bound.col = TermWin.ncol - 1; |
3148 | bound.col = ncol - 1; |
3160 | dirnadd = 1; |
3149 | dirnadd = 1; |
3161 | } |
3150 | } |
3162 | |
3151 | |
3163 | row = mark->row + TermWin.saveLines; |
3152 | row = mark->row + saveLines; |
3164 | col = mark->col; |
3153 | col = mark->col; |
3165 | MAX_IT (col, 0); |
3154 | MAX_IT (col, 0); |
3166 | /* find the edge of a word */ |
3155 | /* find the edge of a word */ |
3167 | stp = &screen.text[row][col]; |
3156 | stp = save[row].t + col; w1 = DELIMIT_TEXT (*stp); |
3168 | w1 = DELIMIT_TEXT (*stp); |
3157 | srp = save[row].r + col; w2 = DELIMIT_REND (*srp); |
3169 | |
|
|
3170 | srp = &screen.rend[row][col]; |
|
|
3171 | w2 = DELIMIT_REND (*srp); |
|
|
3172 | |
3158 | |
3173 | for (;;) |
3159 | for (;;) |
3174 | { |
3160 | { |
3175 | for (; col != bound.col; col += dirnadd) |
3161 | for (; col != bound.col; col += dirnadd) |
3176 | { |
3162 | { |
… | |
… | |
3186 | break; |
3172 | break; |
3187 | } |
3173 | } |
3188 | |
3174 | |
3189 | if ((col == bound.col) && (row != bound.row)) |
3175 | if ((col == bound.col) && (row != bound.row)) |
3190 | { |
3176 | { |
3191 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3177 | if (save[ (row - (dirn == UP ? 1 : 0))].is_longer ()) |
3192 | { |
3178 | { |
3193 | trow = row + dirnadd; |
3179 | trow = row + dirnadd; |
3194 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3180 | tcol = dirn == UP ? ncol - 1 : 0; |
3195 | |
3181 | |
3196 | if (screen.text[trow] == NULL) |
3182 | if (!save[trow].t) |
3197 | break; |
3183 | break; |
3198 | |
3184 | |
3199 | stp = & (screen.text[trow][tcol]); |
3185 | stp = save[trow].t + tcol; |
3200 | srp = & (screen.rend[trow][tcol]); |
3186 | srp = save[trow].r + tcol; |
3201 | |
3187 | |
3202 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3188 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3203 | break; |
3189 | break; |
3204 | |
3190 | |
3205 | row = trow; |
3191 | row = trow; |
… | |
… | |
3213 | Old_Word_Selection_You_Die: |
3199 | Old_Word_Selection_You_Die: |
3214 | if (dirn == DN) |
3200 | if (dirn == DN) |
3215 | col++; /* put us on one past the end */ |
3201 | col++; /* put us on one past the end */ |
3216 | |
3202 | |
3217 | /* Poke the values back in */ |
3203 | /* Poke the values back in */ |
3218 | ret->row = row - TermWin.saveLines; |
3204 | ret->row = row - saveLines; |
3219 | ret->col = col; |
3205 | ret->col = col; |
3220 | } |
3206 | } |
3221 | |
3207 | |
3222 | /* ------------------------------------------------------------------------- */ |
3208 | /* ------------------------------------------------------------------------- */ |
3223 | /* |
3209 | /* |
… | |
… | |
3233 | int col, row; |
3219 | int col, row; |
3234 | |
3220 | |
3235 | col = Pixel2Col (x); |
3221 | col = Pixel2Col (x); |
3236 | row = Pixel2Row (y); |
3222 | row = Pixel2Row (y); |
3237 | MAX_IT (row, 0); |
3223 | MAX_IT (row, 0); |
3238 | MIN_IT (row, (int)TermWin.nrow - 1); |
3224 | MIN_IT (row, (int)nrow - 1); |
3239 | MAX_IT (col, 0); |
3225 | MAX_IT (col, 0); |
3240 | MIN_IT (col, (int)TermWin.ncol); |
3226 | MIN_IT (col, (int)ncol); |
3241 | |
3227 | |
3242 | /* |
3228 | /* |
3243 | * If we're selecting characters (single click) then we must check first |
3229 | * If we're selecting characters (single click) then we must check first |
3244 | * if we are at the same place as the original mark. If we are then |
3230 | * if we are at the same place as the original mark. If we are then |
3245 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3231 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3246 | * be _past_ a character for it to be selected. |
3232 | * be _past_ a character for it to be selected. |
3247 | */ |
3233 | */ |
3248 | if (((selection.clicks % 3) == 1) && !flag |
3234 | if (((selection.clicks % 3) == 1) && !flag |
3249 | && (col == selection.mark.col |
3235 | && (col == selection.mark.col |
3250 | && (row == selection.mark.row + TermWin.view_start))) |
3236 | && (row == selection.mark.row + view_start))) |
3251 | { |
3237 | { |
3252 | /* select nothing */ |
3238 | /* select nothing */ |
3253 | selection.beg.row = selection.end.row = 0; |
3239 | selection.beg.row = selection.end.row = 0; |
3254 | selection.beg.col = selection.end.col = 0; |
3240 | selection.beg.col = selection.end.col = 0; |
3255 | selection.clicks = 4; |
3241 | selection.clicks = 4; |
… | |
… | |
3270 | * Extend the selection to the specified col/row |
3256 | * Extend the selection to the specified col/row |
3271 | */ |
3257 | */ |
3272 | void |
3258 | void |
3273 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3259 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3274 | { |
3260 | { |
3275 | int16_t ncol = TermWin.ncol; |
|
|
3276 | int end_col; |
|
|
3277 | row_col_t pos; |
3261 | row_col_t pos; |
3278 | enum { |
3262 | enum { |
3279 | LEFT, RIGHT |
3263 | LEFT, RIGHT |
3280 | } closeto = RIGHT; |
3264 | } closeto = RIGHT; |
3281 | |
3265 | |
… | |
… | |
3314 | } |
3298 | } |
3315 | |
3299 | |
3316 | pos.col = col; |
3300 | pos.col = col; |
3317 | pos.row = row; |
3301 | pos.row = row; |
3318 | |
3302 | |
3319 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3303 | pos.row -= view_start; /* adjust for scroll */ |
3320 | |
3304 | |
3321 | /* |
3305 | /* |
3322 | * This is mainly xterm style selection with a couple of differences, mainly |
3306 | * This is mainly xterm style selection with a couple of differences, mainly |
3323 | * in the way button3 drag extension works. |
3307 | * in the way button3 drag extension works. |
3324 | * We're either doing: button1 drag; button3 press; or button3 drag |
3308 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3383 | } |
3367 | } |
3384 | } |
3368 | } |
3385 | |
3369 | |
3386 | if (selection.clicks == 1) |
3370 | if (selection.clicks == 1) |
3387 | { |
3371 | { |
3388 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3372 | if (selection.beg.col > save[selection.beg.row + saveLines].l //TODO//FIXME//LEN |
3389 | |
3373 | && !save[selection.beg.row + saveLines].is_longer () |
3390 | if (selection.beg.col > end_col |
|
|
3391 | && end_col != -1 |
|
|
3392 | #if ENABLE_FRILLS |
3374 | #if ENABLE_FRILLS |
3393 | && !selection.rect |
3375 | && !selection.rect |
3394 | #endif |
3376 | #endif |
3395 | ) |
3377 | ) |
3396 | selection.beg.col = ncol; |
3378 | selection.beg.col = ncol; |
3397 | |
3379 | |
3398 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3399 | |
|
|
3400 | if ( |
3380 | if ( |
3401 | selection.end.col > end_col |
3381 | selection.end.col > save[selection.end.row + saveLines].l //TODO//FIXME//LEN |
3402 | && end_col != -1 |
3382 | && !save[selection.end.row + saveLines].is_longer () |
3403 | #if ENABLE_FRILLS |
3383 | #if ENABLE_FRILLS |
3404 | && !selection.rect |
3384 | && !selection.rect |
3405 | #endif |
3385 | #endif |
3406 | ) |
3386 | ) |
3407 | selection.end.col = ncol; |
3387 | selection.end.col = ncol; |
… | |
… | |
3417 | else if (selection.clicks == 3) |
3397 | else if (selection.clicks == 3) |
3418 | { |
3398 | { |
3419 | #if ENABLE_FRILLS |
3399 | #if ENABLE_FRILLS |
3420 | if (options & Opt_tripleclickwords) |
3400 | if (options & Opt_tripleclickwords) |
3421 | { |
3401 | { |
3422 | int end_row; |
|
|
3423 | |
|
|
3424 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3402 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3425 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
|
|
3426 | |
3403 | |
3427 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3404 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3428 | { |
3405 | { |
3429 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3406 | if (!save[end_row + saveLines].is_longer ()) |
3430 | |
|
|
3431 | if (end_col != -1) |
|
|
3432 | { |
3407 | { |
3433 | selection.end.row = end_row; |
3408 | selection.end.row = end_row; |
3434 | selection.end.col = end_col; |
3409 | selection.end.col = save[end_row + saveLines].l; |
3435 | selection_remove_trailing_spaces (); |
3410 | selection_remove_trailing_spaces (); |
3436 | break; |
3411 | break; |
3437 | } |
3412 | } |
3438 | } |
3413 | } |
3439 | } |
3414 | } |
… | |
… | |
3445 | |
3420 | |
3446 | selection.beg.col = 0; |
3421 | selection.beg.col = 0; |
3447 | selection.end.col = ncol; |
3422 | selection.end.col = ncol; |
3448 | |
3423 | |
3449 | // select a complete logical line |
3424 | // select a complete logical line |
3450 | while (selection.beg.row > -TermWin.saveLines |
3425 | while (selection.beg.row > -saveLines |
3451 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
3426 | && save[selection.beg.row - 1 + saveLines].is_longer ()) |
3452 | selection.beg.row--; |
3427 | selection.beg.row--; |
3453 | |
3428 | |
3454 | while (selection.end.row < TermWin.nrow |
3429 | while (selection.end.row < nrow |
3455 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
3430 | && save[selection.end.row + saveLines].is_longer ()) |
3456 | selection.end.row++; |
3431 | selection.end.row++; |
3457 | } |
3432 | } |
3458 | } |
3433 | } |
3459 | |
3434 | |
3460 | if (button3 && buttonpress) |
3435 | if (button3 && buttonpress) |
… | |
… | |
3487 | end_col = selection.end.col; |
3462 | end_col = selection.end.col; |
3488 | end_row = selection.end.row; |
3463 | end_row = selection.end.row; |
3489 | |
3464 | |
3490 | for ( ; end_row >= selection.beg.row; ) |
3465 | for ( ; end_row >= selection.beg.row; ) |
3491 | { |
3466 | { |
3492 | stp = screen.text[end_row + TermWin.saveLines]; |
3467 | stp = save[end_row + saveLines].t; |
3493 | |
3468 | |
3494 | while (--end_col >= 0) |
3469 | while (--end_col >= 0) |
3495 | { |
3470 | { |
3496 | if (stp[end_col] != ' ' |
3471 | if (stp[end_col] != ' ' |
3497 | && stp[end_col] != '\t' |
3472 | && stp[end_col] != '\t' |
3498 | && stp[end_col] != NOCHAR) |
3473 | && stp[end_col] != NOCHAR) |
3499 | break; |
3474 | break; |
3500 | } |
3475 | } |
3501 | |
3476 | |
3502 | if (end_col >= 0 |
3477 | if (end_col >= 0 |
3503 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3478 | || !save[end_row - 1 + saveLines].is_longer ()) |
3504 | { |
3479 | { |
3505 | selection.end.col = end_col + 1; |
3480 | selection.end.col = end_col + 1; |
3506 | selection.end.row = end_row; |
3481 | selection.end.row = end_row; |
3507 | break; |
3482 | break; |
3508 | } |
3483 | } |
3509 | |
3484 | |
3510 | end_row--; |
3485 | end_row--; |
3511 | end_col = TermWin.ncol; |
3486 | end_col = ncol; |
3512 | } |
3487 | } |
3513 | |
3488 | |
3514 | if (selection.mark.row > selection.end.row) |
3489 | if (selection.mark.row > selection.end.row) |
3515 | { |
3490 | { |
3516 | selection.mark.row = selection.end.row; |
3491 | selection.mark.row = selection.end.row; |
… | |
… | |
3679 | */ |
3654 | */ |
3680 | void |
3655 | void |
3681 | rxvt_term::pixel_position (int *x, int *y) |
3656 | rxvt_term::pixel_position (int *x, int *y) |
3682 | { |
3657 | { |
3683 | *x = Pixel2Col (*x); |
3658 | *x = Pixel2Col (*x); |
3684 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */ |
3659 | /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ |
3685 | *y = Pixel2Row (*y); |
3660 | *y = Pixel2Row (*y); |
3686 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */ |
3661 | /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ |
3687 | } |
3662 | } |
3688 | |
3663 | |
3689 | /* ------------------------------------------------------------------------- */ |
3664 | /* ------------------------------------------------------------------------- */ |
3690 | #ifdef USE_XIM |
3665 | #ifdef USE_XIM |
3691 | void |
3666 | void |
3692 | rxvt_term::im_set_position (XPoint &pos) |
3667 | rxvt_term::im_set_position (XPoint &pos) |
3693 | { |
3668 | { |
3694 | XWindowAttributes xwa; |
3669 | XWindowAttributes xwa; |
3695 | |
3670 | |
3696 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3671 | XGetWindowAttributes (display->display, vt, &xwa); |
3697 | |
3672 | |
3698 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3673 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3699 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3674 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3700 | } |
3675 | } |
3701 | #endif |
3676 | #endif |
3702 | |
3677 | |
3703 | #if ENABLE_OVERLAY |
3678 | #if ENABLE_OVERLAY |
3704 | void |
3679 | void |
3705 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3680 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3706 | { |
3681 | { |
3707 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
3682 | if (nrow < 3 || ncol < 3) |
3708 | return; |
3683 | return; |
3709 | |
3684 | |
3710 | want_refresh = 1; |
3685 | want_refresh = 1; |
3711 | |
3686 | |
3712 | scr_overlay_off (); |
3687 | scr_overlay_off (); |
3713 | |
3688 | |
3714 | if (x < 0) x = TermWin.ncol - w; |
3689 | if (x < 0) x = ncol - w; |
3715 | if (y < 0) y = TermWin.nrow - h; |
3690 | if (y < 0) y = nrow - h; |
3716 | |
3691 | |
3717 | // make space for border |
3692 | // make space for border |
3718 | w += 2; MIN_IT (w, TermWin.ncol); |
3693 | w += 2; MIN_IT (w, ncol); |
3719 | h += 2; MIN_IT (h, TermWin.nrow); |
3694 | h += 2; MIN_IT (h, nrow); |
3720 | |
3695 | |
3721 | x -= 1; MAX_IT (x, 0); |
3696 | x -= 1; MAX_IT (x, 0); |
3722 | y -= 1; MAX_IT (y, 0); |
3697 | y -= 1; MAX_IT (y, 0); |
3723 | |
3698 | |
3724 | MIN_IT (x, TermWin.ncol - w); |
3699 | MIN_IT (x, ncol - w); |
3725 | MIN_IT (y, TermWin.nrow - h); |
3700 | MIN_IT (y, nrow - h); |
3726 | |
3701 | |
3727 | ov_x = x; ov_y = y; |
3702 | ov_x = x; ov_y = y; |
3728 | ov_w = w; ov_h = h; |
3703 | ov_w = w; ov_h = h; |
3729 | |
3704 | |
3730 | ov_text = new text_t *[h]; |
3705 | ov_text = new text_t *[h]; |
… | |
… | |
3795 | while (*s) |
3770 | while (*s) |
3796 | scr_overlay_set (x++, y, *s++); |
3771 | scr_overlay_set (x++, y, *s++); |
3797 | } |
3772 | } |
3798 | |
3773 | |
3799 | void |
3774 | void |
|
|
3775 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3776 | { |
|
|
3777 | while (*s) |
|
|
3778 | { |
|
|
3779 | text_t t = *s++; |
|
|
3780 | int width = wcwidth (t); |
|
|
3781 | |
|
|
3782 | while (width--) |
|
|
3783 | { |
|
|
3784 | scr_overlay_set (x++, y, t); |
|
|
3785 | t = NOCHAR; |
|
|
3786 | } |
|
|
3787 | } |
|
|
3788 | } |
|
|
3789 | |
|
|
3790 | void |
3800 | rxvt_term::scr_swap_overlay () |
3791 | rxvt_term::scr_swap_overlay () |
3801 | { |
3792 | { |
3802 | if (!ov_text) |
3793 | if (!ov_text) |
3803 | return; |
3794 | return; |
3804 | |
3795 | |
3805 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
3796 | int row_offset = ov_y + saveLines - view_start; |
3806 | |
3797 | |
3807 | // swap screen mem with overlay |
3798 | // swap screen mem with overlay |
3808 | for (int y = ov_h; y--; ) |
3799 | for (int y = ov_h; y--; ) |
3809 | { |
3800 | { |
3810 | text_t *t1 = ov_text[y]; |
3801 | text_t *t1 = ov_text[y]; |
3811 | rend_t *r1 = ov_rend[y]; |
3802 | rend_t *r1 = ov_rend[y]; |
3812 | |
3803 | |
3813 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
3804 | text_t *t2 = save[y + row_offset].t + ov_x; |
3814 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
3805 | rend_t *r2 = save[y + row_offset].r + ov_x; |
3815 | |
3806 | |
3816 | for (int x = ov_w; x--; ) |
3807 | for (int x = ov_w; x--; ) |
3817 | { |
3808 | { |
3818 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3809 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3819 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3810 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |