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.324 by root, Wed Nov 5 00:01:01 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 ();
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1342 if (row >= nrow) /* Out Of Bounds */
1330 return; 1343 return;
1331 1344
1332 min_it (num, nrow - row); 1345 min_it (num, nrow - row);
1333 1346
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1347 // TODO: the code below does not work when view_start != 0
1348 // the workaround is to disable the clear and use a normal refresh
1349 // when view_start != 0. mysterious.
1335 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1353 {
1339 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1340 1355
1341 if (mapped) 1356 if (mapped && !view_start)
1342 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1345 } 1360 }
1346 else 1361 else
1347 { 1362 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1364
1365 if (mapped && !view_start)
1366 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1370 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1371 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1372 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1358 } 1376 }
1359 1377
1360 for (; num--; row++) 1378 for (; num--; row++)
1361 { 1379 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (!view_start)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1364 } 1384 }
1365} 1385}
1366 1386
1367#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1368void 1388void
… …
1442 * Insert/Delete <count> characters from the current position 1462 * Insert/Delete <count> characters from the current position
1443 */ 1463 */
1444void 1464void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1466{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1467 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1452 1469
1453 if (count <= 0) 1470 if (count <= 0)
1454 return; 1471 return;
… …
1456 scr_do_wrap (); 1473 scr_do_wrap ();
1457 1474
1458 selection_check (1); 1475 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1476 min_it (count, ncol - screen.cur.col);
1460 1477
1461 row = screen.cur.row; 1478 int row = screen.cur.row;
1462 1479
1463 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1464 1481
1465 line->touch (); 1482 line->touch ();
1466 line->is_longer (0); 1483 line->is_longer (0);
1467 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1468 switch (insdel) 1489 switch (insdel)
1469 { 1490 {
1470 case INSERT: 1491 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1492 line->l = min (line->l + count, ncol);
1493
1494 if (line->t[screen.cur.col] == NOCHAR)
1495 scr_kill_char (*line, screen.cur.col);
1496
1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1498 {
1473 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
1475 } 1501 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1502
1479 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1505 {
1482 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1521 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1523 selection_check (1);
1500 screen.cur.col -= count; 1524 screen.cur.col -= count;
1501 1525
1502 line->l = max (line->l - count, 0); 1526 // nuke wide char after the end
1527 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1528 scr_kill_char (*line, screen.cur.col + count);
1529
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1531 break;
1505 1532
1506 case DELETE: 1533 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 line->l = max (line->l - count, 0);
1508 1535
1536 // nuke wide char spanning the end
1537 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1538 scr_kill_char (*line, screen.cur.col + count);
1539
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1541 {
1511 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1513 } 1544 }
1514 1545
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count,
1547 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1517 1548
1518 if (selection.op && current_screen == selection.screen 1549 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1551 {
1521 if (selection.end.row != screen.cur.row 1552 if (selection.end.row != screen.cur.row
… …
1899 XMapWindow (dpy, parent[0]); 1930 XMapWindow (dpy, parent[0]);
1900# endif 1931# endif
1901 1932
1902# if ENABLE_FRILLS 1933# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1934 if (option (Opt_urgentOnBell))
1904 { 1935 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 1936# endif
1912 1937
1913 if (option (Opt_visualBell)) 1938 if (option (Opt_visualBell))
1914 { 1939 {
1915 rvideo_bell = true; 1940 rvideo_bell = true;
… …
2210 continue; 2235 continue;
2211 2236
2212 // redraw one or more characters 2237 // redraw one or more characters
2213 2238
2214 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2216 --col; 2241 --col;
2217 2242
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2219 text_t *text = stp + col; 2244 text_t *text = stp + col;
2220 int count = 1; 2245 int count = 1;
… …
2257 2282
2258 col--; /* went one too far. move back */ 2283 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2284 count -= i; /* dump any matching trailing chars */
2260 2285
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2286 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2287 while (expect_false (i && text[count] == NOCHAR))
2263 count++, i--; 2288 count++, i--;
2264 2289
2265 /* 2290 /*
2266 * Determine the attributes for the string 2291 * Determine the attributes for the string
2267 */ 2292 */
2268 int fore = fgcolor_of (rend); // desired foreground 2293 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2294 int back = bgcolor_of (rend); // desired background
2270 2295
2271 // only do special processing if any attributes are set, which is unlikely 2296 // 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)) 2297 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2273 { 2298 {
2274 bool invert = rend & RS_RVid; 2299 bool invert = rend & RS_RVid;
2275 2300
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2302 if (rend & RS_Bold && fore == Color_fg)
… …
2360 /* 2385 /*
2361 * Actually do the drawing of the string here 2386 * Actually do the drawing of the string here
2362 */ 2387 */
2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2388 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2364 2389
2365 if (have_bg && back == Color_bg) 2390 if (expect_true (have_bg && back == Color_bg))
2366 { 2391 {
2367 // this is very ugly, maybe push it into ->draw? 2392 // this is very ugly, maybe push it into ->draw?
2368 2393
2369 for (i = 0; i < count; i++) /* don't draw empty strings */ 2394 for (i = 0; i < count; i++) /* don't draw empty strings */
2370 if (text[i] != ' ') 2395 if (text[i] != ' ')
… …
2377 did_clear: ; 2402 did_clear: ;
2378 } 2403 }
2379 else 2404 else
2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2405 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2381 2406
2382 if (rend & RS_Uline && font->descent > 1 && fore != back) 2407 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2383 { 2408 {
2384#if ENABLE_FRILLS 2409#if ENABLE_FRILLS
2385 if (ISSET_PIXCOLOR (Color_underline)) 2410 if (ISSET_PIXCOLOR (Color_underline))
2386 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2411 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2387 else 2412 else

Diff Legend

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