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.336 by root, Tue Mar 30 23:54:30 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
… …
220 selection.text = NULL; 231 selection.text = NULL;
221 selection.len = 0; 232 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
224 selection.clicks = 0; 235 selection.clicks = 0;
236 selection.clip_text = NULL;
237 selection.clip_len = 0;
225 } 238 }
226 else 239 else
227 { 240 {
228 /* 241 /*
229 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
267 280
268 if (top_row) 281 if (top_row)
269 { 282 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
285 // TODO: maybe optimise when width didn't change
272 286
273 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 289
276 do 290 do
277 { 291 {
278 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 294 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 296
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 298 {
… …
380 delete old_ta; 392 delete old_ta;
381 delete old_ra; 393 delete old_ra;
382 394
383 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
385 398
386 free (tabs); 399 free (tabs);
387 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
388 404
389 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
390 406
391 prev_nrow = nrow; 407 prev_nrow = nrow;
392 prev_ncol = ncol; 408 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 409
402 tt_winch (); 410 tt_winch ();
403 411
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 413}
… …
417 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
418 426
419 free (row_buf); 427 free (row_buf);
420 free (swap_buf); 428 free (swap_buf);
421 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
422 free (tabs); 432 free (tabs);
423 433 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 434 }
426} 435}
427 436
428/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
429/* 438/*
430 * Hard reset 439 * Hard/Soft reset
431 */ 440 */
432void 441void
433rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
434{ 443{
435 scr_release (); 444 scr_release ();
436 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
437 scr_reset (); 448 scr_reset ();
438 449
439 scr_clear (true); 450 scr_clear (true);
440 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
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 * ------------------------------------------------------------------------- */
… …
483 } 510 }
484 511
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
491#endif
492} 517}
493 518
494void 519void
495rxvt_term::scr_swap_screen () 520rxvt_term::scr_swap_screen ()
496{ 521{
… …
521 want_refresh = 1; 546 want_refresh = 1;
522 view_start = 0; 547 view_start = 0;
523 548
524 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
525 550
526 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
527 552
528#if NSCREENS 553#if NSCREENS
529 if (option (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
530 { 555 {
531 num_scr = 0; 556 num_scr = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
758 } 783 }
759 } 784 }
760 785
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 789 int row = screen.cur.row;
767 790
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 792
770 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
… …
880 if (expect_false ( 903 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR 904 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1 905 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR) 906 && line->t[screen.cur.col + 1] == NOCHAR)
884 )) 907 ))
885 { 908 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 909
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 911
904 // if the character doesn't fit into the remaining columns... 912 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 914 {
907 // ...output spaces 915 // ... artificially enlargen the previous one
908 c = ' '; 916 c = NOCHAR;
909 // and try the same character next loop iteration 917 // and try the same character next loop iteration
910 --str; 918 --str;
911 } 919 }
912 920
913 line->touch (); 921 line->touch ();
… …
989#endif 997#endif
990 } 998 }
991 999
992 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
993 1001
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
996#endif
997} 1003}
998 1004
999/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
1000/* 1006/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1335 if (row >= nrow) /* Out Of Bounds */
1330 return; 1336 return;
1331 1337
1332 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1333 1339
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1335 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1346 {
1339 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1340 1348
1341 if (mapped) 1349 if (mapped && !view_start)
1342 XClearArea (dpy, vt, 0, 1350 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1351 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1352 (unsigned int)Height2Pixel (num), False);
1345 } 1353 }
1346 else 1354 else
1347 { 1355 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1356 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1357
1358 if (mapped && !view_start)
1359 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1362 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1363 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1364 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1365 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 }
1358 } 1369 }
1359 1370
1360 for (; num--; row++) 1371 for (; num--; row++)
1361 { 1372 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1373 scr_blank_screen_mem (ROW(row), rstyle);
1374
1375 if (!view_start)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1364 } 1377 }
1365} 1378}
1366 1379
1367#if !ENABLE_MINIMAL 1380#if !ENABLE_MINIMAL
1368void 1381void
… …
1442 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1443 */ 1456 */
1444void 1457void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1459{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1460 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1452 1462
1453 if (count <= 0) 1463 if (count <= 0)
1454 return; 1464 return;
… …
1456 scr_do_wrap (); 1466 scr_do_wrap ();
1457 1467
1458 selection_check (1); 1468 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1460 1470
1461 row = screen.cur.row; 1471 int row = screen.cur.row;
1462 1472
1463 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1464 1474
1465 line->touch (); 1475 line->touch ();
1466 line->is_longer (0); 1476 line->is_longer (0);
1467 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1468 switch (insdel) 1482 switch (insdel)
1469 { 1483 {
1470 case INSERT: 1484 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1491 {
1473 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1475 } 1494 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1495
1479 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1498 {
1482 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1514 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1516 selection_check (1);
1500 screen.cur.col -= count; 1517 screen.cur.col -= count;
1501 1518
1502 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1524 break;
1505 1525
1506 case DELETE: 1526 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1508 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1534 {
1511 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1513 } 1537 }
1514 1538
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1540
1518 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1543 {
1521 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1835 {
1813 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1815 } 1838 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1839
1817 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1840 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1819 1842
1820 num_scr_allow = 0; 1843 num_scr_allow = 0;
1821 1844
… …
1899 XMapWindow (dpy, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1900# endif 1923# endif
1901 1924
1902# if ENABLE_FRILLS 1925# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1926 if (option (Opt_urgentOnBell))
1904 { 1927 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 1928# endif
1912 1929
1913 if (option (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1914 { 1931 {
1915 rvideo_bell = true; 1932 rvideo_bell = true;
… …
1918 1935
1919 bell_ev.start (VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1920 } 1937 }
1921 else 1938 else
1922 XBell (dpy, 0); 1939 XBell (dpy, 0);
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923#endif 1941#endif
1924} 1942}
1925 1943
1926/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1927/* ARGSUSED */ 1945/* ARGSUSED */
… …
1946 row_start = view_start; 1964 row_start = view_start;
1947 } 1965 }
1948 1966
1949 wctomb (0, 0); 1967 wctomb (0, 0);
1950 1968
1951 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952 { 1970 {
1953 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1954 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1955 1973
1956 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1985 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1986 */ 2004 */
1987void 2005void
1988rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1989{ 2007{
1990 unsigned char have_bg,
1991 showcursor; /* show the cursor */
1992 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1993 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1994 int i; /* tmp */ 2010 int i; /* tmp */
1995#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1996 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
… …
2007 /* 2023 /*
2008 * A: set up vars 2024 * A: set up vars
2009 */ 2025 */
2010 refresh_count = 0; 2026 refresh_count = 0;
2011 2027
2028 unsigned int old_screen_flags = screen.flags;
2012 have_bg = 0; 2029 char have_bg = 0;
2013#ifdef HAVE_BG_PIXMAP 2030#ifdef HAVE_BG_PIXMAP
2014 have_bg = bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
2015#endif 2032#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2034
2018 /* 2035 /*
2019 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2020 */ 2037 */
2021 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
2022 2046
2023 /* 2047 /*
2024 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2025 */ 2049 */
2026 { 2050 {
2027 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2028 2052
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2054 if (hidden_cursor)
2032 showcursor = 0; 2055 showcursor = 0;
2033#endif 2056#endif
2034 2057
… …
2107 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2108 } 2131 }
2109 } 2132 }
2110 } 2133 }
2111 2134
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 2135#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2136 /*
2119 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2121 */ 2139 */
… …
2210 continue; 2228 continue;
2211 2229
2212 // redraw one or more characters 2230 // redraw one or more characters
2213 2231
2214 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2216 --col; 2234 --col;
2217 2235
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2219 text_t *text = stp + col; 2237 text_t *text = stp + col;
2220 int count = 1; 2238 int count = 1;
… …
2227 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2228 { 2246 {
2229 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2230 { 2248 {
2231 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2232 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2233 count++; 2252 count++;
2234 i++; 2253 i++;
2235 2254
2236 continue; 2255 continue;
2237 } 2256 }
… …
2257 2276
2258 col--; /* went one too far. move back */ 2277 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2278 count -= i; /* dump any matching trailing chars */
2260 2279
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2280 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2281 while (expect_false (i && text[count] == NOCHAR))
2263 count++, i--; 2282 count++, i--;
2264 2283
2265 /* 2284 /*
2266 * Determine the attributes for the string 2285 * Determine the attributes for the string
2267 */ 2286 */
2268 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2270 2289
2271 // only do special processing if any attributes are set, which is unlikely 2290 // 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)) 2291 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2273 { 2292 {
2274 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2275 2294
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
… …
2360 /* 2379 /*
2361 * Actually do the drawing of the string here 2380 * Actually do the drawing of the string here
2362 */ 2381 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2382 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2383
2365 if (have_bg && back == Color_bg) 2384 if (expect_true (have_bg && back == Color_bg))
2366 { 2385 {
2367 // this is very ugly, maybe push it into ->draw? 2386 // this is very ugly, maybe push it into ->draw?
2368 2387
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2388 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2389 if (text[i] != ' ')
… …
2377 did_clear: ; 2396 did_clear: ;
2378 } 2397 }
2379 else 2398 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2399 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2400
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2401 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2402 {
2384#if ENABLE_FRILLS 2403#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2404 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2405 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2406 else
… …
2392 xpixel, ypixel + font->ascent + 1, 2411 xpixel, ypixel + font->ascent + 1,
2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2412 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394 } 2413 }
2395 } /* for (col....) */ 2414 } /* for (col....) */
2396 } /* for (row....) */ 2415 } /* for (row....) */
2397
2398#if ENABLE_OVERLAY
2399 scr_swap_overlay ();
2400#endif
2401 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402 2416
2403 /* 2417 /*
2404 * G: cleanup cursor and display outline cursor if necessary 2418 * G: cleanup cursor and display outline cursor if necessary
2405 */ 2419 */
2406 if (showcursor) 2420 if (showcursor)
… …
2445 } 2459 }
2446 2460
2447 /* 2461 /*
2448 * H: cleanup selection 2462 * H: cleanup selection
2449 */ 2463 */
2464#if ENABLE_OVERLAY
2465 scr_swap_overlay ();
2466#endif
2467 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2468
2450 scr_reverse_selection (); 2469 scr_reverse_selection ();
2451 2470
2471 screen.flags = old_screen_flags;
2452 num_scr = 0; 2472 num_scr = 0;
2453 num_scr_allow = 1; 2473 num_scr_allow = 1;
2454} 2474}
2455 2475
2456void 2476void
… …
2926/* 2946/*
2927 * Clear all selected text 2947 * Clear all selected text
2928 * EXT: SelectionClear 2948 * EXT: SelectionClear
2929 */ 2949 */
2930void 2950void
2931rxvt_term::selection_clear () NOTHROW 2951rxvt_term::selection_clear (bool clipboard) NOTHROW
2932{ 2952{
2953 if (!clipboard)
2954 {
2933 want_refresh = 1; 2955 want_refresh = 1;
2934 free (selection.text); 2956 free (selection.text);
2935 selection.text = NULL; 2957 selection.text = NULL;
2936 selection.len = 0; 2958 selection.len = 0;
2937 CLEAR_SELECTION (); 2959 CLEAR_SELECTION ();
2938 2960
2939 if (display->selection_owner == this) 2961 if (display->selection_owner == this)
2940 display->selection_owner = 0; 2962 display->selection_owner = 0;
2963 }
2964 else
2965 {
2966 free (selection.clip_text);
2967 selection.clip_text = NULL;
2968 selection.clip_len = 0;
2969
2970 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0;
2972 }
2973}
2974
2975void
2976rxvt_term::clipboard_copy (Time tm)
2977{
2978 if (selection.len > 0)
2979 {
2980 free (selection.clip_text);
2981 selection.clip_len = selection.len;
2982 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2983 memcpy (selection.clip_text, selection.text,
2984 sizeof (wchar_t) * selection.clip_len);
2985 selection_grab (tm, true);
2986 }
2941} 2987}
2942 2988
2943/* ------------------------------------------------------------------------- */ 2989/* ------------------------------------------------------------------------- */
2944/* 2990/*
2945 * Copy a selection into the cut buffer 2991 * Copy a selection into the cut buffer
… …
3071 3117
3072 selection_grab (tm); 3118 selection_grab (tm);
3073} 3119}
3074 3120
3075bool 3121bool
3076rxvt_term::selection_grab (Time tm) NOTHROW 3122rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3077{ 3123{
3124 Atom sel;
3125
3126 if (!clipboard)
3127 {
3078 selection_time = tm; 3128 selection_time = tm;
3129 sel = XA_PRIMARY;
3130 }
3131 else
3132 {
3133 clipboard_time = tm;
3134 sel = xa[XA_CLIPBOARD];
3135 }
3079 3136
3080 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3137 XSetSelectionOwner (dpy, sel, vt, tm);
3081 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3138 if (XGetSelectionOwner (dpy, sel) == vt)
3082 { 3139 {
3083 display->set_selection_owner (this); 3140 display->set_selection_owner (this, clipboard);
3084 return true; 3141 return true;
3085 } 3142 }
3086 else 3143 else
3087 { 3144 {
3088 selection_clear (); 3145 selection_clear (clipboard);
3089 return false; 3146 return false;
3090 } 3147 }
3091 3148
3092#if 0 3149#if 0
3093 XTextProperty ct; 3150 XTextProperty ct;
… …
3588 else if (rq.target == xa[XA_MULTIPLE]) 3645 else if (rq.target == xa[XA_MULTIPLE])
3589 { 3646 {
3590 /* TODO: Handle MULTIPLE */ 3647 /* TODO: Handle MULTIPLE */
3591 } 3648 }
3592#endif 3649#endif
3593 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3594 { 3651 {
3595 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3596 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3653 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property;
3655 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3597 ev.property = rq.property; 3660 ev.property = rq.property;
3598 } 3661 }
3599 else if (rq.target == XA_STRING 3662 else if (rq.target == XA_STRING
3600 || rq.target == xa[XA_TEXT] 3663 || rq.target == xa[XA_TEXT]
3601 || rq.target == xa[XA_COMPOUND_TEXT] 3664 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3634 { 3697 {
3635 target = xa[XA_COMPOUND_TEXT]; 3698 target = xa[XA_COMPOUND_TEXT];
3636 style = enc_compound_text; 3699 style = enc_compound_text;
3637 } 3700 }
3638 3701
3639 if (selection.text) 3702 if (rq.selection == XA_PRIMARY && selection.text)
3640 { 3703 {
3641 cl = selection.text; 3704 cl = selection.text;
3642 selectlen = selection.len; 3705 selectlen = selection.len;
3706 }
3707 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3708 {
3709 cl = selection.clip_text;
3710 selectlen = selection.clip_len;
3643 } 3711 }
3644 else 3712 else
3645 { 3713 {
3646 cl = L""; 3714 cl = L"";
3647 selectlen = 0; 3715 selectlen = 0;
… …
3715 h += 2; min_it (h, nrow); 3783 h += 2; min_it (h, nrow);
3716 3784
3717 x -= 1; clamp_it (x, 0, ncol - w); 3785 x -= 1; clamp_it (x, 0, ncol - w);
3718 y -= 1; clamp_it (y, 0, nrow - h); 3786 y -= 1; clamp_it (y, 0, nrow - h);
3719 3787
3720 ov_x = x; ov_y = y; 3788 ov.x = x; ov.y = y;
3721 ov_w = w; ov_h = h; 3789 ov.w = w; ov.h = h;
3722 3790
3723 ov_text = new text_t *[h]; 3791 ov.text = new text_t *[h];
3724 ov_rend = new rend_t *[h]; 3792 ov.rend = new rend_t *[h];
3725 3793
3726 for (y = 0; y < h; y++) 3794 for (y = 0; y < h; y++)
3727 { 3795 {
3728 text_t *tp = ov_text[y] = new text_t[w]; 3796 text_t *tp = ov.text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w]; 3797 rend_t *rp = ov.rend[y] = new rend_t[w];
3730 3798
3731 text_t t0, t1, t2; 3799 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE; 3800 rend_t r = OVERLAY_RSTYLE;
3733 3801
3734 if (y == 0) 3802 if (y == 0)
… …
3753} 3821}
3754 3822
3755void 3823void
3756rxvt_term::scr_overlay_off () NOTHROW 3824rxvt_term::scr_overlay_off () NOTHROW
3757{ 3825{
3758 if (!ov_text) 3826 if (!ov.text)
3759 return; 3827 return;
3760 3828
3761 want_refresh = 1; 3829 want_refresh = 1;
3762 3830
3763 for (int y = 0; y < ov_h; y++) 3831 for (int y = 0; y < ov.h; y++)
3764 { 3832 {
3765 delete [] ov_text[y]; 3833 delete [] ov.text[y];
3766 delete [] ov_rend[y]; 3834 delete [] ov.rend[y];
3767 } 3835 }
3768 3836
3769 delete [] ov_text; ov_text = 0; 3837 delete [] ov.text; ov.text = 0;
3770 delete [] ov_rend; ov_rend = 0; 3838 delete [] ov.rend; ov.rend = 0;
3771} 3839}
3772 3840
3773void 3841void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3842rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775{ 3843{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3844 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777 return; 3845 return;
3778 3846
3779 x++, y++; 3847 x++, y++;
3780 3848
3781 ov_text[y][x] = text; 3849 ov.text[y][x] = text;
3782 ov_rend[y][x] = rend; 3850 ov.rend[y][x] = rend;
3783} 3851}
3784 3852
3785void 3853void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3854rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787{ 3855{
… …
3806} 3874}
3807 3875
3808void 3876void
3809rxvt_term::scr_swap_overlay () NOTHROW 3877rxvt_term::scr_swap_overlay () NOTHROW
3810{ 3878{
3811 if (!ov_text) 3879 if (!ov.text)
3812 return; 3880 return;
3813 3881
3882 // hide cursor if it is within the overlay area
3883 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3884 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3885 screen.flags &= ~Screen_VisibleCursor;
3886
3814 // swap screen mem with overlay 3887 // swap screen mem with overlay
3815 for (int y = ov_h; y--; ) 3888 for (int y = ov.h; y--; )
3816 { 3889 {
3817 text_t *t1 = ov_text[y]; 3890 text_t *t1 = ov.text[y];
3818 rend_t *r1 = ov_rend[y]; 3891 rend_t *r1 = ov.rend[y];
3819 3892
3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3893 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; 3894 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822 3895
3823 for (int x = ov_w; x--; ) 3896 for (int x = ov.w; x--; )
3824 { 3897 {
3825 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3898 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3899 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827 } 3900 }
3828 } 3901 }

Diff Legend

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