1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
… | |
… | |
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() \ |
… | |
… | |
93 | */ |
91 | */ |
94 | #define drawBuffer vt |
92 | #define drawBuffer vt |
95 | |
93 | |
96 | #define CLEAR_ROWS(row, num) \ |
94 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
95 | if (mapped) \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
96 | XClearArea (dpy, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
97 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
98 | (unsigned int)Height2Pixel (num), False) |
101 | |
99 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
100 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
101 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
102 | XClearArea (dpy, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
103 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
104 | (unsigned int)Height2Pixel (1), False) |
107 | |
105 | |
108 | #define ERASE_ROWS(row, num) \ |
106 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
107 | XFillRectangle (dpy, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
108 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
109 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
110 | (unsigned int)Height2Pixel (num)) |
113 | |
111 | |
114 | /* ------------------------------------------------------------------------- * |
112 | /* ------------------------------------------------------------------------- * |
… | |
… | |
126 | width = ncol; |
124 | width = ncol; |
127 | } |
125 | } |
128 | |
126 | |
129 | l.touch (); |
127 | l.touch (); |
130 | |
128 | |
131 | efs &= ~RS_baseattrMask; |
129 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
130 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
131 | |
134 | text_t *et = l.t + col; |
132 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
133 | rend_t *er = l.r + col; |
136 | |
134 | |
… | |
… | |
161 | { |
159 | { |
162 | #if ENABLE_OVERLAY |
160 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
161 | scr_overlay_off (); |
164 | #endif |
162 | #endif |
165 | |
163 | |
|
|
164 | rvideo_mode = false; |
166 | view_start = 0; |
165 | view_start = 0; |
167 | num_scr = 0; |
166 | num_scr = 0; |
168 | |
167 | |
169 | if (ncol == 0) |
168 | if (ncol == 0) |
170 | ncol = 80; |
169 | ncol = 80; |
… | |
… | |
237 | selection.text = NULL; |
236 | selection.text = NULL; |
238 | selection.len = 0; |
237 | selection.len = 0; |
239 | selection.op = SELECTION_CLEAR; |
238 | selection.op = SELECTION_CLEAR; |
240 | selection.screen = PRIMARY; |
239 | selection.screen = PRIMARY; |
241 | selection.clicks = 0; |
240 | selection.clicks = 0; |
242 | rvideo_state = rvideo_mode = false; |
|
|
243 | } |
241 | } |
244 | else |
242 | else |
245 | { |
243 | { |
246 | /* |
244 | /* |
247 | * add or delete rows as appropriate |
245 | * add or delete rows as appropriate |
… | |
… | |
407 | CLEAR_ALL_SELECTION (); |
405 | CLEAR_ALL_SELECTION (); |
408 | |
406 | |
409 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
408 | prev_ncol = ncol; |
411 | |
409 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
410 | tabs = (char *)rxvt_malloc (ncol); |
413 | |
411 | |
414 | for (int col = ncol; col--; ) |
412 | for (int col = ncol; --col; ) |
415 | tabs [col] = col % TABSIZE == 0; |
413 | tabs [col] = col % TABSIZE == 0; |
416 | |
414 | |
417 | if (current_screen != PRIMARY) |
415 | if (current_screen != PRIMARY) |
418 | scr_swap_screen (); |
416 | scr_swap_screen (); |
419 | |
417 | |
… | |
… | |
510 | } |
508 | } |
511 | |
509 | |
512 | void |
510 | void |
513 | rxvt_term::scr_swap_screen () |
511 | rxvt_term::scr_swap_screen () |
514 | { |
512 | { |
515 | if (!OPTION (Opt_secondaryScreen)) |
513 | if (!option (Opt_secondaryScreen)) |
516 | return; |
514 | return; |
517 | |
515 | |
518 | for (int i = prev_nrow; i--; ) |
516 | for (int i = prev_nrow; i--; ) |
519 | ::swap (ROW(i), swap_buf [i]); |
517 | ::swap (ROW(i), swap_buf [i]); |
520 | |
518 | |
… | |
… | |
542 | selection_check (2); /* check for boundary cross */ |
540 | selection_check (2); /* check for boundary cross */ |
543 | |
541 | |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
542 | int i = current_screen; current_screen = scrn; scrn = i; |
545 | |
543 | |
546 | #if NSCREENS |
544 | #if NSCREENS |
547 | if (OPTION (Opt_secondaryScreen)) |
545 | if (option (Opt_secondaryScreen)) |
548 | { |
546 | { |
549 | num_scr = 0; |
547 | num_scr = 0; |
550 | |
548 | |
551 | scr_swap_screen (); |
549 | scr_swap_screen (); |
552 | |
550 | |
… | |
… | |
555 | screen.flags |= Screen_VisibleCursor; |
553 | screen.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
554 | swap.flags |= Screen_VisibleCursor; |
557 | } |
555 | } |
558 | else |
556 | else |
559 | #endif |
557 | #endif |
560 | if (OPTION (Opt_secondaryScroll)) |
558 | if (option (Opt_secondaryScroll)) |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
559 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | } |
560 | } |
563 | |
561 | |
564 | // clear WrapNext indicator, solidifying position on next line |
562 | // clear WrapNext indicator, solidifying position on next line |
565 | void |
563 | void |
… | |
… | |
624 | want_refresh = 1; |
622 | want_refresh = 1; |
625 | num_scr += count; |
623 | num_scr += count; |
626 | |
624 | |
627 | if (count > 0 |
625 | if (count > 0 |
628 | && row1 == 0 |
626 | && row1 == 0 |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
627 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
630 | { |
628 | { |
631 | top_row = max (top_row - count, -saveLines); |
629 | top_row = max (top_row - count, -saveLines); |
632 | |
630 | |
633 | // scroll everything up 'count' lines |
631 | // scroll everything up 'count' lines |
634 | term_start = (term_start + count) % total_rows; |
632 | term_start = (term_start + count) % total_rows; |
… | |
… | |
641 | } |
639 | } |
642 | |
640 | |
643 | // erase newly scrolled-in lines |
641 | // erase newly scrolled-in lines |
644 | for (int i = count; i--; ) |
642 | for (int i = count; i--; ) |
645 | { |
643 | { |
646 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
647 | // it is worth the effort on slower machines |
|
|
648 | line_t &l = ROW(nrow - 1 - i); |
644 | line_t &l = ROW(nrow - 1 - i); |
649 | |
645 | |
|
|
646 | // optimize if already cleared, can be significant on slow machines |
|
|
647 | // could be rolled into scr_blank_screen_mem |
|
|
648 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
649 | { |
650 | scr_blank_line (l, 0, l.l, rstyle); |
650 | scr_blank_line (l, 0, l.l, rstyle); |
651 | |
|
|
652 | l.l = 0; |
651 | l.l = 0; |
653 | l.f = 0; |
652 | l.f = 0; |
|
|
653 | } |
|
|
654 | else |
|
|
655 | scr_blank_screen_mem (l, rstyle); |
654 | } |
656 | } |
655 | |
657 | |
656 | // now copy lines below the scroll region bottom to the |
658 | // now copy lines below the scroll region bottom to the |
657 | // bottom of the screen again, so they look as if they |
659 | // bottom of the screen again, so they look as if they |
658 | // hadn't moved. |
660 | // hadn't moved. |
… | |
… | |
680 | selection.op = SELECTION_CLEAR; |
682 | selection.op = SELECTION_CLEAR; |
681 | } |
683 | } |
682 | } |
684 | } |
683 | |
685 | |
684 | // finally move the view window, if desired |
686 | // finally move the view window, if desired |
685 | if (OPTION (Opt_scrollWithBuffer) |
687 | if (option (Opt_scrollWithBuffer) |
686 | && view_start != 0 |
688 | && view_start != 0 |
687 | && view_start != -saveLines) |
689 | && view_start != -saveLines) |
688 | scr_page (UP, count); |
690 | scr_page (UP, count); |
689 | |
691 | |
690 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
692 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
1067 | if (count) |
1069 | if (count) |
1068 | x = ncol - 1; |
1070 | x = ncol - 1; |
1069 | |
1071 | |
1070 | // store horizontal tab commands as characters inside the text |
1072 | // store horizontal tab commands as characters inside the text |
1071 | // buffer so they can be selected and pasted. |
1073 | // buffer so they can be selected and pasted. |
1072 | if (ht && OPTION (Opt_pastableTabs)) |
1074 | if (ht && option (Opt_pastableTabs)) |
1073 | { |
1075 | { |
1074 | base_rend = SET_FONT (base_rend, 0); |
1076 | base_rend = SET_FONT (base_rend, 0); |
1075 | |
1077 | |
1076 | l.touch (x); |
1078 | l.touch (x); |
1077 | |
1079 | |
… | |
… | |
1110 | * Process DEC Back Index |
1112 | * Process DEC Back Index |
1111 | * XTERM_SEQ: ESC 6 |
1113 | * XTERM_SEQ: ESC 6 |
1112 | * Move cursor left in row. If we're at the left boundary, shift everything |
1114 | * Move cursor left in row. If we're at the left boundary, shift everything |
1113 | * in that row right. Clear left column. |
1115 | * in that row right. Clear left column. |
1114 | */ |
1116 | */ |
1115 | #if ENABLE_FRILLS |
1117 | #if !ENABLE_MINIMAL |
1116 | void |
1118 | void |
1117 | rxvt_term::scr_backindex () NOTHROW |
1119 | rxvt_term::scr_backindex () NOTHROW |
1118 | { |
1120 | { |
1119 | if (screen.cur.col > 0) |
1121 | if (screen.cur.col > 0) |
1120 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1122 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1127 | * Process DEC Forward Index |
1129 | * Process DEC Forward Index |
1128 | * XTERM_SEQ: ESC 9 |
1130 | * XTERM_SEQ: ESC 9 |
1129 | * Move cursor right in row. If we're at the right boundary, shift everything |
1131 | * Move cursor right in row. If we're at the right boundary, shift everything |
1130 | * in that row left. Clear right column. |
1132 | * in that row left. Clear right column. |
1131 | */ |
1133 | */ |
1132 | #if ENABLE_FRILLS |
1134 | #if !ENABLE_MINIMAL |
1133 | void |
1135 | void |
1134 | rxvt_term::scr_forwardindex () NOTHROW |
1136 | rxvt_term::scr_forwardindex () NOTHROW |
1135 | { |
1137 | { |
1136 | if (screen.cur.col < ncol - 1) |
1138 | if (screen.cur.col < ncol - 1) |
1137 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1139 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1338 | } |
1340 | } |
1339 | else |
1341 | else |
1340 | { |
1342 | { |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1343 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1342 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1344 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1343 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1345 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1344 | ERASE_ROWS (row, num); |
1346 | ERASE_ROWS (row, num); |
1345 | gcvalue.foreground = pix_colors[Color_fg]; |
1347 | gcvalue.foreground = pix_colors[Color_fg]; |
1346 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1348 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1347 | } |
1349 | } |
1348 | |
1350 | |
1349 | for (; num--; row++) |
1351 | for (; num--; row++) |
1350 | { |
1352 | { |
1351 | scr_blank_screen_mem (ROW(row), rstyle); |
1353 | scr_blank_screen_mem (ROW(row), rstyle); |
1352 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1354 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1353 | } |
1355 | } |
1354 | } |
1356 | } |
1355 | |
1357 | |
1356 | #if ENABLE_FRILLS |
1358 | #if !ENABLE_MINIMAL |
1357 | void |
1359 | void |
1358 | rxvt_term::scr_erase_savelines () NOTHROW |
1360 | rxvt_term::scr_erase_savelines () NOTHROW |
1359 | { |
1361 | { |
1360 | want_refresh = 1; |
1362 | want_refresh = 1; |
1361 | ZERO_SCROLLBACK (); |
1363 | ZERO_SCROLLBACK (); |
… | |
… | |
1619 | */ |
1621 | */ |
1620 | void |
1622 | void |
1621 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1623 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1622 | { |
1624 | { |
1623 | if (mode < 0) |
1625 | if (mode < 0) |
1624 | memset (tabs, 0, ncol * sizeof (char)); |
1626 | memset (tabs, 0, ncol); |
1625 | else if (screen.cur.col < ncol) |
1627 | else if (screen.cur.col < ncol) |
1626 | tabs [screen.cur.col] = !!mode; |
1628 | tabs [screen.cur.col] = !!mode; |
1627 | } |
1629 | } |
1628 | |
1630 | |
1629 | /* ------------------------------------------------------------------------- */ |
1631 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1644 | if (rvideo_state != on) |
1646 | if (rvideo_state != on) |
1645 | { |
1647 | { |
1646 | rvideo_state = on; |
1648 | rvideo_state = on; |
1647 | |
1649 | |
1648 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1650 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1649 | #if XPM_BACKGROUND |
1651 | #ifdef HAVE_BG_PIXMAP |
1650 | if (bgPixmap.pixmap == None) |
1652 | if (bgPixmap.pixmap == None) |
1651 | #endif |
1653 | #endif |
1652 | #if TRANSPARENT |
|
|
1653 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1654 | #endif |
|
|
1655 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1654 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1656 | |
1655 | |
1657 | XGCValues gcvalue; |
1656 | XGCValues gcvalue; |
1658 | gcvalue.foreground = pix_colors[Color_fg]; |
1657 | gcvalue.foreground = pix_colors[Color_fg]; |
1659 | gcvalue.background = pix_colors[Color_bg]; |
1658 | gcvalue.background = pix_colors[Color_bg]; |
1660 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1659 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1661 | |
1660 | |
1662 | scr_clear (); |
1661 | scr_clear (); |
1663 | scr_touch (true); |
1662 | scr_touch (true); |
1664 | } |
1663 | } |
1665 | } |
1664 | } |
… | |
… | |
1750 | { |
1749 | { |
1751 | bool found = false; |
1750 | bool found = false; |
1752 | |
1751 | |
1753 | for (int i = 0; i < nrow; i++) |
1752 | for (int i = 0; i < nrow; i++) |
1754 | { |
1753 | { |
1755 | int col = 0; |
|
|
1756 | rend_t *drp = drawn_buf[i].r; |
1754 | rend_t *drp = drawn_buf[i].r; |
1757 | |
1755 | |
1758 | for (; col < ncol; col++, drp++) |
1756 | for (int col = 0; col < ncol; col++, drp++) |
1759 | if ((*drp & mask) == value) |
1757 | if ((*drp & mask) == value) |
1760 | { |
1758 | { |
1761 | found = true; |
1759 | found = true; |
1762 | *drp = ~value; |
1760 | *drp = ~value; |
1763 | } |
1761 | } |
… | |
… | |
1803 | for (i = PART_BEG; i < RC_COUNT; i++) |
1801 | for (i = PART_BEG; i < RC_COUNT; i++) |
1804 | { |
1802 | { |
1805 | min_it (rc[i].col, ncol - 1); |
1803 | min_it (rc[i].col, ncol - 1); |
1806 | min_it (rc[i].row, nrow - 1); |
1804 | min_it (rc[i].row, nrow - 1); |
1807 | } |
1805 | } |
1808 | |
1806 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1809 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1807 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1810 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1808 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1811 | |
1809 | |
1812 | num_scr_allow = 0; |
1810 | num_scr_allow = 0; |
1813 | |
1811 | |
… | |
… | |
1883 | { |
1881 | { |
1884 | #ifndef NO_BELL |
1882 | #ifndef NO_BELL |
1885 | |
1883 | |
1886 | # ifndef NO_MAPALERT |
1884 | # ifndef NO_MAPALERT |
1887 | # ifdef MAPALERT_OPTION |
1885 | # ifdef MAPALERT_OPTION |
1888 | if (OPTION (Opt_mapAlert)) |
1886 | if (option (Opt_mapAlert)) |
1889 | # endif |
1887 | # endif |
1890 | XMapWindow (display->display, parent[0]); |
1888 | XMapWindow (dpy, parent[0]); |
1891 | # endif |
1889 | # endif |
1892 | |
1890 | |
|
|
1891 | # if ENABLE_FRILLS |
|
|
1892 | if (option (Opt_urgentOnBell)) |
|
|
1893 | { |
|
|
1894 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
|
|
1895 | { |
|
|
1896 | h->flags |= XUrgencyHint; |
|
|
1897 | XSetWMHints (dpy, parent[0], h); |
|
|
1898 | } |
|
|
1899 | } |
|
|
1900 | # endif |
|
|
1901 | |
1893 | if (OPTION (Opt_visualBell)) |
1902 | if (option (Opt_visualBell)) |
1894 | { |
1903 | { |
1895 | rvideo_bell = true; |
1904 | rvideo_bell = true; |
1896 | scr_rvideo_mode (rvideo_mode); |
1905 | scr_rvideo_mode (rvideo_mode); |
1897 | display->flush (); |
1906 | display->flush (); |
1898 | |
1907 | |
1899 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1908 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1900 | } |
1909 | } |
1901 | else |
1910 | else |
1902 | XBell (display->display, 0); |
1911 | XBell (dpy, 0); |
1903 | |
|
|
1904 | #endif |
1912 | #endif |
1905 | } |
1913 | } |
1906 | |
1914 | |
1907 | /* ------------------------------------------------------------------------- */ |
1915 | /* ------------------------------------------------------------------------- */ |
1908 | /* ARGSUSED */ |
1916 | /* ARGSUSED */ |
… | |
… | |
1966 | * screen.text/screen.rend contain what the screen will change to. |
1974 | * screen.text/screen.rend contain what the screen will change to. |
1967 | */ |
1975 | */ |
1968 | void |
1976 | void |
1969 | rxvt_term::scr_refresh () NOTHROW |
1977 | rxvt_term::scr_refresh () NOTHROW |
1970 | { |
1978 | { |
1971 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1979 | unsigned char have_bg, |
1972 | showcursor; /* show the cursor */ |
1980 | showcursor; /* show the cursor */ |
1973 | int16_t col, row, /* column/row we're processing */ |
1981 | int16_t col, row, /* column/row we're processing */ |
1974 | ocrow; /* old cursor row */ |
1982 | ocrow; /* old cursor row */ |
1975 | int i; /* tmp */ |
1983 | int i; /* tmp */ |
1976 | #ifndef NO_CURSORCOLOR |
1984 | #ifndef NO_CURSORCOLOR |
1977 | rend_t cc1; /* store colours at cursor position (s) */ |
1985 | rend_t cc1; /* store colours at cursor position (s) */ |
1978 | #endif |
1986 | #endif |
1979 | rend_t *crp; // cursor rendition pointer |
1987 | rend_t *crp; // cursor rendition pointer |
|
|
1988 | rend_t ccol1, /* Cursor colour */ |
|
|
1989 | ccol2; /* Cursor colour2 */ |
1980 | |
1990 | |
1981 | want_refresh = 0; /* screen is current */ |
1991 | want_refresh = 0; /* screen is current */ |
1982 | |
1992 | |
1983 | if (refresh_type == NO_REFRESH || !mapped) |
1993 | if (refresh_type == NO_REFRESH || !mapped) |
1984 | return; |
1994 | return; |
1985 | |
1995 | |
1986 | /* |
1996 | /* |
1987 | * A: set up vars |
1997 | * A: set up vars |
1988 | */ |
1998 | */ |
1989 | must_clear = 0; |
1999 | have_bg = 0; |
1990 | refresh_count = 0; |
2000 | refresh_count = 0; |
1991 | |
2001 | |
1992 | #if XPM_BACKGROUND |
2002 | #ifdef HAVE_BG_PIXMAP |
1993 | must_clear |= bgPixmap.pixmap != None; |
2003 | have_bg |= bgPixmap.pixmap != None; |
1994 | #endif |
|
|
1995 | #if TRANSPARENT |
|
|
1996 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
1997 | #endif |
2004 | #endif |
1998 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2005 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1999 | |
2006 | |
2000 | /* |
2007 | /* |
2001 | * B: reverse any characters which are selected |
2008 | * B: reverse any characters which are selected |
… | |
… | |
2005 | /* |
2012 | /* |
2006 | * C: set the cursor character (s) |
2013 | * C: set the cursor character (s) |
2007 | */ |
2014 | */ |
2008 | { |
2015 | { |
2009 | unsigned char setoldcursor; |
2016 | unsigned char setoldcursor; |
2010 | rend_t ccol1, /* Cursor colour */ |
|
|
2011 | ccol2; /* Cursor colour2 */ |
|
|
2012 | |
2017 | |
2013 | showcursor = (screen.flags & Screen_VisibleCursor); |
2018 | showcursor = (screen.flags & Screen_VisibleCursor); |
2014 | #ifdef CURSOR_BLINK |
2019 | #ifdef CURSOR_BLINK |
2015 | if (hidden_cursor) |
2020 | if (hidden_cursor) |
2016 | showcursor = 0; |
2021 | showcursor = 0; |
… | |
… | |
2023 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2028 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2024 | col--; |
2029 | col--; |
2025 | |
2030 | |
2026 | crp = &ROW(screen.cur.row).r[col]; |
2031 | crp = &ROW(screen.cur.row).r[col]; |
2027 | |
2032 | |
|
|
2033 | #ifndef NO_CURSORCOLOR |
|
|
2034 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2035 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2036 | ccol1 = Color_cursor; |
|
|
2037 | else |
|
|
2038 | #endif |
|
|
2039 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2040 | ccol1 = fgcolor_of (rstyle); |
|
|
2041 | #else |
|
|
2042 | ccol1 = Color_fg; |
|
|
2043 | #endif |
|
|
2044 | |
|
|
2045 | #ifndef NO_CURSORCOLOR |
|
|
2046 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2047 | ccol2 = Color_cursor2; |
|
|
2048 | else |
|
|
2049 | #endif |
|
|
2050 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2051 | ccol2 = bgcolor_of (rstyle); |
|
|
2052 | #else |
|
|
2053 | ccol2 = Color_bg; |
|
|
2054 | #endif |
|
|
2055 | |
2028 | if (showcursor && focus) |
2056 | if (showcursor && focus) |
2029 | { |
2057 | { |
2030 | if (OPTION (Opt_cursorUnderline)) |
2058 | if (option (Opt_cursorUnderline)) |
2031 | *crp ^= RS_Uline; |
2059 | *crp ^= RS_Uline; |
2032 | else |
2060 | else |
2033 | { |
2061 | { |
2034 | *crp ^= RS_RVid; |
2062 | *crp ^= RS_RVid; |
2035 | |
|
|
2036 | #ifndef NO_CURSORCOLOR |
|
|
2037 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2038 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2039 | ccol1 = Color_cursor; |
|
|
2040 | else |
|
|
2041 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2042 | ccol1 = fgcolor_of (rstyle); |
|
|
2043 | #else |
|
|
2044 | ccol1 = Color_fg; |
|
|
2045 | #endif |
|
|
2046 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2047 | ccol2 = Color_cursor2; |
|
|
2048 | else |
|
|
2049 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2050 | ccol2 = bgcolor_of (rstyle); |
|
|
2051 | #else |
|
|
2052 | ccol2 = Color_bg; |
|
|
2053 | #endif |
|
|
2054 | *crp = SET_FGCOLOR (*crp, ccol1); |
2063 | *crp = SET_FGCOLOR (*crp, ccol1); |
2055 | *crp = SET_BGCOLOR (*crp, ccol2); |
2064 | *crp = SET_BGCOLOR (*crp, ccol2); |
2056 | #endif |
|
|
2057 | } |
2065 | } |
2058 | } |
2066 | } |
2059 | } |
2067 | } |
2060 | |
2068 | |
2061 | /* make sure no outline cursor is left around */ |
2069 | /* make sure no outline cursor is left around */ |
… | |
… | |
2100 | * D: CopyArea pass - very useful for slower links |
2108 | * D: CopyArea pass - very useful for slower links |
2101 | * This has been deliberately kept simple. |
2109 | * This has been deliberately kept simple. |
2102 | */ |
2110 | */ |
2103 | if (!display->is_local |
2111 | if (!display->is_local |
2104 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2112 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2105 | && abs (num_scr) < nrow && !must_clear) |
2113 | && abs (num_scr) < nrow && !have_bg) |
2106 | { |
2114 | { |
2107 | int16_t nits; |
2115 | int16_t nits; |
|
|
2116 | int i = num_scr; |
2108 | int j; |
2117 | int j; |
2109 | int len, wlen; |
2118 | int len, wlen; |
2110 | dLocal (int, num_scr); |
2119 | dLocal (int, num_scr); |
2111 | |
2120 | |
2112 | j = nrow; |
2121 | j = nrow; |
2113 | wlen = len = -1; |
2122 | wlen = len = -1; |
2114 | row = i > 0 ? 0 : j - 1; |
2123 | row = i > 0 ? 0 : j - 1; |
|
|
2124 | |
2115 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2125 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2116 | { |
2126 | { |
2117 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2127 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2118 | { |
2128 | { |
2119 | line_t s = ROW(view_start + row); |
2129 | line_t s = ROW(view_start + row); |
… | |
… | |
2140 | wlen = row; |
2150 | wlen = row; |
2141 | continue; |
2151 | continue; |
2142 | } |
2152 | } |
2143 | } |
2153 | } |
2144 | |
2154 | |
2145 | if (len != -1) |
2155 | if (len >= 0) |
2146 | { |
2156 | { |
2147 | /* also comes here at end if needed because of >= above */ |
2157 | /* also comes here at end if needed because of >= above */ |
2148 | if (wlen < len) |
2158 | if (wlen < len) |
2149 | ::swap (wlen, len); |
2159 | ::swap (wlen, len); |
2150 | |
2160 | |
|
|
2161 | XGCValues gcv; |
|
|
2162 | |
|
|
2163 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2151 | XCopyArea (display->display, vt, vt, |
2164 | XCopyArea (dpy, vt, vt, |
2152 | gc, 0, Row2Pixel (len + i), |
2165 | gc, 0, Row2Pixel (len + i), |
2153 | (unsigned int)this->width, |
2166 | (unsigned int)this->width, |
2154 | (unsigned int)Height2Pixel (wlen - len + 1), |
2167 | (unsigned int)Height2Pixel (wlen - len + 1), |
2155 | 0, Row2Pixel (len)); |
2168 | 0, Row2Pixel (len)); |
|
|
2169 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2170 | |
2156 | len = -1; |
2171 | len = -1; |
2157 | } |
2172 | } |
2158 | } |
2173 | } |
2159 | } |
2174 | } |
2160 | #endif |
2175 | #endif |
… | |
… | |
2216 | count++; |
2231 | count++; |
2217 | |
2232 | |
2218 | if (stp[col] != dtp[col] |
2233 | if (stp[col] != dtp[col] |
2219 | || !RS_SAME (srp[col], drp[col])) |
2234 | || !RS_SAME (srp[col], drp[col])) |
2220 | { |
2235 | { |
2221 | if (must_clear && (i++ > count / 2)) |
2236 | if (have_bg && (i++ > count / 2)) |
2222 | break; |
2237 | break; |
2223 | |
2238 | |
2224 | dtp[col] = stp[col]; |
2239 | dtp[col] = stp[col]; |
2225 | drp[col] = rend; |
2240 | drp[col] = rend; |
2226 | i = 0; |
2241 | i = 0; |
2227 | } |
2242 | } |
2228 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2243 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2229 | break; |
2244 | break; |
2230 | } |
2245 | } |
2231 | |
2246 | |
2232 | col--; /* went one too far. move back */ |
2247 | col--; /* went one too far. move back */ |
2233 | count -= i; /* dump any matching trailing chars */ |
2248 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2243 | int back = bgcolor_of (rend); // desired background |
2258 | int back = bgcolor_of (rend); // desired background |
2244 | |
2259 | |
2245 | // only do special processing if any attributes are set, which is unlikely |
2260 | // only do special processing if any attributes are set, which is unlikely |
2246 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2261 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2247 | { |
2262 | { |
2248 | #if ENABLE_STYLES |
|
|
2249 | // "careful" (too wide) character handling |
|
|
2250 | |
|
|
2251 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2252 | while (text > stp |
|
|
2253 | && srp[text - stp - 1] & RS_Careful |
|
|
2254 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2255 | text--, count++, xpixel -= fwidth; |
|
|
2256 | |
|
|
2257 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2258 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2259 | drp[col + i + 1] = ~srp[col + i + 1]; |
|
|
2260 | |
|
|
2261 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2262 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2263 | drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; |
|
|
2264 | #endif |
|
|
2265 | |
|
|
2266 | bool invert = rend & RS_RVid; |
2263 | bool invert = rend & RS_RVid; |
2267 | |
2264 | |
2268 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2265 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2269 | if (rend & RS_Bold |
2266 | if (rend & RS_Bold |
2270 | && fore == Color_fg) |
2267 | && fore == Color_fg) |
… | |
… | |
2286 | else |
2283 | else |
2287 | invert = !invert; |
2284 | invert = !invert; |
2288 | # endif |
2285 | # endif |
2289 | } |
2286 | } |
2290 | |
2287 | |
2291 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2288 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2292 | fore = Color_UL; |
2289 | fore = Color_UL; |
2293 | #endif |
2290 | #endif |
2294 | |
2291 | |
2295 | if (invert) |
2292 | if (invert) |
2296 | { |
2293 | { |
|
|
2294 | #ifdef OPTION_HC |
|
|
2295 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2296 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2297 | #endif |
|
|
2298 | /* invert the column if no highlightColor is set or it is the |
|
|
2299 | * current cursor column */ |
2297 | ::swap (fore, back); |
2300 | ::swap (fore, back); |
|
|
2301 | #ifdef OPTION_HC |
|
|
2302 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2303 | back = Color_HC; |
|
|
2304 | #endif |
2298 | |
2305 | |
2299 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2306 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2307 | # ifndef OPTION_HC |
2300 | if (ISSET_PIXCOLOR (Color_RV)) |
2308 | if (ISSET_PIXCOLOR (Color_RV)) |
2301 | back = Color_RV; |
2309 | back = Color_RV; |
2302 | |
2310 | # endif |
2303 | if (fore == back) |
2311 | if (fore == back) |
2304 | { |
2312 | { |
2305 | fore = Color_bg; |
2313 | fore = Color_bg; |
2306 | back = Color_fg; |
2314 | back = Color_fg; |
2307 | } |
2315 | } |
… | |
… | |
2318 | } |
2326 | } |
2319 | else if (hidden_text) |
2327 | else if (hidden_text) |
2320 | fore = back; |
2328 | fore = back; |
2321 | } |
2329 | } |
2322 | #endif |
2330 | #endif |
|
|
2331 | |
|
|
2332 | #if ENABLE_STYLES |
|
|
2333 | // "careful" (too wide) character handling |
|
|
2334 | |
|
|
2335 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2336 | while (text > stp |
|
|
2337 | && srp[text - stp - 1] & RS_Careful |
|
|
2338 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2339 | text--, count++, xpixel -= fwidth; |
|
|
2340 | |
|
|
2341 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2342 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2343 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2344 | |
|
|
2345 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2346 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2347 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2348 | #endif |
2323 | } |
2349 | } |
2324 | |
2350 | |
2325 | /* |
2351 | /* |
2326 | * Actually do the drawing of the string here |
2352 | * Actually do the drawing of the string here |
2327 | */ |
2353 | */ |
2328 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2354 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2329 | |
2355 | |
2330 | if (back == fore) |
|
|
2331 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2332 | fwidth * count, fheight, |
|
|
2333 | back); |
|
|
2334 | else if (back == Color_bg) |
2356 | if (have_bg && back == Color_bg) |
2335 | { |
2357 | { |
2336 | if (must_clear) |
2358 | // this is very ugly, maybe push it into ->draw? |
2337 | { |
|
|
2338 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2339 | |
2359 | |
2340 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2360 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2341 | if (text[i] != ' ') |
2361 | if (text[i] != ' ') |
2342 | { |
2362 | { |
2343 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2363 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2344 | break; |
2364 | goto did_clear; |
2345 | } |
|
|
2346 | } |
2365 | } |
2347 | else |
2366 | |
2348 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2367 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2368 | did_clear: ; |
2349 | } |
2369 | } |
2350 | else |
2370 | else |
2351 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2371 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2352 | |
2372 | |
2353 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2373 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2354 | { |
2374 | { |
2355 | #if ENABLE_FRILLS |
2375 | #if ENABLE_FRILLS |
2356 | if (ISSET_PIXCOLOR (Color_underline)) |
2376 | if (ISSET_PIXCOLOR (Color_underline)) |
2357 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2377 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2358 | else |
2378 | else |
2359 | #endif |
2379 | #endif |
2360 | XSetForeground (display->display, gc, pix_colors[fore]); |
2380 | XSetForeground (dpy, gc, pix_colors[fore]); |
2361 | |
2381 | |
2362 | XDrawLine (display->display, drawBuffer, gc, |
2382 | XDrawLine (dpy, drawBuffer, gc, |
2363 | xpixel, ypixel + font->ascent + 1, |
2383 | xpixel, ypixel + font->ascent + 1, |
2364 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2384 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2365 | } |
2385 | } |
2366 | } /* for (col....) */ |
2386 | } /* for (col....) */ |
2367 | } /* for (row....) */ |
2387 | } /* for (row....) */ |
… | |
… | |
2376 | */ |
2396 | */ |
2377 | if (showcursor) |
2397 | if (showcursor) |
2378 | { |
2398 | { |
2379 | if (focus) |
2399 | if (focus) |
2380 | { |
2400 | { |
2381 | if (OPTION (Opt_cursorUnderline)) |
2401 | if (option (Opt_cursorUnderline)) |
2382 | *crp ^= RS_Uline; |
2402 | *crp ^= RS_Uline; |
2383 | else |
2403 | else |
2384 | { |
2404 | { |
2385 | *crp ^= RS_RVid; |
2405 | *crp ^= RS_RVid; |
2386 | #ifndef NO_CURSORCOLOR |
2406 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2400 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2420 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2401 | cursorwidth++; |
2421 | cursorwidth++; |
2402 | |
2422 | |
2403 | #ifndef NO_CURSORCOLOR |
2423 | #ifndef NO_CURSORCOLOR |
2404 | if (ISSET_PIXCOLOR (Color_cursor)) |
2424 | if (ISSET_PIXCOLOR (Color_cursor)) |
2405 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2425 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2426 | else |
2406 | #endif |
2427 | #endif |
|
|
2428 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2407 | |
2429 | |
2408 | XDrawRectangle (display->display, drawBuffer, gc, |
2430 | XDrawRectangle (dpy, drawBuffer, gc, |
2409 | Col2Pixel (col), |
2431 | Col2Pixel (col), |
2410 | Row2Pixel (oldcursor.row), |
2432 | Row2Pixel (oldcursor.row), |
2411 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2433 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2412 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2434 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2413 | } |
2435 | } |
… | |
… | |
2448 | } |
2470 | } |
2449 | |
2471 | |
2450 | void |
2472 | void |
2451 | rxvt_term::scr_recolour () NOTHROW |
2473 | rxvt_term::scr_recolour () NOTHROW |
2452 | { |
2474 | { |
2453 | if (1 |
2475 | #ifdef HAVE_BG_PIXMAP |
2454 | #if TRANSPARENT |
2476 | bgPixmap.apply (); |
2455 | && !am_transparent |
2477 | #else |
2456 | #endif |
|
|
2457 | #if XPM_BACKGROUND |
|
|
2458 | && !bgPixmap.pixmap |
|
|
2459 | #endif |
|
|
2460 | ) |
|
|
2461 | { |
|
|
2462 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2478 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2463 | XClearWindow (display->display, parent[0]); |
2479 | XClearWindow (dpy, parent[0]); |
2464 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2480 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2465 | #if HAVE_SCROLLBARS |
2481 | # if HAVE_SCROLLBARS |
2466 | if (scrollBar.win) |
2482 | if (scrollBar.win) |
2467 | { |
2483 | { |
2468 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2484 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2469 | scrollBar.setIdle (); |
2485 | scrollBar.setIdle (); |
2470 | scrollbar_show (0); |
2486 | scrollbar_show (0); |
2471 | } |
2487 | } |
2472 | #endif |
2488 | # endif |
2473 | } |
|
|
2474 | |
|
|
2475 | scr_clear (); |
2489 | scr_clear (); |
2476 | scr_touch (true); |
2490 | scr_touch (true); |
2477 | want_refresh = 1; |
2491 | want_refresh = 1; |
|
|
2492 | #endif |
|
|
2493 | |
2478 | } |
2494 | } |
2479 | |
2495 | |
2480 | /* ------------------------------------------------------------------------- */ |
2496 | /* ------------------------------------------------------------------------- */ |
2481 | void |
2497 | void |
2482 | rxvt_term::scr_clear (bool really) NOTHROW |
2498 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2486 | |
2502 | |
2487 | num_scr_allow = 0; |
2503 | num_scr_allow = 0; |
2488 | want_refresh = 1; |
2504 | want_refresh = 1; |
2489 | |
2505 | |
2490 | if (really) |
2506 | if (really) |
2491 | XClearWindow (display->display, vt); |
2507 | XClearWindow (dpy, vt); |
2492 | } |
2508 | } |
2493 | |
2509 | |
2494 | void |
2510 | void |
2495 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2511 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2496 | { |
2512 | { |
… | |
… | |
2545 | { |
2561 | { |
2546 | if (selection.op |
2562 | if (selection.op |
2547 | && current_screen == selection.screen |
2563 | && current_screen == selection.screen |
2548 | && selection.end.row >= view_start) |
2564 | && selection.end.row >= view_start) |
2549 | { |
2565 | { |
2550 | #if ENABLE_FRILLS |
2566 | #if !ENABLE_MINIMAL |
2551 | if (selection.rect) |
2567 | if (selection.rect) |
2552 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2568 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2553 | selection.end.row, selection.end.col, |
2569 | selection.end.row, selection.end.col, |
2554 | RS_RVid, RS_RVid | RS_Uline); |
2570 | RS_RVid, RS_RVid | RS_Uline); |
2555 | else |
2571 | else |
… | |
… | |
2671 | } |
2687 | } |
2672 | |
2688 | |
2673 | unsigned long bytes_after; |
2689 | unsigned long bytes_after; |
2674 | XTextProperty ct; |
2690 | XTextProperty ct; |
2675 | |
2691 | |
2676 | if (XGetWindowProperty (display->display, win, prop, |
2692 | if (XGetWindowProperty (dpy, win, prop, |
2677 | 0, PROP_SIZE / 4, |
2693 | 0, PROP_SIZE / 4, |
2678 | delete_prop, AnyPropertyType, |
2694 | delete_prop, AnyPropertyType, |
2679 | &ct.encoding, &ct.format, |
2695 | &ct.encoding, &ct.format, |
2680 | &ct.nitems, &bytes_after, |
2696 | &ct.nitems, &bytes_after, |
2681 | &ct.value) != Success) |
2697 | &ct.value) != Success) |
… | |
… | |
2690 | if (bytes_after) |
2706 | if (bytes_after) |
2691 | { |
2707 | { |
2692 | // fetch and append remaining data |
2708 | // fetch and append remaining data |
2693 | XTextProperty ct2; |
2709 | XTextProperty ct2; |
2694 | |
2710 | |
2695 | if (XGetWindowProperty (display->display, win, prop, |
2711 | if (XGetWindowProperty (dpy, win, prop, |
2696 | ct.nitems / 4, (bytes_after + 3) / 4, |
2712 | ct.nitems / 4, (bytes_after + 3) / 4, |
2697 | delete_prop, AnyPropertyType, |
2713 | delete_prop, AnyPropertyType, |
2698 | &ct2.encoding, &ct2.format, |
2714 | &ct2.encoding, &ct2.format, |
2699 | &ct2.nitems, &bytes_after, |
2715 | &ct2.nitems, &bytes_after, |
2700 | &ct2.value) != Success) |
2716 | &ct2.value) != Success) |
… | |
… | |
2713 | |
2729 | |
2714 | if (ct.encoding == xa[XA_INCR]) |
2730 | if (ct.encoding == xa[XA_INCR]) |
2715 | { |
2731 | { |
2716 | // INCR selection, start handshake |
2732 | // INCR selection, start handshake |
2717 | if (!delete_prop) |
2733 | if (!delete_prop) |
2718 | XDeleteProperty (display->display, win, prop); |
2734 | XDeleteProperty (dpy, win, prop); |
2719 | |
2735 | |
2720 | selection_wait = Sel_incr; |
2736 | selection_wait = Sel_incr; |
2721 | incr_buf_fill = 0; |
2737 | incr_buf_fill = 0; |
2722 | incr_ev.start (NOW + 10); |
2738 | incr_ev.start (NOW + 10); |
2723 | |
2739 | |
… | |
… | |
2770 | } |
2786 | } |
2771 | |
2787 | |
2772 | char **cl; |
2788 | char **cl; |
2773 | int cr; |
2789 | int cr; |
2774 | |
2790 | |
2775 | #if ENABLE_FRILLS |
2791 | #if !ENABLE_MINIMAL |
2776 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2792 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2777 | // so recode it manually |
2793 | // so recode it manually |
2778 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2794 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2779 | { |
2795 | { |
2780 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2796 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2784 | paste (s, strlen (s)); |
2800 | paste (s, strlen (s)); |
2785 | free (s); |
2801 | free (s); |
2786 | } |
2802 | } |
2787 | else |
2803 | else |
2788 | #endif |
2804 | #endif |
2789 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2805 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2790 | && cl) |
2806 | && cl) |
2791 | { |
2807 | { |
2792 | for (int i = 0; i < cr; i++) |
2808 | for (int i = 0; i < cr; i++) |
2793 | paste (cl[i], strlen (cl[i])); |
2809 | paste (cl[i], strlen (cl[i])); |
2794 | |
2810 | |
… | |
… | |
2876 | else if (selnum == Sel_Secondary) |
2892 | else if (selnum == Sel_Secondary) |
2877 | sel = XA_SECONDARY; |
2893 | sel = XA_SECONDARY; |
2878 | else |
2894 | else |
2879 | sel = xa[XA_CLIPBOARD]; |
2895 | sel = xa[XA_CLIPBOARD]; |
2880 | |
2896 | |
2881 | if (XGetSelectionOwner (display->display, sel) != None) |
2897 | if (XGetSelectionOwner (dpy, sel) != None) |
2882 | { |
2898 | { |
2883 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2899 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2884 | vt, selection_request_time); |
2900 | vt, selection_request_time); |
2885 | return 1; |
2901 | return 1; |
2886 | } |
2902 | } |
2887 | |
2903 | |
2888 | return 0; |
2904 | return 0; |
… | |
… | |
2951 | |
2967 | |
2952 | int end_col; |
2968 | int end_col; |
2953 | |
2969 | |
2954 | for (; row <= selection.end.row; row++, col = 0) |
2970 | for (; row <= selection.end.row; row++, col = 0) |
2955 | { |
2971 | { |
2956 | #if ENABLE_FRILLS |
2972 | #if !ENABLE_MINIMAL |
2957 | if (selection.rect) |
2973 | if (selection.rect) |
2958 | { |
2974 | { |
2959 | col = selection.beg.col; |
2975 | col = selection.beg.col; |
2960 | end_col = ncol + 1; |
2976 | end_col = ncol + 1; |
2961 | } |
2977 | } |
… | |
… | |
2964 | end_col = ROW(row).l; |
2980 | end_col = ROW(row).l; |
2965 | |
2981 | |
2966 | col = max (col, 0); |
2982 | col = max (col, 0); |
2967 | |
2983 | |
2968 | if (row == selection.end.row |
2984 | if (row == selection.end.row |
2969 | #if ENABLE_FRILLS |
2985 | #if !ENABLE_MINIMAL |
2970 | || selection.rect |
2986 | || selection.rect |
2971 | #endif |
2987 | #endif |
2972 | ) |
2988 | ) |
2973 | min_it (end_col, selection.end.col); |
2989 | min_it (end_col, selection.end.col); |
2974 | |
2990 | |
… | |
… | |
2997 | #endif |
3013 | #endif |
2998 | else |
3014 | else |
2999 | new_selection_text[ofs++] = *t++; |
3015 | new_selection_text[ofs++] = *t++; |
3000 | } |
3016 | } |
3001 | |
3017 | |
3002 | #if ENABLE_FRILLS |
3018 | #if !ENABLE_MINIMAL |
3003 | if (selection.rect) |
3019 | if (selection.rect) |
3004 | { |
3020 | { |
3005 | while (ofs |
3021 | while (ofs |
3006 | && new_selection_text[ofs - 1] != C0_LF |
3022 | && new_selection_text[ofs - 1] != C0_LF |
3007 | && unicode::is_space (new_selection_text[ofs - 1])) |
3023 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3041 | bool |
3057 | bool |
3042 | rxvt_term::selection_grab (Time tm) NOTHROW |
3058 | rxvt_term::selection_grab (Time tm) NOTHROW |
3043 | { |
3059 | { |
3044 | selection_time = tm; |
3060 | selection_time = tm; |
3045 | |
3061 | |
3046 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3062 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3047 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3063 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3048 | { |
3064 | { |
3049 | display->set_selection_owner (this); |
3065 | display->set_selection_owner (this); |
3050 | return true; |
3066 | return true; |
3051 | } |
3067 | } |
3052 | else |
3068 | else |
… | |
… | |
3056 | } |
3072 | } |
3057 | |
3073 | |
3058 | #if 0 |
3074 | #if 0 |
3059 | XTextProperty ct; |
3075 | XTextProperty ct; |
3060 | |
3076 | |
3061 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3077 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3062 | { |
3078 | { |
3063 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3079 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3064 | XFree (ct.value); |
3080 | XFree (ct.value); |
3065 | } |
3081 | } |
3066 | #endif |
3082 | #endif |
… | |
… | |
3368 | |
3384 | |
3369 | if (selection.clicks == 1) |
3385 | if (selection.clicks == 1) |
3370 | { |
3386 | { |
3371 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3387 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3372 | && !ROW(selection.beg.row).is_longer () |
3388 | && !ROW(selection.beg.row).is_longer () |
3373 | #if ENABLE_FRILLS |
3389 | #if !ENABLE_MINIMAL |
3374 | && !selection.rect |
3390 | && !selection.rect |
3375 | #endif |
3391 | #endif |
3376 | ) |
3392 | ) |
3377 | selection.beg.col = ncol; |
3393 | selection.beg.col = ncol; |
3378 | |
3394 | |
3379 | if ( |
3395 | if ( |
3380 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3396 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3381 | && !ROW(selection.end.row).is_longer () |
3397 | && !ROW(selection.end.row).is_longer () |
3382 | #if ENABLE_FRILLS |
3398 | #if !ENABLE_MINIMAL |
3383 | && !selection.rect |
3399 | && !selection.rect |
3384 | #endif |
3400 | #endif |
3385 | ) |
3401 | ) |
3386 | selection.end.col = ncol; |
3402 | selection.end.col = ncol; |
3387 | } |
3403 | } |
… | |
… | |
3394 | selection_delimit_word (DN, &selection.end, &selection.end); |
3410 | selection_delimit_word (DN, &selection.end, &selection.end); |
3395 | } |
3411 | } |
3396 | else if (selection.clicks == 3) |
3412 | else if (selection.clicks == 3) |
3397 | { |
3413 | { |
3398 | #if ENABLE_FRILLS |
3414 | #if ENABLE_FRILLS |
3399 | if (OPTION (Opt_tripleclickwords)) |
3415 | if (option (Opt_tripleclickwords)) |
3400 | { |
3416 | { |
3401 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3417 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3402 | |
3418 | |
3403 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3419 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3404 | { |
3420 | { |
3405 | if (!ROW(end_row).is_longer ()) |
3421 | if (!ROW(end_row).is_longer ()) |
3406 | { |
3422 | { |
3407 | selection.end.row = end_row; |
3423 | selection.end.row = end_row; |
3408 | selection.end.col = ROW(end_row).l; |
3424 | selection.end.col = ROW(end_row).l; |
|
|
3425 | # if !ENABLE_MINIMAL |
3409 | selection_remove_trailing_spaces (); |
3426 | selection_remove_trailing_spaces (); |
|
|
3427 | # endif |
3410 | break; |
3428 | break; |
3411 | } |
3429 | } |
3412 | } |
3430 | } |
3413 | } |
3431 | } |
3414 | else |
3432 | else |
… | |
… | |
3443 | selection.mark.row = selection.beg.row; |
3461 | selection.mark.row = selection.beg.row; |
3444 | selection.mark.col = selection.beg.col; |
3462 | selection.mark.col = selection.beg.col; |
3445 | } |
3463 | } |
3446 | } |
3464 | } |
3447 | |
3465 | |
3448 | #if ENABLE_FRILLS |
3466 | #if !ENABLE_MINIMAL |
3449 | if (selection.rect && selection.beg.col > selection.end.col) |
3467 | if (selection.rect && selection.beg.col > selection.end.col) |
3450 | ::swap (selection.beg.col, selection.end.col); |
3468 | ::swap (selection.beg.col, selection.end.col); |
3451 | #endif |
3469 | #endif |
3452 | } |
3470 | } |
3453 | |
3471 | |
3454 | #if ENABLE_FRILLS |
3472 | #if !ENABLE_MINIMAL |
3455 | void |
3473 | void |
3456 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3474 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3457 | { |
3475 | { |
3458 | int32_t end_col, end_row; |
3476 | int32_t end_col, end_row; |
3459 | text_t *stp; |
3477 | text_t *stp; |
… | |
… | |
3514 | */ |
3532 | */ |
3515 | void |
3533 | void |
3516 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3534 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3517 | { |
3535 | { |
3518 | XSelectionEvent ev; |
3536 | XSelectionEvent ev; |
3519 | dDisp; |
|
|
3520 | |
3537 | |
3521 | ev.type = SelectionNotify; |
3538 | ev.type = SelectionNotify; |
3522 | ev.property = None; |
3539 | ev.property = None; |
3523 | ev.display = rq.display; |
3540 | ev.display = rq.display; |
3524 | ev.requestor = rq.requestor; |
3541 | ev.requestor = rq.requestor; |
… | |
… | |
3538 | *target++ = xa[XA_COMPOUND_TEXT]; |
3555 | *target++ = xa[XA_COMPOUND_TEXT]; |
3539 | #if X_HAVE_UTF8_STRING |
3556 | #if X_HAVE_UTF8_STRING |
3540 | *target++ = xa[XA_UTF8_STRING]; |
3557 | *target++ = xa[XA_UTF8_STRING]; |
3541 | #endif |
3558 | #endif |
3542 | |
3559 | |
3543 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3560 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3544 | 32, PropModeReplace, |
3561 | 32, PropModeReplace, |
3545 | (unsigned char *)target_list, target - target_list); |
3562 | (unsigned char *)target_list, target - target_list); |
3546 | ev.property = rq.property; |
3563 | ev.property = rq.property; |
3547 | } |
3564 | } |
3548 | #if TODO // TODO |
3565 | #if TODO // TODO |
… | |
… | |
3551 | /* TODO: Handle MULTIPLE */ |
3568 | /* TODO: Handle MULTIPLE */ |
3552 | } |
3569 | } |
3553 | #endif |
3570 | #endif |
3554 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3571 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3555 | { |
3572 | { |
3556 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3573 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3557 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3574 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3558 | ev.property = rq.property; |
3575 | ev.property = rq.property; |
3559 | } |
3576 | } |
3560 | else if (rq.target == XA_STRING |
3577 | else if (rq.target == XA_STRING |
3561 | || rq.target == xa[XA_TEXT] |
3578 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3585 | style = enc_string; |
3602 | style = enc_string; |
3586 | else if (target == xa[XA_TEXT]) |
3603 | else if (target == xa[XA_TEXT]) |
3587 | style = enc_text; |
3604 | style = enc_text; |
3588 | else if (target == xa[XA_COMPOUND_TEXT]) |
3605 | else if (target == xa[XA_COMPOUND_TEXT]) |
3589 | style = enc_compound_text; |
3606 | style = enc_compound_text; |
3590 | #if ENABLE_FRILLS |
3607 | #if !ENABLE_MINIMAL |
3591 | else if (target == xa[XA_UTF8_STRING]) |
3608 | else if (target == xa[XA_UTF8_STRING]) |
3592 | style = enc_utf8; |
3609 | style = enc_utf8; |
3593 | #endif |
3610 | #endif |
3594 | else |
3611 | else |
3595 | { |
3612 | { |
… | |
… | |
3606 | { |
3623 | { |
3607 | cl = L""; |
3624 | cl = L""; |
3608 | selectlen = 0; |
3625 | selectlen = 0; |
3609 | } |
3626 | } |
3610 | |
3627 | |
3611 | #if ENABLE_FRILLS |
3628 | #if !ENABLE_MINIMAL |
3612 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3629 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3613 | // so recode it manually |
3630 | // so recode it manually |
3614 | if (style == enc_utf8) |
3631 | if (style == enc_utf8) |
3615 | { |
3632 | { |
3616 | freect = 1; |
3633 | freect = 1; |
… | |
… | |
3619 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3636 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3620 | ct.nitems = strlen ((char *)ct.value); |
3637 | ct.nitems = strlen ((char *)ct.value); |
3621 | } |
3638 | } |
3622 | else |
3639 | else |
3623 | #endif |
3640 | #endif |
3624 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3641 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3625 | freect = 1; |
3642 | freect = 1; |
3626 | else |
3643 | else |
3627 | { |
3644 | { |
3628 | /* if we failed to convert then send it raw */ |
3645 | /* if we failed to convert then send it raw */ |
3629 | ct.value = (unsigned char *)cl; |
3646 | ct.value = (unsigned char *)cl; |
3630 | ct.nitems = selectlen; |
3647 | ct.nitems = selectlen; |
3631 | ct.encoding = target; |
3648 | ct.encoding = target; |
3632 | } |
3649 | } |
3633 | |
3650 | |
3634 | XChangeProperty (disp, rq.requestor, rq.property, |
3651 | XChangeProperty (dpy, rq.requestor, rq.property, |
3635 | ct.encoding, 8, PropModeReplace, |
3652 | ct.encoding, 8, PropModeReplace, |
3636 | ct.value, (int)ct.nitems); |
3653 | ct.value, (int)ct.nitems); |
3637 | ev.property = rq.property; |
3654 | ev.property = rq.property; |
3638 | |
3655 | |
3639 | if (freect) |
3656 | if (freect) |
3640 | XFree (ct.value); |
3657 | XFree (ct.value); |
3641 | } |
3658 | } |
3642 | |
3659 | |
3643 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3660 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3644 | } |
3661 | } |
3645 | |
3662 | |
3646 | /* ------------------------------------------------------------------------- * |
3663 | /* ------------------------------------------------------------------------- * |
3647 | * MOUSE ROUTINES * |
3664 | * MOUSE ROUTINES * |
3648 | * ------------------------------------------------------------------------- */ |
3665 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3664 | void |
3681 | void |
3665 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3682 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3666 | { |
3683 | { |
3667 | XWindowAttributes xwa; |
3684 | XWindowAttributes xwa; |
3668 | |
3685 | |
3669 | XGetWindowAttributes (display->display, vt, &xwa); |
3686 | XGetWindowAttributes (dpy, vt, &xwa); |
3670 | |
3687 | |
3671 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3688 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3672 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3689 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3673 | } |
3690 | } |
3674 | #endif |
3691 | #endif |