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. |
… | |
… | |
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() \ |
… | |
… | |
89 | /* |
87 | /* |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
88 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
89 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
90 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
93 | */ |
91 | */ |
94 | #define drawBuffer vt |
|
|
95 | |
|
|
96 | #define CLEAR_ROWS(row, num) \ |
92 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
93 | if (mapped) \ |
98 | XClearArea (dpy, drawBuffer, 0, \ |
94 | XClearArea (dpy, vt, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
95 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
96 | (unsigned int)Height2Pixel (num), False) |
101 | |
97 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
98 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
99 | if (mapped) \ |
104 | XClearArea (dpy, drawBuffer, x, y, \ |
100 | XClearArea (dpy, vt, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
101 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
102 | (unsigned int)Height2Pixel (1), False) |
107 | |
103 | |
108 | #define ERASE_ROWS(row, num) \ |
104 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (dpy, drawBuffer, gc, \ |
105 | XFillRectangle (dpy, vt, gc, \ |
110 | 0, Row2Pixel (row), \ |
106 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
107 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
108 | (unsigned int)Height2Pixel (num)) |
113 | |
109 | |
114 | /* ------------------------------------------------------------------------- * |
110 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
111 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
112 | * ------------------------------------------------------------------------- */ |
… | |
… | |
161 | { |
157 | { |
162 | #if ENABLE_OVERLAY |
158 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
159 | scr_overlay_off (); |
164 | #endif |
160 | #endif |
165 | |
161 | |
|
|
162 | rvideo_mode = false; |
166 | view_start = 0; |
163 | view_start = 0; |
167 | num_scr = 0; |
164 | num_scr = 0; |
168 | |
165 | |
169 | if (ncol == 0) |
166 | if (ncol == 0) |
170 | ncol = 80; |
167 | ncol = 80; |
… | |
… | |
237 | selection.text = NULL; |
234 | selection.text = NULL; |
238 | selection.len = 0; |
235 | selection.len = 0; |
239 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
240 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
241 | selection.clicks = 0; |
238 | selection.clicks = 0; |
242 | rvideo_state = rvideo_mode = false; |
|
|
243 | } |
239 | } |
244 | else |
240 | else |
245 | { |
241 | { |
246 | /* |
242 | /* |
247 | * add or delete rows as appropriate |
243 | * add or delete rows as appropriate |
… | |
… | |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
272 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
277 | } |
273 | } |
278 | |
274 | |
279 | line_t *old_buf = row_buf; |
275 | line_t *old_buf = row_buf; |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
276 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
281 | |
277 | |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
278 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
279 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int q = total_rows; // rewrapped row |
280 | int q = total_rows; // rewrapped row |
285 | |
281 | |
286 | if (top_row) |
282 | if (top_row) |
… | |
… | |
330 | int qcol = 0; |
326 | int qcol = 0; |
331 | |
327 | |
332 | // see below for cursor adjustment rationale |
328 | // see below for cursor adjustment rationale |
333 | if (p == ocur.row) |
329 | if (p == ocur.row) |
334 | screen.cur.row = q - (total_rows - nrow); |
330 | screen.cur.row = q - (total_rows - nrow); |
335 | |
331 | |
336 | // fill a single destination line |
332 | // fill a single destination line |
337 | while (lofs < llen && qcol < ncol) |
333 | while (lofs < llen && qcol < ncol) |
338 | { |
334 | { |
339 | int prow = lofs / prev_ncol; |
335 | int prow = lofs / prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
336 | int pcol = lofs % prev_ncol; |
… | |
… | |
366 | } |
362 | } |
367 | while (p != pend && q > 0); |
363 | while (p != pend && q > 0); |
368 | |
364 | |
369 | term_start = total_rows - nrow; |
365 | term_start = total_rows - nrow; |
370 | top_row = q - term_start; |
366 | top_row = q - term_start; |
371 | |
367 | |
372 | // make sure all terminal lines exist |
368 | // make sure all terminal lines exist |
373 | while (top_row > 0) |
369 | while (top_row > 0) |
374 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
370 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
375 | } |
371 | } |
376 | else |
372 | else |
377 | { |
373 | { |
378 | // if no scrollback exists (yet), wing, instead of wrap |
374 | // if no scrollback exists (yet), wing, instead of wrap |
379 | |
375 | |
380 | for (int row = min (nrow, prev_nrow); row--; ) |
376 | for (int row = min (nrow, prev_nrow); row--; ) |
381 | { |
377 | { |
382 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
378 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
383 | line_t &qline = row_buf [row]; |
379 | line_t &qline = row_buf [row]; |
384 | |
380 | |
… | |
… | |
407 | CLEAR_ALL_SELECTION (); |
403 | CLEAR_ALL_SELECTION (); |
408 | |
404 | |
409 | prev_nrow = nrow; |
405 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
406 | prev_ncol = ncol; |
411 | |
407 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
408 | tabs = (char *)rxvt_malloc (ncol); |
413 | |
409 | |
414 | for (int col = ncol; col--; ) |
410 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
411 | tabs [col] = col % TABSIZE == 0; |
416 | |
412 | |
417 | if (current_screen != PRIMARY) |
413 | if (current_screen != PRIMARY) |
418 | scr_swap_screen (); |
414 | scr_swap_screen (); |
419 | |
415 | |
… | |
… | |
510 | } |
506 | } |
511 | |
507 | |
512 | void |
508 | void |
513 | rxvt_term::scr_swap_screen () |
509 | rxvt_term::scr_swap_screen () |
514 | { |
510 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
511 | if (!option (Opt_secondaryScreen)) |
516 | return; |
512 | return; |
517 | |
513 | |
518 | for (int i = prev_nrow; i--; ) |
514 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
515 | ::swap (ROW(i), swap_buf [i]); |
520 | |
516 | |
… | |
… | |
542 | selection_check (2); /* check for boundary cross */ |
538 | selection_check (2); /* check for boundary cross */ |
543 | |
539 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
540 | int i = current_screen; current_screen = scrn; scrn = i; |
545 | |
541 | |
546 | #if NSCREENS |
542 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
543 | if (option (Opt_secondaryScreen)) |
548 | { |
544 | { |
549 | num_scr = 0; |
545 | num_scr = 0; |
550 | |
546 | |
551 | scr_swap_screen (); |
547 | scr_swap_screen (); |
552 | |
548 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
551 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
552 | swap.flags |= Screen_VisibleCursor; |
557 | } |
553 | } |
558 | else |
554 | else |
559 | #endif |
555 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
556 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
557 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
558 | } |
563 | |
559 | |
564 | // clear WrapNext indicator, solidifying position on next line |
560 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
561 | void |
… | |
… | |
598 | /* |
594 | /* |
599 | * Change the rendition style for following text |
595 | * Change the rendition style for following text |
600 | */ |
596 | */ |
601 | void |
597 | void |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
598 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
603 | { |
599 | { |
604 | if (set) |
600 | if (set) |
605 | rstyle |= style; |
601 | rstyle |= style; |
606 | else if (style == ~RS_None) |
602 | else if (style == ~RS_None) |
607 | rstyle = DEFAULT_RSTYLE; |
603 | rstyle = DEFAULT_RSTYLE; |
608 | else |
604 | else |
609 | rstyle &= ~style; |
605 | rstyle &= ~style; |
610 | } |
606 | } |
611 | |
607 | |
612 | /* ------------------------------------------------------------------------- */ |
608 | /* ------------------------------------------------------------------------- */ |
613 | /* |
609 | /* |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
610 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
615 | * count positive ==> scroll up |
611 | * count positive ==> scroll up |
… | |
… | |
624 | want_refresh = 1; |
620 | want_refresh = 1; |
625 | num_scr += count; |
621 | num_scr += count; |
626 | |
622 | |
627 | if (count > 0 |
623 | if (count > 0 |
628 | && row1 == 0 |
624 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
625 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
626 | { |
631 | top_row = max (top_row - count, -saveLines); |
627 | top_row = max (top_row - count, -saveLines); |
632 | |
628 | |
633 | // scroll everything up 'count' lines |
629 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
630 | term_start = (term_start + count) % total_rows; |
… | |
… | |
666 | line_t &l2 = ROW(i); |
662 | line_t &l2 = ROW(i); |
667 | |
663 | |
668 | ::swap (l1, l2); |
664 | ::swap (l1, l2); |
669 | l2.touch (); |
665 | l2.touch (); |
670 | } |
666 | } |
671 | |
667 | |
672 | // move and/or clear selection, if any |
668 | // move and/or clear selection, if any |
673 | if (selection.op && current_screen == selection.screen) |
669 | if (selection.op && current_screen == selection.screen) |
674 | { |
670 | { |
675 | selection.beg.row -= count; |
671 | selection.beg.row -= count; |
676 | selection.end.row -= count; |
672 | selection.end.row -= count; |
… | |
… | |
684 | selection.op = SELECTION_CLEAR; |
680 | selection.op = SELECTION_CLEAR; |
685 | } |
681 | } |
686 | } |
682 | } |
687 | |
683 | |
688 | // finally move the view window, if desired |
684 | // finally move the view window, if desired |
689 | if (OPTION (Opt_scrollWithBuffer) |
685 | if (option (Opt_scrollWithBuffer) |
690 | && view_start != 0 |
686 | && view_start != 0 |
691 | && view_start != -saveLines) |
687 | && view_start != -saveLines) |
692 | scr_page (UP, count); |
688 | scr_page (UP, count); |
693 | |
689 | |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
690 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
712 | { |
708 | { |
713 | /* move selected region too */ |
709 | /* move selected region too */ |
714 | selection.beg.row -= count; |
710 | selection.beg.row -= count; |
715 | selection.end.row -= count; |
711 | selection.end.row -= count; |
716 | selection.mark.row -= count; |
712 | selection.mark.row -= count; |
717 | |
713 | |
718 | selection_check (0); |
714 | selection_check (0); |
719 | } |
715 | } |
720 | } |
716 | } |
721 | |
717 | |
722 | // use a simple and robust scrolling algorithm, this |
718 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
834 | } |
830 | } |
835 | |
831 | |
836 | if (screen.flags & Screen_WrapNext) |
832 | if (screen.flags & Screen_WrapNext) |
837 | { |
833 | { |
838 | scr_do_wrap (); |
834 | scr_do_wrap (); |
839 | |
835 | |
840 | line->l = ncol; |
836 | line->l = ncol; |
841 | line->is_longer (1); |
837 | line->is_longer (1); |
842 | |
838 | |
843 | row = screen.cur.row; |
839 | row = screen.cur.row; |
844 | line = &ROW(row); /* _must_ refresh */ |
840 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
1013 | * XTERM_SEQ: CTRL-H |
1009 | * XTERM_SEQ: CTRL-H |
1014 | */ |
1010 | */ |
1015 | void |
1011 | void |
1016 | rxvt_term::scr_backspace () NOTHROW |
1012 | rxvt_term::scr_backspace () NOTHROW |
1017 | { |
1013 | { |
1018 | want_refresh = 1; |
|
|
1019 | |
|
|
1020 | if (screen.cur.col == 0) |
1014 | if (screen.cur.col == 0) |
1021 | { |
1015 | { |
1022 | if (screen.cur.row > 0) |
1016 | if (screen.cur.row > 0) |
1023 | { |
1017 | { |
1024 | #ifdef TERMCAP_HAS_BW |
1018 | #ifdef TERMCAP_HAS_BW |
1025 | screen.cur.col = ncol - 1; |
1019 | screen.cur.col = ncol - 1; |
1026 | screen.cur.row--; |
1020 | --screen.cur.row; |
1027 | return; |
1021 | |
|
|
1022 | want_refresh = 1; |
1028 | #endif |
1023 | #endif |
1029 | } |
1024 | } |
1030 | } |
1025 | } |
1031 | else if (!(screen.flags & Screen_WrapNext)) |
1026 | else |
1032 | scr_gotorc (0, -1, RELATIVE); |
1027 | scr_gotorc (0, -1, RELATIVE); |
1033 | |
|
|
1034 | screen.flags &= ~Screen_WrapNext; |
|
|
1035 | } |
1028 | } |
1036 | |
1029 | |
1037 | /* ------------------------------------------------------------------------- */ |
1030 | /* ------------------------------------------------------------------------- */ |
1038 | /* |
1031 | /* |
1039 | * Process Horizontal Tab |
1032 | * Process Horizontal Tab |
… | |
… | |
1062 | x = i; |
1055 | x = i; |
1063 | |
1056 | |
1064 | if (!--count) |
1057 | if (!--count) |
1065 | break; |
1058 | break; |
1066 | } |
1059 | } |
1067 | else |
1060 | else |
1068 | ht &= l.t[i] == ' ' |
1061 | ht &= l.t[i] == ' ' |
1069 | && RS_SAME (l.r[i], base_rend); |
1062 | && RS_SAME (l.r[i], base_rend); |
1070 | |
1063 | |
1071 | if (count) |
1064 | if (count) |
1072 | x = ncol - 1; |
1065 | x = ncol - 1; |
1073 | |
1066 | |
1074 | // store horizontal tab commands as characters inside the text |
1067 | // store horizontal tab commands as characters inside the text |
1075 | // buffer so they can be selected and pasted. |
1068 | // buffer so they can be selected and pasted. |
1076 | if (ht && OPTION (Opt_pastableTabs)) |
1069 | if (ht && option (Opt_pastableTabs)) |
1077 | { |
1070 | { |
1078 | base_rend = SET_FONT (base_rend, 0); |
1071 | base_rend = SET_FONT (base_rend, 0); |
1079 | |
1072 | |
1080 | l.touch (x); |
1073 | l.touch (x); |
1081 | |
1074 | |
… | |
… | |
1188 | } |
1181 | } |
1189 | } |
1182 | } |
1190 | else |
1183 | else |
1191 | { |
1184 | { |
1192 | if (screen.flags & Screen_Relative) |
1185 | if (screen.flags & Screen_Relative) |
|
|
1186 | { |
1193 | { /* relative origin mode */ |
1187 | /* relative origin mode */ |
1194 | screen.cur.row = row + screen.tscroll; |
1188 | screen.cur.row = row + screen.tscroll; |
1195 | min_it (screen.cur.row, screen.bscroll); |
1189 | min_it (screen.cur.row, screen.bscroll); |
1196 | } |
1190 | } |
1197 | else |
1191 | else |
1198 | screen.cur.row = row; |
1192 | screen.cur.row = row; |
… | |
… | |
1474 | { |
1468 | { |
1475 | if (selection.end.row != screen.cur.row |
1469 | if (selection.end.row != screen.cur.row |
1476 | || (selection.end.col + count >= ncol)) |
1470 | || (selection.end.col + count >= ncol)) |
1477 | CLEAR_SELECTION (); |
1471 | CLEAR_SELECTION (); |
1478 | else |
1472 | else |
|
|
1473 | { |
1479 | { /* shift selection */ |
1474 | /* shift selection */ |
1480 | selection.beg.col += count; |
1475 | selection.beg.col += count; |
1481 | selection.mark.col += count; /* XXX: yes? */ |
1476 | selection.mark.col += count; /* XXX: yes? */ |
1482 | selection.end.col += count; |
1477 | selection.end.col += count; |
1483 | } |
1478 | } |
1484 | } |
1479 | } |
… | |
… | |
1623 | */ |
1618 | */ |
1624 | void |
1619 | void |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1620 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1626 | { |
1621 | { |
1627 | if (mode < 0) |
1622 | if (mode < 0) |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1623 | memset (tabs, 0, ncol); |
1629 | else if (screen.cur.col < ncol) |
1624 | else if (screen.cur.col < ncol) |
1630 | tabs [screen.cur.col] = !!mode; |
1625 | tabs [screen.cur.col] = !!mode; |
1631 | } |
1626 | } |
1632 | |
1627 | |
1633 | /* ------------------------------------------------------------------------- */ |
1628 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1648 | if (rvideo_state != on) |
1643 | if (rvideo_state != on) |
1649 | { |
1644 | { |
1650 | rvideo_state = on; |
1645 | rvideo_state = on; |
1651 | |
1646 | |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1647 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1653 | #if XPM_BACKGROUND |
1648 | #ifdef HAVE_BG_PIXMAP |
1654 | if (bgPixmap.pixmap == None) |
1649 | if (bgPixmap.pixmap == None) |
1655 | #endif |
|
|
1656 | #if TRANSPARENT |
|
|
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1658 | #endif |
1650 | #endif |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1651 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1660 | |
1652 | |
1661 | XGCValues gcvalue; |
1653 | XGCValues gcvalue; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1654 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1806 | for (i = PART_BEG; i < RC_COUNT; i++) |
1798 | for (i = PART_BEG; i < RC_COUNT; i++) |
1807 | { |
1799 | { |
1808 | min_it (rc[i].col, ncol - 1); |
1800 | min_it (rc[i].col, ncol - 1); |
1809 | min_it (rc[i].row, nrow - 1); |
1801 | min_it (rc[i].row, nrow - 1); |
1810 | } |
1802 | } |
1811 | |
1803 | // 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++) |
1804 | 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); |
1805 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1814 | |
1806 | |
1815 | num_scr_allow = 0; |
1807 | num_scr_allow = 0; |
1816 | |
1808 | |
… | |
… | |
1871 | return true; |
1863 | return true; |
1872 | } |
1864 | } |
1873 | |
1865 | |
1874 | #ifndef NO_BELL |
1866 | #ifndef NO_BELL |
1875 | void |
1867 | void |
1876 | rxvt_term::bell_cb (time_watcher &w) |
1868 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1877 | { |
1869 | { |
1878 | rvideo_bell = false; |
1870 | rvideo_bell = false; |
1879 | scr_rvideo_mode (rvideo_mode); |
1871 | scr_rvideo_mode (rvideo_mode); |
|
|
1872 | refresh_check (); |
1880 | } |
1873 | } |
1881 | #endif |
1874 | #endif |
1882 | |
1875 | |
1883 | /* ------------------------------------------------------------------------- */ |
1876 | /* ------------------------------------------------------------------------- */ |
1884 | void |
1877 | void |
… | |
… | |
1886 | { |
1879 | { |
1887 | #ifndef NO_BELL |
1880 | #ifndef NO_BELL |
1888 | |
1881 | |
1889 | # ifndef NO_MAPALERT |
1882 | # ifndef NO_MAPALERT |
1890 | # ifdef MAPALERT_OPTION |
1883 | # ifdef MAPALERT_OPTION |
1891 | if (OPTION (Opt_mapAlert)) |
1884 | if (option (Opt_mapAlert)) |
1892 | # endif |
1885 | # endif |
1893 | XMapWindow (dpy, parent[0]); |
1886 | XMapWindow (dpy, parent[0]); |
1894 | # endif |
1887 | # endif |
1895 | |
1888 | |
|
|
1889 | # if ENABLE_FRILLS |
|
|
1890 | if (option (Opt_urgentOnBell)) |
|
|
1891 | { |
|
|
1892 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1893 | { |
|
|
1894 | h->flags |= XUrgencyHint; |
|
|
1895 | XSetWMHints (dpy, parent[0], h); |
|
|
1896 | } |
|
|
1897 | } |
|
|
1898 | # endif |
|
|
1899 | |
1896 | if (OPTION (Opt_visualBell)) |
1900 | if (option (Opt_visualBell)) |
1897 | { |
1901 | { |
1898 | rvideo_bell = true; |
1902 | rvideo_bell = true; |
1899 | scr_rvideo_mode (rvideo_mode); |
1903 | scr_rvideo_mode (rvideo_mode); |
1900 | display->flush (); |
1904 | flush (); |
1901 | |
1905 | |
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1906 | bell_ev.start (VISUAL_BELL_DURATION); |
1903 | } |
1907 | } |
1904 | else |
1908 | else |
1905 | XBell (dpy, 0); |
1909 | XBell (dpy, 0); |
1906 | |
|
|
1907 | #endif |
1910 | #endif |
1908 | } |
1911 | } |
1909 | |
1912 | |
1910 | /* ------------------------------------------------------------------------- */ |
1913 | /* ------------------------------------------------------------------------- */ |
1911 | /* ARGSUSED */ |
1914 | /* ARGSUSED */ |
… | |
… | |
1989 | return; |
1992 | return; |
1990 | |
1993 | |
1991 | /* |
1994 | /* |
1992 | * A: set up vars |
1995 | * A: set up vars |
1993 | */ |
1996 | */ |
|
|
1997 | refresh_count = 0; |
|
|
1998 | |
1994 | have_bg = 0; |
1999 | have_bg = 0; |
1995 | refresh_count = 0; |
2000 | #ifdef HAVE_BG_PIXMAP |
1996 | |
|
|
1997 | #if XPM_BACKGROUND |
|
|
1998 | have_bg |= bgPixmap.pixmap != None; |
2001 | have_bg = bgPixmap.pixmap != None; |
1999 | #endif |
|
|
2000 | #if TRANSPARENT |
|
|
2001 | have_bg |= OPTION (Opt_transparent) && am_transparent; |
|
|
2002 | #endif |
2002 | #endif |
2003 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2003 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2004 | |
2004 | |
2005 | /* |
2005 | /* |
2006 | * B: reverse any characters which are selected |
2006 | * B: reverse any characters which are selected |
… | |
… | |
2051 | ccol2 = Color_bg; |
2051 | ccol2 = Color_bg; |
2052 | #endif |
2052 | #endif |
2053 | |
2053 | |
2054 | if (showcursor && focus) |
2054 | if (showcursor && focus) |
2055 | { |
2055 | { |
2056 | if (OPTION (Opt_cursorUnderline)) |
2056 | if (option (Opt_cursorUnderline)) |
2057 | *crp ^= RS_Uline; |
2057 | *crp ^= RS_Uline; |
2058 | else |
2058 | else |
2059 | { |
2059 | { |
2060 | *crp ^= RS_RVid; |
2060 | *crp ^= RS_RVid; |
2061 | *crp = SET_FGCOLOR (*crp, ccol1); |
2061 | *crp = SET_FGCOLOR (*crp, ccol1); |
… | |
… | |
2259 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2259 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2260 | { |
2260 | { |
2261 | bool invert = rend & RS_RVid; |
2261 | bool invert = rend & RS_RVid; |
2262 | |
2262 | |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2264 | if (rend & RS_Bold |
|
|
2265 | && fore == Color_fg) |
2264 | if (rend & RS_Bold && fore == Color_fg) |
2266 | { |
2265 | { |
2267 | if (ISSET_PIXCOLOR (Color_BD)) |
2266 | if (ISSET_PIXCOLOR (Color_BD)) |
2268 | fore = Color_BD; |
2267 | fore = Color_BD; |
2269 | # if !ENABLE_STYLES |
2268 | # if !ENABLE_STYLES |
2270 | else |
2269 | else |
2271 | invert = !invert; |
2270 | invert = !invert; |
2272 | # endif |
2271 | # endif |
2273 | } |
2272 | } |
2274 | |
2273 | |
2275 | if (rend & RS_Italic |
2274 | if (rend & RS_Italic && fore == Color_fg) |
2276 | && fore == Color_fg) |
|
|
2277 | { |
2275 | { |
2278 | if (ISSET_PIXCOLOR (Color_IT)) |
2276 | if (ISSET_PIXCOLOR (Color_IT)) |
2279 | fore = Color_IT; |
2277 | fore = Color_IT; |
2280 | # if !ENABLE_STYLES |
2278 | # if !ENABLE_STYLES |
2281 | else |
2279 | else |
… | |
… | |
2315 | } |
2313 | } |
2316 | |
2314 | |
2317 | #ifdef TEXT_BLINK |
2315 | #ifdef TEXT_BLINK |
2318 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2316 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2319 | { |
2317 | { |
2320 | if (!text_blink_ev.active) |
2318 | if (!text_blink_ev.is_active ()) |
2321 | { |
2319 | { |
2322 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2320 | text_blink_ev.again (); |
2323 | hidden_text = 0; |
2321 | hidden_text = 0; |
2324 | } |
2322 | } |
2325 | else if (hidden_text) |
2323 | else if (hidden_text) |
2326 | fore = back; |
2324 | fore = back; |
2327 | } |
2325 | } |
… | |
… | |
2349 | /* |
2347 | /* |
2350 | * Actually do the drawing of the string here |
2348 | * Actually do the drawing of the string here |
2351 | */ |
2349 | */ |
2352 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2350 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2353 | |
2351 | |
2354 | if (back == fore) |
2352 | if (have_bg && back == Color_bg) |
2355 | font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back); |
|
|
2356 | else if (back == Color_bg && have_bg) |
|
|
2357 | { |
2353 | { |
2358 | // this is very ugly, maybe push it into ->draw? |
2354 | // this is very ugly, maybe push it into ->draw? |
2359 | |
2355 | |
2360 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2356 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2361 | if (text[i] != ' ') |
2357 | if (text[i] != ' ') |
2362 | { |
2358 | { |
2363 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2359 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2364 | goto did_clear; |
2360 | goto did_clear; |
2365 | } |
2361 | } |
2366 | |
2362 | |
2367 | CLEAR_CHARS (xpixel, ypixel, count); |
2363 | CLEAR_CHARS (xpixel, ypixel, count); |
2368 | did_clear: ; |
2364 | did_clear: ; |
… | |
… | |
2377 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2373 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2378 | else |
2374 | else |
2379 | #endif |
2375 | #endif |
2380 | XSetForeground (dpy, gc, pix_colors[fore]); |
2376 | XSetForeground (dpy, gc, pix_colors[fore]); |
2381 | |
2377 | |
2382 | XDrawLine (dpy, drawBuffer, gc, |
2378 | XDrawLine (dpy, vt, gc, |
2383 | xpixel, ypixel + font->ascent + 1, |
2379 | xpixel, ypixel + font->ascent + 1, |
2384 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2380 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2385 | } |
2381 | } |
2386 | } /* for (col....) */ |
2382 | } /* for (col....) */ |
2387 | } /* for (row....) */ |
2383 | } /* for (row....) */ |
… | |
… | |
2396 | */ |
2392 | */ |
2397 | if (showcursor) |
2393 | if (showcursor) |
2398 | { |
2394 | { |
2399 | if (focus) |
2395 | if (focus) |
2400 | { |
2396 | { |
2401 | if (OPTION (Opt_cursorUnderline)) |
2397 | if (option (Opt_cursorUnderline)) |
2402 | *crp ^= RS_Uline; |
2398 | *crp ^= RS_Uline; |
2403 | else |
2399 | else |
2404 | { |
2400 | { |
2405 | *crp ^= RS_RVid; |
2401 | *crp ^= RS_RVid; |
2406 | #ifndef NO_CURSORCOLOR |
2402 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2425 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2421 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2426 | else |
2422 | else |
2427 | #endif |
2423 | #endif |
2428 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2424 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2429 | |
2425 | |
2430 | XDrawRectangle (dpy, drawBuffer, gc, |
2426 | XDrawRectangle (dpy, vt, gc, |
2431 | Col2Pixel (col), |
2427 | Col2Pixel (col), |
2432 | Row2Pixel (oldcursor.row), |
2428 | Row2Pixel (oldcursor.row), |
2433 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2429 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2434 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2430 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2435 | } |
2431 | } |
… | |
… | |
2470 | } |
2466 | } |
2471 | |
2467 | |
2472 | void |
2468 | void |
2473 | rxvt_term::scr_recolour () NOTHROW |
2469 | rxvt_term::scr_recolour () NOTHROW |
2474 | { |
2470 | { |
2475 | if (1 |
2471 | #ifdef HAVE_BG_PIXMAP |
2476 | #if TRANSPARENT |
2472 | bgPixmap.apply (); |
2477 | && !am_transparent |
2473 | #else |
2478 | #endif |
2474 | |
2479 | #if XPM_BACKGROUND |
|
|
2480 | && !bgPixmap.pixmap |
|
|
2481 | #endif |
|
|
2482 | ) |
|
|
2483 | { |
|
|
2484 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2475 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2485 | XClearWindow (dpy, parent[0]); |
2476 | XClearWindow (dpy, parent[0]); |
2486 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2477 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2487 | #if HAVE_SCROLLBARS |
2478 | |
2488 | if (scrollBar.win) |
2479 | if (scrollBar.win) |
2489 | { |
2480 | { |
2490 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2481 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2491 | scrollBar.setIdle (); |
2482 | scrollBar.state = STATE_IDLE; |
2492 | scrollbar_show (0); |
2483 | scrollbar_show (0); |
2493 | } |
|
|
2494 | #endif |
|
|
2495 | } |
2484 | } |
2496 | |
2485 | |
|
|
2486 | #endif |
|
|
2487 | |
|
|
2488 | /* bgPixmap.apply () does not do the following : */ |
2497 | scr_clear (); |
2489 | scr_clear (); |
2498 | scr_touch (true); |
2490 | scr_touch (true); |
2499 | want_refresh = 1; |
2491 | want_refresh = 1; |
2500 | } |
2492 | } |
2501 | |
2493 | |
… | |
… | |
2654 | /* convert normal newline chars into common keyboard Return key sequence */ |
2646 | /* convert normal newline chars into common keyboard Return key sequence */ |
2655 | for (unsigned int i = 0; i < len; i++) |
2647 | for (unsigned int i = 0; i < len; i++) |
2656 | if (data[i] == C0_LF) |
2648 | if (data[i] == C0_LF) |
2657 | data[i] = C0_CR; |
2649 | data[i] = C0_CR; |
2658 | |
2650 | |
|
|
2651 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2652 | tt_printf ("\e[200~"); |
|
|
2653 | |
2659 | tt_write (data, len); |
2654 | tt_write (data, len); |
|
|
2655 | |
|
|
2656 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2657 | tt_printf ("\e[201~"); |
2660 | } |
2658 | } |
2661 | |
2659 | |
2662 | /* ------------------------------------------------------------------------- */ |
2660 | /* ------------------------------------------------------------------------- */ |
2663 | /* |
2661 | /* |
2664 | * Respond to a notification that a primary selection has been sent |
2662 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2739 | if (!delete_prop) |
2737 | if (!delete_prop) |
2740 | XDeleteProperty (dpy, win, prop); |
2738 | XDeleteProperty (dpy, win, prop); |
2741 | |
2739 | |
2742 | selection_wait = Sel_incr; |
2740 | selection_wait = Sel_incr; |
2743 | incr_buf_fill = 0; |
2741 | incr_buf_fill = 0; |
2744 | incr_ev.start (NOW + 10); |
2742 | incr_ev.start (10); |
2745 | |
2743 | |
2746 | goto bailout; |
2744 | goto bailout; |
2747 | } |
2745 | } |
2748 | |
2746 | |
2749 | if (ct.nitems == 0) |
2747 | if (ct.nitems == 0) |
… | |
… | |
2758 | ct.nitems = incr_buf_fill; |
2756 | ct.nitems = incr_buf_fill; |
2759 | incr_buf = 0; |
2757 | incr_buf = 0; |
2760 | incr_buf_size = 0; |
2758 | incr_buf_size = 0; |
2761 | incr_ev.stop (); |
2759 | incr_ev.stop (); |
2762 | } |
2760 | } |
2763 | else |
2761 | else |
2764 | { |
2762 | { |
2765 | if (selection_wait == Sel_normal |
2763 | if (selection_wait == Sel_normal |
2766 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2764 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2767 | { |
2765 | { |
2768 | /* |
2766 | /* |
… | |
… | |
2775 | goto bailout; |
2773 | goto bailout; |
2776 | } |
2774 | } |
2777 | } |
2775 | } |
2778 | else if (selection_wait == Sel_incr) |
2776 | else if (selection_wait == Sel_incr) |
2779 | { |
2777 | { |
2780 | incr_ev.start (NOW + 10); |
2778 | incr_ev.start (10); |
2781 | |
2779 | |
2782 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2780 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2783 | { |
2781 | { |
2784 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2782 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2785 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2783 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2825 | if (selection_wait == Sel_normal) |
2823 | if (selection_wait == Sel_normal) |
2826 | selection_wait = Sel_none; |
2824 | selection_wait = Sel_none; |
2827 | } |
2825 | } |
2828 | |
2826 | |
2829 | void |
2827 | void |
2830 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2828 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2831 | { |
2829 | { |
2832 | selection_wait = Sel_none; |
2830 | selection_wait = Sel_none; |
2833 | |
2831 | |
2834 | incr_buf_size = 0; |
2832 | incr_buf_size = 0; |
2835 | free (incr_buf); |
2833 | free (incr_buf); |
… | |
… | |
2846 | selection_paste (win, prop, true); |
2844 | selection_paste (win, prop, true); |
2847 | } |
2845 | } |
2848 | |
2846 | |
2849 | /* ------------------------------------------------------------------------- */ |
2847 | /* ------------------------------------------------------------------------- */ |
2850 | /* |
2848 | /* |
2851 | * Request the current selection: |
2849 | * Request the current selection: |
2852 | * Order: > internal selection if available |
2850 | * Order: > internal selection if available |
2853 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2851 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2854 | * > CUT_BUFFER0 |
2852 | * > CUT_BUFFER0 |
2855 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2853 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2856 | * will auto fallback to CUT_BUFFER0 |
2854 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2858 | */ |
2856 | */ |
2859 | void |
2857 | void |
2860 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2858 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2861 | { |
2859 | { |
2862 | if (selection.text && selnum == Sel_Primary) |
2860 | if (selection.text && selnum == Sel_Primary) |
|
|
2861 | { |
2863 | { /* internal selection */ |
2862 | /* internal selection */ |
2864 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2863 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2865 | paste (str, strlen (str)); |
2864 | paste (str, strlen (str)); |
2866 | free (str); |
2865 | free (str); |
2867 | return; |
2866 | return; |
2868 | } |
2867 | } |
… | |
… | |
3134 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3133 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3135 | |
3134 | |
3136 | while (selection.mark.col > 0 |
3135 | while (selection.mark.col > 0 |
3137 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3136 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3138 | --selection.mark.col; |
3137 | --selection.mark.col; |
3139 | |
3138 | |
3140 | if (selection.op) |
3139 | if (selection.op) |
|
|
3140 | { |
3141 | { /* clear the old selection */ |
3141 | /* clear the old selection */ |
3142 | selection.beg.row = selection.end.row = selection.mark.row; |
3142 | selection.beg.row = selection.end.row = selection.mark.row; |
3143 | selection.beg.col = selection.end.col = selection.mark.col; |
3143 | selection.beg.col = selection.end.col = selection.mark.col; |
3144 | } |
3144 | } |
3145 | |
3145 | |
3146 | selection.op = SELECTION_INIT; |
3146 | selection.op = SELECTION_INIT; |
… | |
… | |
3335 | * a point/word/line which is either the start or end of the selection |
3335 | * a point/word/line which is either the start or end of the selection |
3336 | * and it was decided by whichever point/word/line was `fixed' at the |
3336 | * and it was decided by whichever point/word/line was `fixed' at the |
3337 | * time of the most recent button3 press |
3337 | * time of the most recent button3 press |
3338 | */ |
3338 | */ |
3339 | if (button3 && buttonpress) |
3339 | if (button3 && buttonpress) |
|
|
3340 | { |
3340 | { /* button3 press */ |
3341 | /* button3 press */ |
3341 | /* |
3342 | /* |
3342 | * first determine which edge of the selection we are closest to |
3343 | * first determine which edge of the selection we are closest to |
3343 | */ |
3344 | */ |
3344 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3345 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3345 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3346 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3363 | selection.mark.row = selection.beg.row; |
3364 | selection.mark.row = selection.beg.row; |
3364 | selection.mark.col = selection.beg.col; |
3365 | selection.mark.col = selection.beg.col; |
3365 | } |
3366 | } |
3366 | } |
3367 | } |
3367 | else |
3368 | else |
|
|
3369 | { |
3368 | { /* button1 drag or button3 drag */ |
3370 | /* button1 drag or button3 drag */ |
3369 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3371 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3370 | { |
3372 | { |
3371 | if (selection.mark.row == selection.end.row |
3373 | if (selection.mark.row == selection.end.row |
3372 | && selection.mark.col == selection.end.col |
3374 | && selection.mark.col == selection.end.col |
3373 | && clickchange |
3375 | && clickchange |
… | |
… | |
3416 | selection_delimit_word (DN, &selection.end, &selection.end); |
3418 | selection_delimit_word (DN, &selection.end, &selection.end); |
3417 | } |
3419 | } |
3418 | else if (selection.clicks == 3) |
3420 | else if (selection.clicks == 3) |
3419 | { |
3421 | { |
3420 | #if ENABLE_FRILLS |
3422 | #if ENABLE_FRILLS |
3421 | if (OPTION (Opt_tripleclickwords)) |
3423 | if (option (Opt_tripleclickwords)) |
3422 | { |
3424 | { |
3423 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3425 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3424 | |
3426 | |
3425 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3427 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3426 | { |
3428 | { |
… | |
… | |
3454 | selection.end.row++; |
3456 | selection.end.row++; |
3455 | } |
3457 | } |
3456 | } |
3458 | } |
3457 | |
3459 | |
3458 | if (button3 && buttonpress) |
3460 | if (button3 && buttonpress) |
|
|
3461 | { |
3459 | { /* mark may need to be changed */ |
3462 | /* mark may need to be changed */ |
3460 | if (closeto == LEFT) |
3463 | if (closeto == LEFT) |
3461 | { |
3464 | { |
3462 | selection.mark.row = selection.end.row; |
3465 | selection.mark.row = selection.end.row; |
3463 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3466 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3464 | } |
3467 | } |
… | |
… | |
3663 | XFree (ct.value); |
3666 | XFree (ct.value); |
3664 | } |
3667 | } |
3665 | |
3668 | |
3666 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3669 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3667 | } |
3670 | } |
3668 | |
|
|
3669 | /* ------------------------------------------------------------------------- * |
|
|
3670 | * MOUSE ROUTINES * |
|
|
3671 | * ------------------------------------------------------------------------- */ |
|
|
3672 | |
|
|
3673 | /* |
|
|
3674 | * return col/row values corresponding to x/y pixel values |
|
|
3675 | */ |
|
|
3676 | void |
|
|
3677 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3678 | { |
|
|
3679 | *x = Pixel2Col (*x); |
|
|
3680 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3681 | *y = Pixel2Row (*y); |
|
|
3682 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3683 | } |
|
|
3684 | |
3671 | |
3685 | /* ------------------------------------------------------------------------- */ |
3672 | /* ------------------------------------------------------------------------- */ |
3686 | #ifdef USE_XIM |
3673 | #ifdef USE_XIM |
3687 | void |
3674 | void |
3688 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3675 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |