… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a separate compile! |
|
|
34 | |
|
|
35 | static inline void |
33 | static inline void |
36 | fill_text (text_t *start, text_t value, int len) |
34 | fill_text (text_t *start, text_t value, int len) |
37 | { |
35 | { |
38 | while (len--) |
36 | while (len--) |
39 | *start++ = value; |
37 | *start++ = value; |
… | |
… | |
98 | |
96 | |
99 | /* Fill part/all of a line with blanks. */ |
97 | /* Fill part/all of a line with blanks. */ |
100 | void |
98 | void |
101 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
99 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
102 | { |
100 | { |
103 | if (!l.t) |
101 | if (!l.valid ()) |
104 | { |
102 | { |
105 | lalloc (l); |
103 | l.alloc (); |
106 | col = 0; |
104 | col = 0; |
107 | width = ncol; |
105 | width = ncol; |
108 | } |
106 | } |
109 | |
107 | |
110 | l.touch (); |
108 | l.touch (); |
… | |
… | |
157 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
158 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
159 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
160 | |
158 | |
161 | void |
159 | void |
|
|
160 | rxvt_term::scr_alloc () NOTHROW |
|
|
161 | { |
|
|
162 | int tsize = sizeof (text_t) * ncol; |
|
|
163 | int rsize = sizeof (rend_t) * ncol; |
|
|
164 | |
|
|
165 | // we assume that rend_t size is a sufficient alignment |
|
|
166 | // factor for text_t and line_t values, and we only |
|
|
167 | // need to adjust tsize. |
|
|
168 | tsize = (tsize + sizeof (rend_t) - 1); |
|
|
169 | tsize -= tsize % sizeof (rend_t); |
|
|
170 | |
|
|
171 | int all_rows = total_rows + nrow + nrow; |
|
|
172 | |
|
|
173 | chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; |
|
|
174 | chunk = chunk_alloc (chunk_size, 0); |
|
|
175 | |
|
|
176 | char *base = (char *)chunk + sizeof (line_t) * all_rows; |
|
|
177 | |
|
|
178 | for (int row = 0; row < all_rows; ++row) |
|
|
179 | { |
|
|
180 | line_t &l = ((line_t *)chunk) [row]; |
|
|
181 | |
|
|
182 | l.t = (text_t *)base; base += tsize; |
|
|
183 | l.r = (rend_t *)base; base += rsize; |
|
|
184 | l.l = -1; |
|
|
185 | l.f = 0; |
|
|
186 | } |
|
|
187 | |
|
|
188 | drawn_buf = (line_t *)chunk; |
|
|
189 | swap_buf = drawn_buf + nrow; |
|
|
190 | row_buf = swap_buf + nrow; |
|
|
191 | } |
|
|
192 | |
|
|
193 | void ecb_cold |
162 | rxvt_term::scr_reset () |
194 | rxvt_term::scr_reset () |
163 | { |
195 | { |
164 | #if ENABLE_OVERLAY |
196 | #if ENABLE_OVERLAY |
165 | scr_overlay_off (); |
197 | scr_overlay_off (); |
166 | #endif |
198 | #endif |
… | |
… | |
192 | total_rows = nrow + saveLines; |
224 | total_rows = nrow + saveLines; |
193 | |
225 | |
194 | screen.tscroll = 0; |
226 | screen.tscroll = 0; |
195 | screen.bscroll = nrow - 1; |
227 | screen.bscroll = nrow - 1; |
196 | |
228 | |
|
|
229 | void *prev_chunk = chunk; |
|
|
230 | line_t *prev_drawn_buf = drawn_buf; |
|
|
231 | line_t *prev_swap_buf = swap_buf; |
|
|
232 | line_t *prev_row_buf = row_buf; |
|
|
233 | |
|
|
234 | int common_col = min (prev_ncol, ncol); |
|
|
235 | |
|
|
236 | scr_alloc (); |
|
|
237 | |
197 | if (!row_buf) |
238 | if (!prev_row_buf) |
198 | { |
239 | { |
199 | /* |
240 | /* |
200 | * first time called so just malloc everything: don't rely on realloc |
241 | * first time called (or after scr_release) so just malloc everything: don't rely on realloc |
201 | */ |
242 | */ |
202 | top_row = 0; |
243 | top_row = 0; |
203 | term_start = 0; |
244 | term_start = 0; |
204 | |
|
|
205 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
206 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
207 | |
|
|
208 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
209 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
210 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
211 | |
|
|
212 | for (int row = nrow; row--; ) |
|
|
213 | { |
|
|
214 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
215 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
216 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
217 | } |
|
|
218 | |
245 | |
219 | memset (charsets, 'B', sizeof (charsets)); |
246 | memset (charsets, 'B', sizeof (charsets)); |
220 | rstyle = DEFAULT_RSTYLE; |
247 | rstyle = DEFAULT_RSTYLE; |
221 | screen.flags = Screen_DefaultFlags; |
248 | screen.flags = Screen_DefaultFlags; |
222 | screen.cur.row = screen.cur.col = 0; |
249 | screen.cur.row = screen.cur.col = 0; |
… | |
… | |
245 | { |
272 | { |
246 | /* |
273 | /* |
247 | * add or delete rows as appropriate |
274 | * add or delete rows as appropriate |
248 | */ |
275 | */ |
249 | |
276 | |
250 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
251 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
252 | |
|
|
253 | #if 0 |
|
|
254 | if (nrow < prev_nrow) |
|
|
255 | { |
|
|
256 | for (int row = nrow; row < prev_nrow; row++) |
|
|
257 | { |
|
|
258 | lfree (swap_buf [row]); |
|
|
259 | lfree (drawn_buf[row]); |
|
|
260 | } |
|
|
261 | } |
|
|
262 | #endif |
|
|
263 | |
|
|
264 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
|
|
265 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
|
|
266 | |
|
|
267 | for (int row = min (nrow, prev_nrow); row--; ) |
277 | for (int row = min (nrow, prev_nrow); row--; ) |
268 | { |
278 | { |
269 | lresize (drawn_buf[row]); |
279 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
270 | lresize (swap_buf [row]); |
280 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
271 | } |
|
|
272 | |
281 | |
273 | for (int row = prev_nrow; row < nrow; row++) |
282 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
|
|
283 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
|
|
284 | memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); |
|
|
285 | memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); |
274 | { |
286 | } |
275 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
277 | } |
|
|
278 | |
|
|
279 | line_t *old_buf = row_buf; |
|
|
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
281 | |
287 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
288 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
289 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
290 | int q = total_rows; // rewrapped row |
285 | |
291 | |
… | |
… | |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
299 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
294 | |
300 | |
295 | do |
301 | do |
296 | { |
302 | { |
297 | p = MOD (p - 1, prev_total_rows); |
303 | p = MOD (p - 1, prev_total_rows); |
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
304 | assert (prev_row_buf [MOD (p, prev_total_rows)].t); |
299 | int plines = 1; |
305 | int plines = 1; |
300 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
306 | int llen = prev_row_buf [MOD (p, prev_total_rows)].l; |
301 | |
307 | |
302 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
308 | while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
303 | { |
309 | { |
304 | p = MOD (p - 1, prev_total_rows); |
310 | p = MOD (p - 1, prev_total_rows); |
305 | |
311 | |
306 | plines++; |
312 | plines++; |
307 | llen += prev_ncol; |
313 | llen += prev_ncol; |
… | |
… | |
320 | |
326 | |
321 | // re-assemble the full line by destination lines |
327 | // re-assemble the full line by destination lines |
322 | for (int qrow = q; qlines--; qrow++) |
328 | for (int qrow = q; qlines--; qrow++) |
323 | { |
329 | { |
324 | qline = row_buf + qrow; |
330 | qline = row_buf + qrow; |
325 | lalloc (*qline); |
331 | qline->alloc (); // redundant with next line |
326 | qline->l = ncol; |
332 | qline->l = ncol; |
327 | qline->is_longer (1); |
333 | qline->is_longer (1); |
328 | |
334 | |
329 | int qcol = 0; |
335 | int qcol = 0; |
330 | |
336 | |
… | |
… | |
345 | // this seems to upset applications/shells/readline |
351 | // this seems to upset applications/shells/readline |
346 | // least. |
352 | // least. |
347 | if (prow == ocur.row) |
353 | if (prow == ocur.row) |
348 | screen.cur.row = q - (total_rows - nrow); |
354 | screen.cur.row = q - (total_rows - nrow); |
349 | |
355 | |
350 | line_t &pline = old_buf [prow]; |
356 | line_t &pline = prev_row_buf [prow]; |
351 | |
357 | |
352 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
358 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | |
359 | |
354 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
360 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
361 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
… | |
… | |
376 | { |
382 | { |
377 | // if no scrollback exists (yet), wing, instead of wrap |
383 | // if no scrollback exists (yet), wing, instead of wrap |
378 | |
384 | |
379 | for (int row = min (nrow, prev_nrow); row--; ) |
385 | for (int row = min (nrow, prev_nrow); row--; ) |
380 | { |
386 | { |
381 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
387 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
382 | line_t &qline = row_buf [row]; |
388 | line_t &dst = row_buf [row]; |
383 | |
389 | |
384 | qline = pline; |
390 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
385 | lresize (qline); |
391 | |
|
|
392 | memcpy (dst.t, src.t, sizeof (text_t) * common_col); |
|
|
393 | memcpy (dst.r, src.r, sizeof (rend_t) * common_col); |
386 | } |
394 | } |
387 | |
395 | |
388 | for (int row = prev_nrow; row < nrow; row++) |
396 | for (int row = prev_nrow; row < nrow; row++) |
389 | { |
|
|
390 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
397 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
391 | } |
|
|
392 | |
398 | |
393 | term_start = 0; |
399 | term_start = 0; |
394 | } |
400 | } |
395 | |
|
|
396 | free (old_buf); |
|
|
397 | delete old_ta; |
|
|
398 | delete old_ra; |
|
|
399 | |
401 | |
400 | clamp_it (screen.cur.row, 0, nrow - 1); |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
401 | clamp_it (screen.cur.col, 0, ncol - 1); |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
402 | } |
404 | } |
403 | |
405 | |
|
|
406 | for (int row = nrow; row--; ) |
|
|
407 | { |
|
|
408 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
409 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
410 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
|
|
411 | } |
|
|
412 | |
|
|
413 | free (prev_chunk); |
|
|
414 | |
404 | free (tabs); |
415 | free (tabs); |
405 | tabs = (char *)rxvt_malloc (ncol); |
416 | tabs = (char *)rxvt_malloc (ncol); |
406 | |
417 | |
407 | for (int col = ncol; col--; ) |
418 | for (int col = ncol; col--; ) |
408 | tabs [col] = col % TABSIZE == 0; |
419 | tabs [col] = col % TABSIZE == 0; |
… | |
… | |
415 | tt_winch (); |
426 | tt_winch (); |
416 | |
427 | |
417 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
428 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
418 | } |
429 | } |
419 | |
430 | |
420 | /* ------------------------------------------------------------------------- */ |
431 | void ecb_cold |
421 | /* |
|
|
422 | * Free everything. That way malloc debugging can find leakage. |
|
|
423 | */ |
|
|
424 | void |
|
|
425 | rxvt_term::scr_release () NOTHROW |
432 | rxvt_term::scr_release () NOTHROW |
426 | { |
433 | { |
427 | if (row_buf) |
434 | chunk_free (chunk, chunk_size); |
428 | { |
435 | chunk = 0; |
429 | delete talloc; talloc = 0; |
436 | row_buf = 0; |
430 | delete ralloc; ralloc = 0; |
|
|
431 | |
437 | |
432 | free (row_buf); |
|
|
433 | free (swap_buf); |
|
|
434 | free (drawn_buf); |
|
|
435 | row_buf = 0; // signal that we freed all the arrays above |
|
|
436 | |
|
|
437 | free (tabs); |
438 | free (tabs); |
438 | tabs = 0; |
439 | tabs = 0; |
439 | } |
|
|
440 | } |
440 | } |
441 | |
441 | |
442 | /* ------------------------------------------------------------------------- */ |
442 | /* ------------------------------------------------------------------------- */ |
443 | /* |
443 | /* |
444 | * Hard/Soft reset |
444 | * Hard/Soft reset |
445 | */ |
445 | */ |
446 | void |
446 | void ecb_cold |
447 | rxvt_term::scr_poweron () |
447 | rxvt_term::scr_poweron () |
448 | { |
448 | { |
449 | scr_release (); |
449 | scr_release (); |
|
|
450 | |
450 | prev_nrow = prev_ncol = 0; |
451 | prev_nrow = prev_ncol = 0; |
451 | rvideo_mode = false; |
452 | rvideo_mode = false; |
452 | scr_soft_reset (); |
453 | scr_soft_reset (); |
453 | scr_reset (); |
454 | scr_reset (); |
454 | |
455 | |
455 | scr_clear (true); |
456 | scr_clear (true); |
456 | scr_refresh (); |
457 | scr_refresh (); |
457 | } |
458 | } |
458 | |
459 | |
459 | void |
460 | void ecb_cold |
460 | rxvt_term::scr_soft_reset () |
461 | rxvt_term::scr_soft_reset () NOTHROW |
461 | { |
462 | { |
462 | /* only affects modes, nothing drastic such as clearing the screen */ |
463 | /* only affects modes, nothing drastic such as clearing the screen */ |
463 | #if ENABLE_OVERLAY |
464 | #if ENABLE_OVERLAY |
464 | scr_overlay_off (); |
465 | scr_overlay_off (); |
465 | #endif |
466 | #endif |
… | |
… | |
520 | assert (s->cur.row >= 0); |
521 | assert (s->cur.row >= 0); |
521 | assert (s->cur.col >= 0); |
522 | assert (s->cur.col >= 0); |
522 | } |
523 | } |
523 | |
524 | |
524 | void |
525 | void |
525 | rxvt_term::scr_swap_screen () |
526 | rxvt_term::scr_swap_screen () NOTHROW |
526 | { |
527 | { |
527 | if (!option (Opt_secondaryScreen)) |
528 | if (!option (Opt_secondaryScreen)) |
528 | return; |
529 | return; |
529 | |
530 | |
530 | for (int i = prev_nrow; i--; ) |
531 | for (int i = prev_nrow; i--; ) |
… | |
… | |
549 | return; |
550 | return; |
550 | |
551 | |
551 | want_refresh = 1; |
552 | want_refresh = 1; |
552 | view_start = 0; |
553 | view_start = 0; |
553 | |
554 | |
554 | selection_check (2); /* check for boundary cross */ |
555 | /* check for boundary cross */ |
|
|
556 | row_col_t pos; |
|
|
557 | pos.row = pos.col = 0; |
|
|
558 | if (ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
559 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
560 | CLEAR_SELECTION (); |
555 | |
561 | |
556 | current_screen = scrn; |
562 | current_screen = scrn; |
557 | |
563 | |
558 | #if NSCREENS |
564 | #if NSCREENS |
559 | if (option (Opt_secondaryScreen)) |
565 | if (option (Opt_secondaryScreen)) |
… | |
… | |
625 | /* |
631 | /* |
626 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
632 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
627 | * count positive ==> scroll up |
633 | * count positive ==> scroll up |
628 | * count negative ==> scroll down |
634 | * count negative ==> scroll down |
629 | */ |
635 | */ |
630 | int |
636 | int ecb_hot |
631 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
637 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
632 | { |
638 | { |
633 | if (count == 0 || (row1 > row2)) |
639 | if (count == 0 || (row1 > row2)) |
634 | return 0; |
640 | return 0; |
635 | |
641 | |
… | |
… | |
644 | |
650 | |
645 | top_row = max (top_row - count, -saveLines); |
651 | top_row = max (top_row - count, -saveLines); |
646 | |
652 | |
647 | // sever bottommost line |
653 | // sever bottommost line |
648 | { |
654 | { |
649 | line_t &l = ROW(row2 - 1); |
655 | line_t &l = ROW(row2); |
650 | l.is_longer (0); |
656 | l.is_longer (0); |
651 | l.touch (); |
657 | l.touch (); |
652 | } |
658 | } |
653 | |
659 | |
654 | // scroll everything up 'count' lines |
660 | // scroll everything up 'count' lines |
… | |
… | |
682 | else |
688 | else |
683 | scr_blank_screen_mem (l, rstyle); |
689 | scr_blank_screen_mem (l, rstyle); |
684 | } |
690 | } |
685 | |
691 | |
686 | // move and/or clear selection, if any |
692 | // move and/or clear selection, if any |
687 | if (selection.op && current_screen == selection.screen) |
693 | if (selection.op && current_screen == selection.screen |
|
|
694 | && selection.beg.row <= row2) |
688 | { |
695 | { |
689 | selection.beg.row -= count; |
696 | selection.beg.row -= count; |
690 | selection.end.row -= count; |
697 | selection.end.row -= count; |
691 | selection.mark.row -= count; |
698 | selection.mark.row -= count; |
692 | |
699 | |
693 | if (selection.beg.row < top_row |
700 | selection_check (0); |
694 | || selection.end.row < top_row |
|
|
695 | || selection.mark.row < top_row) |
|
|
696 | { |
|
|
697 | CLEAR_ALL_SELECTION (); |
|
|
698 | selection.op = SELECTION_CLEAR; |
|
|
699 | } |
|
|
700 | } |
701 | } |
701 | |
702 | |
702 | // finally move the view window, if desired |
703 | // finally move the view window, if desired |
703 | if (option (Opt_scrollWithBuffer) |
704 | if (option (Opt_scrollWithBuffer) |
704 | && view_start != 0 |
705 | && view_start != 0 |
… | |
… | |
746 | |
747 | |
747 | int rows = row2 - row1 + 1; |
748 | int rows = row2 - row1 + 1; |
748 | |
749 | |
749 | min_it (count, rows); |
750 | min_it (count, rows); |
750 | |
751 | |
751 | line_t *temp_buf = row_buf + total_rows; |
752 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
752 | |
753 | |
753 | for (int row = 0; row < rows; row++) |
754 | for (int row = 0; row < rows; row++) |
754 | { |
755 | { |
755 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
756 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
756 | |
757 | |
… | |
… | |
761 | for (int row = 0; row < rows; row++) |
762 | for (int row = 0; row < rows; row++) |
762 | ROW(row1 + row) = temp_buf [row]; |
763 | ROW(row1 + row) = temp_buf [row]; |
763 | |
764 | |
764 | // sever bottommost line |
765 | // sever bottommost line |
765 | { |
766 | { |
766 | line_t &l = ROW(row2 - 1); |
767 | line_t &l = ROW(row2); |
767 | l.is_longer (0); |
768 | l.is_longer (0); |
768 | l.touch (); |
769 | l.touch (); |
769 | } |
770 | } |
770 | |
|
|
771 | } |
771 | } |
772 | |
772 | |
773 | return count; |
773 | return count; |
774 | } |
774 | } |
775 | |
775 | |
776 | /* ------------------------------------------------------------------------- */ |
776 | /* ------------------------------------------------------------------------- */ |
777 | /* |
777 | /* |
778 | * Add text given in <str> of length <len> to screen struct |
778 | * Add text given in <str> of length <len> to screen struct |
779 | */ |
779 | */ |
780 | void |
780 | void ecb_hot |
781 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
781 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
782 | { |
782 | { |
783 | if (len <= 0) /* sanity */ |
783 | if (len <= 0) /* sanity */ |
784 | return; |
784 | return; |
785 | |
785 | |
786 | unsigned char checksel; |
786 | bool checksel; |
787 | unicode_t c; |
787 | unicode_t c; |
788 | int ncol = this->ncol; |
788 | int ncol = this->ncol; |
789 | const wchar_t *strend = str + len; |
789 | const wchar_t *strend = str + len; |
790 | |
790 | |
791 | want_refresh = 1; |
791 | want_refresh = 1; |
… | |
… | |
1135 | * XTERM_SEQ: ESC 6 |
1135 | * XTERM_SEQ: ESC 6 |
1136 | * Move cursor left in row. If we're at the left boundary, shift everything |
1136 | * Move cursor left in row. If we're at the left boundary, shift everything |
1137 | * in that row right. Clear left column. |
1137 | * in that row right. Clear left column. |
1138 | */ |
1138 | */ |
1139 | #if !ENABLE_MINIMAL |
1139 | #if !ENABLE_MINIMAL |
1140 | void |
1140 | void ecb_cold |
1141 | rxvt_term::scr_backindex () NOTHROW |
1141 | rxvt_term::scr_backindex () NOTHROW |
1142 | { |
1142 | { |
1143 | if (screen.cur.col > 0) |
1143 | if (screen.cur.col > 0) |
1144 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1144 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1145 | else |
1145 | else |
… | |
… | |
1152 | * XTERM_SEQ: ESC 9 |
1152 | * XTERM_SEQ: ESC 9 |
1153 | * Move cursor right in row. If we're at the right boundary, shift everything |
1153 | * Move cursor right in row. If we're at the right boundary, shift everything |
1154 | * in that row left. Clear right column. |
1154 | * in that row left. Clear right column. |
1155 | */ |
1155 | */ |
1156 | #if !ENABLE_MINIMAL |
1156 | #if !ENABLE_MINIMAL |
1157 | void |
1157 | void ecb_cold |
1158 | rxvt_term::scr_forwardindex () NOTHROW |
1158 | rxvt_term::scr_forwardindex () NOTHROW |
1159 | { |
1159 | { |
1160 | if (screen.cur.col < ncol - 1) |
1160 | if (screen.cur.col < ncol - 1) |
1161 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1161 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1162 | else |
1162 | else |
… | |
… | |
1313 | scr_blank_line (line, col, num, rstyle); |
1313 | scr_blank_line (line, col, num, rstyle); |
1314 | } |
1314 | } |
1315 | |
1315 | |
1316 | /* ------------------------------------------------------------------------- */ |
1316 | /* ------------------------------------------------------------------------- */ |
1317 | /* |
1317 | /* |
1318 | * Erase part of whole of the screen |
1318 | * Erase part or whole of the screen |
1319 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1319 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1320 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1320 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1321 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1321 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1322 | */ |
1322 | */ |
1323 | void |
1323 | void |
… | |
… | |
1332 | ZERO_SCROLLBACK (); |
1332 | ZERO_SCROLLBACK (); |
1333 | |
1333 | |
1334 | switch (mode) |
1334 | switch (mode) |
1335 | { |
1335 | { |
1336 | case 0: /* erase to end of screen */ |
1336 | case 0: /* erase to end of screen */ |
1337 | selection_check (1); |
|
|
1338 | scr_erase_line (0); |
1337 | scr_erase_line (0); |
1339 | row = screen.cur.row + 1; /* possible OOB */ |
1338 | row = screen.cur.row + 1; /* possible OOB */ |
1340 | num = nrow - row; |
1339 | num = nrow - row; |
1341 | break; |
1340 | break; |
1342 | case 1: /* erase to beginning of screen */ |
1341 | case 1: /* erase to beginning of screen */ |
1343 | selection_check (3); |
|
|
1344 | scr_erase_line (1); |
1342 | scr_erase_line (1); |
1345 | row = 0; |
1343 | row = 0; |
1346 | num = screen.cur.row; |
1344 | num = screen.cur.row; |
1347 | break; |
1345 | break; |
1348 | case 2: /* erase whole screen */ |
1346 | case 2: /* erase whole screen */ |
1349 | selection_check (3); |
|
|
1350 | row = 0; |
1347 | row = 0; |
1351 | num = nrow; |
1348 | num = nrow; |
1352 | break; |
1349 | break; |
1353 | default: |
1350 | default: |
1354 | return; |
1351 | return; |
… | |
… | |
1371 | { |
1368 | { |
1372 | ren = DEFAULT_RSTYLE; |
1369 | ren = DEFAULT_RSTYLE; |
1373 | |
1370 | |
1374 | if (mapped) |
1371 | if (mapped) |
1375 | XClearArea (dpy, vt, 0, |
1372 | XClearArea (dpy, vt, 0, |
1376 | Row2Pixel (row - view_start), (unsigned int)width, |
1373 | Row2Pixel (row - view_start), (unsigned int)vt_width, |
1377 | (unsigned int)Height2Pixel (num), False); |
1374 | (unsigned int)Height2Pixel (num), False); |
1378 | } |
1375 | } |
1379 | else |
1376 | else |
1380 | { |
1377 | { |
1381 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1378 | ren = rstyle & (RS_fgMask | RS_bgMask); |
… | |
… | |
1384 | { |
1381 | { |
1385 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1382 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1386 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1383 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1387 | XFillRectangle (dpy, vt, gc, |
1384 | XFillRectangle (dpy, vt, gc, |
1388 | 0, Row2Pixel (row - view_start), |
1385 | 0, Row2Pixel (row - view_start), |
1389 | (unsigned int)width, |
1386 | (unsigned int)vt_width, |
1390 | (unsigned int)Height2Pixel (num)); |
1387 | (unsigned int)Height2Pixel (num)); |
1391 | gcvalue.foreground = pix_colors[Color_fg]; |
1388 | gcvalue.foreground = pix_colors[Color_fg]; |
1392 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1389 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1393 | } |
1390 | } |
1394 | } |
1391 | } |
… | |
… | |
1416 | /* ------------------------------------------------------------------------- */ |
1413 | /* ------------------------------------------------------------------------- */ |
1417 | /* |
1414 | /* |
1418 | * Fill the screen with `E's |
1415 | * Fill the screen with `E's |
1419 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1416 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1420 | */ |
1417 | */ |
1421 | void |
1418 | void ecb_cold |
1422 | rxvt_term::scr_E () NOTHROW |
1419 | rxvt_term::scr_E () NOTHROW |
1423 | { |
1420 | { |
1424 | rend_t fs; |
1421 | rend_t fs; |
1425 | |
1422 | |
1426 | want_refresh = 1; |
1423 | want_refresh = 1; |
1427 | ZERO_SCROLLBACK (); |
1424 | ZERO_SCROLLBACK (); |
1428 | |
1425 | |
1429 | num_scr_allow = 0; |
1426 | num_scr_allow = 0; |
1430 | selection_check (3); |
1427 | |
|
|
1428 | row_col_t pos; |
|
|
1429 | pos.row = pos.col = 0; |
|
|
1430 | if (ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
1431 | CLEAR_SELECTION (); |
1431 | |
1432 | |
1432 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1433 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1433 | for (int row = nrow; row--; ) |
1434 | for (int row = nrow; row--; ) |
1434 | { |
1435 | { |
1435 | line_t &line = ROW(row); |
1436 | line_t &line = ROW(row); |
… | |
… | |
1586 | /* ------------------------------------------------------------------------- */ |
1587 | /* ------------------------------------------------------------------------- */ |
1587 | /* |
1588 | /* |
1588 | * Set the scrolling region |
1589 | * Set the scrolling region |
1589 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1590 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1590 | */ |
1591 | */ |
1591 | void |
1592 | void ecb_cold |
1592 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1593 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1593 | { |
1594 | { |
1594 | max_it (top, 0); |
1595 | max_it (top, 0); |
1595 | min_it (bot, nrow - 1); |
1596 | min_it (bot, nrow - 1); |
1596 | |
1597 | |
… | |
… | |
1606 | /* |
1607 | /* |
1607 | * Make the cursor visible/invisible |
1608 | * Make the cursor visible/invisible |
1608 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1609 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1609 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1610 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1610 | */ |
1611 | */ |
1611 | void |
1612 | void ecb_cold |
1612 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1613 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1613 | { |
1614 | { |
1614 | want_refresh = 1; |
1615 | want_refresh = 1; |
1615 | |
1616 | |
1616 | if (mode) |
1617 | if (mode) |
… | |
… | |
1623 | /* |
1624 | /* |
1624 | * Set/unset automatic wrapping |
1625 | * Set/unset automatic wrapping |
1625 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1626 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1626 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1627 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1627 | */ |
1628 | */ |
1628 | void |
1629 | void ecb_cold |
1629 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1630 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1630 | { |
1631 | { |
1631 | if (mode) |
1632 | if (mode) |
1632 | screen.flags |= Screen_Autowrap; |
1633 | screen.flags |= Screen_Autowrap; |
1633 | else |
1634 | else |
… | |
… | |
1642 | * Relative mode: line numbers are relative to top margin of scrolling region |
1643 | * Relative mode: line numbers are relative to top margin of scrolling region |
1643 | * and the cursor cannot be moved outside. |
1644 | * and the cursor cannot be moved outside. |
1644 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1645 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1645 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1646 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1646 | */ |
1647 | */ |
1647 | void |
1648 | void ecb_cold |
1648 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1649 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1649 | { |
1650 | { |
1650 | if (mode) |
1651 | if (mode) |
1651 | screen.flags |= Screen_Relative; |
1652 | screen.flags |= Screen_Relative; |
1652 | else |
1653 | else |
… | |
… | |
1659 | /* |
1660 | /* |
1660 | * Set insert/replace mode |
1661 | * Set insert/replace mode |
1661 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1662 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1662 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1663 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1663 | */ |
1664 | */ |
1664 | void |
1665 | void ecb_cold |
1665 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1666 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1666 | { |
1667 | { |
1667 | if (mode) |
1668 | if (mode) |
1668 | screen.flags |= Screen_Insert; |
1669 | screen.flags |= Screen_Insert; |
1669 | else |
1670 | else |
… | |
… | |
1675 | * Set/Unset tabs |
1676 | * Set/Unset tabs |
1676 | * XTERM_SEQ: Set tab at current column : ESC H |
1677 | * XTERM_SEQ: Set tab at current column : ESC H |
1677 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1678 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1678 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1679 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1679 | */ |
1680 | */ |
1680 | void |
1681 | void ecb_cold |
1681 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1682 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1682 | { |
1683 | { |
1683 | if (mode < 0) |
1684 | if (mode < 0) |
1684 | memset (tabs, 0, ncol); |
1685 | memset (tabs, 0, ncol); |
1685 | else if (screen.cur.col < ncol) |
1686 | else if (screen.cur.col < ncol) |
… | |
… | |
1705 | { |
1706 | { |
1706 | rvideo_state = on; |
1707 | rvideo_state = on; |
1707 | |
1708 | |
1708 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1709 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1709 | #ifdef HAVE_BG_PIXMAP |
1710 | #ifdef HAVE_BG_PIXMAP |
1710 | if (bg_pixmap == None) |
1711 | if (bg_img == 0) |
1711 | #endif |
1712 | #endif |
1712 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1713 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1713 | |
1714 | |
1714 | XGCValues gcvalue; |
1715 | XGCValues gcvalue; |
1715 | gcvalue.foreground = pix_colors[Color_fg]; |
1716 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1724 | /* ------------------------------------------------------------------------- */ |
1725 | /* ------------------------------------------------------------------------- */ |
1725 | /* |
1726 | /* |
1726 | * Report current cursor position |
1727 | * Report current cursor position |
1727 | * XTERM_SEQ: Report position: ESC [ 6 n |
1728 | * XTERM_SEQ: Report position: ESC [ 6 n |
1728 | */ |
1729 | */ |
1729 | void |
1730 | void ecb_cold |
1730 | rxvt_term::scr_report_position () NOTHROW |
1731 | rxvt_term::scr_report_position () NOTHROW |
1731 | { |
1732 | { |
1732 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1733 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1733 | } |
1734 | } |
1734 | |
1735 | |
… | |
… | |
1737 | * ------------------------------------------------------------------------- */ |
1738 | * ------------------------------------------------------------------------- */ |
1738 | |
1739 | |
1739 | /* |
1740 | /* |
1740 | * Set font style |
1741 | * Set font style |
1741 | */ |
1742 | */ |
1742 | void |
1743 | void ecb_cold |
1743 | rxvt_term::set_font_style () NOTHROW |
1744 | rxvt_term::set_font_style () NOTHROW |
1744 | { |
1745 | { |
1745 | #if 0 |
1746 | #if 0 |
1746 | switch (charsets [screen.charset]) |
1747 | switch (charsets [screen.charset]) |
1747 | { |
1748 | { |
… | |
… | |
1769 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1770 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1770 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1771 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1771 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1772 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1772 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1773 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1773 | */ |
1774 | */ |
1774 | void |
1775 | void ecb_cold |
1775 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1776 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1776 | { |
1777 | { |
1777 | screen.charset = set; |
1778 | screen.charset = set; |
1778 | set_font_style (); |
1779 | set_font_style (); |
1779 | } |
1780 | } |
… | |
… | |
1800 | * ------------------------------------------------------------------------- */ |
1801 | * ------------------------------------------------------------------------- */ |
1801 | |
1802 | |
1802 | /* |
1803 | /* |
1803 | * refresh matching text. |
1804 | * refresh matching text. |
1804 | */ |
1805 | */ |
1805 | bool |
1806 | bool ecb_cold |
1806 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1807 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1807 | { |
1808 | { |
1808 | bool found = false; |
1809 | bool found = false; |
1809 | |
1810 | |
1810 | for (int i = 0; i < nrow; i++) |
1811 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1829 | PART_BEG = 0, |
1830 | PART_BEG = 0, |
1830 | PART_END, |
1831 | PART_END, |
1831 | RC_COUNT |
1832 | RC_COUNT |
1832 | }; |
1833 | }; |
1833 | |
1834 | |
1834 | void |
1835 | void ecb_hot |
1835 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1836 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1836 | { |
1837 | { |
1837 | int i; |
1838 | int i; |
1838 | row_col_t rc[RC_COUNT]; |
1839 | row_col_t rc[RC_COUNT]; |
1839 | |
1840 | |
… | |
… | |
1876 | * Refresh the entire screen |
1877 | * Refresh the entire screen |
1877 | */ |
1878 | */ |
1878 | void |
1879 | void |
1879 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1880 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1880 | { |
1881 | { |
1881 | scr_expose (0, 0, width, height, refresh); |
1882 | scr_expose (0, 0, vt_width, vt_height, refresh); |
1882 | } |
1883 | } |
1883 | |
1884 | |
1884 | /* ------------------------------------------------------------------------- */ |
1885 | /* ------------------------------------------------------------------------- */ |
1885 | /* |
1886 | /* |
1886 | * Move the display so that the line represented by scrollbar value Y is at |
1887 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1965 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1966 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1966 | #endif |
1967 | #endif |
1967 | } |
1968 | } |
1968 | |
1969 | |
1969 | /* ------------------------------------------------------------------------- */ |
1970 | /* ------------------------------------------------------------------------- */ |
1970 | void |
1971 | void ecb_cold |
1971 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1972 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1972 | { |
1973 | { |
1973 | #ifdef PRINTPIPE |
1974 | #ifdef PRINTPIPE |
1974 | int nrows, row_start; |
1975 | int nrows, row_start; |
1975 | FILE *fd = popen_printer (); |
1976 | FILE *fd = popen_printer (); |
… | |
… | |
2024 | /* |
2025 | /* |
2025 | * Refresh the screen |
2026 | * Refresh the screen |
2026 | * drawn_text/drawn_rend contain the screen information before the update. |
2027 | * drawn_text/drawn_rend contain the screen information before the update. |
2027 | * screen.text/screen.rend contain what the screen will change to. |
2028 | * screen.text/screen.rend contain what the screen will change to. |
2028 | */ |
2029 | */ |
2029 | void |
2030 | void ecb_hot |
2030 | rxvt_term::scr_refresh () NOTHROW |
2031 | rxvt_term::scr_refresh () NOTHROW |
2031 | { |
2032 | { |
2032 | int16_t col, row, /* column/row we're processing */ |
2033 | int16_t col, row, /* column/row we're processing */ |
2033 | ocrow; /* old cursor row */ |
2034 | ocrow; /* old cursor row */ |
2034 | int i; /* tmp */ |
2035 | int i; /* tmp */ |
… | |
… | |
2048 | * A: set up vars |
2049 | * A: set up vars |
2049 | */ |
2050 | */ |
2050 | refresh_count = 0; |
2051 | refresh_count = 0; |
2051 | |
2052 | |
2052 | unsigned int old_screen_flags = screen.flags; |
2053 | unsigned int old_screen_flags = screen.flags; |
2053 | char have_bg = 0; |
2054 | bool have_bg = 0; |
2054 | #ifdef HAVE_BG_PIXMAP |
2055 | #ifdef HAVE_BG_PIXMAP |
2055 | have_bg = bg_pixmap != None; |
2056 | have_bg = bg_img != 0; |
2056 | #endif |
2057 | #endif |
2057 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2058 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2058 | |
2059 | |
2059 | /* |
2060 | /* |
2060 | * B: reverse any characters which are selected |
2061 | * B: reverse any characters which are selected |
… | |
… | |
2064 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2065 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2065 | #if ENABLE_OVERLAY |
2066 | #if ENABLE_OVERLAY |
2066 | scr_swap_overlay (); |
2067 | scr_swap_overlay (); |
2067 | #endif |
2068 | #endif |
2068 | |
2069 | |
2069 | char showcursor = screen.flags & Screen_VisibleCursor; |
2070 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2070 | |
2071 | |
2071 | /* |
2072 | /* |
2072 | * C: set the cursor character (s) |
2073 | * C: set the cursor character (s) |
2073 | */ |
2074 | */ |
2074 | { |
2075 | { |
2075 | unsigned char setoldcursor; |
2076 | bool setoldcursor; |
2076 | |
2077 | |
2077 | #ifdef CURSOR_BLINK |
2078 | #ifdef CURSOR_BLINK |
2078 | if (hidden_cursor) |
2079 | if (hidden_cursor) |
2079 | showcursor = 0; |
2080 | showcursor = 0; |
2080 | #endif |
2081 | #endif |
… | |
… | |
2167 | { |
2168 | { |
2168 | int16_t nits; |
2169 | int16_t nits; |
2169 | int i = num_scr; |
2170 | int i = num_scr; |
2170 | int j; |
2171 | int j; |
2171 | int len, wlen; |
2172 | int len, wlen; |
2172 | dLocal (int, num_scr); |
|
|
2173 | |
2173 | |
2174 | j = nrow; |
2174 | j = nrow; |
2175 | wlen = len = -1; |
2175 | wlen = len = -1; |
2176 | row = i > 0 ? 0 : j - 1; |
2176 | row = i > 0 ? 0 : j - 1; |
2177 | |
2177 | |
… | |
… | |
2482 | |
2482 | |
2483 | XDrawRectangle (dpy, vt, gc, |
2483 | XDrawRectangle (dpy, vt, gc, |
2484 | Col2Pixel (col), |
2484 | Col2Pixel (col), |
2485 | Row2Pixel (oldcursor.row), |
2485 | Row2Pixel (oldcursor.row), |
2486 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2486 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2487 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2487 | (unsigned int) (Height2Pixel (1) - 1)); |
2488 | } |
2488 | } |
2489 | } |
2489 | } |
2490 | |
2490 | |
2491 | /* |
2491 | /* |
2492 | * H: cleanup selection |
2492 | * H: cleanup selection |
… | |
… | |
2501 | screen.flags = old_screen_flags; |
2501 | screen.flags = old_screen_flags; |
2502 | num_scr = 0; |
2502 | num_scr = 0; |
2503 | num_scr_allow = 1; |
2503 | num_scr_allow = 1; |
2504 | } |
2504 | } |
2505 | |
2505 | |
2506 | void |
2506 | void ecb_cold |
2507 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2507 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2508 | { |
2508 | { |
2509 | if (!l.t) |
2509 | if (!l.valid ()) |
2510 | return; |
2510 | return; |
2511 | |
2511 | |
2512 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2512 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2513 | |
2513 | |
2514 | for (int i = ncol; i--; ) |
2514 | for (int i = ncol; i--; ) |
2515 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2515 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2516 | } |
2516 | } |
2517 | |
2517 | |
2518 | void |
2518 | void ecb_cold |
2519 | rxvt_term::scr_remap_chars () NOTHROW |
2519 | rxvt_term::scr_remap_chars () NOTHROW |
2520 | { |
2520 | { |
2521 | for (int i = total_rows; i--; ) |
2521 | for (int i = total_rows; i--; ) |
2522 | scr_remap_chars (row_buf [i]); |
2522 | scr_remap_chars (row_buf [i]); |
2523 | |
2523 | |
… | |
… | |
2526 | scr_remap_chars (drawn_buf [i]); |
2526 | scr_remap_chars (drawn_buf [i]); |
2527 | scr_remap_chars (swap_buf [i]); |
2527 | scr_remap_chars (swap_buf [i]); |
2528 | } |
2528 | } |
2529 | } |
2529 | } |
2530 | |
2530 | |
2531 | void |
2531 | void ecb_cold |
2532 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2532 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2533 | { |
2533 | { |
2534 | bool transparent = false; |
2534 | bool transparent = false; |
2535 | |
2535 | |
2536 | #ifdef HAVE_BG_PIXMAP |
2536 | #ifdef HAVE_BG_PIXMAP |
2537 | if (bg_pixmap != None) |
2537 | if (bg_img != 0) |
2538 | { |
2538 | { |
2539 | # ifdef ENABLE_TRANSPARENCY |
2539 | # if ENABLE_TRANSPARENCY |
2540 | if (bg_flags & BG_IS_TRANSPARENT) |
2540 | if (bg_flags & BG_IS_TRANSPARENT) |
2541 | { |
2541 | { |
2542 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
2542 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
2543 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2543 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2544 | |
2544 | |
2545 | transparent = true; |
2545 | transparent = true; |
2546 | } |
2546 | } |
2547 | else |
2547 | else |
2548 | # endif |
2548 | # endif |
2549 | { |
2549 | { |
2550 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2550 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2551 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
2551 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
2552 | } |
2552 | } |
2553 | } |
2553 | } |
2554 | else |
2554 | else |
2555 | #endif |
2555 | #endif |
2556 | { |
2556 | { |
… | |
… | |
2564 | { |
2564 | { |
2565 | if (transparent) |
2565 | if (transparent) |
2566 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2566 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2567 | else |
2567 | else |
2568 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2568 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2569 | scrollBar.state = STATE_IDLE; |
2569 | scrollBar.state = SB_STATE_IDLE; |
2570 | scrollBar.show (0); |
2570 | scrollBar.show (0); |
2571 | } |
2571 | } |
2572 | |
2572 | |
2573 | if (refresh) |
2573 | if (refresh) |
2574 | { |
2574 | { |
… | |
… | |
2639 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2639 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2640 | srp[col] ^= rstyle; |
2640 | srp[col] ^= rstyle; |
2641 | } |
2641 | } |
2642 | |
2642 | |
2643 | /* ------------------------------------------------------------------------- */ |
2643 | /* ------------------------------------------------------------------------- */ |
2644 | void |
2644 | void ecb_hot |
2645 | rxvt_term::scr_reverse_selection () NOTHROW |
2645 | rxvt_term::scr_reverse_selection () NOTHROW |
2646 | { |
2646 | { |
2647 | if (selection.op |
2647 | if (selection.op |
2648 | && current_screen == selection.screen |
2648 | && current_screen == selection.screen |
2649 | && selection.end.row >= view_start) |
2649 | && selection.end.row >= view_start) |
… | |
… | |
2668 | */ |
2668 | */ |
2669 | #if 0 |
2669 | #if 0 |
2670 | void |
2670 | void |
2671 | rxvt_term::scr_dump (int fd) NOTHROW |
2671 | rxvt_term::scr_dump (int fd) NOTHROW |
2672 | { |
2672 | { |
2673 | int row, wrote; |
2673 | // if this method is needed, it can be implemented by factoring the |
2674 | unsigned int width, towrite; |
2674 | // relevant code in scr_printscreen |
2675 | const char r1[] = "\n"; |
|
|
2676 | |
|
|
2677 | for (row = saveLines + top_row; |
|
|
2678 | row < saveLines + nrow - 1; row++) |
|
|
2679 | { |
|
|
2680 | width = row_buf[row].l >= 0 ? row_buf[row].l |
|
|
2681 | : ncol; |
|
|
2682 | for (towrite = width; towrite; towrite -= wrote) |
|
|
2683 | { |
|
|
2684 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
|
|
2685 | towrite); |
|
|
2686 | if (wrote < 0) |
|
|
2687 | return; /* XXX: death, no report */ |
|
|
2688 | } |
|
|
2689 | if (row_buf[row].l >= 0) |
|
|
2690 | if (write (fd, r1, 1) <= 0) |
|
|
2691 | return; /* XXX: death, no report */ |
|
|
2692 | } |
|
|
2693 | } |
2675 | } |
2694 | #endif |
2676 | #endif |
2695 | |
2677 | |
2696 | /* ------------------------------------------------------------------------- * |
2678 | /* ------------------------------------------------------------------------- * |
2697 | * CHARACTER SELECTION * |
2679 | * CHARACTER SELECTION * |
2698 | * ------------------------------------------------------------------------- */ |
2680 | * ------------------------------------------------------------------------- */ |
2699 | void |
2681 | void |
2700 | rxvt_term::selection_check (int check_more) NOTHROW |
2682 | rxvt_term::selection_check (int check_more) NOTHROW |
2701 | { |
2683 | { |
2702 | row_col_t pos; |
|
|
2703 | |
|
|
2704 | if (!selection.op) |
2684 | if (!selection.op) |
2705 | return; |
2685 | return; |
2706 | |
2686 | |
2707 | pos.row = pos.col = 0; |
|
|
2708 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2687 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2709 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2688 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2710 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2689 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2711 | || (check_more == 1 |
2690 | || (check_more == 1 |
2712 | && current_screen == selection.screen |
2691 | && current_screen == selection.screen |
2713 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2692 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2714 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2693 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2715 | || (check_more == 2 |
|
|
2716 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
2717 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2718 | || (check_more == 3 |
|
|
2719 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2720 | || (check_more == 4 /* screen width change */ |
|
|
2721 | && (selection.beg.row != selection.end.row |
|
|
2722 | || selection.end.col > ncol))) |
|
|
2723 | CLEAR_SELECTION (); |
2694 | CLEAR_ALL_SELECTION (); |
2724 | } |
2695 | } |
2725 | |
2696 | |
2726 | /* ------------------------------------------------------------------------- */ |
2697 | /* ------------------------------------------------------------------------- */ |
2727 | /* |
2698 | /* |
2728 | * Paste a selection direct to the command fd |
2699 | * Paste a selection direct to the command fd |
… | |
… | |
2734 | for (unsigned int i = 0; i < len; i++) |
2705 | for (unsigned int i = 0; i < len; i++) |
2735 | if (data[i] == C0_LF) |
2706 | if (data[i] == C0_LF) |
2736 | data[i] = C0_CR; |
2707 | data[i] = C0_CR; |
2737 | |
2708 | |
2738 | if (priv_modes & PrivMode_BracketPaste) |
2709 | if (priv_modes & PrivMode_BracketPaste) |
2739 | tt_printf ("\e[200~"); |
2710 | tt_printf ("\x1b[200~"); |
2740 | |
2711 | |
2741 | tt_write (data, len); |
2712 | tt_write (data, len); |
2742 | |
2713 | |
2743 | if (priv_modes & PrivMode_BracketPaste) |
2714 | if (priv_modes & PrivMode_BracketPaste) |
2744 | tt_printf ("\e[201~"); |
2715 | tt_printf ("\x1b[201~"); |
2745 | } |
2716 | } |
2746 | |
2717 | |
2747 | void |
2718 | void |
2748 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2719 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2749 | { |
2720 | { |
… | |
… | |
2969 | /* ------------------------------------------------------------------------- */ |
2940 | /* ------------------------------------------------------------------------- */ |
2970 | /* |
2941 | /* |
2971 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2942 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2972 | * EXT: button 1 press |
2943 | * EXT: button 1 press |
2973 | */ |
2944 | */ |
2974 | void |
2945 | void ecb_cold |
2975 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2946 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2976 | { |
2947 | { |
2977 | clicks = ((clicks - 1) % 3) + 1; |
2948 | clicks = ((clicks - 1) % 3) + 1; |
2978 | selection.clicks = clicks; /* save clicks so extend will work */ |
2949 | selection.clicks = clicks; /* save clicks so extend will work */ |
2979 | |
2950 | |
… | |
… | |
2998 | |
2969 | |
2999 | /* ------------------------------------------------------------------------- */ |
2970 | /* ------------------------------------------------------------------------- */ |
3000 | /* |
2971 | /* |
3001 | * Mark a selection at the specified col/row |
2972 | * Mark a selection at the specified col/row |
3002 | */ |
2973 | */ |
3003 | void |
2974 | void ecb_cold |
3004 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2975 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3005 | { |
2976 | { |
3006 | want_refresh = 1; |
2977 | want_refresh = 1; |
3007 | |
2978 | |
3008 | selection.mark.row = row + view_start; |
2979 | selection.mark.row = row + view_start; |
… | |
… | |
3035 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3006 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3036 | #define DELIMIT_TEXT(x) \ |
3007 | #define DELIMIT_TEXT(x) \ |
3037 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3008 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3038 | #define DELIMIT_REND(x) 1 |
3009 | #define DELIMIT_REND(x) 1 |
3039 | |
3010 | |
3040 | void |
3011 | void ecb_cold |
3041 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3012 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3042 | { |
3013 | { |
3043 | int col, row, dirnadd, tcol, trow, w1, w2; |
3014 | int col, row, dirnadd, tcol, trow, w1, w2; |
3044 | row_col_t bound; |
3015 | row_col_t bound; |
3045 | text_t *stp; |
3016 | text_t *stp; |
… | |
… | |
3119 | * EXT: button 3 press; button 1 or 3 drag |
3090 | * EXT: button 3 press; button 1 or 3 drag |
3120 | * flag == 0 ==> button 1 |
3091 | * flag == 0 ==> button 1 |
3121 | * flag == 1 ==> button 3 press |
3092 | * flag == 1 ==> button 3 press |
3122 | * flag == 2 ==> button 3 motion |
3093 | * flag == 2 ==> button 3 motion |
3123 | */ |
3094 | */ |
3124 | void |
3095 | void ecb_cold |
3125 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3096 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3126 | { |
3097 | { |
3127 | int col = clamp (Pixel2Col (x), 0, ncol); |
3098 | int col = clamp (Pixel2Col (x), 0, ncol); |
3128 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3099 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3129 | |
3100 | |
… | |
… | |
3155 | |
3126 | |
3156 | /* ------------------------------------------------------------------------- */ |
3127 | /* ------------------------------------------------------------------------- */ |
3157 | /* |
3128 | /* |
3158 | * Extend the selection to the specified col/row |
3129 | * Extend the selection to the specified col/row |
3159 | */ |
3130 | */ |
3160 | void |
3131 | void ecb_cold |
3161 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3132 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3162 | { |
3133 | { |
3163 | row_col_t pos; |
3134 | row_col_t pos; |
3164 | enum { |
3135 | enum { |
3165 | LEFT, RIGHT |
3136 | LEFT, RIGHT |
… | |
… | |
3356 | ::swap (selection.beg.col, selection.end.col); |
3327 | ::swap (selection.beg.col, selection.end.col); |
3357 | #endif |
3328 | #endif |
3358 | } |
3329 | } |
3359 | |
3330 | |
3360 | #if !ENABLE_MINIMAL |
3331 | #if !ENABLE_MINIMAL |
3361 | void |
3332 | void ecb_cold |
3362 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3333 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3363 | { |
3334 | { |
3364 | int32_t end_col, end_row; |
3335 | int32_t end_col, end_row; |
3365 | text_t *stp; |
3336 | text_t *stp; |
3366 | |
3337 | |
… | |
… | |
3404 | /* ------------------------------------------------------------------------- */ |
3375 | /* ------------------------------------------------------------------------- */ |
3405 | /* |
3376 | /* |
3406 | * Double click on button 3 when already selected |
3377 | * Double click on button 3 when already selected |
3407 | * EXT: button 3 double click |
3378 | * EXT: button 3 double click |
3408 | */ |
3379 | */ |
3409 | void |
3380 | void ecb_cold |
3410 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3381 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3411 | { |
3382 | { |
3412 | selection.clicks = selection.clicks % 3 + 1; |
3383 | selection.clicks = selection.clicks % 3 + 1; |
3413 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3384 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3414 | } |
3385 | } |
… | |
… | |
3416 | /* ------------------------------------------------------------------------- */ |
3387 | /* ------------------------------------------------------------------------- */ |
3417 | /* |
3388 | /* |
3418 | * Respond to a request for our current selection |
3389 | * Respond to a request for our current selection |
3419 | * EXT: SelectionRequest |
3390 | * EXT: SelectionRequest |
3420 | */ |
3391 | */ |
3421 | void |
3392 | void ecb_cold |
3422 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3393 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3423 | { |
3394 | { |
3424 | Atom property = rq.property == None ? rq.target : rq.property; |
3395 | Atom property = rq.property == None ? rq.target : rq.property; |
3425 | XSelectionEvent ev; |
3396 | XSelectionEvent ev; |
3426 | |
3397 | |
… | |
… | |
3559 | |
3530 | |
3560 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3531 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3561 | } |
3532 | } |
3562 | |
3533 | |
3563 | /* ------------------------------------------------------------------------- */ |
3534 | /* ------------------------------------------------------------------------- */ |
3564 | #ifdef USE_XIM |
3535 | #if USE_XIM |
3565 | void |
3536 | void ecb_cold |
3566 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3537 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3567 | { |
3538 | { |
3568 | XWindowAttributes xwa; |
3539 | XWindowAttributes xwa; |
3569 | |
3540 | |
3570 | XGetWindowAttributes (dpy, vt, &xwa); |
3541 | XGetWindowAttributes (dpy, vt, &xwa); |