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. |
… | |
… | |
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 seperate compile! |
34 | |
34 | |
35 | 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) |
36 | { |
36 | { |
37 | while (len--) |
37 | while (len--) |
38 | *start++ = value; |
38 | *start++ = value; |
39 | } |
39 | } |
40 | |
40 | |
… | |
… | |
83 | 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) |
84 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
84 | #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) |
85 | ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) |
86 | |
86 | |
87 | /* |
87 | /* |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
88 | * 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 | */ |
89 | */ |
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) \ |
90 | #define CLEAR_CHARS(x, y, num) \ |
101 | if (mapped) \ |
91 | if (mapped) \ |
102 | XClearArea (dpy, drawBuffer, x, y, \ |
92 | XClearArea (dpy, vt, x, y, \ |
103 | (unsigned int)Width2Pixel (num), \ |
93 | (unsigned int)Width2Pixel (num), \ |
104 | (unsigned int)Height2Pixel (1), False) |
94 | (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 | |
95 | |
112 | /* ------------------------------------------------------------------------- * |
96 | /* ------------------------------------------------------------------------- * |
113 | * SCREEN `COMMON' ROUTINES * |
97 | * SCREEN `COMMON' ROUTINES * |
114 | * ------------------------------------------------------------------------- */ |
98 | * ------------------------------------------------------------------------- */ |
115 | |
99 | |
… | |
… | |
148 | |
132 | |
149 | l.l = 0; |
133 | l.l = 0; |
150 | l.f = 0; |
134 | l.f = 0; |
151 | } |
135 | } |
152 | |
136 | |
|
|
137 | // nuke a single wide character at the given column |
|
|
138 | void |
|
|
139 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
140 | { |
|
|
141 | // find begin |
|
|
142 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
143 | col--; |
|
|
144 | |
|
|
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
147 | |
|
|
148 | // found start, nuke |
|
|
149 | do { |
|
|
150 | l.t[col] = ' '; |
|
|
151 | l.r[col] = rend; |
|
|
152 | col++; |
|
|
153 | } while (col < ncol && l.t[col] == NOCHAR); |
|
|
154 | } |
|
|
155 | |
153 | /* ------------------------------------------------------------------------- * |
156 | /* ------------------------------------------------------------------------- * |
154 | * SCREEN INITIALISATION * |
157 | * SCREEN INITIALISATION * |
155 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
156 | |
159 | |
157 | void |
160 | void |
158 | rxvt_term::scr_reset () |
161 | rxvt_term::scr_reset () |
159 | { |
162 | { |
160 | #if ENABLE_OVERLAY |
|
|
161 | scr_overlay_off (); |
|
|
162 | #endif |
|
|
163 | |
|
|
164 | rvideo_mode = false; |
|
|
165 | view_start = 0; |
163 | view_start = 0; |
166 | num_scr = 0; |
164 | num_scr = 0; |
167 | |
165 | |
168 | if (ncol == 0) |
166 | if (ncol == 0) |
169 | ncol = 80; |
167 | ncol = 80; |
… | |
… | |
171 | if (nrow == 0) |
169 | if (nrow == 0) |
172 | nrow = 24; |
170 | nrow = 24; |
173 | |
171 | |
174 | if (ncol == prev_ncol && nrow == prev_nrow) |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | return; |
173 | return; |
176 | |
|
|
177 | if (current_screen != PRIMARY) |
|
|
178 | scr_swap_screen (); |
|
|
179 | |
174 | |
180 | // we need at least two lines for wrapping to work correctly |
175 | // we need at least two lines for wrapping to work correctly |
181 | while (nrow + saveLines < 2) |
176 | while (nrow + saveLines < 2) |
182 | { |
177 | { |
183 | //TODO//FIXME |
178 | //TODO//FIXME |
… | |
… | |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
269 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
275 | } |
270 | } |
276 | |
271 | |
277 | line_t *old_buf = row_buf; |
272 | line_t *old_buf = row_buf; |
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
273 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
279 | |
274 | |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
275 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
276 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
277 | int q = total_rows; // rewrapped row |
283 | |
278 | |
284 | if (top_row) |
279 | if (top_row) |
… | |
… | |
328 | int qcol = 0; |
323 | int qcol = 0; |
329 | |
324 | |
330 | // see below for cursor adjustment rationale |
325 | // see below for cursor adjustment rationale |
331 | if (p == ocur.row) |
326 | if (p == ocur.row) |
332 | screen.cur.row = q - (total_rows - nrow); |
327 | screen.cur.row = q - (total_rows - nrow); |
333 | |
328 | |
334 | // fill a single destination line |
329 | // fill a single destination line |
335 | while (lofs < llen && qcol < ncol) |
330 | while (lofs < llen && qcol < ncol) |
336 | { |
331 | { |
337 | int prow = lofs / prev_ncol; |
332 | int prow = lofs / prev_ncol; |
338 | int pcol = lofs % prev_ncol; |
333 | int pcol = lofs % prev_ncol; |
… | |
… | |
364 | } |
359 | } |
365 | while (p != pend && q > 0); |
360 | while (p != pend && q > 0); |
366 | |
361 | |
367 | term_start = total_rows - nrow; |
362 | term_start = total_rows - nrow; |
368 | top_row = q - term_start; |
363 | top_row = q - term_start; |
369 | |
364 | |
370 | // make sure all terminal lines exist |
365 | // make sure all terminal lines exist |
371 | while (top_row > 0) |
366 | while (top_row > 0) |
372 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
367 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
373 | } |
368 | } |
374 | else |
369 | else |
375 | { |
370 | { |
376 | // if no scrollback exists (yet), wing, instead of wrap |
371 | // if no scrollback exists (yet), wing, instead of wrap |
377 | |
372 | |
378 | for (int row = min (nrow, prev_nrow); row--; ) |
373 | for (int row = min (nrow, prev_nrow); row--; ) |
379 | { |
374 | { |
380 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
375 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
381 | line_t &qline = row_buf [row]; |
376 | line_t &qline = row_buf [row]; |
382 | |
377 | |
… | |
… | |
396 | delete old_ta; |
391 | delete old_ta; |
397 | delete old_ra; |
392 | delete old_ra; |
398 | |
393 | |
399 | clamp_it (screen.cur.row, 0, nrow - 1); |
394 | clamp_it (screen.cur.row, 0, nrow - 1); |
400 | clamp_it (screen.cur.col, 0, ncol - 1); |
395 | clamp_it (screen.cur.col, 0, ncol - 1); |
401 | |
|
|
402 | free (tabs); |
|
|
403 | } |
396 | } |
404 | |
397 | |
405 | CLEAR_ALL_SELECTION (); |
398 | CLEAR_ALL_SELECTION (); |
406 | |
399 | |
407 | prev_nrow = nrow; |
400 | prev_nrow = nrow; |
408 | prev_ncol = ncol; |
401 | 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 | |
402 | |
418 | tt_winch (); |
403 | tt_winch (); |
419 | |
404 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
405 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
406 | } |
… | |
… | |
433 | delete ralloc; ralloc = 0; |
418 | delete ralloc; ralloc = 0; |
434 | |
419 | |
435 | free (row_buf); |
420 | free (row_buf); |
436 | free (swap_buf); |
421 | free (swap_buf); |
437 | free (drawn_buf); |
422 | free (drawn_buf); |
|
|
423 | row_buf = 0; // signal that we freed all the arrays above |
|
|
424 | |
438 | free (tabs); |
425 | free (tabs); |
439 | |
426 | tabs = 0; |
440 | row_buf = 0; // signal that we freed all the arrays |
|
|
441 | } |
427 | } |
442 | } |
428 | } |
443 | |
429 | |
444 | /* ------------------------------------------------------------------------- */ |
430 | /* ------------------------------------------------------------------------- */ |
445 | /* |
431 | /* |
446 | * Hard reset |
432 | * Hard/Soft reset |
447 | */ |
433 | */ |
448 | void |
434 | void |
449 | rxvt_term::scr_poweron () |
435 | rxvt_term::scr_poweron () |
450 | { |
436 | { |
451 | scr_release (); |
437 | scr_release (); |
452 | prev_nrow = prev_ncol = 0; |
438 | prev_nrow = prev_ncol = 0; |
|
|
439 | scr_soft_reset (); |
453 | scr_reset (); |
440 | scr_reset (); |
454 | |
441 | |
455 | scr_clear (true); |
442 | scr_clear (true); |
456 | scr_refresh (); |
443 | scr_refresh (); |
|
|
444 | } |
|
|
445 | |
|
|
446 | void |
|
|
447 | rxvt_term::scr_soft_reset () |
|
|
448 | { |
|
|
449 | /* only affects modes, nothing drastic such as clearing the screen */ |
|
|
450 | #if ENABLE_OVERLAY |
|
|
451 | scr_overlay_off (); |
|
|
452 | #endif |
|
|
453 | |
|
|
454 | rvideo_mode = false; |
|
|
455 | |
|
|
456 | if (current_screen != PRIMARY) |
|
|
457 | scr_swap_screen (); |
|
|
458 | |
|
|
459 | free (tabs); |
|
|
460 | tabs = (char *)rxvt_malloc (ncol); |
|
|
461 | |
|
|
462 | for (int col = ncol; --col; ) |
|
|
463 | tabs [col] = col % TABSIZE == 0; |
|
|
464 | |
|
|
465 | if (current_screen != PRIMARY) |
|
|
466 | scr_swap_screen (); |
|
|
467 | |
|
|
468 | scr_scroll_region (0, MAX_ROWS - 1); |
|
|
469 | scr_rendition (0, ~RS_None); |
|
|
470 | scr_insert_mode (0); |
457 | } |
471 | } |
458 | |
472 | |
459 | /* ------------------------------------------------------------------------- * |
473 | /* ------------------------------------------------------------------------- * |
460 | * PROCESS SCREEN COMMANDS * |
474 | * PROCESS SCREEN COMMANDS * |
461 | * ------------------------------------------------------------------------- */ |
475 | * ------------------------------------------------------------------------- */ |
… | |
… | |
596 | /* |
610 | /* |
597 | * Change the rendition style for following text |
611 | * Change the rendition style for following text |
598 | */ |
612 | */ |
599 | void |
613 | void |
600 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
614 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
601 | { |
615 | { |
602 | if (set) |
616 | if (set) |
603 | rstyle |= style; |
617 | rstyle |= style; |
604 | else if (style == ~RS_None) |
618 | else if (style == ~RS_None) |
605 | rstyle = DEFAULT_RSTYLE; |
619 | rstyle = DEFAULT_RSTYLE; |
606 | else |
620 | else |
607 | rstyle &= ~style; |
621 | rstyle &= ~style; |
608 | } |
622 | } |
609 | |
623 | |
610 | /* ------------------------------------------------------------------------- */ |
624 | /* ------------------------------------------------------------------------- */ |
611 | /* |
625 | /* |
612 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
626 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
613 | * count positive ==> scroll up |
627 | * count positive ==> scroll up |
… | |
… | |
664 | line_t &l2 = ROW(i); |
678 | line_t &l2 = ROW(i); |
665 | |
679 | |
666 | ::swap (l1, l2); |
680 | ::swap (l1, l2); |
667 | l2.touch (); |
681 | l2.touch (); |
668 | } |
682 | } |
669 | |
683 | |
670 | // move and/or clear selection, if any |
684 | // move and/or clear selection, if any |
671 | if (selection.op && current_screen == selection.screen) |
685 | if (selection.op && current_screen == selection.screen) |
672 | { |
686 | { |
673 | selection.beg.row -= count; |
687 | selection.beg.row -= count; |
674 | selection.end.row -= count; |
688 | selection.end.row -= count; |
… | |
… | |
710 | { |
724 | { |
711 | /* move selected region too */ |
725 | /* move selected region too */ |
712 | selection.beg.row -= count; |
726 | selection.beg.row -= count; |
713 | selection.end.row -= count; |
727 | selection.end.row -= count; |
714 | selection.mark.row -= count; |
728 | selection.mark.row -= count; |
715 | |
729 | |
716 | selection_check (0); |
730 | selection_check (0); |
717 | } |
731 | } |
718 | } |
732 | } |
719 | |
733 | |
720 | // use a simple and robust scrolling algorithm, this |
734 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
787 | |
801 | |
788 | while (str < strend) |
802 | while (str < strend) |
789 | { |
803 | { |
790 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
804 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
791 | |
805 | |
792 | if (c < 0x20) |
806 | if (expect_false (c < 0x20)) |
793 | if (c == C0_LF) |
807 | if (c == C0_LF) |
794 | { |
808 | { |
795 | max_it (line->l, screen.cur.col); |
809 | max_it (line->l, screen.cur.col); |
796 | |
810 | |
797 | screen.flags &= ~Screen_WrapNext; |
811 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
816 | { |
830 | { |
817 | scr_tab (1, true); |
831 | scr_tab (1, true); |
818 | continue; |
832 | continue; |
819 | } |
833 | } |
820 | |
834 | |
|
|
835 | if (expect_false ( |
821 | if (checksel /* see if we're writing within selection */ |
836 | checksel /* see if we're writing within selection */ |
822 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
837 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
823 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
838 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
839 | )) |
824 | { |
840 | { |
825 | checksel = 0; |
841 | checksel = 0; |
826 | /* |
842 | /* |
827 | * If we wrote anywhere in the selected area, kill the selection |
843 | * If we wrote anywhere in the selected area, kill the selection |
828 | * XXX: should we kill the mark too? Possibly, but maybe that |
844 | * XXX: should we kill the mark too? Possibly, but maybe that |
829 | * should be a similar check. |
845 | * should be a similar check. |
830 | */ |
846 | */ |
831 | CLEAR_SELECTION (); |
847 | CLEAR_SELECTION (); |
832 | } |
848 | } |
833 | |
849 | |
834 | if (screen.flags & Screen_WrapNext) |
850 | if (expect_false (screen.flags & Screen_WrapNext)) |
835 | { |
851 | { |
836 | scr_do_wrap (); |
852 | scr_do_wrap (); |
837 | |
853 | |
838 | line->l = ncol; |
854 | line->l = ncol; |
839 | line->is_longer (1); |
855 | line->is_longer (1); |
840 | |
856 | |
841 | row = screen.cur.row; |
857 | row = screen.cur.row; |
842 | line = &ROW(row); /* _must_ refresh */ |
858 | line = &ROW(row); /* _must_ refresh */ |
843 | } |
859 | } |
844 | |
860 | |
845 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
861 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
846 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
862 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
847 | c = 0xfffd; |
863 | c = 0xfffd; |
848 | |
864 | |
849 | // rely on wcwidth to tell us the character width, do wcwidth before |
865 | // rely on wcwidth to tell us the character width, do wcwidth before |
850 | // further replacements, as wcwidth might return -1 for the line |
866 | // further replacements, as wcwidth might return -1 for the line |
851 | // drawing characters below as they might be invalid in the current |
867 | // drawing characters below as they might be invalid in the current |
852 | // locale. |
868 | // locale. |
853 | int width = WCWIDTH (c); |
869 | int width = WCWIDTH (c); |
854 | |
870 | |
855 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
871 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
856 | { |
872 | { |
857 | // vt100 special graphics and line drawing |
873 | // vt100 special graphics and line drawing |
858 | // 5f-7e standard vt100 |
874 | // 5f-7e standard vt100 |
859 | // 40-5e rxvt extension for extra curses acs chars |
875 | // 40-5e rxvt extension for extra curses acs chars |
860 | static uint16_t vt100_0[62] = { // 41 .. 7e |
876 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
873 | c = vt100_0[c - 0x41]; |
889 | c = vt100_0[c - 0x41]; |
874 | width = 1; // vt100 line drawing characters are always single-width |
890 | width = 1; // vt100 line drawing characters are always single-width |
875 | } |
891 | } |
876 | } |
892 | } |
877 | |
893 | |
878 | if (screen.flags & Screen_Insert) |
894 | if (expect_false (screen.flags & Screen_Insert)) |
879 | scr_insdel_chars (width, INSERT); |
895 | scr_insdel_chars (width, INSERT); |
880 | |
896 | |
881 | if (width != 0) |
897 | if (width != 0) |
882 | { |
898 | { |
883 | #if !UNICODE_3 |
899 | #if !UNICODE_3 |
… | |
… | |
889 | c = 0xfffd; |
905 | c = 0xfffd; |
890 | # endif |
906 | # endif |
891 | #endif |
907 | #endif |
892 | |
908 | |
893 | // nuke the character at this position, if required |
909 | // nuke the character at this position, if required |
|
|
910 | if (expect_false ( |
894 | if (line->t[screen.cur.col] == NOCHAR |
911 | line->t[screen.cur.col] == NOCHAR |
895 | || (screen.cur.col < ncol - 1 |
912 | || (screen.cur.col < ncol - 1 |
896 | && line->t[screen.cur.col + 1] == NOCHAR)) |
913 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
914 | )) |
|
|
915 | scr_kill_char (*line, screen.cur.col); |
|
|
916 | |
|
|
917 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
|
|
918 | |
|
|
919 | // if the character doesn't fit into the remaining columns... |
|
|
920 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
897 | { |
921 | { |
898 | int col = screen.cur.col; |
922 | // ... 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 = ' '; |
923 | c = NOCHAR; |
921 | // and try the same character next loop iteration |
924 | // and try the same character next loop iteration |
922 | --str; |
925 | --str; |
923 | } |
926 | } |
924 | |
927 | |
925 | line->touch (); |
928 | line->touch (); |
… | |
… | |
927 | do |
930 | do |
928 | { |
931 | { |
929 | line->t[screen.cur.col] = c; |
932 | line->t[screen.cur.col] = c; |
930 | line->r[screen.cur.col] = rend; |
933 | line->r[screen.cur.col] = rend; |
931 | |
934 | |
932 | if (screen.cur.col < ncol - 1) |
935 | if (expect_true (screen.cur.col < ncol - 1)) |
933 | screen.cur.col++; |
936 | screen.cur.col++; |
934 | else |
937 | else |
935 | { |
938 | { |
936 | line->l = ncol; |
939 | line->l = ncol; |
937 | if (screen.flags & Screen_Autowrap) |
940 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
939 | break; |
942 | break; |
940 | } |
943 | } |
941 | |
944 | |
942 | c = NOCHAR; |
945 | c = NOCHAR; |
943 | } |
946 | } |
944 | while (--width > 0); |
947 | while (expect_false (--width > 0)); |
945 | |
948 | |
946 | // pad with spaces when overwriting wide character with smaller one |
949 | // pad with spaces when overwriting wide character with smaller one |
947 | if (!width) |
950 | if (expect_false (!width)) |
948 | { |
951 | { |
949 | line->touch (); |
952 | line->touch (); |
950 | |
953 | |
951 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
954 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
952 | { |
955 | { |
953 | line->t[c] = ' '; |
956 | line->t[c] = ' '; |
954 | line->r[c] = rend; |
957 | line->r[c] = rend; |
955 | } |
958 | } |
956 | } |
959 | } |
957 | } |
960 | } |
|
|
961 | #if ENABLE_COMBINING |
958 | else // width == 0 |
962 | else // width == 0 |
959 | { |
963 | { |
960 | #if ENABLE_COMBINING |
964 | 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 | { |
965 | { |
|
|
966 | // handle combining characters |
|
|
967 | // we just tag the accent on the previous on-screen character. |
|
|
968 | // this is arguably not correct, but also arguably not wrong. |
|
|
969 | // we don't handle double-width characters nicely yet. |
|
|
970 | line_t *linep; |
|
|
971 | text_t *tp; |
|
|
972 | rend_t *rp; |
|
|
973 | |
|
|
974 | if (screen.cur.col > 0) |
|
|
975 | { |
971 | linep = line; |
976 | linep = line; |
972 | tp = line->t + screen.cur.col - 1; |
977 | tp = line->t + screen.cur.col - 1; |
973 | rp = line->r + screen.cur.col - 1; |
978 | rp = line->r + screen.cur.col - 1; |
|
|
979 | } |
|
|
980 | else if (screen.cur.row > 0 |
|
|
981 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
982 | { |
|
|
983 | linep = &ROW(screen.cur.row - 1); |
|
|
984 | tp = line->t + ncol - 1; |
|
|
985 | rp = line->r + ncol - 1; |
|
|
986 | } |
|
|
987 | else |
|
|
988 | continue; |
|
|
989 | |
|
|
990 | linep->touch (); |
|
|
991 | |
|
|
992 | while (*tp == NOCHAR && tp > linep->t) |
|
|
993 | tp--, rp--; |
|
|
994 | |
|
|
995 | // first try to find a precomposed character |
|
|
996 | unicode_t n = rxvt_compose (*tp, c); |
|
|
997 | if (n == NOCHAR) |
|
|
998 | n = rxvt_composite.compose (*tp, c); |
|
|
999 | |
|
|
1000 | *tp = n; |
|
|
1001 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
974 | } |
1002 | } |
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 | } |
1003 | } |
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 |
1004 | #endif |
998 | } |
|
|
999 | } |
1005 | } |
1000 | |
1006 | |
1001 | max_it (line->l, screen.cur.col); |
1007 | max_it (line->l, screen.cur.col); |
1002 | |
1008 | |
1003 | #ifdef DEBUG_STRICT |
1009 | #ifdef DEBUG_STRICT |
… | |
… | |
1011 | * XTERM_SEQ: CTRL-H |
1017 | * XTERM_SEQ: CTRL-H |
1012 | */ |
1018 | */ |
1013 | void |
1019 | void |
1014 | rxvt_term::scr_backspace () NOTHROW |
1020 | rxvt_term::scr_backspace () NOTHROW |
1015 | { |
1021 | { |
1016 | want_refresh = 1; |
|
|
1017 | |
|
|
1018 | if (screen.cur.col == 0) |
1022 | if (screen.cur.col == 0) |
1019 | { |
1023 | { |
1020 | if (screen.cur.row > 0) |
1024 | if (screen.cur.row > 0) |
1021 | { |
1025 | { |
1022 | #ifdef TERMCAP_HAS_BW |
1026 | #ifdef TERMCAP_HAS_BW |
1023 | screen.cur.col = ncol - 1; |
1027 | screen.cur.col = ncol - 1; |
1024 | screen.cur.row--; |
1028 | --screen.cur.row; |
1025 | return; |
1029 | |
|
|
1030 | want_refresh = 1; |
1026 | #endif |
1031 | #endif |
1027 | } |
1032 | } |
1028 | } |
1033 | } |
1029 | else if (!(screen.flags & Screen_WrapNext)) |
1034 | else |
1030 | scr_gotorc (0, -1, RELATIVE); |
1035 | scr_gotorc (0, -1, RELATIVE); |
1031 | |
|
|
1032 | screen.flags &= ~Screen_WrapNext; |
|
|
1033 | } |
1036 | } |
1034 | |
1037 | |
1035 | /* ------------------------------------------------------------------------- */ |
1038 | /* ------------------------------------------------------------------------- */ |
1036 | /* |
1039 | /* |
1037 | * Process Horizontal Tab |
1040 | * Process Horizontal Tab |
… | |
… | |
1060 | x = i; |
1063 | x = i; |
1061 | |
1064 | |
1062 | if (!--count) |
1065 | if (!--count) |
1063 | break; |
1066 | break; |
1064 | } |
1067 | } |
1065 | else |
1068 | else |
1066 | ht &= l.t[i] == ' ' |
1069 | ht &= l.t[i] == ' ' |
1067 | && RS_SAME (l.r[i], base_rend); |
1070 | && RS_SAME (l.r[i], base_rend); |
1068 | |
1071 | |
1069 | if (count) |
1072 | if (count) |
1070 | x = ncol - 1; |
1073 | x = ncol - 1; |
… | |
… | |
1186 | } |
1189 | } |
1187 | } |
1190 | } |
1188 | else |
1191 | else |
1189 | { |
1192 | { |
1190 | if (screen.flags & Screen_Relative) |
1193 | if (screen.flags & Screen_Relative) |
|
|
1194 | { |
1191 | { /* relative origin mode */ |
1195 | /* relative origin mode */ |
1192 | screen.cur.row = row + screen.tscroll; |
1196 | screen.cur.row = row + screen.tscroll; |
1193 | min_it (screen.cur.row, screen.bscroll); |
1197 | min_it (screen.cur.row, screen.bscroll); |
1194 | } |
1198 | } |
1195 | else |
1199 | else |
1196 | screen.cur.row = row; |
1200 | screen.cur.row = row; |
… | |
… | |
1229 | /* |
1233 | /* |
1230 | * Erase part or whole of a line |
1234 | * Erase part or whole of a line |
1231 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1235 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1232 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1236 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1233 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1237 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1238 | * extension: clear to right unless wrapped: ESC [ 3 K |
1234 | */ |
1239 | */ |
1235 | void |
1240 | void |
1236 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1241 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1237 | { |
1242 | { |
1238 | unsigned int col, num; |
1243 | unsigned int col, num; |
… | |
… | |
1247 | line.touch (); |
1252 | line.touch (); |
1248 | line.is_longer (0); |
1253 | line.is_longer (0); |
1249 | |
1254 | |
1250 | switch (mode) |
1255 | switch (mode) |
1251 | { |
1256 | { |
|
|
1257 | case 3: |
|
|
1258 | if (screen.flags & Screen_WrapNext) |
|
|
1259 | return; |
|
|
1260 | |
|
|
1261 | /* fall through */ |
|
|
1262 | |
1252 | case 0: /* erase to end of line */ |
1263 | case 0: /* erase to end of line */ |
1253 | col = screen.cur.col; |
1264 | col = screen.cur.col; |
1254 | num = ncol - col; |
1265 | num = ncol - col; |
1255 | min_it (line.l, col); |
1266 | min_it (line.l, col); |
|
|
1267 | |
1256 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1268 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1257 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1269 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1258 | CLEAR_SELECTION (); |
1270 | CLEAR_SELECTION (); |
1259 | break; |
1271 | break; |
|
|
1272 | |
1260 | case 1: /* erase to beginning of line */ |
1273 | case 1: /* erase to beginning of line */ |
1261 | col = 0; |
1274 | col = 0; |
1262 | num = screen.cur.col + 1; |
1275 | num = screen.cur.col + 1; |
|
|
1276 | |
1263 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1277 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1264 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1278 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1265 | CLEAR_SELECTION (); |
1279 | CLEAR_SELECTION (); |
1266 | break; |
1280 | break; |
|
|
1281 | |
1267 | case 2: /* erase whole line */ |
1282 | case 2: /* erase whole line */ |
1268 | col = 0; |
1283 | col = 0; |
1269 | num = ncol; |
1284 | num = ncol; |
1270 | line.l = 0; |
1285 | line.l = 0; |
1271 | if (selection.beg.row <= screen.cur.row |
1286 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1329 | if (row >= nrow) /* Out Of Bounds */ |
1344 | if (row >= nrow) /* Out Of Bounds */ |
1330 | return; |
1345 | return; |
1331 | |
1346 | |
1332 | min_it (num, nrow - row); |
1347 | min_it (num, nrow - row); |
1333 | |
1348 | |
|
|
1349 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1334 | if (rstyle & (RS_RVid | RS_Uline)) |
1350 | if (rstyle & (RS_RVid | RS_Uline)) |
1335 | ren = (rend_t) ~RS_None; |
1351 | ren = (rend_t) ~RS_None; |
1336 | else if (GET_BASEBG (rstyle) == Color_bg) |
1352 | else if (GET_BASEBG (rstyle) == Color_bg) |
1337 | { |
1353 | { |
1338 | ren = DEFAULT_RSTYLE; |
1354 | ren = DEFAULT_RSTYLE; |
1339 | CLEAR_ROWS (row, num); |
1355 | |
|
|
1356 | if (mapped) |
|
|
1357 | XClearArea (dpy, vt, 0, |
|
|
1358 | Row2Pixel (row), (unsigned int)width, |
|
|
1359 | (unsigned int)Height2Pixel (num), False); |
1340 | } |
1360 | } |
1341 | else |
1361 | else |
1342 | { |
1362 | { |
1343 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1363 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1364 | |
1344 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1365 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1345 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1366 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1346 | ERASE_ROWS (row, num); |
1367 | XFillRectangle (dpy, vt, gc, |
|
|
1368 | 0, Row2Pixel (row), |
|
|
1369 | (unsigned int)width, |
|
|
1370 | (unsigned int)Height2Pixel (num)); |
1347 | gcvalue.foreground = pix_colors[Color_fg]; |
1371 | gcvalue.foreground = pix_colors[Color_fg]; |
1348 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1372 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1349 | } |
1373 | } |
1350 | |
1374 | |
1351 | for (; num--; row++) |
1375 | for (; num--; row++) |
… | |
… | |
1433 | * Insert/Delete <count> characters from the current position |
1457 | * Insert/Delete <count> characters from the current position |
1434 | */ |
1458 | */ |
1435 | void |
1459 | void |
1436 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1460 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1437 | { |
1461 | { |
1438 | int col, row; |
|
|
1439 | rend_t tr; |
|
|
1440 | |
|
|
1441 | want_refresh = 1; |
1462 | want_refresh = 1; |
1442 | ZERO_SCROLLBACK (); |
1463 | ZERO_SCROLLBACK (); |
1443 | |
1464 | |
1444 | if (count <= 0) |
1465 | if (count <= 0) |
1445 | return; |
1466 | return; |
… | |
… | |
1447 | scr_do_wrap (); |
1468 | scr_do_wrap (); |
1448 | |
1469 | |
1449 | selection_check (1); |
1470 | selection_check (1); |
1450 | min_it (count, ncol - screen.cur.col); |
1471 | min_it (count, ncol - screen.cur.col); |
1451 | |
1472 | |
1452 | row = screen.cur.row; |
1473 | int row = screen.cur.row; |
1453 | |
1474 | |
1454 | line_t *line = &ROW(row); |
1475 | line_t *line = &ROW(row); |
1455 | |
1476 | |
1456 | line->touch (); |
1477 | line->touch (); |
1457 | line->is_longer (0); |
1478 | line->is_longer (0); |
1458 | |
1479 | |
|
|
1480 | // nuke wide spanning the start |
|
|
1481 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1482 | scr_kill_char (*line, screen.cur.col); |
|
|
1483 | |
1459 | switch (insdel) |
1484 | switch (insdel) |
1460 | { |
1485 | { |
1461 | case INSERT: |
1486 | case INSERT: |
1462 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1487 | line->l = min (line->l + count, ncol); |
|
|
1488 | |
|
|
1489 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1490 | scr_kill_char (*line, screen.cur.col); |
|
|
1491 | |
|
|
1492 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1463 | { |
1493 | { |
1464 | line->t[col] = line->t[col - count]; |
1494 | line->t[col] = line->t[col - count]; |
1465 | line->r[col] = line->r[col - count]; |
1495 | line->r[col] = line->r[col - count]; |
1466 | } |
1496 | } |
1467 | |
|
|
1468 | line->l = min (line->l + count, ncol); |
|
|
1469 | |
1497 | |
1470 | if (selection.op && current_screen == selection.screen |
1498 | if (selection.op && current_screen == selection.screen |
1471 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1499 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1472 | { |
1500 | { |
1473 | if (selection.end.row != screen.cur.row |
1501 | if (selection.end.row != screen.cur.row |
1474 | || (selection.end.col + count >= ncol)) |
1502 | || (selection.end.col + count >= ncol)) |
1475 | CLEAR_SELECTION (); |
1503 | CLEAR_SELECTION (); |
1476 | else |
1504 | else |
|
|
1505 | { |
1477 | { /* shift selection */ |
1506 | /* shift selection */ |
1478 | selection.beg.col += count; |
1507 | selection.beg.col += count; |
1479 | selection.mark.col += count; /* XXX: yes? */ |
1508 | selection.mark.col += count; /* XXX: yes? */ |
1480 | selection.end.col += count; |
1509 | selection.end.col += count; |
1481 | } |
1510 | } |
1482 | } |
1511 | } |
… | |
… | |
1487 | case ERASE: |
1516 | case ERASE: |
1488 | screen.cur.col += count; /* don't worry if > ncol */ |
1517 | screen.cur.col += count; /* don't worry if > ncol */ |
1489 | selection_check (1); |
1518 | selection_check (1); |
1490 | screen.cur.col -= count; |
1519 | screen.cur.col -= count; |
1491 | |
1520 | |
1492 | line->l = max (line->l - count, 0); |
1521 | // nuke wide char after the end |
|
|
1522 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1523 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1524 | |
1493 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1525 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1494 | break; |
1526 | break; |
1495 | |
1527 | |
1496 | case DELETE: |
1528 | case DELETE: |
1497 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1529 | line->l = max (line->l - count, 0); |
1498 | |
1530 | |
|
|
1531 | // nuke wide char spanning the end |
|
|
1532 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1533 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1534 | |
1499 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1535 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1500 | { |
1536 | { |
1501 | line->t[col] = line->t[col + count]; |
1537 | line->t[col] = line->t[col + count]; |
1502 | line->r[col] = line->r[col + count]; |
1538 | line->r[col] = line->r[col + count]; |
1503 | } |
1539 | } |
1504 | |
1540 | |
1505 | line->l = max (line->l - count, 0); |
|
|
1506 | scr_blank_line (*line, ncol - count, count, tr); |
1541 | scr_blank_line (*line, ncol - count, count, |
|
|
1542 | line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask)); |
1507 | |
1543 | |
1508 | if (selection.op && current_screen == selection.screen |
1544 | if (selection.op && current_screen == selection.screen |
1509 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1545 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1510 | { |
1546 | { |
1511 | if (selection.end.row != screen.cur.row |
1547 | if (selection.end.row != screen.cur.row |
… | |
… | |
1621 | */ |
1657 | */ |
1622 | void |
1658 | void |
1623 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1659 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1624 | { |
1660 | { |
1625 | if (mode < 0) |
1661 | if (mode < 0) |
1626 | memset (tabs, 0, ncol * sizeof (char)); |
1662 | memset (tabs, 0, ncol); |
1627 | else if (screen.cur.col < ncol) |
1663 | else if (screen.cur.col < ncol) |
1628 | tabs [screen.cur.col] = !!mode; |
1664 | tabs [screen.cur.col] = !!mode; |
1629 | } |
1665 | } |
1630 | |
1666 | |
1631 | /* ------------------------------------------------------------------------- */ |
1667 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1801 | for (i = PART_BEG; i < RC_COUNT; i++) |
1837 | for (i = PART_BEG; i < RC_COUNT; i++) |
1802 | { |
1838 | { |
1803 | min_it (rc[i].col, ncol - 1); |
1839 | min_it (rc[i].col, ncol - 1); |
1804 | min_it (rc[i].row, nrow - 1); |
1840 | min_it (rc[i].row, nrow - 1); |
1805 | } |
1841 | } |
1806 | |
1842 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1807 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1843 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1808 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1844 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1809 | |
1845 | |
1810 | num_scr_allow = 0; |
1846 | num_scr_allow = 0; |
1811 | |
1847 | |
… | |
… | |
1866 | return true; |
1902 | return true; |
1867 | } |
1903 | } |
1868 | |
1904 | |
1869 | #ifndef NO_BELL |
1905 | #ifndef NO_BELL |
1870 | void |
1906 | void |
1871 | rxvt_term::bell_cb (time_watcher &w) |
1907 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1872 | { |
1908 | { |
1873 | rvideo_bell = false; |
1909 | rvideo_bell = false; |
1874 | scr_rvideo_mode (rvideo_mode); |
1910 | scr_rvideo_mode (rvideo_mode); |
|
|
1911 | refresh_check (); |
1875 | } |
1912 | } |
1876 | #endif |
1913 | #endif |
1877 | |
1914 | |
1878 | /* ------------------------------------------------------------------------- */ |
1915 | /* ------------------------------------------------------------------------- */ |
1879 | void |
1916 | void |
… | |
… | |
1885 | # ifdef MAPALERT_OPTION |
1922 | # ifdef MAPALERT_OPTION |
1886 | if (option (Opt_mapAlert)) |
1923 | if (option (Opt_mapAlert)) |
1887 | # endif |
1924 | # endif |
1888 | XMapWindow (dpy, parent[0]); |
1925 | XMapWindow (dpy, parent[0]); |
1889 | # endif |
1926 | # endif |
|
|
1927 | |
1890 | # if ENABLE_FRILLS |
1928 | # if ENABLE_FRILLS |
1891 | if (option (Opt_urgentOnBell)) |
1929 | if (option (Opt_urgentOnBell)) |
1892 | { |
1930 | set_urgency (1); |
1893 | XWMHints *h; |
|
|
1894 | |
|
|
1895 | h = XGetWMHints(dpy, parent[0]); |
|
|
1896 | if (h != NULL) |
|
|
1897 | { |
|
|
1898 | h->flags |= XUrgencyHint; |
|
|
1899 | XSetWMHints(dpy, parent[0], h); |
|
|
1900 | } |
|
|
1901 | } |
|
|
1902 | # endif |
1931 | # endif |
1903 | |
1932 | |
1904 | if (option (Opt_visualBell)) |
1933 | if (option (Opt_visualBell)) |
1905 | { |
1934 | { |
1906 | rvideo_bell = true; |
1935 | rvideo_bell = true; |
1907 | scr_rvideo_mode (rvideo_mode); |
1936 | scr_rvideo_mode (rvideo_mode); |
1908 | display->flush (); |
1937 | flush (); |
1909 | |
1938 | |
1910 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1939 | bell_ev.start (VISUAL_BELL_DURATION); |
1911 | } |
1940 | } |
1912 | else |
1941 | else |
1913 | XBell (dpy, 0); |
1942 | XBell (dpy, 0); |
1914 | #endif |
1943 | #endif |
1915 | } |
1944 | } |
… | |
… | |
1919 | void |
1948 | void |
1920 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1949 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1921 | { |
1950 | { |
1922 | #ifdef PRINTPIPE |
1951 | #ifdef PRINTPIPE |
1923 | int nrows, row_start; |
1952 | int nrows, row_start; |
1924 | FILE *fd; |
1953 | FILE *fd = popen_printer (); |
1925 | |
1954 | |
1926 | if ((fd = popen_printer ()) == NULL) |
1955 | if (!fd) |
1927 | return; |
1956 | return; |
1928 | |
1957 | |
1929 | if (fullhist) |
1958 | if (fullhist) |
1930 | { |
1959 | { |
1931 | nrows = nrow - top_row; |
1960 | nrows = nrow - top_row; |
… | |
… | |
1996 | return; |
2025 | return; |
1997 | |
2026 | |
1998 | /* |
2027 | /* |
1999 | * A: set up vars |
2028 | * A: set up vars |
2000 | */ |
2029 | */ |
|
|
2030 | refresh_count = 0; |
|
|
2031 | |
2001 | have_bg = 0; |
2032 | have_bg = 0; |
2002 | refresh_count = 0; |
|
|
2003 | |
|
|
2004 | #ifdef HAVE_BG_PIXMAP |
2033 | #ifdef HAVE_BG_PIXMAP |
2005 | have_bg |= bgPixmap.pixmap != None; |
2034 | have_bg = bgPixmap.pixmap != None; |
2006 | #endif |
2035 | #endif |
2007 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2036 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2008 | |
2037 | |
2009 | /* |
2038 | /* |
2010 | * B: reverse any characters which are selected |
2039 | * B: reverse any characters which are selected |
… | |
… | |
2201 | continue; |
2230 | continue; |
2202 | |
2231 | |
2203 | // redraw one or more characters |
2232 | // redraw one or more characters |
2204 | |
2233 | |
2205 | // seek to the beginning of wide characters |
2234 | // seek to the beginning of wide characters |
2206 | while (stp[col] == NOCHAR && col > 0) |
2235 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2207 | --col; |
2236 | --col; |
2208 | |
2237 | |
2209 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2238 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2210 | text_t *text = stp + col; |
2239 | text_t *text = stp + col; |
2211 | int count = 1; |
2240 | int count = 1; |
… | |
… | |
2248 | |
2277 | |
2249 | col--; /* went one too far. move back */ |
2278 | col--; /* went one too far. move back */ |
2250 | count -= i; /* dump any matching trailing chars */ |
2279 | count -= i; /* dump any matching trailing chars */ |
2251 | |
2280 | |
2252 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2281 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2253 | while (i && text[count] == NOCHAR) |
2282 | while (expect_false (i && text[count] == NOCHAR)) |
2254 | count++, i--; |
2283 | count++, i--; |
2255 | |
2284 | |
2256 | /* |
2285 | /* |
2257 | * Determine the attributes for the string |
2286 | * Determine the attributes for the string |
2258 | */ |
2287 | */ |
2259 | int fore = fgcolor_of (rend); // desired foreground |
2288 | int fore = fgcolor_of (rend); // desired foreground |
2260 | int back = bgcolor_of (rend); // desired background |
2289 | int back = bgcolor_of (rend); // desired background |
2261 | |
2290 | |
2262 | // only do special processing if any attributes are set, which is unlikely |
2291 | // only do special processing if any attributes are set, which is unlikely |
2263 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2292 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2264 | { |
2293 | { |
2265 | bool invert = rend & RS_RVid; |
2294 | bool invert = rend & RS_RVid; |
2266 | |
2295 | |
2267 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2296 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2268 | if (rend & RS_Bold |
|
|
2269 | && fore == Color_fg) |
2297 | if (rend & RS_Bold && fore == Color_fg) |
2270 | { |
2298 | { |
2271 | if (ISSET_PIXCOLOR (Color_BD)) |
2299 | if (ISSET_PIXCOLOR (Color_BD)) |
2272 | fore = Color_BD; |
2300 | fore = Color_BD; |
2273 | # if !ENABLE_STYLES |
2301 | # if !ENABLE_STYLES |
2274 | else |
2302 | else |
2275 | invert = !invert; |
2303 | invert = !invert; |
2276 | # endif |
2304 | # endif |
2277 | } |
2305 | } |
2278 | |
2306 | |
2279 | if (rend & RS_Italic |
2307 | if (rend & RS_Italic && fore == Color_fg) |
2280 | && fore == Color_fg) |
|
|
2281 | { |
2308 | { |
2282 | if (ISSET_PIXCOLOR (Color_IT)) |
2309 | if (ISSET_PIXCOLOR (Color_IT)) |
2283 | fore = Color_IT; |
2310 | fore = Color_IT; |
2284 | # if !ENABLE_STYLES |
2311 | # if !ENABLE_STYLES |
2285 | else |
2312 | else |
… | |
… | |
2319 | } |
2346 | } |
2320 | |
2347 | |
2321 | #ifdef TEXT_BLINK |
2348 | #ifdef TEXT_BLINK |
2322 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2349 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2323 | { |
2350 | { |
2324 | if (!text_blink_ev.active) |
2351 | if (!text_blink_ev.is_active ()) |
2325 | { |
2352 | { |
2326 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2353 | text_blink_ev.again (); |
2327 | hidden_text = 0; |
2354 | hidden_text = 0; |
2328 | } |
2355 | } |
2329 | else if (hidden_text) |
2356 | else if (hidden_text) |
2330 | fore = back; |
2357 | fore = back; |
2331 | } |
2358 | } |
… | |
… | |
2353 | /* |
2380 | /* |
2354 | * Actually do the drawing of the string here |
2381 | * Actually do the drawing of the string here |
2355 | */ |
2382 | */ |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2383 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2357 | |
2384 | |
2358 | if (have_bg && back == Color_bg) |
2385 | if (expect_true (have_bg && back == Color_bg)) |
2359 | { |
2386 | { |
2360 | // this is very ugly, maybe push it into ->draw? |
2387 | // this is very ugly, maybe push it into ->draw? |
2361 | |
2388 | |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2389 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2363 | if (text[i] != ' ') |
2390 | if (text[i] != ' ') |
… | |
… | |
2370 | did_clear: ; |
2397 | did_clear: ; |
2371 | } |
2398 | } |
2372 | else |
2399 | else |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2400 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2374 | |
2401 | |
2375 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2402 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2376 | { |
2403 | { |
2377 | #if ENABLE_FRILLS |
2404 | #if ENABLE_FRILLS |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2405 | if (ISSET_PIXCOLOR (Color_underline)) |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2406 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2380 | else |
2407 | else |
2381 | #endif |
2408 | #endif |
2382 | XSetForeground (dpy, gc, pix_colors[fore]); |
2409 | XSetForeground (dpy, gc, pix_colors[fore]); |
2383 | |
2410 | |
2384 | XDrawLine (dpy, drawBuffer, gc, |
2411 | XDrawLine (dpy, vt, gc, |
2385 | xpixel, ypixel + font->ascent + 1, |
2412 | xpixel, ypixel + font->ascent + 1, |
2386 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2413 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2387 | } |
2414 | } |
2388 | } /* for (col....) */ |
2415 | } /* for (col....) */ |
2389 | } /* for (row....) */ |
2416 | } /* for (row....) */ |
… | |
… | |
2427 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2454 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2428 | else |
2455 | else |
2429 | #endif |
2456 | #endif |
2430 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2457 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2431 | |
2458 | |
2432 | XDrawRectangle (dpy, drawBuffer, gc, |
2459 | XDrawRectangle (dpy, vt, gc, |
2433 | Col2Pixel (col), |
2460 | Col2Pixel (col), |
2434 | Row2Pixel (oldcursor.row), |
2461 | Row2Pixel (oldcursor.row), |
2435 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2462 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2436 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2463 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2437 | } |
2464 | } |
… | |
… | |
2475 | rxvt_term::scr_recolour () NOTHROW |
2502 | rxvt_term::scr_recolour () NOTHROW |
2476 | { |
2503 | { |
2477 | #ifdef HAVE_BG_PIXMAP |
2504 | #ifdef HAVE_BG_PIXMAP |
2478 | bgPixmap.apply (); |
2505 | bgPixmap.apply (); |
2479 | #else |
2506 | #else |
|
|
2507 | |
2480 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2508 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2481 | XClearWindow (dpy, parent[0]); |
2509 | XClearWindow (dpy, parent[0]); |
2482 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2510 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2483 | # if HAVE_SCROLLBARS |
2511 | |
2484 | if (scrollBar.win) |
2512 | if (scrollBar.win) |
2485 | { |
2513 | { |
2486 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2514 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2487 | scrollBar.setIdle (); |
2515 | scrollBar.state = STATE_IDLE; |
2488 | scrollbar_show (0); |
2516 | scrollBar.show (0); |
2489 | } |
2517 | } |
|
|
2518 | |
2490 | # endif |
2519 | #endif |
2491 | #endif |
2520 | |
2492 | |
2521 | /* bgPixmap.apply () does not do the following : */ |
2493 | scr_clear (); |
2522 | scr_clear (); |
2494 | scr_touch (true); |
2523 | scr_touch (true); |
2495 | want_refresh = 1; |
2524 | want_refresh = 1; |
2496 | } |
2525 | } |
2497 | |
2526 | |
… | |
… | |
2589 | { |
2618 | { |
2590 | int row, wrote; |
2619 | int row, wrote; |
2591 | unsigned int width, towrite; |
2620 | unsigned int width, towrite; |
2592 | char r1[] = "\n"; |
2621 | char r1[] = "\n"; |
2593 | |
2622 | |
2594 | for (row = saveLines - nsaved; |
2623 | for (row = saveLines + top_row; |
2595 | row < saveLines + nrow - 1; row++) |
2624 | row < saveLines + nrow - 1; row++) |
2596 | { |
2625 | { |
2597 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2626 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2598 | : ncol; |
2627 | : ncol; |
2599 | for (towrite = width; towrite; towrite -= wrote) |
2628 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2650 | /* convert normal newline chars into common keyboard Return key sequence */ |
2679 | /* convert normal newline chars into common keyboard Return key sequence */ |
2651 | for (unsigned int i = 0; i < len; i++) |
2680 | for (unsigned int i = 0; i < len; i++) |
2652 | if (data[i] == C0_LF) |
2681 | if (data[i] == C0_LF) |
2653 | data[i] = C0_CR; |
2682 | data[i] = C0_CR; |
2654 | |
2683 | |
|
|
2684 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2685 | tt_printf ("\e[200~"); |
|
|
2686 | |
2655 | tt_write (data, len); |
2687 | tt_write (data, len); |
|
|
2688 | |
|
|
2689 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2690 | tt_printf ("\e[201~"); |
2656 | } |
2691 | } |
2657 | |
2692 | |
2658 | /* ------------------------------------------------------------------------- */ |
2693 | /* ------------------------------------------------------------------------- */ |
2659 | /* |
2694 | /* |
2660 | * Respond to a notification that a primary selection has been sent |
2695 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2735 | if (!delete_prop) |
2770 | if (!delete_prop) |
2736 | XDeleteProperty (dpy, win, prop); |
2771 | XDeleteProperty (dpy, win, prop); |
2737 | |
2772 | |
2738 | selection_wait = Sel_incr; |
2773 | selection_wait = Sel_incr; |
2739 | incr_buf_fill = 0; |
2774 | incr_buf_fill = 0; |
2740 | incr_ev.start (NOW + 10); |
2775 | incr_ev.start (10); |
2741 | |
2776 | |
2742 | goto bailout; |
2777 | goto bailout; |
2743 | } |
2778 | } |
2744 | |
2779 | |
2745 | if (ct.nitems == 0) |
2780 | if (ct.nitems == 0) |
… | |
… | |
2754 | ct.nitems = incr_buf_fill; |
2789 | ct.nitems = incr_buf_fill; |
2755 | incr_buf = 0; |
2790 | incr_buf = 0; |
2756 | incr_buf_size = 0; |
2791 | incr_buf_size = 0; |
2757 | incr_ev.stop (); |
2792 | incr_ev.stop (); |
2758 | } |
2793 | } |
2759 | else |
2794 | else |
2760 | { |
2795 | { |
2761 | if (selection_wait == Sel_normal |
2796 | if (selection_wait == Sel_normal |
2762 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2797 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2763 | { |
2798 | { |
2764 | /* |
2799 | /* |
… | |
… | |
2771 | goto bailout; |
2806 | goto bailout; |
2772 | } |
2807 | } |
2773 | } |
2808 | } |
2774 | else if (selection_wait == Sel_incr) |
2809 | else if (selection_wait == Sel_incr) |
2775 | { |
2810 | { |
2776 | incr_ev.start (NOW + 10); |
2811 | incr_ev.start (10); |
2777 | |
2812 | |
2778 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2813 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2779 | { |
2814 | { |
2780 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2815 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2781 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2816 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2821 | if (selection_wait == Sel_normal) |
2856 | if (selection_wait == Sel_normal) |
2822 | selection_wait = Sel_none; |
2857 | selection_wait = Sel_none; |
2823 | } |
2858 | } |
2824 | |
2859 | |
2825 | void |
2860 | void |
2826 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2861 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2827 | { |
2862 | { |
2828 | selection_wait = Sel_none; |
2863 | selection_wait = Sel_none; |
2829 | |
2864 | |
2830 | incr_buf_size = 0; |
2865 | incr_buf_size = 0; |
2831 | free (incr_buf); |
2866 | free (incr_buf); |
… | |
… | |
2842 | selection_paste (win, prop, true); |
2877 | selection_paste (win, prop, true); |
2843 | } |
2878 | } |
2844 | |
2879 | |
2845 | /* ------------------------------------------------------------------------- */ |
2880 | /* ------------------------------------------------------------------------- */ |
2846 | /* |
2881 | /* |
2847 | * Request the current selection: |
2882 | * Request the current selection: |
2848 | * Order: > internal selection if available |
2883 | * Order: > internal selection if available |
2849 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2884 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2850 | * > CUT_BUFFER0 |
2885 | * > CUT_BUFFER0 |
2851 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2886 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2852 | * will auto fallback to CUT_BUFFER0 |
2887 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2854 | */ |
2889 | */ |
2855 | void |
2890 | void |
2856 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2891 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2857 | { |
2892 | { |
2858 | if (selection.text && selnum == Sel_Primary) |
2893 | if (selection.text && selnum == Sel_Primary) |
|
|
2894 | { |
2859 | { /* internal selection */ |
2895 | /* internal selection */ |
2860 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2896 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2861 | paste (str, strlen (str)); |
2897 | paste (str, strlen (str)); |
2862 | free (str); |
2898 | free (str); |
2863 | return; |
2899 | return; |
2864 | } |
2900 | } |
… | |
… | |
3130 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3166 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3131 | |
3167 | |
3132 | while (selection.mark.col > 0 |
3168 | while (selection.mark.col > 0 |
3133 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3169 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3134 | --selection.mark.col; |
3170 | --selection.mark.col; |
3135 | |
3171 | |
3136 | if (selection.op) |
3172 | if (selection.op) |
|
|
3173 | { |
3137 | { /* clear the old selection */ |
3174 | /* clear the old selection */ |
3138 | selection.beg.row = selection.end.row = selection.mark.row; |
3175 | selection.beg.row = selection.end.row = selection.mark.row; |
3139 | selection.beg.col = selection.end.col = selection.mark.col; |
3176 | selection.beg.col = selection.end.col = selection.mark.col; |
3140 | } |
3177 | } |
3141 | |
3178 | |
3142 | selection.op = SELECTION_INIT; |
3179 | selection.op = SELECTION_INIT; |
… | |
… | |
3331 | * a point/word/line which is either the start or end of the selection |
3368 | * a point/word/line which is either the start or end of the selection |
3332 | * and it was decided by whichever point/word/line was `fixed' at the |
3369 | * and it was decided by whichever point/word/line was `fixed' at the |
3333 | * time of the most recent button3 press |
3370 | * time of the most recent button3 press |
3334 | */ |
3371 | */ |
3335 | if (button3 && buttonpress) |
3372 | if (button3 && buttonpress) |
|
|
3373 | { |
3336 | { /* button3 press */ |
3374 | /* button3 press */ |
3337 | /* |
3375 | /* |
3338 | * first determine which edge of the selection we are closest to |
3376 | * first determine which edge of the selection we are closest to |
3339 | */ |
3377 | */ |
3340 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3378 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3341 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3379 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3359 | selection.mark.row = selection.beg.row; |
3397 | selection.mark.row = selection.beg.row; |
3360 | selection.mark.col = selection.beg.col; |
3398 | selection.mark.col = selection.beg.col; |
3361 | } |
3399 | } |
3362 | } |
3400 | } |
3363 | else |
3401 | else |
|
|
3402 | { |
3364 | { /* button1 drag or button3 drag */ |
3403 | /* button1 drag or button3 drag */ |
3365 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3404 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3366 | { |
3405 | { |
3367 | if (selection.mark.row == selection.end.row |
3406 | if (selection.mark.row == selection.end.row |
3368 | && selection.mark.col == selection.end.col |
3407 | && selection.mark.col == selection.end.col |
3369 | && clickchange |
3408 | && clickchange |
… | |
… | |
3450 | selection.end.row++; |
3489 | selection.end.row++; |
3451 | } |
3490 | } |
3452 | } |
3491 | } |
3453 | |
3492 | |
3454 | if (button3 && buttonpress) |
3493 | if (button3 && buttonpress) |
|
|
3494 | { |
3455 | { /* mark may need to be changed */ |
3495 | /* mark may need to be changed */ |
3456 | if (closeto == LEFT) |
3496 | if (closeto == LEFT) |
3457 | { |
3497 | { |
3458 | selection.mark.row = selection.end.row; |
3498 | selection.mark.row = selection.end.row; |
3459 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3499 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3460 | } |
3500 | } |
… | |
… | |
3659 | XFree (ct.value); |
3699 | XFree (ct.value); |
3660 | } |
3700 | } |
3661 | |
3701 | |
3662 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3702 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3663 | } |
3703 | } |
3664 | |
|
|
3665 | /* ------------------------------------------------------------------------- * |
|
|
3666 | * MOUSE ROUTINES * |
|
|
3667 | * ------------------------------------------------------------------------- */ |
|
|
3668 | |
|
|
3669 | /* |
|
|
3670 | * return col/row values corresponding to x/y pixel values |
|
|
3671 | */ |
|
|
3672 | void |
|
|
3673 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3674 | { |
|
|
3675 | *x = Pixel2Col (*x); |
|
|
3676 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3677 | *y = Pixel2Row (*y); |
|
|
3678 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3679 | } |
|
|
3680 | |
3704 | |
3681 | /* ------------------------------------------------------------------------- */ |
3705 | /* ------------------------------------------------------------------------- */ |
3682 | #ifdef USE_XIM |
3706 | #ifdef USE_XIM |
3683 | void |
3707 | void |
3684 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3708 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |