… | |
… | |
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 |
… | |
… | |
220 | selection.text = NULL; |
231 | selection.text = NULL; |
221 | selection.len = 0; |
232 | selection.len = 0; |
222 | selection.op = SELECTION_CLEAR; |
233 | selection.op = SELECTION_CLEAR; |
223 | selection.screen = PRIMARY; |
234 | selection.screen = PRIMARY; |
224 | selection.clicks = 0; |
235 | selection.clicks = 0; |
|
|
236 | selection.clip_text = NULL; |
|
|
237 | selection.clip_len = 0; |
225 | } |
238 | } |
226 | else |
239 | else |
227 | { |
240 | { |
228 | /* |
241 | /* |
229 | * add or delete rows as appropriate |
242 | * add or delete rows as appropriate |
… | |
… | |
267 | |
280 | |
268 | if (top_row) |
281 | if (top_row) |
269 | { |
282 | { |
270 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
283 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
271 | // to come up with a lean and mean algorithm. |
284 | // to come up with a lean and mean algorithm. |
|
|
285 | // TODO: maybe optimise when width didn't change |
272 | |
286 | |
273 | row_col_t ocur = screen.cur; |
287 | row_col_t ocur = screen.cur; |
274 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
288 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
275 | |
289 | |
276 | do |
290 | do |
277 | { |
291 | { |
278 | p = MOD (p - 1, prev_total_rows); |
292 | p = MOD (p - 1, prev_total_rows); |
279 | #ifdef DEBUG_STRICT |
|
|
280 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | assert (old_buf [MOD (p, prev_total_rows)].t); |
281 | #endif |
|
|
282 | int plines = 1; |
294 | int plines = 1; |
283 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
295 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
284 | |
296 | |
285 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
297 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
286 | { |
298 | { |
… | |
… | |
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 | */ |
432 | void |
441 | void |
433 | rxvt_term::scr_poweron () |
442 | rxvt_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 | |
|
|
454 | void |
|
|
455 | rxvt_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 | * ------------------------------------------------------------------------- */ |
… | |
… | |
483 | } |
510 | } |
484 | |
511 | |
485 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
512 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
486 | min_it (s->cur.row, nrow - 1); |
513 | min_it (s->cur.row, nrow - 1); |
487 | min_it (s->cur.col, ncol - 1); |
514 | min_it (s->cur.col, ncol - 1); |
488 | #ifdef DEBUG_STRICT |
|
|
489 | assert (s->cur.row >= 0); |
515 | assert (s->cur.row >= 0); |
490 | assert (s->cur.col >= 0); |
516 | assert (s->cur.col >= 0); |
491 | #endif |
|
|
492 | } |
517 | } |
493 | |
518 | |
494 | void |
519 | void |
495 | rxvt_term::scr_swap_screen () |
520 | rxvt_term::scr_swap_screen () |
496 | { |
521 | { |
… | |
… | |
521 | want_refresh = 1; |
546 | want_refresh = 1; |
522 | view_start = 0; |
547 | view_start = 0; |
523 | |
548 | |
524 | selection_check (2); /* check for boundary cross */ |
549 | selection_check (2); /* check for boundary cross */ |
525 | |
550 | |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
551 | current_screen = scrn; |
527 | |
552 | |
528 | #if NSCREENS |
553 | #if NSCREENS |
529 | if (option (Opt_secondaryScreen)) |
554 | if (option (Opt_secondaryScreen)) |
530 | { |
555 | { |
531 | num_scr = 0; |
556 | num_scr = 0; |
… | |
… | |
756 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
781 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
757 | screen.cur.row -= minlines; |
782 | screen.cur.row -= minlines; |
758 | } |
783 | } |
759 | } |
784 | } |
760 | |
785 | |
761 | #ifdef DEBUG_STRICT |
|
|
762 | assert (screen.cur.col < ncol); |
786 | assert (screen.cur.col < ncol); |
763 | assert (screen.cur.row < nrow |
787 | assert (screen.cur.row < nrow |
764 | && screen.cur.row >= top_row); |
788 | && screen.cur.row >= top_row); |
765 | #endif |
|
|
766 | int row = screen.cur.row; |
789 | int row = screen.cur.row; |
767 | |
790 | |
768 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
791 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
769 | |
792 | |
770 | line_t *line = &ROW(row); |
793 | line_t *line = &ROW(row); |
… | |
… | |
880 | if (expect_false ( |
903 | if (expect_false ( |
881 | line->t[screen.cur.col] == NOCHAR |
904 | line->t[screen.cur.col] == NOCHAR |
882 | || (screen.cur.col < ncol - 1 |
905 | || (screen.cur.col < ncol - 1 |
883 | && line->t[screen.cur.col + 1] == NOCHAR) |
906 | && line->t[screen.cur.col + 1] == NOCHAR) |
884 | )) |
907 | )) |
885 | { |
908 | 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 | |
909 | |
902 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
910 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
903 | |
911 | |
904 | // if the character doesn't fit into the remaining columns... |
912 | // if the character doesn't fit into the remaining columns... |
905 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
913 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
906 | { |
914 | { |
907 | // ...output spaces |
915 | // ... artificially enlargen the previous one |
908 | c = ' '; |
916 | c = NOCHAR; |
909 | // and try the same character next loop iteration |
917 | // and try the same character next loop iteration |
910 | --str; |
918 | --str; |
911 | } |
919 | } |
912 | |
920 | |
913 | line->touch (); |
921 | line->touch (); |
… | |
… | |
989 | #endif |
997 | #endif |
990 | } |
998 | } |
991 | |
999 | |
992 | max_it (line->l, screen.cur.col); |
1000 | max_it (line->l, screen.cur.col); |
993 | |
1001 | |
994 | #ifdef DEBUG_STRICT |
|
|
995 | assert (screen.cur.row >= 0); |
1002 | assert (screen.cur.row >= 0); |
996 | #endif |
|
|
997 | } |
1003 | } |
998 | |
1004 | |
999 | /* ------------------------------------------------------------------------- */ |
1005 | /* ------------------------------------------------------------------------- */ |
1000 | /* |
1006 | /* |
1001 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1007 | * Process Backspace. Move back the cursor back a position, wrap if have to |
… | |
… | |
1329 | if (row >= nrow) /* Out Of Bounds */ |
1335 | if (row >= nrow) /* Out Of Bounds */ |
1330 | return; |
1336 | return; |
1331 | |
1337 | |
1332 | min_it (num, nrow - row); |
1338 | min_it (num, nrow - row); |
1333 | |
1339 | |
1334 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1340 | // TODO: the code below does not work when view_start != 0 |
|
|
1341 | // the workaround is to disable the clear and use a normal refresh |
|
|
1342 | // when view_start != 0. mysterious. |
1335 | if (rstyle & (RS_RVid | RS_Uline)) |
1343 | if (rstyle & (RS_RVid | RS_Uline)) |
1336 | ren = (rend_t) ~RS_None; |
1344 | ren = (rend_t) ~RS_None; |
1337 | else if (GET_BASEBG (rstyle) == Color_bg) |
1345 | else if (GET_BASEBG (rstyle) == Color_bg) |
1338 | { |
1346 | { |
1339 | ren = DEFAULT_RSTYLE; |
1347 | ren = DEFAULT_RSTYLE; |
1340 | |
1348 | |
1341 | if (mapped) |
1349 | if (mapped && !view_start) |
1342 | XClearArea (dpy, vt, 0, |
1350 | XClearArea (dpy, vt, 0, |
1343 | Row2Pixel (row), (unsigned int)width, |
1351 | Row2Pixel (row - view_start), (unsigned int)width, |
1344 | (unsigned int)Height2Pixel (num), False); |
1352 | (unsigned int)Height2Pixel (num), False); |
1345 | } |
1353 | } |
1346 | else |
1354 | else |
1347 | { |
1355 | { |
1348 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1356 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1349 | |
1357 | |
|
|
1358 | if (mapped && !view_start) |
|
|
1359 | { |
1350 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1360 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1351 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1352 | XFillRectangle (dpy, vt, gc, |
1362 | XFillRectangle (dpy, vt, gc, |
1353 | 0, Row2Pixel (row), |
1363 | 0, Row2Pixel (row - view_start), |
1354 | (unsigned int)width, |
1364 | (unsigned int)width, |
1355 | (unsigned int)Height2Pixel (num)); |
1365 | (unsigned int)Height2Pixel (num)); |
1356 | gcvalue.foreground = pix_colors[Color_fg]; |
1366 | gcvalue.foreground = pix_colors[Color_fg]; |
1357 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
|
|
1368 | } |
1358 | } |
1369 | } |
1359 | |
1370 | |
1360 | for (; num--; row++) |
1371 | for (; num--; row++) |
1361 | { |
1372 | { |
1362 | scr_blank_screen_mem (ROW(row), rstyle); |
1373 | scr_blank_screen_mem (ROW(row), rstyle); |
|
|
1374 | |
|
|
1375 | if (!view_start) |
1363 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1376 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1364 | } |
1377 | } |
1365 | } |
1378 | } |
1366 | |
1379 | |
1367 | #if !ENABLE_MINIMAL |
1380 | #if !ENABLE_MINIMAL |
1368 | void |
1381 | void |
… | |
… | |
1442 | * Insert/Delete <count> characters from the current position |
1455 | * Insert/Delete <count> characters from the current position |
1443 | */ |
1456 | */ |
1444 | void |
1457 | void |
1445 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1458 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1446 | { |
1459 | { |
1447 | int col, row; |
|
|
1448 | rend_t tr; |
|
|
1449 | |
|
|
1450 | want_refresh = 1; |
1460 | want_refresh = 1; |
1451 | ZERO_SCROLLBACK (); |
1461 | ZERO_SCROLLBACK (); |
1452 | |
1462 | |
1453 | if (count <= 0) |
1463 | if (count <= 0) |
1454 | return; |
1464 | return; |
… | |
… | |
1456 | scr_do_wrap (); |
1466 | scr_do_wrap (); |
1457 | |
1467 | |
1458 | selection_check (1); |
1468 | selection_check (1); |
1459 | min_it (count, ncol - screen.cur.col); |
1469 | min_it (count, ncol - screen.cur.col); |
1460 | |
1470 | |
1461 | row = screen.cur.row; |
1471 | int row = screen.cur.row; |
1462 | |
1472 | |
1463 | line_t *line = &ROW(row); |
1473 | line_t *line = &ROW(row); |
1464 | |
1474 | |
1465 | line->touch (); |
1475 | line->touch (); |
1466 | line->is_longer (0); |
1476 | line->is_longer (0); |
1467 | |
1477 | |
|
|
1478 | // nuke wide spanning the start |
|
|
1479 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1480 | scr_kill_char (*line, screen.cur.col); |
|
|
1481 | |
1468 | switch (insdel) |
1482 | switch (insdel) |
1469 | { |
1483 | { |
1470 | case INSERT: |
1484 | case INSERT: |
1471 | for (col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1485 | line->l = min (line->l + count, ncol); |
|
|
1486 | |
|
|
1487 | if (line->t[screen.cur.col] == NOCHAR) |
|
|
1488 | scr_kill_char (*line, screen.cur.col); |
|
|
1489 | |
|
|
1490 | for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) |
1472 | { |
1491 | { |
1473 | line->t[col] = line->t[col - count]; |
1492 | line->t[col] = line->t[col - count]; |
1474 | line->r[col] = line->r[col - count]; |
1493 | line->r[col] = line->r[col - count]; |
1475 | } |
1494 | } |
1476 | |
|
|
1477 | line->l = min (line->l + count, ncol); |
|
|
1478 | |
1495 | |
1479 | if (selection.op && current_screen == selection.screen |
1496 | if (selection.op && current_screen == selection.screen |
1480 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1497 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1481 | { |
1498 | { |
1482 | if (selection.end.row != screen.cur.row |
1499 | if (selection.end.row != screen.cur.row |
… | |
… | |
1497 | case ERASE: |
1514 | case ERASE: |
1498 | screen.cur.col += count; /* don't worry if > ncol */ |
1515 | screen.cur.col += count; /* don't worry if > ncol */ |
1499 | selection_check (1); |
1516 | selection_check (1); |
1500 | screen.cur.col -= count; |
1517 | screen.cur.col -= count; |
1501 | |
1518 | |
1502 | line->l = max (line->l - count, 0); |
1519 | // nuke wide char after the end |
|
|
1520 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1521 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1522 | |
1503 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1523 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1504 | break; |
1524 | break; |
1505 | |
1525 | |
1506 | case DELETE: |
1526 | case DELETE: |
1507 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1527 | line->l = max (line->l - count, 0); |
1508 | |
1528 | |
|
|
1529 | // nuke wide char spanning the end |
|
|
1530 | if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR) |
|
|
1531 | scr_kill_char (*line, screen.cur.col + count); |
|
|
1532 | |
1509 | for (col = screen.cur.col; (col + count) < ncol; col++) |
1533 | for (int col = screen.cur.col; (col + count) < ncol; col++) |
1510 | { |
1534 | { |
1511 | line->t[col] = line->t[col + count]; |
1535 | line->t[col] = line->t[col + count]; |
1512 | line->r[col] = line->r[col + count]; |
1536 | line->r[col] = line->r[col + count]; |
1513 | } |
1537 | } |
1514 | |
1538 | |
1515 | line->l = max (line->l - count, 0); |
|
|
1516 | scr_blank_line (*line, ncol - count, count, tr); |
1539 | scr_blank_line (*line, ncol - count, count, rstyle); |
1517 | |
1540 | |
1518 | if (selection.op && current_screen == selection.screen |
1541 | if (selection.op && current_screen == selection.screen |
1519 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1542 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1520 | { |
1543 | { |
1521 | if (selection.end.row != screen.cur.row |
1544 | if (selection.end.row != screen.cur.row |
… | |
… | |
1811 | for (i = PART_BEG; i < RC_COUNT; i++) |
1834 | for (i = PART_BEG; i < RC_COUNT; i++) |
1812 | { |
1835 | { |
1813 | min_it (rc[i].col, ncol - 1); |
1836 | min_it (rc[i].col, ncol - 1); |
1814 | min_it (rc[i].row, nrow - 1); |
1837 | min_it (rc[i].row, nrow - 1); |
1815 | } |
1838 | } |
1816 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1839 | |
1817 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1840 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1818 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1841 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1819 | |
1842 | |
1820 | num_scr_allow = 0; |
1843 | num_scr_allow = 0; |
1821 | |
1844 | |
… | |
… | |
1912 | |
1935 | |
1913 | bell_ev.start (VISUAL_BELL_DURATION); |
1936 | bell_ev.start (VISUAL_BELL_DURATION); |
1914 | } |
1937 | } |
1915 | else |
1938 | else |
1916 | XBell (dpy, 0); |
1939 | XBell (dpy, 0); |
|
|
1940 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1917 | #endif |
1941 | #endif |
1918 | } |
1942 | } |
1919 | |
1943 | |
1920 | /* ------------------------------------------------------------------------- */ |
1944 | /* ------------------------------------------------------------------------- */ |
1921 | /* ARGSUSED */ |
1945 | /* ARGSUSED */ |
… | |
… | |
1940 | row_start = view_start; |
1964 | row_start = view_start; |
1941 | } |
1965 | } |
1942 | |
1966 | |
1943 | wctomb (0, 0); |
1967 | wctomb (0, 0); |
1944 | |
1968 | |
1945 | for (int r1 = 0; r1 < nrows; r1++) |
1969 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1946 | { |
1970 | { |
1947 | text_t *tp = ROW(r1).t; |
1971 | text_t *tp = ROW(r1).t; |
1948 | int len = ROW(r1).l; |
1972 | int len = ROW(r1).l; |
1949 | |
1973 | |
1950 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
1974 | for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN |
… | |
… | |
1979 | * screen.text/screen.rend contain what the screen will change to. |
2003 | * screen.text/screen.rend contain what the screen will change to. |
1980 | */ |
2004 | */ |
1981 | void |
2005 | void |
1982 | rxvt_term::scr_refresh () NOTHROW |
2006 | rxvt_term::scr_refresh () NOTHROW |
1983 | { |
2007 | { |
1984 | unsigned char have_bg, |
|
|
1985 | showcursor; /* show the cursor */ |
|
|
1986 | int16_t col, row, /* column/row we're processing */ |
2008 | int16_t col, row, /* column/row we're processing */ |
1987 | ocrow; /* old cursor row */ |
2009 | ocrow; /* old cursor row */ |
1988 | int i; /* tmp */ |
2010 | int i; /* tmp */ |
1989 | #ifndef NO_CURSORCOLOR |
2011 | #ifndef NO_CURSORCOLOR |
1990 | rend_t cc1; /* store colours at cursor position (s) */ |
2012 | rend_t cc1; /* store colours at cursor position (s) */ |
… | |
… | |
2001 | /* |
2023 | /* |
2002 | * A: set up vars |
2024 | * A: set up vars |
2003 | */ |
2025 | */ |
2004 | refresh_count = 0; |
2026 | refresh_count = 0; |
2005 | |
2027 | |
|
|
2028 | unsigned int old_screen_flags = screen.flags; |
2006 | have_bg = 0; |
2029 | char have_bg = 0; |
2007 | #ifdef HAVE_BG_PIXMAP |
2030 | #ifdef HAVE_BG_PIXMAP |
2008 | have_bg = bgPixmap.pixmap != None; |
2031 | have_bg = bgPixmap.pixmap != None; |
2009 | #endif |
2032 | #endif |
2010 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2033 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2011 | |
2034 | |
2012 | /* |
2035 | /* |
2013 | * B: reverse any characters which are selected |
2036 | * B: reverse any characters which are selected |
2014 | */ |
2037 | */ |
2015 | scr_reverse_selection (); |
2038 | scr_reverse_selection (); |
|
|
2039 | |
|
|
2040 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2041 | #if ENABLE_OVERLAY |
|
|
2042 | scr_swap_overlay (); |
|
|
2043 | #endif |
|
|
2044 | |
|
|
2045 | char showcursor = screen.flags & Screen_VisibleCursor; |
2016 | |
2046 | |
2017 | /* |
2047 | /* |
2018 | * C: set the cursor character (s) |
2048 | * C: set the cursor character (s) |
2019 | */ |
2049 | */ |
2020 | { |
2050 | { |
2021 | unsigned char setoldcursor; |
2051 | unsigned char setoldcursor; |
2022 | |
2052 | |
2023 | showcursor = (screen.flags & Screen_VisibleCursor); |
|
|
2024 | #ifdef CURSOR_BLINK |
2053 | #ifdef CURSOR_BLINK |
2025 | if (hidden_cursor) |
2054 | if (hidden_cursor) |
2026 | showcursor = 0; |
2055 | showcursor = 0; |
2027 | #endif |
2056 | #endif |
2028 | |
2057 | |
… | |
… | |
2056 | ccol2 = bgcolor_of (rstyle); |
2085 | ccol2 = bgcolor_of (rstyle); |
2057 | #else |
2086 | #else |
2058 | ccol2 = Color_bg; |
2087 | ccol2 = Color_bg; |
2059 | #endif |
2088 | #endif |
2060 | |
2089 | |
2061 | if (showcursor && focus) |
2090 | if (focus) |
2062 | { |
2091 | { |
2063 | if (option (Opt_cursorUnderline)) |
2092 | if (option (Opt_cursorUnderline)) |
2064 | *crp ^= RS_Uline; |
2093 | *crp ^= RS_Uline; |
2065 | else |
2094 | else |
2066 | { |
2095 | { |
… | |
… | |
2101 | oldcursor.col = screen.cur.col; |
2130 | oldcursor.col = screen.cur.col; |
2102 | } |
2131 | } |
2103 | } |
2132 | } |
2104 | } |
2133 | } |
2105 | |
2134 | |
2106 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
|
|
2107 | #if ENABLE_OVERLAY |
|
|
2108 | scr_swap_overlay (); |
|
|
2109 | #endif |
|
|
2110 | |
|
|
2111 | #ifndef NO_SLOW_LINK_SUPPORT |
2135 | #ifndef NO_SLOW_LINK_SUPPORT |
2112 | /* |
2136 | /* |
2113 | * D: CopyArea pass - very useful for slower links |
2137 | * D: CopyArea pass - very useful for slower links |
2114 | * This has been deliberately kept simple. |
2138 | * This has been deliberately kept simple. |
2115 | */ |
2139 | */ |
… | |
… | |
2207 | |
2231 | |
2208 | // seek to the beginning of wide characters |
2232 | // seek to the beginning of wide characters |
2209 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2233 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2210 | --col; |
2234 | --col; |
2211 | |
2235 | |
2212 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2236 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2213 | text_t *text = stp + col; |
2237 | text_t *text = stp + col; |
2214 | int count = 1; |
2238 | int count = 1; |
2215 | |
2239 | |
2216 | dtp[col] = stp[col]; |
2240 | dtp[col] = stp[col]; |
2217 | drp[col] = rend; |
2241 | drp[col] = rend; |
… | |
… | |
2221 | for (i = 0; ++col < ncol; ) |
2245 | for (i = 0; ++col < ncol; ) |
2222 | { |
2246 | { |
2223 | if (stp[col] == NOCHAR) |
2247 | if (stp[col] == NOCHAR) |
2224 | { |
2248 | { |
2225 | dtp[col] = stp[col]; |
2249 | dtp[col] = stp[col]; |
2226 | drp[col] = rend; |
2250 | drp[col] = srp[col]; |
|
|
2251 | |
2227 | count++; |
2252 | count++; |
2228 | i++; |
2253 | i++; |
2229 | |
2254 | |
2230 | continue; |
2255 | continue; |
2231 | } |
2256 | } |
… | |
… | |
2261 | */ |
2286 | */ |
2262 | int fore = fgcolor_of (rend); // desired foreground |
2287 | int fore = fgcolor_of (rend); // desired foreground |
2263 | int back = bgcolor_of (rend); // desired background |
2288 | int back = bgcolor_of (rend); // desired background |
2264 | |
2289 | |
2265 | // only do special processing if any attributes are set, which is unlikely |
2290 | // only do special processing if any attributes are set, which is unlikely |
2266 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2291 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2267 | { |
2292 | { |
2268 | bool invert = rend & RS_RVid; |
2293 | bool invert = rend & RS_RVid; |
2269 | |
2294 | |
2270 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2295 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2271 | if (rend & RS_Bold && fore == Color_fg) |
2296 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2290 | |
2315 | |
2291 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2316 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2292 | fore = Color_UL; |
2317 | fore = Color_UL; |
2293 | #endif |
2318 | #endif |
2294 | |
2319 | |
|
|
2320 | #ifdef OPTION_HC |
|
|
2321 | if (rend & RS_Sel) |
|
|
2322 | { |
|
|
2323 | /* invert the column if no highlightColor is set or it is the |
|
|
2324 | * current cursor column */ |
|
|
2325 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2326 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2327 | { |
|
|
2328 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2329 | fore = Color_HTC; |
|
|
2330 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2331 | else if (!invert) |
|
|
2332 | fore = back; |
|
|
2333 | back = Color_HC; |
|
|
2334 | invert = 0; |
|
|
2335 | } |
|
|
2336 | } |
|
|
2337 | #endif |
|
|
2338 | |
2295 | if (invert) |
2339 | if (invert) |
2296 | { |
2340 | { |
2297 | #ifdef OPTION_HC |
|
|
2298 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2299 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2300 | #endif |
|
|
2301 | /* invert the column if no highlightColor is set or it is the |
|
|
2302 | * current cursor column */ |
|
|
2303 | ::swap (fore, back); |
2341 | ::swap (fore, back); |
2304 | #ifdef OPTION_HC |
|
|
2305 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2306 | back = Color_HC; |
|
|
2307 | #endif |
|
|
2308 | |
2342 | |
2309 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2343 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2310 | # ifndef OPTION_HC |
|
|
2311 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2312 | back = Color_RV; |
|
|
2313 | # endif |
|
|
2314 | if (fore == back) |
2344 | if (fore == back) |
2315 | { |
2345 | { |
2316 | fore = Color_bg; |
2346 | fore = Color_bg; |
2317 | back = Color_fg; |
2347 | back = Color_fg; |
2318 | } |
2348 | } |
… | |
… | |
2387 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2417 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2388 | } |
2418 | } |
2389 | } /* for (col....) */ |
2419 | } /* for (col....) */ |
2390 | } /* for (row....) */ |
2420 | } /* for (row....) */ |
2391 | |
2421 | |
2392 | #if ENABLE_OVERLAY |
|
|
2393 | scr_swap_overlay (); |
|
|
2394 | #endif |
|
|
2395 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2396 | |
|
|
2397 | /* |
2422 | /* |
2398 | * G: cleanup cursor and display outline cursor if necessary |
2423 | * G: cleanup cursor and display outline cursor if necessary |
2399 | */ |
2424 | */ |
2400 | if (showcursor) |
2425 | if (showcursor) |
2401 | { |
2426 | { |
… | |
… | |
2439 | } |
2464 | } |
2440 | |
2465 | |
2441 | /* |
2466 | /* |
2442 | * H: cleanup selection |
2467 | * H: cleanup selection |
2443 | */ |
2468 | */ |
|
|
2469 | #if ENABLE_OVERLAY |
|
|
2470 | scr_swap_overlay (); |
|
|
2471 | #endif |
|
|
2472 | HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END)); |
|
|
2473 | |
2444 | scr_reverse_selection (); |
2474 | scr_reverse_selection (); |
2445 | |
2475 | |
|
|
2476 | screen.flags = old_screen_flags; |
2446 | num_scr = 0; |
2477 | num_scr = 0; |
2447 | num_scr_allow = 1; |
2478 | num_scr_allow = 1; |
2448 | } |
2479 | } |
2449 | |
2480 | |
2450 | void |
2481 | void |
… | |
… | |
2570 | { |
2601 | { |
2571 | #if !ENABLE_MINIMAL |
2602 | #if !ENABLE_MINIMAL |
2572 | if (selection.rect) |
2603 | if (selection.rect) |
2573 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2604 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2574 | selection.end.row, selection.end.col, |
2605 | selection.end.row, selection.end.col, |
2575 | RS_RVid, RS_RVid | RS_Uline); |
2606 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2576 | else |
2607 | else |
2577 | #endif |
2608 | #endif |
2578 | scr_xor_span (selection.beg.row, selection.beg.col, |
2609 | scr_xor_span (selection.beg.row, selection.beg.col, |
2579 | selection.end.row, selection.end.col, |
2610 | selection.end.row, selection.end.col, |
2580 | RS_RVid); |
2611 | RS_Sel | RS_RVid); |
2581 | } |
2612 | } |
2582 | } |
2613 | } |
2583 | |
2614 | |
2584 | /* ------------------------------------------------------------------------- */ |
2615 | /* ------------------------------------------------------------------------- */ |
2585 | /* |
2616 | /* |
… | |
… | |
2878 | selection_wait = Sel_normal; |
2909 | selection_wait = Sel_normal; |
2879 | |
2910 | |
2880 | #if X_HAVE_UTF8_STRING |
2911 | #if X_HAVE_UTF8_STRING |
2881 | selection_type = Sel_UTF8String; |
2912 | selection_type = Sel_UTF8String; |
2882 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2913 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2883 | return; |
2914 | return; |
2884 | #else |
2915 | #else |
2885 | selection_type = Sel_CompoundText; |
2916 | selection_type = Sel_CompoundText; |
2886 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2917 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2887 | return; |
2918 | return; |
2888 | #endif |
2919 | #endif |
2889 | } |
2920 | } |
2890 | |
2921 | |
2891 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2922 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2892 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2923 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2920 | /* |
2951 | /* |
2921 | * Clear all selected text |
2952 | * Clear all selected text |
2922 | * EXT: SelectionClear |
2953 | * EXT: SelectionClear |
2923 | */ |
2954 | */ |
2924 | void |
2955 | void |
2925 | rxvt_term::selection_clear () NOTHROW |
2956 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2926 | { |
2957 | { |
|
|
2958 | if (!clipboard) |
|
|
2959 | { |
2927 | want_refresh = 1; |
2960 | want_refresh = 1; |
2928 | free (selection.text); |
2961 | free (selection.text); |
2929 | selection.text = NULL; |
2962 | selection.text = NULL; |
2930 | selection.len = 0; |
2963 | selection.len = 0; |
2931 | CLEAR_SELECTION (); |
2964 | CLEAR_SELECTION (); |
2932 | |
2965 | |
2933 | if (display->selection_owner == this) |
2966 | if (display->selection_owner == this) |
2934 | display->selection_owner = 0; |
2967 | display->selection_owner = 0; |
|
|
2968 | } |
|
|
2969 | else |
|
|
2970 | { |
|
|
2971 | free (selection.clip_text); |
|
|
2972 | selection.clip_text = NULL; |
|
|
2973 | selection.clip_len = 0; |
|
|
2974 | |
|
|
2975 | if (display->clipboard_owner == this) |
|
|
2976 | display->clipboard_owner = 0; |
|
|
2977 | } |
|
|
2978 | } |
|
|
2979 | |
|
|
2980 | void |
|
|
2981 | rxvt_term::clipboard_copy (Time tm) |
|
|
2982 | { |
|
|
2983 | if (selection.len > 0) |
|
|
2984 | { |
|
|
2985 | free (selection.clip_text); |
|
|
2986 | selection.clip_len = selection.len; |
|
|
2987 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2988 | memcpy (selection.clip_text, selection.text, |
|
|
2989 | sizeof (wchar_t) * selection.clip_len); |
|
|
2990 | selection_grab (tm, true); |
|
|
2991 | } |
2935 | } |
2992 | } |
2936 | |
2993 | |
2937 | /* ------------------------------------------------------------------------- */ |
2994 | /* ------------------------------------------------------------------------- */ |
2938 | /* |
2995 | /* |
2939 | * Copy a selection into the cut buffer |
2996 | * Copy a selection into the cut buffer |
… | |
… | |
3065 | |
3122 | |
3066 | selection_grab (tm); |
3123 | selection_grab (tm); |
3067 | } |
3124 | } |
3068 | |
3125 | |
3069 | bool |
3126 | bool |
3070 | rxvt_term::selection_grab (Time tm) NOTHROW |
3127 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3071 | { |
3128 | { |
|
|
3129 | Atom sel; |
|
|
3130 | |
|
|
3131 | if (!clipboard) |
|
|
3132 | { |
3072 | selection_time = tm; |
3133 | selection_time = tm; |
|
|
3134 | sel = XA_PRIMARY; |
|
|
3135 | } |
|
|
3136 | else |
|
|
3137 | { |
|
|
3138 | clipboard_time = tm; |
|
|
3139 | sel = xa[XA_CLIPBOARD]; |
|
|
3140 | } |
3073 | |
3141 | |
3074 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3142 | XSetSelectionOwner (dpy, sel, vt, tm); |
3075 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3143 | if (XGetSelectionOwner (dpy, sel) == vt) |
3076 | { |
3144 | { |
3077 | display->set_selection_owner (this); |
3145 | display->set_selection_owner (this, clipboard); |
3078 | return true; |
3146 | return true; |
3079 | } |
3147 | } |
3080 | else |
3148 | else |
3081 | { |
3149 | { |
3082 | selection_clear (); |
3150 | selection_clear (clipboard); |
3083 | return false; |
3151 | return false; |
3084 | } |
3152 | } |
3085 | |
3153 | |
3086 | #if 0 |
3154 | #if 0 |
3087 | XTextProperty ct; |
3155 | XTextProperty ct; |
… | |
… | |
3582 | else if (rq.target == xa[XA_MULTIPLE]) |
3650 | else if (rq.target == xa[XA_MULTIPLE]) |
3583 | { |
3651 | { |
3584 | /* TODO: Handle MULTIPLE */ |
3652 | /* TODO: Handle MULTIPLE */ |
3585 | } |
3653 | } |
3586 | #endif |
3654 | #endif |
3587 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3655 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3588 | { |
3656 | { |
3589 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3657 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3590 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3658 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3659 | ev.property = rq.property; |
|
|
3660 | } |
|
|
3661 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3662 | { |
|
|
3663 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3664 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3591 | ev.property = rq.property; |
3665 | ev.property = rq.property; |
3592 | } |
3666 | } |
3593 | else if (rq.target == XA_STRING |
3667 | else if (rq.target == XA_STRING |
3594 | || rq.target == xa[XA_TEXT] |
3668 | || rq.target == xa[XA_TEXT] |
3595 | || rq.target == xa[XA_COMPOUND_TEXT] |
3669 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3628 | { |
3702 | { |
3629 | target = xa[XA_COMPOUND_TEXT]; |
3703 | target = xa[XA_COMPOUND_TEXT]; |
3630 | style = enc_compound_text; |
3704 | style = enc_compound_text; |
3631 | } |
3705 | } |
3632 | |
3706 | |
3633 | if (selection.text) |
3707 | if (rq.selection == XA_PRIMARY && selection.text) |
3634 | { |
3708 | { |
3635 | cl = selection.text; |
3709 | cl = selection.text; |
3636 | selectlen = selection.len; |
3710 | selectlen = selection.len; |
|
|
3711 | } |
|
|
3712 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3713 | { |
|
|
3714 | cl = selection.clip_text; |
|
|
3715 | selectlen = selection.clip_len; |
3637 | } |
3716 | } |
3638 | else |
3717 | else |
3639 | { |
3718 | { |
3640 | cl = L""; |
3719 | cl = L""; |
3641 | selectlen = 0; |
3720 | selectlen = 0; |
… | |
… | |
3709 | h += 2; min_it (h, nrow); |
3788 | h += 2; min_it (h, nrow); |
3710 | |
3789 | |
3711 | x -= 1; clamp_it (x, 0, ncol - w); |
3790 | x -= 1; clamp_it (x, 0, ncol - w); |
3712 | y -= 1; clamp_it (y, 0, nrow - h); |
3791 | y -= 1; clamp_it (y, 0, nrow - h); |
3713 | |
3792 | |
3714 | ov_x = x; ov_y = y; |
3793 | ov.x = x; ov.y = y; |
3715 | ov_w = w; ov_h = h; |
3794 | ov.w = w; ov.h = h; |
3716 | |
3795 | |
3717 | ov_text = new text_t *[h]; |
3796 | ov.text = new text_t *[h]; |
3718 | ov_rend = new rend_t *[h]; |
3797 | ov.rend = new rend_t *[h]; |
3719 | |
3798 | |
3720 | for (y = 0; y < h; y++) |
3799 | for (y = 0; y < h; y++) |
3721 | { |
3800 | { |
3722 | text_t *tp = ov_text[y] = new text_t[w]; |
3801 | text_t *tp = ov.text[y] = new text_t[w]; |
3723 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
3802 | rend_t *rp = ov.rend[y] = new rend_t[w]; |
3724 | |
3803 | |
3725 | text_t t0, t1, t2; |
3804 | text_t t0, t1, t2; |
3726 | rend_t r = OVERLAY_RSTYLE; |
3805 | rend_t r = OVERLAY_RSTYLE; |
3727 | |
3806 | |
3728 | if (y == 0) |
3807 | if (y == 0) |
… | |
… | |
3747 | } |
3826 | } |
3748 | |
3827 | |
3749 | void |
3828 | void |
3750 | rxvt_term::scr_overlay_off () NOTHROW |
3829 | rxvt_term::scr_overlay_off () NOTHROW |
3751 | { |
3830 | { |
3752 | if (!ov_text) |
3831 | if (!ov.text) |
3753 | return; |
3832 | return; |
3754 | |
3833 | |
3755 | want_refresh = 1; |
3834 | want_refresh = 1; |
3756 | |
3835 | |
3757 | for (int y = 0; y < ov_h; y++) |
3836 | for (int y = 0; y < ov.h; y++) |
3758 | { |
3837 | { |
3759 | delete [] ov_text[y]; |
3838 | delete [] ov.text[y]; |
3760 | delete [] ov_rend[y]; |
3839 | delete [] ov.rend[y]; |
3761 | } |
3840 | } |
3762 | |
3841 | |
3763 | delete [] ov_text; ov_text = 0; |
3842 | delete [] ov.text; ov.text = 0; |
3764 | delete [] ov_rend; ov_rend = 0; |
3843 | delete [] ov.rend; ov.rend = 0; |
3765 | } |
3844 | } |
3766 | |
3845 | |
3767 | void |
3846 | void |
3768 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3847 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3769 | { |
3848 | { |
3770 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3849 | if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2) |
3771 | return; |
3850 | return; |
3772 | |
3851 | |
3773 | x++, y++; |
3852 | x++, y++; |
3774 | |
3853 | |
3775 | ov_text[y][x] = text; |
3854 | ov.text[y][x] = text; |
3776 | ov_rend[y][x] = rend; |
3855 | ov.rend[y][x] = rend; |
3777 | } |
3856 | } |
3778 | |
3857 | |
3779 | void |
3858 | void |
3780 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3859 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3781 | { |
3860 | { |
… | |
… | |
3800 | } |
3879 | } |
3801 | |
3880 | |
3802 | void |
3881 | void |
3803 | rxvt_term::scr_swap_overlay () NOTHROW |
3882 | rxvt_term::scr_swap_overlay () NOTHROW |
3804 | { |
3883 | { |
3805 | if (!ov_text) |
3884 | if (!ov.text) |
3806 | return; |
3885 | return; |
3807 | |
3886 | |
|
|
3887 | // hide cursor if it is within the overlay area |
|
|
3888 | if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w) |
|
|
3889 | && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h)) |
|
|
3890 | screen.flags &= ~Screen_VisibleCursor; |
|
|
3891 | |
3808 | // swap screen mem with overlay |
3892 | // swap screen mem with overlay |
3809 | for (int y = ov_h; y--; ) |
3893 | for (int y = ov.h; y--; ) |
3810 | { |
3894 | { |
3811 | text_t *t1 = ov_text[y]; |
3895 | text_t *t1 = ov.text[y]; |
3812 | rend_t *r1 = ov_rend[y]; |
3896 | rend_t *r1 = ov.rend[y]; |
3813 | |
3897 | |
3814 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3898 | text_t *t2 = ROW(y + ov.y + view_start).t + ov.x; |
3815 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3899 | rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x; |
3816 | |
3900 | |
3817 | for (int x = ov_w; x--; ) |
3901 | for (int x = ov.w; x--; ) |
3818 | { |
3902 | { |
3819 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3903 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3820 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3904 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3821 | } |
3905 | } |
3822 | } |
3906 | } |