1 | /*---------------------------------------------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-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. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a separate compile! |
34 | |
34 | |
|
|
35 | static inline void |
35 | inline void fill_text (text_t *start, text_t value, int len) |
36 | fill_text (text_t *start, text_t value, int len) |
36 | { |
37 | { |
37 | while (len--) |
38 | while (len--) |
38 | *start++ = value; |
39 | *start++ = value; |
39 | } |
40 | } |
40 | |
41 | |
… | |
… | |
83 | 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) |
84 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
85 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | |
87 | |
87 | /* |
88 | /* |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
90 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
91 | */ |
90 | */ |
92 | #define drawBuffer vt |
|
|
93 | |
|
|
94 | #define CLEAR_ROWS(row, num) \ |
|
|
95 | if (mapped) \ |
|
|
96 | XClearArea (dpy, drawBuffer, 0, \ |
|
|
97 | Row2Pixel (row), (unsigned int)width, \ |
|
|
98 | (unsigned int)Height2Pixel (num), False) |
|
|
99 | |
|
|
100 | #define CLEAR_CHARS(x, y, num) \ |
91 | #define CLEAR_CHARS(x, y, num) \ |
101 | if (mapped) \ |
92 | if (mapped) \ |
102 | XClearArea (dpy, drawBuffer, x, y, \ |
93 | XClearArea (dpy, vt, x, y, \ |
103 | (unsigned int)Width2Pixel (num), \ |
94 | (unsigned int)Width2Pixel (num), \ |
104 | (unsigned int)Height2Pixel (1), False) |
95 | (unsigned int)Height2Pixel (1), False) |
105 | |
|
|
106 | #define ERASE_ROWS(row, num) \ |
|
|
107 | XFillRectangle (dpy, drawBuffer, gc, \ |
|
|
108 | 0, Row2Pixel (row), \ |
|
|
109 | (unsigned int)width, \ |
|
|
110 | (unsigned int)Height2Pixel (num)) |
|
|
111 | |
96 | |
112 | /* ------------------------------------------------------------------------- * |
97 | /* ------------------------------------------------------------------------- * |
113 | * SCREEN `COMMON' ROUTINES * |
98 | * SCREEN `COMMON' ROUTINES * |
114 | * ------------------------------------------------------------------------- */ |
99 | * ------------------------------------------------------------------------- */ |
115 | |
100 | |
… | |
… | |
148 | |
133 | |
149 | l.l = 0; |
134 | l.l = 0; |
150 | l.f = 0; |
135 | l.f = 0; |
151 | } |
136 | } |
152 | |
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); |
|
|
155 | } |
|
|
156 | |
153 | /* ------------------------------------------------------------------------- * |
157 | /* ------------------------------------------------------------------------- * |
154 | * SCREEN INITIALISATION * |
158 | * SCREEN INITIALISATION * |
155 | * ------------------------------------------------------------------------- */ |
159 | * ------------------------------------------------------------------------- */ |
156 | |
160 | |
157 | void |
161 | void |
158 | rxvt_term::scr_reset () |
162 | rxvt_term::scr_reset () |
159 | { |
163 | { |
160 | #if ENABLE_OVERLAY |
|
|
161 | scr_overlay_off (); |
|
|
162 | #endif |
|
|
163 | |
|
|
164 | rvideo_mode = false; |
|
|
165 | view_start = 0; |
164 | view_start = 0; |
166 | num_scr = 0; |
165 | num_scr = 0; |
167 | |
166 | |
168 | if (ncol == 0) |
167 | if (ncol == 0) |
169 | ncol = 80; |
168 | ncol = 80; |
… | |
… | |
171 | if (nrow == 0) |
170 | if (nrow == 0) |
172 | nrow = 24; |
171 | nrow = 24; |
173 | |
172 | |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | return; |
174 | return; |
176 | |
|
|
177 | if (current_screen != PRIMARY) |
|
|
178 | scr_swap_screen (); |
|
|
179 | |
175 | |
180 | // we need at least two lines for wrapping to work correctly |
176 | // we need at least two lines for wrapping to work correctly |
181 | while (nrow + saveLines < 2) |
177 | while (nrow + saveLines < 2) |
182 | { |
178 | { |
183 | //TODO//FIXME |
179 | //TODO//FIXME |
… | |
… | |
236 | selection.text = NULL; |
232 | selection.text = NULL; |
237 | selection.len = 0; |
233 | selection.len = 0; |
238 | selection.op = SELECTION_CLEAR; |
234 | selection.op = SELECTION_CLEAR; |
239 | selection.screen = PRIMARY; |
235 | selection.screen = PRIMARY; |
240 | selection.clicks = 0; |
236 | selection.clicks = 0; |
|
|
237 | selection.clip_text = NULL; |
|
|
238 | selection.clip_len = 0; |
241 | } |
239 | } |
242 | else |
240 | else |
243 | { |
241 | { |
244 | /* |
242 | /* |
245 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
274 | 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); |
275 | } |
273 | } |
276 | |
274 | |
277 | line_t *old_buf = row_buf; |
275 | line_t *old_buf = row_buf; |
278 | 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)); |
279 | |
277 | |
280 | 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 |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
280 | int q = total_rows; // rewrapped row |
283 | |
281 | |
284 | if (top_row) |
282 | if (top_row) |
285 | { |
283 | { |
286 | // 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 |
287 | // 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 |
288 | |
287 | |
289 | row_col_t ocur = screen.cur; |
288 | row_col_t ocur = screen.cur; |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | |
290 | |
292 | do |
291 | do |
293 | { |
292 | { |
294 | p = MOD (p - 1, prev_total_rows); |
293 | p = MOD (p - 1, prev_total_rows); |
295 | #ifdef DEBUG_STRICT |
|
|
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
294 | assert (old_buf [MOD (p, prev_total_rows)].t); |
297 | #endif |
|
|
298 | int plines = 1; |
295 | int plines = 1; |
299 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
300 | |
297 | |
301 | 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 ()) |
302 | { |
299 | { |
… | |
… | |
328 | int qcol = 0; |
325 | int qcol = 0; |
329 | |
326 | |
330 | // see below for cursor adjustment rationale |
327 | // see below for cursor adjustment rationale |
331 | if (p == ocur.row) |
328 | if (p == ocur.row) |
332 | screen.cur.row = q - (total_rows - nrow); |
329 | screen.cur.row = q - (total_rows - nrow); |
333 | |
330 | |
334 | // fill a single destination line |
331 | // fill a single destination line |
335 | while (lofs < llen && qcol < ncol) |
332 | while (lofs < llen && qcol < ncol) |
336 | { |
333 | { |
337 | int prow = lofs / prev_ncol; |
334 | int prow = lofs / prev_ncol; |
338 | int pcol = lofs % prev_ncol; |
335 | int pcol = lofs % prev_ncol; |
… | |
… | |
364 | } |
361 | } |
365 | while (p != pend && q > 0); |
362 | while (p != pend && q > 0); |
366 | |
363 | |
367 | term_start = total_rows - nrow; |
364 | term_start = total_rows - nrow; |
368 | top_row = q - term_start; |
365 | top_row = q - term_start; |
369 | |
366 | |
370 | // make sure all terminal lines exist |
367 | // make sure all terminal lines exist |
371 | while (top_row > 0) |
368 | while (top_row > 0) |
372 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
369 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
373 | } |
370 | } |
374 | else |
371 | else |
375 | { |
372 | { |
376 | // if no scrollback exists (yet), wing, instead of wrap |
373 | // if no scrollback exists (yet), wing, instead of wrap |
377 | |
374 | |
378 | for (int row = min (nrow, prev_nrow); row--; ) |
375 | for (int row = min (nrow, prev_nrow); row--; ) |
379 | { |
376 | { |
380 | 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)]; |
381 | line_t &qline = row_buf [row]; |
378 | line_t &qline = row_buf [row]; |
382 | |
379 | |
… | |
… | |
396 | delete old_ta; |
393 | delete old_ta; |
397 | delete old_ra; |
394 | delete old_ra; |
398 | |
395 | |
399 | clamp_it (screen.cur.row, 0, nrow - 1); |
396 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.col, 0, ncol - 1); |
397 | clamp_it (screen.cur.col, 0, ncol - 1); |
|
|
398 | } |
401 | |
399 | |
402 | free (tabs); |
400 | free (tabs); |
403 | } |
401 | tabs = (char *)rxvt_malloc (ncol); |
|
|
402 | |
|
|
403 | for (int col = ncol; --col; ) |
|
|
404 | tabs [col] = col % TABSIZE == 0; |
404 | |
405 | |
405 | CLEAR_ALL_SELECTION (); |
406 | CLEAR_ALL_SELECTION (); |
406 | |
407 | |
407 | prev_nrow = nrow; |
408 | prev_nrow = nrow; |
408 | prev_ncol = ncol; |
409 | prev_ncol = ncol; |
409 | |
|
|
410 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
|
|
411 | |
|
|
412 | for (int col = ncol; --col; ) |
|
|
413 | tabs [col] = col % TABSIZE == 0; |
|
|
414 | |
|
|
415 | if (current_screen != PRIMARY) |
|
|
416 | scr_swap_screen (); |
|
|
417 | |
410 | |
418 | tt_winch (); |
411 | tt_winch (); |
419 | |
412 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
413 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
414 | } |
… | |
… | |
433 | delete ralloc; ralloc = 0; |
426 | delete ralloc; ralloc = 0; |
434 | |
427 | |
435 | free (row_buf); |
428 | free (row_buf); |
436 | free (swap_buf); |
429 | free (swap_buf); |
437 | free (drawn_buf); |
430 | free (drawn_buf); |
|
|
431 | row_buf = 0; // signal that we freed all the arrays above |
|
|
432 | |
438 | free (tabs); |
433 | free (tabs); |
439 | |
434 | tabs = 0; |
440 | row_buf = 0; // signal that we freed all the arrays |
|
|
441 | } |
435 | } |
442 | } |
436 | } |
443 | |
437 | |
444 | /* ------------------------------------------------------------------------- */ |
438 | /* ------------------------------------------------------------------------- */ |
445 | /* |
439 | /* |
446 | * Hard reset |
440 | * Hard/Soft reset |
447 | */ |
441 | */ |
448 | void |
442 | void |
449 | rxvt_term::scr_poweron () |
443 | rxvt_term::scr_poweron () |
450 | { |
444 | { |
451 | scr_release (); |
445 | scr_release (); |
452 | prev_nrow = prev_ncol = 0; |
446 | prev_nrow = prev_ncol = 0; |
|
|
447 | rvideo_mode = false; |
|
|
448 | scr_soft_reset (); |
453 | scr_reset (); |
449 | scr_reset (); |
454 | |
450 | |
455 | scr_clear (true); |
451 | scr_clear (true); |
456 | 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); |
457 | } |
469 | } |
458 | |
470 | |
459 | /* ------------------------------------------------------------------------- * |
471 | /* ------------------------------------------------------------------------- * |
460 | * PROCESS SCREEN COMMANDS * |
472 | * PROCESS SCREEN COMMANDS * |
461 | * ------------------------------------------------------------------------- */ |
473 | * ------------------------------------------------------------------------- */ |
… | |
… | |
499 | } |
511 | } |
500 | |
512 | |
501 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
502 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.row, nrow - 1); |
503 | min_it (s->cur.col, ncol - 1); |
515 | min_it (s->cur.col, ncol - 1); |
504 | #ifdef DEBUG_STRICT |
|
|
505 | assert (s->cur.row >= 0); |
516 | assert (s->cur.row >= 0); |
506 | assert (s->cur.col >= 0); |
517 | assert (s->cur.col >= 0); |
507 | #endif |
|
|
508 | } |
518 | } |
509 | |
519 | |
510 | void |
520 | void |
511 | rxvt_term::scr_swap_screen () |
521 | rxvt_term::scr_swap_screen () |
512 | { |
522 | { |
… | |
… | |
537 | want_refresh = 1; |
547 | want_refresh = 1; |
538 | view_start = 0; |
548 | view_start = 0; |
539 | |
549 | |
540 | selection_check (2); /* check for boundary cross */ |
550 | selection_check (2); /* check for boundary cross */ |
541 | |
551 | |
542 | int i = current_screen; current_screen = scrn; scrn = i; |
552 | current_screen = scrn; |
543 | |
553 | |
544 | #if NSCREENS |
554 | #if NSCREENS |
545 | if (option (Opt_secondaryScreen)) |
555 | if (option (Opt_secondaryScreen)) |
546 | { |
556 | { |
547 | num_scr = 0; |
557 | num_scr = 0; |
… | |
… | |
596 | /* |
606 | /* |
597 | * Change the rendition style for following text |
607 | * Change the rendition style for following text |
598 | */ |
608 | */ |
599 | void |
609 | void |
600 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
610 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
601 | { |
611 | { |
602 | if (set) |
612 | if (set) |
603 | rstyle |= style; |
613 | rstyle |= style; |
604 | else if (style == ~RS_None) |
614 | else if (style == ~RS_None) |
605 | rstyle = DEFAULT_RSTYLE; |
615 | rstyle = DEFAULT_RSTYLE; |
606 | else |
616 | else |
607 | rstyle &= ~style; |
617 | rstyle &= ~style; |
608 | } |
618 | } |
609 | |
619 | |
610 | /* ------------------------------------------------------------------------- */ |
620 | /* ------------------------------------------------------------------------- */ |
611 | /* |
621 | /* |
612 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
622 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
613 | * count positive ==> scroll up |
623 | * count positive ==> scroll up |
… | |
… | |
664 | line_t &l2 = ROW(i); |
674 | line_t &l2 = ROW(i); |
665 | |
675 | |
666 | ::swap (l1, l2); |
676 | ::swap (l1, l2); |
667 | l2.touch (); |
677 | l2.touch (); |
668 | } |
678 | } |
669 | |
679 | |
670 | // move and/or clear selection, if any |
680 | // move and/or clear selection, if any |
671 | if (selection.op && current_screen == selection.screen) |
681 | if (selection.op && current_screen == selection.screen) |
672 | { |
682 | { |
673 | selection.beg.row -= count; |
683 | selection.beg.row -= count; |
674 | selection.end.row -= count; |
684 | selection.end.row -= count; |
… | |
… | |
710 | { |
720 | { |
711 | /* move selected region too */ |
721 | /* move selected region too */ |
712 | selection.beg.row -= count; |
722 | selection.beg.row -= count; |
713 | selection.end.row -= count; |
723 | selection.end.row -= count; |
714 | selection.mark.row -= count; |
724 | selection.mark.row -= count; |
715 | |
725 | |
716 | selection_check (0); |
726 | selection_check (0); |
717 | } |
727 | } |
718 | } |
728 | } |
719 | |
729 | |
720 | // use a simple and robust scrolling algorithm, this |
730 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
772 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
782 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
773 | screen.cur.row -= minlines; |
783 | screen.cur.row -= minlines; |
774 | } |
784 | } |
775 | } |
785 | } |
776 | |
786 | |
777 | #ifdef DEBUG_STRICT |
|
|
778 | assert (screen.cur.col < ncol); |
787 | assert (screen.cur.col < ncol); |
779 | assert (screen.cur.row < nrow |
788 | assert (screen.cur.row < nrow |
780 | && screen.cur.row >= top_row); |
789 | && screen.cur.row >= top_row); |
781 | #endif |
|
|
782 | int row = screen.cur.row; |
790 | int row = screen.cur.row; |
783 | |
791 | |
784 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
792 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
785 | |
793 | |
786 | line_t *line = &ROW(row); |
794 | line_t *line = &ROW(row); |
787 | |
795 | |
788 | while (str < strend) |
796 | while (str < strend) |
789 | { |
797 | { |
790 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
798 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
791 | |
799 | |
792 | if (c < 0x20) |
800 | if (expect_false (c < 0x20)) |
793 | if (c == C0_LF) |
801 | if (c == C0_LF) |
794 | { |
802 | { |
795 | max_it (line->l, screen.cur.col); |
803 | max_it (line->l, screen.cur.col); |
796 | |
804 | |
797 | screen.flags &= ~Screen_WrapNext; |
805 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
816 | { |
824 | { |
817 | scr_tab (1, true); |
825 | scr_tab (1, true); |
818 | continue; |
826 | continue; |
819 | } |
827 | } |
820 | |
828 | |
|
|
829 | if (expect_false ( |
821 | if (checksel /* see if we're writing within selection */ |
830 | checksel /* see if we're writing within selection */ |
822 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
831 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
823 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
832 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
833 | )) |
824 | { |
834 | { |
825 | checksel = 0; |
835 | checksel = 0; |
826 | /* |
836 | /* |
827 | * If we wrote anywhere in the selected area, kill the selection |
837 | * If we wrote anywhere in the selected area, kill the selection |
828 | * XXX: should we kill the mark too? Possibly, but maybe that |
838 | * XXX: should we kill the mark too? Possibly, but maybe that |
829 | * should be a similar check. |
839 | * should be a similar check. |
830 | */ |
840 | */ |
831 | CLEAR_SELECTION (); |
841 | CLEAR_SELECTION (); |
832 | } |
842 | } |
833 | |
843 | |
834 | if (screen.flags & Screen_WrapNext) |
844 | if (expect_false (screen.flags & Screen_WrapNext)) |
835 | { |
845 | { |
836 | scr_do_wrap (); |
846 | scr_do_wrap (); |
837 | |
847 | |
838 | line->l = ncol; |
848 | line->l = ncol; |
839 | line->is_longer (1); |
849 | line->is_longer (1); |
840 | |
850 | |
841 | row = screen.cur.row; |
851 | row = screen.cur.row; |
842 | line = &ROW(row); /* _must_ refresh */ |
852 | line = &ROW(row); /* _must_ refresh */ |
843 | } |
853 | } |
844 | |
854 | |
845 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
855 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
846 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
856 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
847 | c = 0xfffd; |
857 | c = 0xfffd; |
848 | |
858 | |
849 | // rely on wcwidth to tell us the character width, do wcwidth before |
859 | // rely on wcwidth to tell us the character width, do wcwidth before |
850 | // further replacements, as wcwidth might return -1 for the line |
860 | // further replacements, as wcwidth might return -1 for the line |
851 | // drawing characters below as they might be invalid in the current |
861 | // drawing characters below as they might be invalid in the current |
852 | // locale. |
862 | // locale. |
853 | int width = WCWIDTH (c); |
863 | int width = WCWIDTH (c); |
854 | |
864 | |
855 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
865 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
856 | { |
866 | { |
857 | // vt100 special graphics and line drawing |
867 | // vt100 special graphics and line drawing |
858 | // 5f-7e standard vt100 |
868 | // 5f-7e standard vt100 |
859 | // 40-5e rxvt extension for extra curses acs chars |
869 | // 40-5e rxvt extension for extra curses acs chars |
860 | static uint16_t vt100_0[62] = { // 41 .. 7e |
870 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
873 | c = vt100_0[c - 0x41]; |
883 | c = vt100_0[c - 0x41]; |
874 | width = 1; // vt100 line drawing characters are always single-width |
884 | width = 1; // vt100 line drawing characters are always single-width |
875 | } |
885 | } |
876 | } |
886 | } |
877 | |
887 | |
878 | if (screen.flags & Screen_Insert) |
888 | if (expect_false (screen.flags & Screen_Insert)) |
879 | scr_insdel_chars (width, INSERT); |
889 | scr_insdel_chars (width, INSERT); |
880 | |
890 | |
881 | if (width != 0) |
891 | if (width != 0) |
882 | { |
892 | { |
883 | #if !UNICODE_3 |
893 | #if !UNICODE_3 |
… | |
… | |
889 | c = 0xfffd; |
899 | c = 0xfffd; |
890 | # endif |
900 | # endif |
891 | #endif |
901 | #endif |
892 | |
902 | |
893 | // nuke the character at this position, if required |
903 | // nuke the character at this position, if required |
|
|
904 | if (expect_false ( |
894 | if (line->t[screen.cur.col] == NOCHAR |
905 | line->t[screen.cur.col] == NOCHAR |
895 | || (screen.cur.col < ncol - 1 |
906 | || (screen.cur.col < ncol - 1 |
896 | && 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)) |
897 | { |
915 | { |
898 | int col = screen.cur.col; |
916 | // ... artificially enlargen the previous one |
899 | |
|
|
900 | // find begin |
|
|
901 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
902 | col--; |
|
|
903 | |
|
|
904 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
905 | |
|
|
906 | // found begin, nuke |
|
|
907 | do { |
|
|
908 | line->t[col] = ' '; |
|
|
909 | line->r[col] = rend; |
|
|
910 | col++; |
|
|
911 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
912 | } |
|
|
913 | |
|
|
914 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
915 | |
|
|
916 | // if the character doesn't fit into the remaining columns... |
|
|
917 | if (screen.cur.col > ncol - width && ncol >= width) |
|
|
918 | { |
|
|
919 | // ...output spaces |
|
|
920 | c = ' '; |
917 | c = NOCHAR; |
921 | // and try the same character next loop iteration |
918 | // and try the same character next loop iteration |
922 | --str; |
919 | --str; |
923 | } |
920 | } |
924 | |
921 | |
925 | line->touch (); |
922 | line->touch (); |
… | |
… | |
927 | do |
924 | do |
928 | { |
925 | { |
929 | line->t[screen.cur.col] = c; |
926 | line->t[screen.cur.col] = c; |
930 | line->r[screen.cur.col] = rend; |
927 | line->r[screen.cur.col] = rend; |
931 | |
928 | |
932 | if (screen.cur.col < ncol - 1) |
929 | if (expect_true (screen.cur.col < ncol - 1)) |
933 | screen.cur.col++; |
930 | screen.cur.col++; |
934 | else |
931 | else |
935 | { |
932 | { |
936 | line->l = ncol; |
933 | line->l = ncol; |
937 | if (screen.flags & Screen_Autowrap) |
934 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
939 | break; |
936 | break; |
940 | } |
937 | } |
941 | |
938 | |
942 | c = NOCHAR; |
939 | c = NOCHAR; |
943 | } |
940 | } |
944 | while (--width > 0); |
941 | while (expect_false (--width > 0)); |
945 | |
942 | |
946 | // pad with spaces when overwriting wide character with smaller one |
943 | // pad with spaces when overwriting wide character with smaller one |
947 | if (!width) |
944 | if (expect_false (!width)) |
948 | { |
945 | { |
949 | line->touch (); |
946 | line->touch (); |
950 | |
947 | |
951 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
948 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
952 | { |
949 | { |
953 | line->t[c] = ' '; |
950 | line->t[c] = ' '; |
954 | line->r[c] = rend; |
951 | line->r[c] = rend; |
955 | } |
952 | } |
956 | } |
953 | } |
957 | } |
954 | } |
|
|
955 | #if ENABLE_COMBINING |
958 | else // width == 0 |
956 | else // width == 0 |
959 | { |
957 | { |
960 | #if ENABLE_COMBINING |
958 | if (c != 0xfeff) // ignore BOM |
961 | // handle combining characters |
|
|
962 | // we just tag the accent on the previous on-screen character. |
|
|
963 | // this is arguably not correct, but also arguably not wrong. |
|
|
964 | // we don't handle double-width characters nicely yet. |
|
|
965 | line_t *linep; |
|
|
966 | text_t *tp; |
|
|
967 | rend_t *rp; |
|
|
968 | |
|
|
969 | if (screen.cur.col > 0) |
|
|
970 | { |
959 | { |
|
|
960 | // handle combining characters |
|
|
961 | // we just tag the accent on the previous on-screen character. |
|
|
962 | // this is arguably not correct, but also arguably not wrong. |
|
|
963 | // we don't handle double-width characters nicely yet. |
|
|
964 | line_t *linep; |
|
|
965 | text_t *tp; |
|
|
966 | rend_t *rp; |
|
|
967 | |
|
|
968 | if (screen.cur.col > 0) |
|
|
969 | { |
971 | linep = line; |
970 | linep = line; |
972 | tp = line->t + screen.cur.col - 1; |
971 | tp = line->t + screen.cur.col - 1; |
973 | rp = line->r + screen.cur.col - 1; |
972 | rp = line->r + screen.cur.col - 1; |
|
|
973 | } |
|
|
974 | else if (screen.cur.row > 0 |
|
|
975 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
976 | { |
|
|
977 | linep = &ROW(screen.cur.row - 1); |
|
|
978 | tp = line->t + ncol - 1; |
|
|
979 | rp = line->r + ncol - 1; |
|
|
980 | } |
|
|
981 | else |
|
|
982 | continue; |
|
|
983 | |
|
|
984 | linep->touch (); |
|
|
985 | |
|
|
986 | while (*tp == NOCHAR && tp > linep->t) |
|
|
987 | tp--, rp--; |
|
|
988 | |
|
|
989 | // first try to find a precomposed character |
|
|
990 | unicode_t n = rxvt_compose (*tp, c); |
|
|
991 | if (n == NOCHAR) |
|
|
992 | n = rxvt_composite.compose (*tp, c); |
|
|
993 | |
|
|
994 | *tp = n; |
|
|
995 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
974 | } |
996 | } |
975 | else if (screen.cur.row > 0 |
|
|
976 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
977 | { |
|
|
978 | linep = &ROW(screen.cur.row - 1); |
|
|
979 | tp = line->t + ncol - 1; |
|
|
980 | rp = line->r + ncol - 1; |
|
|
981 | } |
997 | } |
982 | else |
|
|
983 | continue; |
|
|
984 | |
|
|
985 | linep->touch (); |
|
|
986 | |
|
|
987 | while (*tp == NOCHAR && tp > linep->t) |
|
|
988 | tp--, rp--; |
|
|
989 | |
|
|
990 | // first try to find a precomposed character |
|
|
991 | unicode_t n = rxvt_compose (*tp, c); |
|
|
992 | if (n == NOCHAR) |
|
|
993 | n = rxvt_composite.compose (*tp, c); |
|
|
994 | |
|
|
995 | *tp = n; |
|
|
996 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
997 | #endif |
998 | #endif |
998 | } |
|
|
999 | } |
999 | } |
1000 | |
1000 | |
1001 | max_it (line->l, screen.cur.col); |
1001 | max_it (line->l, screen.cur.col); |
1002 | |
1002 | |
1003 | #ifdef DEBUG_STRICT |
|
|
1004 | assert (screen.cur.row >= 0); |
1003 | assert (screen.cur.row >= 0); |
1005 | #endif |
|
|
1006 | } |
1004 | } |
1007 | |
1005 | |
1008 | /* ------------------------------------------------------------------------- */ |
1006 | /* ------------------------------------------------------------------------- */ |
1009 | /* |
1007 | /* |
1010 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1008 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1011 | * XTERM_SEQ: CTRL-H |
1009 | * XTERM_SEQ: CTRL-H |
1012 | */ |
1010 | */ |
1013 | void |
1011 | void |
1014 | rxvt_term::scr_backspace () NOTHROW |
1012 | rxvt_term::scr_backspace () NOTHROW |
1015 | { |
1013 | { |
1016 | want_refresh = 1; |
|
|
1017 | |
|
|
1018 | if (screen.cur.col == 0) |
1014 | if (screen.cur.col == 0) |
1019 | { |
1015 | { |
1020 | if (screen.cur.row > 0) |
1016 | if (screen.cur.row > 0) |
1021 | { |
1017 | { |
1022 | #ifdef TERMCAP_HAS_BW |
1018 | #ifdef TERMCAP_HAS_BW |
1023 | screen.cur.col = ncol - 1; |
1019 | screen.cur.col = ncol - 1; |
1024 | screen.cur.row--; |
1020 | --screen.cur.row; |
1025 | return; |
1021 | |
|
|
1022 | want_refresh = 1; |
1026 | #endif |
1023 | #endif |
1027 | } |
1024 | } |
1028 | } |
1025 | } |
1029 | else if (!(screen.flags & Screen_WrapNext)) |
1026 | else |
1030 | scr_gotorc (0, -1, RELATIVE); |
1027 | scr_gotorc (0, -1, RELATIVE); |
1031 | |
|
|
1032 | screen.flags &= ~Screen_WrapNext; |
|
|
1033 | } |
1028 | } |
1034 | |
1029 | |
1035 | /* ------------------------------------------------------------------------- */ |
1030 | /* ------------------------------------------------------------------------- */ |
1036 | /* |
1031 | /* |
1037 | * Process Horizontal Tab |
1032 | * Process Horizontal Tab |
… | |
… | |
1060 | x = i; |
1055 | x = i; |
1061 | |
1056 | |
1062 | if (!--count) |
1057 | if (!--count) |
1063 | break; |
1058 | break; |
1064 | } |
1059 | } |
1065 | else |
1060 | else |
1066 | ht &= l.t[i] == ' ' |
1061 | ht &= l.t[i] == ' ' |
1067 | && RS_SAME (l.r[i], base_rend); |
1062 | && RS_SAME (l.r[i], base_rend); |
1068 | |
1063 | |
1069 | if (count) |
1064 | if (count) |
1070 | x = ncol - 1; |
1065 | x = ncol - 1; |
… | |
… | |
1186 | } |
1181 | } |
1187 | } |
1182 | } |
1188 | else |
1183 | else |
1189 | { |
1184 | { |
1190 | if (screen.flags & Screen_Relative) |
1185 | if (screen.flags & Screen_Relative) |
|
|
1186 | { |
1191 | { /* relative origin mode */ |
1187 | /* relative origin mode */ |
1192 | screen.cur.row = row + screen.tscroll; |
1188 | screen.cur.row = row + screen.tscroll; |
1193 | min_it (screen.cur.row, screen.bscroll); |
1189 | min_it (screen.cur.row, screen.bscroll); |
1194 | } |
1190 | } |
1195 | else |
1191 | else |
1196 | screen.cur.row = row; |
1192 | screen.cur.row = row; |
… | |
… | |
1229 | /* |
1225 | /* |
1230 | * Erase part or whole of a line |
1226 | * Erase part or whole of a line |
1231 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1227 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1232 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1228 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1233 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1229 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1230 | * extension: clear to right unless wrapped: ESC [ 3 K |
1234 | */ |
1231 | */ |
1235 | void |
1232 | void |
1236 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1233 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1237 | { |
1234 | { |
1238 | unsigned int col, num; |
1235 | unsigned int col, num; |
… | |
… | |
1247 | line.touch (); |
1244 | line.touch (); |
1248 | line.is_longer (0); |
1245 | line.is_longer (0); |
1249 | |
1246 | |
1250 | switch (mode) |
1247 | switch (mode) |
1251 | { |
1248 | { |
|
|
1249 | case 3: |
|
|
1250 | if (screen.flags & Screen_WrapNext) |
|
|
1251 | return; |
|
|
1252 | |
|
|
1253 | /* fall through */ |
|
|
1254 | |
1252 | case 0: /* erase to end of line */ |
1255 | case 0: /* erase to end of line */ |
1253 | col = screen.cur.col; |
1256 | col = screen.cur.col; |
1254 | num = ncol - col; |
1257 | num = ncol - col; |
1255 | min_it (line.l, col); |
1258 | min_it (line.l, col); |
|
|
1259 | |
1256 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1260 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1257 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1261 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1258 | CLEAR_SELECTION (); |
1262 | CLEAR_SELECTION (); |
1259 | break; |
1263 | break; |
|
|
1264 | |
1260 | case 1: /* erase to beginning of line */ |
1265 | case 1: /* erase to beginning of line */ |
1261 | col = 0; |
1266 | col = 0; |
1262 | num = screen.cur.col + 1; |
1267 | num = screen.cur.col + 1; |
|
|
1268 | |
1263 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1269 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1264 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1270 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1265 | CLEAR_SELECTION (); |
1271 | CLEAR_SELECTION (); |
1266 | break; |
1272 | break; |
|
|
1273 | |
1267 | case 2: /* erase whole line */ |
1274 | case 2: /* erase whole line */ |
1268 | col = 0; |
1275 | col = 0; |
1269 | num = ncol; |
1276 | num = ncol; |
1270 | line.l = 0; |
1277 | line.l = 0; |
1271 | if (selection.beg.row <= screen.cur.row |
1278 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1329 | if (row >= nrow) /* Out Of Bounds */ |
1336 | if (row >= nrow) /* Out Of Bounds */ |
1330 | return; |
1337 | return; |
1331 | |
1338 | |
1332 | min_it (num, nrow - row); |
1339 | min_it (num, nrow - row); |
1333 | |
1340 | |
1334 | if (rstyle & (RS_RVid | RS_Uline)) |
1341 | if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) |
1335 | ren = (rend_t) ~RS_None; |
1342 | ren = (rend_t) ~RS_None; |
1336 | else if (GET_BASEBG (rstyle) == Color_bg) |
1343 | else if (GET_BASEBG (rstyle) == Color_bg) |
1337 | { |
1344 | { |
1338 | ren = DEFAULT_RSTYLE; |
1345 | ren = DEFAULT_RSTYLE; |
1339 | CLEAR_ROWS (row, num); |
1346 | |
|
|
1347 | if (mapped) |
|
|
1348 | XClearArea (dpy, vt, 0, |
|
|
1349 | Row2Pixel (row - view_start), (unsigned int)width, |
|
|
1350 | (unsigned int)Height2Pixel (num), False); |
1340 | } |
1351 | } |
1341 | else |
1352 | else |
1342 | { |
1353 | { |
1343 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1354 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1355 | |
|
|
1356 | if (mapped) |
|
|
1357 | { |
1344 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1358 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1345 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1359 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1346 | ERASE_ROWS (row, num); |
1360 | XFillRectangle (dpy, vt, gc, |
|
|
1361 | 0, Row2Pixel (row - view_start), |
|
|
1362 | (unsigned int)width, |
|
|
1363 | (unsigned int)Height2Pixel (num)); |
1347 | gcvalue.foreground = pix_colors[Color_fg]; |
1364 | gcvalue.foreground = pix_colors[Color_fg]; |
1348 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1365 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1366 | } |
1349 | } |
1367 | } |
1350 | |
1368 | |
1351 | for (; num--; row++) |
1369 | for (; num--; row++) |
1352 | { |
1370 | { |
1353 | scr_blank_screen_mem (ROW(row), rstyle); |
1371 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1372 | |
|
|
1373 | if (row - view_start < nrow) |
1354 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1374 | scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren); |
1355 | } |
1375 | } |
1356 | } |
1376 | } |
1357 | |
1377 | |
1358 | #if !ENABLE_MINIMAL |
1378 | #if !ENABLE_MINIMAL |
1359 | void |
1379 | void |
… | |
… | |
1433 | * Insert/Delete <count> characters from the current position |
1453 | * Insert/Delete <count> characters from the current position |
1434 | */ |
1454 | */ |
1435 | void |
1455 | void |
1436 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1456 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1437 | { |
1457 | { |
1438 | int col, row; |
|
|
1439 | rend_t tr; |
|
|
1440 | |
|
|
1441 | want_refresh = 1; |
1458 | want_refresh = 1; |
1442 | ZERO_SCROLLBACK (); |
1459 | ZERO_SCROLLBACK (); |
1443 | |
1460 | |
1444 | if (count <= 0) |
1461 | if (count <= 0) |
1445 | return; |
1462 | return; |
… | |
… | |
1447 | scr_do_wrap (); |
1464 | scr_do_wrap (); |
1448 | |
1465 | |
1449 | selection_check (1); |
1466 | selection_check (1); |
1450 | min_it (count, ncol - screen.cur.col); |
1467 | min_it (count, ncol - screen.cur.col); |
1451 | |
1468 | |
1452 | row = screen.cur.row; |
1469 | int row = screen.cur.row; |
1453 | |
1470 | |
1454 | line_t *line = &ROW(row); |
1471 | line_t *line = &ROW(row); |
1455 | |
1472 | |
1456 | line->touch (); |
1473 | line->touch (); |
1457 | line->is_longer (0); |
1474 | line->is_longer (0); |
1458 | |
1475 | |
|
|
1476 | // nuke wide spanning the start |
|
|
1477 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1478 | scr_kill_char (*line, screen.cur.col); |
|
|
1479 | |
1459 | switch (insdel) |
1480 | switch (insdel) |
1460 | { |
1481 | { |
1461 | case INSERT: |
1482 | case INSERT: |
1462 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1483 | line->l = min (line->l + count, ncol); |
|
|
1484 | |
|
|
1485 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1486 | scr_kill_char (*line, screen.cur.col); |
|
|
1487 | |
|
|
1488 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1463 | { |
1489 | { |
1464 | line->t[col] = line->t[col - count]; |
1490 | line->t[col] = line->t[col - count]; |
1465 | line->r[col] = line->r[col - count]; |
1491 | line->r[col] = line->r[col - count]; |
1466 | } |
1492 | } |
1467 | |
|
|
1468 | line->l = min (line->l + count, ncol); |
|
|
1469 | |
1493 | |
1470 | if (selection.op && current_screen == selection.screen |
1494 | if (selection.op && current_screen == selection.screen |
1471 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1495 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1472 | { |
1496 | { |
1473 | if (selection.end.row != screen.cur.row |
1497 | if (selection.end.row != screen.cur.row |
1474 | || (selection.end.col + count >= ncol)) |
1498 | || (selection.end.col + count >= ncol)) |
1475 | CLEAR_SELECTION (); |
1499 | CLEAR_SELECTION (); |
1476 | else |
1500 | else |
|
|
1501 | { |
1477 | { /* shift selection */ |
1502 | /* shift selection */ |
1478 | selection.beg.col += count; |
1503 | selection.beg.col += count; |
1479 | selection.mark.col += count; /* XXX: yes? */ |
1504 | selection.mark.col += count; /* XXX: yes? */ |
1480 | selection.end.col += count; |
1505 | selection.end.col += count; |
1481 | } |
1506 | } |
1482 | } |
1507 | } |
… | |
… | |
1487 | case ERASE: |
1512 | case ERASE: |
1488 | screen.cur.col += count; /* don't worry if > ncol */ |
1513 | screen.cur.col += count; /* don't worry if > ncol */ |
1489 | selection_check (1); |
1514 | selection_check (1); |
1490 | screen.cur.col -= count; |
1515 | screen.cur.col -= count; |
1491 | |
1516 | |
1492 | line->l = max (line->l - count, 0); |
1517 | // nuke wide char after the end |
|
|
1518 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1519 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1520 | |
1493 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1521 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1494 | break; |
1522 | break; |
1495 | |
1523 | |
1496 | case DELETE: |
1524 | case DELETE: |
1497 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1525 | line->l = max (line->l - count, 0); |
1498 | |
1526 | |
|
|
1527 | // nuke wide char spanning the end |
|
|
1528 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1529 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1530 | |
1499 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1531 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1500 | { |
1532 | { |
1501 | line->t[col] = line->t[col + count]; |
1533 | line->t[col] = line->t[col + count]; |
1502 | line->r[col] = line->r[col + count]; |
1534 | line->r[col] = line->r[col + count]; |
1503 | } |
1535 | } |
1504 | |
1536 | |
1505 | line->l = max (line->l - count, 0); |
|
|
1506 | scr_blank_line (*line, ncol - count, count, tr); |
1537 | scr_blank_line (*line, ncol - count, count, rstyle); |
1507 | |
1538 | |
1508 | if (selection.op && current_screen == selection.screen |
1539 | if (selection.op && current_screen == selection.screen |
1509 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1540 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1510 | { |
1541 | { |
1511 | if (selection.end.row != screen.cur.row |
1542 | if (selection.end.row != screen.cur.row |
… | |
… | |
1621 | */ |
1652 | */ |
1622 | void |
1653 | void |
1623 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1654 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1624 | { |
1655 | { |
1625 | if (mode < 0) |
1656 | if (mode < 0) |
1626 | memset (tabs, 0, ncol * sizeof (char)); |
1657 | memset (tabs, 0, ncol); |
1627 | else if (screen.cur.col < ncol) |
1658 | else if (screen.cur.col < ncol) |
1628 | tabs [screen.cur.col] = !!mode; |
1659 | tabs [screen.cur.col] = !!mode; |
1629 | } |
1660 | } |
1630 | |
1661 | |
1631 | /* ------------------------------------------------------------------------- */ |
1662 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1648 | rvideo_state = on; |
1679 | rvideo_state = on; |
1649 | |
1680 | |
1650 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1681 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1651 | #ifdef HAVE_BG_PIXMAP |
1682 | #ifdef HAVE_BG_PIXMAP |
1652 | if (bgPixmap.pixmap == None) |
1683 | if (bgPixmap.pixmap == None) |
1653 | #endif |
|
|
1654 | #if ENABLE_TRANSPARENCY |
|
|
1655 | if (!option (Opt_transparent) || am_transparent == 0) |
|
|
1656 | #endif |
1684 | #endif |
1657 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1685 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1658 | |
1686 | |
1659 | XGCValues gcvalue; |
1687 | XGCValues gcvalue; |
1660 | gcvalue.foreground = pix_colors[Color_fg]; |
1688 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1869 | return true; |
1897 | return true; |
1870 | } |
1898 | } |
1871 | |
1899 | |
1872 | #ifndef NO_BELL |
1900 | #ifndef NO_BELL |
1873 | void |
1901 | void |
1874 | rxvt_term::bell_cb (time_watcher &w) |
1902 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1875 | { |
1903 | { |
1876 | rvideo_bell = false; |
1904 | rvideo_bell = false; |
1877 | scr_rvideo_mode (rvideo_mode); |
1905 | scr_rvideo_mode (rvideo_mode); |
|
|
1906 | refresh_check (); |
1878 | } |
1907 | } |
1879 | #endif |
1908 | #endif |
1880 | |
1909 | |
1881 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
1882 | void |
1911 | void |
… | |
… | |
1888 | # ifdef MAPALERT_OPTION |
1917 | # ifdef MAPALERT_OPTION |
1889 | if (option (Opt_mapAlert)) |
1918 | if (option (Opt_mapAlert)) |
1890 | # endif |
1919 | # endif |
1891 | XMapWindow (dpy, parent[0]); |
1920 | XMapWindow (dpy, parent[0]); |
1892 | # endif |
1921 | # endif |
|
|
1922 | |
1893 | # if ENABLE_FRILLS |
1923 | # if ENABLE_FRILLS |
1894 | if (option (Opt_urgentOnBell)) |
1924 | if (option (Opt_urgentOnBell)) |
1895 | { |
1925 | set_urgency (1); |
1896 | XWMHints *h; |
|
|
1897 | |
|
|
1898 | h = XGetWMHints(dpy, parent[0]); |
|
|
1899 | if (h != NULL) |
|
|
1900 | { |
|
|
1901 | h->flags |= XUrgencyHint; |
|
|
1902 | XSetWMHints(dpy, parent[0], h); |
|
|
1903 | } |
|
|
1904 | } |
|
|
1905 | # endif |
1926 | # endif |
1906 | |
1927 | |
1907 | if (option (Opt_visualBell)) |
1928 | if (option (Opt_visualBell)) |
1908 | { |
1929 | { |
1909 | rvideo_bell = true; |
1930 | rvideo_bell = true; |
1910 | scr_rvideo_mode (rvideo_mode); |
1931 | scr_rvideo_mode (rvideo_mode); |
1911 | display->flush (); |
1932 | flush (); |
1912 | |
1933 | |
1913 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1934 | bell_ev.start (VISUAL_BELL_DURATION); |
1914 | } |
1935 | } |
1915 | else |
1936 | else |
1916 | XBell (dpy, 0); |
1937 | XBell (dpy, 0); |
|
|
1938 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1917 | #endif |
1939 | #endif |
1918 | } |
1940 | } |
1919 | |
1941 | |
1920 | /* ------------------------------------------------------------------------- */ |
1942 | /* ------------------------------------------------------------------------- */ |
1921 | /* ARGSUSED */ |
1943 | /* ARGSUSED */ |
1922 | void |
1944 | void |
1923 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1945 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1924 | { |
1946 | { |
1925 | #ifdef PRINTPIPE |
1947 | #ifdef PRINTPIPE |
1926 | int nrows, row_start; |
1948 | int nrows, row_start; |
1927 | FILE *fd; |
1949 | FILE *fd = popen_printer (); |
1928 | |
1950 | |
1929 | if ((fd = popen_printer ()) == NULL) |
1951 | if (!fd) |
1930 | return; |
1952 | return; |
1931 | |
1953 | |
1932 | if (fullhist) |
1954 | if (fullhist) |
1933 | { |
1955 | { |
1934 | nrows = nrow - top_row; |
1956 | nrows = nrow - top_row; |
… | |
… | |
1940 | row_start = view_start; |
1962 | row_start = view_start; |
1941 | } |
1963 | } |
1942 | |
1964 | |
1943 | wctomb (0, 0); |
1965 | wctomb (0, 0); |
1944 | |
1966 | |
1945 | for (int r1 = 0; r1 < nrows; r1++) |
1967 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1946 | { |
1968 | { |
1947 | text_t *tp = ROW(r1).t; |
1969 | text_t *tp = ROW(r1).t; |
1948 | int len = ROW(r1).l; |
1970 | int len = ROW(r1).l; |
1949 | |
1971 | |
1950 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1972 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1979 | * screen.text/screen.rend contain what the screen will change to. |
2001 | * screen.text/screen.rend contain what the screen will change to. |
1980 | */ |
2002 | */ |
1981 | void |
2003 | void |
1982 | rxvt_term::scr_refresh () NOTHROW |
2004 | rxvt_term::scr_refresh () NOTHROW |
1983 | { |
2005 | { |
1984 | unsigned char have_bg, |
|
|
1985 | showcursor; /* show the cursor */ |
|
|
1986 | int16_t col, row, /* column/row we're processing */ |
2006 | int16_t col, row, /* column/row we're processing */ |
1987 | ocrow; /* old cursor row */ |
2007 | ocrow; /* old cursor row */ |
1988 | int i; /* tmp */ |
2008 | int i; /* tmp */ |
1989 | #ifndef NO_CURSORCOLOR |
2009 | #ifndef NO_CURSORCOLOR |
1990 | rend_t cc1; /* store colours at cursor position (s) */ |
2010 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
1999 | return; |
2019 | return; |
2000 | |
2020 | |
2001 | /* |
2021 | /* |
2002 | * A: set up vars |
2022 | * A: set up vars |
2003 | */ |
2023 | */ |
2004 | have_bg = 0; |
|
|
2005 | refresh_count = 0; |
2024 | refresh_count = 0; |
2006 | |
2025 | |
|
|
2026 | unsigned int old_screen_flags = screen.flags; |
|
|
2027 | char have_bg = 0; |
2007 | #ifdef HAVE_BG_PIXMAP |
2028 | #ifdef HAVE_BG_PIXMAP |
2008 | have_bg |= bgPixmap.pixmap != None; |
2029 | have_bg = bgPixmap.pixmap != None; |
2009 | #endif |
|
|
2010 | #if ENABLE_TRANSPARENCY |
|
|
2011 | have_bg |= option (Opt_transparent) && am_transparent; |
|
|
2012 | #endif |
2030 | #endif |
2013 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2031 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2014 | |
2032 | |
2015 | /* |
2033 | /* |
2016 | * B: reverse any characters which are selected |
2034 | * B: reverse any characters which are selected |
2017 | */ |
2035 | */ |
2018 | scr_reverse_selection (); |
2036 | scr_reverse_selection (); |
|
|
2037 | |
|
|
2038 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2039 | #if ENABLE_OVERLAY |
|
|
2040 | scr_swap_overlay (); |
|
|
2041 | #endif |
|
|
2042 | |
|
|
2043 | char showcursor = screen.flags & Screen_VisibleCursor; |
2019 | |
2044 | |
2020 | /* |
2045 | /* |
2021 | * C: set the cursor character (s) |
2046 | * C: set the cursor character (s) |
2022 | */ |
2047 | */ |
2023 | { |
2048 | { |
2024 | unsigned char setoldcursor; |
2049 | unsigned char setoldcursor; |
2025 | |
2050 | |
2026 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2027 | #ifdef CURSOR_BLINK |
2051 | #ifdef CURSOR_BLINK |
2028 | if (hidden_cursor) |
2052 | if (hidden_cursor) |
2029 | showcursor = 0; |
2053 | showcursor = 0; |
2030 | #endif |
2054 | #endif |
2031 | |
2055 | |
… | |
… | |
2059 | ccol2 = bgcolor_of (rstyle); |
2083 | ccol2 = bgcolor_of (rstyle); |
2060 | #else |
2084 | #else |
2061 | ccol2 = Color_bg; |
2085 | ccol2 = Color_bg; |
2062 | #endif |
2086 | #endif |
2063 | |
2087 | |
2064 | if (showcursor && focus) |
2088 | if (focus) |
2065 | { |
2089 | { |
2066 | if (option (Opt_cursorUnderline)) |
2090 | if (option (Opt_cursorUnderline)) |
2067 | *crp ^= RS_Uline; |
2091 | *crp ^= RS_Uline; |
2068 | else |
2092 | else |
2069 | { |
2093 | { |
… | |
… | |
2104 | oldcursor.col = screen.cur.col; |
2128 | oldcursor.col = screen.cur.col; |
2105 | } |
2129 | } |
2106 | } |
2130 | } |
2107 | } |
2131 | } |
2108 | |
2132 | |
2109 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2110 | #if ENABLE_OVERLAY |
|
|
2111 | scr_swap_overlay (); |
|
|
2112 | #endif |
|
|
2113 | |
|
|
2114 | #ifndef NO_SLOW_LINK_SUPPORT |
2133 | #ifndef NO_SLOW_LINK_SUPPORT |
2115 | /* |
2134 | /* |
2116 | * D: CopyArea pass - very useful for slower links |
2135 | * D: CopyArea pass - very useful for slower links |
2117 | * This has been deliberately kept simple. |
2136 | * This has been deliberately kept simple. |
2118 | */ |
2137 | */ |
… | |
… | |
2207 | continue; |
2226 | continue; |
2208 | |
2227 | |
2209 | // redraw one or more characters |
2228 | // redraw one or more characters |
2210 | |
2229 | |
2211 | // seek to the beginning of wide characters |
2230 | // seek to the beginning of wide characters |
2212 | while (stp[col] == NOCHAR && col > 0) |
2231 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2213 | --col; |
2232 | --col; |
2214 | |
2233 | |
2215 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2234 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2216 | text_t *text = stp + col; |
2235 | text_t *text = stp + col; |
2217 | int count = 1; |
2236 | int count = 1; |
2218 | |
2237 | |
2219 | dtp[col] = stp[col]; |
2238 | dtp[col] = stp[col]; |
2220 | drp[col] = rend; |
2239 | drp[col] = rend; |
… | |
… | |
2224 | for (i = 0; ++col < ncol; ) |
2243 | for (i = 0; ++col < ncol; ) |
2225 | { |
2244 | { |
2226 | if (stp[col] == NOCHAR) |
2245 | if (stp[col] == NOCHAR) |
2227 | { |
2246 | { |
2228 | dtp[col] = stp[col]; |
2247 | dtp[col] = stp[col]; |
2229 | drp[col] = rend; |
2248 | drp[col] = srp[col]; |
|
|
2249 | |
2230 | count++; |
2250 | count++; |
2231 | i++; |
2251 | i++; |
2232 | |
2252 | |
2233 | continue; |
2253 | continue; |
2234 | } |
2254 | } |
… | |
… | |
2254 | |
2274 | |
2255 | col--; /* went one too far. move back */ |
2275 | col--; /* went one too far. move back */ |
2256 | count -= i; /* dump any matching trailing chars */ |
2276 | count -= i; /* dump any matching trailing chars */ |
2257 | |
2277 | |
2258 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2278 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2259 | while (i && text[count] == NOCHAR) |
2279 | while (expect_false (i && text[count] == NOCHAR)) |
2260 | count++, i--; |
2280 | count++, i--; |
2261 | |
2281 | |
2262 | /* |
2282 | /* |
2263 | * Determine the attributes for the string |
2283 | * Determine the attributes for the string |
2264 | */ |
2284 | */ |
2265 | int fore = fgcolor_of (rend); // desired foreground |
2285 | int fore = fgcolor_of (rend); // desired foreground |
2266 | int back = bgcolor_of (rend); // desired background |
2286 | int back = bgcolor_of (rend); // desired background |
2267 | |
2287 | |
2268 | // only do special processing if any attributes are set, which is unlikely |
2288 | // only do special processing if any attributes are set, which is unlikely |
2269 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2289 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2270 | { |
2290 | { |
2271 | bool invert = rend & RS_RVid; |
2291 | bool invert = rend & RS_RVid; |
2272 | |
2292 | |
2273 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2293 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2274 | if (rend & RS_Bold |
|
|
2275 | && fore == Color_fg) |
2294 | if (rend & RS_Bold && fore == Color_fg) |
2276 | { |
2295 | { |
2277 | if (ISSET_PIXCOLOR (Color_BD)) |
2296 | if (ISSET_PIXCOLOR (Color_BD)) |
2278 | fore = Color_BD; |
2297 | fore = Color_BD; |
2279 | # if !ENABLE_STYLES |
2298 | # if !ENABLE_STYLES |
2280 | else |
2299 | else |
2281 | invert = !invert; |
2300 | invert = !invert; |
2282 | # endif |
2301 | # endif |
2283 | } |
2302 | } |
2284 | |
2303 | |
2285 | if (rend & RS_Italic |
2304 | if (rend & RS_Italic && fore == Color_fg) |
2286 | && fore == Color_fg) |
|
|
2287 | { |
2305 | { |
2288 | if (ISSET_PIXCOLOR (Color_IT)) |
2306 | if (ISSET_PIXCOLOR (Color_IT)) |
2289 | fore = Color_IT; |
2307 | fore = Color_IT; |
2290 | # if !ENABLE_STYLES |
2308 | # if !ENABLE_STYLES |
2291 | else |
2309 | else |
… | |
… | |
2295 | |
2313 | |
2296 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2314 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2297 | fore = Color_UL; |
2315 | fore = Color_UL; |
2298 | #endif |
2316 | #endif |
2299 | |
2317 | |
|
|
2318 | #ifdef OPTION_HC |
|
|
2319 | if (rend & RS_Sel) |
|
|
2320 | { |
|
|
2321 | /* invert the column if no highlightColor is set or it is the |
|
|
2322 | * current cursor column */ |
|
|
2323 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2324 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2325 | { |
|
|
2326 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2327 | fore = Color_HTC; |
|
|
2328 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2329 | else if (!invert) |
|
|
2330 | fore = back; |
|
|
2331 | |
|
|
2332 | back = Color_HC; |
|
|
2333 | invert = 0; |
|
|
2334 | } |
|
|
2335 | } |
|
|
2336 | #endif |
|
|
2337 | |
2300 | if (invert) |
2338 | if (invert) |
2301 | { |
2339 | { |
2302 | #ifdef OPTION_HC |
|
|
2303 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2304 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2305 | #endif |
|
|
2306 | /* invert the column if no highlightColor is set or it is the |
|
|
2307 | * current cursor column */ |
|
|
2308 | ::swap (fore, back); |
2340 | ::swap (fore, back); |
2309 | #ifdef OPTION_HC |
|
|
2310 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2311 | back = Color_HC; |
|
|
2312 | #endif |
|
|
2313 | |
2341 | |
2314 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2342 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2315 | # ifndef OPTION_HC |
|
|
2316 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2317 | back = Color_RV; |
|
|
2318 | # endif |
|
|
2319 | if (fore == back) |
2343 | if (fore == back) |
2320 | { |
2344 | { |
2321 | fore = Color_bg; |
2345 | fore = Color_bg; |
2322 | back = Color_fg; |
2346 | back = Color_fg; |
2323 | } |
2347 | } |
… | |
… | |
2325 | } |
2349 | } |
2326 | |
2350 | |
2327 | #ifdef TEXT_BLINK |
2351 | #ifdef TEXT_BLINK |
2328 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2352 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2329 | { |
2353 | { |
2330 | if (!text_blink_ev.active) |
2354 | if (!text_blink_ev.is_active ()) |
2331 | { |
2355 | { |
2332 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2356 | text_blink_ev.again (); |
2333 | hidden_text = 0; |
2357 | hidden_text = 0; |
2334 | } |
2358 | } |
2335 | else if (hidden_text) |
2359 | else if (hidden_text) |
2336 | fore = back; |
2360 | fore = back; |
2337 | } |
2361 | } |
… | |
… | |
2359 | /* |
2383 | /* |
2360 | * Actually do the drawing of the string here |
2384 | * Actually do the drawing of the string here |
2361 | */ |
2385 | */ |
2362 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2386 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2363 | |
2387 | |
2364 | if (have_bg && back == Color_bg) |
2388 | if (expect_true (have_bg && back == Color_bg)) |
2365 | { |
2389 | { |
2366 | // this is very ugly, maybe push it into ->draw? |
2390 | // this is very ugly, maybe push it into ->draw? |
2367 | |
2391 | |
2368 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2392 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2369 | if (text[i] != ' ') |
2393 | if (text[i] != ' ') |
… | |
… | |
2376 | did_clear: ; |
2400 | did_clear: ; |
2377 | } |
2401 | } |
2378 | else |
2402 | else |
2379 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2403 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2380 | |
2404 | |
2381 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2405 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2382 | { |
2406 | { |
2383 | #if ENABLE_FRILLS |
2407 | #if ENABLE_FRILLS |
2384 | if (ISSET_PIXCOLOR (Color_underline)) |
2408 | if (ISSET_PIXCOLOR (Color_underline)) |
2385 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2409 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2386 | else |
2410 | else |
2387 | #endif |
2411 | #endif |
2388 | XSetForeground (dpy, gc, pix_colors[fore]); |
2412 | XSetForeground (dpy, gc, pix_colors[fore]); |
2389 | |
2413 | |
2390 | XDrawLine (dpy, drawBuffer, gc, |
2414 | XDrawLine (dpy, vt, gc, |
2391 | xpixel, ypixel + font->ascent + 1, |
2415 | xpixel, ypixel + font->ascent + 1, |
2392 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2416 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2393 | } |
2417 | } |
2394 | } /* for (col....) */ |
2418 | } /* for (col....) */ |
2395 | } /* for (row....) */ |
2419 | } /* for (row....) */ |
2396 | |
|
|
2397 | #if ENABLE_OVERLAY |
|
|
2398 | scr_swap_overlay (); |
|
|
2399 | #endif |
|
|
2400 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2401 | |
2420 | |
2402 | /* |
2421 | /* |
2403 | * G: cleanup cursor and display outline cursor if necessary |
2422 | * G: cleanup cursor and display outline cursor if necessary |
2404 | */ |
2423 | */ |
2405 | if (showcursor) |
2424 | if (showcursor) |
… | |
… | |
2433 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2452 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2434 | else |
2453 | else |
2435 | #endif |
2454 | #endif |
2436 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2455 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2437 | |
2456 | |
2438 | XDrawRectangle (dpy, drawBuffer, gc, |
2457 | XDrawRectangle (dpy, vt, gc, |
2439 | Col2Pixel (col), |
2458 | Col2Pixel (col), |
2440 | Row2Pixel (oldcursor.row), |
2459 | Row2Pixel (oldcursor.row), |
2441 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2460 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2442 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2461 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2443 | } |
2462 | } |
2444 | } |
2463 | } |
2445 | |
2464 | |
2446 | /* |
2465 | /* |
2447 | * H: cleanup selection |
2466 | * H: cleanup selection |
2448 | */ |
2467 | */ |
|
|
2468 | #if ENABLE_OVERLAY |
|
|
2469 | scr_swap_overlay (); |
|
|
2470 | #endif |
|
|
2471 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2472 | |
2449 | scr_reverse_selection (); |
2473 | scr_reverse_selection (); |
2450 | |
2474 | |
|
|
2475 | screen.flags = old_screen_flags; |
2451 | num_scr = 0; |
2476 | num_scr = 0; |
2452 | num_scr_allow = 1; |
2477 | num_scr_allow = 1; |
2453 | } |
2478 | } |
2454 | |
2479 | |
2455 | void |
2480 | void |
… | |
… | |
2478 | } |
2503 | } |
2479 | |
2504 | |
2480 | void |
2505 | void |
2481 | rxvt_term::scr_recolour () NOTHROW |
2506 | rxvt_term::scr_recolour () NOTHROW |
2482 | { |
2507 | { |
2483 | if (1 |
|
|
2484 | #if ENABLE_TRANSPARENCY |
|
|
2485 | && !am_transparent |
|
|
2486 | #endif |
|
|
2487 | #ifdef HAVE_BG_PIXMAP |
2508 | #ifdef HAVE_BG_PIXMAP |
2488 | && !bgPixmap.pixmap |
2509 | bgPixmap.apply (); |
2489 | #endif |
2510 | #else |
2490 | ) |
2511 | |
2491 | { |
|
|
2492 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2512 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2493 | XClearWindow (dpy, parent[0]); |
2513 | XClearWindow (dpy, parent[0]); |
2494 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2514 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2495 | #if HAVE_SCROLLBARS |
2515 | |
2496 | if (scrollBar.win) |
2516 | if (scrollBar.win) |
2497 | { |
2517 | { |
2498 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2518 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2499 | scrollBar.setIdle (); |
2519 | scrollBar.state = STATE_IDLE; |
2500 | scrollbar_show (0); |
2520 | scrollBar.show (0); |
2501 | } |
|
|
2502 | #endif |
|
|
2503 | } |
2521 | } |
2504 | |
2522 | |
|
|
2523 | #endif |
|
|
2524 | |
|
|
2525 | /* bgPixmap.apply () does not do the following : */ |
2505 | scr_clear (); |
2526 | scr_clear (); |
2506 | scr_touch (true); |
2527 | scr_touch (true); |
2507 | want_refresh = 1; |
2528 | want_refresh = 1; |
2508 | } |
2529 | } |
2509 | |
2530 | |
… | |
… | |
2579 | { |
2600 | { |
2580 | #if !ENABLE_MINIMAL |
2601 | #if !ENABLE_MINIMAL |
2581 | if (selection.rect) |
2602 | if (selection.rect) |
2582 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2603 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2583 | selection.end.row, selection.end.col, |
2604 | selection.end.row, selection.end.col, |
2584 | RS_RVid, RS_RVid | RS_Uline); |
2605 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2585 | else |
2606 | else |
2586 | #endif |
2607 | #endif |
2587 | scr_xor_span (selection.beg.row, selection.beg.col, |
2608 | scr_xor_span (selection.beg.row, selection.beg.col, |
2588 | selection.end.row, selection.end.col, |
2609 | selection.end.row, selection.end.col, |
2589 | RS_RVid); |
2610 | RS_Sel | RS_RVid); |
2590 | } |
2611 | } |
2591 | } |
2612 | } |
2592 | |
2613 | |
2593 | /* ------------------------------------------------------------------------- */ |
2614 | /* ------------------------------------------------------------------------- */ |
2594 | /* |
2615 | /* |
… | |
… | |
2601 | { |
2622 | { |
2602 | int row, wrote; |
2623 | int row, wrote; |
2603 | unsigned int width, towrite; |
2624 | unsigned int width, towrite; |
2604 | char r1[] = "\n"; |
2625 | char r1[] = "\n"; |
2605 | |
2626 | |
2606 | for (row = saveLines - nsaved; |
2627 | for (row = saveLines + top_row; |
2607 | row < saveLines + nrow - 1; row++) |
2628 | row < saveLines + nrow - 1; row++) |
2608 | { |
2629 | { |
2609 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2630 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2610 | : ncol; |
2631 | : ncol; |
2611 | for (towrite = width; towrite; towrite -= wrote) |
2632 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2655 | /* ------------------------------------------------------------------------- */ |
2676 | /* ------------------------------------------------------------------------- */ |
2656 | /* |
2677 | /* |
2657 | * Paste a selection direct to the command fd |
2678 | * Paste a selection direct to the command fd |
2658 | */ |
2679 | */ |
2659 | void |
2680 | void |
2660 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2681 | rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW |
2661 | { |
2682 | { |
2662 | /* convert normal newline chars into common keyboard Return key sequence */ |
2683 | /* convert normal newline chars into common keyboard Return key sequence */ |
2663 | for (unsigned int i = 0; i < len; i++) |
2684 | for (unsigned int i = 0; i < len; i++) |
2664 | if (data[i] == C0_LF) |
2685 | if (data[i] == C0_LF) |
2665 | data[i] = C0_CR; |
2686 | data[i] = C0_CR; |
2666 | |
2687 | |
|
|
2688 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2689 | tt_printf ("\e[200~"); |
|
|
2690 | |
2667 | tt_write (data, len); |
2691 | tt_write (data, len); |
|
|
2692 | |
|
|
2693 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2694 | tt_printf ("\e[201~"); |
|
|
2695 | } |
|
|
2696 | |
|
|
2697 | void |
|
|
2698 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
|
|
2699 | { |
|
|
2700 | if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END))) |
|
|
2701 | return; |
|
|
2702 | |
|
|
2703 | tt_paste (data, len); |
2668 | } |
2704 | } |
2669 | |
2705 | |
2670 | /* ------------------------------------------------------------------------- */ |
2706 | /* ------------------------------------------------------------------------- */ |
2671 | /* |
2707 | /* |
2672 | * Respond to a notification that a primary selection has been sent |
2708 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2747 | if (!delete_prop) |
2783 | if (!delete_prop) |
2748 | XDeleteProperty (dpy, win, prop); |
2784 | XDeleteProperty (dpy, win, prop); |
2749 | |
2785 | |
2750 | selection_wait = Sel_incr; |
2786 | selection_wait = Sel_incr; |
2751 | incr_buf_fill = 0; |
2787 | incr_buf_fill = 0; |
2752 | incr_ev.start (NOW + 10); |
2788 | incr_ev.start (10); |
2753 | |
2789 | |
2754 | goto bailout; |
2790 | goto bailout; |
2755 | } |
2791 | } |
2756 | |
2792 | |
2757 | if (ct.nitems == 0) |
2793 | if (ct.nitems == 0) |
… | |
… | |
2766 | ct.nitems = incr_buf_fill; |
2802 | ct.nitems = incr_buf_fill; |
2767 | incr_buf = 0; |
2803 | incr_buf = 0; |
2768 | incr_buf_size = 0; |
2804 | incr_buf_size = 0; |
2769 | incr_ev.stop (); |
2805 | incr_ev.stop (); |
2770 | } |
2806 | } |
2771 | else |
2807 | else |
2772 | { |
2808 | { |
2773 | if (selection_wait == Sel_normal |
2809 | if (selection_wait == Sel_normal |
2774 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2810 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2775 | { |
2811 | { |
2776 | /* |
2812 | /* |
… | |
… | |
2783 | goto bailout; |
2819 | goto bailout; |
2784 | } |
2820 | } |
2785 | } |
2821 | } |
2786 | else if (selection_wait == Sel_incr) |
2822 | else if (selection_wait == Sel_incr) |
2787 | { |
2823 | { |
2788 | incr_ev.start (NOW + 10); |
2824 | incr_ev.start (10); |
2789 | |
2825 | |
2790 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2826 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2791 | { |
2827 | { |
2792 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2828 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2793 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2829 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2833 | if (selection_wait == Sel_normal) |
2869 | if (selection_wait == Sel_normal) |
2834 | selection_wait = Sel_none; |
2870 | selection_wait = Sel_none; |
2835 | } |
2871 | } |
2836 | |
2872 | |
2837 | void |
2873 | void |
2838 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2874 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2839 | { |
2875 | { |
2840 | selection_wait = Sel_none; |
2876 | selection_wait = Sel_none; |
2841 | |
2877 | |
2842 | incr_buf_size = 0; |
2878 | incr_buf_size = 0; |
2843 | free (incr_buf); |
2879 | free (incr_buf); |
… | |
… | |
2854 | selection_paste (win, prop, true); |
2890 | selection_paste (win, prop, true); |
2855 | } |
2891 | } |
2856 | |
2892 | |
2857 | /* ------------------------------------------------------------------------- */ |
2893 | /* ------------------------------------------------------------------------- */ |
2858 | /* |
2894 | /* |
2859 | * Request the current selection: |
2895 | * Request the current selection: |
2860 | * Order: > internal selection if available |
2896 | * Order: > internal selection if available |
2861 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2897 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2862 | * > CUT_BUFFER0 |
2898 | * > CUT_BUFFER0 |
2863 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2899 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2864 | * will auto fallback to CUT_BUFFER0 |
2900 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2866 | */ |
2902 | */ |
2867 | void |
2903 | void |
2868 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2904 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2869 | { |
2905 | { |
2870 | if (selection.text && selnum == Sel_Primary) |
2906 | if (selection.text && selnum == Sel_Primary) |
|
|
2907 | { |
2871 | { /* internal selection */ |
2908 | /* internal selection */ |
2872 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2909 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2873 | paste (str, strlen (str)); |
2910 | paste (str, strlen (str)); |
2874 | free (str); |
2911 | free (str); |
2875 | return; |
2912 | return; |
2876 | } |
2913 | } |
… | |
… | |
2880 | selection_wait = Sel_normal; |
2917 | selection_wait = Sel_normal; |
2881 | |
2918 | |
2882 | #if X_HAVE_UTF8_STRING |
2919 | #if X_HAVE_UTF8_STRING |
2883 | selection_type = Sel_UTF8String; |
2920 | selection_type = Sel_UTF8String; |
2884 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2921 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2885 | return; |
2922 | return; |
2886 | #else |
2923 | #else |
2887 | selection_type = Sel_CompoundText; |
2924 | selection_type = Sel_CompoundText; |
2888 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2925 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2889 | return; |
2926 | return; |
2890 | #endif |
2927 | #endif |
2891 | } |
2928 | } |
2892 | |
2929 | |
2893 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2930 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2894 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2931 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2922 | /* |
2959 | /* |
2923 | * Clear all selected text |
2960 | * Clear all selected text |
2924 | * EXT: SelectionClear |
2961 | * EXT: SelectionClear |
2925 | */ |
2962 | */ |
2926 | void |
2963 | void |
2927 | rxvt_term::selection_clear () NOTHROW |
2964 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2928 | { |
2965 | { |
|
|
2966 | if (!clipboard) |
|
|
2967 | { |
2929 | want_refresh = 1; |
2968 | want_refresh = 1; |
2930 | free (selection.text); |
2969 | free (selection.text); |
2931 | selection.text = NULL; |
2970 | selection.text = NULL; |
2932 | selection.len = 0; |
2971 | selection.len = 0; |
2933 | CLEAR_SELECTION (); |
2972 | CLEAR_SELECTION (); |
2934 | |
2973 | |
2935 | if (display->selection_owner == this) |
2974 | if (display->selection_owner == this) |
2936 | display->selection_owner = 0; |
2975 | display->selection_owner = 0; |
|
|
2976 | } |
|
|
2977 | else |
|
|
2978 | { |
|
|
2979 | free (selection.clip_text); |
|
|
2980 | selection.clip_text = NULL; |
|
|
2981 | selection.clip_len = 0; |
|
|
2982 | |
|
|
2983 | if (display->clipboard_owner == this) |
|
|
2984 | display->clipboard_owner = 0; |
|
|
2985 | } |
2937 | } |
2986 | } |
2938 | |
2987 | |
2939 | /* ------------------------------------------------------------------------- */ |
2988 | /* ------------------------------------------------------------------------- */ |
2940 | /* |
2989 | /* |
2941 | * Copy a selection into the cut buffer |
2990 | * Copy a selection into the cut buffer |
… | |
… | |
3067 | |
3116 | |
3068 | selection_grab (tm); |
3117 | selection_grab (tm); |
3069 | } |
3118 | } |
3070 | |
3119 | |
3071 | bool |
3120 | bool |
3072 | rxvt_term::selection_grab (Time tm) NOTHROW |
3121 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3073 | { |
3122 | { |
|
|
3123 | Atom sel; |
|
|
3124 | |
|
|
3125 | if (!clipboard) |
|
|
3126 | { |
3074 | selection_time = tm; |
3127 | selection_time = tm; |
|
|
3128 | sel = XA_PRIMARY; |
|
|
3129 | } |
|
|
3130 | else |
|
|
3131 | { |
|
|
3132 | clipboard_time = tm; |
|
|
3133 | sel = xa[XA_CLIPBOARD]; |
|
|
3134 | } |
3075 | |
3135 | |
3076 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3136 | XSetSelectionOwner (dpy, sel, vt, tm); |
3077 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3137 | if (XGetSelectionOwner (dpy, sel) == vt) |
3078 | { |
3138 | { |
3079 | display->set_selection_owner (this); |
3139 | display->set_selection_owner (this, clipboard); |
3080 | return true; |
3140 | return true; |
3081 | } |
3141 | } |
3082 | else |
3142 | else |
3083 | { |
3143 | { |
3084 | selection_clear (); |
3144 | selection_clear (clipboard); |
3085 | return false; |
3145 | return false; |
3086 | } |
3146 | } |
3087 | |
3147 | |
3088 | #if 0 |
3148 | #if 0 |
3089 | XTextProperty ct; |
3149 | XTextProperty ct; |
… | |
… | |
3142 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3202 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3143 | |
3203 | |
3144 | while (selection.mark.col > 0 |
3204 | while (selection.mark.col > 0 |
3145 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3205 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3146 | --selection.mark.col; |
3206 | --selection.mark.col; |
3147 | |
3207 | |
3148 | if (selection.op) |
3208 | if (selection.op) |
|
|
3209 | { |
3149 | { /* clear the old selection */ |
3210 | /* clear the old selection */ |
3150 | selection.beg.row = selection.end.row = selection.mark.row; |
3211 | selection.beg.row = selection.end.row = selection.mark.row; |
3151 | selection.beg.col = selection.end.col = selection.mark.col; |
3212 | selection.beg.col = selection.end.col = selection.mark.col; |
3152 | } |
3213 | } |
3153 | |
3214 | |
3154 | selection.op = SELECTION_INIT; |
3215 | selection.op = SELECTION_INIT; |
… | |
… | |
3343 | * a point/word/line which is either the start or end of the selection |
3404 | * a point/word/line which is either the start or end of the selection |
3344 | * and it was decided by whichever point/word/line was `fixed' at the |
3405 | * and it was decided by whichever point/word/line was `fixed' at the |
3345 | * time of the most recent button3 press |
3406 | * time of the most recent button3 press |
3346 | */ |
3407 | */ |
3347 | if (button3 && buttonpress) |
3408 | if (button3 && buttonpress) |
|
|
3409 | { |
3348 | { /* button3 press */ |
3410 | /* button3 press */ |
3349 | /* |
3411 | /* |
3350 | * first determine which edge of the selection we are closest to |
3412 | * first determine which edge of the selection we are closest to |
3351 | */ |
3413 | */ |
3352 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3414 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3353 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3415 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3371 | selection.mark.row = selection.beg.row; |
3433 | selection.mark.row = selection.beg.row; |
3372 | selection.mark.col = selection.beg.col; |
3434 | selection.mark.col = selection.beg.col; |
3373 | } |
3435 | } |
3374 | } |
3436 | } |
3375 | else |
3437 | else |
|
|
3438 | { |
3376 | { /* button1 drag or button3 drag */ |
3439 | /* button1 drag or button3 drag */ |
3377 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3440 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3378 | { |
3441 | { |
3379 | if (selection.mark.row == selection.end.row |
3442 | if (selection.mark.row == selection.end.row |
3380 | && selection.mark.col == selection.end.col |
3443 | && selection.mark.col == selection.end.col |
3381 | && clickchange |
3444 | && clickchange |
… | |
… | |
3462 | selection.end.row++; |
3525 | selection.end.row++; |
3463 | } |
3526 | } |
3464 | } |
3527 | } |
3465 | |
3528 | |
3466 | if (button3 && buttonpress) |
3529 | if (button3 && buttonpress) |
|
|
3530 | { |
3467 | { /* mark may need to be changed */ |
3531 | /* mark may need to be changed */ |
3468 | if (closeto == LEFT) |
3532 | if (closeto == LEFT) |
3469 | { |
3533 | { |
3470 | selection.mark.row = selection.end.row; |
3534 | selection.mark.row = selection.end.row; |
3471 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3535 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3472 | } |
3536 | } |
… | |
… | |
3580 | else if (rq.target == xa[XA_MULTIPLE]) |
3644 | else if (rq.target == xa[XA_MULTIPLE]) |
3581 | { |
3645 | { |
3582 | /* TODO: Handle MULTIPLE */ |
3646 | /* TODO: Handle MULTIPLE */ |
3583 | } |
3647 | } |
3584 | #endif |
3648 | #endif |
3585 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3649 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3586 | { |
3650 | { |
3587 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3651 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3588 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3652 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3653 | ev.property = rq.property; |
|
|
3654 | } |
|
|
3655 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3656 | { |
|
|
3657 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3658 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3589 | ev.property = rq.property; |
3659 | ev.property = rq.property; |
3590 | } |
3660 | } |
3591 | else if (rq.target == XA_STRING |
3661 | else if (rq.target == XA_STRING |
3592 | || rq.target == xa[XA_TEXT] |
3662 | || rq.target == xa[XA_TEXT] |
3593 | || rq.target == xa[XA_COMPOUND_TEXT] |
3663 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3626 | { |
3696 | { |
3627 | target = xa[XA_COMPOUND_TEXT]; |
3697 | target = xa[XA_COMPOUND_TEXT]; |
3628 | style = enc_compound_text; |
3698 | style = enc_compound_text; |
3629 | } |
3699 | } |
3630 | |
3700 | |
3631 | if (selection.text) |
3701 | if (rq.selection == XA_PRIMARY && selection.text) |
3632 | { |
3702 | { |
3633 | cl = selection.text; |
3703 | cl = selection.text; |
3634 | selectlen = selection.len; |
3704 | selectlen = selection.len; |
|
|
3705 | } |
|
|
3706 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3707 | { |
|
|
3708 | cl = selection.clip_text; |
|
|
3709 | selectlen = selection.clip_len; |
3635 | } |
3710 | } |
3636 | else |
3711 | else |
3637 | { |
3712 | { |
3638 | cl = L""; |
3713 | cl = L""; |
3639 | selectlen = 0; |
3714 | selectlen = 0; |
… | |
… | |
3671 | XFree (ct.value); |
3746 | XFree (ct.value); |
3672 | } |
3747 | } |
3673 | |
3748 | |
3674 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3749 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3675 | } |
3750 | } |
3676 | |
|
|
3677 | /* ------------------------------------------------------------------------- * |
|
|
3678 | * MOUSE ROUTINES * |
|
|
3679 | * ------------------------------------------------------------------------- */ |
|
|
3680 | |
|
|
3681 | /* |
|
|
3682 | * return col/row values corresponding to x/y pixel values |
|
|
3683 | */ |
|
|
3684 | void |
|
|
3685 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3686 | { |
|
|
3687 | *x = Pixel2Col (*x); |
|
|
3688 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3689 | *y = Pixel2Row (*y); |
|
|
3690 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3691 | } |
|
|
3692 | |
3751 | |
3693 | /* ------------------------------------------------------------------------- */ |
3752 | /* ------------------------------------------------------------------------- */ |
3694 | #ifdef USE_XIM |
3753 | #ifdef USE_XIM |
3695 | void |
3754 | void |
3696 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3755 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
… | |
… | |
3723 | h += 2; min_it (h, nrow); |
3782 | h += 2; min_it (h, nrow); |
3724 | |
3783 | |
3725 | x -= 1; clamp_it (x, 0, ncol - w); |
3784 | x -= 1; clamp_it (x, 0, ncol - w); |
3726 | y -= 1; clamp_it (y, 0, nrow - h); |
3785 | y -= 1; clamp_it (y, 0, nrow - h); |
3727 | |
3786 | |
3728 | ov_x = x; ov_y = y; |
3787 | ov.x = x; ov.y = y; |
3729 | ov_w = w; ov_h = h; |
3788 | ov.w = w; ov.h = h; |
3730 | |
3789 | |
3731 | ov_text = new text_t *[h]; |
3790 | ov.text = new text_t *[h]; |
3732 | ov_rend = new rend_t *[h]; |
3791 | ov.rend = new rend_t *[h]; |
3733 | |
3792 | |
3734 | for (y = 0; y < h; y++) |
3793 | for (y = 0; y < h; y++) |
3735 | { |
3794 | { |
3736 | text_t *tp = ov_text[y] = new text_t[w]; |
3795 | text_t *tp = ov.text[y] = new text_t[w]; |
3737 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3796 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3738 | |
3797 | |
3739 | text_t t0, t1, t2; |
3798 | text_t t0, t1, t2; |
3740 | rend_t r = OVERLAY_RSTYLE; |
3799 | rend_t r = OVERLAY_RSTYLE; |
3741 | |
3800 | |
3742 | if (y == 0) |
3801 | if (y == 0) |
… | |
… | |
3761 | } |
3820 | } |
3762 | |
3821 | |
3763 | void |
3822 | void |
3764 | rxvt_term::scr_overlay_off () NOTHROW |
3823 | rxvt_term::scr_overlay_off () NOTHROW |
3765 | { |
3824 | { |
3766 | if (!ov_text) |
3825 | if (!ov.text) |
3767 | return; |
3826 | return; |
3768 | |
3827 | |
3769 | want_refresh = 1; |
3828 | want_refresh = 1; |
3770 | |
3829 | |
3771 | for (int y = 0; y < ov_h; y++) |
3830 | for (int y = 0; y < ov.h; y++) |
3772 | { |
3831 | { |
3773 | delete [] ov_text[y]; |
3832 | delete [] ov.text[y]; |
3774 | delete [] ov_rend[y]; |
3833 | delete [] ov.rend[y]; |
3775 | } |
3834 | } |
3776 | |
3835 | |
3777 | delete [] ov_text; ov_text = 0; |
3836 | delete [] ov.text; ov.text = 0; |
3778 | delete [] ov_rend; ov_rend = 0; |
3837 | delete [] ov.rend; ov.rend = 0; |
3779 | } |
3838 | } |
3780 | |
3839 | |
3781 | void |
3840 | void |
3782 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3841 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3783 | { |
3842 | { |
3784 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3843 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3785 | return; |
3844 | return; |
3786 | |
3845 | |
3787 | x++, y++; |
3846 | x++, y++; |
3788 | |
3847 | |
3789 | ov_text[y][x] = text; |
3848 | ov.text[y][x] = text; |
3790 | ov_rend[y][x] = rend; |
3849 | ov.rend[y][x] = rend; |
3791 | } |
3850 | } |
3792 | |
3851 | |
3793 | void |
3852 | void |
3794 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3853 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3795 | { |
3854 | { |
… | |
… | |
3814 | } |
3873 | } |
3815 | |
3874 | |
3816 | void |
3875 | void |
3817 | rxvt_term::scr_swap_overlay () NOTHROW |
3876 | rxvt_term::scr_swap_overlay () NOTHROW |
3818 | { |
3877 | { |
3819 | if (!ov_text) |
3878 | if (!ov.text) |
3820 | return; |
3879 | return; |
3821 | |
3880 | |
|
|
3881 | // hide cursor if it is within the overlay area |
|
|
3882 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3883 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3884 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3885 | |
3822 | // swap screen mem with overlay |
3886 | // swap screen mem with overlay |
3823 | for (int y = ov_h; y--; ) |
3887 | for (int y = ov.h; y--; ) |
3824 | { |
3888 | { |
3825 | text_t *t1 = ov_text[y]; |
3889 | text_t *t1 = ov.text[y]; |
3826 | rend_t *r1 = ov_rend[y]; |
3890 | rend_t *r1 = ov.rend[y]; |
3827 | |
3891 | |
3828 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3892 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3829 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3893 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3830 | |
3894 | |
3831 | for (int x = ov_w; x--; ) |
3895 | for (int x = ov.w; x--; ) |
3832 | { |
3896 | { |
3833 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3897 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3834 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3898 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3835 | } |
3899 | } |
3836 | } |
3900 | } |