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.310 by root, Wed Jul 23 17:10:07 2008 UTC vs.
Revision 1.322 by root, Tue Nov 4 23:35:50 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 163 scr_soft_reset ();
145 scr_overlay_off ();
146#endif
147 164
148 rvideo_mode = false;
149 view_start = 0; 165 view_start = 0;
150 num_scr = 0; 166 num_scr = 0;
151 167
152 if (ncol == 0) 168 if (ncol == 0)
153 ncol = 80; 169 ncol = 80;
… …
155 if (nrow == 0) 171 if (nrow == 0)
156 nrow = 24; 172 nrow = 24;
157 173
158 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 175 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 176
164 // we need at least two lines for wrapping to work correctly 177 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 178 while (nrow + saveLines < 2)
166 { 179 {
167 //TODO//FIXME 180 //TODO//FIXME
… …
380 delete old_ta; 393 delete old_ta;
381 delete old_ra; 394 delete old_ra;
382 395
383 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
385
386 free (tabs);
387 } 398 }
388 399
389 CLEAR_ALL_SELECTION (); 400 CLEAR_ALL_SELECTION ();
390 401
391 prev_nrow = nrow; 402 prev_nrow = nrow;
392 prev_ncol = ncol; 403 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 404
402 tt_winch (); 405 tt_winch ();
403 406
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 407 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 408}
… …
417 delete ralloc; ralloc = 0; 420 delete ralloc; ralloc = 0;
418 421
419 free (row_buf); 422 free (row_buf);
420 free (swap_buf); 423 free (swap_buf);
421 free (drawn_buf); 424 free (drawn_buf);
425 row_buf = 0; // signal that we freed all the arrays above
426
422 free (tabs); 427 free (tabs);
423 428 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 429 }
426} 430}
427 431
428/* ------------------------------------------------------------------------- */ 432/* ------------------------------------------------------------------------- */
429/* 433/*
430 * Hard reset 434 * Hard/Soft reset
431 */ 435 */
432void 436void
433rxvt_term::scr_poweron () 437rxvt_term::scr_poweron ()
434{ 438{
435 scr_release (); 439 scr_release ();
436 prev_nrow = prev_ncol = 0; 440 prev_nrow = prev_ncol = 0;
437 scr_reset (); 441 scr_reset ();
438 442
439 scr_clear (true); 443 scr_clear (true);
440 scr_refresh (); 444 scr_refresh ();
445}
446
447void
448rxvt_term::scr_soft_reset ()
449{
450 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY
452 scr_overlay_off ();
453#endif
454
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY)
458 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
441} 469}
442 470
443/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
880 if (expect_false ( 908 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR 909 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1 910 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR) 911 && line->t[screen.cur.col + 1] == NOCHAR)
884 )) 912 ))
885 { 913 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 914
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 916
904 // if the character doesn't fit into the remaining columns... 917 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 918 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 919 {
907 // ...output spaces 920 // ... artificially enlargen the previous one
908 c = ' '; 921 c = NOCHAR;
909 // and try the same character next loop iteration 922 // and try the same character next loop iteration
910 --str; 923 --str;
911 } 924 }
912 925
913 line->touch (); 926 line->touch ();
… …
1338 { 1351 {
1339 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1340 1353
1341 if (mapped) 1354 if (mapped)
1342 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1345 } 1358 }
1346 else 1359 else
1347 { 1360 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1362
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1366 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1367 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1368 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1358 } 1371 }
… …
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,
1540 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1517 1541
1518 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1544 {
1521 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1899 XMapWindow (dpy, parent[0]); 1923 XMapWindow (dpy, parent[0]);
1900# endif 1924# endif
1901 1925
1902# if ENABLE_FRILLS 1926# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1927 if (option (Opt_urgentOnBell))
1904 { 1928 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 1929# endif
1912 1930
1913 if (option (Opt_visualBell)) 1931 if (option (Opt_visualBell))
1914 { 1932 {
1915 rvideo_bell = true; 1933 rvideo_bell = true;

Diff Legend

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