ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.260 by root, Sat Feb 18 15:24:39 2006 UTC

… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
… …
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
… …
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
181 //TODO//FIXME 184 //TODO//FIXME
182 saveLines++; 185 saveLines++;
183 prev_nrow--; 186 prev_nrow--;
184 top_row--; 187 top_row--;
… …
195 if (!row_buf) 198 if (!row_buf)
196 { 199 {
197 /* 200 /*
198 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
199 */ 202 */
200 top_row = 0; /* no saved lines */ 203 top_row = 0;
201 term_start = 0; 204 term_start = 0;
202 205
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 208
… …
280 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
282 285
283 if (top_row) 286 if (top_row)
284 { 287 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
287 290
288 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 293
… …
347 350
348 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
349 352
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 354
352#if DEBUG_STRICT
353 assert (len);
354 assert (pline.t);
355#endif
356
357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 357
360 lofs += len; 358 lofs += len;
361 qcol += len; 359 qcol += len;
… …
401 delete old_ra; 399 delete old_ra;
402 400
403 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
405 403
406 if (tabs)
407 free (tabs); 404 free (tabs);
408 } 405 }
409 406
410 CLEAR_ALL_SELECTION (); 407 CLEAR_ALL_SELECTION ();
411 408
412 prev_nrow = nrow; 409 prev_nrow = nrow;
… …
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416 413
417 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
418 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
419 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
420 tt_winch (); 420 tt_winch ();
421 421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 423}
424 424
… …
427 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
428 */ 428 */
429void 429void
430rxvt_term::scr_release () NOTHROW 430rxvt_term::scr_release () NOTHROW
431{ 431{
432 if (row_buf)
433 {
432 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
434 436
435 free (row_buf); 437 free (row_buf);
436 free (swap_buf); 438 free (swap_buf);
437 free (drawn_buf); 439 free (drawn_buf);
438 free (tabs); 440 free (tabs);
439 441
440 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
441} 444}
442 445
443/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
444/* 447/*
445 * Hard reset 448 * Hard reset
446 */ 449 */
447void 450void
448rxvt_term::scr_poweron () NOTHROW 451rxvt_term::scr_poweron ()
449{ 452{
450 scr_release (); 453 scr_release ();
451 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
452 scr_reset (); 455 scr_reset ();
453 456
… …
504 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
506#endif 509#endif
507} 510}
508 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
509/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
510/* 528/*
511 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 532 */
515int 533void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 534rxvt_term::scr_change_screen (int scrn)
517{ 535{
536 if (scrn == current_screen)
537 return;
538
518 want_refresh = 1; 539 want_refresh = 1;
519 view_start = 0; 540 view_start = 0;
520 541
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
525 543
526 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
527
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533 545
534#if NSCREENS 546#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
536 { 548 {
537 num_scr = 0; 549 num_scr = 0;
538 550
539 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 552
542 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
546 } 557 }
547 else 558 else
548#endif 559#endif
549 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 562}
554 563
555// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
556void 565void
557rxvt_term::scr_do_wrap () NOTHROW 566rxvt_term::scr_do_wrap () NOTHROW
… …
632 } 641 }
633 642
634 // erase newly scrolled-in lines 643 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 644 for (int i = count; i--; )
636 { 645 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i); 646 line_t &l = ROW(nrow - 1 - i);
640 647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 {
641 scr_blank_line (l, 0, l.l, rstyle); 652 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 653 l.l = 0;
644 l.f = 0; 654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
645 } 658 }
646 659
647 // now copy lines below the scroll region bottom to the 660 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 661 // bottom of the screen again, so they look as if they
649 // hadn't moved. 662 // hadn't moved.
… …
749 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
750 763
751 if (minlines > 0) 764 if (minlines > 0)
752 { 765 {
753 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
754 768
755 if (minlines > 0 769 if (minlines > 0
756 && screen.tscroll == 0 770 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
758 { 772 {
… …
832 846
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835 c = 0xfffd; 849 c = 0xfffd;
836 850
837 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
839 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
840 // locale. 854 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
842 856
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
844 { 858 {
845 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 860 // 5f-7e standard vt100
… …
1100 * Process DEC Back Index 1114 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1104 */ 1118 */
1105#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1106void 1120void
1107rxvt_term::scr_backindex () NOTHROW 1121rxvt_term::scr_backindex () NOTHROW
1108{ 1122{
1109 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1131 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1121 */ 1135 */
1122#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1123void 1137void
1124rxvt_term::scr_forwardindex () NOTHROW 1138rxvt_term::scr_forwardindex () NOTHROW
1125{ 1139{
1126 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1328 } 1342 }
1329 else 1343 else
1330 { 1344 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1335 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1337 } 1351 }
1338 1352
1339 for (; num--; row++) 1353 for (; num--; row++)
1340 { 1354 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1357 }
1344} 1358}
1345 1359
1346#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1347void 1361void
1348rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1363{
1350 want_refresh = 1; 1364 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1640 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1641#endif 1655#endif
1642#if TRANSPARENT 1656#if TRANSPARENT
1643 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1644#endif 1658#endif
1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1646 1660
1647 XGCValues gcvalue; 1661 XGCValues gcvalue;
1648 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1649 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1651 1665
1652 scr_clear (); 1666 scr_clear ();
1653 scr_touch (true); 1667 scr_touch (true);
1654 } 1668 }
1655} 1669}
… …
1740{ 1754{
1741 bool found = false; 1755 bool found = false;
1742 1756
1743 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1744 { 1758 {
1745 int col = 0;
1746 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1747 1760
1748 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1749 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1750 { 1763 {
1751 found = true; 1764 found = true;
1752 *drp = ~value; 1765 *drp = ~value;
1753 } 1766 }
… …
1875 1888
1876# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1878 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1879# endif 1892# endif
1880 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1881# endif 1894# endif
1882 1895
1883 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1884 { 1897 {
1885 rvideo_bell = true; 1898 rvideo_bell = true;
… …
1887 display->flush (); 1900 display->flush ();
1888 1901
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1890 } 1903 }
1891 else 1904 else
1892 XBell (display->display, 0); 1905 XBell (dpy, 0);
1893 1906
1894#endif 1907#endif
1895} 1908}
1896 1909
1897/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
… …
1956 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1957 */ 1970 */
1958void 1971void
1959rxvt_term::scr_refresh () NOTHROW 1972rxvt_term::scr_refresh () NOTHROW
1960{ 1973{
1961 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1962 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1963 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1964 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1965 int i; /* tmp */ 1978 int i; /* tmp */
1966#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
… …
1974 return; 1987 return;
1975 1988
1976 /* 1989 /*
1977 * A: set up vars 1990 * A: set up vars
1978 */ 1991 */
1979 must_clear = 0; 1992 have_bg = 0;
1980 refresh_count = 0; 1993 refresh_count = 0;
1981 1994
1982#if XPM_BACKGROUND 1995#if XPM_BACKGROUND
1983 must_clear |= bgPixmap.pixmap != None; 1996 have_bg |= bgPixmap.pixmap != None;
1984#endif 1997#endif
1985#if TRANSPARENT 1998#if TRANSPARENT
1986 must_clear |= OPTION (Opt_transparent) && am_transparent; 1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
1987#endif 2000#endif
1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1989 2002
1990 /* 2003 /*
1991 * B: reverse any characters which are selected 2004 * B: reverse any characters which are selected
… …
2090 * D: CopyArea pass - very useful for slower links 2103 * D: CopyArea pass - very useful for slower links
2091 * This has been deliberately kept simple. 2104 * This has been deliberately kept simple.
2092 */ 2105 */
2093 if (!display->is_local 2106 if (!display->is_local
2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2095 && abs (num_scr) < nrow && !must_clear) 2108 && abs (num_scr) < nrow && !have_bg)
2096 { 2109 {
2097 int16_t nits; 2110 int16_t nits;
2098 int j; 2111 int j;
2099 int len, wlen; 2112 int len, wlen;
2100 dLocal (int, num_scr); 2113 dLocal (int, num_scr);
… …
2136 { 2149 {
2137 /* also comes here at end if needed because of >= above */ 2150 /* also comes here at end if needed because of >= above */
2138 if (wlen < len) 2151 if (wlen < len)
2139 ::swap (wlen, len); 2152 ::swap (wlen, len);
2140 2153
2154 XGCValues gcv;
2155
2156 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2141 XCopyArea (display->display, vt, vt, 2157 XCopyArea (dpy, vt, vt,
2142 gc, 0, Row2Pixel (len + i), 2158 gc, 0, Row2Pixel (len + i),
2143 (unsigned int)this->width, 2159 (unsigned int)this->width,
2144 (unsigned int)Height2Pixel (wlen - len + 1), 2160 (unsigned int)Height2Pixel (wlen - len + 1),
2145 0, Row2Pixel (len)); 2161 0, Row2Pixel (len));
2162 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2163
2146 len = -1; 2164 len = -1;
2147 } 2165 }
2148 } 2166 }
2149 } 2167 }
2150#endif 2168#endif
… …
2206 count++; 2224 count++;
2207 2225
2208 if (stp[col] != dtp[col] 2226 if (stp[col] != dtp[col]
2209 || !RS_SAME (srp[col], drp[col])) 2227 || !RS_SAME (srp[col], drp[col]))
2210 { 2228 {
2211 if (must_clear && (i++ > count / 2)) 2229 if (have_bg && (i++ > count / 2))
2212 break; 2230 break;
2213 2231
2214 dtp[col] = stp[col]; 2232 dtp[col] = stp[col];
2215 drp[col] = rend; 2233 drp[col] = rend;
2216 i = 0; 2234 i = 0;
2217 } 2235 }
2218 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2236 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2219 break; 2237 break;
2220 } 2238 }
2221 2239
2222 col--; /* went one too far. move back */ 2240 col--; /* went one too far. move back */
2223 count -= i; /* dump any matching trailing chars */ 2241 count -= i; /* dump any matching trailing chars */
… …
2234 2252
2235 // only do special processing if any attributes are set, which is unlikely 2253 // only do special processing if any attributes are set, which is unlikely
2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2254 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2237 { 2255 {
2238#if ENABLE_STYLES 2256#if ENABLE_STYLES
2239 // force redraw after "careful" characters to avoid pixel droppings 2257 // "careful" (too wide) character handling
2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2241 drp[col + 1] = ~srp[col + 1];
2242 2258
2243 // include previous careful character(s) if possible, looks nicer (best effort...) 2259 // include previous careful character(s) if possible, looks nicer (best effort...)
2244 while (text > stp 2260 while (text > stp
2245 && srp[text - stp - 1] & RS_Careful 2261 && srp[text - stp - 1] & RS_Careful
2246 && RS_SAME (rend, srp[text - stp - 1])) 2262 && RS_SAME (rend, srp[text - stp - 1]))
2247 text--, count++, xpixel -= fwidth; 2263 text--, count++, xpixel -= fwidth;
2264
2265 // force redraw after "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2267 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2268
2269 // force redraw before "careful" characters to avoid pixel droppings
2270 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2271 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2248#endif 2272#endif
2249 2273
2250 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2251 2275
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2310 * Actually do the drawing of the string here 2334 * Actually do the drawing of the string here
2311 */ 2335 */
2312 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2336 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2313 2337
2314 if (back == fore) 2338 if (back == fore)
2315 font->clear_rect (*drawable, xpixel, ypixel, 2339 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2316 fwidth * count, fheight,
2317 back);
2318 else if (back == Color_bg) 2340 else if (back == Color_bg && have_bg)
2319 { 2341 {
2320 if (must_clear) 2342 // this is very ugly, maybe push it into ->draw?
2321 {
2322 CLEAR_CHARS (xpixel, ypixel, count);
2323 2343
2324 for (i = 0; i < count; i++) /* don't draw empty strings */ 2344 for (i = 0; i < count; i++) /* don't draw empty strings */
2325 if (text[i] != ' ') 2345 if (text[i] != ' ')
2326 { 2346 {
2327 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2328 break; 2348 goto did_clear;
2329 }
2330 } 2349 }
2331 else 2350
2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2351 CLEAR_CHARS (xpixel, ypixel, count);
2352 did_clear: ;
2333 } 2353 }
2334 else 2354 else
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2336 2356
2337 if (rend & RS_Uline && font->descent > 1 && fore != back) 2357 if (rend & RS_Uline && font->descent > 1 && fore != back)
2338 { 2358 {
2339#if ENABLE_FRILLS 2359#if ENABLE_FRILLS
2340 if (ISSET_PIXCOLOR (Color_underline)) 2360 if (ISSET_PIXCOLOR (Color_underline))
2341 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2361 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2342 else 2362 else
2343#endif 2363#endif
2344 XSetForeground (display->display, gc, pix_colors[fore]); 2364 XSetForeground (dpy, gc, pix_colors[fore]);
2345 2365
2346 XDrawLine (display->display, drawBuffer, gc, 2366 XDrawLine (dpy, drawBuffer, gc,
2347 xpixel, ypixel + font->ascent + 1, 2367 xpixel, ypixel + font->ascent + 1,
2348 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2349 } 2369 }
2350 } /* for (col....) */ 2370 } /* for (col....) */
2351 } /* for (row....) */ 2371 } /* for (row....) */
… …
2384 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2405 cursorwidth++;
2386 2406
2387#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2408 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2409 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2390#endif 2410#endif
2391 2411
2392 XDrawRectangle (display->display, drawBuffer, gc, 2412 XDrawRectangle (dpy, drawBuffer, gc,
2393 Col2Pixel (col), 2413 Col2Pixel (col),
2394 Row2Pixel (oldcursor.row), 2414 Row2Pixel (oldcursor.row),
2395 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2415 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2396 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2397 } 2417 }
… …
2441#if XPM_BACKGROUND 2461#if XPM_BACKGROUND
2442 && !bgPixmap.pixmap 2462 && !bgPixmap.pixmap
2443#endif 2463#endif
2444 ) 2464 )
2445 { 2465 {
2446 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2466 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2447 XClearWindow (display->display, parent[0]); 2467 XClearWindow (dpy, parent[0]);
2448 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2468 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2449#if HAVE_SCROLLBARS 2469#if HAVE_SCROLLBARS
2450 if (scrollBar.win) 2470 if (scrollBar.win)
2451 { 2471 {
2452 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2472 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2453 scrollBar.setIdle (); 2473 scrollBar.setIdle ();
2454 scrollbar_show (0); 2474 scrollbar_show (0);
2455 } 2475 }
2456#endif 2476#endif
2457 } 2477 }
… …
2470 2490
2471 num_scr_allow = 0; 2491 num_scr_allow = 0;
2472 want_refresh = 1; 2492 want_refresh = 1;
2473 2493
2474 if (really) 2494 if (really)
2475 XClearWindow (display->display, vt); 2495 XClearWindow (dpy, vt);
2476} 2496}
2477 2497
2478void 2498void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{ 2500{
… …
2529{ 2549{
2530 if (selection.op 2550 if (selection.op
2531 && current_screen == selection.screen 2551 && current_screen == selection.screen
2532 && selection.end.row >= view_start) 2552 && selection.end.row >= view_start)
2533 { 2553 {
2534#if ENABLE_FRILLS 2554#if !ENABLE_MINIMAL
2535 if (selection.rect) 2555 if (selection.rect)
2536 scr_xor_rect (selection.beg.row, selection.beg.col, 2556 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 selection.end.row, selection.end.col, 2557 selection.end.row, selection.end.col,
2538 RS_RVid, RS_RVid | RS_Uline); 2558 RS_RVid, RS_RVid | RS_Uline);
2539 else 2559 else
… …
2655 } 2675 }
2656 2676
2657 unsigned long bytes_after; 2677 unsigned long bytes_after;
2658 XTextProperty ct; 2678 XTextProperty ct;
2659 2679
2660 if (XGetWindowProperty (display->display, win, prop, 2680 if (XGetWindowProperty (dpy, win, prop,
2661 0, PROP_SIZE / 4, 2681 0, PROP_SIZE / 4,
2662 delete_prop, AnyPropertyType, 2682 delete_prop, AnyPropertyType,
2663 &ct.encoding, &ct.format, 2683 &ct.encoding, &ct.format,
2664 &ct.nitems, &bytes_after, 2684 &ct.nitems, &bytes_after,
2665 &ct.value) != Success) 2685 &ct.value) != Success)
… …
2674 if (bytes_after) 2694 if (bytes_after)
2675 { 2695 {
2676 // fetch and append remaining data 2696 // fetch and append remaining data
2677 XTextProperty ct2; 2697 XTextProperty ct2;
2678 2698
2679 if (XGetWindowProperty (display->display, win, prop, 2699 if (XGetWindowProperty (dpy, win, prop,
2680 ct.nitems / 4, (bytes_after + 3) / 4, 2700 ct.nitems / 4, (bytes_after + 3) / 4,
2681 delete_prop, AnyPropertyType, 2701 delete_prop, AnyPropertyType,
2682 &ct2.encoding, &ct2.format, 2702 &ct2.encoding, &ct2.format,
2683 &ct2.nitems, &bytes_after, 2703 &ct2.nitems, &bytes_after,
2684 &ct2.value) != Success) 2704 &ct2.value) != Success)
… …
2697 2717
2698 if (ct.encoding == xa[XA_INCR]) 2718 if (ct.encoding == xa[XA_INCR])
2699 { 2719 {
2700 // INCR selection, start handshake 2720 // INCR selection, start handshake
2701 if (!delete_prop) 2721 if (!delete_prop)
2702 XDeleteProperty (display->display, win, prop); 2722 XDeleteProperty (dpy, win, prop);
2703 2723
2704 selection_wait = Sel_incr; 2724 selection_wait = Sel_incr;
2705 incr_buf_fill = 0; 2725 incr_buf_fill = 0;
2706 incr_ev.start (NOW + 10); 2726 incr_ev.start (NOW + 10);
2707 2727
… …
2754 } 2774 }
2755 2775
2756 char **cl; 2776 char **cl;
2757 int cr; 2777 int cr;
2758 2778
2759#if ENABLE_FRILLS 2779#if !ENABLE_MINIMAL
2760 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2780 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2761 // so recode it manually 2781 // so recode it manually
2762 if (ct.encoding == xa[XA_UTF8_STRING]) 2782 if (ct.encoding == xa[XA_UTF8_STRING])
2763 { 2783 {
2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2768 paste (s, strlen (s)); 2788 paste (s, strlen (s));
2769 free (s); 2789 free (s);
2770 } 2790 }
2771 else 2791 else
2772#endif 2792#endif
2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2793 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2774 && cl) 2794 && cl)
2775 { 2795 {
2776 for (int i = 0; i < cr; i++) 2796 for (int i = 0; i < cr; i++)
2777 paste (cl[i], strlen (cl[i])); 2797 paste (cl[i], strlen (cl[i]));
2778 2798
… …
2860 else if (selnum == Sel_Secondary) 2880 else if (selnum == Sel_Secondary)
2861 sel = XA_SECONDARY; 2881 sel = XA_SECONDARY;
2862 else 2882 else
2863 sel = xa[XA_CLIPBOARD]; 2883 sel = xa[XA_CLIPBOARD];
2864 2884
2865 if (XGetSelectionOwner (display->display, sel) != None) 2885 if (XGetSelectionOwner (dpy, sel) != None)
2866 { 2886 {
2867 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2887 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2868 vt, selection_request_time); 2888 vt, selection_request_time);
2869 return 1; 2889 return 1;
2870 } 2890 }
2871 2891
2872 return 0; 2892 return 0;
… …
2935 2955
2936 int end_col; 2956 int end_col;
2937 2957
2938 for (; row <= selection.end.row; row++, col = 0) 2958 for (; row <= selection.end.row; row++, col = 0)
2939 { 2959 {
2940#if ENABLE_FRILLS 2960#if !ENABLE_MINIMAL
2941 if (selection.rect) 2961 if (selection.rect)
2942 { 2962 {
2943 col = selection.beg.col; 2963 col = selection.beg.col;
2944 end_col = ncol + 1; 2964 end_col = ncol + 1;
2945 } 2965 }
… …
2948 end_col = ROW(row).l; 2968 end_col = ROW(row).l;
2949 2969
2950 col = max (col, 0); 2970 col = max (col, 0);
2951 2971
2952 if (row == selection.end.row 2972 if (row == selection.end.row
2953#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2954 || selection.rect 2974 || selection.rect
2955#endif 2975#endif
2956 ) 2976 )
2957 min_it (end_col, selection.end.col); 2977 min_it (end_col, selection.end.col);
2958 2978
… …
2981#endif 3001#endif
2982 else 3002 else
2983 new_selection_text[ofs++] = *t++; 3003 new_selection_text[ofs++] = *t++;
2984 } 3004 }
2985 3005
2986#if ENABLE_FRILLS 3006#if !ENABLE_MINIMAL
2987 if (selection.rect) 3007 if (selection.rect)
2988 { 3008 {
2989 while (ofs 3009 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF 3010 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1])) 3011 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3025bool 3045bool
3026rxvt_term::selection_grab (Time tm) NOTHROW 3046rxvt_term::selection_grab (Time tm) NOTHROW
3027{ 3047{
3028 selection_time = tm; 3048 selection_time = tm;
3029 3049
3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3050 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3051 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3032 { 3052 {
3033 display->set_selection_owner (this); 3053 display->set_selection_owner (this);
3034 return true; 3054 return true;
3035 } 3055 }
3036 else 3056 else
… …
3040 } 3060 }
3041 3061
3042#if 0 3062#if 0
3043 XTextProperty ct; 3063 XTextProperty ct;
3044 3064
3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3065 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3046 { 3066 {
3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3048 XFree (ct.value); 3068 XFree (ct.value);
3049 } 3069 }
3050#endif 3070#endif
… …
3352 3372
3353 if (selection.clicks == 1) 3373 if (selection.clicks == 1)
3354 { 3374 {
3355 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3375 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.beg.row).is_longer () 3376 && !ROW(selection.beg.row).is_longer ()
3357#if ENABLE_FRILLS 3377#if !ENABLE_MINIMAL
3358 && !selection.rect 3378 && !selection.rect
3359#endif 3379#endif
3360 ) 3380 )
3361 selection.beg.col = ncol; 3381 selection.beg.col = ncol;
3362 3382
3363 if ( 3383 if (
3364 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.end.row).is_longer () 3385 && !ROW(selection.end.row).is_longer ()
3366#if ENABLE_FRILLS 3386#if !ENABLE_MINIMAL
3367 && !selection.rect 3387 && !selection.rect
3368#endif 3388#endif
3369 ) 3389 )
3370 selection.end.col = ncol; 3390 selection.end.col = ncol;
3371 } 3391 }
… …
3388 { 3408 {
3389 if (!ROW(end_row).is_longer ()) 3409 if (!ROW(end_row).is_longer ())
3390 { 3410 {
3391 selection.end.row = end_row; 3411 selection.end.row = end_row;
3392 selection.end.col = ROW(end_row).l; 3412 selection.end.col = ROW(end_row).l;
3413# if !ENABLE_MINIMAL
3393 selection_remove_trailing_spaces (); 3414 selection_remove_trailing_spaces ();
3415# endif
3394 break; 3416 break;
3395 } 3417 }
3396 } 3418 }
3397 } 3419 }
3398 else 3420 else
… …
3427 selection.mark.row = selection.beg.row; 3449 selection.mark.row = selection.beg.row;
3428 selection.mark.col = selection.beg.col; 3450 selection.mark.col = selection.beg.col;
3429 } 3451 }
3430 } 3452 }
3431 3453
3432#if ENABLE_FRILLS 3454#if !ENABLE_MINIMAL
3433 if (selection.rect && selection.beg.col > selection.end.col) 3455 if (selection.rect && selection.beg.col > selection.end.col)
3434 ::swap (selection.beg.col, selection.end.col); 3456 ::swap (selection.beg.col, selection.end.col);
3435#endif 3457#endif
3436} 3458}
3437 3459
3438#if ENABLE_FRILLS 3460#if !ENABLE_MINIMAL
3439void 3461void
3440rxvt_term::selection_remove_trailing_spaces () NOTHROW 3462rxvt_term::selection_remove_trailing_spaces () NOTHROW
3441{ 3463{
3442 int32_t end_col, end_row; 3464 int32_t end_col, end_row;
3443 text_t *stp; 3465 text_t *stp;
… …
3498 */ 3520 */
3499void 3521void
3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3522rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3501{ 3523{
3502 XSelectionEvent ev; 3524 XSelectionEvent ev;
3503 dDisp;
3504 3525
3505 ev.type = SelectionNotify; 3526 ev.type = SelectionNotify;
3506 ev.property = None; 3527 ev.property = None;
3507 ev.display = rq.display; 3528 ev.display = rq.display;
3508 ev.requestor = rq.requestor; 3529 ev.requestor = rq.requestor;
… …
3522 *target++ = xa[XA_COMPOUND_TEXT]; 3543 *target++ = xa[XA_COMPOUND_TEXT];
3523#if X_HAVE_UTF8_STRING 3544#if X_HAVE_UTF8_STRING
3524 *target++ = xa[XA_UTF8_STRING]; 3545 *target++ = xa[XA_UTF8_STRING];
3525#endif 3546#endif
3526 3547
3527 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3548 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3528 32, PropModeReplace, 3549 32, PropModeReplace,
3529 (unsigned char *)target_list, target - target_list); 3550 (unsigned char *)target_list, target - target_list);
3530 ev.property = rq.property; 3551 ev.property = rq.property;
3531 } 3552 }
3532#if TODO // TODO 3553#if TODO // TODO
… …
3535 /* TODO: Handle MULTIPLE */ 3556 /* TODO: Handle MULTIPLE */
3536 } 3557 }
3537#endif 3558#endif
3538 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3559 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3539 { 3560 {
3540 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3561 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3541 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3562 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3542 ev.property = rq.property; 3563 ev.property = rq.property;
3543 } 3564 }
3544 else if (rq.target == XA_STRING 3565 else if (rq.target == XA_STRING
3545 || rq.target == xa[XA_TEXT] 3566 || rq.target == xa[XA_TEXT]
… …
3569 style = enc_string; 3590 style = enc_string;
3570 else if (target == xa[XA_TEXT]) 3591 else if (target == xa[XA_TEXT])
3571 style = enc_text; 3592 style = enc_text;
3572 else if (target == xa[XA_COMPOUND_TEXT]) 3593 else if (target == xa[XA_COMPOUND_TEXT])
3573 style = enc_compound_text; 3594 style = enc_compound_text;
3574#if ENABLE_FRILLS 3595#if !ENABLE_MINIMAL
3575 else if (target == xa[XA_UTF8_STRING]) 3596 else if (target == xa[XA_UTF8_STRING])
3576 style = enc_utf8; 3597 style = enc_utf8;
3577#endif 3598#endif
3578 else 3599 else
3579 { 3600 {
… …
3590 { 3611 {
3591 cl = L""; 3612 cl = L"";
3592 selectlen = 0; 3613 selectlen = 0;
3593 } 3614 }
3594 3615
3595#if ENABLE_FRILLS 3616#if !ENABLE_MINIMAL
3596 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3617 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3597 // so recode it manually 3618 // so recode it manually
3598 if (style == enc_utf8) 3619 if (style == enc_utf8)
3599 { 3620 {
3600 freect = 1; 3621 freect = 1;
… …
3603 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3624 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3604 ct.nitems = strlen ((char *)ct.value); 3625 ct.nitems = strlen ((char *)ct.value);
3605 } 3626 }
3606 else 3627 else
3607#endif 3628#endif
3608 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3629 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3609 freect = 1; 3630 freect = 1;
3610 else 3631 else
3611 { 3632 {
3612 /* if we failed to convert then send it raw */ 3633 /* if we failed to convert then send it raw */
3613 ct.value = (unsigned char *)cl; 3634 ct.value = (unsigned char *)cl;
3614 ct.nitems = selectlen; 3635 ct.nitems = selectlen;
3615 ct.encoding = target; 3636 ct.encoding = target;
3616 } 3637 }
3617 3638
3618 XChangeProperty (disp, rq.requestor, rq.property, 3639 XChangeProperty (dpy, rq.requestor, rq.property,
3619 ct.encoding, 8, PropModeReplace, 3640 ct.encoding, 8, PropModeReplace,
3620 ct.value, (int)ct.nitems); 3641 ct.value, (int)ct.nitems);
3621 ev.property = rq.property; 3642 ev.property = rq.property;
3622 3643
3623 if (freect) 3644 if (freect)
3624 XFree (ct.value); 3645 XFree (ct.value);
3625 } 3646 }
3626 3647
3627 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3648 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3628} 3649}
3629 3650
3630/* ------------------------------------------------------------------------- * 3651/* ------------------------------------------------------------------------- *
3631 * MOUSE ROUTINES * 3652 * MOUSE ROUTINES *
3632 * ------------------------------------------------------------------------- */ 3653 * ------------------------------------------------------------------------- */
… …
3648void 3669void
3649rxvt_term::im_set_position (XPoint &pos) NOTHROW 3670rxvt_term::im_set_position (XPoint &pos) NOTHROW
3650{ 3671{
3651 XWindowAttributes xwa; 3672 XWindowAttributes xwa;
3652 3673
3653 XGetWindowAttributes (display->display, vt, &xwa); 3674 XGetWindowAttributes (dpy, vt, &xwa);
3654 3675
3655 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3676 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3656 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3677 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3657} 3678}
3658#endif 3679#endif
… …
3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3775rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3755{ 3776{
3756 while (*s) 3777 while (*s)
3757 { 3778 {
3758 text_t t = *s++; 3779 text_t t = *s++;
3759 int width = wcwidth (t); 3780 int width = WCWIDTH (t);
3760 3781
3761 while (width--) 3782 while (width--)
3762 { 3783 {
3763 scr_overlay_set (x++, y, t); 3784 scr_overlay_set (x++, y, t);
3764 t = NOCHAR; 3785 t = NOCHAR;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines