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.314 by root, Tue Nov 4 14:34:13 2008 UTC vs.
Revision 1.325 by root, Wed Nov 5 12:28:15 2008 UTC

… …
143 col--; 143 col--;
144 144
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 147
148 // found begin, nuke 148 // found start, nuke
149 do { 149 do {
150 l.t[col] = ' '; 150 l.t[col] = ' ';
151 l.r[col] = rend; 151 l.r[col] = rend;
152 col++; 152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
… …
158 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
159 159
160void 160void
161rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
162{ 162{
163#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 163 view_start = 0;
169 num_scr = 0; 164 num_scr = 0;
170 165
171 if (ncol == 0) 166 if (ncol == 0)
172 ncol = 80; 167 ncol = 80;
… …
174 if (nrow == 0) 169 if (nrow == 0)
175 nrow = 24; 170 nrow = 24;
176 171
177 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 173 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 174
183 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
185 { 177 {
186 //TODO//FIXME 178 //TODO//FIXME
… …
286 278
287 if (top_row) 279 if (top_row)
288 { 280 {
289 // 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
290 // 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
291 284
292 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 287
295 do 288 do
… …
399 delete old_ta; 392 delete old_ta;
400 delete old_ra; 393 delete old_ra;
401 394
402 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
404
405 free (tabs);
406 } 397 }
407 398
408 CLEAR_ALL_SELECTION (); 399 CLEAR_ALL_SELECTION ();
409 400
410 prev_nrow = nrow; 401 prev_nrow = nrow;
411 prev_ncol = ncol; 402 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 403
421 tt_winch (); 404 tt_winch ();
422 405
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 406 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 407}
… …
436 delete ralloc; ralloc = 0; 419 delete ralloc; ralloc = 0;
437 420
438 free (row_buf); 421 free (row_buf);
439 free (swap_buf); 422 free (swap_buf);
440 free (drawn_buf); 423 free (drawn_buf);
424 row_buf = 0; // signal that we freed all the arrays above
425
441 free (tabs); 426 free (tabs);
442 427 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 428 }
445} 429}
446 430
447/* ------------------------------------------------------------------------- */ 431/* ------------------------------------------------------------------------- */
448/* 432/*
449 * Hard reset 433 * Hard/Soft reset
450 */ 434 */
451void 435void
452rxvt_term::scr_poweron () 436rxvt_term::scr_poweron ()
453{ 437{
454 scr_release (); 438 scr_release ();
455 prev_nrow = prev_ncol = 0; 439 prev_nrow = prev_ncol = 0;
440 rvideo_mode = false;
441 scr_soft_reset ();
456 scr_reset (); 442 scr_reset ();
457 443
458 scr_clear (true); 444 scr_clear (true);
459 scr_refresh (); 445 scr_refresh ();
446}
447
448void
449rxvt_term::scr_soft_reset ()
450{
451 /* only affects modes, nothing drastic such as clearing the screen */
452#if ENABLE_OVERLAY
453 scr_overlay_off ();
454#endif
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);
460} 468}
461 469
462/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 915
908 // if the character doesn't fit into the remaining columns... 916 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 918 {
911 // ...output spaces 919 // ... artificially enlargen the previous one
912 c = ' '; 920 c = NOCHAR;
913 // and try the same character next loop iteration 921 // and try the same character next loop iteration
914 --str; 922 --str;
915 } 923 }
916 924
917 line->touch (); 925 line->touch ();
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1334 return; 1342 return;
1335 1343
1336 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1337 1345
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1339 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1352 {
1343 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1344 1354
1345 if (mapped) 1355 if (mapped && !view_start)
1346 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1349 } 1359 }
1350 else 1360 else
1351 { 1361 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1363
1364 if (mapped && !view_start)
1365 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1370 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1362 } 1375 }
1363 1376
1364 for (; num--; row++) 1377 for (; num--; row++)
1365 { 1378 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1368 } 1383 }
1369} 1384}
1370 1385
1371#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1372void 1387void
… …
1464 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1465 1480
1466 line->touch (); 1481 line->touch ();
1467 line->is_longer (0); 1482 line->is_longer (0);
1468 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1469 switch (insdel) 1488 switch (insdel)
1470 { 1489 {
1471 case INSERT: 1490 case INSERT:
1472 line->l = min (line->l + count, ncol); 1491 line->l = min (line->l + count, ncol);
1492
1493 if (line->t[screen.cur.col] == NOCHAR)
1494 scr_kill_char (*line, screen.cur.col);
1473 1495
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) 1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1475 { 1497 {
1476 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1477 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
… …
1498 case ERASE: 1520 case ERASE:
1499 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1500 selection_check (1); 1522 selection_check (1);
1501 screen.cur.col -= count; 1523 screen.cur.col -= count;
1502 1524
1525 // nuke wide char after the end
1526 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1527 scr_kill_char (*line, screen.cur.col + count);
1528
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1530 break;
1505 1531
1506 case DELETE: 1532 case DELETE:
1507 {
1508 line->l = max (line->l - count, 0); 1533 line->l = max (line->l - count, 0);
1509 1534
1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1511 1538
1512 for (int col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1540 {
1514 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1516 } 1543 }
1517 1544
1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1522 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1523 1546
1524 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1526 { 1549 {
1527 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
1528 || (screen.cur.col >= selection.beg.col - count) 1551 || (screen.cur.col >= selection.beg.col - count)
1529 || selection.end.col >= ncol) 1552 || selection.end.col >= ncol)
1530 CLEAR_SELECTION (); 1553 CLEAR_SELECTION ();
1531 else 1554 else
1532 { 1555 {
1533 /* shift selection */ 1556 /* shift selection */
1534 selection.beg.col -= count; 1557 selection.beg.col -= count;
1535 selection.mark.col -= count; /* XXX: yes? */ 1558 selection.mark.col -= count; /* XXX: yes? */
1536 selection.end.col -= count; 1559 selection.end.col -= count;
1537 } 1560 }
1538 }
1539 } 1561 }
1540 1562
1541 break; 1563 break;
1542 } 1564 }
1543} 1565}

Diff Legend

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