… | |
… | |
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 |
|
|
138 | void |
|
|
139 | rxvt_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 | |
141 | void |
160 | void |
142 | rxvt_term::scr_reset () |
161 | rxvt_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); |
385 | |
|
|
386 | free (tabs); |
|
|
387 | } |
397 | } |
388 | |
398 | |
389 | CLEAR_ALL_SELECTION (); |
399 | CLEAR_ALL_SELECTION (); |
390 | |
400 | |
391 | prev_nrow = nrow; |
401 | prev_nrow = nrow; |
392 | prev_ncol = ncol; |
402 | 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 | |
403 | |
402 | tt_winch (); |
404 | tt_winch (); |
403 | |
405 | |
404 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
406 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
405 | } |
407 | } |
… | |
… | |
417 | delete ralloc; ralloc = 0; |
419 | delete ralloc; ralloc = 0; |
418 | |
420 | |
419 | free (row_buf); |
421 | free (row_buf); |
420 | free (swap_buf); |
422 | free (swap_buf); |
421 | free (drawn_buf); |
423 | free (drawn_buf); |
|
|
424 | row_buf = 0; // signal that we freed all the arrays above |
|
|
425 | |
422 | free (tabs); |
426 | free (tabs); |
423 | |
427 | tabs = 0; |
424 | row_buf = 0; // signal that we freed all the arrays |
|
|
425 | } |
428 | } |
426 | } |
429 | } |
427 | |
430 | |
428 | /* ------------------------------------------------------------------------- */ |
431 | /* ------------------------------------------------------------------------- */ |
429 | /* |
432 | /* |
430 | * Hard reset |
433 | * Hard/Soft reset |
431 | */ |
434 | */ |
432 | void |
435 | void |
433 | rxvt_term::scr_poweron () |
436 | rxvt_term::scr_poweron () |
434 | { |
437 | { |
435 | scr_release (); |
438 | scr_release (); |
436 | prev_nrow = prev_ncol = 0; |
439 | prev_nrow = prev_ncol = 0; |
|
|
440 | rvideo_mode = false; |
|
|
441 | scr_soft_reset (); |
437 | scr_reset (); |
442 | scr_reset (); |
438 | |
443 | |
439 | scr_clear (true); |
444 | scr_clear (true); |
440 | scr_refresh (); |
445 | scr_refresh (); |
|
|
446 | } |
|
|
447 | |
|
|
448 | void |
|
|
449 | rxvt_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); |
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 |
1368 | void |
1387 | void |
… | |
… | |
1442 | * Insert/Delete <count> characters from the current position |
1461 | * Insert/Delete <count> characters from the current position |
1443 | */ |
1462 | */ |
1444 | void |
1463 | void |
1445 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1464 | rxvt_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; |