1 | /*--------------------------------*-C-*--------------------------------------* |
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-2006 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
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. |
… | |
… | |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
|
|
32 | |
|
|
33 | #include <inttypes.h> |
31 | #include <inttypes.h> |
34 | |
32 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
36 | |
34 | |
|
|
35 | static inline void |
37 | inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
38 | { |
37 | { |
39 | while (len--) |
38 | while (len--) |
40 | *start++ = value; |
39 | *start++ = value; |
41 | } |
40 | } |
42 | |
41 | |
… | |
… | |
47 | |
46 | |
48 | /* ------------------------------------------------------------------------- * |
47 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
49 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
50 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
51 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
52 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
53 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
54 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
55 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
56 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
85 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
84 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
86 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
87 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
88 | |
87 | |
89 | /* |
88 | /* |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
93 | */ |
90 | */ |
94 | #define drawBuffer vt |
|
|
95 | |
|
|
96 | #define CLEAR_ROWS(row, num) \ |
|
|
97 | if (mapped) \ |
|
|
98 | XClearArea (display->display, drawBuffer, 0, \ |
|
|
99 | Row2Pixel (row), (unsigned int)width, \ |
|
|
100 | (unsigned int)Height2Pixel (num), False) |
|
|
101 | |
|
|
102 | #define CLEAR_CHARS(x, y, num) \ |
91 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
92 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
93 | XClearArea (dpy, vt, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
94 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
95 | (unsigned int)Height2Pixel (1), False) |
107 | |
|
|
108 | #define ERASE_ROWS(row, num) \ |
|
|
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
|
|
110 | 0, Row2Pixel (row), \ |
|
|
111 | (unsigned int)width, \ |
|
|
112 | (unsigned int)Height2Pixel (num)) |
|
|
113 | |
96 | |
114 | /* ------------------------------------------------------------------------- * |
97 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
98 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
99 | * ------------------------------------------------------------------------- */ |
117 | |
100 | |
… | |
… | |
126 | width = ncol; |
109 | width = ncol; |
127 | } |
110 | } |
128 | |
111 | |
129 | l.touch (); |
112 | l.touch (); |
130 | |
113 | |
131 | efs &= ~RS_baseattrMask; |
114 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
115 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
116 | |
134 | text_t *et = l.t + col; |
117 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
118 | rend_t *er = l.r + col; |
136 | |
119 | |
… | |
… | |
148 | { |
131 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
132 | scr_blank_line (l, 0, ncol, efs); |
150 | |
133 | |
151 | l.l = 0; |
134 | l.l = 0; |
152 | l.f = 0; |
135 | l.f = 0; |
|
|
136 | } |
|
|
137 | |
|
|
138 | // nuke a single wide character at the given column |
|
|
139 | void |
|
|
140 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
141 | { |
|
|
142 | // find begin |
|
|
143 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
144 | col--; |
|
|
145 | |
|
|
146 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
147 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
148 | |
|
|
149 | // found start, nuke |
|
|
150 | do { |
|
|
151 | l.t[col] = ' '; |
|
|
152 | l.r[col] = rend; |
|
|
153 | col++; |
|
|
154 | } while (col < ncol && l.t[col] == NOCHAR); |
153 | } |
155 | } |
154 | |
156 | |
155 | /* ------------------------------------------------------------------------- * |
157 | /* ------------------------------------------------------------------------- * |
156 | * SCREEN INITIALISATION * |
158 | * SCREEN INITIALISATION * |
157 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
158 | |
160 | |
159 | void |
161 | void |
160 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
161 | { |
163 | { |
162 | #if ENABLE_OVERLAY |
|
|
163 | scr_overlay_off (); |
|
|
164 | #endif |
|
|
165 | |
|
|
166 | view_start = 0; |
164 | view_start = 0; |
167 | num_scr = 0; |
165 | num_scr = 0; |
168 | |
166 | |
169 | if (ncol == 0) |
167 | if (ncol == 0) |
170 | ncol = 80; |
168 | ncol = 80; |
… | |
… | |
172 | if (nrow == 0) |
170 | if (nrow == 0) |
173 | nrow = 24; |
171 | nrow = 24; |
174 | |
172 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
174 | return; |
177 | |
|
|
178 | if (current_screen != PRIMARY) |
|
|
179 | scr_swap_screen (); |
|
|
180 | |
175 | |
181 | // we need at least two lines for wrapping to work correctly |
176 | // we need at least two lines for wrapping to work correctly |
182 | while (nrow + saveLines < 2) |
177 | while (nrow + saveLines < 2) |
183 | { |
178 | { |
184 | //TODO//FIXME |
179 | //TODO//FIXME |
… | |
… | |
237 | selection.text = NULL; |
232 | selection.text = NULL; |
238 | selection.len = 0; |
233 | selection.len = 0; |
239 | selection.op = SELECTION_CLEAR; |
234 | selection.op = SELECTION_CLEAR; |
240 | selection.screen = PRIMARY; |
235 | selection.screen = PRIMARY; |
241 | selection.clicks = 0; |
236 | selection.clicks = 0; |
242 | rvideo_state = rvideo_mode = false; |
237 | selection.clip_text = NULL; |
|
|
238 | selection.clip_len = 0; |
243 | } |
239 | } |
244 | else |
240 | else |
245 | { |
241 | { |
246 | /* |
242 | /* |
247 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
277 | } |
273 | } |
278 | |
274 | |
279 | line_t *old_buf = row_buf; |
275 | line_t *old_buf = row_buf; |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
276 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
281 | |
277 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
278 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
280 | int q = total_rows; // rewrapped row |
285 | |
281 | |
286 | if (top_row) |
282 | if (top_row) |
287 | { |
283 | { |
288 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
284 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
289 | // to come up with a lean and mean algorithm. |
285 | // to come up with a lean and mean algorithm. |
|
|
286 | // TODO: maybe optimise when width didn't change |
290 | |
287 | |
291 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
292 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
293 | |
290 | |
294 | do |
291 | do |
295 | { |
292 | { |
296 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
297 | #ifdef DEBUG_STRICT |
|
|
298 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
299 | #endif |
|
|
300 | int plines = 1; |
295 | int plines = 1; |
301 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
302 | |
297 | |
303 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
298 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
304 | { |
299 | { |
… | |
… | |
330 | int qcol = 0; |
325 | int qcol = 0; |
331 | |
326 | |
332 | // see below for cursor adjustment rationale |
327 | // see below for cursor adjustment rationale |
333 | if (p == ocur.row) |
328 | if (p == ocur.row) |
334 | screen.cur.row = q - (total_rows - nrow); |
329 | screen.cur.row = q - (total_rows - nrow); |
335 | |
330 | |
336 | // fill a single destination line |
331 | // fill a single destination line |
337 | while (lofs < llen && qcol < ncol) |
332 | while (lofs < llen && qcol < ncol) |
338 | { |
333 | { |
339 | int prow = lofs / prev_ncol; |
334 | int prow = lofs / prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
335 | int pcol = lofs % prev_ncol; |
… | |
… | |
366 | } |
361 | } |
367 | while (p != pend && q > 0); |
362 | while (p != pend && q > 0); |
368 | |
363 | |
369 | term_start = total_rows - nrow; |
364 | term_start = total_rows - nrow; |
370 | top_row = q - term_start; |
365 | top_row = q - term_start; |
371 | |
366 | |
372 | // make sure all terminal lines exist |
367 | // make sure all terminal lines exist |
373 | while (top_row > 0) |
368 | while (top_row > 0) |
374 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
369 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
375 | } |
370 | } |
376 | else |
371 | else |
377 | { |
372 | { |
378 | // if no scrollback exists (yet), wing, instead of wrap |
373 | // if no scrollback exists (yet), wing, instead of wrap |
379 | |
374 | |
380 | for (int row = min (nrow, prev_nrow); row--; ) |
375 | for (int row = min (nrow, prev_nrow); row--; ) |
381 | { |
376 | { |
382 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
377 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
383 | line_t &qline = row_buf [row]; |
378 | line_t &qline = row_buf [row]; |
384 | |
379 | |
… | |
… | |
398 | delete old_ta; |
393 | delete old_ta; |
399 | delete old_ra; |
394 | delete old_ra; |
400 | |
395 | |
401 | clamp_it (screen.cur.row, 0, nrow - 1); |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
402 | clamp_it (screen.cur.col, 0, ncol - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
398 | } |
403 | |
399 | |
404 | free (tabs); |
400 | free (tabs); |
405 | } |
401 | tabs = (char *)rxvt_malloc (ncol); |
|
|
402 | |
|
|
403 | for (int col = ncol; --col; ) |
|
|
404 | tabs [col] = col % TABSIZE == 0; |
406 | |
405 | |
407 | CLEAR_ALL_SELECTION (); |
406 | CLEAR_ALL_SELECTION (); |
408 | |
407 | |
409 | prev_nrow = nrow; |
408 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
409 | prev_ncol = ncol; |
411 | |
|
|
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
|
|
413 | |
|
|
414 | for (int col = ncol; col--; ) |
|
|
415 | tabs [col] = col % TABSIZE == 0; |
|
|
416 | |
|
|
417 | if (current_screen != PRIMARY) |
|
|
418 | scr_swap_screen (); |
|
|
419 | |
410 | |
420 | tt_winch (); |
411 | tt_winch (); |
421 | |
412 | |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
413 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
423 | } |
414 | } |
… | |
… | |
435 | delete ralloc; ralloc = 0; |
426 | delete ralloc; ralloc = 0; |
436 | |
427 | |
437 | free (row_buf); |
428 | free (row_buf); |
438 | free (swap_buf); |
429 | free (swap_buf); |
439 | free (drawn_buf); |
430 | free (drawn_buf); |
|
|
431 | row_buf = 0; // signal that we freed all the arrays above |
|
|
432 | |
440 | free (tabs); |
433 | free (tabs); |
441 | |
434 | tabs = 0; |
442 | row_buf = 0; // signal that we freed all the arrays |
|
|
443 | } |
435 | } |
444 | } |
436 | } |
445 | |
437 | |
446 | /* ------------------------------------------------------------------------- */ |
438 | /* ------------------------------------------------------------------------- */ |
447 | /* |
439 | /* |
448 | * Hard reset |
440 | * Hard/Soft reset |
449 | */ |
441 | */ |
450 | void |
442 | void |
451 | rxvt_term::scr_poweron () |
443 | rxvt_term::scr_poweron () |
452 | { |
444 | { |
453 | scr_release (); |
445 | scr_release (); |
454 | prev_nrow = prev_ncol = 0; |
446 | prev_nrow = prev_ncol = 0; |
|
|
447 | rvideo_mode = false; |
|
|
448 | scr_soft_reset (); |
455 | scr_reset (); |
449 | scr_reset (); |
456 | |
450 | |
457 | scr_clear (true); |
451 | scr_clear (true); |
458 | scr_refresh (); |
452 | scr_refresh (); |
|
|
453 | } |
|
|
454 | |
|
|
455 | void |
|
|
456 | rxvt_term::scr_soft_reset () |
|
|
457 | { |
|
|
458 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
459 | #if ENABLE_OVERLAY |
|
|
460 | scr_overlay_off (); |
|
|
461 | #endif |
|
|
462 | |
|
|
463 | if (current_screen != PRIMARY) |
|
|
464 | scr_swap_screen (); |
|
|
465 | |
|
|
466 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
467 | scr_rendition (0, ~RS_None); |
|
|
468 | scr_insert_mode (0); |
459 | } |
469 | } |
460 | |
470 | |
461 | /* ------------------------------------------------------------------------- * |
471 | /* ------------------------------------------------------------------------- * |
462 | * PROCESS SCREEN COMMANDS * |
472 | * PROCESS SCREEN COMMANDS * |
463 | * ------------------------------------------------------------------------- */ |
473 | * ------------------------------------------------------------------------- */ |
… | |
… | |
501 | } |
511 | } |
502 | |
512 | |
503 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
504 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.row, nrow - 1); |
505 | min_it (s->cur.col, ncol - 1); |
515 | min_it (s->cur.col, ncol - 1); |
506 | #ifdef DEBUG_STRICT |
|
|
507 | assert (s->cur.row >= 0); |
516 | assert (s->cur.row >= 0); |
508 | assert (s->cur.col >= 0); |
517 | assert (s->cur.col >= 0); |
509 | #endif |
|
|
510 | } |
518 | } |
511 | |
519 | |
512 | void |
520 | void |
513 | rxvt_term::scr_swap_screen () |
521 | rxvt_term::scr_swap_screen () |
514 | { |
522 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
523 | if (!option (Opt_secondaryScreen)) |
516 | return; |
524 | return; |
517 | |
525 | |
518 | for (int i = prev_nrow; i--; ) |
526 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
527 | ::swap (ROW(i), swap_buf [i]); |
520 | |
528 | |
… | |
… | |
539 | want_refresh = 1; |
547 | want_refresh = 1; |
540 | view_start = 0; |
548 | view_start = 0; |
541 | |
549 | |
542 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
543 | |
551 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
545 | |
553 | |
546 | #if NSCREENS |
554 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
548 | { |
556 | { |
549 | num_scr = 0; |
557 | num_scr = 0; |
550 | |
558 | |
551 | scr_swap_screen (); |
559 | scr_swap_screen (); |
552 | |
560 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
563 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
564 | swap.flags |= Screen_VisibleCursor; |
557 | } |
565 | } |
558 | else |
566 | else |
559 | #endif |
567 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
568 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
569 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
570 | } |
563 | |
571 | |
564 | // clear WrapNext indicator, solidifying position on next line |
572 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
573 | void |
… | |
… | |
598 | /* |
606 | /* |
599 | * Change the rendition style for following text |
607 | * Change the rendition style for following text |
600 | */ |
608 | */ |
601 | void |
609 | void |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
610 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
603 | { |
611 | { |
604 | if (set) |
612 | if (set) |
605 | rstyle |= style; |
613 | rstyle |= style; |
606 | else if (style == ~RS_None) |
614 | else if (style == ~RS_None) |
607 | rstyle = DEFAULT_RSTYLE; |
615 | rstyle = DEFAULT_RSTYLE; |
608 | else |
616 | else |
609 | rstyle &= ~style; |
617 | rstyle &= ~style; |
610 | } |
618 | } |
611 | |
619 | |
612 | /* ------------------------------------------------------------------------- */ |
620 | /* ------------------------------------------------------------------------- */ |
613 | /* |
621 | /* |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
622 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
615 | * count positive ==> scroll up |
623 | * count positive ==> scroll up |
… | |
… | |
624 | want_refresh = 1; |
632 | want_refresh = 1; |
625 | num_scr += count; |
633 | num_scr += count; |
626 | |
634 | |
627 | if (count > 0 |
635 | if (count > 0 |
628 | && row1 == 0 |
636 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
637 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
638 | { |
631 | top_row = max (top_row - count, -saveLines); |
639 | top_row = max (top_row - count, -saveLines); |
632 | |
640 | |
633 | // scroll everything up 'count' lines |
641 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
642 | term_start = (term_start + count) % total_rows; |
… | |
… | |
641 | } |
649 | } |
642 | |
650 | |
643 | // erase newly scrolled-in lines |
651 | // erase newly scrolled-in lines |
644 | for (int i = count; i--; ) |
652 | for (int i = count; i--; ) |
645 | { |
653 | { |
646 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
647 | // it is worth the effort on slower machines |
|
|
648 | line_t &l = ROW(nrow - 1 - i); |
654 | line_t &l = ROW(nrow - 1 - i); |
649 | |
655 | |
|
|
656 | // optimize if already cleared, can be significant on slow machines |
|
|
657 | // could be rolled into scr_blank_screen_mem |
|
|
658 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
659 | { |
650 | scr_blank_line (l, 0, l.l, rstyle); |
660 | scr_blank_line (l, 0, l.l, rstyle); |
651 | |
|
|
652 | l.l = 0; |
661 | l.l = 0; |
653 | l.f = 0; |
662 | l.f = 0; |
|
|
663 | } |
|
|
664 | else |
|
|
665 | scr_blank_screen_mem (l, rstyle); |
654 | } |
666 | } |
655 | |
667 | |
656 | // now copy lines below the scroll region bottom to the |
668 | // now copy lines below the scroll region bottom to the |
657 | // bottom of the screen again, so they look as if they |
669 | // bottom of the screen again, so they look as if they |
658 | // hadn't moved. |
670 | // hadn't moved. |
… | |
… | |
662 | line_t &l2 = ROW(i); |
674 | line_t &l2 = ROW(i); |
663 | |
675 | |
664 | ::swap (l1, l2); |
676 | ::swap (l1, l2); |
665 | l2.touch (); |
677 | l2.touch (); |
666 | } |
678 | } |
667 | |
679 | |
668 | // move and/or clear selection, if any |
680 | // move and/or clear selection, if any |
669 | if (selection.op && current_screen == selection.screen) |
681 | if (selection.op && current_screen == selection.screen) |
670 | { |
682 | { |
671 | selection.beg.row -= count; |
683 | selection.beg.row -= count; |
672 | selection.end.row -= count; |
684 | selection.end.row -= count; |
… | |
… | |
680 | selection.op = SELECTION_CLEAR; |
692 | selection.op = SELECTION_CLEAR; |
681 | } |
693 | } |
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 |
687 | && view_start != -saveLines) |
699 | && view_start != -saveLines) |
688 | scr_page (UP, count); |
700 | scr_page (UP, count); |
689 | |
701 | |
690 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
702 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
708 | { |
720 | { |
709 | /* move selected region too */ |
721 | /* move selected region too */ |
710 | selection.beg.row -= count; |
722 | selection.beg.row -= count; |
711 | selection.end.row -= count; |
723 | selection.end.row -= count; |
712 | selection.mark.row -= count; |
724 | selection.mark.row -= count; |
713 | |
725 | |
714 | selection_check (0); |
726 | selection_check (0); |
715 | } |
727 | } |
716 | } |
728 | } |
717 | |
729 | |
718 | // use a simple and robust scrolling algorithm, this |
730 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
758 | ZERO_SCROLLBACK (); |
770 | ZERO_SCROLLBACK (); |
759 | |
771 | |
760 | if (minlines > 0) |
772 | if (minlines > 0) |
761 | { |
773 | { |
762 | minlines += screen.cur.row - screen.bscroll; |
774 | minlines += screen.cur.row - screen.bscroll; |
|
|
775 | min_it (minlines, screen.cur.row - top_row); |
763 | |
776 | |
764 | if (minlines > 0 |
777 | if (minlines > 0 |
765 | && screen.tscroll == 0 |
778 | && screen.tscroll == 0 |
766 | && screen.bscroll == nrow - 1) |
779 | && screen.bscroll == nrow - 1) |
767 | { |
780 | { |
… | |
… | |
769 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
782 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
770 | screen.cur.row -= minlines; |
783 | screen.cur.row -= minlines; |
771 | } |
784 | } |
772 | } |
785 | } |
773 | |
786 | |
774 | #ifdef DEBUG_STRICT |
|
|
775 | assert (screen.cur.col < ncol); |
787 | assert (screen.cur.col < ncol); |
776 | assert (screen.cur.row < nrow |
788 | assert (screen.cur.row < nrow |
777 | && screen.cur.row >= top_row); |
789 | && screen.cur.row >= top_row); |
778 | #endif |
|
|
779 | int row = screen.cur.row; |
790 | int row = screen.cur.row; |
780 | |
791 | |
781 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
792 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
782 | |
793 | |
783 | line_t *line = &ROW(row); |
794 | line_t *line = &ROW(row); |
784 | |
795 | |
785 | while (str < strend) |
796 | while (str < strend) |
786 | { |
797 | { |
787 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
788 | |
799 | |
789 | if (c < 0x20) |
800 | if (expect_false (c < 0x20)) |
790 | if (c == C0_LF) |
801 | if (c == C0_LF) |
791 | { |
802 | { |
792 | max_it (line->l, screen.cur.col); |
803 | max_it (line->l, screen.cur.col); |
793 | |
804 | |
794 | screen.flags &= ~Screen_WrapNext; |
805 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
813 | { |
824 | { |
814 | scr_tab (1, true); |
825 | scr_tab (1, true); |
815 | continue; |
826 | continue; |
816 | } |
827 | } |
817 | |
828 | |
|
|
829 | if (expect_false ( |
818 | if (checksel /* see if we're writing within selection */ |
830 | checksel /* see if we're writing within selection */ |
819 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
820 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
833 | )) |
821 | { |
834 | { |
822 | checksel = 0; |
835 | checksel = 0; |
823 | /* |
836 | /* |
824 | * If we wrote anywhere in the selected area, kill the selection |
837 | * If we wrote anywhere in the selected area, kill the selection |
825 | * XXX: should we kill the mark too? Possibly, but maybe that |
838 | * XXX: should we kill the mark too? Possibly, but maybe that |
826 | * should be a similar check. |
839 | * should be a similar check. |
827 | */ |
840 | */ |
828 | CLEAR_SELECTION (); |
841 | CLEAR_SELECTION (); |
829 | } |
842 | } |
830 | |
843 | |
831 | if (screen.flags & Screen_WrapNext) |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
832 | { |
845 | { |
833 | scr_do_wrap (); |
846 | scr_do_wrap (); |
834 | |
847 | |
835 | line->l = ncol; |
848 | line->l = ncol; |
836 | line->is_longer (1); |
849 | line->is_longer (1); |
837 | |
850 | |
838 | row = screen.cur.row; |
851 | row = screen.cur.row; |
839 | line = &ROW(row); /* _must_ refresh */ |
852 | line = &ROW(row); /* _must_ refresh */ |
840 | } |
853 | } |
841 | |
854 | |
842 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
844 | c = 0xfffd; |
857 | c = 0xfffd; |
845 | |
858 | |
846 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
847 | // do wcwidth before further replacements, as wcwidth might return -1 |
860 | // further replacements, as wcwidth might return -1 for the line |
848 | // for the line drawing characters below as they might be invalid in the current |
861 | // drawing characters below as they might be invalid in the current |
849 | // locale. |
862 | // locale. |
850 | int width = c < 0x100 ? 1 : wcwidth (c); |
863 | int width = WCWIDTH (c); |
851 | |
864 | |
852 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
853 | { |
866 | { |
854 | // vt100 special graphics and line drawing |
867 | // vt100 special graphics and line drawing |
855 | // 5f-7e standard vt100 |
868 | // 5f-7e standard vt100 |
856 | // 40-5e rxvt extension for extra curses acs chars |
869 | // 40-5e rxvt extension for extra curses acs chars |
857 | static uint16_t vt100_0[62] = { // 41 .. 7e |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
870 | c = vt100_0[c - 0x41]; |
883 | c = vt100_0[c - 0x41]; |
871 | width = 1; // vt100 line drawing characters are always single-width |
884 | width = 1; // vt100 line drawing characters are always single-width |
872 | } |
885 | } |
873 | } |
886 | } |
874 | |
887 | |
875 | if (screen.flags & Screen_Insert) |
888 | if (expect_false (screen.flags & Screen_Insert)) |
876 | scr_insdel_chars (width, INSERT); |
889 | scr_insdel_chars (width, INSERT); |
877 | |
890 | |
878 | if (width != 0) |
891 | if (width != 0) |
879 | { |
892 | { |
880 | #if !UNICODE_3 |
893 | #if !UNICODE_3 |
… | |
… | |
886 | c = 0xfffd; |
899 | c = 0xfffd; |
887 | # endif |
900 | # endif |
888 | #endif |
901 | #endif |
889 | |
902 | |
890 | // nuke the character at this position, if required |
903 | // nuke the character at this position, if required |
|
|
904 | if (expect_false ( |
891 | if (line->t[screen.cur.col] == NOCHAR |
905 | line->t[screen.cur.col] == NOCHAR |
892 | || (screen.cur.col < ncol - 1 |
906 | || (screen.cur.col < ncol - 1 |
893 | && line->t[screen.cur.col + 1] == NOCHAR)) |
907 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
908 | )) |
|
|
909 | scr_kill_char (*line, screen.cur.col); |
|
|
910 | |
|
|
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
912 | |
|
|
913 | // if the character doesn't fit into the remaining columns... |
|
|
914 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
894 | { |
915 | { |
895 | int col = screen.cur.col; |
916 | if (screen.flags & Screen_Autowrap) |
896 | |
|
|
897 | // find begin |
|
|
898 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
899 | col--; |
|
|
900 | |
|
|
901 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
902 | |
|
|
903 | // found begin, nuke |
|
|
904 | do { |
917 | { |
905 | line->t[col] = ' '; |
918 | // ... artificially enlargen the previous one |
906 | line->r[col] = rend; |
919 | c = NOCHAR; |
907 | col++; |
|
|
908 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
909 | } |
|
|
910 | |
|
|
911 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
912 | |
|
|
913 | // if the character doesn't fit into the remaining columns... |
|
|
914 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
915 | { |
|
|
916 | // ...output spaces |
|
|
917 | c = ' '; |
|
|
918 | // and try the same character next loop iteration |
920 | // and try the same character next loop iteration |
919 | --str; |
921 | --str; |
|
|
922 | } |
|
|
923 | else |
|
|
924 | screen.cur.col = ncol - width; |
920 | } |
925 | } |
921 | |
926 | |
922 | line->touch (); |
927 | line->touch (); |
923 | |
928 | |
924 | do |
929 | do |
925 | { |
930 | { |
926 | line->t[screen.cur.col] = c; |
931 | line->t[screen.cur.col] = c; |
927 | line->r[screen.cur.col] = rend; |
932 | line->r[screen.cur.col] = rend; |
928 | |
933 | |
929 | if (screen.cur.col < ncol - 1) |
934 | if (expect_true (screen.cur.col < ncol - 1)) |
930 | screen.cur.col++; |
935 | screen.cur.col++; |
931 | else |
936 | else |
932 | { |
937 | { |
933 | line->l = ncol; |
938 | line->l = ncol; |
934 | if (screen.flags & Screen_Autowrap) |
939 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
936 | break; |
941 | break; |
937 | } |
942 | } |
938 | |
943 | |
939 | c = NOCHAR; |
944 | c = NOCHAR; |
940 | } |
945 | } |
941 | while (--width > 0); |
946 | while (expect_false (--width > 0)); |
942 | |
947 | |
943 | // pad with spaces when overwriting wide character with smaller one |
948 | // pad with spaces when overwriting wide character with smaller one |
944 | if (!width) |
949 | if (expect_false (!width)) |
945 | { |
950 | { |
946 | line->touch (); |
951 | line->touch (); |
947 | |
952 | |
948 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
953 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
949 | { |
954 | { |
950 | line->t[c] = ' '; |
955 | line->t[c] = ' '; |
951 | line->r[c] = rend; |
956 | line->r[c] = rend; |
952 | } |
957 | } |
953 | } |
958 | } |
954 | } |
959 | } |
|
|
960 | #if ENABLE_COMBINING |
955 | else // width == 0 |
961 | else // width == 0 |
956 | { |
962 | { |
957 | #if ENABLE_COMBINING |
963 | if (c != 0xfeff) // ignore BOM |
958 | // handle combining characters |
|
|
959 | // we just tag the accent on the previous on-screen character. |
|
|
960 | // this is arguably not correct, but also arguably not wrong. |
|
|
961 | // we don't handle double-width characters nicely yet. |
|
|
962 | line_t *linep; |
|
|
963 | text_t *tp; |
|
|
964 | rend_t *rp; |
|
|
965 | |
|
|
966 | if (screen.cur.col > 0) |
|
|
967 | { |
964 | { |
|
|
965 | // handle combining characters |
|
|
966 | // we just tag the accent on the previous on-screen character. |
|
|
967 | // this is arguably not correct, but also arguably not wrong. |
|
|
968 | // we don't handle double-width characters nicely yet. |
|
|
969 | line_t *linep; |
|
|
970 | text_t *tp; |
|
|
971 | rend_t *rp; |
|
|
972 | |
|
|
973 | if (screen.cur.col > 0) |
|
|
974 | { |
968 | linep = line; |
975 | linep = line; |
969 | tp = line->t + screen.cur.col - 1; |
976 | tp = line->t + screen.cur.col - 1; |
970 | rp = line->r + screen.cur.col - 1; |
977 | rp = line->r + screen.cur.col - 1; |
|
|
978 | } |
|
|
979 | else if (screen.cur.row > 0 |
|
|
980 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
981 | { |
|
|
982 | linep = &ROW(screen.cur.row - 1); |
|
|
983 | tp = line->t + ncol - 1; |
|
|
984 | rp = line->r + ncol - 1; |
|
|
985 | } |
|
|
986 | else |
|
|
987 | continue; |
|
|
988 | |
|
|
989 | linep->touch (); |
|
|
990 | |
|
|
991 | while (*tp == NOCHAR && tp > linep->t) |
|
|
992 | tp--, rp--; |
|
|
993 | |
|
|
994 | // first try to find a precomposed character |
|
|
995 | unicode_t n = rxvt_compose (*tp, c); |
|
|
996 | if (n == NOCHAR) |
|
|
997 | n = rxvt_composite.compose (*tp, c); |
|
|
998 | |
|
|
999 | *tp = n; |
|
|
1000 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
971 | } |
1001 | } |
972 | else if (screen.cur.row > 0 |
|
|
973 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
974 | { |
|
|
975 | linep = &ROW(screen.cur.row - 1); |
|
|
976 | tp = line->t + ncol - 1; |
|
|
977 | rp = line->r + ncol - 1; |
|
|
978 | } |
1002 | } |
979 | else |
|
|
980 | continue; |
|
|
981 | |
|
|
982 | linep->touch (); |
|
|
983 | |
|
|
984 | while (*tp == NOCHAR && tp > linep->t) |
|
|
985 | tp--, rp--; |
|
|
986 | |
|
|
987 | // first try to find a precomposed character |
|
|
988 | unicode_t n = rxvt_compose (*tp, c); |
|
|
989 | if (n == NOCHAR) |
|
|
990 | n = rxvt_composite.compose (*tp, c); |
|
|
991 | |
|
|
992 | *tp = n; |
|
|
993 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
994 | #endif |
1003 | #endif |
995 | } |
|
|
996 | } |
1004 | } |
997 | |
1005 | |
998 | max_it (line->l, screen.cur.col); |
1006 | max_it (line->l, screen.cur.col); |
999 | |
1007 | |
1000 | #ifdef DEBUG_STRICT |
|
|
1001 | assert (screen.cur.row >= 0); |
1008 | assert (screen.cur.row >= 0); |
1002 | #endif |
|
|
1003 | } |
1009 | } |
1004 | |
1010 | |
1005 | /* ------------------------------------------------------------------------- */ |
1011 | /* ------------------------------------------------------------------------- */ |
1006 | /* |
1012 | /* |
1007 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1013 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1008 | * XTERM_SEQ: CTRL-H |
1014 | * XTERM_SEQ: CTRL-H |
1009 | */ |
1015 | */ |
1010 | void |
1016 | void |
1011 | rxvt_term::scr_backspace () NOTHROW |
1017 | rxvt_term::scr_backspace () NOTHROW |
1012 | { |
1018 | { |
1013 | want_refresh = 1; |
|
|
1014 | |
|
|
1015 | if (screen.cur.col == 0) |
1019 | if (screen.cur.col == 0) |
1016 | { |
1020 | { |
1017 | if (screen.cur.row > 0) |
1021 | if (screen.cur.row > 0) |
1018 | { |
1022 | { |
1019 | #ifdef TERMCAP_HAS_BW |
1023 | #ifdef TERMCAP_HAS_BW |
1020 | screen.cur.col = ncol - 1; |
1024 | screen.cur.col = ncol - 1; |
1021 | screen.cur.row--; |
1025 | --screen.cur.row; |
1022 | return; |
1026 | |
|
|
1027 | want_refresh = 1; |
1023 | #endif |
1028 | #endif |
1024 | } |
1029 | } |
1025 | } |
1030 | } |
1026 | else if (!(screen.flags & Screen_WrapNext)) |
1031 | else |
1027 | scr_gotorc (0, -1, RELATIVE); |
1032 | scr_gotorc (0, -1, RELATIVE); |
1028 | |
|
|
1029 | screen.flags &= ~Screen_WrapNext; |
|
|
1030 | } |
1033 | } |
1031 | |
1034 | |
1032 | /* ------------------------------------------------------------------------- */ |
1035 | /* ------------------------------------------------------------------------- */ |
1033 | /* |
1036 | /* |
1034 | * Process Horizontal Tab |
1037 | * Process Horizontal Tab |
… | |
… | |
1057 | x = i; |
1060 | x = i; |
1058 | |
1061 | |
1059 | if (!--count) |
1062 | if (!--count) |
1060 | break; |
1063 | break; |
1061 | } |
1064 | } |
1062 | else |
1065 | else |
1063 | ht &= l.t[i] == ' ' |
1066 | ht &= l.t[i] == ' ' |
1064 | && RS_SAME (l.r[i], base_rend); |
1067 | && RS_SAME (l.r[i], base_rend); |
1065 | |
1068 | |
1066 | if (count) |
1069 | if (count) |
1067 | x = ncol - 1; |
1070 | x = ncol - 1; |
1068 | |
1071 | |
1069 | // store horizontal tab commands as characters inside the text |
1072 | // store horizontal tab commands as characters inside the text |
1070 | // buffer so they can be selected and pasted. |
1073 | // buffer so they can be selected and pasted. |
1071 | if (ht && OPTION (Opt_pastableTabs)) |
1074 | if (ht && option (Opt_pastableTabs)) |
1072 | { |
1075 | { |
1073 | base_rend = SET_FONT (base_rend, 0); |
1076 | base_rend = SET_FONT (base_rend, 0); |
1074 | |
1077 | |
1075 | l.touch (x); |
1078 | l.touch (x); |
1076 | |
1079 | |
… | |
… | |
1109 | * Process DEC Back Index |
1112 | * Process DEC Back Index |
1110 | * XTERM_SEQ: ESC 6 |
1113 | * XTERM_SEQ: ESC 6 |
1111 | * Move cursor left in row. If we're at the left boundary, shift everything |
1114 | * Move cursor left in row. If we're at the left boundary, shift everything |
1112 | * in that row right. Clear left column. |
1115 | * in that row right. Clear left column. |
1113 | */ |
1116 | */ |
1114 | #if ENABLE_FRILLS |
1117 | #if !ENABLE_MINIMAL |
1115 | void |
1118 | void |
1116 | rxvt_term::scr_backindex () NOTHROW |
1119 | rxvt_term::scr_backindex () NOTHROW |
1117 | { |
1120 | { |
1118 | if (screen.cur.col > 0) |
1121 | if (screen.cur.col > 0) |
1119 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1122 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1126 | * Process DEC Forward Index |
1129 | * Process DEC Forward Index |
1127 | * XTERM_SEQ: ESC 9 |
1130 | * XTERM_SEQ: ESC 9 |
1128 | * Move cursor right in row. If we're at the right boundary, shift everything |
1131 | * Move cursor right in row. If we're at the right boundary, shift everything |
1129 | * in that row left. Clear right column. |
1132 | * in that row left. Clear right column. |
1130 | */ |
1133 | */ |
1131 | #if ENABLE_FRILLS |
1134 | #if !ENABLE_MINIMAL |
1132 | void |
1135 | void |
1133 | rxvt_term::scr_forwardindex () NOTHROW |
1136 | rxvt_term::scr_forwardindex () NOTHROW |
1134 | { |
1137 | { |
1135 | if (screen.cur.col < ncol - 1) |
1138 | if (screen.cur.col < ncol - 1) |
1136 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1139 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1183 | } |
1186 | } |
1184 | } |
1187 | } |
1185 | else |
1188 | else |
1186 | { |
1189 | { |
1187 | if (screen.flags & Screen_Relative) |
1190 | if (screen.flags & Screen_Relative) |
|
|
1191 | { |
1188 | { /* relative origin mode */ |
1192 | /* relative origin mode */ |
1189 | screen.cur.row = row + screen.tscroll; |
1193 | screen.cur.row = row + screen.tscroll; |
1190 | min_it (screen.cur.row, screen.bscroll); |
1194 | min_it (screen.cur.row, screen.bscroll); |
1191 | } |
1195 | } |
1192 | else |
1196 | else |
1193 | screen.cur.row = row; |
1197 | screen.cur.row = row; |
… | |
… | |
1226 | /* |
1230 | /* |
1227 | * Erase part or whole of a line |
1231 | * Erase part or whole of a line |
1228 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1232 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1229 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1233 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1230 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1234 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1235 | * extension: clear to right unless wrapped: ESC [ 3 K |
1231 | */ |
1236 | */ |
1232 | void |
1237 | void |
1233 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1234 | { |
1239 | { |
1235 | unsigned int col, num; |
1240 | unsigned int col, num; |
… | |
… | |
1244 | line.touch (); |
1249 | line.touch (); |
1245 | line.is_longer (0); |
1250 | line.is_longer (0); |
1246 | |
1251 | |
1247 | switch (mode) |
1252 | switch (mode) |
1248 | { |
1253 | { |
|
|
1254 | case 3: |
|
|
1255 | if (screen.flags & Screen_WrapNext) |
|
|
1256 | return; |
|
|
1257 | |
|
|
1258 | /* fall through */ |
|
|
1259 | |
1249 | case 0: /* erase to end of line */ |
1260 | case 0: /* erase to end of line */ |
1250 | col = screen.cur.col; |
1261 | col = screen.cur.col; |
1251 | num = ncol - col; |
1262 | num = ncol - col; |
1252 | min_it (line.l, col); |
1263 | min_it (line.l, col); |
|
|
1264 | |
1253 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1265 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1254 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1266 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1255 | CLEAR_SELECTION (); |
1267 | CLEAR_SELECTION (); |
1256 | break; |
1268 | break; |
|
|
1269 | |
1257 | case 1: /* erase to beginning of line */ |
1270 | case 1: /* erase to beginning of line */ |
1258 | col = 0; |
1271 | col = 0; |
1259 | num = screen.cur.col + 1; |
1272 | num = screen.cur.col + 1; |
|
|
1273 | |
1260 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1274 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1261 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1275 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1262 | CLEAR_SELECTION (); |
1276 | CLEAR_SELECTION (); |
1263 | break; |
1277 | break; |
|
|
1278 | |
1264 | case 2: /* erase whole line */ |
1279 | case 2: /* erase whole line */ |
1265 | col = 0; |
1280 | col = 0; |
1266 | num = ncol; |
1281 | num = ncol; |
1267 | line.l = 0; |
1282 | line.l = 0; |
1268 | if (selection.beg.row <= screen.cur.row |
1283 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1326 | if (row >= nrow) /* Out Of Bounds */ |
1341 | if (row >= nrow) /* Out Of Bounds */ |
1327 | return; |
1342 | return; |
1328 | |
1343 | |
1329 | min_it (num, nrow - row); |
1344 | min_it (num, nrow - row); |
1330 | |
1345 | |
1331 | if (rstyle & (RS_RVid | RS_Uline)) |
1346 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1332 | ren = (rend_t) ~RS_None; |
1347 | ren = (rend_t) ~RS_None; |
1333 | else if (GET_BASEBG (rstyle) == Color_bg) |
1348 | else if (GET_BASEBG (rstyle) == Color_bg) |
1334 | { |
1349 | { |
1335 | ren = DEFAULT_RSTYLE; |
1350 | ren = DEFAULT_RSTYLE; |
1336 | CLEAR_ROWS (row, num); |
1351 | |
|
|
1352 | if (mapped) |
|
|
1353 | XClearArea (dpy, vt, 0, |
|
|
1354 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1355 | (unsigned int)Height2Pixel (num), False); |
1337 | } |
1356 | } |
1338 | else |
1357 | else |
1339 | { |
1358 | { |
1340 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1359 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1360 | |
|
|
1361 | if (mapped) |
|
|
1362 | { |
1341 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1363 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1342 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1364 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1343 | ERASE_ROWS (row, num); |
1365 | XFillRectangle (dpy, vt, gc, |
|
|
1366 | 0, Row2Pixel (row - view_start), |
|
|
1367 | (unsigned int)width, |
|
|
1368 | (unsigned int)Height2Pixel (num)); |
1344 | gcvalue.foreground = pix_colors[Color_fg]; |
1369 | gcvalue.foreground = pix_colors[Color_fg]; |
1345 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1370 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1371 | } |
1346 | } |
1372 | } |
1347 | |
1373 | |
1348 | for (; num--; row++) |
1374 | for (; num--; row++) |
1349 | { |
1375 | { |
1350 | scr_blank_screen_mem (ROW(row), rstyle); |
1376 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1377 | |
|
|
1378 | if (row - view_start < nrow) |
1351 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1379 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1352 | } |
1380 | } |
1353 | } |
1381 | } |
1354 | |
1382 | |
1355 | #if ENABLE_FRILLS |
1383 | #if !ENABLE_MINIMAL |
1356 | void |
1384 | void |
1357 | rxvt_term::scr_erase_savelines () NOTHROW |
1385 | rxvt_term::scr_erase_savelines () NOTHROW |
1358 | { |
1386 | { |
1359 | want_refresh = 1; |
1387 | want_refresh = 1; |
1360 | ZERO_SCROLLBACK (); |
1388 | ZERO_SCROLLBACK (); |
… | |
… | |
1430 | * Insert/Delete <count> characters from the current position |
1458 | * Insert/Delete <count> characters from the current position |
1431 | */ |
1459 | */ |
1432 | void |
1460 | void |
1433 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1461 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1434 | { |
1462 | { |
1435 | int col, row; |
|
|
1436 | rend_t tr; |
|
|
1437 | |
|
|
1438 | want_refresh = 1; |
1463 | want_refresh = 1; |
1439 | ZERO_SCROLLBACK (); |
1464 | ZERO_SCROLLBACK (); |
1440 | |
1465 | |
1441 | if (count <= 0) |
1466 | if (count <= 0) |
1442 | return; |
1467 | return; |
… | |
… | |
1444 | scr_do_wrap (); |
1469 | scr_do_wrap (); |
1445 | |
1470 | |
1446 | selection_check (1); |
1471 | selection_check (1); |
1447 | min_it (count, ncol - screen.cur.col); |
1472 | min_it (count, ncol - screen.cur.col); |
1448 | |
1473 | |
1449 | row = screen.cur.row; |
1474 | int row = screen.cur.row; |
1450 | |
1475 | |
1451 | line_t *line = &ROW(row); |
1476 | line_t *line = &ROW(row); |
1452 | |
1477 | |
1453 | line->touch (); |
1478 | line->touch (); |
1454 | line->is_longer (0); |
1479 | line->is_longer (0); |
1455 | |
1480 | |
|
|
1481 | // nuke wide spanning the start |
|
|
1482 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1483 | scr_kill_char (*line, screen.cur.col); |
|
|
1484 | |
1456 | switch (insdel) |
1485 | switch (insdel) |
1457 | { |
1486 | { |
1458 | case INSERT: |
1487 | case INSERT: |
1459 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1488 | line->l = min (line->l + count, ncol); |
|
|
1489 | |
|
|
1490 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1491 | scr_kill_char (*line, screen.cur.col); |
|
|
1492 | |
|
|
1493 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1460 | { |
1494 | { |
1461 | line->t[col] = line->t[col - count]; |
1495 | line->t[col] = line->t[col - count]; |
1462 | line->r[col] = line->r[col - count]; |
1496 | line->r[col] = line->r[col - count]; |
1463 | } |
1497 | } |
1464 | |
|
|
1465 | line->l = min (line->l + count, ncol); |
|
|
1466 | |
1498 | |
1467 | if (selection.op && current_screen == selection.screen |
1499 | if (selection.op && current_screen == selection.screen |
1468 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1500 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1469 | { |
1501 | { |
1470 | if (selection.end.row != screen.cur.row |
1502 | if (selection.end.row != screen.cur.row |
1471 | || (selection.end.col + count >= ncol)) |
1503 | || (selection.end.col + count >= ncol)) |
1472 | CLEAR_SELECTION (); |
1504 | CLEAR_SELECTION (); |
1473 | else |
1505 | else |
|
|
1506 | { |
1474 | { /* shift selection */ |
1507 | /* shift selection */ |
1475 | selection.beg.col += count; |
1508 | selection.beg.col += count; |
1476 | selection.mark.col += count; /* XXX: yes? */ |
1509 | selection.mark.col += count; /* XXX: yes? */ |
1477 | selection.end.col += count; |
1510 | selection.end.col += count; |
1478 | } |
1511 | } |
1479 | } |
1512 | } |
… | |
… | |
1484 | case ERASE: |
1517 | case ERASE: |
1485 | screen.cur.col += count; /* don't worry if > ncol */ |
1518 | screen.cur.col += count; /* don't worry if > ncol */ |
1486 | selection_check (1); |
1519 | selection_check (1); |
1487 | screen.cur.col -= count; |
1520 | screen.cur.col -= count; |
1488 | |
1521 | |
1489 | line->l = max (line->l - count, 0); |
1522 | // nuke wide char after the end |
|
|
1523 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1524 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1525 | |
1490 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1526 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1491 | break; |
1527 | break; |
1492 | |
1528 | |
1493 | case DELETE: |
1529 | case DELETE: |
1494 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1530 | line->l = max (line->l - count, 0); |
1495 | |
1531 | |
|
|
1532 | // nuke wide char spanning the end |
|
|
1533 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1534 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1535 | |
1496 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1536 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1497 | { |
1537 | { |
1498 | line->t[col] = line->t[col + count]; |
1538 | line->t[col] = line->t[col + count]; |
1499 | line->r[col] = line->r[col + count]; |
1539 | line->r[col] = line->r[col + count]; |
1500 | } |
1540 | } |
1501 | |
1541 | |
1502 | line->l = max (line->l - count, 0); |
|
|
1503 | scr_blank_line (*line, ncol - count, count, tr); |
1542 | scr_blank_line (*line, ncol - count, count, rstyle); |
1504 | |
1543 | |
1505 | if (selection.op && current_screen == selection.screen |
1544 | if (selection.op && current_screen == selection.screen |
1506 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1507 | { |
1546 | { |
1508 | if (selection.end.row != screen.cur.row |
1547 | if (selection.end.row != screen.cur.row |
… | |
… | |
1618 | */ |
1657 | */ |
1619 | void |
1658 | void |
1620 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1659 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1621 | { |
1660 | { |
1622 | if (mode < 0) |
1661 | if (mode < 0) |
1623 | memset (tabs, 0, ncol * sizeof (char)); |
1662 | memset (tabs, 0, ncol); |
1624 | else if (screen.cur.col < ncol) |
1663 | else if (screen.cur.col < ncol) |
1625 | tabs [screen.cur.col] = !!mode; |
1664 | tabs [screen.cur.col] = !!mode; |
1626 | } |
1665 | } |
1627 | |
1666 | |
1628 | /* ------------------------------------------------------------------------- */ |
1667 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1643 | if (rvideo_state != on) |
1682 | if (rvideo_state != on) |
1644 | { |
1683 | { |
1645 | rvideo_state = on; |
1684 | rvideo_state = on; |
1646 | |
1685 | |
1647 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1686 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1648 | #if XPM_BACKGROUND |
1687 | #ifdef HAVE_BG_PIXMAP |
1649 | if (bgPixmap.pixmap == None) |
1688 | if (bgPixmap.pixmap == None) |
1650 | #endif |
1689 | #endif |
1651 | #if TRANSPARENT |
|
|
1652 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1653 | #endif |
|
|
1654 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1690 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1655 | |
1691 | |
1656 | XGCValues gcvalue; |
1692 | XGCValues gcvalue; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1693 | gcvalue.foreground = pix_colors[Color_fg]; |
1658 | gcvalue.background = pix_colors[Color_bg]; |
1694 | gcvalue.background = pix_colors[Color_bg]; |
1659 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1695 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1660 | |
1696 | |
1661 | scr_clear (); |
1697 | scr_clear (); |
1662 | scr_touch (true); |
1698 | scr_touch (true); |
1663 | } |
1699 | } |
1664 | } |
1700 | } |
… | |
… | |
1749 | { |
1785 | { |
1750 | bool found = false; |
1786 | bool found = false; |
1751 | |
1787 | |
1752 | for (int i = 0; i < nrow; i++) |
1788 | for (int i = 0; i < nrow; i++) |
1753 | { |
1789 | { |
1754 | int col = 0; |
|
|
1755 | rend_t *drp = drawn_buf[i].r; |
1790 | rend_t *drp = drawn_buf[i].r; |
1756 | |
1791 | |
1757 | for (; col < ncol; col++, drp++) |
1792 | for (int col = 0; col < ncol; col++, drp++) |
1758 | if ((*drp & mask) == value) |
1793 | if ((*drp & mask) == value) |
1759 | { |
1794 | { |
1760 | found = true; |
1795 | found = true; |
1761 | *drp = ~value; |
1796 | *drp = ~value; |
1762 | } |
1797 | } |
… | |
… | |
1867 | return true; |
1902 | return true; |
1868 | } |
1903 | } |
1869 | |
1904 | |
1870 | #ifndef NO_BELL |
1905 | #ifndef NO_BELL |
1871 | void |
1906 | void |
1872 | rxvt_term::bell_cb (time_watcher &w) |
1907 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1873 | { |
1908 | { |
1874 | rvideo_bell = false; |
1909 | rvideo_bell = false; |
1875 | scr_rvideo_mode (rvideo_mode); |
1910 | scr_rvideo_mode (rvideo_mode); |
|
|
1911 | refresh_check (); |
1876 | } |
1912 | } |
1877 | #endif |
1913 | #endif |
1878 | |
1914 | |
1879 | /* ------------------------------------------------------------------------- */ |
1915 | /* ------------------------------------------------------------------------- */ |
1880 | void |
1916 | void |
… | |
… | |
1882 | { |
1918 | { |
1883 | #ifndef NO_BELL |
1919 | #ifndef NO_BELL |
1884 | |
1920 | |
1885 | # ifndef NO_MAPALERT |
1921 | # ifndef NO_MAPALERT |
1886 | # ifdef MAPALERT_OPTION |
1922 | # ifdef MAPALERT_OPTION |
1887 | if (OPTION (Opt_mapAlert)) |
1923 | if (option (Opt_mapAlert)) |
1888 | # endif |
1924 | # endif |
1889 | XMapWindow (display->display, parent[0]); |
1925 | XMapWindow (dpy, parent[0]); |
1890 | # endif |
1926 | # endif |
1891 | |
1927 | |
|
|
1928 | # if ENABLE_FRILLS |
|
|
1929 | if (option (Opt_urgentOnBell)) |
|
|
1930 | set_urgency (1); |
|
|
1931 | # endif |
|
|
1932 | |
1892 | if (OPTION (Opt_visualBell)) |
1933 | if (option (Opt_visualBell)) |
1893 | { |
1934 | { |
1894 | rvideo_bell = true; |
1935 | rvideo_bell = true; |
1895 | scr_rvideo_mode (rvideo_mode); |
1936 | scr_rvideo_mode (rvideo_mode); |
1896 | display->flush (); |
1937 | flush (); |
1897 | |
1938 | |
1898 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1939 | bell_ev.start (VISUAL_BELL_DURATION); |
1899 | } |
1940 | } |
1900 | else |
1941 | else |
1901 | XBell (display->display, 0); |
1942 | XBell (dpy, 0); |
1902 | |
1943 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1903 | #endif |
1944 | #endif |
1904 | } |
1945 | } |
1905 | |
1946 | |
1906 | /* ------------------------------------------------------------------------- */ |
1947 | /* ------------------------------------------------------------------------- */ |
1907 | /* ARGSUSED */ |
1948 | /* ARGSUSED */ |
1908 | void |
1949 | void |
1909 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1950 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1910 | { |
1951 | { |
1911 | #ifdef PRINTPIPE |
1952 | #ifdef PRINTPIPE |
1912 | int nrows, row_start; |
1953 | int nrows, row_start; |
1913 | FILE *fd; |
1954 | FILE *fd = popen_printer (); |
1914 | |
1955 | |
1915 | if ((fd = popen_printer ()) == NULL) |
1956 | if (!fd) |
1916 | return; |
1957 | return; |
1917 | |
1958 | |
1918 | if (fullhist) |
1959 | if (fullhist) |
1919 | { |
1960 | { |
1920 | nrows = nrow - top_row; |
1961 | nrows = nrow - top_row; |
… | |
… | |
1926 | row_start = view_start; |
1967 | row_start = view_start; |
1927 | } |
1968 | } |
1928 | |
1969 | |
1929 | wctomb (0, 0); |
1970 | wctomb (0, 0); |
1930 | |
1971 | |
1931 | for (int r1 = 0; r1 < nrows; r1++) |
1972 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1932 | { |
1973 | { |
1933 | text_t *tp = ROW(r1).t; |
1974 | text_t *tp = ROW(r1).t; |
1934 | int len = ROW(r1).l; |
1975 | int len = ROW(r1).l; |
1935 | |
1976 | |
1936 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1977 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1965 | * screen.text/screen.rend contain what the screen will change to. |
2006 | * screen.text/screen.rend contain what the screen will change to. |
1966 | */ |
2007 | */ |
1967 | void |
2008 | void |
1968 | rxvt_term::scr_refresh () NOTHROW |
2009 | rxvt_term::scr_refresh () NOTHROW |
1969 | { |
2010 | { |
1970 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
|
|
1971 | showcursor; /* show the cursor */ |
|
|
1972 | int16_t col, row, /* column/row we're processing */ |
2011 | int16_t col, row, /* column/row we're processing */ |
1973 | ocrow; /* old cursor row */ |
2012 | ocrow; /* old cursor row */ |
1974 | int i; /* tmp */ |
2013 | int i; /* tmp */ |
1975 | #ifndef NO_CURSORCOLOR |
2014 | #ifndef NO_CURSORCOLOR |
1976 | rend_t cc1; /* store colours at cursor position (s) */ |
2015 | rend_t cc1; /* store colours at cursor position (s) */ |
1977 | #endif |
2016 | #endif |
1978 | rend_t *crp; // cursor rendition pointer |
2017 | rend_t *crp; // cursor rendition pointer |
|
|
2018 | rend_t ccol1, /* Cursor colour */ |
|
|
2019 | ccol2; /* Cursor colour2 */ |
1979 | |
2020 | |
1980 | want_refresh = 0; /* screen is current */ |
2021 | want_refresh = 0; /* screen is current */ |
1981 | |
2022 | |
1982 | if (refresh_type == NO_REFRESH || !mapped) |
2023 | if (refresh_type == NO_REFRESH || !mapped) |
1983 | return; |
2024 | return; |
1984 | |
2025 | |
1985 | /* |
2026 | /* |
1986 | * A: set up vars |
2027 | * A: set up vars |
1987 | */ |
2028 | */ |
1988 | must_clear = 0; |
|
|
1989 | refresh_count = 0; |
2029 | refresh_count = 0; |
1990 | |
2030 | |
1991 | #if XPM_BACKGROUND |
2031 | unsigned int old_screen_flags = screen.flags; |
|
|
2032 | char have_bg = 0; |
|
|
2033 | #ifdef HAVE_BG_PIXMAP |
1992 | must_clear |= bgPixmap.pixmap != None; |
2034 | have_bg = bgPixmap.pixmap != None; |
1993 | #endif |
|
|
1994 | #if TRANSPARENT |
|
|
1995 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
1996 | #endif |
2035 | #endif |
1997 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1998 | |
2037 | |
1999 | /* |
2038 | /* |
2000 | * B: reverse any characters which are selected |
2039 | * B: reverse any characters which are selected |
2001 | */ |
2040 | */ |
2002 | scr_reverse_selection (); |
2041 | scr_reverse_selection (); |
|
|
2042 | |
|
|
2043 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2044 | #if ENABLE_OVERLAY |
|
|
2045 | scr_swap_overlay (); |
|
|
2046 | #endif |
|
|
2047 | |
|
|
2048 | char showcursor = screen.flags & Screen_VisibleCursor; |
2003 | |
2049 | |
2004 | /* |
2050 | /* |
2005 | * C: set the cursor character (s) |
2051 | * C: set the cursor character (s) |
2006 | */ |
2052 | */ |
2007 | { |
2053 | { |
2008 | unsigned char setoldcursor; |
2054 | unsigned char setoldcursor; |
2009 | rend_t ccol1, /* Cursor colour */ |
|
|
2010 | ccol2; /* Cursor colour2 */ |
|
|
2011 | |
2055 | |
2012 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2013 | #ifdef CURSOR_BLINK |
2056 | #ifdef CURSOR_BLINK |
2014 | if (hidden_cursor) |
2057 | if (hidden_cursor) |
2015 | showcursor = 0; |
2058 | showcursor = 0; |
2016 | #endif |
2059 | #endif |
2017 | |
2060 | |
… | |
… | |
2022 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2065 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2023 | col--; |
2066 | col--; |
2024 | |
2067 | |
2025 | crp = &ROW(screen.cur.row).r[col]; |
2068 | crp = &ROW(screen.cur.row).r[col]; |
2026 | |
2069 | |
2027 | if (showcursor && focus) |
2070 | #ifndef NO_CURSORCOLOR |
|
|
2071 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2072 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2073 | ccol1 = Color_cursor; |
|
|
2074 | else |
|
|
2075 | #endif |
|
|
2076 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2077 | ccol1 = fgcolor_of (rstyle); |
|
|
2078 | #else |
|
|
2079 | ccol1 = Color_fg; |
|
|
2080 | #endif |
|
|
2081 | |
|
|
2082 | #ifndef NO_CURSORCOLOR |
|
|
2083 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2084 | ccol2 = Color_cursor2; |
|
|
2085 | else |
|
|
2086 | #endif |
|
|
2087 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2088 | ccol2 = bgcolor_of (rstyle); |
|
|
2089 | #else |
|
|
2090 | ccol2 = Color_bg; |
|
|
2091 | #endif |
|
|
2092 | |
|
|
2093 | if (focus) |
2028 | { |
2094 | { |
2029 | if (OPTION (Opt_cursorUnderline)) |
2095 | if (option (Opt_cursorUnderline)) |
2030 | *crp ^= RS_Uline; |
2096 | *crp ^= RS_Uline; |
2031 | else |
2097 | else |
2032 | { |
2098 | { |
2033 | *crp ^= RS_RVid; |
2099 | *crp ^= RS_RVid; |
2034 | |
|
|
2035 | #ifndef NO_CURSORCOLOR |
|
|
2036 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2037 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2038 | ccol1 = Color_cursor; |
|
|
2039 | else |
|
|
2040 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2041 | ccol1 = fgcolor_of (rstyle); |
|
|
2042 | #else |
|
|
2043 | ccol1 = Color_fg; |
|
|
2044 | #endif |
|
|
2045 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2046 | ccol2 = Color_cursor2; |
|
|
2047 | else |
|
|
2048 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2049 | ccol2 = bgcolor_of (rstyle); |
|
|
2050 | #else |
|
|
2051 | ccol2 = Color_bg; |
|
|
2052 | #endif |
|
|
2053 | *crp = SET_FGCOLOR (*crp, ccol1); |
2100 | *crp = SET_FGCOLOR (*crp, ccol1); |
2054 | *crp = SET_BGCOLOR (*crp, ccol2); |
2101 | *crp = SET_BGCOLOR (*crp, ccol2); |
2055 | #endif |
|
|
2056 | } |
2102 | } |
2057 | } |
2103 | } |
2058 | } |
2104 | } |
2059 | |
2105 | |
2060 | /* make sure no outline cursor is left around */ |
2106 | /* make sure no outline cursor is left around */ |
… | |
… | |
2087 | oldcursor.col = screen.cur.col; |
2133 | oldcursor.col = screen.cur.col; |
2088 | } |
2134 | } |
2089 | } |
2135 | } |
2090 | } |
2136 | } |
2091 | |
2137 | |
2092 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2093 | #if ENABLE_OVERLAY |
|
|
2094 | scr_swap_overlay (); |
|
|
2095 | #endif |
|
|
2096 | |
|
|
2097 | #ifndef NO_SLOW_LINK_SUPPORT |
2138 | #ifndef NO_SLOW_LINK_SUPPORT |
2098 | /* |
2139 | /* |
2099 | * D: CopyArea pass - very useful for slower links |
2140 | * D: CopyArea pass - very useful for slower links |
2100 | * This has been deliberately kept simple. |
2141 | * This has been deliberately kept simple. |
2101 | */ |
2142 | */ |
2102 | if (!display->is_local |
2143 | if (!display->is_local |
2103 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2144 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2104 | && abs (num_scr) < nrow && !must_clear) |
2145 | && abs (num_scr) < nrow && !have_bg) |
2105 | { |
2146 | { |
2106 | int16_t nits; |
2147 | int16_t nits; |
|
|
2148 | int i = num_scr; |
2107 | int j; |
2149 | int j; |
2108 | int len, wlen; |
2150 | int len, wlen; |
2109 | dLocal (int, num_scr); |
2151 | dLocal (int, num_scr); |
2110 | |
2152 | |
2111 | j = nrow; |
2153 | j = nrow; |
2112 | wlen = len = -1; |
2154 | wlen = len = -1; |
2113 | row = i > 0 ? 0 : j - 1; |
2155 | row = i > 0 ? 0 : j - 1; |
|
|
2156 | |
2114 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2157 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2115 | { |
2158 | { |
2116 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2159 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2117 | { |
2160 | { |
2118 | line_t s = ROW(view_start + row); |
2161 | line_t s = ROW(view_start + row); |
… | |
… | |
2139 | wlen = row; |
2182 | wlen = row; |
2140 | continue; |
2183 | continue; |
2141 | } |
2184 | } |
2142 | } |
2185 | } |
2143 | |
2186 | |
2144 | if (len != -1) |
2187 | if (len >= 0) |
2145 | { |
2188 | { |
2146 | /* also comes here at end if needed because of >= above */ |
2189 | /* also comes here at end if needed because of >= above */ |
2147 | if (wlen < len) |
2190 | if (wlen < len) |
2148 | ::swap (wlen, len); |
2191 | ::swap (wlen, len); |
2149 | |
2192 | |
|
|
2193 | XGCValues gcv; |
|
|
2194 | |
|
|
2195 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2150 | XCopyArea (display->display, vt, vt, |
2196 | XCopyArea (dpy, vt, vt, |
2151 | gc, 0, Row2Pixel (len + i), |
2197 | gc, 0, Row2Pixel (len + i), |
2152 | (unsigned int)this->width, |
2198 | (unsigned int)this->width, |
2153 | (unsigned int)Height2Pixel (wlen - len + 1), |
2199 | (unsigned int)Height2Pixel (wlen - len + 1), |
2154 | 0, Row2Pixel (len)); |
2200 | 0, Row2Pixel (len)); |
|
|
2201 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2202 | |
2155 | len = -1; |
2203 | len = -1; |
2156 | } |
2204 | } |
2157 | } |
2205 | } |
2158 | } |
2206 | } |
2159 | #endif |
2207 | #endif |
… | |
… | |
2183 | continue; |
2231 | continue; |
2184 | |
2232 | |
2185 | // redraw one or more characters |
2233 | // redraw one or more characters |
2186 | |
2234 | |
2187 | // seek to the beginning of wide characters |
2235 | // seek to the beginning of wide characters |
2188 | while (stp[col] == NOCHAR && col > 0) |
2236 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2189 | --col; |
2237 | --col; |
2190 | |
2238 | |
2191 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2239 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2192 | text_t *text = stp + col; |
2240 | text_t *text = stp + col; |
2193 | int count = 1; |
2241 | int count = 1; |
2194 | |
2242 | |
2195 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2196 | drp[col] = rend; |
2244 | drp[col] = rend; |
… | |
… | |
2200 | for (i = 0; ++col < ncol; ) |
2248 | for (i = 0; ++col < ncol; ) |
2201 | { |
2249 | { |
2202 | if (stp[col] == NOCHAR) |
2250 | if (stp[col] == NOCHAR) |
2203 | { |
2251 | { |
2204 | dtp[col] = stp[col]; |
2252 | dtp[col] = stp[col]; |
2205 | drp[col] = rend; |
2253 | drp[col] = srp[col]; |
|
|
2254 | |
2206 | count++; |
2255 | count++; |
2207 | i++; |
2256 | i++; |
2208 | |
2257 | |
2209 | continue; |
2258 | continue; |
2210 | } |
2259 | } |
… | |
… | |
2215 | count++; |
2264 | count++; |
2216 | |
2265 | |
2217 | if (stp[col] != dtp[col] |
2266 | if (stp[col] != dtp[col] |
2218 | || !RS_SAME (srp[col], drp[col])) |
2267 | || !RS_SAME (srp[col], drp[col])) |
2219 | { |
2268 | { |
2220 | if (must_clear && (i++ > count / 2)) |
2269 | if (have_bg && (i++ > count / 2)) |
2221 | break; |
2270 | break; |
2222 | |
2271 | |
2223 | dtp[col] = stp[col]; |
2272 | dtp[col] = stp[col]; |
2224 | drp[col] = rend; |
2273 | drp[col] = rend; |
2225 | i = 0; |
2274 | i = 0; |
2226 | } |
2275 | } |
2227 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2276 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2228 | break; |
2277 | break; |
2229 | } |
2278 | } |
2230 | |
2279 | |
2231 | col--; /* went one too far. move back */ |
2280 | col--; /* went one too far. move back */ |
2232 | count -= i; /* dump any matching trailing chars */ |
2281 | count -= i; /* dump any matching trailing chars */ |
2233 | |
2282 | |
2234 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2283 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2235 | while (i && text[count] == NOCHAR) |
2284 | while (expect_false (i && text[count] == NOCHAR)) |
2236 | count++, i--; |
2285 | count++, i--; |
2237 | |
2286 | |
2238 | /* |
2287 | /* |
2239 | * Determine the attributes for the string |
2288 | * Determine the attributes for the string |
2240 | */ |
2289 | */ |
2241 | int fore = fgcolor_of (rend); // desired foreground |
2290 | int fore = fgcolor_of (rend); // desired foreground |
2242 | int back = bgcolor_of (rend); // desired background |
2291 | int back = bgcolor_of (rend); // desired background |
2243 | |
2292 | |
2244 | // only do special processing if any attributes are set, which is unlikely |
2293 | // only do special processing if any attributes are set, which is unlikely |
2245 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2294 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2246 | { |
2295 | { |
2247 | #if ENABLE_STYLES |
|
|
2248 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2249 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2250 | drp[col + 1] = ~srp[col + 1]; |
|
|
2251 | |
|
|
2252 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2253 | while (text > stp |
|
|
2254 | && srp[text - stp - 1] & RS_Careful |
|
|
2255 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2256 | text--, count++, xpixel -= fwidth; |
|
|
2257 | #endif |
|
|
2258 | |
|
|
2259 | bool invert = rend & RS_RVid; |
2296 | bool invert = rend & RS_RVid; |
2260 | |
2297 | |
2261 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2298 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2262 | if (rend & RS_Bold |
|
|
2263 | && fore == Color_fg) |
2299 | if (rend & RS_Bold && fore == Color_fg) |
2264 | { |
2300 | { |
2265 | if (ISSET_PIXCOLOR (Color_BD)) |
2301 | if (ISSET_PIXCOLOR (Color_BD)) |
2266 | fore = Color_BD; |
2302 | fore = Color_BD; |
2267 | # if !ENABLE_STYLES |
2303 | # if !ENABLE_STYLES |
2268 | else |
2304 | else |
2269 | invert = !invert; |
2305 | invert = !invert; |
2270 | # endif |
2306 | # endif |
2271 | } |
2307 | } |
2272 | |
2308 | |
2273 | if (rend & RS_Italic |
2309 | if (rend & RS_Italic && fore == Color_fg) |
2274 | && fore == Color_fg) |
|
|
2275 | { |
2310 | { |
2276 | if (ISSET_PIXCOLOR (Color_IT)) |
2311 | if (ISSET_PIXCOLOR (Color_IT)) |
2277 | fore = Color_IT; |
2312 | fore = Color_IT; |
2278 | # if !ENABLE_STYLES |
2313 | # if !ENABLE_STYLES |
2279 | else |
2314 | else |
2280 | invert = !invert; |
2315 | invert = !invert; |
2281 | # endif |
2316 | # endif |
2282 | } |
2317 | } |
2283 | |
2318 | |
2284 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2319 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2285 | fore = Color_UL; |
2320 | fore = Color_UL; |
|
|
2321 | #endif |
|
|
2322 | |
|
|
2323 | #ifdef OPTION_HC |
|
|
2324 | if (rend & RS_Sel) |
|
|
2325 | { |
|
|
2326 | /* invert the column if no highlightColor is set or it is the |
|
|
2327 | * current cursor column */ |
|
|
2328 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2329 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2330 | { |
|
|
2331 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2332 | fore = Color_HTC; |
|
|
2333 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2334 | else if (!invert) |
|
|
2335 | fore = back; |
|
|
2336 | |
|
|
2337 | back = Color_HC; |
|
|
2338 | invert = 0; |
|
|
2339 | } |
|
|
2340 | } |
2286 | #endif |
2341 | #endif |
2287 | |
2342 | |
2288 | if (invert) |
2343 | if (invert) |
2289 | { |
2344 | { |
2290 | ::swap (fore, back); |
2345 | ::swap (fore, back); |
2291 | |
2346 | |
2292 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2347 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2293 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2294 | back = Color_RV; |
|
|
2295 | |
|
|
2296 | if (fore == back) |
2348 | if (fore == back) |
2297 | { |
2349 | { |
2298 | fore = Color_bg; |
2350 | fore = Color_bg; |
2299 | back = Color_fg; |
2351 | back = Color_fg; |
2300 | } |
2352 | } |
… | |
… | |
2302 | } |
2354 | } |
2303 | |
2355 | |
2304 | #ifdef TEXT_BLINK |
2356 | #ifdef TEXT_BLINK |
2305 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2357 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2306 | { |
2358 | { |
2307 | if (!text_blink_ev.active) |
2359 | if (!text_blink_ev.is_active ()) |
2308 | { |
2360 | { |
2309 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2361 | text_blink_ev.again (); |
2310 | hidden_text = 0; |
2362 | hidden_text = 0; |
2311 | } |
2363 | } |
2312 | else if (hidden_text) |
2364 | else if (hidden_text) |
2313 | fore = back; |
2365 | fore = back; |
2314 | } |
2366 | } |
2315 | #endif |
2367 | #endif |
|
|
2368 | |
|
|
2369 | #if ENABLE_STYLES |
|
|
2370 | // "careful" (too wide) character handling |
|
|
2371 | |
|
|
2372 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2373 | while (text > stp |
|
|
2374 | && srp[text - stp - 1] & RS_Careful |
|
|
2375 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2376 | text--, count++, xpixel -= fwidth; |
|
|
2377 | |
|
|
2378 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2379 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2380 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2381 | |
|
|
2382 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2383 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2384 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2385 | #endif |
2316 | } |
2386 | } |
2317 | |
2387 | |
2318 | /* |
2388 | /* |
2319 | * Actually do the drawing of the string here |
2389 | * Actually do the drawing of the string here |
2320 | */ |
2390 | */ |
2321 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2391 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2322 | |
2392 | |
2323 | if (back == fore) |
2393 | if (expect_true (have_bg && back == Color_bg)) |
2324 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2325 | fwidth * count, fheight, |
|
|
2326 | back); |
|
|
2327 | else if (back == Color_bg) |
|
|
2328 | { |
2394 | { |
2329 | if (must_clear) |
2395 | // this is very ugly, maybe push it into ->draw? |
2330 | { |
|
|
2331 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2332 | |
2396 | |
2333 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2397 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2334 | if (text[i] != ' ') |
2398 | if (text[i] != ' ') |
2335 | { |
2399 | { |
2336 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2400 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2337 | break; |
2401 | goto did_clear; |
2338 | } |
|
|
2339 | } |
2402 | } |
2340 | else |
2403 | |
2341 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2404 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2405 | did_clear: ; |
2342 | } |
2406 | } |
2343 | else |
2407 | else |
2344 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2408 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2345 | |
2409 | |
2346 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2410 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2347 | { |
2411 | { |
2348 | #if ENABLE_FRILLS |
2412 | #if ENABLE_FRILLS |
2349 | if (ISSET_PIXCOLOR (Color_underline)) |
2413 | if (ISSET_PIXCOLOR (Color_underline)) |
2350 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2414 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2351 | else |
2415 | else |
2352 | #endif |
2416 | #endif |
2353 | XSetForeground (display->display, gc, pix_colors[fore]); |
2417 | XSetForeground (dpy, gc, pix_colors[fore]); |
2354 | |
2418 | |
2355 | XDrawLine (display->display, drawBuffer, gc, |
2419 | XDrawLine (dpy, vt, gc, |
2356 | xpixel, ypixel + font->ascent + 1, |
2420 | xpixel, ypixel + font->ascent + 1, |
2357 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2421 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2358 | } |
2422 | } |
2359 | } /* for (col....) */ |
2423 | } /* for (col....) */ |
2360 | } /* for (row....) */ |
2424 | } /* for (row....) */ |
2361 | |
2425 | |
2362 | #if ENABLE_OVERLAY |
|
|
2363 | scr_swap_overlay (); |
|
|
2364 | #endif |
|
|
2365 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2366 | |
|
|
2367 | /* |
2426 | /* |
2368 | * G: cleanup cursor and display outline cursor if necessary |
2427 | * G: cleanup cursor and display outline cursor if necessary |
2369 | */ |
2428 | */ |
2370 | if (showcursor) |
2429 | if (showcursor) |
2371 | { |
2430 | { |
2372 | if (focus) |
2431 | if (focus) |
2373 | { |
2432 | { |
2374 | if (OPTION (Opt_cursorUnderline)) |
2433 | if (option (Opt_cursorUnderline)) |
2375 | *crp ^= RS_Uline; |
2434 | *crp ^= RS_Uline; |
2376 | else |
2435 | else |
2377 | { |
2436 | { |
2378 | *crp ^= RS_RVid; |
2437 | *crp ^= RS_RVid; |
2379 | #ifndef NO_CURSORCOLOR |
2438 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2393 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2452 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2394 | cursorwidth++; |
2453 | cursorwidth++; |
2395 | |
2454 | |
2396 | #ifndef NO_CURSORCOLOR |
2455 | #ifndef NO_CURSORCOLOR |
2397 | if (ISSET_PIXCOLOR (Color_cursor)) |
2456 | if (ISSET_PIXCOLOR (Color_cursor)) |
2398 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2457 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2458 | else |
2399 | #endif |
2459 | #endif |
|
|
2460 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2400 | |
2461 | |
2401 | XDrawRectangle (display->display, drawBuffer, gc, |
2462 | XDrawRectangle (dpy, vt, gc, |
2402 | Col2Pixel (col), |
2463 | Col2Pixel (col), |
2403 | Row2Pixel (oldcursor.row), |
2464 | Row2Pixel (oldcursor.row), |
2404 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2465 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2405 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2466 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2406 | } |
2467 | } |
2407 | } |
2468 | } |
2408 | |
2469 | |
2409 | /* |
2470 | /* |
2410 | * H: cleanup selection |
2471 | * H: cleanup selection |
2411 | */ |
2472 | */ |
|
|
2473 | #if ENABLE_OVERLAY |
|
|
2474 | scr_swap_overlay (); |
|
|
2475 | #endif |
|
|
2476 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2477 | |
2412 | scr_reverse_selection (); |
2478 | scr_reverse_selection (); |
2413 | |
2479 | |
|
|
2480 | screen.flags = old_screen_flags; |
2414 | num_scr = 0; |
2481 | num_scr = 0; |
2415 | num_scr_allow = 1; |
2482 | num_scr_allow = 1; |
2416 | } |
2483 | } |
2417 | |
2484 | |
2418 | void |
2485 | void |
… | |
… | |
2441 | } |
2508 | } |
2442 | |
2509 | |
2443 | void |
2510 | void |
2444 | rxvt_term::scr_recolour () NOTHROW |
2511 | rxvt_term::scr_recolour () NOTHROW |
2445 | { |
2512 | { |
2446 | if (1 |
2513 | #ifdef HAVE_BG_PIXMAP |
2447 | #if TRANSPARENT |
2514 | bgPixmap.apply (); |
2448 | && !am_transparent |
2515 | #else |
2449 | #endif |
2516 | |
2450 | #if XPM_BACKGROUND |
|
|
2451 | && !bgPixmap.pixmap |
|
|
2452 | #endif |
|
|
2453 | ) |
|
|
2454 | { |
|
|
2455 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2517 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2456 | XClearWindow (display->display, parent[0]); |
2518 | XClearWindow (dpy, parent[0]); |
2457 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2519 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2458 | #if HAVE_SCROLLBARS |
2520 | |
2459 | if (scrollBar.win) |
2521 | if (scrollBar.win) |
2460 | { |
2522 | { |
2461 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2523 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2462 | scrollBar.setIdle (); |
2524 | scrollBar.state = STATE_IDLE; |
2463 | scrollbar_show (0); |
2525 | scrollBar.show (0); |
2464 | } |
|
|
2465 | #endif |
|
|
2466 | } |
2526 | } |
2467 | |
2527 | |
|
|
2528 | #endif |
|
|
2529 | |
|
|
2530 | /* bgPixmap.apply () does not do the following : */ |
2468 | scr_clear (); |
2531 | scr_clear (); |
2469 | scr_touch (true); |
2532 | scr_touch (true); |
2470 | want_refresh = 1; |
2533 | want_refresh = 1; |
2471 | } |
2534 | } |
2472 | |
2535 | |
… | |
… | |
2479 | |
2542 | |
2480 | num_scr_allow = 0; |
2543 | num_scr_allow = 0; |
2481 | want_refresh = 1; |
2544 | want_refresh = 1; |
2482 | |
2545 | |
2483 | if (really) |
2546 | if (really) |
2484 | XClearWindow (display->display, vt); |
2547 | XClearWindow (dpy, vt); |
2485 | } |
2548 | } |
2486 | |
2549 | |
2487 | void |
2550 | void |
2488 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2551 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2489 | { |
2552 | { |
… | |
… | |
2538 | { |
2601 | { |
2539 | if (selection.op |
2602 | if (selection.op |
2540 | && current_screen == selection.screen |
2603 | && current_screen == selection.screen |
2541 | && selection.end.row >= view_start) |
2604 | && selection.end.row >= view_start) |
2542 | { |
2605 | { |
2543 | #if ENABLE_FRILLS |
2606 | #if !ENABLE_MINIMAL |
2544 | if (selection.rect) |
2607 | if (selection.rect) |
2545 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2608 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2546 | selection.end.row, selection.end.col, |
2609 | selection.end.row, selection.end.col, |
2547 | RS_RVid, RS_RVid | RS_Uline); |
2610 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2548 | else |
2611 | else |
2549 | #endif |
2612 | #endif |
2550 | scr_xor_span (selection.beg.row, selection.beg.col, |
2613 | scr_xor_span (selection.beg.row, selection.beg.col, |
2551 | selection.end.row, selection.end.col, |
2614 | selection.end.row, selection.end.col, |
2552 | RS_RVid); |
2615 | RS_Sel | RS_RVid); |
2553 | } |
2616 | } |
2554 | } |
2617 | } |
2555 | |
2618 | |
2556 | /* ------------------------------------------------------------------------- */ |
2619 | /* ------------------------------------------------------------------------- */ |
2557 | /* |
2620 | /* |
… | |
… | |
2564 | { |
2627 | { |
2565 | int row, wrote; |
2628 | int row, wrote; |
2566 | unsigned int width, towrite; |
2629 | unsigned int width, towrite; |
2567 | char r1[] = "\n"; |
2630 | char r1[] = "\n"; |
2568 | |
2631 | |
2569 | for (row = saveLines - nsaved; |
2632 | for (row = saveLines + top_row; |
2570 | row < saveLines + nrow - 1; row++) |
2633 | row < saveLines + nrow - 1; row++) |
2571 | { |
2634 | { |
2572 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2635 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2573 | : ncol; |
2636 | : ncol; |
2574 | for (towrite = width; towrite; towrite -= wrote) |
2637 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2618 | /* ------------------------------------------------------------------------- */ |
2681 | /* ------------------------------------------------------------------------- */ |
2619 | /* |
2682 | /* |
2620 | * Paste a selection direct to the command fd |
2683 | * Paste a selection direct to the command fd |
2621 | */ |
2684 | */ |
2622 | void |
2685 | void |
2623 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2686 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2624 | { |
2687 | { |
2625 | /* convert normal newline chars into common keyboard Return key sequence */ |
2688 | /* convert normal newline chars into common keyboard Return key sequence */ |
2626 | for (unsigned int i = 0; i < len; i++) |
2689 | for (unsigned int i = 0; i < len; i++) |
2627 | if (data[i] == C0_LF) |
2690 | if (data[i] == C0_LF) |
2628 | data[i] = C0_CR; |
2691 | data[i] = C0_CR; |
2629 | |
2692 | |
|
|
2693 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2694 | tt_printf ("\e[200~"); |
|
|
2695 | |
2630 | tt_write (data, len); |
2696 | tt_write (data, len); |
|
|
2697 | |
|
|
2698 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2699 | tt_printf ("\e[201~"); |
|
|
2700 | } |
|
|
2701 | |
|
|
2702 | void |
|
|
2703 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
|
|
2704 | { |
|
|
2705 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
|
|
2706 | return; |
|
|
2707 | |
|
|
2708 | tt_paste (data, len); |
2631 | } |
2709 | } |
2632 | |
2710 | |
2633 | /* ------------------------------------------------------------------------- */ |
2711 | /* ------------------------------------------------------------------------- */ |
2634 | /* |
2712 | /* |
2635 | * Respond to a notification that a primary selection has been sent |
2713 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2664 | } |
2742 | } |
2665 | |
2743 | |
2666 | unsigned long bytes_after; |
2744 | unsigned long bytes_after; |
2667 | XTextProperty ct; |
2745 | XTextProperty ct; |
2668 | |
2746 | |
2669 | if (XGetWindowProperty (display->display, win, prop, |
2747 | if (XGetWindowProperty (dpy, win, prop, |
2670 | 0, PROP_SIZE / 4, |
2748 | 0, PROP_SIZE / 4, |
2671 | delete_prop, AnyPropertyType, |
2749 | delete_prop, AnyPropertyType, |
2672 | &ct.encoding, &ct.format, |
2750 | &ct.encoding, &ct.format, |
2673 | &ct.nitems, &bytes_after, |
2751 | &ct.nitems, &bytes_after, |
2674 | &ct.value) != Success) |
2752 | &ct.value) != Success) |
… | |
… | |
2683 | if (bytes_after) |
2761 | if (bytes_after) |
2684 | { |
2762 | { |
2685 | // fetch and append remaining data |
2763 | // fetch and append remaining data |
2686 | XTextProperty ct2; |
2764 | XTextProperty ct2; |
2687 | |
2765 | |
2688 | if (XGetWindowProperty (display->display, win, prop, |
2766 | if (XGetWindowProperty (dpy, win, prop, |
2689 | ct.nitems / 4, (bytes_after + 3) / 4, |
2767 | ct.nitems / 4, (bytes_after + 3) / 4, |
2690 | delete_prop, AnyPropertyType, |
2768 | delete_prop, AnyPropertyType, |
2691 | &ct2.encoding, &ct2.format, |
2769 | &ct2.encoding, &ct2.format, |
2692 | &ct2.nitems, &bytes_after, |
2770 | &ct2.nitems, &bytes_after, |
2693 | &ct2.value) != Success) |
2771 | &ct2.value) != Success) |
… | |
… | |
2706 | |
2784 | |
2707 | if (ct.encoding == xa[XA_INCR]) |
2785 | if (ct.encoding == xa[XA_INCR]) |
2708 | { |
2786 | { |
2709 | // INCR selection, start handshake |
2787 | // INCR selection, start handshake |
2710 | if (!delete_prop) |
2788 | if (!delete_prop) |
2711 | XDeleteProperty (display->display, win, prop); |
2789 | XDeleteProperty (dpy, win, prop); |
2712 | |
2790 | |
2713 | selection_wait = Sel_incr; |
2791 | selection_wait = Sel_incr; |
2714 | incr_buf_fill = 0; |
2792 | incr_buf_fill = 0; |
2715 | incr_ev.start (NOW + 10); |
2793 | incr_ev.start (10); |
2716 | |
2794 | |
2717 | goto bailout; |
2795 | goto bailout; |
2718 | } |
2796 | } |
2719 | |
2797 | |
2720 | if (ct.nitems == 0) |
2798 | if (ct.nitems == 0) |
… | |
… | |
2729 | ct.nitems = incr_buf_fill; |
2807 | ct.nitems = incr_buf_fill; |
2730 | incr_buf = 0; |
2808 | incr_buf = 0; |
2731 | incr_buf_size = 0; |
2809 | incr_buf_size = 0; |
2732 | incr_ev.stop (); |
2810 | incr_ev.stop (); |
2733 | } |
2811 | } |
2734 | else |
2812 | else |
2735 | { |
2813 | { |
2736 | if (selection_wait == Sel_normal |
2814 | if (selection_wait == Sel_normal |
2737 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2815 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2738 | { |
2816 | { |
2739 | /* |
2817 | /* |
… | |
… | |
2746 | goto bailout; |
2824 | goto bailout; |
2747 | } |
2825 | } |
2748 | } |
2826 | } |
2749 | else if (selection_wait == Sel_incr) |
2827 | else if (selection_wait == Sel_incr) |
2750 | { |
2828 | { |
2751 | incr_ev.start (NOW + 10); |
2829 | incr_ev.start (10); |
2752 | |
2830 | |
2753 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2831 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2754 | { |
2832 | { |
2755 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2833 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2756 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2834 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2763 | } |
2841 | } |
2764 | |
2842 | |
2765 | char **cl; |
2843 | char **cl; |
2766 | int cr; |
2844 | int cr; |
2767 | |
2845 | |
2768 | #if ENABLE_FRILLS |
2846 | #if !ENABLE_MINIMAL |
2769 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2847 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2770 | // so recode it manually |
2848 | // so recode it manually |
2771 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2849 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2772 | { |
2850 | { |
2773 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2851 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2777 | paste (s, strlen (s)); |
2855 | paste (s, strlen (s)); |
2778 | free (s); |
2856 | free (s); |
2779 | } |
2857 | } |
2780 | else |
2858 | else |
2781 | #endif |
2859 | #endif |
2782 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2860 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2783 | && cl) |
2861 | && cl) |
2784 | { |
2862 | { |
2785 | for (int i = 0; i < cr; i++) |
2863 | for (int i = 0; i < cr; i++) |
2786 | paste (cl[i], strlen (cl[i])); |
2864 | paste (cl[i], strlen (cl[i])); |
2787 | |
2865 | |
… | |
… | |
2796 | if (selection_wait == Sel_normal) |
2874 | if (selection_wait == Sel_normal) |
2797 | selection_wait = Sel_none; |
2875 | selection_wait = Sel_none; |
2798 | } |
2876 | } |
2799 | |
2877 | |
2800 | void |
2878 | void |
2801 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2879 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2802 | { |
2880 | { |
2803 | selection_wait = Sel_none; |
2881 | selection_wait = Sel_none; |
2804 | |
2882 | |
2805 | incr_buf_size = 0; |
2883 | incr_buf_size = 0; |
2806 | free (incr_buf); |
2884 | free (incr_buf); |
… | |
… | |
2817 | selection_paste (win, prop, true); |
2895 | selection_paste (win, prop, true); |
2818 | } |
2896 | } |
2819 | |
2897 | |
2820 | /* ------------------------------------------------------------------------- */ |
2898 | /* ------------------------------------------------------------------------- */ |
2821 | /* |
2899 | /* |
2822 | * Request the current selection: |
2900 | * Request the current selection: |
2823 | * Order: > internal selection if available |
2901 | * Order: > internal selection if available |
2824 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2902 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2825 | * > CUT_BUFFER0 |
2903 | * > CUT_BUFFER0 |
2826 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2904 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2827 | * will auto fallback to CUT_BUFFER0 |
2905 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2829 | */ |
2907 | */ |
2830 | void |
2908 | void |
2831 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2909 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2832 | { |
2910 | { |
2833 | if (selection.text && selnum == Sel_Primary) |
2911 | if (selection.text && selnum == Sel_Primary) |
|
|
2912 | { |
2834 | { /* internal selection */ |
2913 | /* internal selection */ |
2835 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2914 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2836 | paste (str, strlen (str)); |
2915 | paste (str, strlen (str)); |
2837 | free (str); |
2916 | free (str); |
2838 | return; |
2917 | return; |
2839 | } |
2918 | } |
… | |
… | |
2843 | selection_wait = Sel_normal; |
2922 | selection_wait = Sel_normal; |
2844 | |
2923 | |
2845 | #if X_HAVE_UTF8_STRING |
2924 | #if X_HAVE_UTF8_STRING |
2846 | selection_type = Sel_UTF8String; |
2925 | selection_type = Sel_UTF8String; |
2847 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2926 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2848 | return; |
2927 | return; |
2849 | #else |
2928 | #else |
2850 | selection_type = Sel_CompoundText; |
2929 | selection_type = Sel_CompoundText; |
2851 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2930 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2852 | return; |
2931 | return; |
2853 | #endif |
2932 | #endif |
2854 | } |
2933 | } |
2855 | |
2934 | |
2856 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2935 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2857 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2936 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2869 | else if (selnum == Sel_Secondary) |
2948 | else if (selnum == Sel_Secondary) |
2870 | sel = XA_SECONDARY; |
2949 | sel = XA_SECONDARY; |
2871 | else |
2950 | else |
2872 | sel = xa[XA_CLIPBOARD]; |
2951 | sel = xa[XA_CLIPBOARD]; |
2873 | |
2952 | |
2874 | if (XGetSelectionOwner (display->display, sel) != None) |
2953 | if (XGetSelectionOwner (dpy, sel) != None) |
2875 | { |
2954 | { |
2876 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2955 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2877 | vt, selection_request_time); |
2956 | vt, selection_request_time); |
2878 | return 1; |
2957 | return 1; |
2879 | } |
2958 | } |
2880 | |
2959 | |
2881 | return 0; |
2960 | return 0; |
… | |
… | |
2885 | /* |
2964 | /* |
2886 | * Clear all selected text |
2965 | * Clear all selected text |
2887 | * EXT: SelectionClear |
2966 | * EXT: SelectionClear |
2888 | */ |
2967 | */ |
2889 | void |
2968 | void |
2890 | rxvt_term::selection_clear () NOTHROW |
2969 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2891 | { |
2970 | { |
|
|
2971 | if (!clipboard) |
|
|
2972 | { |
2892 | want_refresh = 1; |
2973 | want_refresh = 1; |
2893 | free (selection.text); |
2974 | free (selection.text); |
2894 | selection.text = NULL; |
2975 | selection.text = NULL; |
2895 | selection.len = 0; |
2976 | selection.len = 0; |
2896 | CLEAR_SELECTION (); |
2977 | CLEAR_SELECTION (); |
2897 | |
2978 | |
2898 | if (display->selection_owner == this) |
2979 | if (display->selection_owner == this) |
2899 | display->selection_owner = 0; |
2980 | display->selection_owner = 0; |
|
|
2981 | } |
|
|
2982 | else |
|
|
2983 | { |
|
|
2984 | free (selection.clip_text); |
|
|
2985 | selection.clip_text = NULL; |
|
|
2986 | selection.clip_len = 0; |
|
|
2987 | |
|
|
2988 | if (display->clipboard_owner == this) |
|
|
2989 | display->clipboard_owner = 0; |
|
|
2990 | } |
2900 | } |
2991 | } |
2901 | |
2992 | |
2902 | /* ------------------------------------------------------------------------- */ |
2993 | /* ------------------------------------------------------------------------- */ |
2903 | /* |
2994 | /* |
2904 | * Copy a selection into the cut buffer |
2995 | * Copy a selection into the cut buffer |
… | |
… | |
2944 | |
3035 | |
2945 | int end_col; |
3036 | int end_col; |
2946 | |
3037 | |
2947 | for (; row <= selection.end.row; row++, col = 0) |
3038 | for (; row <= selection.end.row; row++, col = 0) |
2948 | { |
3039 | { |
2949 | #if ENABLE_FRILLS |
3040 | #if !ENABLE_MINIMAL |
2950 | if (selection.rect) |
3041 | if (selection.rect) |
2951 | { |
3042 | { |
2952 | col = selection.beg.col; |
3043 | col = selection.beg.col; |
2953 | end_col = ncol + 1; |
3044 | end_col = ncol + 1; |
2954 | } |
3045 | } |
… | |
… | |
2957 | end_col = ROW(row).l; |
3048 | end_col = ROW(row).l; |
2958 | |
3049 | |
2959 | col = max (col, 0); |
3050 | col = max (col, 0); |
2960 | |
3051 | |
2961 | if (row == selection.end.row |
3052 | if (row == selection.end.row |
2962 | #if ENABLE_FRILLS |
3053 | #if !ENABLE_MINIMAL |
2963 | || selection.rect |
3054 | || selection.rect |
2964 | #endif |
3055 | #endif |
2965 | ) |
3056 | ) |
2966 | min_it (end_col, selection.end.col); |
3057 | min_it (end_col, selection.end.col); |
2967 | |
3058 | |
… | |
… | |
2990 | #endif |
3081 | #endif |
2991 | else |
3082 | else |
2992 | new_selection_text[ofs++] = *t++; |
3083 | new_selection_text[ofs++] = *t++; |
2993 | } |
3084 | } |
2994 | |
3085 | |
2995 | #if ENABLE_FRILLS |
3086 | #if !ENABLE_MINIMAL |
2996 | if (selection.rect) |
3087 | if (selection.rect) |
2997 | { |
3088 | { |
2998 | while (ofs |
3089 | while (ofs |
2999 | && new_selection_text[ofs - 1] != C0_LF |
3090 | && new_selection_text[ofs - 1] != C0_LF |
3000 | && unicode::is_space (new_selection_text[ofs - 1])) |
3091 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3030 | |
3121 | |
3031 | selection_grab (tm); |
3122 | selection_grab (tm); |
3032 | } |
3123 | } |
3033 | |
3124 | |
3034 | bool |
3125 | bool |
3035 | rxvt_term::selection_grab (Time tm) NOTHROW |
3126 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3036 | { |
3127 | { |
|
|
3128 | Atom sel; |
|
|
3129 | |
|
|
3130 | if (!clipboard) |
|
|
3131 | { |
3037 | selection_time = tm; |
3132 | selection_time = tm; |
3038 | |
3133 | sel = XA_PRIMARY; |
3039 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
|
|
3040 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
|
|
3041 | { |
3134 | } |
|
|
3135 | else |
|
|
3136 | { |
|
|
3137 | clipboard_time = tm; |
|
|
3138 | sel = xa[XA_CLIPBOARD]; |
|
|
3139 | } |
|
|
3140 | |
|
|
3141 | XSetSelectionOwner (dpy, sel, vt, tm); |
|
|
3142 | if (XGetSelectionOwner (dpy, sel) == vt) |
|
|
3143 | { |
3042 | display->set_selection_owner (this); |
3144 | display->set_selection_owner (this, clipboard); |
3043 | return true; |
3145 | return true; |
3044 | } |
3146 | } |
3045 | else |
3147 | else |
3046 | { |
3148 | { |
3047 | selection_clear (); |
3149 | selection_clear (clipboard); |
3048 | return false; |
3150 | return false; |
3049 | } |
3151 | } |
3050 | |
3152 | |
3051 | #if 0 |
3153 | #if 0 |
3052 | XTextProperty ct; |
3154 | XTextProperty ct; |
3053 | |
3155 | |
3054 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3156 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3055 | { |
3157 | { |
3056 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3158 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3057 | XFree (ct.value); |
3159 | XFree (ct.value); |
3058 | } |
3160 | } |
3059 | #endif |
3161 | #endif |
… | |
… | |
3105 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3207 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3106 | |
3208 | |
3107 | while (selection.mark.col > 0 |
3209 | while (selection.mark.col > 0 |
3108 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3210 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3109 | --selection.mark.col; |
3211 | --selection.mark.col; |
3110 | |
3212 | |
3111 | if (selection.op) |
3213 | if (selection.op) |
|
|
3214 | { |
3112 | { /* clear the old selection */ |
3215 | /* clear the old selection */ |
3113 | selection.beg.row = selection.end.row = selection.mark.row; |
3216 | selection.beg.row = selection.end.row = selection.mark.row; |
3114 | selection.beg.col = selection.end.col = selection.mark.col; |
3217 | selection.beg.col = selection.end.col = selection.mark.col; |
3115 | } |
3218 | } |
3116 | |
3219 | |
3117 | selection.op = SELECTION_INIT; |
3220 | selection.op = SELECTION_INIT; |
… | |
… | |
3306 | * a point/word/line which is either the start or end of the selection |
3409 | * a point/word/line which is either the start or end of the selection |
3307 | * and it was decided by whichever point/word/line was `fixed' at the |
3410 | * and it was decided by whichever point/word/line was `fixed' at the |
3308 | * time of the most recent button3 press |
3411 | * time of the most recent button3 press |
3309 | */ |
3412 | */ |
3310 | if (button3 && buttonpress) |
3413 | if (button3 && buttonpress) |
|
|
3414 | { |
3311 | { /* button3 press */ |
3415 | /* button3 press */ |
3312 | /* |
3416 | /* |
3313 | * first determine which edge of the selection we are closest to |
3417 | * first determine which edge of the selection we are closest to |
3314 | */ |
3418 | */ |
3315 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3419 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3316 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3420 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3334 | selection.mark.row = selection.beg.row; |
3438 | selection.mark.row = selection.beg.row; |
3335 | selection.mark.col = selection.beg.col; |
3439 | selection.mark.col = selection.beg.col; |
3336 | } |
3440 | } |
3337 | } |
3441 | } |
3338 | else |
3442 | else |
|
|
3443 | { |
3339 | { /* button1 drag or button3 drag */ |
3444 | /* button1 drag or button3 drag */ |
3340 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3445 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3341 | { |
3446 | { |
3342 | if (selection.mark.row == selection.end.row |
3447 | if (selection.mark.row == selection.end.row |
3343 | && selection.mark.col == selection.end.col |
3448 | && selection.mark.col == selection.end.col |
3344 | && clickchange |
3449 | && clickchange |
… | |
… | |
3361 | |
3466 | |
3362 | if (selection.clicks == 1) |
3467 | if (selection.clicks == 1) |
3363 | { |
3468 | { |
3364 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3469 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3365 | && !ROW(selection.beg.row).is_longer () |
3470 | && !ROW(selection.beg.row).is_longer () |
3366 | #if ENABLE_FRILLS |
3471 | #if !ENABLE_MINIMAL |
3367 | && !selection.rect |
3472 | && !selection.rect |
3368 | #endif |
3473 | #endif |
3369 | ) |
3474 | ) |
3370 | selection.beg.col = ncol; |
3475 | selection.beg.col = ncol; |
3371 | |
3476 | |
3372 | if ( |
3477 | if ( |
3373 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3478 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3374 | && !ROW(selection.end.row).is_longer () |
3479 | && !ROW(selection.end.row).is_longer () |
3375 | #if ENABLE_FRILLS |
3480 | #if !ENABLE_MINIMAL |
3376 | && !selection.rect |
3481 | && !selection.rect |
3377 | #endif |
3482 | #endif |
3378 | ) |
3483 | ) |
3379 | selection.end.col = ncol; |
3484 | selection.end.col = ncol; |
3380 | } |
3485 | } |
… | |
… | |
3387 | selection_delimit_word (DN, &selection.end, &selection.end); |
3492 | selection_delimit_word (DN, &selection.end, &selection.end); |
3388 | } |
3493 | } |
3389 | else if (selection.clicks == 3) |
3494 | else if (selection.clicks == 3) |
3390 | { |
3495 | { |
3391 | #if ENABLE_FRILLS |
3496 | #if ENABLE_FRILLS |
3392 | if (OPTION (Opt_tripleclickwords)) |
3497 | if (option (Opt_tripleclickwords)) |
3393 | { |
3498 | { |
3394 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3499 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3395 | |
3500 | |
3396 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3501 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3397 | { |
3502 | { |
3398 | if (!ROW(end_row).is_longer ()) |
3503 | if (!ROW(end_row).is_longer ()) |
3399 | { |
3504 | { |
3400 | selection.end.row = end_row; |
3505 | selection.end.row = end_row; |
3401 | selection.end.col = ROW(end_row).l; |
3506 | selection.end.col = ROW(end_row).l; |
|
|
3507 | # if !ENABLE_MINIMAL |
3402 | selection_remove_trailing_spaces (); |
3508 | selection_remove_trailing_spaces (); |
|
|
3509 | # endif |
3403 | break; |
3510 | break; |
3404 | } |
3511 | } |
3405 | } |
3512 | } |
3406 | } |
3513 | } |
3407 | else |
3514 | else |
… | |
… | |
3423 | selection.end.row++; |
3530 | selection.end.row++; |
3424 | } |
3531 | } |
3425 | } |
3532 | } |
3426 | |
3533 | |
3427 | if (button3 && buttonpress) |
3534 | if (button3 && buttonpress) |
|
|
3535 | { |
3428 | { /* mark may need to be changed */ |
3536 | /* mark may need to be changed */ |
3429 | if (closeto == LEFT) |
3537 | if (closeto == LEFT) |
3430 | { |
3538 | { |
3431 | selection.mark.row = selection.end.row; |
3539 | selection.mark.row = selection.end.row; |
3432 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3540 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3433 | } |
3541 | } |
… | |
… | |
3436 | selection.mark.row = selection.beg.row; |
3544 | selection.mark.row = selection.beg.row; |
3437 | selection.mark.col = selection.beg.col; |
3545 | selection.mark.col = selection.beg.col; |
3438 | } |
3546 | } |
3439 | } |
3547 | } |
3440 | |
3548 | |
3441 | #if ENABLE_FRILLS |
3549 | #if !ENABLE_MINIMAL |
3442 | if (selection.rect && selection.beg.col > selection.end.col) |
3550 | if (selection.rect && selection.beg.col > selection.end.col) |
3443 | ::swap (selection.beg.col, selection.end.col); |
3551 | ::swap (selection.beg.col, selection.end.col); |
3444 | #endif |
3552 | #endif |
3445 | } |
3553 | } |
3446 | |
3554 | |
3447 | #if ENABLE_FRILLS |
3555 | #if !ENABLE_MINIMAL |
3448 | void |
3556 | void |
3449 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3557 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3450 | { |
3558 | { |
3451 | int32_t end_col, end_row; |
3559 | int32_t end_col, end_row; |
3452 | text_t *stp; |
3560 | text_t *stp; |
… | |
… | |
3507 | */ |
3615 | */ |
3508 | void |
3616 | void |
3509 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3617 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3510 | { |
3618 | { |
3511 | XSelectionEvent ev; |
3619 | XSelectionEvent ev; |
3512 | dDisp; |
|
|
3513 | |
3620 | |
3514 | ev.type = SelectionNotify; |
3621 | ev.type = SelectionNotify; |
3515 | ev.property = None; |
3622 | ev.property = None; |
3516 | ev.display = rq.display; |
3623 | ev.display = rq.display; |
3517 | ev.requestor = rq.requestor; |
3624 | ev.requestor = rq.requestor; |
… | |
… | |
3531 | *target++ = xa[XA_COMPOUND_TEXT]; |
3638 | *target++ = xa[XA_COMPOUND_TEXT]; |
3532 | #if X_HAVE_UTF8_STRING |
3639 | #if X_HAVE_UTF8_STRING |
3533 | *target++ = xa[XA_UTF8_STRING]; |
3640 | *target++ = xa[XA_UTF8_STRING]; |
3534 | #endif |
3641 | #endif |
3535 | |
3642 | |
3536 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3643 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3537 | 32, PropModeReplace, |
3644 | 32, PropModeReplace, |
3538 | (unsigned char *)target_list, target - target_list); |
3645 | (unsigned char *)target_list, target - target_list); |
3539 | ev.property = rq.property; |
3646 | ev.property = rq.property; |
3540 | } |
3647 | } |
3541 | #if TODO // TODO |
3648 | #if TODO // TODO |
3542 | else if (rq.target == xa[XA_MULTIPLE]) |
3649 | else if (rq.target == xa[XA_MULTIPLE]) |
3543 | { |
3650 | { |
3544 | /* TODO: Handle MULTIPLE */ |
3651 | /* TODO: Handle MULTIPLE */ |
3545 | } |
3652 | } |
3546 | #endif |
3653 | #endif |
3547 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3654 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3548 | { |
3655 | { |
3549 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3656 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3550 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3657 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3658 | ev.property = rq.property; |
|
|
3659 | } |
|
|
3660 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3661 | { |
|
|
3662 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3663 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3551 | ev.property = rq.property; |
3664 | ev.property = rq.property; |
3552 | } |
3665 | } |
3553 | else if (rq.target == XA_STRING |
3666 | else if (rq.target == XA_STRING |
3554 | || rq.target == xa[XA_TEXT] |
3667 | || rq.target == xa[XA_TEXT] |
3555 | || rq.target == xa[XA_COMPOUND_TEXT] |
3668 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3578 | style = enc_string; |
3691 | style = enc_string; |
3579 | else if (target == xa[XA_TEXT]) |
3692 | else if (target == xa[XA_TEXT]) |
3580 | style = enc_text; |
3693 | style = enc_text; |
3581 | else if (target == xa[XA_COMPOUND_TEXT]) |
3694 | else if (target == xa[XA_COMPOUND_TEXT]) |
3582 | style = enc_compound_text; |
3695 | style = enc_compound_text; |
3583 | #if ENABLE_FRILLS |
3696 | #if !ENABLE_MINIMAL |
3584 | else if (target == xa[XA_UTF8_STRING]) |
3697 | else if (target == xa[XA_UTF8_STRING]) |
3585 | style = enc_utf8; |
3698 | style = enc_utf8; |
3586 | #endif |
3699 | #endif |
3587 | else |
3700 | else |
3588 | { |
3701 | { |
3589 | target = xa[XA_COMPOUND_TEXT]; |
3702 | target = xa[XA_COMPOUND_TEXT]; |
3590 | style = enc_compound_text; |
3703 | style = enc_compound_text; |
3591 | } |
3704 | } |
3592 | |
3705 | |
3593 | if (selection.text) |
3706 | if (rq.selection == XA_PRIMARY && selection.text) |
3594 | { |
3707 | { |
3595 | cl = selection.text; |
3708 | cl = selection.text; |
3596 | selectlen = selection.len; |
3709 | selectlen = selection.len; |
3597 | } |
3710 | } |
|
|
3711 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3712 | { |
|
|
3713 | cl = selection.clip_text; |
|
|
3714 | selectlen = selection.clip_len; |
|
|
3715 | } |
3598 | else |
3716 | else |
3599 | { |
3717 | { |
3600 | cl = L""; |
3718 | cl = L""; |
3601 | selectlen = 0; |
3719 | selectlen = 0; |
3602 | } |
3720 | } |
3603 | |
3721 | |
3604 | #if ENABLE_FRILLS |
3722 | #if !ENABLE_MINIMAL |
3605 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3723 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3606 | // so recode it manually |
3724 | // so recode it manually |
3607 | if (style == enc_utf8) |
3725 | if (style == enc_utf8) |
3608 | { |
3726 | { |
3609 | freect = 1; |
3727 | freect = 1; |
… | |
… | |
3612 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3730 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3613 | ct.nitems = strlen ((char *)ct.value); |
3731 | ct.nitems = strlen ((char *)ct.value); |
3614 | } |
3732 | } |
3615 | else |
3733 | else |
3616 | #endif |
3734 | #endif |
3617 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3735 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3618 | freect = 1; |
3736 | freect = 1; |
3619 | else |
3737 | else |
3620 | { |
3738 | { |
3621 | /* if we failed to convert then send it raw */ |
3739 | /* if we failed to convert then send it raw */ |
3622 | ct.value = (unsigned char *)cl; |
3740 | ct.value = (unsigned char *)cl; |
3623 | ct.nitems = selectlen; |
3741 | ct.nitems = selectlen; |
3624 | ct.encoding = target; |
3742 | ct.encoding = target; |
3625 | } |
3743 | } |
3626 | |
3744 | |
3627 | XChangeProperty (disp, rq.requestor, rq.property, |
3745 | XChangeProperty (dpy, rq.requestor, rq.property, |
3628 | ct.encoding, 8, PropModeReplace, |
3746 | ct.encoding, 8, PropModeReplace, |
3629 | ct.value, (int)ct.nitems); |
3747 | ct.value, (int)ct.nitems); |
3630 | ev.property = rq.property; |
3748 | ev.property = rq.property; |
3631 | |
3749 | |
3632 | if (freect) |
3750 | if (freect) |
3633 | XFree (ct.value); |
3751 | XFree (ct.value); |
3634 | } |
3752 | } |
3635 | |
3753 | |
3636 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3754 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3637 | } |
|
|
3638 | |
|
|
3639 | /* ------------------------------------------------------------------------- * |
|
|
3640 | * MOUSE ROUTINES * |
|
|
3641 | * ------------------------------------------------------------------------- */ |
|
|
3642 | |
|
|
3643 | /* |
|
|
3644 | * return col/row values corresponding to x/y pixel values |
|
|
3645 | */ |
|
|
3646 | void |
|
|
3647 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3648 | { |
|
|
3649 | *x = Pixel2Col (*x); |
|
|
3650 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3651 | *y = Pixel2Row (*y); |
|
|
3652 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3653 | } |
3755 | } |
3654 | |
3756 | |
3655 | /* ------------------------------------------------------------------------- */ |
3757 | /* ------------------------------------------------------------------------- */ |
3656 | #ifdef USE_XIM |
3758 | #ifdef USE_XIM |
3657 | void |
3759 | void |
3658 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3760 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3659 | { |
3761 | { |
3660 | XWindowAttributes xwa; |
3762 | XWindowAttributes xwa; |
3661 | |
3763 | |
3662 | XGetWindowAttributes (display->display, vt, &xwa); |
3764 | XGetWindowAttributes (dpy, vt, &xwa); |
3663 | |
3765 | |
3664 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3766 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3665 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3767 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3666 | } |
3768 | } |
3667 | #endif |
3769 | #endif |
… | |
… | |
3685 | h += 2; min_it (h, nrow); |
3787 | h += 2; min_it (h, nrow); |
3686 | |
3788 | |
3687 | x -= 1; clamp_it (x, 0, ncol - w); |
3789 | x -= 1; clamp_it (x, 0, ncol - w); |
3688 | y -= 1; clamp_it (y, 0, nrow - h); |
3790 | y -= 1; clamp_it (y, 0, nrow - h); |
3689 | |
3791 | |
3690 | ov_x = x; ov_y = y; |
3792 | ov.x = x; ov.y = y; |
3691 | ov_w = w; ov_h = h; |
3793 | ov.w = w; ov.h = h; |
3692 | |
3794 | |
3693 | ov_text = new text_t *[h]; |
3795 | ov.text = new text_t *[h]; |
3694 | ov_rend = new rend_t *[h]; |
3796 | ov.rend = new rend_t *[h]; |
3695 | |
3797 | |
3696 | for (y = 0; y < h; y++) |
3798 | for (y = 0; y < h; y++) |
3697 | { |
3799 | { |
3698 | text_t *tp = ov_text[y] = new text_t[w]; |
3800 | text_t *tp = ov.text[y] = new text_t[w]; |
3699 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3801 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3700 | |
3802 | |
3701 | text_t t0, t1, t2; |
3803 | text_t t0, t1, t2; |
3702 | rend_t r = OVERLAY_RSTYLE; |
3804 | rend_t r = OVERLAY_RSTYLE; |
3703 | |
3805 | |
3704 | if (y == 0) |
3806 | if (y == 0) |
… | |
… | |
3723 | } |
3825 | } |
3724 | |
3826 | |
3725 | void |
3827 | void |
3726 | rxvt_term::scr_overlay_off () NOTHROW |
3828 | rxvt_term::scr_overlay_off () NOTHROW |
3727 | { |
3829 | { |
3728 | if (!ov_text) |
3830 | if (!ov.text) |
3729 | return; |
3831 | return; |
3730 | |
3832 | |
3731 | want_refresh = 1; |
3833 | want_refresh = 1; |
3732 | |
3834 | |
3733 | for (int y = 0; y < ov_h; y++) |
3835 | for (int y = 0; y < ov.h; y++) |
3734 | { |
3836 | { |
3735 | delete [] ov_text[y]; |
3837 | delete [] ov.text[y]; |
3736 | delete [] ov_rend[y]; |
3838 | delete [] ov.rend[y]; |
3737 | } |
3839 | } |
3738 | |
3840 | |
3739 | delete [] ov_text; ov_text = 0; |
3841 | delete [] ov.text; ov.text = 0; |
3740 | delete [] ov_rend; ov_rend = 0; |
3842 | delete [] ov.rend; ov.rend = 0; |
3741 | } |
3843 | } |
3742 | |
3844 | |
3743 | void |
3845 | void |
3744 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3846 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3745 | { |
3847 | { |
3746 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3848 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3747 | return; |
3849 | return; |
3748 | |
3850 | |
3749 | x++, y++; |
3851 | x++, y++; |
3750 | |
3852 | |
3751 | ov_text[y][x] = text; |
3853 | ov.text[y][x] = text; |
3752 | ov_rend[y][x] = rend; |
3854 | ov.rend[y][x] = rend; |
3753 | } |
3855 | } |
3754 | |
3856 | |
3755 | void |
3857 | void |
3756 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3858 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3757 | { |
3859 | { |
… | |
… | |
3763 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3865 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3764 | { |
3866 | { |
3765 | while (*s) |
3867 | while (*s) |
3766 | { |
3868 | { |
3767 | text_t t = *s++; |
3869 | text_t t = *s++; |
3768 | int width = wcwidth (t); |
3870 | int width = WCWIDTH (t); |
3769 | |
3871 | |
3770 | while (width--) |
3872 | while (width--) |
3771 | { |
3873 | { |
3772 | scr_overlay_set (x++, y, t); |
3874 | scr_overlay_set (x++, y, t); |
3773 | t = NOCHAR; |
3875 | t = NOCHAR; |
… | |
… | |
3776 | } |
3878 | } |
3777 | |
3879 | |
3778 | void |
3880 | void |
3779 | rxvt_term::scr_swap_overlay () NOTHROW |
3881 | rxvt_term::scr_swap_overlay () NOTHROW |
3780 | { |
3882 | { |
3781 | if (!ov_text) |
3883 | if (!ov.text) |
3782 | return; |
3884 | return; |
3783 | |
3885 | |
|
|
3886 | // hide cursor if it is within the overlay area |
|
|
3887 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3888 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3889 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3890 | |
3784 | // swap screen mem with overlay |
3891 | // swap screen mem with overlay |
3785 | for (int y = ov_h; y--; ) |
3892 | for (int y = ov.h; y--; ) |
3786 | { |
3893 | { |
3787 | text_t *t1 = ov_text[y]; |
3894 | text_t *t1 = ov.text[y]; |
3788 | rend_t *r1 = ov_rend[y]; |
3895 | rend_t *r1 = ov.rend[y]; |
3789 | |
3896 | |
3790 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3897 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3791 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3898 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3792 | |
3899 | |
3793 | for (int x = ov_w; x--; ) |
3900 | for (int x = ov.w; x--; ) |
3794 | { |
3901 | { |
3795 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3902 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3796 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3903 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3797 | } |
3904 | } |
3798 | } |
3905 | } |