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 seperate compile! |
36 | |
34 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
38 | { |
36 | { |
39 | while (len--) |
37 | while (len--) |
40 | *start++ = value; |
38 | *start++ = value; |
41 | } |
39 | } |
42 | |
40 | |
… | |
… | |
47 | |
45 | |
48 | /* ------------------------------------------------------------------------- * |
46 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
48 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
49 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
50 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
51 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
52 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
53 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
54 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
55 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
85 | ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) |
83 | 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) \ |
84 | #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) |
85 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
88 | |
86 | |
89 | /* |
87 | /* |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
88 | * 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 | */ |
89 | */ |
94 | #define drawBuffer vt |
|
|
95 | |
|
|
96 | #define CLEAR_ROWS(row, num) \ |
|
|
97 | if (mapped) \ |
|
|
98 | XClearArea (xdisp, drawBuffer, 0, \ |
|
|
99 | Row2Pixel (row), (unsigned int)width, \ |
|
|
100 | (unsigned int)Height2Pixel (num), False) |
|
|
101 | |
|
|
102 | #define CLEAR_CHARS(x, y, num) \ |
90 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
91 | if (mapped) \ |
104 | XClearArea (xdisp, drawBuffer, x, y, \ |
92 | XClearArea (dpy, vt, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
93 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
94 | (unsigned int)Height2Pixel (1), False) |
107 | |
|
|
108 | #define ERASE_ROWS(row, num) \ |
|
|
109 | XFillRectangle (xdisp, drawBuffer, gc, \ |
|
|
110 | 0, Row2Pixel (row), \ |
|
|
111 | (unsigned int)width, \ |
|
|
112 | (unsigned int)Height2Pixel (num)) |
|
|
113 | |
95 | |
114 | /* ------------------------------------------------------------------------- * |
96 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
97 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
98 | * ------------------------------------------------------------------------- */ |
117 | |
99 | |
… | |
… | |
161 | { |
143 | { |
162 | #if ENABLE_OVERLAY |
144 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
145 | scr_overlay_off (); |
164 | #endif |
146 | #endif |
165 | |
147 | |
|
|
148 | rvideo_mode = false; |
166 | view_start = 0; |
149 | view_start = 0; |
167 | num_scr = 0; |
150 | num_scr = 0; |
168 | |
151 | |
169 | if (ncol == 0) |
152 | if (ncol == 0) |
170 | ncol = 80; |
153 | ncol = 80; |
… | |
… | |
237 | selection.text = NULL; |
220 | selection.text = NULL; |
238 | selection.len = 0; |
221 | selection.len = 0; |
239 | selection.op = SELECTION_CLEAR; |
222 | selection.op = SELECTION_CLEAR; |
240 | selection.screen = PRIMARY; |
223 | selection.screen = PRIMARY; |
241 | selection.clicks = 0; |
224 | selection.clicks = 0; |
242 | rvideo_state = rvideo_mode = false; |
|
|
243 | } |
225 | } |
244 | else |
226 | else |
245 | { |
227 | { |
246 | /* |
228 | /* |
247 | * add or delete rows as appropriate |
229 | * add or delete rows as appropriate |
… | |
… | |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
258 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
277 | } |
259 | } |
278 | |
260 | |
279 | line_t *old_buf = row_buf; |
261 | line_t *old_buf = row_buf; |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
262 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
281 | |
263 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
264 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
265 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
266 | int q = total_rows; // rewrapped row |
285 | |
267 | |
286 | if (top_row) |
268 | if (top_row) |
… | |
… | |
330 | int qcol = 0; |
312 | int qcol = 0; |
331 | |
313 | |
332 | // see below for cursor adjustment rationale |
314 | // see below for cursor adjustment rationale |
333 | if (p == ocur.row) |
315 | if (p == ocur.row) |
334 | screen.cur.row = q - (total_rows - nrow); |
316 | screen.cur.row = q - (total_rows - nrow); |
335 | |
317 | |
336 | // fill a single destination line |
318 | // fill a single destination line |
337 | while (lofs < llen && qcol < ncol) |
319 | while (lofs < llen && qcol < ncol) |
338 | { |
320 | { |
339 | int prow = lofs / prev_ncol; |
321 | int prow = lofs / prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
322 | int pcol = lofs % prev_ncol; |
… | |
… | |
366 | } |
348 | } |
367 | while (p != pend && q > 0); |
349 | while (p != pend && q > 0); |
368 | |
350 | |
369 | term_start = total_rows - nrow; |
351 | term_start = total_rows - nrow; |
370 | top_row = q - term_start; |
352 | top_row = q - term_start; |
371 | |
353 | |
372 | // make sure all terminal lines exist |
354 | // make sure all terminal lines exist |
373 | while (top_row > 0) |
355 | while (top_row > 0) |
374 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
356 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
375 | } |
357 | } |
376 | else |
358 | else |
377 | { |
359 | { |
378 | // if no scrollback exists (yet), wing, instead of wrap |
360 | // if no scrollback exists (yet), wing, instead of wrap |
379 | |
361 | |
380 | for (int row = min (nrow, prev_nrow); row--; ) |
362 | for (int row = min (nrow, prev_nrow); row--; ) |
381 | { |
363 | { |
382 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
364 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
383 | line_t &qline = row_buf [row]; |
365 | line_t &qline = row_buf [row]; |
384 | |
366 | |
… | |
… | |
407 | CLEAR_ALL_SELECTION (); |
389 | CLEAR_ALL_SELECTION (); |
408 | |
390 | |
409 | prev_nrow = nrow; |
391 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
392 | prev_ncol = ncol; |
411 | |
393 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
394 | tabs = (char *)rxvt_malloc (ncol); |
413 | |
395 | |
414 | for (int col = ncol; col--; ) |
396 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
397 | tabs [col] = col % TABSIZE == 0; |
416 | |
398 | |
417 | if (current_screen != PRIMARY) |
399 | if (current_screen != PRIMARY) |
418 | scr_swap_screen (); |
400 | scr_swap_screen (); |
419 | |
401 | |
… | |
… | |
510 | } |
492 | } |
511 | |
493 | |
512 | void |
494 | void |
513 | rxvt_term::scr_swap_screen () |
495 | rxvt_term::scr_swap_screen () |
514 | { |
496 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
497 | if (!option (Opt_secondaryScreen)) |
516 | return; |
498 | return; |
517 | |
499 | |
518 | for (int i = prev_nrow; i--; ) |
500 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
501 | ::swap (ROW(i), swap_buf [i]); |
520 | |
502 | |
… | |
… | |
542 | selection_check (2); /* check for boundary cross */ |
524 | selection_check (2); /* check for boundary cross */ |
543 | |
525 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
545 | |
527 | |
546 | #if NSCREENS |
528 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
529 | if (option (Opt_secondaryScreen)) |
548 | { |
530 | { |
549 | num_scr = 0; |
531 | num_scr = 0; |
550 | |
532 | |
551 | scr_swap_screen (); |
533 | scr_swap_screen (); |
552 | |
534 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
537 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
538 | swap.flags |= Screen_VisibleCursor; |
557 | } |
539 | } |
558 | else |
540 | else |
559 | #endif |
541 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
542 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
543 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
544 | } |
563 | |
545 | |
564 | // clear WrapNext indicator, solidifying position on next line |
546 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
547 | void |
… | |
… | |
598 | /* |
580 | /* |
599 | * Change the rendition style for following text |
581 | * Change the rendition style for following text |
600 | */ |
582 | */ |
601 | void |
583 | void |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
584 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
603 | { |
585 | { |
604 | if (set) |
586 | if (set) |
605 | rstyle |= style; |
587 | rstyle |= style; |
606 | else if (style == ~RS_None) |
588 | else if (style == ~RS_None) |
607 | rstyle = DEFAULT_RSTYLE; |
589 | rstyle = DEFAULT_RSTYLE; |
608 | else |
590 | else |
609 | rstyle &= ~style; |
591 | rstyle &= ~style; |
610 | } |
592 | } |
611 | |
593 | |
612 | /* ------------------------------------------------------------------------- */ |
594 | /* ------------------------------------------------------------------------- */ |
613 | /* |
595 | /* |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
596 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
615 | * count positive ==> scroll up |
597 | * count positive ==> scroll up |
… | |
… | |
624 | want_refresh = 1; |
606 | want_refresh = 1; |
625 | num_scr += count; |
607 | num_scr += count; |
626 | |
608 | |
627 | if (count > 0 |
609 | if (count > 0 |
628 | && row1 == 0 |
610 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
611 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
612 | { |
631 | top_row = max (top_row - count, -saveLines); |
613 | top_row = max (top_row - count, -saveLines); |
632 | |
614 | |
633 | // scroll everything up 'count' lines |
615 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
616 | term_start = (term_start + count) % total_rows; |
… | |
… | |
645 | { |
627 | { |
646 | line_t &l = ROW(nrow - 1 - i); |
628 | line_t &l = ROW(nrow - 1 - i); |
647 | |
629 | |
648 | // optimize if already cleared, can be significant on slow machines |
630 | // optimize if already cleared, can be significant on slow machines |
649 | // could be rolled into scr_blank_screen_mem |
631 | // could be rolled into scr_blank_screen_mem |
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) |
632 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
651 | { |
633 | { |
652 | scr_blank_line (l, 0, l.l, rstyle); |
634 | scr_blank_line (l, 0, l.l, rstyle); |
653 | l.l = 0; |
635 | l.l = 0; |
654 | l.f = 0; |
636 | l.f = 0; |
655 | } |
637 | } |
… | |
… | |
666 | line_t &l2 = ROW(i); |
648 | line_t &l2 = ROW(i); |
667 | |
649 | |
668 | ::swap (l1, l2); |
650 | ::swap (l1, l2); |
669 | l2.touch (); |
651 | l2.touch (); |
670 | } |
652 | } |
671 | |
653 | |
672 | // move and/or clear selection, if any |
654 | // move and/or clear selection, if any |
673 | if (selection.op && current_screen == selection.screen) |
655 | if (selection.op && current_screen == selection.screen) |
674 | { |
656 | { |
675 | selection.beg.row -= count; |
657 | selection.beg.row -= count; |
676 | selection.end.row -= count; |
658 | selection.end.row -= count; |
… | |
… | |
684 | selection.op = SELECTION_CLEAR; |
666 | selection.op = SELECTION_CLEAR; |
685 | } |
667 | } |
686 | } |
668 | } |
687 | |
669 | |
688 | // finally move the view window, if desired |
670 | // finally move the view window, if desired |
689 | if (OPTION (Opt_scrollWithBuffer) |
671 | if (option (Opt_scrollWithBuffer) |
690 | && view_start != 0 |
672 | && view_start != 0 |
691 | && view_start != -saveLines) |
673 | && view_start != -saveLines) |
692 | scr_page (UP, count); |
674 | scr_page (UP, count); |
693 | |
675 | |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
676 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
712 | { |
694 | { |
713 | /* move selected region too */ |
695 | /* move selected region too */ |
714 | selection.beg.row -= count; |
696 | selection.beg.row -= count; |
715 | selection.end.row -= count; |
697 | selection.end.row -= count; |
716 | selection.mark.row -= count; |
698 | selection.mark.row -= count; |
717 | |
699 | |
718 | selection_check (0); |
700 | selection_check (0); |
719 | } |
701 | } |
720 | } |
702 | } |
721 | |
703 | |
722 | // use a simple and robust scrolling algorithm, this |
704 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
834 | } |
816 | } |
835 | |
817 | |
836 | if (screen.flags & Screen_WrapNext) |
818 | if (screen.flags & Screen_WrapNext) |
837 | { |
819 | { |
838 | scr_do_wrap (); |
820 | scr_do_wrap (); |
839 | |
821 | |
840 | line->l = ncol; |
822 | line->l = ncol; |
841 | line->is_longer (1); |
823 | line->is_longer (1); |
842 | |
824 | |
843 | row = screen.cur.row; |
825 | row = screen.cur.row; |
844 | line = &ROW(row); /* _must_ refresh */ |
826 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
1013 | * XTERM_SEQ: CTRL-H |
995 | * XTERM_SEQ: CTRL-H |
1014 | */ |
996 | */ |
1015 | void |
997 | void |
1016 | rxvt_term::scr_backspace () NOTHROW |
998 | rxvt_term::scr_backspace () NOTHROW |
1017 | { |
999 | { |
1018 | want_refresh = 1; |
|
|
1019 | |
|
|
1020 | if (screen.cur.col == 0) |
1000 | if (screen.cur.col == 0) |
1021 | { |
1001 | { |
1022 | if (screen.cur.row > 0) |
1002 | if (screen.cur.row > 0) |
1023 | { |
1003 | { |
1024 | #ifdef TERMCAP_HAS_BW |
1004 | #ifdef TERMCAP_HAS_BW |
1025 | screen.cur.col = ncol - 1; |
1005 | screen.cur.col = ncol - 1; |
1026 | screen.cur.row--; |
1006 | --screen.cur.row; |
1027 | return; |
1007 | |
|
|
1008 | want_refresh = 1; |
1028 | #endif |
1009 | #endif |
1029 | } |
1010 | } |
1030 | } |
1011 | } |
1031 | else if (!(screen.flags & Screen_WrapNext)) |
1012 | else |
1032 | scr_gotorc (0, -1, RELATIVE); |
1013 | scr_gotorc (0, -1, RELATIVE); |
1033 | |
|
|
1034 | screen.flags &= ~Screen_WrapNext; |
|
|
1035 | } |
1014 | } |
1036 | |
1015 | |
1037 | /* ------------------------------------------------------------------------- */ |
1016 | /* ------------------------------------------------------------------------- */ |
1038 | /* |
1017 | /* |
1039 | * Process Horizontal Tab |
1018 | * Process Horizontal Tab |
… | |
… | |
1062 | x = i; |
1041 | x = i; |
1063 | |
1042 | |
1064 | if (!--count) |
1043 | if (!--count) |
1065 | break; |
1044 | break; |
1066 | } |
1045 | } |
1067 | else |
1046 | else |
1068 | ht &= l.t[i] == ' ' |
1047 | ht &= l.t[i] == ' ' |
1069 | && RS_SAME (l.r[i], base_rend); |
1048 | && RS_SAME (l.r[i], base_rend); |
1070 | |
1049 | |
1071 | if (count) |
1050 | if (count) |
1072 | x = ncol - 1; |
1051 | x = ncol - 1; |
1073 | |
1052 | |
1074 | // store horizontal tab commands as characters inside the text |
1053 | // store horizontal tab commands as characters inside the text |
1075 | // buffer so they can be selected and pasted. |
1054 | // buffer so they can be selected and pasted. |
1076 | if (ht && OPTION (Opt_pastableTabs)) |
1055 | if (ht && option (Opt_pastableTabs)) |
1077 | { |
1056 | { |
1078 | base_rend = SET_FONT (base_rend, 0); |
1057 | base_rend = SET_FONT (base_rend, 0); |
1079 | |
1058 | |
1080 | l.touch (x); |
1059 | l.touch (x); |
1081 | |
1060 | |
… | |
… | |
1188 | } |
1167 | } |
1189 | } |
1168 | } |
1190 | else |
1169 | else |
1191 | { |
1170 | { |
1192 | if (screen.flags & Screen_Relative) |
1171 | if (screen.flags & Screen_Relative) |
|
|
1172 | { |
1193 | { /* relative origin mode */ |
1173 | /* relative origin mode */ |
1194 | screen.cur.row = row + screen.tscroll; |
1174 | screen.cur.row = row + screen.tscroll; |
1195 | min_it (screen.cur.row, screen.bscroll); |
1175 | min_it (screen.cur.row, screen.bscroll); |
1196 | } |
1176 | } |
1197 | else |
1177 | else |
1198 | screen.cur.row = row; |
1178 | screen.cur.row = row; |
… | |
… | |
1231 | /* |
1211 | /* |
1232 | * Erase part or whole of a line |
1212 | * Erase part or whole of a line |
1233 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1213 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1234 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1214 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1235 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1215 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1216 | * extension: clear to right unless wrapped: ESC [ 3 K |
1236 | */ |
1217 | */ |
1237 | void |
1218 | void |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1219 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1239 | { |
1220 | { |
1240 | unsigned int col, num; |
1221 | unsigned int col, num; |
… | |
… | |
1249 | line.touch (); |
1230 | line.touch (); |
1250 | line.is_longer (0); |
1231 | line.is_longer (0); |
1251 | |
1232 | |
1252 | switch (mode) |
1233 | switch (mode) |
1253 | { |
1234 | { |
|
|
1235 | case 3: |
|
|
1236 | if (screen.flags & Screen_WrapNext) |
|
|
1237 | return; |
|
|
1238 | |
|
|
1239 | /* fall through */ |
|
|
1240 | |
1254 | case 0: /* erase to end of line */ |
1241 | case 0: /* erase to end of line */ |
1255 | col = screen.cur.col; |
1242 | col = screen.cur.col; |
1256 | num = ncol - col; |
1243 | num = ncol - col; |
1257 | min_it (line.l, col); |
1244 | min_it (line.l, col); |
|
|
1245 | |
1258 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1246 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1259 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1247 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1260 | CLEAR_SELECTION (); |
1248 | CLEAR_SELECTION (); |
1261 | break; |
1249 | break; |
|
|
1250 | |
1262 | case 1: /* erase to beginning of line */ |
1251 | case 1: /* erase to beginning of line */ |
1263 | col = 0; |
1252 | col = 0; |
1264 | num = screen.cur.col + 1; |
1253 | num = screen.cur.col + 1; |
|
|
1254 | |
1265 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1255 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1266 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1256 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1267 | CLEAR_SELECTION (); |
1257 | CLEAR_SELECTION (); |
1268 | break; |
1258 | break; |
|
|
1259 | |
1269 | case 2: /* erase whole line */ |
1260 | case 2: /* erase whole line */ |
1270 | col = 0; |
1261 | col = 0; |
1271 | num = ncol; |
1262 | num = ncol; |
1272 | line.l = 0; |
1263 | line.l = 0; |
1273 | if (selection.beg.row <= screen.cur.row |
1264 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1331 | if (row >= nrow) /* Out Of Bounds */ |
1322 | if (row >= nrow) /* Out Of Bounds */ |
1332 | return; |
1323 | return; |
1333 | |
1324 | |
1334 | min_it (num, nrow - row); |
1325 | min_it (num, nrow - row); |
1335 | |
1326 | |
|
|
1327 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1336 | if (rstyle & (RS_RVid | RS_Uline)) |
1328 | if (rstyle & (RS_RVid | RS_Uline)) |
1337 | ren = (rend_t) ~RS_None; |
1329 | ren = (rend_t) ~RS_None; |
1338 | else if (GET_BASEBG (rstyle) == Color_bg) |
1330 | else if (GET_BASEBG (rstyle) == Color_bg) |
1339 | { |
1331 | { |
1340 | ren = DEFAULT_RSTYLE; |
1332 | ren = DEFAULT_RSTYLE; |
1341 | CLEAR_ROWS (row, num); |
1333 | |
|
|
1334 | if (mapped) |
|
|
1335 | XClearArea (dpy, vt, 0, |
|
|
1336 | Row2Pixel (row), (unsigned int)width, |
|
|
1337 | (unsigned int)Height2Pixel (num), False); |
1342 | } |
1338 | } |
1343 | else |
1339 | else |
1344 | { |
1340 | { |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1342 | |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1343 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1347 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1344 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1348 | ERASE_ROWS (row, num); |
1345 | XFillRectangle (dpy, vt, gc, |
|
|
1346 | 0, Row2Pixel (row), |
|
|
1347 | (unsigned int)width, |
|
|
1348 | (unsigned int)Height2Pixel (num)); |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1350 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1351 | } |
1351 | } |
1352 | |
1352 | |
1353 | for (; num--; row++) |
1353 | for (; num--; row++) |
1354 | { |
1354 | { |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
… | |
… | |
1474 | { |
1474 | { |
1475 | if (selection.end.row != screen.cur.row |
1475 | if (selection.end.row != screen.cur.row |
1476 | || (selection.end.col + count >= ncol)) |
1476 | || (selection.end.col + count >= ncol)) |
1477 | CLEAR_SELECTION (); |
1477 | CLEAR_SELECTION (); |
1478 | else |
1478 | else |
|
|
1479 | { |
1479 | { /* shift selection */ |
1480 | /* shift selection */ |
1480 | selection.beg.col += count; |
1481 | selection.beg.col += count; |
1481 | selection.mark.col += count; /* XXX: yes? */ |
1482 | selection.mark.col += count; /* XXX: yes? */ |
1482 | selection.end.col += count; |
1483 | selection.end.col += count; |
1483 | } |
1484 | } |
1484 | } |
1485 | } |
… | |
… | |
1623 | */ |
1624 | */ |
1624 | void |
1625 | void |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1626 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1626 | { |
1627 | { |
1627 | if (mode < 0) |
1628 | if (mode < 0) |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1629 | memset (tabs, 0, ncol); |
1629 | else if (screen.cur.col < ncol) |
1630 | else if (screen.cur.col < ncol) |
1630 | tabs [screen.cur.col] = !!mode; |
1631 | tabs [screen.cur.col] = !!mode; |
1631 | } |
1632 | } |
1632 | |
1633 | |
1633 | /* ------------------------------------------------------------------------- */ |
1634 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1648 | if (rvideo_state != on) |
1649 | if (rvideo_state != on) |
1649 | { |
1650 | { |
1650 | rvideo_state = on; |
1651 | rvideo_state = on; |
1651 | |
1652 | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1654 | #ifdef HAVE_BG_PIXMAP |
1654 | if (bgPixmap.pixmap == None) |
1655 | if (bgPixmap.pixmap == None) |
1655 | #endif |
1656 | #endif |
1656 | #if TRANSPARENT |
|
|
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1658 | #endif |
|
|
1659 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1657 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1658 | |
1661 | XGCValues gcvalue; |
1659 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1660 | gcvalue.foreground = pix_colors[Color_fg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1661 | gcvalue.background = pix_colors[Color_bg]; |
1664 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1662 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1665 | |
1663 | |
1666 | scr_clear (); |
1664 | scr_clear (); |
1667 | scr_touch (true); |
1665 | scr_touch (true); |
1668 | } |
1666 | } |
1669 | } |
1667 | } |
… | |
… | |
1806 | for (i = PART_BEG; i < RC_COUNT; i++) |
1804 | for (i = PART_BEG; i < RC_COUNT; i++) |
1807 | { |
1805 | { |
1808 | min_it (rc[i].col, ncol - 1); |
1806 | min_it (rc[i].col, ncol - 1); |
1809 | min_it (rc[i].row, nrow - 1); |
1807 | min_it (rc[i].row, nrow - 1); |
1810 | } |
1808 | } |
1811 | |
1809 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1812 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1810 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1813 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1811 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1814 | |
1812 | |
1815 | num_scr_allow = 0; |
1813 | num_scr_allow = 0; |
1816 | |
1814 | |
… | |
… | |
1871 | return true; |
1869 | return true; |
1872 | } |
1870 | } |
1873 | |
1871 | |
1874 | #ifndef NO_BELL |
1872 | #ifndef NO_BELL |
1875 | void |
1873 | void |
1876 | rxvt_term::bell_cb (time_watcher &w) |
1874 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1877 | { |
1875 | { |
1878 | rvideo_bell = false; |
1876 | rvideo_bell = false; |
1879 | scr_rvideo_mode (rvideo_mode); |
1877 | scr_rvideo_mode (rvideo_mode); |
|
|
1878 | refresh_check (); |
1880 | } |
1879 | } |
1881 | #endif |
1880 | #endif |
1882 | |
1881 | |
1883 | /* ------------------------------------------------------------------------- */ |
1882 | /* ------------------------------------------------------------------------- */ |
1884 | void |
1883 | void |
… | |
… | |
1886 | { |
1885 | { |
1887 | #ifndef NO_BELL |
1886 | #ifndef NO_BELL |
1888 | |
1887 | |
1889 | # ifndef NO_MAPALERT |
1888 | # ifndef NO_MAPALERT |
1890 | # ifdef MAPALERT_OPTION |
1889 | # ifdef MAPALERT_OPTION |
1891 | if (OPTION (Opt_mapAlert)) |
1890 | if (option (Opt_mapAlert)) |
1892 | # endif |
1891 | # endif |
1893 | XMapWindow (xdisp, parent[0]); |
1892 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1893 | # endif |
1895 | |
1894 | |
|
|
1895 | # if ENABLE_FRILLS |
|
|
1896 | if (option (Opt_urgentOnBell)) |
|
|
1897 | { |
|
|
1898 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1899 | { |
|
|
1900 | h->flags |= XUrgencyHint; |
|
|
1901 | XSetWMHints (dpy, parent[0], h); |
|
|
1902 | } |
|
|
1903 | } |
|
|
1904 | # endif |
|
|
1905 | |
1896 | if (OPTION (Opt_visualBell)) |
1906 | if (option (Opt_visualBell)) |
1897 | { |
1907 | { |
1898 | rvideo_bell = true; |
1908 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1909 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1910 | flush (); |
1901 | |
1911 | |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1912 | bell_ev.start (VISUAL_BELL_DURATION); |
1903 | } |
1913 | } |
1904 | else |
1914 | else |
1905 | XBell (xdisp, 0); |
1915 | XBell (dpy, 0); |
1906 | |
|
|
1907 | #endif |
1916 | #endif |
1908 | } |
1917 | } |
1909 | |
1918 | |
1910 | /* ------------------------------------------------------------------------- */ |
1919 | /* ------------------------------------------------------------------------- */ |
1911 | /* ARGSUSED */ |
1920 | /* ARGSUSED */ |
… | |
… | |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1978 | * screen.text/screen.rend contain what the screen will change to. |
1970 | */ |
1979 | */ |
1971 | void |
1980 | void |
1972 | rxvt_term::scr_refresh () NOTHROW |
1981 | rxvt_term::scr_refresh () NOTHROW |
1973 | { |
1982 | { |
1974 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1983 | unsigned char have_bg, |
1975 | showcursor; /* show the cursor */ |
1984 | showcursor; /* show the cursor */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1985 | int16_t col, row, /* column/row we're processing */ |
1977 | ocrow; /* old cursor row */ |
1986 | ocrow; /* old cursor row */ |
1978 | int i; /* tmp */ |
1987 | int i; /* tmp */ |
1979 | #ifndef NO_CURSORCOLOR |
1988 | #ifndef NO_CURSORCOLOR |
1980 | rend_t cc1; /* store colours at cursor position (s) */ |
1989 | rend_t cc1; /* store colours at cursor position (s) */ |
1981 | #endif |
1990 | #endif |
1982 | rend_t *crp; // cursor rendition pointer |
1991 | rend_t *crp; // cursor rendition pointer |
|
|
1992 | rend_t ccol1, /* Cursor colour */ |
|
|
1993 | ccol2; /* Cursor colour2 */ |
1983 | |
1994 | |
1984 | want_refresh = 0; /* screen is current */ |
1995 | want_refresh = 0; /* screen is current */ |
1985 | |
1996 | |
1986 | if (refresh_type == NO_REFRESH || !mapped) |
1997 | if (refresh_type == NO_REFRESH || !mapped) |
1987 | return; |
1998 | return; |
1988 | |
1999 | |
1989 | /* |
2000 | /* |
1990 | * A: set up vars |
2001 | * A: set up vars |
1991 | */ |
2002 | */ |
1992 | must_clear = 0; |
|
|
1993 | refresh_count = 0; |
2003 | refresh_count = 0; |
1994 | |
2004 | |
1995 | #if XPM_BACKGROUND |
2005 | have_bg = 0; |
|
|
2006 | #ifdef HAVE_BG_PIXMAP |
1996 | must_clear |= bgPixmap.pixmap != None; |
2007 | have_bg = bgPixmap.pixmap != None; |
1997 | #endif |
|
|
1998 | #if TRANSPARENT |
|
|
1999 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
2000 | #endif |
2008 | #endif |
2001 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2009 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2002 | |
2010 | |
2003 | /* |
2011 | /* |
2004 | * B: reverse any characters which are selected |
2012 | * B: reverse any characters which are selected |
… | |
… | |
2008 | /* |
2016 | /* |
2009 | * C: set the cursor character (s) |
2017 | * C: set the cursor character (s) |
2010 | */ |
2018 | */ |
2011 | { |
2019 | { |
2012 | unsigned char setoldcursor; |
2020 | unsigned char setoldcursor; |
2013 | rend_t ccol1, /* Cursor colour */ |
|
|
2014 | ccol2; /* Cursor colour2 */ |
|
|
2015 | |
2021 | |
2016 | showcursor = (screen.flags & Screen_VisibleCursor); |
2022 | showcursor = (screen.flags & Screen_VisibleCursor); |
2017 | #ifdef CURSOR_BLINK |
2023 | #ifdef CURSOR_BLINK |
2018 | if (hidden_cursor) |
2024 | if (hidden_cursor) |
2019 | showcursor = 0; |
2025 | showcursor = 0; |
… | |
… | |
2026 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2032 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2027 | col--; |
2033 | col--; |
2028 | |
2034 | |
2029 | crp = &ROW(screen.cur.row).r[col]; |
2035 | crp = &ROW(screen.cur.row).r[col]; |
2030 | |
2036 | |
|
|
2037 | #ifndef NO_CURSORCOLOR |
|
|
2038 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2039 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2040 | ccol1 = Color_cursor; |
|
|
2041 | else |
|
|
2042 | #endif |
|
|
2043 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2044 | ccol1 = fgcolor_of (rstyle); |
|
|
2045 | #else |
|
|
2046 | ccol1 = Color_fg; |
|
|
2047 | #endif |
|
|
2048 | |
|
|
2049 | #ifndef NO_CURSORCOLOR |
|
|
2050 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2051 | ccol2 = Color_cursor2; |
|
|
2052 | else |
|
|
2053 | #endif |
|
|
2054 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2055 | ccol2 = bgcolor_of (rstyle); |
|
|
2056 | #else |
|
|
2057 | ccol2 = Color_bg; |
|
|
2058 | #endif |
|
|
2059 | |
2031 | if (showcursor && focus) |
2060 | if (showcursor && focus) |
2032 | { |
2061 | { |
2033 | if (OPTION (Opt_cursorUnderline)) |
2062 | if (option (Opt_cursorUnderline)) |
2034 | *crp ^= RS_Uline; |
2063 | *crp ^= RS_Uline; |
2035 | else |
2064 | else |
2036 | { |
2065 | { |
2037 | *crp ^= RS_RVid; |
2066 | *crp ^= RS_RVid; |
2038 | |
|
|
2039 | #ifndef NO_CURSORCOLOR |
|
|
2040 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2041 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2042 | ccol1 = Color_cursor; |
|
|
2043 | else |
|
|
2044 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2045 | ccol1 = fgcolor_of (rstyle); |
|
|
2046 | #else |
|
|
2047 | ccol1 = Color_fg; |
|
|
2048 | #endif |
|
|
2049 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2050 | ccol2 = Color_cursor2; |
|
|
2051 | else |
|
|
2052 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2053 | ccol2 = bgcolor_of (rstyle); |
|
|
2054 | #else |
|
|
2055 | ccol2 = Color_bg; |
|
|
2056 | #endif |
|
|
2057 | *crp = SET_FGCOLOR (*crp, ccol1); |
2067 | *crp = SET_FGCOLOR (*crp, ccol1); |
2058 | *crp = SET_BGCOLOR (*crp, ccol2); |
2068 | *crp = SET_BGCOLOR (*crp, ccol2); |
2059 | #endif |
|
|
2060 | } |
2069 | } |
2061 | } |
2070 | } |
2062 | } |
2071 | } |
2063 | |
2072 | |
2064 | /* make sure no outline cursor is left around */ |
2073 | /* make sure no outline cursor is left around */ |
… | |
… | |
2103 | * D: CopyArea pass - very useful for slower links |
2112 | * D: CopyArea pass - very useful for slower links |
2104 | * This has been deliberately kept simple. |
2113 | * This has been deliberately kept simple. |
2105 | */ |
2114 | */ |
2106 | if (!display->is_local |
2115 | if (!display->is_local |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2116 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2108 | && abs (num_scr) < nrow && !must_clear) |
2117 | && abs (num_scr) < nrow && !have_bg) |
2109 | { |
2118 | { |
2110 | int16_t nits; |
2119 | int16_t nits; |
|
|
2120 | int i = num_scr; |
2111 | int j; |
2121 | int j; |
2112 | int len, wlen; |
2122 | int len, wlen; |
2113 | dLocal (int, num_scr); |
2123 | dLocal (int, num_scr); |
2114 | |
2124 | |
2115 | j = nrow; |
2125 | j = nrow; |
2116 | wlen = len = -1; |
2126 | wlen = len = -1; |
2117 | row = i > 0 ? 0 : j - 1; |
2127 | row = i > 0 ? 0 : j - 1; |
|
|
2128 | |
2118 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2129 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2119 | { |
2130 | { |
2120 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2131 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2121 | { |
2132 | { |
2122 | line_t s = ROW(view_start + row); |
2133 | line_t s = ROW(view_start + row); |
… | |
… | |
2143 | wlen = row; |
2154 | wlen = row; |
2144 | continue; |
2155 | continue; |
2145 | } |
2156 | } |
2146 | } |
2157 | } |
2147 | |
2158 | |
2148 | if (len != -1) |
2159 | if (len >= 0) |
2149 | { |
2160 | { |
2150 | /* also comes here at end if needed because of >= above */ |
2161 | /* also comes here at end if needed because of >= above */ |
2151 | if (wlen < len) |
2162 | if (wlen < len) |
2152 | ::swap (wlen, len); |
2163 | ::swap (wlen, len); |
2153 | |
2164 | |
|
|
2165 | XGCValues gcv; |
|
|
2166 | |
|
|
2167 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2154 | XCopyArea (xdisp, vt, vt, |
2168 | XCopyArea (dpy, vt, vt, |
2155 | gc, 0, Row2Pixel (len + i), |
2169 | gc, 0, Row2Pixel (len + i), |
2156 | (unsigned int)this->width, |
2170 | (unsigned int)this->width, |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2171 | (unsigned int)Height2Pixel (wlen - len + 1), |
2158 | 0, Row2Pixel (len)); |
2172 | 0, Row2Pixel (len)); |
|
|
2173 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2174 | |
2159 | len = -1; |
2175 | len = -1; |
2160 | } |
2176 | } |
2161 | } |
2177 | } |
2162 | } |
2178 | } |
2163 | #endif |
2179 | #endif |
… | |
… | |
2219 | count++; |
2235 | count++; |
2220 | |
2236 | |
2221 | if (stp[col] != dtp[col] |
2237 | if (stp[col] != dtp[col] |
2222 | || !RS_SAME (srp[col], drp[col])) |
2238 | || !RS_SAME (srp[col], drp[col])) |
2223 | { |
2239 | { |
2224 | if (must_clear && (i++ > count / 2)) |
2240 | if (have_bg && (i++ > count / 2)) |
2225 | break; |
2241 | break; |
2226 | |
2242 | |
2227 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2228 | drp[col] = rend; |
2244 | drp[col] = rend; |
2229 | i = 0; |
2245 | i = 0; |
2230 | } |
2246 | } |
2231 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2247 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2232 | break; |
2248 | break; |
2233 | } |
2249 | } |
2234 | |
2250 | |
2235 | col--; /* went one too far. move back */ |
2251 | col--; /* went one too far. move back */ |
2236 | count -= i; /* dump any matching trailing chars */ |
2252 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2246 | int back = bgcolor_of (rend); // desired background |
2262 | int back = bgcolor_of (rend); // desired background |
2247 | |
2263 | |
2248 | // only do special processing if any attributes are set, which is unlikely |
2264 | // only do special processing if any attributes are set, which is unlikely |
2249 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2265 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2250 | { |
2266 | { |
2251 | #if ENABLE_STYLES |
|
|
2252 | // "careful" (too wide) character handling |
|
|
2253 | |
|
|
2254 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2255 | while (text > stp |
|
|
2256 | && srp[text - stp - 1] & RS_Careful |
|
|
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2258 | text--, count++, xpixel -= fwidth; |
|
|
2259 | |
|
|
2260 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2261 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2262 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2263 | |
|
|
2264 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2265 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2266 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2267 | #endif |
|
|
2268 | |
|
|
2269 | bool invert = rend & RS_RVid; |
2267 | bool invert = rend & RS_RVid; |
2270 | |
2268 | |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2269 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2272 | if (rend & RS_Bold |
|
|
2273 | && fore == Color_fg) |
2270 | if (rend & RS_Bold && fore == Color_fg) |
2274 | { |
2271 | { |
2275 | if (ISSET_PIXCOLOR (Color_BD)) |
2272 | if (ISSET_PIXCOLOR (Color_BD)) |
2276 | fore = Color_BD; |
2273 | fore = Color_BD; |
2277 | # if !ENABLE_STYLES |
2274 | # if !ENABLE_STYLES |
2278 | else |
2275 | else |
2279 | invert = !invert; |
2276 | invert = !invert; |
2280 | # endif |
2277 | # endif |
2281 | } |
2278 | } |
2282 | |
2279 | |
2283 | if (rend & RS_Italic |
2280 | if (rend & RS_Italic && fore == Color_fg) |
2284 | && fore == Color_fg) |
|
|
2285 | { |
2281 | { |
2286 | if (ISSET_PIXCOLOR (Color_IT)) |
2282 | if (ISSET_PIXCOLOR (Color_IT)) |
2287 | fore = Color_IT; |
2283 | fore = Color_IT; |
2288 | # if !ENABLE_STYLES |
2284 | # if !ENABLE_STYLES |
2289 | else |
2285 | else |
2290 | invert = !invert; |
2286 | invert = !invert; |
2291 | # endif |
2287 | # endif |
2292 | } |
2288 | } |
2293 | |
2289 | |
2294 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2290 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2295 | fore = Color_UL; |
2291 | fore = Color_UL; |
2296 | #endif |
2292 | #endif |
2297 | |
2293 | |
2298 | if (invert) |
2294 | if (invert) |
2299 | { |
2295 | { |
|
|
2296 | #ifdef OPTION_HC |
|
|
2297 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2298 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | #endif |
|
|
2300 | /* invert the column if no highlightColor is set or it is the |
|
|
2301 | * current cursor column */ |
2300 | ::swap (fore, back); |
2302 | ::swap (fore, back); |
|
|
2303 | #ifdef OPTION_HC |
|
|
2304 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2305 | back = Color_HC; |
|
|
2306 | #endif |
2301 | |
2307 | |
2302 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2308 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2309 | # ifndef OPTION_HC |
2303 | if (ISSET_PIXCOLOR (Color_RV)) |
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
2304 | back = Color_RV; |
2311 | back = Color_RV; |
2305 | |
2312 | # endif |
2306 | if (fore == back) |
2313 | if (fore == back) |
2307 | { |
2314 | { |
2308 | fore = Color_bg; |
2315 | fore = Color_bg; |
2309 | back = Color_fg; |
2316 | back = Color_fg; |
2310 | } |
2317 | } |
… | |
… | |
2312 | } |
2319 | } |
2313 | |
2320 | |
2314 | #ifdef TEXT_BLINK |
2321 | #ifdef TEXT_BLINK |
2315 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2322 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2316 | { |
2323 | { |
2317 | if (!text_blink_ev.active) |
2324 | if (!text_blink_ev.is_active ()) |
2318 | { |
2325 | { |
2319 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2326 | text_blink_ev.again (); |
2320 | hidden_text = 0; |
2327 | hidden_text = 0; |
2321 | } |
2328 | } |
2322 | else if (hidden_text) |
2329 | else if (hidden_text) |
2323 | fore = back; |
2330 | fore = back; |
2324 | } |
2331 | } |
2325 | #endif |
2332 | #endif |
|
|
2333 | |
|
|
2334 | #if ENABLE_STYLES |
|
|
2335 | // "careful" (too wide) character handling |
|
|
2336 | |
|
|
2337 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2338 | while (text > stp |
|
|
2339 | && srp[text - stp - 1] & RS_Careful |
|
|
2340 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2341 | text--, count++, xpixel -= fwidth; |
|
|
2342 | |
|
|
2343 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2344 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2345 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2346 | |
|
|
2347 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2348 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2349 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2350 | #endif |
2326 | } |
2351 | } |
2327 | |
2352 | |
2328 | /* |
2353 | /* |
2329 | * Actually do the drawing of the string here |
2354 | * Actually do the drawing of the string here |
2330 | */ |
2355 | */ |
2331 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2332 | |
2357 | |
2333 | if (back == fore) |
|
|
2334 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2335 | fwidth * count, fheight, |
|
|
2336 | back); |
|
|
2337 | else if (back == Color_bg) |
2358 | if (have_bg && back == Color_bg) |
2338 | { |
2359 | { |
2339 | if (must_clear) |
2360 | // this is very ugly, maybe push it into ->draw? |
2340 | { |
|
|
2341 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2342 | |
2361 | |
2343 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2344 | if (text[i] != ' ') |
2363 | if (text[i] != ' ') |
2345 | { |
2364 | { |
2346 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2365 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2347 | break; |
2366 | goto did_clear; |
2348 | } |
|
|
2349 | } |
2367 | } |
2350 | else |
2368 | |
2351 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2369 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2370 | did_clear: ; |
2352 | } |
2371 | } |
2353 | else |
2372 | else |
2354 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2355 | |
2374 | |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2375 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2357 | { |
2376 | { |
2358 | #if ENABLE_FRILLS |
2377 | #if ENABLE_FRILLS |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2361 | else |
2380 | else |
2362 | #endif |
2381 | #endif |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2382 | XSetForeground (dpy, gc, pix_colors[fore]); |
2364 | |
2383 | |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2384 | XDrawLine (dpy, vt, gc, |
2366 | xpixel, ypixel + font->ascent + 1, |
2385 | xpixel, ypixel + font->ascent + 1, |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2386 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2368 | } |
2387 | } |
2369 | } /* for (col....) */ |
2388 | } /* for (col....) */ |
2370 | } /* for (row....) */ |
2389 | } /* for (row....) */ |
… | |
… | |
2379 | */ |
2398 | */ |
2380 | if (showcursor) |
2399 | if (showcursor) |
2381 | { |
2400 | { |
2382 | if (focus) |
2401 | if (focus) |
2383 | { |
2402 | { |
2384 | if (OPTION (Opt_cursorUnderline)) |
2403 | if (option (Opt_cursorUnderline)) |
2385 | *crp ^= RS_Uline; |
2404 | *crp ^= RS_Uline; |
2386 | else |
2405 | else |
2387 | { |
2406 | { |
2388 | *crp ^= RS_RVid; |
2407 | *crp ^= RS_RVid; |
2389 | #ifndef NO_CURSORCOLOR |
2408 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2422 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2404 | cursorwidth++; |
2423 | cursorwidth++; |
2405 | |
2424 | |
2406 | #ifndef NO_CURSORCOLOR |
2425 | #ifndef NO_CURSORCOLOR |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2426 | if (ISSET_PIXCOLOR (Color_cursor)) |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2427 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2428 | else |
2409 | #endif |
2429 | #endif |
|
|
2430 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2410 | |
2431 | |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2432 | XDrawRectangle (dpy, vt, gc, |
2412 | Col2Pixel (col), |
2433 | Col2Pixel (col), |
2413 | Row2Pixel (oldcursor.row), |
2434 | Row2Pixel (oldcursor.row), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2435 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2436 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2416 | } |
2437 | } |
… | |
… | |
2451 | } |
2472 | } |
2452 | |
2473 | |
2453 | void |
2474 | void |
2454 | rxvt_term::scr_recolour () NOTHROW |
2475 | rxvt_term::scr_recolour () NOTHROW |
2455 | { |
2476 | { |
2456 | if (1 |
2477 | #ifdef HAVE_BG_PIXMAP |
2457 | #if TRANSPARENT |
2478 | bgPixmap.apply (); |
2458 | && !am_transparent |
2479 | #else |
2459 | #endif |
2480 | |
2460 | #if XPM_BACKGROUND |
|
|
2461 | && !bgPixmap.pixmap |
|
|
2462 | #endif |
|
|
2463 | ) |
|
|
2464 | { |
|
|
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2481 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2466 | XClearWindow (xdisp, parent[0]); |
2482 | XClearWindow (dpy, parent[0]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2483 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2468 | #if HAVE_SCROLLBARS |
2484 | |
2469 | if (scrollBar.win) |
2485 | if (scrollBar.win) |
2470 | { |
2486 | { |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2487 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2472 | scrollBar.setIdle (); |
2488 | scrollBar.state = STATE_IDLE; |
2473 | scrollbar_show (0); |
2489 | scrollBar.show (0); |
2474 | } |
|
|
2475 | #endif |
|
|
2476 | } |
2490 | } |
2477 | |
2491 | |
|
|
2492 | #endif |
|
|
2493 | |
|
|
2494 | /* bgPixmap.apply () does not do the following : */ |
2478 | scr_clear (); |
2495 | scr_clear (); |
2479 | scr_touch (true); |
2496 | scr_touch (true); |
2480 | want_refresh = 1; |
2497 | want_refresh = 1; |
2481 | } |
2498 | } |
2482 | |
2499 | |
… | |
… | |
2489 | |
2506 | |
2490 | num_scr_allow = 0; |
2507 | num_scr_allow = 0; |
2491 | want_refresh = 1; |
2508 | want_refresh = 1; |
2492 | |
2509 | |
2493 | if (really) |
2510 | if (really) |
2494 | XClearWindow (xdisp, vt); |
2511 | XClearWindow (dpy, vt); |
2495 | } |
2512 | } |
2496 | |
2513 | |
2497 | void |
2514 | void |
2498 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2515 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2499 | { |
2516 | { |
… | |
… | |
2574 | { |
2591 | { |
2575 | int row, wrote; |
2592 | int row, wrote; |
2576 | unsigned int width, towrite; |
2593 | unsigned int width, towrite; |
2577 | char r1[] = "\n"; |
2594 | char r1[] = "\n"; |
2578 | |
2595 | |
2579 | for (row = saveLines - nsaved; |
2596 | for (row = saveLines + top_row; |
2580 | row < saveLines + nrow - 1; row++) |
2597 | row < saveLines + nrow - 1; row++) |
2581 | { |
2598 | { |
2582 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2599 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2583 | : ncol; |
2600 | : ncol; |
2584 | for (towrite = width; towrite; towrite -= wrote) |
2601 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2635 | /* convert normal newline chars into common keyboard Return key sequence */ |
2652 | /* convert normal newline chars into common keyboard Return key sequence */ |
2636 | for (unsigned int i = 0; i < len; i++) |
2653 | for (unsigned int i = 0; i < len; i++) |
2637 | if (data[i] == C0_LF) |
2654 | if (data[i] == C0_LF) |
2638 | data[i] = C0_CR; |
2655 | data[i] = C0_CR; |
2639 | |
2656 | |
|
|
2657 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2658 | tt_printf ("\e[200~"); |
|
|
2659 | |
2640 | tt_write (data, len); |
2660 | tt_write (data, len); |
|
|
2661 | |
|
|
2662 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2663 | tt_printf ("\e[201~"); |
2641 | } |
2664 | } |
2642 | |
2665 | |
2643 | /* ------------------------------------------------------------------------- */ |
2666 | /* ------------------------------------------------------------------------- */ |
2644 | /* |
2667 | /* |
2645 | * Respond to a notification that a primary selection has been sent |
2668 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2674 | } |
2697 | } |
2675 | |
2698 | |
2676 | unsigned long bytes_after; |
2699 | unsigned long bytes_after; |
2677 | XTextProperty ct; |
2700 | XTextProperty ct; |
2678 | |
2701 | |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2702 | if (XGetWindowProperty (dpy, win, prop, |
2680 | 0, PROP_SIZE / 4, |
2703 | 0, PROP_SIZE / 4, |
2681 | delete_prop, AnyPropertyType, |
2704 | delete_prop, AnyPropertyType, |
2682 | &ct.encoding, &ct.format, |
2705 | &ct.encoding, &ct.format, |
2683 | &ct.nitems, &bytes_after, |
2706 | &ct.nitems, &bytes_after, |
2684 | &ct.value) != Success) |
2707 | &ct.value) != Success) |
… | |
… | |
2693 | if (bytes_after) |
2716 | if (bytes_after) |
2694 | { |
2717 | { |
2695 | // fetch and append remaining data |
2718 | // fetch and append remaining data |
2696 | XTextProperty ct2; |
2719 | XTextProperty ct2; |
2697 | |
2720 | |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2721 | if (XGetWindowProperty (dpy, win, prop, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2722 | ct.nitems / 4, (bytes_after + 3) / 4, |
2700 | delete_prop, AnyPropertyType, |
2723 | delete_prop, AnyPropertyType, |
2701 | &ct2.encoding, &ct2.format, |
2724 | &ct2.encoding, &ct2.format, |
2702 | &ct2.nitems, &bytes_after, |
2725 | &ct2.nitems, &bytes_after, |
2703 | &ct2.value) != Success) |
2726 | &ct2.value) != Success) |
… | |
… | |
2716 | |
2739 | |
2717 | if (ct.encoding == xa[XA_INCR]) |
2740 | if (ct.encoding == xa[XA_INCR]) |
2718 | { |
2741 | { |
2719 | // INCR selection, start handshake |
2742 | // INCR selection, start handshake |
2720 | if (!delete_prop) |
2743 | if (!delete_prop) |
2721 | XDeleteProperty (xdisp, win, prop); |
2744 | XDeleteProperty (dpy, win, prop); |
2722 | |
2745 | |
2723 | selection_wait = Sel_incr; |
2746 | selection_wait = Sel_incr; |
2724 | incr_buf_fill = 0; |
2747 | incr_buf_fill = 0; |
2725 | incr_ev.start (NOW + 10); |
2748 | incr_ev.start (10); |
2726 | |
2749 | |
2727 | goto bailout; |
2750 | goto bailout; |
2728 | } |
2751 | } |
2729 | |
2752 | |
2730 | if (ct.nitems == 0) |
2753 | if (ct.nitems == 0) |
… | |
… | |
2739 | ct.nitems = incr_buf_fill; |
2762 | ct.nitems = incr_buf_fill; |
2740 | incr_buf = 0; |
2763 | incr_buf = 0; |
2741 | incr_buf_size = 0; |
2764 | incr_buf_size = 0; |
2742 | incr_ev.stop (); |
2765 | incr_ev.stop (); |
2743 | } |
2766 | } |
2744 | else |
2767 | else |
2745 | { |
2768 | { |
2746 | if (selection_wait == Sel_normal |
2769 | if (selection_wait == Sel_normal |
2747 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2770 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2748 | { |
2771 | { |
2749 | /* |
2772 | /* |
… | |
… | |
2756 | goto bailout; |
2779 | goto bailout; |
2757 | } |
2780 | } |
2758 | } |
2781 | } |
2759 | else if (selection_wait == Sel_incr) |
2782 | else if (selection_wait == Sel_incr) |
2760 | { |
2783 | { |
2761 | incr_ev.start (NOW + 10); |
2784 | incr_ev.start (10); |
2762 | |
2785 | |
2763 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2786 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2764 | { |
2787 | { |
2765 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2788 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2766 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2789 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2787 | paste (s, strlen (s)); |
2810 | paste (s, strlen (s)); |
2788 | free (s); |
2811 | free (s); |
2789 | } |
2812 | } |
2790 | else |
2813 | else |
2791 | #endif |
2814 | #endif |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2815 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2793 | && cl) |
2816 | && cl) |
2794 | { |
2817 | { |
2795 | for (int i = 0; i < cr; i++) |
2818 | for (int i = 0; i < cr; i++) |
2796 | paste (cl[i], strlen (cl[i])); |
2819 | paste (cl[i], strlen (cl[i])); |
2797 | |
2820 | |
… | |
… | |
2806 | if (selection_wait == Sel_normal) |
2829 | if (selection_wait == Sel_normal) |
2807 | selection_wait = Sel_none; |
2830 | selection_wait = Sel_none; |
2808 | } |
2831 | } |
2809 | |
2832 | |
2810 | void |
2833 | void |
2811 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2834 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2812 | { |
2835 | { |
2813 | selection_wait = Sel_none; |
2836 | selection_wait = Sel_none; |
2814 | |
2837 | |
2815 | incr_buf_size = 0; |
2838 | incr_buf_size = 0; |
2816 | free (incr_buf); |
2839 | free (incr_buf); |
… | |
… | |
2827 | selection_paste (win, prop, true); |
2850 | selection_paste (win, prop, true); |
2828 | } |
2851 | } |
2829 | |
2852 | |
2830 | /* ------------------------------------------------------------------------- */ |
2853 | /* ------------------------------------------------------------------------- */ |
2831 | /* |
2854 | /* |
2832 | * Request the current selection: |
2855 | * Request the current selection: |
2833 | * Order: > internal selection if available |
2856 | * Order: > internal selection if available |
2834 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2857 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2835 | * > CUT_BUFFER0 |
2858 | * > CUT_BUFFER0 |
2836 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2859 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2837 | * will auto fallback to CUT_BUFFER0 |
2860 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2839 | */ |
2862 | */ |
2840 | void |
2863 | void |
2841 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2864 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2842 | { |
2865 | { |
2843 | if (selection.text && selnum == Sel_Primary) |
2866 | if (selection.text && selnum == Sel_Primary) |
|
|
2867 | { |
2844 | { /* internal selection */ |
2868 | /* internal selection */ |
2845 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2869 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2846 | paste (str, strlen (str)); |
2870 | paste (str, strlen (str)); |
2847 | free (str); |
2871 | free (str); |
2848 | return; |
2872 | return; |
2849 | } |
2873 | } |
… | |
… | |
2879 | else if (selnum == Sel_Secondary) |
2903 | else if (selnum == Sel_Secondary) |
2880 | sel = XA_SECONDARY; |
2904 | sel = XA_SECONDARY; |
2881 | else |
2905 | else |
2882 | sel = xa[XA_CLIPBOARD]; |
2906 | sel = xa[XA_CLIPBOARD]; |
2883 | |
2907 | |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2908 | if (XGetSelectionOwner (dpy, sel) != None) |
2885 | { |
2909 | { |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2910 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2887 | vt, selection_request_time); |
2911 | vt, selection_request_time); |
2888 | return 1; |
2912 | return 1; |
2889 | } |
2913 | } |
2890 | |
2914 | |
2891 | return 0; |
2915 | return 0; |
… | |
… | |
3044 | bool |
3068 | bool |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
3069 | rxvt_term::selection_grab (Time tm) NOTHROW |
3046 | { |
3070 | { |
3047 | selection_time = tm; |
3071 | selection_time = tm; |
3048 | |
3072 | |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3073 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3074 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3051 | { |
3075 | { |
3052 | display->set_selection_owner (this); |
3076 | display->set_selection_owner (this); |
3053 | return true; |
3077 | return true; |
3054 | } |
3078 | } |
3055 | else |
3079 | else |
… | |
… | |
3059 | } |
3083 | } |
3060 | |
3084 | |
3061 | #if 0 |
3085 | #if 0 |
3062 | XTextProperty ct; |
3086 | XTextProperty ct; |
3063 | |
3087 | |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3088 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3065 | { |
3089 | { |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3090 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3067 | XFree (ct.value); |
3091 | XFree (ct.value); |
3068 | } |
3092 | } |
3069 | #endif |
3093 | #endif |
… | |
… | |
3115 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3139 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3116 | |
3140 | |
3117 | while (selection.mark.col > 0 |
3141 | while (selection.mark.col > 0 |
3118 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3142 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3119 | --selection.mark.col; |
3143 | --selection.mark.col; |
3120 | |
3144 | |
3121 | if (selection.op) |
3145 | if (selection.op) |
|
|
3146 | { |
3122 | { /* clear the old selection */ |
3147 | /* clear the old selection */ |
3123 | selection.beg.row = selection.end.row = selection.mark.row; |
3148 | selection.beg.row = selection.end.row = selection.mark.row; |
3124 | selection.beg.col = selection.end.col = selection.mark.col; |
3149 | selection.beg.col = selection.end.col = selection.mark.col; |
3125 | } |
3150 | } |
3126 | |
3151 | |
3127 | selection.op = SELECTION_INIT; |
3152 | selection.op = SELECTION_INIT; |
… | |
… | |
3316 | * a point/word/line which is either the start or end of the selection |
3341 | * a point/word/line which is either the start or end of the selection |
3317 | * and it was decided by whichever point/word/line was `fixed' at the |
3342 | * and it was decided by whichever point/word/line was `fixed' at the |
3318 | * time of the most recent button3 press |
3343 | * time of the most recent button3 press |
3319 | */ |
3344 | */ |
3320 | if (button3 && buttonpress) |
3345 | if (button3 && buttonpress) |
|
|
3346 | { |
3321 | { /* button3 press */ |
3347 | /* button3 press */ |
3322 | /* |
3348 | /* |
3323 | * first determine which edge of the selection we are closest to |
3349 | * first determine which edge of the selection we are closest to |
3324 | */ |
3350 | */ |
3325 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3351 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3326 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3352 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3344 | selection.mark.row = selection.beg.row; |
3370 | selection.mark.row = selection.beg.row; |
3345 | selection.mark.col = selection.beg.col; |
3371 | selection.mark.col = selection.beg.col; |
3346 | } |
3372 | } |
3347 | } |
3373 | } |
3348 | else |
3374 | else |
|
|
3375 | { |
3349 | { /* button1 drag or button3 drag */ |
3376 | /* button1 drag or button3 drag */ |
3350 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3377 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3351 | { |
3378 | { |
3352 | if (selection.mark.row == selection.end.row |
3379 | if (selection.mark.row == selection.end.row |
3353 | && selection.mark.col == selection.end.col |
3380 | && selection.mark.col == selection.end.col |
3354 | && clickchange |
3381 | && clickchange |
… | |
… | |
3397 | selection_delimit_word (DN, &selection.end, &selection.end); |
3424 | selection_delimit_word (DN, &selection.end, &selection.end); |
3398 | } |
3425 | } |
3399 | else if (selection.clicks == 3) |
3426 | else if (selection.clicks == 3) |
3400 | { |
3427 | { |
3401 | #if ENABLE_FRILLS |
3428 | #if ENABLE_FRILLS |
3402 | if (OPTION (Opt_tripleclickwords)) |
3429 | if (option (Opt_tripleclickwords)) |
3403 | { |
3430 | { |
3404 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3431 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3405 | |
3432 | |
3406 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3433 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3407 | { |
3434 | { |
… | |
… | |
3435 | selection.end.row++; |
3462 | selection.end.row++; |
3436 | } |
3463 | } |
3437 | } |
3464 | } |
3438 | |
3465 | |
3439 | if (button3 && buttonpress) |
3466 | if (button3 && buttonpress) |
|
|
3467 | { |
3440 | { /* mark may need to be changed */ |
3468 | /* mark may need to be changed */ |
3441 | if (closeto == LEFT) |
3469 | if (closeto == LEFT) |
3442 | { |
3470 | { |
3443 | selection.mark.row = selection.end.row; |
3471 | selection.mark.row = selection.end.row; |
3444 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3472 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3445 | } |
3473 | } |
… | |
… | |
3542 | *target++ = xa[XA_COMPOUND_TEXT]; |
3570 | *target++ = xa[XA_COMPOUND_TEXT]; |
3543 | #if X_HAVE_UTF8_STRING |
3571 | #if X_HAVE_UTF8_STRING |
3544 | *target++ = xa[XA_UTF8_STRING]; |
3572 | *target++ = xa[XA_UTF8_STRING]; |
3545 | #endif |
3573 | #endif |
3546 | |
3574 | |
3547 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3575 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3548 | 32, PropModeReplace, |
3576 | 32, PropModeReplace, |
3549 | (unsigned char *)target_list, target - target_list); |
3577 | (unsigned char *)target_list, target - target_list); |
3550 | ev.property = rq.property; |
3578 | ev.property = rq.property; |
3551 | } |
3579 | } |
3552 | #if TODO // TODO |
3580 | #if TODO // TODO |
… | |
… | |
3555 | /* TODO: Handle MULTIPLE */ |
3583 | /* TODO: Handle MULTIPLE */ |
3556 | } |
3584 | } |
3557 | #endif |
3585 | #endif |
3558 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3586 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3559 | { |
3587 | { |
3560 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3588 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3561 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3589 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3562 | ev.property = rq.property; |
3590 | ev.property = rq.property; |
3563 | } |
3591 | } |
3564 | else if (rq.target == XA_STRING |
3592 | else if (rq.target == XA_STRING |
3565 | || rq.target == xa[XA_TEXT] |
3593 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3623 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3651 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3624 | ct.nitems = strlen ((char *)ct.value); |
3652 | ct.nitems = strlen ((char *)ct.value); |
3625 | } |
3653 | } |
3626 | else |
3654 | else |
3627 | #endif |
3655 | #endif |
3628 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3656 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3629 | freect = 1; |
3657 | freect = 1; |
3630 | else |
3658 | else |
3631 | { |
3659 | { |
3632 | /* if we failed to convert then send it raw */ |
3660 | /* if we failed to convert then send it raw */ |
3633 | ct.value = (unsigned char *)cl; |
3661 | ct.value = (unsigned char *)cl; |
3634 | ct.nitems = selectlen; |
3662 | ct.nitems = selectlen; |
3635 | ct.encoding = target; |
3663 | ct.encoding = target; |
3636 | } |
3664 | } |
3637 | |
3665 | |
3638 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3666 | XChangeProperty (dpy, rq.requestor, rq.property, |
3639 | ct.encoding, 8, PropModeReplace, |
3667 | ct.encoding, 8, PropModeReplace, |
3640 | ct.value, (int)ct.nitems); |
3668 | ct.value, (int)ct.nitems); |
3641 | ev.property = rq.property; |
3669 | ev.property = rq.property; |
3642 | |
3670 | |
3643 | if (freect) |
3671 | if (freect) |
3644 | XFree (ct.value); |
3672 | XFree (ct.value); |
3645 | } |
3673 | } |
3646 | |
3674 | |
3647 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3675 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3648 | } |
|
|
3649 | |
|
|
3650 | /* ------------------------------------------------------------------------- * |
|
|
3651 | * MOUSE ROUTINES * |
|
|
3652 | * ------------------------------------------------------------------------- */ |
|
|
3653 | |
|
|
3654 | /* |
|
|
3655 | * return col/row values corresponding to x/y pixel values |
|
|
3656 | */ |
|
|
3657 | void |
|
|
3658 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3659 | { |
|
|
3660 | *x = Pixel2Col (*x); |
|
|
3661 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3662 | *y = Pixel2Row (*y); |
|
|
3663 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3664 | } |
3676 | } |
3665 | |
3677 | |
3666 | /* ------------------------------------------------------------------------- */ |
3678 | /* ------------------------------------------------------------------------- */ |
3667 | #ifdef USE_XIM |
3679 | #ifdef USE_XIM |
3668 | void |
3680 | void |
3669 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3681 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3670 | { |
3682 | { |
3671 | XWindowAttributes xwa; |
3683 | XWindowAttributes xwa; |
3672 | |
3684 | |
3673 | XGetWindowAttributes (xdisp, vt, &xwa); |
3685 | XGetWindowAttributes (dpy, vt, &xwa); |
3674 | |
3686 | |
3675 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3687 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3676 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3688 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3677 | } |
3689 | } |
3678 | #endif |
3690 | #endif |