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.307 by root, Fri Jun 27 00:44:32 2008 UTC vs.
Revision 1.319 by root, Tue Nov 4 23:08:44 2008 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
… …
380 delete old_ta; 391 delete old_ta;
381 delete old_ra; 392 delete old_ra;
382 393
383 clamp_it (screen.cur.row, 0, nrow - 1); 394 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 395 clamp_it (screen.cur.col, 0, ncol - 1);
385
386 free (tabs);
387 } 396 }
388 397
389 CLEAR_ALL_SELECTION (); 398 CLEAR_ALL_SELECTION ();
390 399
391 prev_nrow = nrow; 400 prev_nrow = nrow;
392 prev_ncol = ncol; 401 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 402
402 tt_winch (); 403 tt_winch ();
403 404
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 405 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 406}
… …
417 delete ralloc; ralloc = 0; 418 delete ralloc; ralloc = 0;
418 419
419 free (row_buf); 420 free (row_buf);
420 free (swap_buf); 421 free (swap_buf);
421 free (drawn_buf); 422 free (drawn_buf);
423 row_buf = 0; // signal that we freed all the arrays above
424
422 free (tabs); 425 free (tabs);
423 426 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 427 }
426} 428}
427 429
428/* ------------------------------------------------------------------------- */ 430/* ------------------------------------------------------------------------- */
429/* 431/*
430 * Hard reset 432 * Hard/Soft reset
431 */ 433 */
432void 434void
433rxvt_term::scr_poweron () 435rxvt_term::scr_poweron ()
434{ 436{
435 scr_release (); 437 scr_release ();
436 prev_nrow = prev_ncol = 0; 438 prev_nrow = prev_ncol = 0;
439 scr_soft_reset ();
437 scr_reset (); 440 scr_reset ();
438 441
439 scr_clear (true); 442 scr_clear (true);
440 scr_refresh (); 443 scr_refresh ();
444}
445
446void
447rxvt_term::scr_soft_reset ()
448{
449 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY
451 scr_overlay_off ();
452#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
441} 468}
442 469
443/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
771 798
772 while (str < strend) 799 while (str < strend)
773 { 800 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 802
776 if (c < 0x20) 803 if (expect_false (c < 0x20))
777 if (c == C0_LF) 804 if (c == C0_LF)
778 { 805 {
779 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
780 807
781 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
800 { 827 {
801 scr_tab (1, true); 828 scr_tab (1, true);
802 continue; 829 continue;
803 } 830 }
804 831
832 if (expect_false (
805 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
806 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
807 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
808 { 837 {
809 checksel = 0; 838 checksel = 0;
810 /* 839 /*
811 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
812 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
813 * should be a similar check. 842 * should be a similar check.
814 */ 843 */
815 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
816 } 845 }
817 846
818 if (screen.flags & Screen_WrapNext) 847 if (expect_false (screen.flags & Screen_WrapNext))
819 { 848 {
820 scr_do_wrap (); 849 scr_do_wrap ();
821 850
822 line->l = ncol; 851 line->l = ncol;
823 line->is_longer (1); 852 line->is_longer (1);
… …
825 row = screen.cur.row; 854 row = screen.cur.row;
826 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
827 } 856 }
828 857
829 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
830 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
831 c = 0xfffd; 860 c = 0xfffd;
832 861
833 // rely on wcwidth to tell us the character width, do wcwidth before 862 // rely on wcwidth to tell us the character width, do wcwidth before
834 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
835 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
836 // locale. 865 // locale.
837 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
838 867
839 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
840 { 869 {
841 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
842 // 5f-7e standard vt100 871 // 5f-7e standard vt100
843 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
844 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
858 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
859 } 888 }
860 } 889 }
861 890
862 if (screen.flags & Screen_Insert) 891 if (expect_false (screen.flags & Screen_Insert))
863 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
864 893
865 if (width != 0) 894 if (width != 0)
866 { 895 {
867#if !UNICODE_3 896#if !UNICODE_3
… …
873 c = 0xfffd; 902 c = 0xfffd;
874# endif 903# endif
875#endif 904#endif
876 905
877 // nuke the character at this position, if required 906 // nuke the character at this position, if required
907 if (expect_false (
878 if (line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
879 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
880 && line->t[screen.cur.col + 1] == NOCHAR)) 910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
881 { 918 {
882 int col = screen.cur.col; 919 // ... artificially enlargen the previous one
883
884 // find begin
885 while (col > 0 && line->t[col] == NOCHAR)
886 col--;
887
888 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
889
890 // found begin, nuke
891 do {
892 line->t[col] = ' ';
893 line->r[col] = rend;
894 col++;
895 } while (col < ncol && line->t[col] == NOCHAR);
896 }
897
898 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899
900 // if the character doesn't fit into the remaining columns...
901 if (screen.cur.col > ncol - width && ncol >= width)
902 {
903 // ...output spaces
904 c = ' '; 920 c = NOCHAR;
905 // and try the same character next loop iteration 921 // and try the same character next loop iteration
906 --str; 922 --str;
907 } 923 }
908 924
909 line->touch (); 925 line->touch ();
… …
911 do 927 do
912 { 928 {
913 line->t[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
914 line->r[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
915 931
916 if (screen.cur.col < ncol - 1) 932 if (expect_true (screen.cur.col < ncol - 1))
917 screen.cur.col++; 933 screen.cur.col++;
918 else 934 else
919 { 935 {
920 line->l = ncol; 936 line->l = ncol;
921 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
… …
923 break; 939 break;
924 } 940 }
925 941
926 c = NOCHAR; 942 c = NOCHAR;
927 } 943 }
928 while (--width > 0); 944 while (expect_false (--width > 0));
929 945
930 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
931 if (!width) 947 if (expect_false (!width))
932 { 948 {
933 line->touch (); 949 line->touch ();
934 950
935 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
936 { 952 {
937 line->t[c] = ' '; 953 line->t[c] = ' ';
938 line->r[c] = rend; 954 line->r[c] = rend;
939 } 955 }
940 } 956 }
941 } 957 }
958#if ENABLE_COMBINING
942 else // width == 0 959 else // width == 0
943 { 960 {
944#if ENABLE_COMBINING 961 if (c != 0xfeff) // ignore BOM
945 // handle combining characters
946 // we just tag the accent on the previous on-screen character.
947 // this is arguably not correct, but also arguably not wrong.
948 // we don't handle double-width characters nicely yet.
949 line_t *linep;
950 text_t *tp;
951 rend_t *rp;
952
953 if (screen.cur.col > 0)
954 { 962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
955 linep = line; 973 linep = line;
956 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
957 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 999 }
959 else if (screen.cur.row > 0
960 && ROW(screen.cur.row - 1).is_longer ())
961 {
962 linep = &ROW(screen.cur.row - 1);
963 tp = line->t + ncol - 1;
964 rp = line->r + ncol - 1;
965 } 1000 }
966 else
967 continue;
968
969 linep->touch ();
970
971 while (*tp == NOCHAR && tp > linep->t)
972 tp--, rp--;
973
974 // first try to find a precomposed character
975 unicode_t n = rxvt_compose (*tp, c);
976 if (n == NOCHAR)
977 n = rxvt_composite.compose (*tp, c);
978
979 *tp = n;
980 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
981#endif 1001#endif
982 }
983 } 1002 }
984 1003
985 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
986 1005
987#ifdef DEBUG_STRICT 1006#ifdef DEBUG_STRICT
… …
1435 * Insert/Delete <count> characters from the current position 1454 * Insert/Delete <count> characters from the current position
1436 */ 1455 */
1437void 1456void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1457rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1458{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1459 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1460 ZERO_SCROLLBACK ();
1445 1461
1446 if (count <= 0) 1462 if (count <= 0)
1447 return; 1463 return;
… …
1449 scr_do_wrap (); 1465 scr_do_wrap ();
1450 1466
1451 selection_check (1); 1467 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1468 min_it (count, ncol - screen.cur.col);
1453 1469
1454 row = screen.cur.row; 1470 int row = screen.cur.row;
1455 1471
1456 line_t *line = &ROW(row); 1472 line_t *line = &ROW(row);
1457 1473
1458 line->touch (); 1474 line->touch ();
1459 line->is_longer (0); 1475 line->is_longer (0);
1460 1476
1477 // nuke wide spanning the start
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1461 switch (insdel) 1481 switch (insdel)
1462 { 1482 {
1463 case INSERT: 1483 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1484 line->l = min (line->l + count, ncol);
1485
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1489 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1490 {
1466 line->t[col] = line->t[col - count]; 1491 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1492 line->r[col] = line->r[col - count];
1468 } 1493 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1494
1472 if (selection.op && current_screen == selection.screen 1495 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1497 {
1475 if (selection.end.row != screen.cur.row 1498 if (selection.end.row != screen.cur.row
… …
1490 case ERASE: 1513 case ERASE:
1491 screen.cur.col += count; /* don't worry if > ncol */ 1514 screen.cur.col += count; /* don't worry if > ncol */
1492 selection_check (1); 1515 selection_check (1);
1493 screen.cur.col -= count; 1516 screen.cur.col -= count;
1494 1517
1495 line->l = max (line->l - count, 0); 1518 // nuke wide char after the end
1519 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col + count);
1521
1496 scr_blank_line (*line, screen.cur.col, count, rstyle); 1522 scr_blank_line (*line, screen.cur.col, count, rstyle);
1497 break; 1523 break;
1498 1524
1499 case DELETE: 1525 case DELETE:
1500 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1526 line->l = max (line->l - count, 0);
1501 1527
1528 // nuke wide char spanning the end
1529 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col + count);
1531
1502 for (col = screen.cur.col; (col + count) < ncol; col++) 1532 for (int col = screen.cur.col; (col + count) < ncol; col++)
1503 { 1533 {
1504 line->t[col] = line->t[col + count]; 1534 line->t[col] = line->t[col + count];
1505 line->r[col] = line->r[col + count]; 1535 line->r[col] = line->r[col + count];
1506 } 1536 }
1507 1537
1508 line->l = max (line->l - count, 0);
1509 scr_blank_line (*line, ncol - count, count, tr); 1538 scr_blank_line (*line, ncol - count, count,
1539 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1510 1540
1511 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1543 {
1514 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1892 XMapWindow (dpy, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1893# endif 1923# endif
1894 1924
1895# if ENABLE_FRILLS 1925# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1926 if (option (Opt_urgentOnBell))
1897 { 1927 set_urgency (1);
1898 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 {
1900 h->flags |= XUrgencyHint;
1901 XSetWMHints (dpy, parent[0], h);
1902 }
1903 }
1904# endif 1928# endif
1905 1929
1906 if (option (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1907 { 1931 {
1908 rvideo_bell = true; 1932 rvideo_bell = true;
… …
1921void 1945void
1922rxvt_term::scr_printscreen (int fullhist) NOTHROW 1946rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923{ 1947{
1924#ifdef PRINTPIPE 1948#ifdef PRINTPIPE
1925 int nrows, row_start; 1949 int nrows, row_start;
1926 FILE *fd; 1950 FILE *fd = popen_printer ();
1927 1951
1928 if ((fd = popen_printer ()) == NULL) 1952 if (!fd)
1929 return; 1953 return;
1930 1954
1931 if (fullhist) 1955 if (fullhist)
1932 { 1956 {
1933 nrows = nrow - top_row; 1957 nrows = nrow - top_row;
… …
2203 continue; 2227 continue;
2204 2228
2205 // redraw one or more characters 2229 // redraw one or more characters
2206 2230
2207 // seek to the beginning of wide characters 2231 // seek to the beginning of wide characters
2208 while (stp[col] == NOCHAR && col > 0) 2232 while (expect_false (stp[col] == NOCHAR && col > 0))
2209 --col; 2233 --col;
2210 2234
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2235 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2212 text_t *text = stp + col; 2236 text_t *text = stp + col;
2213 int count = 1; 2237 int count = 1;
… …
2250 2274
2251 col--; /* went one too far. move back */ 2275 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2276 count -= i; /* dump any matching trailing chars */
2253 2277
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2278 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (i && text[count] == NOCHAR) 2279 while (expect_false (i && text[count] == NOCHAR))
2256 count++, i--; 2280 count++, i--;
2257 2281
2258 /* 2282 /*
2259 * Determine the attributes for the string 2283 * Determine the attributes for the string
2260 */ 2284 */
2261 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2263 2287
2264 // 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
2265 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)))
2266 { 2290 {
2267 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2268 2292
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
… …
2353 /* 2377 /*
2354 * Actually do the drawing of the string here 2378 * Actually do the drawing of the string here
2355 */ 2379 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2381
2358 if (have_bg && back == Color_bg) 2382 if (expect_true (have_bg && back == Color_bg))
2359 { 2383 {
2360 // this is very ugly, maybe push it into ->draw? 2384 // this is very ugly, maybe push it into ->draw?
2361 2385
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2386 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2387 if (text[i] != ' ')
… …
2370 did_clear: ; 2394 did_clear: ;
2371 } 2395 }
2372 else 2396 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2398
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2400 {
2377#if ENABLE_FRILLS 2401#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2402 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2403 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2404 else

Diff Legend

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