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.326 by root, Wed Nov 5 13:04:51 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
… …
267 278
268 if (top_row) 279 if (top_row)
269 { 280 {
270 // 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
271 // 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
272 284
273 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 287
276 do 288 do
… …
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 * ------------------------------------------------------------------------- */
… …
880 if (expect_false ( 907 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR) 910 && line->t[screen.cur.col + 1] == NOCHAR)
884 )) 911 ))
885 { 912 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 913
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 915
904 // if the character doesn't fit into the remaining columns... 916 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 918 {
907 // ...output spaces 919 // ... artificially enlargen the previous one
908 c = ' '; 920 c = NOCHAR;
909 // and try the same character next loop iteration 921 // and try the same character next loop iteration
910 --str; 922 --str;
911 } 923 }
912 924
913 line->touch (); 925 line->touch ();
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1330 return; 1342 return;
1331 1343
1332 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1333 1345
1334 /*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.
1335 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1352 {
1339 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1340 1354
1341 if (mapped) 1355 if (mapped && !view_start)
1342 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1345 } 1359 }
1346 else 1360 else
1347 { 1361 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1363
1364 if (mapped && !view_start)
1365 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1370 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1358 } 1375 }
1359 1376
1360 for (; num--; row++) 1377 for (; num--; row++)
1361 { 1378 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1364 } 1383 }
1365} 1384}
1366 1385
1367#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1368void 1387void
… …
1442 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1443 */ 1462 */
1444void 1463void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1465{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1466 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1452 1468
1453 if (count <= 0) 1469 if (count <= 0)
1454 return; 1470 return;
… …
1456 scr_do_wrap (); 1472 scr_do_wrap ();
1457 1473
1458 selection_check (1); 1474 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1460 1476
1461 row = screen.cur.row; 1477 int row = screen.cur.row;
1462 1478
1463 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1464 1480
1465 line->touch (); 1481 line->touch ();
1466 line->is_longer (0); 1482 line->is_longer (0);
1467 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1468 switch (insdel) 1488 switch (insdel)
1469 { 1489 {
1470 case INSERT: 1490 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 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);
1495
1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1497 {
1473 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1475 } 1500 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1501
1479 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1504 {
1482 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1520 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1522 selection_check (1);
1500 screen.cur.col -= count; 1523 screen.cur.col -= count;
1501 1524
1502 line->l = max (line->l - count, 0); 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 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1508 1534
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);
1538
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1540 {
1511 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1513 } 1543 }
1514 1544
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1546
1518 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1549 {
1521 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1899 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent[0]);
1900# endif 1929# endif
1901 1930
1902# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1904 { 1933 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 1934# endif
1912 1935
1913 if (option (Opt_visualBell)) 1936 if (option (Opt_visualBell))
1914 { 1937 {
1915 rvideo_bell = true; 1938 rvideo_bell = true;
… …
2210 continue; 2233 continue;
2211 2234
2212 // redraw one or more characters 2235 // redraw one or more characters
2213 2236
2214 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2216 --col; 2239 --col;
2217 2240
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2219 text_t *text = stp + col; 2242 text_t *text = stp + col;
2220 int count = 1; 2243 int count = 1;
… …
2257 2280
2258 col--; /* went one too far. move back */ 2281 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2282 count -= i; /* dump any matching trailing chars */
2260 2283
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2284 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2285 while (expect_false (i && text[count] == NOCHAR))
2263 count++, i--; 2286 count++, i--;
2264 2287
2265 /* 2288 /*
2266 * Determine the attributes for the string 2289 * Determine the attributes for the string
2267 */ 2290 */
2268 int fore = fgcolor_of (rend); // desired foreground 2291 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2292 int back = bgcolor_of (rend); // desired background
2270 2293
2271 // only do special processing if any attributes are set, which is unlikely 2294 // 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)) 2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2273 { 2296 {
2274 bool invert = rend & RS_RVid; 2297 bool invert = rend & RS_RVid;
2275 2298
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2299#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2300 if (rend & RS_Bold && fore == Color_fg)
… …
2360 /* 2383 /*
2361 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2362 */ 2385 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2387
2365 if (have_bg && back == Color_bg) 2388 if (expect_true (have_bg && back == Color_bg))
2366 { 2389 {
2367 // this is very ugly, maybe push it into ->draw? 2390 // this is very ugly, maybe push it into ->draw?
2368 2391
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2392 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2393 if (text[i] != ' ')
… …
2377 did_clear: ; 2400 did_clear: ;
2378 } 2401 }
2379 else 2402 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2404
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2406 {
2384#if ENABLE_FRILLS 2407#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2408 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2409 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2410 else

Diff Legend

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