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.309 by root, Mon Jul 21 16:51:31 2008 UTC vs.
Revision 1.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC

… …
132 132
133 l.l = 0; 133 l.l = 0;
134 l.f = 0; 134 l.f = 0;
135} 135}
136 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
137/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
140 159
141void 160void
142rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
143{ 162{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 163 view_start = 0;
150 num_scr = 0; 164 num_scr = 0;
151 165
152 if (ncol == 0) 166 if (ncol == 0)
153 ncol = 80; 167 ncol = 80;
… …
155 if (nrow == 0) 169 if (nrow == 0)
156 nrow = 24; 170 nrow = 24;
157 171
158 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 173 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 174
164 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
166 { 177 {
167 //TODO//FIXME 178 //TODO//FIXME
… …
267 278
268 if (top_row) 279 if (top_row)
269 { 280 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
272 284
273 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 287
276 do 288 do
277 { 289 {
278 p = MOD (p - 1, prev_total_rows); 290 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 291 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 292 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 293 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 294
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 296 {
… …
380 delete old_ta; 390 delete old_ta;
381 delete old_ra; 391 delete old_ra;
382 392
383 clamp_it (screen.cur.row, 0, nrow - 1); 393 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 394 clamp_it (screen.cur.col, 0, ncol - 1);
395 }
385 396
386 free (tabs); 397 free (tabs);
387 } 398 tabs = (char *)rxvt_malloc (ncol);
399
400 for (int col = ncol; --col; )
401 tabs [col] = col % TABSIZE == 0;
388 402
389 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
390 404
391 prev_nrow = nrow; 405 prev_nrow = nrow;
392 prev_ncol = ncol; 406 prev_ncol = ncol;
393
394 tabs = (char *)rxvt_malloc (ncol);
395
396 for (int col = ncol; --col; )
397 tabs [col] = col % TABSIZE == 0;
398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401 407
402 tt_winch (); 408 tt_winch ();
403 409
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 410 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 411}
… …
417 delete ralloc; ralloc = 0; 423 delete ralloc; ralloc = 0;
418 424
419 free (row_buf); 425 free (row_buf);
420 free (swap_buf); 426 free (swap_buf);
421 free (drawn_buf); 427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
422 free (tabs); 430 free (tabs);
423 431 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 432 }
426} 433}
427 434
428/* ------------------------------------------------------------------------- */ 435/* ------------------------------------------------------------------------- */
429/* 436/*
430 * Hard reset 437 * Hard/Soft reset
431 */ 438 */
432void 439void
433rxvt_term::scr_poweron () 440rxvt_term::scr_poweron ()
434{ 441{
435 scr_release (); 442 scr_release ();
436 prev_nrow = prev_ncol = 0; 443 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false;
445 scr_soft_reset ();
437 scr_reset (); 446 scr_reset ();
438 447
439 scr_clear (true); 448 scr_clear (true);
440 scr_refresh (); 449 scr_refresh ();
450}
451
452void
453rxvt_term::scr_soft_reset ()
454{
455 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY
457 scr_overlay_off ();
458#endif
459
460 if (current_screen != PRIMARY)
461 scr_swap_screen ();
462
463 scr_scroll_region (0, MAX_ROWS - 1);
464 scr_rendition (0, ~RS_None);
465 scr_insert_mode (0);
441} 466}
442 467
443/* ------------------------------------------------------------------------- * 468/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 469 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 470 * ------------------------------------------------------------------------- */
… …
483 } 508 }
484 509
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 510 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 511 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 512 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 513 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 514 assert (s->cur.col >= 0);
491#endif
492} 515}
493 516
494void 517void
495rxvt_term::scr_swap_screen () 518rxvt_term::scr_swap_screen ()
496{ 519{
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 779 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 780 screen.cur.row -= minlines;
758 } 781 }
759 } 782 }
760 783
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 784 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 785 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 786 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 787 int row = screen.cur.row;
767 788
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 789 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 790
770 line_t *line = &ROW(row); 791 line_t *line = &ROW(row);
… …
880 if (expect_false ( 901 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR 902 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1 903 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR) 904 && line->t[screen.cur.col + 1] == NOCHAR)
884 )) 905 ))
885 { 906 scr_kill_char (*line, screen.cur.col);
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901 907
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 909
904 // if the character doesn't fit into the remaining columns... 910 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 912 {
907 // ...output spaces 913 // ... artificially enlargen the previous one
908 c = ' '; 914 c = NOCHAR;
909 // and try the same character next loop iteration 915 // and try the same character next loop iteration
910 --str; 916 --str;
911 } 917 }
912 918
913 line->touch (); 919 line->touch ();
… …
989#endif 995#endif
990 } 996 }
991 997
992 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
993 999
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1000 assert (screen.cur.row >= 0);
996#endif
997} 1001}
998 1002
999/* ------------------------------------------------------------------------- */ 1003/* ------------------------------------------------------------------------- */
1000/* 1004/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1005 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1330 return; 1334 return;
1331 1335
1332 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1333 1337
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1335 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1344 {
1339 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1340 1346
1341 if (mapped) 1347 if (mapped && !view_start)
1342 XClearArea (dpy, vt, 0, 1348 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1349 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1350 (unsigned int)Height2Pixel (num), False);
1345 } 1351 }
1346 else 1352 else
1347 { 1353 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1355
1356 if (mapped && !view_start)
1357 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1360 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1361 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1362 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1363 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1364 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1365 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 }
1358 } 1367 }
1359 1368
1360 for (; num--; row++) 1369 for (; num--; row++)
1361 { 1370 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1373 if (!view_start)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1364 } 1375 }
1365} 1376}
1366 1377
1367#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1368void 1379void
… …
1442 * Insert/Delete <count> characters from the current position 1453 * Insert/Delete <count> characters from the current position
1443 */ 1454 */
1444void 1455void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1456rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1457{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1458 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1459 ZERO_SCROLLBACK ();
1452 1460
1453 if (count <= 0) 1461 if (count <= 0)
1454 return; 1462 return;
… …
1456 scr_do_wrap (); 1464 scr_do_wrap ();
1457 1465
1458 selection_check (1); 1466 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1467 min_it (count, ncol - screen.cur.col);
1460 1468
1461 row = screen.cur.row; 1469 int row = screen.cur.row;
1462 1470
1463 line_t *line = &ROW(row); 1471 line_t *line = &ROW(row);
1464 1472
1465 line->touch (); 1473 line->touch ();
1466 line->is_longer (0); 1474 line->is_longer (0);
1467 1475
1476 // nuke wide spanning the start
1477 if (line->t[screen.cur.col] == NOCHAR)
1478 scr_kill_char (*line, screen.cur.col);
1479
1468 switch (insdel) 1480 switch (insdel)
1469 { 1481 {
1470 case INSERT: 1482 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1483 line->l = min (line->l + count, ncol);
1484
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1488 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1489 {
1473 line->t[col] = line->t[col - count]; 1490 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1491 line->r[col] = line->r[col - count];
1475 } 1492 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1493
1479 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1496 {
1482 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1512 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1513 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1514 selection_check (1);
1500 screen.cur.col -= count; 1515 screen.cur.col -= count;
1501 1516
1502 line->l = max (line->l - count, 0); 1517 // nuke wide char after the end
1518 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1519 scr_kill_char (*line, screen.cur.col + count);
1520
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1521 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1522 break;
1505 1523
1506 case DELETE: 1524 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1525 line->l = max (line->l - count, 0);
1508 1526
1527 // nuke wide char spanning the end
1528 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1529 scr_kill_char (*line, screen.cur.col + count);
1530
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1531 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1532 {
1511 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1513 } 1535 }
1514 1536
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1538
1518 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1541 {
1521 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1899 XMapWindow (dpy, parent[0]); 1920 XMapWindow (dpy, parent[0]);
1900# endif 1921# endif
1901 1922
1902# if ENABLE_FRILLS 1923# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1924 if (option (Opt_urgentOnBell))
1904 { 1925 set_urgency (1);
1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1906 {
1907 h->flags |= XUrgencyHint;
1908 XSetWMHints (dpy, parent[0], h);
1909 }
1910 }
1911# endif 1926# endif
1912 1927
1913 if (option (Opt_visualBell)) 1928 if (option (Opt_visualBell))
1914 { 1929 {
1915 rvideo_bell = true; 1930 rvideo_bell = true;
… …
1918 1933
1919 bell_ev.start (VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1920 } 1935 }
1921 else 1936 else
1922 XBell (dpy, 0); 1937 XBell (dpy, 0);
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923#endif 1939#endif
1924} 1940}
1925 1941
1926/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1927/* ARGSUSED */ 1943/* ARGSUSED */
… …
1946 row_start = view_start; 1962 row_start = view_start;
1947 } 1963 }
1948 1964
1949 wctomb (0, 0); 1965 wctomb (0, 0);
1950 1966
1951 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952 { 1968 {
1953 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1954 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1955 1971
1956 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1985 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
1986 */ 2002 */
1987void 2003void
1988rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
1989{ 2005{
1990 unsigned char have_bg,
1991 showcursor; /* show the cursor */
1992 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
1993 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
1994 int i; /* tmp */ 2008 int i; /* tmp */
1995#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
1996 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
… …
2007 /* 2021 /*
2008 * A: set up vars 2022 * A: set up vars
2009 */ 2023 */
2010 refresh_count = 0; 2024 refresh_count = 0;
2011 2025
2026 unsigned int old_screen_flags = screen.flags;
2012 have_bg = 0; 2027 char have_bg = 0;
2013#ifdef HAVE_BG_PIXMAP 2028#ifdef HAVE_BG_PIXMAP
2014 have_bg = bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
2015#endif 2030#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2032
2018 /* 2033 /*
2019 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2020 */ 2035 */
2021 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2022 2044
2023 /* 2045 /*
2024 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2025 */ 2047 */
2026 { 2048 {
2027 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2028 2050
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2052 if (hidden_cursor)
2032 showcursor = 0; 2053 showcursor = 0;
2033#endif 2054#endif
2034 2055
… …
2107 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2108 } 2129 }
2109 } 2130 }
2110 } 2131 }
2111 2132
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116
2117#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2134 /*
2119 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2121 */ 2137 */
… …
2210 continue; 2226 continue;
2211 2227
2212 // redraw one or more characters 2228 // redraw one or more characters
2213 2229
2214 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2216 --col; 2232 --col;
2217 2233
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2219 text_t *text = stp + col; 2235 text_t *text = stp + col;
2220 int count = 1; 2236 int count = 1;
… …
2227 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2228 { 2244 {
2229 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2230 { 2246 {
2231 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2232 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2233 count++; 2250 count++;
2234 i++; 2251 i++;
2235 2252
2236 continue; 2253 continue;
2237 } 2254 }
… …
2257 2274
2258 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2260 2277
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2263 count++, i--; 2280 count++, i--;
2264 2281
2265 /* 2282 /*
2266 * Determine the attributes for the string 2283 * Determine the attributes for the string
2267 */ 2284 */
2268 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2270 2287
2271 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2273 { 2290 {
2274 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2275 2292
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
… …
2360 /* 2377 /*
2361 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2362 */ 2379 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2381
2365 if (have_bg && back == Color_bg) 2382 if (expect_true (have_bg && back == Color_bg))
2366 { 2383 {
2367 // this is very ugly, maybe push it into ->draw? 2384 // this is very ugly, maybe push it into ->draw?
2368 2385
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2387 if (text[i] != ' ')
… …
2377 did_clear: ; 2394 did_clear: ;
2378 } 2395 }
2379 else 2396 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2398
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2400 {
2384#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2404 else
… …
2392 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394 } 2411 }
2395 } /* for (col....) */ 2412 } /* for (col....) */
2396 } /* for (row....) */ 2413 } /* for (row....) */
2397
2398#if ENABLE_OVERLAY
2399 scr_swap_overlay ();
2400#endif
2401 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402 2414
2403 /* 2415 /*
2404 * G: cleanup cursor and display outline cursor if necessary 2416 * G: cleanup cursor and display outline cursor if necessary
2405 */ 2417 */
2406 if (showcursor) 2418 if (showcursor)
… …
2445 } 2457 }
2446 2458
2447 /* 2459 /*
2448 * H: cleanup selection 2460 * H: cleanup selection
2449 */ 2461 */
2462#if ENABLE_OVERLAY
2463 scr_swap_overlay ();
2464#endif
2465 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2466
2450 scr_reverse_selection (); 2467 scr_reverse_selection ();
2451 2468
2469 screen.flags = old_screen_flags;
2452 num_scr = 0; 2470 num_scr = 0;
2453 num_scr_allow = 1; 2471 num_scr_allow = 1;
2454} 2472}
2455 2473
2456void 2474void
… …
3715 h += 2; min_it (h, nrow); 3733 h += 2; min_it (h, nrow);
3716 3734
3717 x -= 1; clamp_it (x, 0, ncol - w); 3735 x -= 1; clamp_it (x, 0, ncol - w);
3718 y -= 1; clamp_it (y, 0, nrow - h); 3736 y -= 1; clamp_it (y, 0, nrow - h);
3719 3737
3720 ov_x = x; ov_y = y; 3738 ov.x = x; ov.y = y;
3721 ov_w = w; ov_h = h; 3739 ov.w = w; ov.h = h;
3722 3740
3723 ov_text = new text_t *[h]; 3741 ov.text = new text_t *[h];
3724 ov_rend = new rend_t *[h]; 3742 ov.rend = new rend_t *[h];
3725 3743
3726 for (y = 0; y < h; y++) 3744 for (y = 0; y < h; y++)
3727 { 3745 {
3728 text_t *tp = ov_text[y] = new text_t[w]; 3746 text_t *tp = ov.text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w]; 3747 rend_t *rp = ov.rend[y] = new rend_t[w];
3730 3748
3731 text_t t0, t1, t2; 3749 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE; 3750 rend_t r = OVERLAY_RSTYLE;
3733 3751
3734 if (y == 0) 3752 if (y == 0)
… …
3753} 3771}
3754 3772
3755void 3773void
3756rxvt_term::scr_overlay_off () NOTHROW 3774rxvt_term::scr_overlay_off () NOTHROW
3757{ 3775{
3758 if (!ov_text) 3776 if (!ov.text)
3759 return; 3777 return;
3760 3778
3761 want_refresh = 1; 3779 want_refresh = 1;
3762 3780
3763 for (int y = 0; y < ov_h; y++) 3781 for (int y = 0; y < ov.h; y++)
3764 { 3782 {
3765 delete [] ov_text[y]; 3783 delete [] ov.text[y];
3766 delete [] ov_rend[y]; 3784 delete [] ov.rend[y];
3767 } 3785 }
3768 3786
3769 delete [] ov_text; ov_text = 0; 3787 delete [] ov.text; ov.text = 0;
3770 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov.rend; ov.rend = 0;
3771} 3789}
3772 3790
3773void 3791void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775{ 3793{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777 return; 3795 return;
3778 3796
3779 x++, y++; 3797 x++, y++;
3780 3798
3781 ov_text[y][x] = text; 3799 ov.text[y][x] = text;
3782 ov_rend[y][x] = rend; 3800 ov.rend[y][x] = rend;
3783} 3801}
3784 3802
3785void 3803void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787{ 3805{
… …
3806} 3824}
3807 3825
3808void 3826void
3809rxvt_term::scr_swap_overlay () NOTHROW 3827rxvt_term::scr_swap_overlay () NOTHROW
3810{ 3828{
3811 if (!ov_text) 3829 if (!ov.text)
3812 return; 3830 return;
3813 3831
3832 // hide cursor if it is within the overlay area
3833 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3834 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3835 screen.flags &= ~Screen_VisibleCursor;
3836
3814 // swap screen mem with overlay 3837 // swap screen mem with overlay
3815 for (int y = ov_h; y--; ) 3838 for (int y = ov.h; y--; )
3816 { 3839 {
3817 text_t *t1 = ov_text[y]; 3840 text_t *t1 = ov.text[y];
3818 rend_t *r1 = ov_rend[y]; 3841 rend_t *r1 = ov.rend[y];
3819 3842
3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3843 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3821 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3844 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822 3845
3823 for (int x = ov_w; x--; ) 3846 for (int x = ov.w; x--; )
3824 { 3847 {
3825 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3848 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827 } 3850 }
3828 } 3851 }

Diff Legend

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