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.319 by root, Tue Nov 4 23:08:44 2008 UTC vs.
Revision 1.326 by root, Wed Nov 5 13:04:51 2008 UTC

… …
278 278
279 if (top_row) 279 if (top_row)
280 { 280 {
281 // 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
282 // 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
283 284
284 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
285 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286 287
287 do 288 do
… …
393 394
394 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
395 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
396 } 397 }
397 398
399 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
404
398 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
399 406
400 prev_nrow = nrow; 407 prev_nrow = nrow;
401 prev_ncol = ncol; 408 prev_ncol = ncol;
402 409
… …
434void 441void
435rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
436{ 443{
437 scr_release (); 444 scr_release ();
438 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
439 scr_soft_reset (); 447 scr_soft_reset ();
440 scr_reset (); 448 scr_reset ();
441 449
442 scr_clear (true); 450 scr_clear (true);
443 scr_refresh (); 451 scr_refresh ();
… …
449 /* only affects modes, nothing drastic such as clearing the screen */ 457 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY 458#if ENABLE_OVERLAY
451 scr_overlay_off (); 459 scr_overlay_off ();
452#endif 460#endif
453 461
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY) 462 if (current_screen != PRIMARY)
457 scr_swap_screen (); 463 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 464
465 scr_scroll_region (0, MAX_ROWS - 1); 465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None); 466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0); 467 scr_insert_mode (0);
468} 468}
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1342 return; 1342 return;
1343 1343
1344 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1345 1345
1346 /*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.
1347 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1348 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1349 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1350 { 1352 {
1351 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1352 1354
1353 if (mapped) 1355 if (mapped && !view_start)
1354 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1355 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1356 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1357 } 1359 }
1358 else 1360 else
1359 { 1361 {
1360 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1361 1363
1364 if (mapped && !view_start)
1365 {
1362 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1363 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1364 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1365 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1366 (unsigned int)width, 1370 (unsigned int)width,
1367 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1368 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1369 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1370 } 1375 }
1371 1376
1372 for (; num--; row++) 1377 for (; num--; row++)
1373 { 1378 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1375 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1376 } 1383 }
1377} 1384}
1378 1385
1379#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1380void 1387void
… …
1533 { 1540 {
1534 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1535 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1536 } 1543 }
1537 1544
1538 scr_blank_line (*line, ncol - count, count, 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1539 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1540 1546
1541 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543 { 1549 {
1544 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row

Diff Legend

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