1 | /*---------------------------------------------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | * (at your option) any later version. |
11 | * (at your option) any later version. |
… | |
… | |
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 seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
41 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
42 | #define PROP_SIZE 256*1024 |
|
|
43 | #define PASTE_SIZE 32768 |
|
|
44 | #define TABSIZE 8 /* default tab size */ |
43 | #define TABSIZE 8 /* default tab size */ |
45 | |
44 | |
46 | /* ------------------------------------------------------------------------- * |
45 | /* ------------------------------------------------------------------------- * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
46 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * ------------------------------------------------------------------------- */ |
47 | * ------------------------------------------------------------------------- */ |
… | |
… | |
50 | if (option (Opt_scrollTtyOutput)) \ |
49 | if (option (Opt_scrollTtyOutput)) \ |
51 | view_start = 0 |
50 | view_start = 0 |
52 | #define CLEAR_SELECTION() \ |
51 | #define CLEAR_SELECTION() \ |
53 | selection.beg.row = selection.beg.col \ |
52 | selection.beg.row = selection.beg.col \ |
54 | = selection.end.row = selection.end.col = 0 |
53 | = selection.end.row = selection.end.col = 0 |
55 | #define CLEAR_ALL_SELECTION() \ |
54 | #define CLEAR_SELECTION_MARK() \ |
56 | selection.beg.row = selection.beg.col \ |
|
|
57 | = selection.mark.row = selection.mark.col \ |
|
|
58 | = selection.end.row = selection.end.col = 0 |
55 | selection.mark.row = selection.mark.col = 0 |
59 | |
56 | |
60 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
57 | #define ROW_AND_COL_IS_AFTER(A, B, C, D) \ |
61 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
58 | (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) |
62 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
59 | #define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ |
63 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
60 | (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) |
… | |
… | |
83 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
80 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
84 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
81 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
82 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | |
83 | |
87 | /* |
84 | /* |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
85 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
91 | */ |
86 | */ |
92 | #define CLEAR_ROWS(row, num) \ |
|
|
93 | if (mapped) \ |
|
|
94 | XClearArea (dpy, vt, 0, \ |
|
|
95 | Row2Pixel (row), (unsigned int)width, \ |
|
|
96 | (unsigned int)Height2Pixel (num), False) |
|
|
97 | |
|
|
98 | #define CLEAR_CHARS(x, y, num) \ |
87 | #define CLEAR_CHARS(x, y, num) \ |
99 | if (mapped) \ |
88 | if (mapped) \ |
100 | XClearArea (dpy, vt, x, y, \ |
89 | XClearArea (dpy, vt, x, y, \ |
101 | (unsigned int)Width2Pixel (num), \ |
90 | (unsigned int)Width2Pixel (num), \ |
102 | (unsigned int)Height2Pixel (1), False) |
91 | (unsigned int)Height2Pixel (1), False) |
103 | |
92 | |
104 | #define ERASE_ROWS(row, num) \ |
|
|
105 | XFillRectangle (dpy, vt, gc, \ |
|
|
106 | 0, Row2Pixel (row), \ |
|
|
107 | (unsigned int)width, \ |
|
|
108 | (unsigned int)Height2Pixel (num)) |
|
|
109 | |
|
|
110 | /* ------------------------------------------------------------------------- * |
93 | /* ------------------------------------------------------------------------- * |
111 | * SCREEN `COMMON' ROUTINES * |
94 | * SCREEN `COMMON' ROUTINES * |
112 | * ------------------------------------------------------------------------- */ |
95 | * ------------------------------------------------------------------------- */ |
113 | |
96 | |
114 | /* Fill part/all of a line with blanks. */ |
97 | /* Fill part/all of a line with blanks. */ |
… | |
… | |
146 | |
129 | |
147 | l.l = 0; |
130 | l.l = 0; |
148 | l.f = 0; |
131 | l.f = 0; |
149 | } |
132 | } |
150 | |
133 | |
|
|
134 | // nuke a single wide character at the given column |
|
|
135 | void |
|
|
136 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
137 | { |
|
|
138 | // find begin |
|
|
139 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
140 | col--; |
|
|
141 | |
|
|
142 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
143 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
144 | |
|
|
145 | l.touch (); |
|
|
146 | |
|
|
147 | // found start, nuke |
|
|
148 | do { |
|
|
149 | l.t[col] = ' '; |
|
|
150 | l.r[col] = rend; |
|
|
151 | col++; |
|
|
152 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
153 | } |
|
|
154 | |
151 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
152 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
153 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
154 | |
158 | |
155 | void |
159 | void |
… | |
… | |
157 | { |
161 | { |
158 | #if ENABLE_OVERLAY |
162 | #if ENABLE_OVERLAY |
159 | scr_overlay_off (); |
163 | scr_overlay_off (); |
160 | #endif |
164 | #endif |
161 | |
165 | |
162 | rvideo_mode = false; |
|
|
163 | view_start = 0; |
166 | view_start = 0; |
164 | num_scr = 0; |
167 | num_scr = 0; |
165 | |
168 | |
166 | if (ncol == 0) |
169 | if (ncol == 0) |
167 | ncol = 80; |
170 | ncol = 80; |
… | |
… | |
169 | if (nrow == 0) |
172 | if (nrow == 0) |
170 | nrow = 24; |
173 | nrow = 24; |
171 | |
174 | |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | return; |
176 | return; |
174 | |
|
|
175 | if (current_screen != PRIMARY) |
|
|
176 | scr_swap_screen (); |
|
|
177 | |
177 | |
178 | // we need at least two lines for wrapping to work correctly |
178 | // we need at least two lines for wrapping to work correctly |
179 | while (nrow + saveLines < 2) |
179 | while (nrow + saveLines < 2) |
180 | { |
180 | { |
181 | //TODO//FIXME |
181 | //TODO//FIXME |
… | |
… | |
201 | term_start = 0; |
201 | term_start = 0; |
202 | |
202 | |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | |
205 | |
206 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
206 | row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t)); |
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
209 | |
209 | |
210 | for (int row = nrow; row--; ) |
210 | for (int row = nrow; row--; ) |
211 | { |
211 | { |
… | |
… | |
234 | selection.text = NULL; |
234 | selection.text = NULL; |
235 | selection.len = 0; |
235 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
238 | selection.clicks = 0; |
|
|
239 | selection.clip_text = NULL; |
|
|
240 | selection.clip_len = 0; |
239 | } |
241 | } |
240 | else |
242 | else |
241 | { |
243 | { |
242 | /* |
244 | /* |
243 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
… | |
… | |
271 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
273 | } |
275 | } |
274 | |
276 | |
275 | line_t *old_buf = row_buf; |
277 | line_t *old_buf = row_buf; |
276 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
278 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
277 | |
279 | |
278 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
280 | int q = total_rows; // rewrapped row |
282 | int q = total_rows; // rewrapped row |
281 | |
283 | |
282 | if (top_row) |
284 | if (top_row) |
283 | { |
285 | { |
284 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
286 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
285 | // to come up with a lean and mean algorithm. |
287 | // to come up with a lean and mean algorithm. |
|
|
288 | // TODO: maybe optimise when width didn't change |
286 | |
289 | |
287 | row_col_t ocur = screen.cur; |
290 | row_col_t ocur = screen.cur; |
288 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | |
292 | |
290 | do |
293 | do |
291 | { |
294 | { |
292 | p = MOD (p - 1, prev_total_rows); |
295 | p = MOD (p - 1, prev_total_rows); |
293 | #ifdef DEBUG_STRICT |
|
|
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
295 | #endif |
|
|
296 | int plines = 1; |
297 | int plines = 1; |
297 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
298 | |
299 | |
299 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
300 | { |
301 | { |
… | |
… | |
394 | delete old_ta; |
395 | delete old_ta; |
395 | delete old_ra; |
396 | delete old_ra; |
396 | |
397 | |
397 | clamp_it (screen.cur.row, 0, nrow - 1); |
398 | clamp_it (screen.cur.row, 0, nrow - 1); |
398 | clamp_it (screen.cur.col, 0, ncol - 1); |
399 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
400 | } |
399 | |
401 | |
400 | free (tabs); |
402 | free (tabs); |
401 | } |
403 | tabs = (char *)rxvt_malloc (ncol); |
402 | |
404 | |
|
|
405 | for (int col = ncol; col--; ) |
|
|
406 | tabs [col] = col % TABSIZE == 0; |
|
|
407 | |
403 | CLEAR_ALL_SELECTION (); |
408 | CLEAR_SELECTION (); |
|
|
409 | CLEAR_SELECTION_MARK (); |
404 | |
410 | |
405 | prev_nrow = nrow; |
411 | prev_nrow = nrow; |
406 | prev_ncol = ncol; |
412 | prev_ncol = ncol; |
407 | |
|
|
408 | tabs = (char *)rxvt_malloc (ncol); |
|
|
409 | |
|
|
410 | for (int col = ncol; --col; ) |
|
|
411 | tabs [col] = col % TABSIZE == 0; |
|
|
412 | |
|
|
413 | if (current_screen != PRIMARY) |
|
|
414 | scr_swap_screen (); |
|
|
415 | |
413 | |
416 | tt_winch (); |
414 | tt_winch (); |
417 | |
415 | |
418 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
416 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
419 | } |
417 | } |
… | |
… | |
431 | delete ralloc; ralloc = 0; |
429 | delete ralloc; ralloc = 0; |
432 | |
430 | |
433 | free (row_buf); |
431 | free (row_buf); |
434 | free (swap_buf); |
432 | free (swap_buf); |
435 | free (drawn_buf); |
433 | free (drawn_buf); |
|
|
434 | row_buf = 0; // signal that we freed all the arrays above |
|
|
435 | |
436 | free (tabs); |
436 | free (tabs); |
437 | |
437 | tabs = 0; |
438 | row_buf = 0; // signal that we freed all the arrays |
|
|
439 | } |
438 | } |
440 | } |
439 | } |
441 | |
440 | |
442 | /* ------------------------------------------------------------------------- */ |
441 | /* ------------------------------------------------------------------------- */ |
443 | /* |
442 | /* |
444 | * Hard reset |
443 | * Hard/Soft reset |
445 | */ |
444 | */ |
446 | void |
445 | void |
447 | rxvt_term::scr_poweron () |
446 | rxvt_term::scr_poweron () |
448 | { |
447 | { |
449 | scr_release (); |
448 | scr_release (); |
450 | prev_nrow = prev_ncol = 0; |
449 | prev_nrow = prev_ncol = 0; |
|
|
450 | rvideo_mode = false; |
|
|
451 | scr_soft_reset (); |
451 | scr_reset (); |
452 | scr_reset (); |
452 | |
453 | |
453 | scr_clear (true); |
454 | scr_clear (true); |
454 | scr_refresh (); |
455 | scr_refresh (); |
|
|
456 | } |
|
|
457 | |
|
|
458 | void |
|
|
459 | rxvt_term::scr_soft_reset () |
|
|
460 | { |
|
|
461 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
462 | #if ENABLE_OVERLAY |
|
|
463 | scr_overlay_off (); |
|
|
464 | #endif |
|
|
465 | |
|
|
466 | if (current_screen != PRIMARY) |
|
|
467 | scr_swap_screen (); |
|
|
468 | |
|
|
469 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
470 | scr_rendition (0, ~RS_None); |
|
|
471 | scr_insert_mode (0); |
455 | } |
472 | } |
456 | |
473 | |
457 | /* ------------------------------------------------------------------------- * |
474 | /* ------------------------------------------------------------------------- * |
458 | * PROCESS SCREEN COMMANDS * |
475 | * PROCESS SCREEN COMMANDS * |
459 | * ------------------------------------------------------------------------- */ |
476 | * ------------------------------------------------------------------------- */ |
… | |
… | |
497 | } |
514 | } |
498 | |
515 | |
499 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
516 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
500 | min_it (s->cur.row, nrow - 1); |
517 | min_it (s->cur.row, nrow - 1); |
501 | min_it (s->cur.col, ncol - 1); |
518 | min_it (s->cur.col, ncol - 1); |
502 | #ifdef DEBUG_STRICT |
|
|
503 | assert (s->cur.row >= 0); |
519 | assert (s->cur.row >= 0); |
504 | assert (s->cur.col >= 0); |
520 | assert (s->cur.col >= 0); |
505 | #endif |
|
|
506 | } |
521 | } |
507 | |
522 | |
508 | void |
523 | void |
509 | rxvt_term::scr_swap_screen () |
524 | rxvt_term::scr_swap_screen () |
510 | { |
525 | { |
… | |
… | |
535 | want_refresh = 1; |
550 | want_refresh = 1; |
536 | view_start = 0; |
551 | view_start = 0; |
537 | |
552 | |
538 | selection_check (2); /* check for boundary cross */ |
553 | selection_check (2); /* check for boundary cross */ |
539 | |
554 | |
540 | int i = current_screen; current_screen = scrn; scrn = i; |
555 | current_screen = scrn; |
541 | |
556 | |
542 | #if NSCREENS |
557 | #if NSCREENS |
543 | if (option (Opt_secondaryScreen)) |
558 | if (option (Opt_secondaryScreen)) |
544 | { |
559 | { |
545 | num_scr = 0; |
560 | num_scr = 0; |
… | |
… | |
622 | |
637 | |
623 | if (count > 0 |
638 | if (count > 0 |
624 | && row1 == 0 |
639 | && row1 == 0 |
625 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
640 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
626 | { |
641 | { |
|
|
642 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
643 | |
627 | top_row = max (top_row - count, -saveLines); |
644 | top_row = max (top_row - count, -saveLines); |
628 | |
|
|
629 | // scroll everything up 'count' lines |
|
|
630 | term_start = (term_start + count) % total_rows; |
|
|
631 | |
645 | |
632 | // sever bottommost line |
646 | // sever bottommost line |
633 | { |
647 | { |
634 | line_t &l = ROW(row2 - count); |
648 | line_t &l = ROW(row2); |
635 | l.is_longer (0); |
649 | l.is_longer (0); |
636 | l.touch (); |
650 | l.touch (); |
637 | } |
651 | } |
638 | |
652 | |
|
|
653 | // scroll everything up 'count' lines |
|
|
654 | term_start = (term_start + count) % total_rows; |
|
|
655 | |
|
|
656 | // now copy lines below the scroll region bottom to the |
|
|
657 | // bottom of the screen again, so they look as if they |
|
|
658 | // hadn't moved. |
|
|
659 | for (int i = nrow; --i > row2; ) |
|
|
660 | { |
|
|
661 | line_t &l1 = ROW(i - count); |
|
|
662 | line_t &l2 = ROW(i); |
|
|
663 | |
|
|
664 | ::swap (l1, l2); |
|
|
665 | l2.touch (); |
|
|
666 | } |
|
|
667 | |
639 | // erase newly scrolled-in lines |
668 | // erase newly scrolled-in lines |
640 | for (int i = count; i--; ) |
669 | for (int i = count; i--; ) |
641 | { |
670 | { |
642 | line_t &l = ROW(nrow - 1 - i); |
671 | line_t &l = ROW(row2 - i); |
643 | |
672 | |
644 | // optimize if already cleared, can be significant on slow machines |
673 | // optimise if already cleared, can be significant on slow machines |
645 | // could be rolled into scr_blank_screen_mem |
674 | // could be rolled into scr_blank_screen_mem |
646 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
675 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
647 | { |
676 | { |
648 | scr_blank_line (l, 0, l.l, rstyle); |
677 | scr_blank_line (l, 0, l.l, rstyle); |
649 | l.l = 0; |
678 | l.l = 0; |
… | |
… | |
651 | } |
680 | } |
652 | else |
681 | else |
653 | scr_blank_screen_mem (l, rstyle); |
682 | scr_blank_screen_mem (l, rstyle); |
654 | } |
683 | } |
655 | |
684 | |
656 | // now copy lines below the scroll region bottom to the |
|
|
657 | // bottom of the screen again, so they look as if they |
|
|
658 | // hadn't moved. |
|
|
659 | for (int i = nrow; --i > row2; ) |
|
|
660 | { |
|
|
661 | line_t &l1 = ROW(i - count); |
|
|
662 | line_t &l2 = ROW(i); |
|
|
663 | |
|
|
664 | ::swap (l1, l2); |
|
|
665 | l2.touch (); |
|
|
666 | } |
|
|
667 | |
|
|
668 | // move and/or clear selection, if any |
685 | // move and/or clear selection, if any |
669 | if (selection.op && current_screen == selection.screen) |
686 | if (selection.op && current_screen == selection.screen |
|
|
687 | && selection.beg.row <= row2) |
670 | { |
688 | { |
671 | selection.beg.row -= count; |
689 | selection.beg.row -= count; |
672 | selection.end.row -= count; |
690 | selection.end.row -= count; |
673 | selection.mark.row -= count; |
691 | selection.mark.row -= count; |
674 | |
692 | |
675 | if (selection.beg.row < top_row |
693 | selection_check (0); |
676 | || selection.end.row < top_row |
|
|
677 | || selection.mark.row < top_row) |
|
|
678 | { |
|
|
679 | CLEAR_ALL_SELECTION (); |
|
|
680 | selection.op = SELECTION_CLEAR; |
|
|
681 | } |
|
|
682 | } |
694 | } |
683 | |
695 | |
684 | // finally move the view window, if desired |
696 | // finally move the view window, if desired |
685 | if (option (Opt_scrollWithBuffer) |
697 | if (option (Opt_scrollWithBuffer) |
686 | && view_start != 0 |
698 | && view_start != 0 |
… | |
… | |
699 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
711 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
700 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
712 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
701 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
713 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
702 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
714 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
703 | { |
715 | { |
704 | CLEAR_ALL_SELECTION (); |
716 | CLEAR_SELECTION (); |
705 | selection.op = SELECTION_CLEAR; |
717 | if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) |
|
|
718 | CLEAR_SELECTION_MARK (); |
706 | } |
719 | } |
707 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
720 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
708 | { |
721 | { |
709 | /* move selected region too */ |
722 | /* move selected region too */ |
710 | selection.beg.row -= count; |
723 | selection.beg.row -= count; |
… | |
… | |
716 | } |
729 | } |
717 | |
730 | |
718 | // use a simple and robust scrolling algorithm, this |
731 | // use a simple and robust scrolling algorithm, this |
719 | // part of scr_scroll_text is not time-critical. |
732 | // part of scr_scroll_text is not time-critical. |
720 | |
733 | |
|
|
734 | // sever line above scroll region |
|
|
735 | if (row1) |
|
|
736 | { |
|
|
737 | line_t &l = ROW(row1 - 1); |
|
|
738 | l.is_longer (0); |
|
|
739 | l.touch (); |
|
|
740 | } |
|
|
741 | |
721 | int rows = row2 - row1 + 1; |
742 | int rows = row2 - row1 + 1; |
722 | |
743 | |
723 | min_it (count, rows); |
744 | min_it (count, rows); |
724 | |
745 | |
725 | line_t *temp_buf = row_buf + total_rows; |
746 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
726 | |
747 | |
727 | for (int row = 0; row < rows; row++) |
748 | for (int row = 0; row < rows; row++) |
728 | { |
749 | { |
729 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
750 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
730 | |
751 | |
… | |
… | |
732 | scr_blank_screen_mem (temp_buf [row], rstyle); |
753 | scr_blank_screen_mem (temp_buf [row], rstyle); |
733 | } |
754 | } |
734 | |
755 | |
735 | for (int row = 0; row < rows; row++) |
756 | for (int row = 0; row < rows; row++) |
736 | ROW(row1 + row) = temp_buf [row]; |
757 | ROW(row1 + row) = temp_buf [row]; |
|
|
758 | |
|
|
759 | // sever bottommost line |
|
|
760 | { |
|
|
761 | line_t &l = ROW(row2); |
|
|
762 | l.is_longer (0); |
|
|
763 | l.touch (); |
|
|
764 | } |
737 | } |
765 | } |
738 | |
766 | |
739 | return count; |
767 | return count; |
740 | } |
768 | } |
741 | |
769 | |
… | |
… | |
747 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
775 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
748 | { |
776 | { |
749 | if (len <= 0) /* sanity */ |
777 | if (len <= 0) /* sanity */ |
750 | return; |
778 | return; |
751 | |
779 | |
752 | unsigned char checksel; |
780 | bool checksel; |
753 | unicode_t c; |
781 | unicode_t c; |
754 | int ncol = this->ncol; |
782 | int ncol = this->ncol; |
755 | const wchar_t *strend = str + len; |
783 | const wchar_t *strend = str + len; |
756 | |
784 | |
757 | want_refresh = 1; |
785 | want_refresh = 1; |
… | |
… | |
770 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
798 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
771 | screen.cur.row -= minlines; |
799 | screen.cur.row -= minlines; |
772 | } |
800 | } |
773 | } |
801 | } |
774 | |
802 | |
775 | #ifdef DEBUG_STRICT |
|
|
776 | assert (screen.cur.col < ncol); |
803 | assert (screen.cur.col < ncol); |
777 | assert (screen.cur.row < nrow |
804 | assert (screen.cur.row < nrow |
778 | && screen.cur.row >= top_row); |
805 | && screen.cur.row >= top_row); |
779 | #endif |
|
|
780 | int row = screen.cur.row; |
806 | int row = screen.cur.row; |
781 | |
807 | |
782 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
808 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
783 | |
809 | |
784 | line_t *line = &ROW(row); |
810 | line_t *line = &ROW(row); |
785 | |
811 | |
786 | while (str < strend) |
812 | while (str < strend) |
787 | { |
813 | { |
788 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
814 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
789 | |
815 | |
790 | if (c < 0x20) |
816 | if (ecb_unlikely (c < 0x20)) |
791 | if (c == C0_LF) |
817 | if (c == C0_LF) |
792 | { |
818 | { |
793 | max_it (line->l, screen.cur.col); |
819 | max_it (line->l, screen.cur.col); |
794 | |
820 | |
795 | screen.flags &= ~Screen_WrapNext; |
821 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
814 | { |
840 | { |
815 | scr_tab (1, true); |
841 | scr_tab (1, true); |
816 | continue; |
842 | continue; |
817 | } |
843 | } |
818 | |
844 | |
|
|
845 | if (ecb_unlikely ( |
819 | if (checksel /* see if we're writing within selection */ |
846 | checksel /* see if we're writing within selection */ |
820 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
847 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
821 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
848 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
849 | )) |
822 | { |
850 | { |
823 | checksel = 0; |
851 | checksel = 0; |
824 | /* |
852 | /* |
825 | * If we wrote anywhere in the selected area, kill the selection |
853 | * If we wrote anywhere in the selected area, kill the selection |
826 | * XXX: should we kill the mark too? Possibly, but maybe that |
854 | * XXX: should we kill the mark too? Possibly, but maybe that |
827 | * should be a similar check. |
855 | * should be a similar check. |
828 | */ |
856 | */ |
829 | CLEAR_SELECTION (); |
857 | CLEAR_SELECTION (); |
830 | } |
858 | } |
831 | |
859 | |
832 | if (screen.flags & Screen_WrapNext) |
860 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
833 | { |
861 | { |
834 | scr_do_wrap (); |
862 | scr_do_wrap (); |
835 | |
863 | |
836 | line->l = ncol; |
864 | line->l = ncol; |
837 | line->is_longer (1); |
865 | line->is_longer (1); |
… | |
… | |
839 | row = screen.cur.row; |
867 | row = screen.cur.row; |
840 | line = &ROW(row); /* _must_ refresh */ |
868 | line = &ROW(row); /* _must_ refresh */ |
841 | } |
869 | } |
842 | |
870 | |
843 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
871 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
844 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
872 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
845 | c = 0xfffd; |
873 | c = 0xfffd; |
846 | |
874 | |
847 | // rely on wcwidth to tell us the character width, do wcwidth before |
875 | // rely on wcwidth to tell us the character width, do wcwidth before |
848 | // further replacements, as wcwidth might return -1 for the line |
876 | // further replacements, as wcwidth might return -1 for the line |
849 | // drawing characters below as they might be invalid in the current |
877 | // drawing characters below as they might be invalid in the current |
850 | // locale. |
878 | // locale. |
851 | int width = WCWIDTH (c); |
879 | int width = WCWIDTH (c); |
852 | |
880 | |
853 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
881 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
854 | { |
882 | { |
855 | // vt100 special graphics and line drawing |
883 | // vt100 special graphics and line drawing |
856 | // 5f-7e standard vt100 |
884 | // 5f-7e standard vt100 |
857 | // 40-5e rxvt extension for extra curses acs chars |
885 | // 40-5e rxvt extension for extra curses acs chars |
858 | static uint16_t vt100_0[62] = { // 41 .. 7e |
886 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
871 | c = vt100_0[c - 0x41]; |
899 | c = vt100_0[c - 0x41]; |
872 | width = 1; // vt100 line drawing characters are always single-width |
900 | width = 1; // vt100 line drawing characters are always single-width |
873 | } |
901 | } |
874 | } |
902 | } |
875 | |
903 | |
876 | if (screen.flags & Screen_Insert) |
904 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
877 | scr_insdel_chars (width, INSERT); |
905 | scr_insdel_chars (width, INSERT); |
878 | |
906 | |
879 | if (width != 0) |
907 | if (width != 0) |
880 | { |
908 | { |
881 | #if !UNICODE_3 |
909 | #if !UNICODE_3 |
… | |
… | |
886 | # else |
914 | # else |
887 | c = 0xfffd; |
915 | c = 0xfffd; |
888 | # endif |
916 | # endif |
889 | #endif |
917 | #endif |
890 | |
918 | |
|
|
919 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
920 | |
|
|
921 | // if the character doesn't fit into the remaining columns... |
|
|
922 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
|
|
923 | { |
|
|
924 | if (screen.flags & Screen_Autowrap) |
|
|
925 | { |
|
|
926 | // ... artificially enlargen the previous one |
|
|
927 | c = NOCHAR; |
|
|
928 | // and try the same character next loop iteration |
|
|
929 | --str; |
|
|
930 | } |
|
|
931 | else |
|
|
932 | screen.cur.col = ncol - width; |
|
|
933 | } |
|
|
934 | |
891 | // nuke the character at this position, if required |
935 | // nuke the character at this position, if required |
|
|
936 | // due to wonderful coincidences everywhere else in this loop |
|
|
937 | // we never have to check for overwriting a wide char itself, |
|
|
938 | // only its tail. |
892 | if (line->t[screen.cur.col] == NOCHAR |
939 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
893 | || (screen.cur.col < ncol - 1 |
940 | scr_kill_char (*line, screen.cur.col); |
894 | && line->t[screen.cur.col + 1] == NOCHAR)) |
|
|
895 | { |
|
|
896 | int col = screen.cur.col; |
|
|
897 | |
|
|
898 | // find begin |
|
|
899 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
900 | col--; |
|
|
901 | |
|
|
902 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
903 | |
|
|
904 | // found begin, nuke |
|
|
905 | do { |
|
|
906 | line->t[col] = ' '; |
|
|
907 | line->r[col] = rend; |
|
|
908 | col++; |
|
|
909 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
910 | } |
|
|
911 | |
|
|
912 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
913 | |
|
|
914 | // if the character doesn't fit into the remaining columns... |
|
|
915 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
916 | { |
|
|
917 | // ...output spaces |
|
|
918 | c = ' '; |
|
|
919 | // and try the same character next loop iteration |
|
|
920 | --str; |
|
|
921 | } |
|
|
922 | |
941 | |
923 | line->touch (); |
942 | line->touch (); |
924 | |
943 | |
925 | do |
944 | do |
926 | { |
945 | { |
927 | line->t[screen.cur.col] = c; |
946 | line->t[screen.cur.col] = c; |
928 | line->r[screen.cur.col] = rend; |
947 | line->r[screen.cur.col] = rend; |
929 | |
948 | |
930 | if (screen.cur.col < ncol - 1) |
949 | if (ecb_likely (screen.cur.col < ncol - 1)) |
931 | screen.cur.col++; |
950 | screen.cur.col++; |
932 | else |
951 | else |
933 | { |
952 | { |
934 | line->l = ncol; |
953 | line->l = ncol; |
935 | if (screen.flags & Screen_Autowrap) |
954 | if (screen.flags & Screen_Autowrap) |
936 | screen.flags |= Screen_WrapNext; |
955 | screen.flags |= Screen_WrapNext; |
937 | break; |
956 | |
|
|
957 | goto end_of_line; |
938 | } |
958 | } |
939 | |
959 | |
940 | c = NOCHAR; |
960 | c = NOCHAR; |
941 | } |
961 | } |
942 | while (--width > 0); |
962 | while (ecb_unlikely (--width > 0)); |
943 | |
963 | |
944 | // pad with spaces when overwriting wide character with smaller one |
964 | // pad with spaces when overwriting wide character with smaller one |
945 | if (!width) |
965 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
946 | { |
966 | { |
947 | line->touch (); |
967 | line->t[c] = ' '; |
|
|
968 | line->r[c] = rend; |
|
|
969 | } |
948 | |
970 | |
949 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
971 | end_of_line: |
|
|
972 | ; |
|
|
973 | } |
|
|
974 | #if ENABLE_COMBINING |
|
|
975 | else // width == 0 |
|
|
976 | { |
|
|
977 | if (c != 0xfeff) // ignore BOM |
|
|
978 | { |
|
|
979 | // handle combining characters |
|
|
980 | // we just tag the accent on the previous on-screen character. |
|
|
981 | // this is arguably not correct, but also arguably not wrong. |
|
|
982 | // we don't handle double-width characters nicely yet. |
|
|
983 | line_t *linep; |
|
|
984 | text_t *tp; |
|
|
985 | rend_t *rp; |
|
|
986 | |
|
|
987 | if (screen.cur.col > 0) |
950 | { |
988 | { |
951 | line->t[c] = ' '; |
|
|
952 | line->r[c] = rend; |
989 | linep = line; |
|
|
990 | tp = line->t + screen.cur.col - 1; |
|
|
991 | rp = line->r + screen.cur.col - 1; |
953 | } |
992 | } |
|
|
993 | else if (screen.cur.row > 0 |
|
|
994 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
995 | { |
|
|
996 | linep = &ROW(screen.cur.row - 1); |
|
|
997 | tp = line->t + ncol - 1; |
|
|
998 | rp = line->r + ncol - 1; |
|
|
999 | } |
|
|
1000 | else |
|
|
1001 | continue; |
|
|
1002 | |
|
|
1003 | linep->touch (); |
|
|
1004 | |
|
|
1005 | while (*tp == NOCHAR && tp > linep->t) |
|
|
1006 | tp--, rp--; |
|
|
1007 | |
|
|
1008 | // first try to find a precomposed character |
|
|
1009 | unicode_t n = rxvt_compose (*tp, c); |
|
|
1010 | if (n == NOCHAR) |
|
|
1011 | n = rxvt_composite.compose (*tp, c); |
|
|
1012 | |
|
|
1013 | *tp = n; |
|
|
1014 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
954 | } |
1015 | } |
955 | } |
1016 | } |
956 | else // width == 0 |
|
|
957 | { |
|
|
958 | #if ENABLE_COMBINING |
|
|
959 | // handle combining characters |
|
|
960 | // we just tag the accent on the previous on-screen character. |
|
|
961 | // this is arguably not correct, but also arguably not wrong. |
|
|
962 | // we don't handle double-width characters nicely yet. |
|
|
963 | line_t *linep; |
|
|
964 | text_t *tp; |
|
|
965 | rend_t *rp; |
|
|
966 | |
|
|
967 | if (screen.cur.col > 0) |
|
|
968 | { |
|
|
969 | linep = line; |
|
|
970 | tp = line->t + screen.cur.col - 1; |
|
|
971 | rp = line->r + screen.cur.col - 1; |
|
|
972 | } |
|
|
973 | else if (screen.cur.row > 0 |
|
|
974 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
975 | { |
|
|
976 | linep = &ROW(screen.cur.row - 1); |
|
|
977 | tp = line->t + ncol - 1; |
|
|
978 | rp = line->r + ncol - 1; |
|
|
979 | } |
|
|
980 | else |
|
|
981 | continue; |
|
|
982 | |
|
|
983 | linep->touch (); |
|
|
984 | |
|
|
985 | while (*tp == NOCHAR && tp > linep->t) |
|
|
986 | tp--, rp--; |
|
|
987 | |
|
|
988 | // first try to find a precomposed character |
|
|
989 | unicode_t n = rxvt_compose (*tp, c); |
|
|
990 | if (n == NOCHAR) |
|
|
991 | n = rxvt_composite.compose (*tp, c); |
|
|
992 | |
|
|
993 | *tp = n; |
|
|
994 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
995 | #endif |
1017 | #endif |
996 | } |
|
|
997 | } |
1018 | } |
998 | |
1019 | |
999 | max_it (line->l, screen.cur.col); |
1020 | max_it (line->l, screen.cur.col); |
1000 | |
1021 | |
1001 | #ifdef DEBUG_STRICT |
|
|
1002 | assert (screen.cur.row >= 0); |
1022 | assert (screen.cur.row >= 0); |
1003 | #endif |
|
|
1004 | } |
1023 | } |
1005 | |
1024 | |
1006 | /* ------------------------------------------------------------------------- */ |
1025 | /* ------------------------------------------------------------------------- */ |
1007 | /* |
1026 | /* |
1008 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1027 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1021 | |
1040 | |
1022 | want_refresh = 1; |
1041 | want_refresh = 1; |
1023 | #endif |
1042 | #endif |
1024 | } |
1043 | } |
1025 | } |
1044 | } |
|
|
1045 | else if (screen.flags & Screen_WrapNext) |
|
|
1046 | screen.flags &= ~Screen_WrapNext; |
1026 | else |
1047 | else |
1027 | scr_gotorc (0, -1, RELATIVE); |
1048 | scr_gotorc (0, -1, RELATIVE); |
1028 | } |
1049 | } |
1029 | |
1050 | |
1030 | /* ------------------------------------------------------------------------- */ |
1051 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1225 | /* |
1246 | /* |
1226 | * Erase part or whole of a line |
1247 | * Erase part or whole of a line |
1227 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1248 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1228 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1249 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1229 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1250 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1251 | * extension: clear to right unless wrapped: ESC [ 3 K |
1230 | */ |
1252 | */ |
1231 | void |
1253 | void |
1232 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1254 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1233 | { |
1255 | { |
1234 | unsigned int col, num; |
1256 | unsigned int col, num; |
… | |
… | |
1243 | line.touch (); |
1265 | line.touch (); |
1244 | line.is_longer (0); |
1266 | line.is_longer (0); |
1245 | |
1267 | |
1246 | switch (mode) |
1268 | switch (mode) |
1247 | { |
1269 | { |
|
|
1270 | case 3: |
|
|
1271 | if (screen.flags & Screen_WrapNext) |
|
|
1272 | return; |
|
|
1273 | |
|
|
1274 | /* fall through */ |
|
|
1275 | |
1248 | case 0: /* erase to end of line */ |
1276 | case 0: /* erase to end of line */ |
1249 | col = screen.cur.col; |
1277 | col = screen.cur.col; |
1250 | num = ncol - col; |
1278 | num = ncol - col; |
1251 | min_it (line.l, col); |
1279 | min_it (line.l, col); |
|
|
1280 | |
1252 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1281 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1253 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1282 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1254 | CLEAR_SELECTION (); |
1283 | CLEAR_SELECTION (); |
1255 | break; |
1284 | break; |
|
|
1285 | |
1256 | case 1: /* erase to beginning of line */ |
1286 | case 1: /* erase to beginning of line */ |
1257 | col = 0; |
1287 | col = 0; |
1258 | num = screen.cur.col + 1; |
1288 | num = screen.cur.col + 1; |
|
|
1289 | |
1259 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1290 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1260 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1291 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1261 | CLEAR_SELECTION (); |
1292 | CLEAR_SELECTION (); |
1262 | break; |
1293 | break; |
|
|
1294 | |
1263 | case 2: /* erase whole line */ |
1295 | case 2: /* erase whole line */ |
1264 | col = 0; |
1296 | col = 0; |
1265 | num = ncol; |
1297 | num = ncol; |
1266 | line.l = 0; |
1298 | line.l = 0; |
1267 | if (selection.beg.row <= screen.cur.row |
1299 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1325 | if (row >= nrow) /* Out Of Bounds */ |
1357 | if (row >= nrow) /* Out Of Bounds */ |
1326 | return; |
1358 | return; |
1327 | |
1359 | |
1328 | min_it (num, nrow - row); |
1360 | min_it (num, nrow - row); |
1329 | |
1361 | |
1330 | if (rstyle & (RS_RVid | RS_Uline)) |
1362 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1331 | ren = (rend_t) ~RS_None; |
1363 | ren = (rend_t) ~RS_None; |
1332 | else if (GET_BASEBG (rstyle) == Color_bg) |
1364 | else if (GET_BASEBG (rstyle) == Color_bg) |
1333 | { |
1365 | { |
1334 | ren = DEFAULT_RSTYLE; |
1366 | ren = DEFAULT_RSTYLE; |
1335 | CLEAR_ROWS (row, num); |
1367 | |
|
|
1368 | if (mapped) |
|
|
1369 | XClearArea (dpy, vt, 0, |
|
|
1370 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1371 | (unsigned int)Height2Pixel (num), False); |
1336 | } |
1372 | } |
1337 | else |
1373 | else |
1338 | { |
1374 | { |
1339 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1375 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1376 | |
|
|
1377 | if (mapped) |
|
|
1378 | { |
1340 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1379 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1341 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1380 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1342 | ERASE_ROWS (row, num); |
1381 | XFillRectangle (dpy, vt, gc, |
|
|
1382 | 0, Row2Pixel (row - view_start), |
|
|
1383 | (unsigned int)width, |
|
|
1384 | (unsigned int)Height2Pixel (num)); |
1343 | gcvalue.foreground = pix_colors[Color_fg]; |
1385 | gcvalue.foreground = pix_colors[Color_fg]; |
1344 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1386 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1387 | } |
1345 | } |
1388 | } |
1346 | |
1389 | |
1347 | for (; num--; row++) |
1390 | for (; num--; row++) |
1348 | { |
1391 | { |
1349 | scr_blank_screen_mem (ROW(row), rstyle); |
1392 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1393 | |
|
|
1394 | if (row - view_start < nrow) |
1350 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1395 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1351 | } |
1396 | } |
1352 | } |
1397 | } |
1353 | |
1398 | |
1354 | #if !ENABLE_MINIMAL |
1399 | #if !ENABLE_MINIMAL |
1355 | void |
1400 | void |
… | |
… | |
1429 | * Insert/Delete <count> characters from the current position |
1474 | * Insert/Delete <count> characters from the current position |
1430 | */ |
1475 | */ |
1431 | void |
1476 | void |
1432 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1477 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1433 | { |
1478 | { |
1434 | int col, row; |
|
|
1435 | rend_t tr; |
|
|
1436 | |
|
|
1437 | want_refresh = 1; |
1479 | want_refresh = 1; |
1438 | ZERO_SCROLLBACK (); |
1480 | ZERO_SCROLLBACK (); |
1439 | |
1481 | |
1440 | if (count <= 0) |
1482 | if (count <= 0) |
1441 | return; |
1483 | return; |
… | |
… | |
1443 | scr_do_wrap (); |
1485 | scr_do_wrap (); |
1444 | |
1486 | |
1445 | selection_check (1); |
1487 | selection_check (1); |
1446 | min_it (count, ncol - screen.cur.col); |
1488 | min_it (count, ncol - screen.cur.col); |
1447 | |
1489 | |
1448 | row = screen.cur.row; |
1490 | int row = screen.cur.row; |
1449 | |
1491 | |
1450 | line_t *line = &ROW(row); |
1492 | line_t *line = &ROW(row); |
1451 | |
1493 | |
1452 | line->touch (); |
1494 | line->touch (); |
1453 | line->is_longer (0); |
1495 | line->is_longer (0); |
1454 | |
1496 | |
|
|
1497 | // nuke wide spanning the start |
|
|
1498 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1499 | scr_kill_char (*line, screen.cur.col); |
|
|
1500 | |
1455 | switch (insdel) |
1501 | switch (insdel) |
1456 | { |
1502 | { |
1457 | case INSERT: |
1503 | case INSERT: |
1458 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1504 | line->l = min (line->l + count, ncol); |
|
|
1505 | |
|
|
1506 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1507 | scr_kill_char (*line, screen.cur.col); |
|
|
1508 | |
|
|
1509 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1459 | { |
1510 | { |
1460 | line->t[col] = line->t[col - count]; |
1511 | line->t[col] = line->t[col - count]; |
1461 | line->r[col] = line->r[col - count]; |
1512 | line->r[col] = line->r[col - count]; |
1462 | } |
1513 | } |
1463 | |
|
|
1464 | line->l = min (line->l + count, ncol); |
|
|
1465 | |
1514 | |
1466 | if (selection.op && current_screen == selection.screen |
1515 | if (selection.op && current_screen == selection.screen |
1467 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1516 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1468 | { |
1517 | { |
1469 | if (selection.end.row != screen.cur.row |
1518 | if (selection.end.row != screen.cur.row |
… | |
… | |
1484 | case ERASE: |
1533 | case ERASE: |
1485 | screen.cur.col += count; /* don't worry if > ncol */ |
1534 | screen.cur.col += count; /* don't worry if > ncol */ |
1486 | selection_check (1); |
1535 | selection_check (1); |
1487 | screen.cur.col -= count; |
1536 | screen.cur.col -= count; |
1488 | |
1537 | |
1489 | line->l = max (line->l - count, 0); |
1538 | // nuke wide char after the end |
|
|
1539 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1540 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1541 | |
1490 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1542 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1491 | break; |
1543 | break; |
1492 | |
1544 | |
1493 | case DELETE: |
1545 | case DELETE: |
1494 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1546 | line->l = max (line->l - count, 0); |
1495 | |
1547 | |
|
|
1548 | // nuke wide char spanning the end |
|
|
1549 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1550 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1551 | |
1496 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1552 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1497 | { |
1553 | { |
1498 | line->t[col] = line->t[col + count]; |
1554 | line->t[col] = line->t[col + count]; |
1499 | line->r[col] = line->r[col + count]; |
1555 | line->r[col] = line->r[col + count]; |
1500 | } |
1556 | } |
1501 | |
1557 | |
1502 | line->l = max (line->l - count, 0); |
|
|
1503 | scr_blank_line (*line, ncol - count, count, tr); |
1558 | scr_blank_line (*line, ncol - count, count, rstyle); |
1504 | |
1559 | |
1505 | if (selection.op && current_screen == selection.screen |
1560 | if (selection.op && current_screen == selection.screen |
1506 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1561 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1507 | { |
1562 | { |
1508 | if (selection.end.row != screen.cur.row |
1563 | if (selection.end.row != screen.cur.row |
… | |
… | |
1644 | { |
1699 | { |
1645 | rvideo_state = on; |
1700 | rvideo_state = on; |
1646 | |
1701 | |
1647 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1702 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1648 | #ifdef HAVE_BG_PIXMAP |
1703 | #ifdef HAVE_BG_PIXMAP |
1649 | if (bgPixmap.pixmap == None) |
1704 | if (bg_pixmap == None) |
1650 | #endif |
1705 | #endif |
1651 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1706 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1652 | |
1707 | |
1653 | XGCValues gcvalue; |
1708 | XGCValues gcvalue; |
1654 | gcvalue.foreground = pix_colors[Color_fg]; |
1709 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1798 | for (i = PART_BEG; i < RC_COUNT; i++) |
1853 | for (i = PART_BEG; i < RC_COUNT; i++) |
1799 | { |
1854 | { |
1800 | min_it (rc[i].col, ncol - 1); |
1855 | min_it (rc[i].col, ncol - 1); |
1801 | min_it (rc[i].row, nrow - 1); |
1856 | min_it (rc[i].row, nrow - 1); |
1802 | } |
1857 | } |
1803 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1858 | |
1804 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1859 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1805 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1860 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1806 | |
1861 | |
1807 | num_scr_allow = 0; |
1862 | num_scr_allow = 0; |
1808 | |
1863 | |
… | |
… | |
1881 | |
1936 | |
1882 | # ifndef NO_MAPALERT |
1937 | # ifndef NO_MAPALERT |
1883 | # ifdef MAPALERT_OPTION |
1938 | # ifdef MAPALERT_OPTION |
1884 | if (option (Opt_mapAlert)) |
1939 | if (option (Opt_mapAlert)) |
1885 | # endif |
1940 | # endif |
1886 | XMapWindow (dpy, parent[0]); |
1941 | XMapWindow (dpy, parent); |
1887 | # endif |
1942 | # endif |
1888 | |
1943 | |
1889 | # if ENABLE_FRILLS |
1944 | # if ENABLE_FRILLS |
1890 | if (option (Opt_urgentOnBell)) |
1945 | if (option (Opt_urgentOnBell)) |
1891 | { |
1946 | set_urgency (1); |
1892 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1893 | { |
|
|
1894 | h->flags |= XUrgencyHint; |
|
|
1895 | XSetWMHints (dpy, parent[0], h); |
|
|
1896 | } |
|
|
1897 | } |
|
|
1898 | # endif |
1947 | # endif |
1899 | |
1948 | |
1900 | if (option (Opt_visualBell)) |
1949 | if (option (Opt_visualBell)) |
1901 | { |
1950 | { |
1902 | rvideo_bell = true; |
1951 | rvideo_bell = true; |
… | |
… | |
1905 | |
1954 | |
1906 | bell_ev.start (VISUAL_BELL_DURATION); |
1955 | bell_ev.start (VISUAL_BELL_DURATION); |
1907 | } |
1956 | } |
1908 | else |
1957 | else |
1909 | XBell (dpy, 0); |
1958 | XBell (dpy, 0); |
|
|
1959 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1910 | #endif |
1960 | #endif |
1911 | } |
1961 | } |
1912 | |
1962 | |
1913 | /* ------------------------------------------------------------------------- */ |
1963 | /* ------------------------------------------------------------------------- */ |
1914 | /* ARGSUSED */ |
|
|
1915 | void |
1964 | void |
1916 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1965 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1917 | { |
1966 | { |
1918 | #ifdef PRINTPIPE |
1967 | #ifdef PRINTPIPE |
1919 | int nrows, row_start; |
1968 | int nrows, row_start; |
1920 | FILE *fd; |
1969 | FILE *fd = popen_printer (); |
1921 | |
1970 | |
1922 | if ((fd = popen_printer ()) == NULL) |
1971 | if (!fd) |
1923 | return; |
1972 | return; |
1924 | |
1973 | |
1925 | if (fullhist) |
1974 | if (fullhist) |
1926 | { |
1975 | { |
1927 | nrows = nrow - top_row; |
1976 | nrows = nrow - top_row; |
… | |
… | |
1933 | row_start = view_start; |
1982 | row_start = view_start; |
1934 | } |
1983 | } |
1935 | |
1984 | |
1936 | wctomb (0, 0); |
1985 | wctomb (0, 0); |
1937 | |
1986 | |
1938 | for (int r1 = 0; r1 < nrows; r1++) |
1987 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1939 | { |
1988 | { |
1940 | text_t *tp = ROW(r1).t; |
1989 | text_t *tp = ROW(r1).t; |
1941 | int len = ROW(r1).l; |
1990 | int len = ROW(r1).l; |
1942 | |
1991 | |
1943 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1992 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1972 | * screen.text/screen.rend contain what the screen will change to. |
2021 | * screen.text/screen.rend contain what the screen will change to. |
1973 | */ |
2022 | */ |
1974 | void |
2023 | void |
1975 | rxvt_term::scr_refresh () NOTHROW |
2024 | rxvt_term::scr_refresh () NOTHROW |
1976 | { |
2025 | { |
1977 | unsigned char have_bg, |
|
|
1978 | showcursor; /* show the cursor */ |
|
|
1979 | int16_t col, row, /* column/row we're processing */ |
2026 | int16_t col, row, /* column/row we're processing */ |
1980 | ocrow; /* old cursor row */ |
2027 | ocrow; /* old cursor row */ |
1981 | int i; /* tmp */ |
2028 | int i; /* tmp */ |
1982 | #ifndef NO_CURSORCOLOR |
2029 | #ifndef NO_CURSORCOLOR |
1983 | rend_t cc1; /* store colours at cursor position (s) */ |
2030 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
1994 | /* |
2041 | /* |
1995 | * A: set up vars |
2042 | * A: set up vars |
1996 | */ |
2043 | */ |
1997 | refresh_count = 0; |
2044 | refresh_count = 0; |
1998 | |
2045 | |
|
|
2046 | unsigned int old_screen_flags = screen.flags; |
1999 | have_bg = 0; |
2047 | bool have_bg = 0; |
2000 | #ifdef HAVE_BG_PIXMAP |
2048 | #ifdef HAVE_BG_PIXMAP |
2001 | have_bg = bgPixmap.pixmap != None; |
2049 | have_bg = bg_pixmap != None; |
2002 | #endif |
2050 | #endif |
2003 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2051 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2004 | |
2052 | |
2005 | /* |
2053 | /* |
2006 | * B: reverse any characters which are selected |
2054 | * B: reverse any characters which are selected |
2007 | */ |
2055 | */ |
2008 | scr_reverse_selection (); |
2056 | scr_reverse_selection (); |
2009 | |
2057 | |
|
|
2058 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2059 | #if ENABLE_OVERLAY |
|
|
2060 | scr_swap_overlay (); |
|
|
2061 | #endif |
|
|
2062 | |
|
|
2063 | bool showcursor = screen.flags & Screen_VisibleCursor; |
|
|
2064 | |
2010 | /* |
2065 | /* |
2011 | * C: set the cursor character (s) |
2066 | * C: set the cursor character (s) |
2012 | */ |
2067 | */ |
2013 | { |
2068 | { |
2014 | unsigned char setoldcursor; |
2069 | bool setoldcursor; |
2015 | |
2070 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2017 | #ifdef CURSOR_BLINK |
2071 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2072 | if (hidden_cursor) |
2019 | showcursor = 0; |
2073 | showcursor = 0; |
2020 | #endif |
2074 | #endif |
2021 | |
2075 | |
… | |
… | |
2049 | ccol2 = bgcolor_of (rstyle); |
2103 | ccol2 = bgcolor_of (rstyle); |
2050 | #else |
2104 | #else |
2051 | ccol2 = Color_bg; |
2105 | ccol2 = Color_bg; |
2052 | #endif |
2106 | #endif |
2053 | |
2107 | |
2054 | if (showcursor && focus) |
2108 | if (focus) |
2055 | { |
2109 | { |
2056 | if (option (Opt_cursorUnderline)) |
2110 | if (option (Opt_cursorUnderline)) |
2057 | *crp ^= RS_Uline; |
2111 | *crp ^= RS_Uline; |
2058 | else |
2112 | else |
2059 | { |
2113 | { |
… | |
… | |
2094 | oldcursor.col = screen.cur.col; |
2148 | oldcursor.col = screen.cur.col; |
2095 | } |
2149 | } |
2096 | } |
2150 | } |
2097 | } |
2151 | } |
2098 | |
2152 | |
2099 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2100 | #if ENABLE_OVERLAY |
|
|
2101 | scr_swap_overlay (); |
|
|
2102 | #endif |
|
|
2103 | |
|
|
2104 | #ifndef NO_SLOW_LINK_SUPPORT |
2153 | #ifndef NO_SLOW_LINK_SUPPORT |
2105 | /* |
2154 | /* |
2106 | * D: CopyArea pass - very useful for slower links |
2155 | * D: CopyArea pass - very useful for slower links |
2107 | * This has been deliberately kept simple. |
2156 | * This has been deliberately kept simple. |
2108 | */ |
2157 | */ |
… | |
… | |
2197 | continue; |
2246 | continue; |
2198 | |
2247 | |
2199 | // redraw one or more characters |
2248 | // redraw one or more characters |
2200 | |
2249 | |
2201 | // seek to the beginning of wide characters |
2250 | // seek to the beginning of wide characters |
2202 | while (stp[col] == NOCHAR && col > 0) |
2251 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2203 | --col; |
2252 | --col; |
2204 | |
2253 | |
2205 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2254 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2206 | text_t *text = stp + col; |
2255 | text_t *text = stp + col; |
2207 | int count = 1; |
2256 | int count = 1; |
2208 | |
2257 | |
2209 | dtp[col] = stp[col]; |
2258 | dtp[col] = stp[col]; |
2210 | drp[col] = rend; |
2259 | drp[col] = rend; |
… | |
… | |
2214 | for (i = 0; ++col < ncol; ) |
2263 | for (i = 0; ++col < ncol; ) |
2215 | { |
2264 | { |
2216 | if (stp[col] == NOCHAR) |
2265 | if (stp[col] == NOCHAR) |
2217 | { |
2266 | { |
2218 | dtp[col] = stp[col]; |
2267 | dtp[col] = stp[col]; |
2219 | drp[col] = rend; |
2268 | drp[col] = srp[col]; |
|
|
2269 | |
2220 | count++; |
2270 | count++; |
2221 | i++; |
2271 | i++; |
2222 | |
2272 | |
2223 | continue; |
2273 | continue; |
2224 | } |
2274 | } |
… | |
… | |
2244 | |
2294 | |
2245 | col--; /* went one too far. move back */ |
2295 | col--; /* went one too far. move back */ |
2246 | count -= i; /* dump any matching trailing chars */ |
2296 | count -= i; /* dump any matching trailing chars */ |
2247 | |
2297 | |
2248 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2298 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2249 | while (i && text[count] == NOCHAR) |
2299 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2250 | count++, i--; |
2300 | count++, i--; |
2251 | |
2301 | |
2252 | /* |
2302 | /* |
2253 | * Determine the attributes for the string |
2303 | * Determine the attributes for the string |
2254 | */ |
2304 | */ |
2255 | int fore = fgcolor_of (rend); // desired foreground |
2305 | int fore = fgcolor_of (rend); // desired foreground |
2256 | int back = bgcolor_of (rend); // desired background |
2306 | int back = bgcolor_of (rend); // desired background |
2257 | |
2307 | |
2258 | // only do special processing if any attributes are set, which is unlikely |
2308 | // only do special processing if any attributes are set, which is unlikely |
2259 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2309 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2260 | { |
2310 | { |
2261 | bool invert = rend & RS_RVid; |
2311 | bool invert = rend & RS_RVid; |
2262 | |
2312 | |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2313 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2264 | if (rend & RS_Bold && fore == Color_fg) |
2314 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2283 | |
2333 | |
2284 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2334 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2285 | fore = Color_UL; |
2335 | fore = Color_UL; |
2286 | #endif |
2336 | #endif |
2287 | |
2337 | |
|
|
2338 | #ifdef OPTION_HC |
|
|
2339 | if (rend & RS_Sel) |
|
|
2340 | { |
|
|
2341 | /* invert the column if no highlightColor is set or it is the |
|
|
2342 | * current cursor column */ |
|
|
2343 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2344 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2345 | { |
|
|
2346 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2347 | fore = Color_HTC; |
|
|
2348 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2349 | else if (!invert) |
|
|
2350 | fore = back; |
|
|
2351 | |
|
|
2352 | back = Color_HC; |
|
|
2353 | invert = 0; |
|
|
2354 | } |
|
|
2355 | } |
|
|
2356 | #endif |
|
|
2357 | |
2288 | if (invert) |
2358 | if (invert) |
2289 | { |
2359 | { |
2290 | #ifdef OPTION_HC |
|
|
2291 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2292 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2293 | #endif |
|
|
2294 | /* invert the column if no highlightColor is set or it is the |
|
|
2295 | * current cursor column */ |
|
|
2296 | ::swap (fore, back); |
2360 | ::swap (fore, back); |
2297 | #ifdef OPTION_HC |
|
|
2298 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | back = Color_HC; |
|
|
2300 | #endif |
|
|
2301 | |
2361 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2362 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2303 | # ifndef OPTION_HC |
|
|
2304 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2305 | back = Color_RV; |
|
|
2306 | # endif |
|
|
2307 | if (fore == back) |
2363 | if (fore == back) |
2308 | { |
2364 | { |
2309 | fore = Color_bg; |
2365 | fore = Color_bg; |
2310 | back = Color_fg; |
2366 | back = Color_fg; |
2311 | } |
2367 | } |
… | |
… | |
2347 | /* |
2403 | /* |
2348 | * Actually do the drawing of the string here |
2404 | * Actually do the drawing of the string here |
2349 | */ |
2405 | */ |
2350 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2406 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2351 | |
2407 | |
2352 | if (have_bg && back == Color_bg) |
2408 | if (ecb_likely (have_bg && back == Color_bg)) |
2353 | { |
2409 | { |
2354 | // this is very ugly, maybe push it into ->draw? |
2410 | // this is very ugly, maybe push it into ->draw? |
2355 | |
2411 | |
2356 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2412 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2357 | if (text[i] != ' ') |
2413 | if (text[i] != ' ') |
… | |
… | |
2364 | did_clear: ; |
2420 | did_clear: ; |
2365 | } |
2421 | } |
2366 | else |
2422 | else |
2367 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2423 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2368 | |
2424 | |
2369 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2425 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2370 | { |
2426 | { |
2371 | #if ENABLE_FRILLS |
2427 | #if ENABLE_FRILLS |
2372 | if (ISSET_PIXCOLOR (Color_underline)) |
2428 | if (ISSET_PIXCOLOR (Color_underline)) |
2373 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2429 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2374 | else |
2430 | else |
… | |
… | |
2379 | xpixel, ypixel + font->ascent + 1, |
2435 | xpixel, ypixel + font->ascent + 1, |
2380 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2436 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2381 | } |
2437 | } |
2382 | } /* for (col....) */ |
2438 | } /* for (col....) */ |
2383 | } /* for (row....) */ |
2439 | } /* for (row....) */ |
2384 | |
|
|
2385 | #if ENABLE_OVERLAY |
|
|
2386 | scr_swap_overlay (); |
|
|
2387 | #endif |
|
|
2388 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2389 | |
2440 | |
2390 | /* |
2441 | /* |
2391 | * G: cleanup cursor and display outline cursor if necessary |
2442 | * G: cleanup cursor and display outline cursor if necessary |
2392 | */ |
2443 | */ |
2393 | if (showcursor) |
2444 | if (showcursor) |
… | |
… | |
2432 | } |
2483 | } |
2433 | |
2484 | |
2434 | /* |
2485 | /* |
2435 | * H: cleanup selection |
2486 | * H: cleanup selection |
2436 | */ |
2487 | */ |
|
|
2488 | #if ENABLE_OVERLAY |
|
|
2489 | scr_swap_overlay (); |
|
|
2490 | #endif |
|
|
2491 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2492 | |
2437 | scr_reverse_selection (); |
2493 | scr_reverse_selection (); |
2438 | |
2494 | |
|
|
2495 | screen.flags = old_screen_flags; |
2439 | num_scr = 0; |
2496 | num_scr = 0; |
2440 | num_scr_allow = 1; |
2497 | num_scr_allow = 1; |
2441 | } |
2498 | } |
2442 | |
2499 | |
2443 | void |
2500 | void |
… | |
… | |
2464 | scr_remap_chars (swap_buf [i]); |
2521 | scr_remap_chars (swap_buf [i]); |
2465 | } |
2522 | } |
2466 | } |
2523 | } |
2467 | |
2524 | |
2468 | void |
2525 | void |
2469 | rxvt_term::scr_recolour () NOTHROW |
2526 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2470 | { |
2527 | { |
|
|
2528 | bool transparent = false; |
|
|
2529 | |
2471 | #ifdef HAVE_BG_PIXMAP |
2530 | #ifdef HAVE_BG_PIXMAP |
2472 | bgPixmap.apply (); |
2531 | if (bg_pixmap != None) |
2473 | #else |
2532 | { |
|
|
2533 | # ifdef ENABLE_TRANSPARENCY |
|
|
2534 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2535 | { |
|
|
2536 | XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); |
|
|
2537 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2474 | |
2538 | |
|
|
2539 | transparent = true; |
|
|
2540 | } |
|
|
2541 | else |
|
|
2542 | # endif |
|
|
2543 | { |
|
|
2544 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2545 | XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); |
|
|
2546 | } |
|
|
2547 | } |
|
|
2548 | else |
|
|
2549 | #endif |
|
|
2550 | { |
2475 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2551 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2476 | XClearWindow (dpy, parent[0]); |
|
|
2477 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2552 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2553 | } |
|
|
2554 | |
|
|
2555 | XClearWindow (dpy, parent); |
2478 | |
2556 | |
2479 | if (scrollBar.win) |
2557 | if (scrollBar.win) |
2480 | { |
2558 | { |
|
|
2559 | if (transparent) |
|
|
2560 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2561 | else |
2481 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2562 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2482 | scrollBar.state = STATE_IDLE; |
2563 | scrollBar.state = SB_STATE_IDLE; |
2483 | scrollbar_show (0); |
2564 | scrollBar.show (0); |
2484 | } |
2565 | } |
2485 | |
2566 | |
2486 | #endif |
2567 | if (refresh) |
2487 | |
2568 | { |
2488 | /* bgPixmap.apply () does not do the following : */ |
|
|
2489 | scr_clear (); |
2569 | scr_clear (); |
2490 | scr_touch (true); |
2570 | scr_touch (true); |
|
|
2571 | } |
2491 | want_refresh = 1; |
2572 | want_refresh = 1; |
2492 | } |
2573 | } |
2493 | |
2574 | |
2494 | /* ------------------------------------------------------------------------- */ |
2575 | /* ------------------------------------------------------------------------- */ |
2495 | void |
2576 | void |
… | |
… | |
2563 | { |
2644 | { |
2564 | #if !ENABLE_MINIMAL |
2645 | #if !ENABLE_MINIMAL |
2565 | if (selection.rect) |
2646 | if (selection.rect) |
2566 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2647 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2567 | selection.end.row, selection.end.col, |
2648 | selection.end.row, selection.end.col, |
2568 | RS_RVid, RS_RVid | RS_Uline); |
2649 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2569 | else |
2650 | else |
2570 | #endif |
2651 | #endif |
2571 | scr_xor_span (selection.beg.row, selection.beg.col, |
2652 | scr_xor_span (selection.beg.row, selection.beg.col, |
2572 | selection.end.row, selection.end.col, |
2653 | selection.end.row, selection.end.col, |
2573 | RS_RVid); |
2654 | RS_Sel | RS_RVid); |
2574 | } |
2655 | } |
2575 | } |
2656 | } |
2576 | |
2657 | |
2577 | /* ------------------------------------------------------------------------- */ |
2658 | /* ------------------------------------------------------------------------- */ |
2578 | /* |
2659 | /* |
… | |
… | |
2583 | void |
2664 | void |
2584 | rxvt_term::scr_dump (int fd) NOTHROW |
2665 | rxvt_term::scr_dump (int fd) NOTHROW |
2585 | { |
2666 | { |
2586 | int row, wrote; |
2667 | int row, wrote; |
2587 | unsigned int width, towrite; |
2668 | unsigned int width, towrite; |
2588 | char r1[] = "\n"; |
2669 | const char r1[] = "\n"; |
2589 | |
2670 | |
2590 | for (row = saveLines - nsaved; |
2671 | for (row = saveLines + top_row; |
2591 | row < saveLines + nrow - 1; row++) |
2672 | row < saveLines + nrow - 1; row++) |
2592 | { |
2673 | { |
2593 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2674 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2594 | : ncol; |
2675 | : ncol; |
2595 | for (towrite = width; towrite; towrite -= wrote) |
2676 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2610 | * CHARACTER SELECTION * |
2691 | * CHARACTER SELECTION * |
2611 | * ------------------------------------------------------------------------- */ |
2692 | * ------------------------------------------------------------------------- */ |
2612 | void |
2693 | void |
2613 | rxvt_term::selection_check (int check_more) NOTHROW |
2694 | rxvt_term::selection_check (int check_more) NOTHROW |
2614 | { |
2695 | { |
2615 | row_col_t pos; |
|
|
2616 | |
|
|
2617 | if (!selection.op) |
2696 | if (!selection.op) |
2618 | return; |
2697 | return; |
2619 | |
2698 | |
|
|
2699 | row_col_t pos; |
2620 | pos.row = pos.col = 0; |
2700 | pos.row = pos.col = 0; |
|
|
2701 | |
2621 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2702 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2622 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
|
|
2623 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2703 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2624 | || (check_more == 1 |
2704 | || (check_more == 1 |
2625 | && current_screen == selection.screen |
2705 | && current_screen == selection.screen |
2626 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2706 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2627 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2707 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2628 | || (check_more == 2 |
2708 | || (check_more == 2 |
2629 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2709 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
2630 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2710 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2631 | || (check_more == 3 |
2711 | || (check_more == 3 |
2632 | && ROWCOL_IS_AFTER (selection.end, pos)) |
2712 | && ROWCOL_IS_AFTER (selection.end, pos))) |
2633 | || (check_more == 4 /* screen width change */ |
|
|
2634 | && (selection.beg.row != selection.end.row |
|
|
2635 | || selection.end.col > ncol))) |
|
|
2636 | CLEAR_SELECTION (); |
2713 | CLEAR_SELECTION (); |
|
|
2714 | |
|
|
2715 | if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow)) |
|
|
2716 | CLEAR_SELECTION_MARK (); |
2637 | } |
2717 | } |
2638 | |
2718 | |
2639 | /* ------------------------------------------------------------------------- */ |
2719 | /* ------------------------------------------------------------------------- */ |
2640 | /* |
2720 | /* |
2641 | * Paste a selection direct to the command fd |
2721 | * Paste a selection direct to the command fd |
2642 | */ |
2722 | */ |
2643 | void |
2723 | void |
2644 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2724 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2645 | { |
2725 | { |
2646 | /* convert normal newline chars into common keyboard Return key sequence */ |
2726 | /* convert normal newline chars into common keyboard Return key sequence */ |
2647 | for (unsigned int i = 0; i < len; i++) |
2727 | for (unsigned int i = 0; i < len; i++) |
2648 | if (data[i] == C0_LF) |
2728 | if (data[i] == C0_LF) |
2649 | data[i] = C0_CR; |
2729 | data[i] = C0_CR; |
… | |
… | |
2655 | |
2735 | |
2656 | if (priv_modes & PrivMode_BracketPaste) |
2736 | if (priv_modes & PrivMode_BracketPaste) |
2657 | tt_printf ("\e[201~"); |
2737 | tt_printf ("\e[201~"); |
2658 | } |
2738 | } |
2659 | |
2739 | |
2660 | /* ------------------------------------------------------------------------- */ |
|
|
2661 | /* |
|
|
2662 | * Respond to a notification that a primary selection has been sent |
|
|
2663 | * EXT: SelectionNotify |
|
|
2664 | */ |
|
|
2665 | void |
2740 | void |
2666 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2741 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2667 | { |
2742 | { |
2668 | if (prop == None) /* check for failed XConvertSelection */ |
2743 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
2669 | { |
|
|
2670 | if ((selection_type & Sel_CompoundText)) |
|
|
2671 | { |
|
|
2672 | int selnum = selection_type & Sel_whereMask; |
|
|
2673 | |
|
|
2674 | selection_type = 0; |
|
|
2675 | if (selnum != Sel_direct) |
|
|
2676 | selection_request_other (XA_STRING, selnum); |
|
|
2677 | } |
|
|
2678 | |
|
|
2679 | if ((selection_type & Sel_UTF8String)) |
|
|
2680 | { |
|
|
2681 | int selnum = selection_type & Sel_whereMask; |
|
|
2682 | |
|
|
2683 | selection_type = Sel_CompoundText; |
|
|
2684 | if (selnum != Sel_direct) |
|
|
2685 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2686 | else |
|
|
2687 | selection_type = 0; |
|
|
2688 | } |
|
|
2689 | |
|
|
2690 | return; |
|
|
2691 | } |
|
|
2692 | |
|
|
2693 | unsigned long bytes_after; |
|
|
2694 | XTextProperty ct; |
|
|
2695 | |
|
|
2696 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2697 | 0, PROP_SIZE / 4, |
|
|
2698 | delete_prop, AnyPropertyType, |
|
|
2699 | &ct.encoding, &ct.format, |
|
|
2700 | &ct.nitems, &bytes_after, |
|
|
2701 | &ct.value) != Success) |
|
|
2702 | { |
|
|
2703 | ct.value = 0; |
|
|
2704 | goto bailout; |
|
|
2705 | } |
|
|
2706 | |
|
|
2707 | if (ct.encoding == None) |
|
|
2708 | goto bailout; |
|
|
2709 | |
|
|
2710 | if (bytes_after) |
|
|
2711 | { |
|
|
2712 | // fetch and append remaining data |
|
|
2713 | XTextProperty ct2; |
|
|
2714 | |
|
|
2715 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2716 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2717 | delete_prop, AnyPropertyType, |
|
|
2718 | &ct2.encoding, &ct2.format, |
|
|
2719 | &ct2.nitems, &bytes_after, |
|
|
2720 | &ct2.value) != Success) |
|
|
2721 | goto bailout; |
|
|
2722 | |
|
|
2723 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2724 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2725 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2726 | ct.nitems += ct2.nitems; |
|
|
2727 | |
|
|
2728 | XFree (ct2.value); |
|
|
2729 | } |
|
|
2730 | |
|
|
2731 | if (ct.value == 0) |
|
|
2732 | goto bailout; |
|
|
2733 | |
|
|
2734 | if (ct.encoding == xa[XA_INCR]) |
|
|
2735 | { |
|
|
2736 | // INCR selection, start handshake |
|
|
2737 | if (!delete_prop) |
|
|
2738 | XDeleteProperty (dpy, win, prop); |
|
|
2739 | |
|
|
2740 | selection_wait = Sel_incr; |
|
|
2741 | incr_buf_fill = 0; |
|
|
2742 | incr_ev.start (10); |
|
|
2743 | |
|
|
2744 | goto bailout; |
|
|
2745 | } |
|
|
2746 | |
|
|
2747 | if (ct.nitems == 0) |
|
|
2748 | { |
|
|
2749 | if (selection_wait == Sel_incr) |
|
|
2750 | { |
|
|
2751 | XFree (ct.value); |
|
|
2752 | |
|
|
2753 | // finally complete, now paste the whole thing |
|
|
2754 | selection_wait = Sel_normal; |
|
|
2755 | ct.value = (unsigned char *)incr_buf; |
|
|
2756 | ct.nitems = incr_buf_fill; |
|
|
2757 | incr_buf = 0; |
|
|
2758 | incr_buf_size = 0; |
|
|
2759 | incr_ev.stop (); |
|
|
2760 | } |
|
|
2761 | else |
|
|
2762 | { |
|
|
2763 | if (selection_wait == Sel_normal |
|
|
2764 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2765 | { |
|
|
2766 | /* |
|
|
2767 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2768 | * XConvertSelection () but nothing was presented |
|
|
2769 | */ |
|
|
2770 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2771 | } |
|
|
2772 | |
|
|
2773 | goto bailout; |
|
|
2774 | } |
|
|
2775 | } |
|
|
2776 | else if (selection_wait == Sel_incr) |
|
|
2777 | { |
|
|
2778 | incr_ev.start (10); |
|
|
2779 | |
|
|
2780 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2781 | { |
|
|
2782 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2783 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2784 | } |
|
|
2785 | |
|
|
2786 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2787 | incr_buf_fill += ct.nitems; |
|
|
2788 | |
|
|
2789 | goto bailout; |
|
|
2790 | } |
|
|
2791 | |
|
|
2792 | char **cl; |
|
|
2793 | int cr; |
|
|
2794 | |
|
|
2795 | #if !ENABLE_MINIMAL |
|
|
2796 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2797 | // so recode it manually |
|
|
2798 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2799 | { |
|
|
2800 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2801 | char *s = rxvt_wcstombs (w); |
|
|
2802 | free (w); |
|
|
2803 | // TODO: strlen == only the first element will be converted. well... |
|
|
2804 | paste (s, strlen (s)); |
|
|
2805 | free (s); |
|
|
2806 | } |
|
|
2807 | else |
|
|
2808 | #endif |
|
|
2809 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2810 | && cl) |
|
|
2811 | { |
|
|
2812 | for (int i = 0; i < cr; i++) |
|
|
2813 | paste (cl[i], strlen (cl[i])); |
|
|
2814 | |
|
|
2815 | XFreeStringList (cl); |
|
|
2816 | } |
|
|
2817 | else |
|
|
2818 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2819 | |
|
|
2820 | bailout: |
|
|
2821 | XFree (ct.value); |
|
|
2822 | |
|
|
2823 | if (selection_wait == Sel_normal) |
|
|
2824 | selection_wait = Sel_none; |
|
|
2825 | } |
|
|
2826 | |
|
|
2827 | void |
|
|
2828 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2829 | { |
|
|
2830 | selection_wait = Sel_none; |
|
|
2831 | |
|
|
2832 | incr_buf_size = 0; |
|
|
2833 | free (incr_buf); |
|
|
2834 | |
|
|
2835 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2836 | } |
|
|
2837 | |
|
|
2838 | void |
|
|
2839 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2840 | { |
|
|
2841 | if (prop == None || selection_wait != Sel_incr) |
|
|
2842 | return; |
2744 | return; |
2843 | |
2745 | |
2844 | selection_paste (win, prop, true); |
2746 | tt_paste (data, len); |
2845 | } |
2747 | } |
2846 | |
2748 | |
2847 | /* ------------------------------------------------------------------------- */ |
2749 | /* ------------------------------------------------------------------------- */ |
2848 | /* |
2750 | /* |
2849 | * Request the current selection: |
2751 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2850 | * Order: > internal selection if available |
2752 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2851 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2753 | * as fallback |
2852 | * > CUT_BUFFER0 |
|
|
2853 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2854 | * will auto fallback to CUT_BUFFER0 |
|
|
2855 | * EXT: button 2 release |
2754 | * EXT: button 2 release |
2856 | */ |
2755 | */ |
2857 | void |
2756 | void |
2858 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2757 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2859 | { |
2758 | { |
2860 | if (selection.text && selnum == Sel_Primary) |
2759 | if (!selection_req) |
2861 | { |
|
|
2862 | /* internal selection */ |
|
|
2863 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2864 | paste (str, strlen (str)); |
|
|
2865 | free (str); |
|
|
2866 | return; |
|
|
2867 | } |
2760 | { |
2868 | else |
2761 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2762 | selection_req->run (); |
2869 | { |
2763 | } |
2870 | selection_request_time = tm; |
|
|
2871 | selection_wait = Sel_normal; |
|
|
2872 | |
|
|
2873 | #if X_HAVE_UTF8_STRING |
|
|
2874 | selection_type = Sel_UTF8String; |
|
|
2875 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2876 | return; |
|
|
2877 | #else |
|
|
2878 | selection_type = Sel_CompoundText; |
|
|
2879 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2880 | return; |
|
|
2881 | #endif |
|
|
2882 | } |
|
|
2883 | |
|
|
2884 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2885 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2886 | } |
|
|
2887 | |
|
|
2888 | int |
|
|
2889 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2890 | { |
|
|
2891 | Atom sel; |
|
|
2892 | |
|
|
2893 | selection_type |= selnum; |
|
|
2894 | |
|
|
2895 | if (selnum == Sel_Primary) |
|
|
2896 | sel = XA_PRIMARY; |
|
|
2897 | else if (selnum == Sel_Secondary) |
|
|
2898 | sel = XA_SECONDARY; |
|
|
2899 | else |
|
|
2900 | sel = xa[XA_CLIPBOARD]; |
|
|
2901 | |
|
|
2902 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2903 | { |
|
|
2904 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2905 | vt, selection_request_time); |
|
|
2906 | return 1; |
|
|
2907 | } |
|
|
2908 | |
|
|
2909 | return 0; |
|
|
2910 | } |
2764 | } |
2911 | |
2765 | |
2912 | /* ------------------------------------------------------------------------- */ |
2766 | /* ------------------------------------------------------------------------- */ |
2913 | /* |
2767 | /* |
2914 | * Clear all selected text |
2768 | * Clear all selected text |
2915 | * EXT: SelectionClear |
2769 | * EXT: SelectionClear |
2916 | */ |
2770 | */ |
2917 | void |
2771 | void |
2918 | rxvt_term::selection_clear () NOTHROW |
2772 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2919 | { |
2773 | { |
|
|
2774 | if (!clipboard) |
|
|
2775 | { |
2920 | want_refresh = 1; |
2776 | want_refresh = 1; |
2921 | free (selection.text); |
2777 | free (selection.text); |
2922 | selection.text = NULL; |
2778 | selection.text = NULL; |
2923 | selection.len = 0; |
2779 | selection.len = 0; |
2924 | CLEAR_SELECTION (); |
2780 | CLEAR_SELECTION (); |
2925 | |
2781 | |
2926 | if (display->selection_owner == this) |
2782 | if (display->selection_owner == this) |
2927 | display->selection_owner = 0; |
2783 | display->selection_owner = 0; |
|
|
2784 | } |
|
|
2785 | else |
|
|
2786 | { |
|
|
2787 | free (selection.clip_text); |
|
|
2788 | selection.clip_text = NULL; |
|
|
2789 | selection.clip_len = 0; |
|
|
2790 | |
|
|
2791 | if (display->clipboard_owner == this) |
|
|
2792 | display->clipboard_owner = 0; |
|
|
2793 | } |
2928 | } |
2794 | } |
2929 | |
2795 | |
2930 | /* ------------------------------------------------------------------------- */ |
2796 | /* ------------------------------------------------------------------------- */ |
2931 | /* |
2797 | /* |
2932 | * Copy a selection into the cut buffer |
2798 | * Copy a selection into the cut buffer |
2933 | * EXT: button 1 or 3 release |
2799 | * EXT: button 1 or 3 release |
2934 | */ |
2800 | */ |
2935 | void |
2801 | void |
2936 | rxvt_term::selection_make (Time tm) |
2802 | rxvt_term::selection_make (Time tm) |
2937 | { |
2803 | { |
2938 | int i; |
2804 | int size; |
2939 | wchar_t *new_selection_text; |
2805 | wchar_t *new_selection_text; |
2940 | text_t *t; |
2806 | text_t *t; |
2941 | |
2807 | |
2942 | switch (selection.op) |
2808 | switch (selection.op) |
2943 | { |
2809 | { |
… | |
… | |
2959 | return; /* nothing selected, go away */ |
2825 | return; /* nothing selected, go away */ |
2960 | |
2826 | |
2961 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2827 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2962 | return; |
2828 | return; |
2963 | |
2829 | |
2964 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2830 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2965 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2831 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
2966 | |
2832 | |
2967 | int ofs = 0; |
2833 | int ofs = 0; |
2968 | int extra = 0; |
2834 | int extra = 0; |
2969 | |
2835 | |
2970 | int col = selection.beg.col; |
2836 | int col = selection.beg.col; |
… | |
… | |
2976 | { |
2842 | { |
2977 | #if !ENABLE_MINIMAL |
2843 | #if !ENABLE_MINIMAL |
2978 | if (selection.rect) |
2844 | if (selection.rect) |
2979 | { |
2845 | { |
2980 | col = selection.beg.col; |
2846 | col = selection.beg.col; |
2981 | end_col = ncol + 1; |
2847 | end_col = selection.end.col; |
2982 | } |
2848 | } |
2983 | else |
2849 | else |
2984 | #endif |
2850 | #endif |
2985 | end_col = ROW(row).l; |
2851 | end_col = ROW(row).l; |
2986 | |
2852 | |
2987 | col = max (col, 0); |
2853 | col = max (col, 0); |
2988 | |
2854 | |
2989 | if (row == selection.end.row |
2855 | if (row == selection.end.row) |
2990 | #if !ENABLE_MINIMAL |
|
|
2991 | || selection.rect |
|
|
2992 | #endif |
|
|
2993 | ) |
|
|
2994 | min_it (end_col, selection.end.col); |
2856 | min_it (end_col, selection.end.col); |
2995 | |
2857 | |
2996 | t = ROW(row).t + col; |
2858 | t = ROW(row).t + col; |
2997 | |
2859 | |
2998 | for (; col < end_col; col++) |
2860 | for (; col < end_col; col++) |
… | |
… | |
3006 | |
2868 | |
3007 | extra -= (len - 1); |
2869 | extra -= (len - 1); |
3008 | |
2870 | |
3009 | if (extra < 0) |
2871 | if (extra < 0) |
3010 | { |
2872 | { |
3011 | extra += i; |
2873 | extra += size; |
3012 | i += i; |
2874 | size += size; |
3013 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2875 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3014 | } |
2876 | } |
3015 | |
2877 | |
3016 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2878 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3017 | } |
2879 | } |
3018 | #endif |
2880 | #endif |
… | |
… | |
3030 | |
2892 | |
3031 | new_selection_text[ofs++] = C0_LF; |
2893 | new_selection_text[ofs++] = C0_LF; |
3032 | } |
2894 | } |
3033 | else |
2895 | else |
3034 | #endif |
2896 | #endif |
3035 | if (!ROW(row).is_longer () && row != selection.end.row) |
2897 | if (!ROW(row).is_longer () |
|
|
2898 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2899 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3036 | new_selection_text[ofs++] = C0_LF; |
2900 | new_selection_text[ofs++] = C0_LF; |
3037 | } |
2901 | } |
3038 | |
|
|
3039 | if (end_col != selection.end.col) |
|
|
3040 | new_selection_text[ofs++] = C0_LF; |
|
|
3041 | |
2902 | |
3042 | new_selection_text[ofs] = 0; |
2903 | new_selection_text[ofs] = 0; |
3043 | |
2904 | |
3044 | if (ofs == 0) |
2905 | if (ofs == 0) |
3045 | { |
2906 | { |
… | |
… | |
3058 | |
2919 | |
3059 | selection_grab (tm); |
2920 | selection_grab (tm); |
3060 | } |
2921 | } |
3061 | |
2922 | |
3062 | bool |
2923 | bool |
3063 | rxvt_term::selection_grab (Time tm) NOTHROW |
2924 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3064 | { |
2925 | { |
|
|
2926 | Atom sel; |
|
|
2927 | |
|
|
2928 | if (!clipboard) |
|
|
2929 | { |
3065 | selection_time = tm; |
2930 | selection_time = tm; |
|
|
2931 | sel = XA_PRIMARY; |
|
|
2932 | } |
|
|
2933 | else |
|
|
2934 | { |
|
|
2935 | clipboard_time = tm; |
|
|
2936 | sel = xa[XA_CLIPBOARD]; |
|
|
2937 | } |
3066 | |
2938 | |
3067 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
2939 | XSetSelectionOwner (dpy, sel, vt, tm); |
3068 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
2940 | if (XGetSelectionOwner (dpy, sel) == vt) |
3069 | { |
2941 | { |
3070 | display->set_selection_owner (this); |
2942 | display->set_selection_owner (this, clipboard); |
3071 | return true; |
2943 | return true; |
3072 | } |
2944 | } |
3073 | else |
2945 | else |
3074 | { |
2946 | { |
3075 | selection_clear (); |
2947 | selection_clear (clipboard); |
3076 | return false; |
2948 | return false; |
3077 | } |
2949 | } |
3078 | |
2950 | |
3079 | #if 0 |
2951 | #if 0 |
3080 | XTextProperty ct; |
2952 | XTextProperty ct; |
… | |
… | |
3540 | * EXT: SelectionRequest |
3412 | * EXT: SelectionRequest |
3541 | */ |
3413 | */ |
3542 | void |
3414 | void |
3543 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3415 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3544 | { |
3416 | { |
|
|
3417 | Atom property = rq.property == None ? rq.target : rq.property; |
3545 | XSelectionEvent ev; |
3418 | XSelectionEvent ev; |
3546 | |
3419 | |
3547 | ev.type = SelectionNotify; |
3420 | ev.type = SelectionNotify; |
3548 | ev.property = None; |
3421 | ev.property = None; |
3549 | ev.display = rq.display; |
3422 | ev.display = rq.display; |
… | |
… | |
3564 | *target++ = xa[XA_COMPOUND_TEXT]; |
3437 | *target++ = xa[XA_COMPOUND_TEXT]; |
3565 | #if X_HAVE_UTF8_STRING |
3438 | #if X_HAVE_UTF8_STRING |
3566 | *target++ = xa[XA_UTF8_STRING]; |
3439 | *target++ = xa[XA_UTF8_STRING]; |
3567 | #endif |
3440 | #endif |
3568 | |
3441 | |
3569 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3442 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3570 | 32, PropModeReplace, |
3443 | 32, PropModeReplace, |
3571 | (unsigned char *)target_list, target - target_list); |
3444 | (unsigned char *)target_list, target - target_list); |
3572 | ev.property = rq.property; |
3445 | ev.property = property; |
3573 | } |
3446 | } |
3574 | #if TODO // TODO |
3447 | #if TODO // TODO |
3575 | else if (rq.target == xa[XA_MULTIPLE]) |
3448 | else if (rq.target == xa[XA_MULTIPLE]) |
3576 | { |
3449 | { |
3577 | /* TODO: Handle MULTIPLE */ |
3450 | /* TODO: Handle MULTIPLE */ |
3578 | } |
3451 | } |
3579 | #endif |
3452 | #endif |
3580 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3453 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3581 | { |
3454 | { |
3582 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3455 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3583 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3456 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3584 | ev.property = rq.property; |
3457 | ev.property = property; |
|
|
3458 | } |
|
|
3459 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3460 | { |
|
|
3461 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
|
|
3462 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
|
|
3463 | ev.property = property; |
3585 | } |
3464 | } |
3586 | else if (rq.target == XA_STRING |
3465 | else if (rq.target == XA_STRING |
3587 | || rq.target == xa[XA_TEXT] |
3466 | || rq.target == xa[XA_TEXT] |
3588 | || rq.target == xa[XA_COMPOUND_TEXT] |
3467 | || rq.target == xa[XA_COMPOUND_TEXT] |
3589 | || rq.target == xa[XA_UTF8_STRING] |
3468 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3621 | { |
3500 | { |
3622 | target = xa[XA_COMPOUND_TEXT]; |
3501 | target = xa[XA_COMPOUND_TEXT]; |
3623 | style = enc_compound_text; |
3502 | style = enc_compound_text; |
3624 | } |
3503 | } |
3625 | |
3504 | |
3626 | if (selection.text) |
3505 | if (rq.selection == XA_PRIMARY && selection.text) |
3627 | { |
3506 | { |
3628 | cl = selection.text; |
3507 | cl = selection.text; |
3629 | selectlen = selection.len; |
3508 | selectlen = selection.len; |
|
|
3509 | } |
|
|
3510 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3511 | { |
|
|
3512 | cl = selection.clip_text; |
|
|
3513 | selectlen = selection.clip_len; |
3630 | } |
3514 | } |
3631 | else |
3515 | else |
3632 | { |
3516 | { |
3633 | cl = L""; |
3517 | cl = L""; |
3634 | selectlen = 0; |
3518 | selectlen = 0; |
… | |
… | |
3655 | ct.value = (unsigned char *)cl; |
3539 | ct.value = (unsigned char *)cl; |
3656 | ct.nitems = selectlen; |
3540 | ct.nitems = selectlen; |
3657 | ct.encoding = target; |
3541 | ct.encoding = target; |
3658 | } |
3542 | } |
3659 | |
3543 | |
3660 | XChangeProperty (dpy, rq.requestor, rq.property, |
3544 | XChangeProperty (dpy, rq.requestor, property, |
3661 | ct.encoding, 8, PropModeReplace, |
3545 | ct.encoding, 8, PropModeReplace, |
3662 | ct.value, (int)ct.nitems); |
3546 | ct.value, (int)ct.nitems); |
3663 | ev.property = rq.property; |
3547 | ev.property = property; |
3664 | |
3548 | |
3665 | if (freect) |
3549 | if (freect) |
3666 | XFree (ct.value); |
3550 | XFree (ct.value); |
3667 | } |
3551 | } |
3668 | |
3552 | |
… | |
… | |
3702 | h += 2; min_it (h, nrow); |
3586 | h += 2; min_it (h, nrow); |
3703 | |
3587 | |
3704 | x -= 1; clamp_it (x, 0, ncol - w); |
3588 | x -= 1; clamp_it (x, 0, ncol - w); |
3705 | y -= 1; clamp_it (y, 0, nrow - h); |
3589 | y -= 1; clamp_it (y, 0, nrow - h); |
3706 | |
3590 | |
3707 | ov_x = x; ov_y = y; |
3591 | ov.x = x; ov.y = y; |
3708 | ov_w = w; ov_h = h; |
3592 | ov.w = w; ov.h = h; |
3709 | |
3593 | |
3710 | ov_text = new text_t *[h]; |
3594 | ov.text = new text_t *[h]; |
3711 | ov_rend = new rend_t *[h]; |
3595 | ov.rend = new rend_t *[h]; |
3712 | |
3596 | |
3713 | for (y = 0; y < h; y++) |
3597 | for (y = 0; y < h; y++) |
3714 | { |
3598 | { |
3715 | text_t *tp = ov_text[y] = new text_t[w]; |
3599 | text_t *tp = ov.text[y] = new text_t[w]; |
3716 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3600 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3717 | |
3601 | |
3718 | text_t t0, t1, t2; |
3602 | text_t t0, t1, t2; |
3719 | rend_t r = OVERLAY_RSTYLE; |
3603 | rend_t r = OVERLAY_RSTYLE; |
3720 | |
3604 | |
3721 | if (y == 0) |
3605 | if (y == 0) |
… | |
… | |
3740 | } |
3624 | } |
3741 | |
3625 | |
3742 | void |
3626 | void |
3743 | rxvt_term::scr_overlay_off () NOTHROW |
3627 | rxvt_term::scr_overlay_off () NOTHROW |
3744 | { |
3628 | { |
3745 | if (!ov_text) |
3629 | if (!ov.text) |
3746 | return; |
3630 | return; |
3747 | |
3631 | |
3748 | want_refresh = 1; |
3632 | want_refresh = 1; |
3749 | |
3633 | |
3750 | for (int y = 0; y < ov_h; y++) |
3634 | for (int y = 0; y < ov.h; y++) |
3751 | { |
3635 | { |
3752 | delete [] ov_text[y]; |
3636 | delete [] ov.text[y]; |
3753 | delete [] ov_rend[y]; |
3637 | delete [] ov.rend[y]; |
3754 | } |
3638 | } |
3755 | |
3639 | |
3756 | delete [] ov_text; ov_text = 0; |
3640 | delete [] ov.text; ov.text = 0; |
3757 | delete [] ov_rend; ov_rend = 0; |
3641 | delete [] ov.rend; ov.rend = 0; |
3758 | } |
3642 | } |
3759 | |
3643 | |
3760 | void |
3644 | void |
3761 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3645 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3762 | { |
3646 | { |
3763 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3647 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3764 | return; |
3648 | return; |
3765 | |
3649 | |
3766 | x++, y++; |
3650 | x++, y++; |
3767 | |
3651 | |
3768 | ov_text[y][x] = text; |
3652 | ov.text[y][x] = text; |
3769 | ov_rend[y][x] = rend; |
3653 | ov.rend[y][x] = rend; |
3770 | } |
3654 | } |
3771 | |
3655 | |
3772 | void |
3656 | void |
3773 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3657 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3774 | { |
3658 | { |
… | |
… | |
3793 | } |
3677 | } |
3794 | |
3678 | |
3795 | void |
3679 | void |
3796 | rxvt_term::scr_swap_overlay () NOTHROW |
3680 | rxvt_term::scr_swap_overlay () NOTHROW |
3797 | { |
3681 | { |
3798 | if (!ov_text) |
3682 | if (!ov.text) |
3799 | return; |
3683 | return; |
3800 | |
3684 | |
|
|
3685 | // hide cursor if it is within the overlay area |
|
|
3686 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3687 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3688 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3689 | |
3801 | // swap screen mem with overlay |
3690 | // swap screen mem with overlay |
3802 | for (int y = ov_h; y--; ) |
3691 | for (int y = ov.h; y--; ) |
3803 | { |
3692 | { |
3804 | text_t *t1 = ov_text[y]; |
3693 | text_t *t1 = ov.text[y]; |
3805 | rend_t *r1 = ov_rend[y]; |
3694 | rend_t *r1 = ov.rend[y]; |
3806 | |
3695 | |
3807 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3696 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3808 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3697 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3809 | |
3698 | |
3810 | for (int x = ov_w; x--; ) |
3699 | for (int x = ov.w; x--; ) |
3811 | { |
3700 | { |
3812 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3701 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3813 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3702 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3814 | } |
3703 | } |
3815 | } |
3704 | } |