1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*--------------------------------*-C-*--------------------------------------* |
2 | * File: screen.c |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
7 | * |
7 | * |
… | |
… | |
189 | } |
189 | } |
190 | |
190 | |
191 | if (prev_nrow == 0) |
191 | if (prev_nrow == 0) |
192 | { |
192 | { |
193 | /* |
193 | /* |
194 | * first time called so just malloc everything : don't rely on realloc |
194 | * first time called so just malloc everything: don't rely on realloc |
195 | * Note: this is still needed so that all the scrollback lines are NULL |
195 | * Note: this is still needed so that all the scrollback lines are NULL |
196 | */ |
196 | */ |
197 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
197 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
198 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
198 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
199 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
199 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
… | |
… | |
256 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
256 | scr_scroll_text (0, (int)prev_nrow - 1, k, 1); |
257 | |
257 | |
258 | for (p = nrow; p < prev_nrow; p++) |
258 | for (p = nrow; p < prev_nrow; p++) |
259 | { |
259 | { |
260 | q = p + TermWin.saveLines; |
260 | q = p + TermWin.saveLines; |
|
|
261 | |
261 | if (screen.text[q]) |
262 | if (screen.text[q]) |
262 | { |
263 | { |
263 | #ifdef DEBUG_STRICT |
264 | #ifdef DEBUG_STRICT |
264 | assert (screen.rend[q]); |
265 | assert (screen.rend[q]); |
265 | #endif |
266 | #endif |
266 | talloc->free (screen.text[q]); |
267 | talloc->free (screen.text[q]); |
267 | ralloc->free (screen.rend[q]); |
268 | ralloc->free (screen.rend[q]); |
268 | } |
269 | } |
|
|
270 | |
269 | if (swap.text[p]) |
271 | if (swap.text[p]) |
270 | { |
272 | { |
271 | #ifdef DEBUG_STRICT |
273 | #ifdef DEBUG_STRICT |
272 | assert (swap.rend[p]); |
274 | assert (swap.rend[p]); |
273 | #endif |
275 | #endif |
274 | talloc->free (swap.text[p]); |
276 | talloc->free (swap.text[p]); |
275 | ralloc->free (swap.rend[p]); |
277 | ralloc->free (swap.rend[p]); |
276 | } |
278 | } |
|
|
279 | |
277 | #ifdef DEBUG_STRICT |
280 | #ifdef DEBUG_STRICT |
278 | assert (drawn_text[p] && drawn_rend[p]); |
281 | assert (drawn_text[p] && drawn_rend[p]); |
279 | #endif |
282 | #endif |
280 | talloc->free (drawn_text[p]); |
283 | talloc->free (drawn_text[p]); |
281 | ralloc->free (drawn_rend[p]); |
284 | ralloc->free (drawn_rend[p]); |
… | |
… | |
311 | swap.tlen[p] = 0; |
314 | swap.tlen[p] = 0; |
312 | swap.text[p] = NULL; |
315 | swap.text[p] = NULL; |
313 | swap.rend[p] = NULL; |
316 | swap.rend[p] = NULL; |
314 | drawn_text[p] = NULL; |
317 | drawn_text[p] = NULL; |
315 | drawn_rend[p] = NULL; |
318 | drawn_rend[p] = NULL; |
316 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
319 | scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); |
317 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
320 | scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); |
318 | } |
321 | } |
319 | |
322 | |
320 | if (k > 0) |
323 | if (k > 0) |
321 | { |
324 | { |
… | |
… | |
336 | } |
339 | } |
337 | |
340 | |
338 | /* resize columns */ |
341 | /* resize columns */ |
339 | if (ncol != prev_ncol) |
342 | if (ncol != prev_ncol) |
340 | { |
343 | { |
341 | int common = min (prev_ncol, ncol); |
|
|
342 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
344 | rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); |
343 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
345 | rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); |
344 | |
346 | |
345 | for (p = 0; p < total_rows; p++) |
347 | for (p = 0; p < total_rows; p++) |
346 | { |
348 | { |
347 | if (screen.text[p]) |
349 | if (screen.text[p]) |
348 | { |
350 | { |
349 | text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; |
351 | screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t)); |
350 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; |
352 | screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t)); |
351 | |
353 | |
352 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
354 | MIN_IT (screen.tlen[p], (int16_t)ncol); |
353 | |
355 | |
354 | if (ncol > prev_ncol) |
356 | if (ncol > prev_ncol) |
355 | scr_blank_line (& (screen.text[p][prev_ncol]), |
357 | scr_blank_line (&screen.text[p][prev_ncol], |
356 | & (screen.rend[p][prev_ncol]), |
358 | &screen.rend[p][prev_ncol], |
357 | ncol - prev_ncol, |
359 | ncol - prev_ncol, setrstyle); |
358 | setrstyle); |
|
|
359 | } |
360 | } |
360 | } |
361 | } |
361 | |
362 | |
362 | for (p = 0; p < nrow; p++) |
363 | for (p = 0; p < nrow; p++) |
363 | { |
364 | { |
364 | text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; |
365 | drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t)); |
365 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; |
366 | drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t)); |
366 | |
367 | |
367 | if (ncol > prev_ncol) |
368 | if (ncol > prev_ncol) |
368 | scr_blank_line (& (drawn_text[p][prev_ncol]), |
369 | scr_blank_line (&drawn_text[p][prev_ncol], |
369 | & (drawn_rend[p][prev_ncol]), |
370 | &drawn_rend[p][prev_ncol], |
370 | ncol - prev_ncol, setrstyle); |
371 | ncol - prev_ncol, setrstyle); |
371 | |
372 | |
372 | if (swap.text[p]) |
373 | if (swap.text[p]) |
373 | { |
374 | { |
374 | text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; |
375 | swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t)); |
375 | rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; |
376 | swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t)); |
376 | |
377 | |
377 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
378 | MIN_IT (swap.tlen[p], (int16_t)ncol); |
378 | |
379 | |
379 | if (ncol > prev_ncol) |
380 | if (ncol > prev_ncol) |
380 | scr_blank_line (& (swap.text[p][prev_ncol]), |
381 | scr_blank_line (&swap.text[p][prev_ncol], |
381 | & (swap.rend[p][prev_ncol]), |
382 | &swap.rend[p][prev_ncol], |
382 | ncol - prev_ncol, setrstyle); |
383 | ncol - prev_ncol, setrstyle); |
383 | } |
384 | } |
384 | |
385 | |
385 | } |
386 | } |
386 | |
387 | |
… | |
… | |
438 | { |
439 | { |
439 | uint16_t total_rows; |
440 | uint16_t total_rows; |
440 | int i; |
441 | int i; |
441 | |
442 | |
442 | total_rows = TermWin.nrow + TermWin.saveLines; |
443 | total_rows = TermWin.nrow + TermWin.saveLines; |
443 | |
|
|
444 | #ifdef DEBUG_STRICT |
|
|
445 | for (i = 0; i < total_rows; i++) |
|
|
446 | { |
|
|
447 | if (screen.text[i]) |
|
|
448 | /* then so is screen.rend[i] */ |
|
|
449 | assert (screen.rend[i]); |
|
|
450 | } |
|
|
451 | #endif |
|
|
452 | |
444 | |
453 | delete talloc; talloc = 0; |
445 | delete talloc; talloc = 0; |
454 | delete ralloc; ralloc = 0; |
446 | delete ralloc; ralloc = 0; |
455 | |
447 | |
456 | free (screen.text); |
448 | free (screen.text); |
… | |
… | |
485 | |
477 | |
486 | scr_release (); |
478 | scr_release (); |
487 | prev_nrow = prev_ncol = 0; |
479 | prev_nrow = prev_ncol = 0; |
488 | scr_reset (); |
480 | scr_reset (); |
489 | |
481 | |
490 | scr_clear (); |
482 | scr_clear (true); |
491 | scr_refresh (SLOW_REFRESH); |
483 | scr_refresh (SLOW_REFRESH); |
492 | } |
484 | } |
493 | |
485 | |
494 | /* ------------------------------------------------------------------------- * |
486 | /* ------------------------------------------------------------------------- * |
495 | * PROCESS SCREEN COMMANDS * |
487 | * PROCESS SCREEN COMMANDS * |
… | |
… | |
500 | * XTERM_SEQ: Restore cursor: ESC 8 |
492 | * XTERM_SEQ: Restore cursor: ESC 8 |
501 | */ |
493 | */ |
502 | void |
494 | void |
503 | rxvt_term::scr_cursor (int mode) |
495 | rxvt_term::scr_cursor (int mode) |
504 | { |
496 | { |
505 | screen_t *s; |
497 | screen_t *s; |
506 | |
498 | |
507 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
499 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
508 | |
500 | |
509 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
501 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
510 | if (current_screen == SECONDARY) |
502 | if (current_screen == SECONDARY) |
511 | s = & (swap); |
503 | s = &swap; |
512 | else |
504 | else |
513 | #endif |
505 | #endif |
514 | s = & (screen); |
506 | s = &screen; |
|
|
507 | |
515 | switch (mode) |
508 | switch (mode) |
516 | { |
509 | { |
517 | case SAVE: |
510 | case SAVE: |
518 | s->s_cur.row = s->cur.row; |
511 | s->s_cur.row = s->cur.row; |
519 | s->s_cur.col = s->cur.col; |
512 | s->s_cur.col = s->cur.col; |
520 | s->s_rstyle = rstyle; |
513 | s->s_rstyle = rstyle; |
521 | s->s_charset = s->charset; |
514 | s->s_charset = s->charset; |
522 | s->s_charset_char = charsets[s->charset]; |
515 | s->s_charset_char = charsets[s->charset]; |
523 | break; |
516 | break; |
|
|
517 | |
524 | case RESTORE: |
518 | case RESTORE: |
525 | want_refresh = 1; |
519 | want_refresh = 1; |
526 | s->cur.row = s->s_cur.row; |
520 | s->cur.row = s->s_cur.row; |
527 | s->cur.col = s->s_cur.col; |
521 | s->cur.col = s->s_cur.col; |
528 | s->flags &= ~Screen_WrapNext; |
522 | s->flags &= ~Screen_WrapNext; |
… | |
… | |
530 | s->charset = s->s_charset; |
524 | s->charset = s->s_charset; |
531 | charsets[s->charset] = s->s_charset_char; |
525 | charsets[s->charset] = s->s_charset_char; |
532 | set_font_style (); |
526 | set_font_style (); |
533 | break; |
527 | break; |
534 | } |
528 | } |
|
|
529 | |
535 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
530 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
536 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
531 | MIN_IT (s->cur.row, TermWin.nrow - 1); |
537 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
532 | MIN_IT (s->cur.col, TermWin.ncol - 1); |
538 | #ifdef DEBUG_STRICT |
533 | #ifdef DEBUG_STRICT |
539 | assert (s->cur.row >= 0); |
534 | assert (s->cur.row >= 0); |
… | |
… | |
551 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
546 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
552 | */ |
547 | */ |
553 | int |
548 | int |
554 | rxvt_term::scr_change_screen (int scrn) |
549 | rxvt_term::scr_change_screen (int scrn) |
555 | { |
550 | { |
556 | int i; |
551 | int i; |
557 | #if NSCREENS |
552 | #if NSCREENS |
558 | int offset; |
553 | int offset; |
559 | #endif |
554 | #endif |
560 | |
555 | |
561 | want_refresh = 1; |
556 | want_refresh = 1; |
562 | |
557 | |
563 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
558 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
564 | |
559 | |
565 | TermWin.view_start = 0; |
560 | TermWin.view_start = 0; |
566 | |
561 | |
567 | if (current_screen == scrn) |
562 | if (current_screen == scrn) |
568 | return current_screen; |
563 | return scrn; |
569 | |
564 | |
570 | selection_check (2); /* check for boundary cross */ |
565 | selection_check (2); /* check for boundary cross */ |
571 | |
566 | |
572 | SWAP_IT (current_screen, scrn, int); |
567 | SWAP_IT (current_screen, scrn, int); |
573 | #if NSCREENS |
568 | #if NSCREENS |
|
|
569 | if (Options & Opt_secondaryScreen) |
|
|
570 | { |
574 | num_scr = 0; |
571 | num_scr = 0; |
575 | offset = TermWin.saveLines; |
572 | offset = TermWin.saveLines; |
576 | for (i = prev_nrow; i--;) |
573 | for (i = prev_nrow; i--;) |
577 | { |
574 | { |
578 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
575 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
579 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
576 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
580 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
577 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
581 | } |
578 | } |
582 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
579 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
583 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
580 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
584 | # ifdef DEBUG_STRICT |
581 | # ifdef DEBUG_STRICT |
585 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
582 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
586 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
583 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
587 | # else /* drive with your eyes closed */ |
584 | # else /* drive with your eyes closed */ |
588 | MAX_IT (screen.cur.row, 0); |
585 | MAX_IT (screen.cur.row, 0); |
589 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
586 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
590 | MAX_IT (screen.cur.col, 0); |
587 | MAX_IT (screen.cur.col, 0); |
591 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
588 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
592 | # endif |
589 | # endif |
593 | SWAP_IT (screen.charset, swap.charset, int16_t); |
590 | SWAP_IT (screen.charset, swap.charset, int16_t); |
594 | SWAP_IT (screen.flags, swap.flags, int); |
591 | SWAP_IT (screen.flags, swap.flags, int); |
595 | screen.flags |= Screen_VisibleCursor; |
592 | screen.flags |= Screen_VisibleCursor; |
596 | swap.flags |= Screen_VisibleCursor; |
593 | swap.flags |= Screen_VisibleCursor; |
597 | #else |
594 | } |
598 | # ifdef SCROLL_ON_NO_SECONDARY |
595 | else |
|
|
596 | #endif |
|
|
597 | if (Options & Opt_secondaryScroll) |
599 | if (current_screen == PRIMARY) |
598 | //if (current_screen == PRIMARY) |
600 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
599 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
601 | # endif |
|
|
602 | #endif |
|
|
603 | return scrn; |
600 | return scrn; |
604 | } |
601 | } |
605 | |
602 | |
606 | /* ------------------------------------------------------------------------- */ |
603 | /* ------------------------------------------------------------------------- */ |
607 | /* |
604 | /* |
… | |
… | |
649 | return 0; |
646 | return 0; |
650 | |
647 | |
651 | want_refresh = 1; |
648 | want_refresh = 1; |
652 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
649 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
653 | |
650 | |
654 | if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) |
651 | if (row1 == 0 && count > 0 |
|
|
652 | && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) |
655 | { |
653 | { |
656 | nscrolled = (long)TermWin.nscrolled + (long)count; |
654 | nscrolled = (long)TermWin.nscrolled + (long)count; |
657 | |
655 | |
658 | if (nscrolled > (long)TermWin.saveLines) |
656 | if (nscrolled > (long)TermWin.saveLines) |
659 | TermWin.nscrolled = TermWin.saveLines; |
657 | TermWin.nscrolled = TermWin.saveLines; |
… | |
… | |
712 | for (i = 0, j = row1; i < count; i++, j++) |
710 | for (i = 0, j = row1; i < count; i++, j++) |
713 | { |
711 | { |
714 | buf_text[i] = screen.text[j]; |
712 | buf_text[i] = screen.text[j]; |
715 | buf_rend[i] = screen.rend[j]; |
713 | buf_rend[i] = screen.rend[j]; |
716 | } |
714 | } |
|
|
715 | |
717 | /* A2: Rotate lines */ |
716 | /* A2: Rotate lines */ |
718 | for (j = row1, i = j + count; i <= row2; i++, j++) |
717 | for (j = row1, i = j + count; i <= row2; i++, j++) |
719 | { |
718 | { |
720 | screen.tlen[j] = screen.tlen[i]; |
719 | screen.tlen[j] = screen.tlen[i]; |
721 | screen.text[j] = screen.text[i]; |
720 | screen.text[j] = screen.text[i]; |
722 | screen.rend[j] = screen.rend[i]; |
721 | screen.rend[j] = screen.rend[i]; |
723 | } |
722 | } |
|
|
723 | |
724 | j = row2 - count + 1, i = count; |
724 | j = row2 - count + 1, i = count; |
725 | } |
725 | } |
726 | else /* if (j < 0) */ |
726 | else /* if (j < 0) */ |
727 | { |
727 | { |
728 | /* B: scroll down */ |
728 | /* B: scroll down */ |
… | |
… | |
731 | for (i = 0, j = row2; i < count; i++, j--) |
731 | for (i = 0, j = row2; i < count; i++, j--) |
732 | { |
732 | { |
733 | buf_text[i] = screen.text[j]; |
733 | buf_text[i] = screen.text[j]; |
734 | buf_rend[i] = screen.rend[j]; |
734 | buf_rend[i] = screen.rend[j]; |
735 | } |
735 | } |
|
|
736 | |
736 | /* B2: Rotate lines */ |
737 | /* B2: Rotate lines */ |
737 | for (j = row2, i = j - count; i >= row1; i--, j--) |
738 | for (j = row2, i = j - count; i >= row1; i--, j--) |
738 | { |
739 | { |
739 | screen.tlen[j] = screen.tlen[i]; |
740 | screen.tlen[j] = screen.tlen[i]; |
740 | screen.text[j] = screen.text[i]; |
741 | screen.text[j] = screen.text[i]; |
741 | screen.rend[j] = screen.rend[i]; |
742 | screen.rend[j] = screen.rend[i]; |
742 | } |
743 | } |
|
|
744 | |
743 | j = row1, i = count; |
745 | j = row1, i = count; |
744 | count = -count; |
746 | count = -count; |
745 | } |
747 | } |
746 | |
748 | |
747 | /* C: Resurrect lines */ |
749 | /* C: Resurrect lines */ |
… | |
… | |
750 | screen.tlen[j] = 0; |
752 | screen.tlen[j] = 0; |
751 | screen.text[j] = buf_text[i]; |
753 | screen.text[j] = buf_text[i]; |
752 | screen.rend[j] = buf_rend[i]; |
754 | screen.rend[j] = buf_rend[i]; |
753 | |
755 | |
754 | if (!spec) /* line length may not equal TermWin.ncol */ |
756 | if (!spec) /* line length may not equal TermWin.ncol */ |
755 | scr_blank_screen_mem (screen.text, screen.rend, |
757 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); |
756 | (unsigned int)j, rstyle); |
|
|
757 | } |
758 | } |
758 | |
759 | |
759 | return count; |
760 | return count; |
760 | } |
761 | } |
761 | |
762 | |
… | |
… | |
801 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
802 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
802 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
803 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
803 | #endif |
804 | #endif |
804 | row = screen.cur.row + TermWin.saveLines; |
805 | row = screen.cur.row + TermWin.saveLines; |
805 | |
806 | |
806 | checksel = (selection.op |
807 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
807 | && current_screen == selection.screen) ? 1 : 0; |
|
|
808 | clearsel = 0; |
808 | clearsel = 0; |
809 | |
809 | |
810 | stp = screen.text[row]; |
810 | stp = screen.text[row]; |
811 | srp = screen.rend[row]; |
811 | srp = screen.rend[row]; |
812 | |
812 | |
813 | for (i = 0; i < len;) |
813 | while (len--) |
814 | { |
814 | { |
815 | c = str[i++]; |
815 | c = *str++; |
|
|
816 | |
|
|
817 | if (c < 0x20) |
816 | switch (c) |
818 | switch (c) |
817 | { |
819 | { |
818 | case '\t': |
820 | case C0_HT: |
819 | scr_tab (1); |
821 | scr_tab (1); |
820 | continue; |
822 | continue; |
821 | case '\n': |
823 | |
|
|
824 | case C0_LF: |
822 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
825 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
823 | MAX_IT (screen.tlen[row], screen.cur.col); |
826 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
827 | |
824 | screen.flags &= ~Screen_WrapNext; |
828 | screen.flags &= ~Screen_WrapNext; |
|
|
829 | |
825 | if (screen.cur.row == screen.bscroll) |
830 | if (screen.cur.row == screen.bscroll) |
826 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
831 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
827 | else if (screen.cur.row < (TermWin.nrow - 1)) |
832 | else if (screen.cur.row < (TermWin.nrow - 1)) |
828 | row = (++screen.cur.row) + TermWin.saveLines; |
833 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
834 | |
829 | stp = screen.text[row]; /* _must_ refresh */ |
835 | stp = screen.text[row]; /* _must_ refresh */ |
830 | srp = screen.rend[row]; /* _must_ refresh */ |
836 | srp = screen.rend[row]; /* _must_ refresh */ |
831 | continue; |
837 | continue; |
832 | case '\r': |
838 | |
|
|
839 | case C0_CR: |
833 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
840 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
834 | MAX_IT (screen.tlen[row], screen.cur.col); |
841 | MAX_IT (screen.tlen[row], screen.cur.col); |
|
|
842 | |
835 | screen.flags &= ~Screen_WrapNext; |
843 | screen.flags &= ~Screen_WrapNext; |
836 | screen.cur.col = 0; |
844 | screen.cur.col = 0; |
837 | continue; |
845 | continue; |
838 | default: |
|
|
839 | if (c == 127) |
|
|
840 | continue; /* yummmm..... */ |
|
|
841 | break; |
|
|
842 | } |
846 | } |
843 | |
847 | |
844 | if (checksel /* see if we're writing within selection */ |
848 | if (checksel /* see if we're writing within selection */ |
845 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
849 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
846 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
850 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
847 | { |
851 | { |
… | |
… | |
866 | if (screen.flags & Screen_Insert) |
870 | if (screen.flags & Screen_Insert) |
867 | scr_insdel_chars (1, INSERT); |
871 | scr_insdel_chars (1, INSERT); |
868 | |
872 | |
869 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
873 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
870 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
874 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
871 | // characters have width -1 (DOH!) on gnu/linux sometimes. |
875 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
872 | int width = c < 256 ? 1 : wcwidth (c); |
876 | int width = c < 256 ? 1 : wcwidth (c); |
873 | |
877 | |
874 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
878 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
875 | switch (c) |
|
|
876 | { |
879 | { |
877 | // vt100 special graphics and line drawing |
880 | // vt100 special graphics and line drawing |
878 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
881 | static uint16_t vt100_0[32] = { // 5f .. 7e |
879 | case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; |
882 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
880 | case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; |
883 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
881 | case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; |
884 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
882 | case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; |
885 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
883 | case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; |
|
|
884 | case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; |
|
|
885 | case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; |
|
|
886 | case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; |
|
|
887 | case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; |
|
|
888 | case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
|
|
889 | } |
886 | }; |
890 | |
887 | |
|
|
888 | if (c >= 0x5f && c <= 0x7e) |
|
|
889 | { |
|
|
890 | c = vt100_0[c - 0x5f]; |
|
|
891 | width = 1; |
|
|
892 | } |
|
|
893 | } |
|
|
894 | |
891 | if (width > 0) |
895 | if (width != 0) |
892 | { |
896 | { |
893 | #if !UNICODE_3 && ENABLE_COMBINING |
897 | #if !UNICODE_3 && ENABLE_COMBINING |
894 | // trim characters we can't store directly :( |
898 | // trim characters we can't store directly :( |
895 | if (c >= 0x10000) |
899 | if (c >= 0x10000) |
896 | c = rxvt_composite.compose (c); // map to lower 16 bits |
900 | c = rxvt_composite.compose (c); // map to lower 16 bits |
… | |
… | |
988 | */ |
992 | */ |
989 | void |
993 | void |
990 | rxvt_term::scr_backspace () |
994 | rxvt_term::scr_backspace () |
991 | { |
995 | { |
992 | want_refresh = 1; |
996 | want_refresh = 1; |
|
|
997 | |
993 | if (screen.cur.col == 0) |
998 | if (screen.cur.col == 0) |
994 | { |
999 | { |
995 | if (screen.cur.row > 0) |
1000 | if (screen.cur.row > 0) |
996 | { |
1001 | { |
997 | #ifdef TERMCAP_HAS_BW |
1002 | #ifdef TERMCAP_HAS_BW |
… | |
… | |
1002 | |
1007 | |
1003 | } |
1008 | } |
1004 | } |
1009 | } |
1005 | else if ((screen.flags & Screen_WrapNext) == 0) |
1010 | else if ((screen.flags & Screen_WrapNext) == 0) |
1006 | scr_gotorc (0, -1, RELATIVE); |
1011 | scr_gotorc (0, -1, RELATIVE); |
|
|
1012 | |
1007 | screen.flags &= ~Screen_WrapNext; |
1013 | screen.flags &= ~Screen_WrapNext; |
1008 | } |
1014 | } |
1009 | |
1015 | |
1010 | /* ------------------------------------------------------------------------- */ |
1016 | /* ------------------------------------------------------------------------- */ |
1011 | /* |
1017 | /* |
… | |
… | |
1014 | * XTERM_SEQ: CTRL-I |
1020 | * XTERM_SEQ: CTRL-I |
1015 | */ |
1021 | */ |
1016 | void |
1022 | void |
1017 | rxvt_term::scr_tab (int count) |
1023 | rxvt_term::scr_tab (int count) |
1018 | { |
1024 | { |
1019 | int i, x; |
1025 | int i, x; |
1020 | |
1026 | |
1021 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1027 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1022 | want_refresh = 1; |
1028 | want_refresh = 1; |
1023 | i = x = screen.cur.col; |
1029 | i = x = screen.cur.col; |
|
|
1030 | |
1024 | if (count == 0) |
1031 | if (count == 0) |
1025 | return; |
1032 | return; |
1026 | else if (count > 0) |
1033 | else if (count > 0) |
1027 | { |
1034 | { |
1028 | for (; ++i < TermWin.ncol; ) |
1035 | for (; ++i < TermWin.ncol; ) |
… | |
… | |
1030 | { |
1037 | { |
1031 | x = i; |
1038 | x = i; |
1032 | if (!--count) |
1039 | if (!--count) |
1033 | break; |
1040 | break; |
1034 | } |
1041 | } |
|
|
1042 | |
1035 | if (count) |
1043 | if (count) |
1036 | x = TermWin.ncol - 1; |
1044 | x = TermWin.ncol - 1; |
1037 | } |
1045 | } |
1038 | else /* if (count < 0) */ |
1046 | else /* if (count < 0) */ |
1039 | { |
1047 | { |
… | |
… | |
1042 | { |
1050 | { |
1043 | x = i; |
1051 | x = i; |
1044 | if (!++count) |
1052 | if (!++count) |
1045 | break; |
1053 | break; |
1046 | } |
1054 | } |
|
|
1055 | |
1047 | if (count) |
1056 | if (count) |
1048 | x = 0; |
1057 | x = 0; |
1049 | } |
1058 | } |
|
|
1059 | |
1050 | if (x != screen.cur.col) |
1060 | if (x != screen.cur.col) |
1051 | scr_gotorc (0, x, R_RELATIVE); |
1061 | scr_gotorc (0, x, R_RELATIVE); |
1052 | } |
1062 | } |
1053 | |
1063 | |
1054 | /* ------------------------------------------------------------------------- */ |
1064 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1111 | want_refresh = 1; |
1121 | want_refresh = 1; |
1112 | ZERO_SCROLLBACK (); |
1122 | ZERO_SCROLLBACK (); |
1113 | |
1123 | |
1114 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1124 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
1115 | |
1125 | |
1116 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1126 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1117 | : col); |
|
|
1118 | MAX_IT (screen.cur.col, 0); |
1127 | MAX_IT (screen.cur.col, 0); |
1119 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1128 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1120 | |
1129 | |
1121 | screen.flags &= ~Screen_WrapNext; |
1130 | screen.flags &= ~Screen_WrapNext; |
1122 | if (relative & R_RELATIVE) |
1131 | if (relative & R_RELATIVE) |
… | |
… | |
1161 | * direction should be UP or DN |
1170 | * direction should be UP or DN |
1162 | */ |
1171 | */ |
1163 | void |
1172 | void |
1164 | rxvt_term::scr_index (enum page_dirn direction) |
1173 | rxvt_term::scr_index (enum page_dirn direction) |
1165 | { |
1174 | { |
1166 | int dirn; |
1175 | int dirn; |
1167 | |
1176 | |
1168 | want_refresh = 1; |
1177 | want_refresh = 1; |
1169 | dirn = ((direction == UP) ? 1 : -1); |
1178 | dirn = ((direction == UP) ? 1 : -1); |
1170 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1179 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1171 | |
1180 | |
… | |
… | |
1231 | default: |
1240 | default: |
1232 | return; |
1241 | return; |
1233 | } |
1242 | } |
1234 | |
1243 | |
1235 | if (screen.text[row]) |
1244 | if (screen.text[row]) |
1236 | scr_blank_line (& (screen.text[row][col]), |
1245 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
1237 | & (screen.rend[row][col]), num, rstyle); |
|
|
1238 | else |
1246 | else |
1239 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1247 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1240 | } |
1248 | } |
1241 | |
1249 | |
1242 | /* ------------------------------------------------------------------------- */ |
1250 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1247 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1255 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1248 | */ |
1256 | */ |
1249 | void |
1257 | void |
1250 | rxvt_term::scr_erase_screen (int mode) |
1258 | rxvt_term::scr_erase_screen (int mode) |
1251 | { |
1259 | { |
1252 | int num; |
1260 | int num; |
1253 | int32_t row, row_offset; |
1261 | int32_t row, row_offset; |
1254 | rend_t ren; |
1262 | rend_t ren; |
1255 | XGCValues gcvalue; |
1263 | XGCValues gcvalue; |
1256 | |
1264 | |
1257 | want_refresh = 1; |
1265 | want_refresh = 1; |
1258 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1266 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
1259 | ZERO_SCROLLBACK (); |
1267 | ZERO_SCROLLBACK (); |
1260 | row_offset = (int32_t)TermWin.saveLines; |
1268 | row_offset = (int32_t)TermWin.saveLines; |
… | |
… | |
1279 | num = TermWin.nrow; |
1287 | num = TermWin.nrow; |
1280 | break; |
1288 | break; |
1281 | default: |
1289 | default: |
1282 | return; |
1290 | return; |
1283 | } |
1291 | } |
|
|
1292 | |
1284 | refresh_type |= REFRESH_BOUNDS; |
1293 | refresh_type |= REFRESH_BOUNDS; |
|
|
1294 | |
1285 | if (selection.op && current_screen == selection.screen |
1295 | if (selection.op && current_screen == selection.screen |
1286 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1296 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1287 | || (selection.end.row >= row |
1297 | || (selection.end.row >= row |
1288 | && selection.end.row <= row + num))) |
1298 | && selection.end.row <= row + num))) |
1289 | CLEAR_SELECTION (); |
1299 | CLEAR_SELECTION (); |
|
|
1300 | |
1290 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1301 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1291 | return; |
1302 | return; |
|
|
1303 | |
1292 | MIN_IT (num, (TermWin.nrow - row)); |
1304 | MIN_IT (num, (TermWin.nrow - row)); |
|
|
1305 | |
1293 | if (rstyle & (RS_RVid | RS_Uline)) |
1306 | if (rstyle & (RS_RVid | RS_Uline)) |
1294 | ren = (rend_t) ~RS_None; |
1307 | ren = (rend_t) ~RS_None; |
1295 | else if (GET_BASEBG (rstyle) == Color_bg) |
1308 | else if (GET_BASEBG (rstyle) == Color_bg) |
1296 | { |
1309 | { |
1297 | ren = DEFAULT_RSTYLE; |
1310 | ren = DEFAULT_RSTYLE; |
… | |
… | |
1304 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1317 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1305 | ERASE_ROWS (row, num); |
1318 | ERASE_ROWS (row, num); |
1306 | gcvalue.foreground = PixColors[Color_fg]; |
1319 | gcvalue.foreground = PixColors[Color_fg]; |
1307 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1320 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1308 | } |
1321 | } |
|
|
1322 | |
1309 | for (; num--; row++) |
1323 | for (; num--; row++) |
1310 | { |
1324 | { |
1311 | scr_blank_screen_mem (screen.text, screen.rend, |
1325 | scr_blank_screen_mem (screen.text, screen.rend, |
1312 | (unsigned int) (row + row_offset), rstyle); |
1326 | (unsigned int) (row + row_offset), rstyle); |
1313 | screen.tlen[row + row_offset] = 0; |
1327 | screen.tlen[row + row_offset] = 0; |
… | |
… | |
1347 | * Insert/Delete <count> lines |
1361 | * Insert/Delete <count> lines |
1348 | */ |
1362 | */ |
1349 | void |
1363 | void |
1350 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1364 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1351 | { |
1365 | { |
1352 | int end; |
1366 | int end; |
1353 | |
1367 | |
1354 | ZERO_SCROLLBACK (); |
1368 | ZERO_SCROLLBACK (); |
1355 | |
1369 | |
1356 | selection_check (1); |
1370 | selection_check (1); |
1357 | |
1371 | |
… | |
… | |
1376 | * Insert/Delete <count> characters from the current position |
1390 | * Insert/Delete <count> characters from the current position |
1377 | */ |
1391 | */ |
1378 | void |
1392 | void |
1379 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1393 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1380 | { |
1394 | { |
1381 | int col, row; |
1395 | int col, row; |
1382 | rend_t tr; |
1396 | rend_t tr; |
1383 | text_t *stp; |
1397 | text_t *stp; |
1384 | rend_t *srp; |
1398 | rend_t *srp; |
1385 | int16_t *slp; |
1399 | int16_t *slp; |
1386 | |
1400 | |
1387 | want_refresh = 1; |
1401 | want_refresh = 1; |
1388 | ZERO_SCROLLBACK (); |
1402 | ZERO_SCROLLBACK (); |
1389 | |
1403 | |
1390 | if (count <= 0) |
1404 | if (count <= 0) |
… | |
… | |
1397 | screen.flags &= ~Screen_WrapNext; |
1411 | screen.flags &= ~Screen_WrapNext; |
1398 | |
1412 | |
1399 | stp = screen.text[row]; |
1413 | stp = screen.text[row]; |
1400 | srp = screen.rend[row]; |
1414 | srp = screen.rend[row]; |
1401 | slp = & (screen.tlen[row]); |
1415 | slp = & (screen.tlen[row]); |
|
|
1416 | |
1402 | switch (insdel) |
1417 | switch (insdel) |
1403 | { |
1418 | { |
1404 | case INSERT: |
1419 | case INSERT: |
1405 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1420 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1406 | col--) |
1421 | col--) |
1407 | { |
1422 | { |
1408 | stp[col] = stp[col - count]; |
1423 | stp[col] = stp[col - count]; |
1409 | srp[col] = srp[col - count]; |
1424 | srp[col] = srp[col - count]; |
1410 | } |
1425 | } |
|
|
1426 | |
1411 | if (*slp != -1) |
1427 | if (*slp != -1) |
1412 | { |
1428 | { |
1413 | *slp += count; |
1429 | *slp += count; |
1414 | MIN_IT (*slp, TermWin.ncol); |
1430 | MIN_IT (*slp, TermWin.ncol); |
1415 | } |
1431 | } |
|
|
1432 | |
1416 | if (selection.op && current_screen == selection.screen |
1433 | if (selection.op && current_screen == selection.screen |
1417 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1434 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1418 | { |
1435 | { |
1419 | if (selection.end.row != screen.cur.row |
1436 | if (selection.end.row != screen.cur.row |
1420 | || (selection.end.col + count >= TermWin.ncol)) |
1437 | || (selection.end.col + count >= TermWin.ncol)) |
… | |
… | |
1424 | selection.beg.col += count; |
1441 | selection.beg.col += count; |
1425 | selection.mark.col += count; /* XXX: yes? */ |
1442 | selection.mark.col += count; /* XXX: yes? */ |
1426 | selection.end.col += count; |
1443 | selection.end.col += count; |
1427 | } |
1444 | } |
1428 | } |
1445 | } |
|
|
1446 | |
1429 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1447 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1430 | (unsigned int)count, rstyle); |
1448 | (unsigned int)count, rstyle); |
1431 | break; |
1449 | break; |
|
|
1450 | |
1432 | case ERASE: |
1451 | case ERASE: |
1433 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1452 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1434 | selection_check (1); |
1453 | selection_check (1); |
1435 | screen.cur.col -= count; |
1454 | screen.cur.col -= count; |
1436 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1455 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1437 | (unsigned int)count, rstyle); |
1456 | (unsigned int)count, rstyle); |
1438 | break; |
1457 | break; |
|
|
1458 | |
1439 | case DELETE: |
1459 | case DELETE: |
1440 | tr = srp[TermWin.ncol - 1] |
|
|
1441 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1460 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
|
|
1461 | |
1442 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1462 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1443 | { |
1463 | { |
1444 | stp[col] = stp[col + count]; |
1464 | stp[col] = stp[col + count]; |
1445 | srp[col] = srp[col + count]; |
1465 | srp[col] = srp[col + count]; |
1446 | } |
1466 | } |
|
|
1467 | |
1447 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1468 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1448 | & (srp[TermWin.ncol - count]), |
1469 | & (srp[TermWin.ncol - count]), |
1449 | (unsigned int)count, tr); |
1470 | (unsigned int)count, tr); |
|
|
1471 | |
1450 | if (*slp == -1) /* break line continuation */ |
1472 | if (*slp == -1) /* break line continuation */ |
1451 | *slp = TermWin.ncol; |
1473 | *slp = TermWin.ncol; |
|
|
1474 | |
1452 | *slp -= count; |
1475 | *slp -= count; |
1453 | MAX_IT (*slp, 0); |
1476 | MAX_IT (*slp, 0); |
|
|
1477 | |
1454 | if (selection.op && current_screen == selection.screen |
1478 | if (selection.op && current_screen == selection.screen |
1455 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1479 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1456 | { |
1480 | { |
1457 | if (selection.end.row != screen.cur.row |
1481 | if (selection.end.row != screen.cur.row |
1458 | || (screen.cur.col >= selection.beg.col - count) |
1482 | || (screen.cur.col >= selection.beg.col - count) |
… | |
… | |
1464 | selection.beg.col -= count; |
1488 | selection.beg.col -= count; |
1465 | selection.mark.col -= count; /* XXX: yes? */ |
1489 | selection.mark.col -= count; /* XXX: yes? */ |
1466 | selection.end.col -= count; |
1490 | selection.end.col -= count; |
1467 | } |
1491 | } |
1468 | } |
1492 | } |
|
|
1493 | |
1469 | break; |
1494 | break; |
1470 | } |
1495 | } |
1471 | } |
1496 | } |
1472 | |
1497 | |
1473 | /* ------------------------------------------------------------------------- */ |
1498 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1478 | void |
1503 | void |
1479 | rxvt_term::scr_scroll_region (int top, int bot) |
1504 | rxvt_term::scr_scroll_region (int top, int bot) |
1480 | { |
1505 | { |
1481 | MAX_IT (top, 0); |
1506 | MAX_IT (top, 0); |
1482 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1507 | MIN_IT (bot, (int)TermWin.nrow - 1); |
|
|
1508 | |
1483 | if (top > bot) |
1509 | if (top > bot) |
1484 | return; |
1510 | return; |
|
|
1511 | |
1485 | screen.tscroll = top; |
1512 | screen.tscroll = top; |
1486 | screen.bscroll = bot; |
1513 | screen.bscroll = bot; |
1487 | scr_gotorc (0, 0, 0); |
1514 | scr_gotorc (0, 0, 0); |
1488 | } |
1515 | } |
1489 | |
1516 | |
… | |
… | |
1495 | */ |
1522 | */ |
1496 | void |
1523 | void |
1497 | rxvt_term::scr_cursor_visible (int mode) |
1524 | rxvt_term::scr_cursor_visible (int mode) |
1498 | { |
1525 | { |
1499 | want_refresh = 1; |
1526 | want_refresh = 1; |
|
|
1527 | |
1500 | if (mode) |
1528 | if (mode) |
1501 | screen.flags |= Screen_VisibleCursor; |
1529 | screen.flags |= Screen_VisibleCursor; |
1502 | else |
1530 | else |
1503 | screen.flags &= ~Screen_VisibleCursor; |
1531 | screen.flags &= ~Screen_VisibleCursor; |
1504 | } |
1532 | } |
… | |
… | |
1742 | } |
1770 | } |
1743 | |
1771 | |
1744 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
1772 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
1745 | |
1773 | |
1746 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1774 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1747 | fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, |
1775 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1748 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
|
|
1749 | |
1776 | |
1750 | if (refresh) |
1777 | if (refresh) |
1751 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1778 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1752 | } |
1779 | } |
1753 | |
1780 | |
… | |
… | |
1820 | if (TermWin.view_start != oldviewstart) |
1847 | if (TermWin.view_start != oldviewstart) |
1821 | { |
1848 | { |
1822 | want_refresh = 1; |
1849 | want_refresh = 1; |
1823 | num_scr -= (TermWin.view_start - oldviewstart); |
1850 | num_scr -= (TermWin.view_start - oldviewstart); |
1824 | } |
1851 | } |
|
|
1852 | |
1825 | return (int) (TermWin.view_start - oldviewstart); |
1853 | return (int) (TermWin.view_start - oldviewstart); |
1826 | } |
1854 | } |
1827 | |
1855 | |
1828 | /* ------------------------------------------------------------------------- */ |
1856 | /* ------------------------------------------------------------------------- */ |
1829 | void |
1857 | void |
… | |
… | |
1947 | |
1975 | |
1948 | /* |
1976 | /* |
1949 | * C: set the cursor character (s) |
1977 | * C: set the cursor character (s) |
1950 | */ |
1978 | */ |
1951 | { |
1979 | { |
1952 | unsigned char setoldcursor; |
1980 | unsigned char setoldcursor; |
1953 | rend_t ccol1, /* Cursor colour */ |
1981 | rend_t ccol1, /* Cursor colour */ |
1954 | ccol2; /* Cursor colour2 */ |
1982 | ccol2; /* Cursor colour2 */ |
1955 | |
1983 | |
1956 | showcursor = (screen.flags & Screen_VisibleCursor); |
1984 | showcursor = (screen.flags & Screen_VisibleCursor); |
1957 | #ifdef CURSOR_BLINK |
1985 | #ifdef CURSOR_BLINK |
1958 | if (hidden_cursor) |
1986 | if (hidden_cursor) |
1959 | showcursor = 0; |
1987 | showcursor = 0; |
1960 | #endif |
1988 | #endif |
1961 | |
1989 | |
1962 | if (showcursor) |
1990 | if (showcursor) |
1963 | { |
1991 | { |
1964 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
1992 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
1965 | [screen.cur.col]); |
|
|
1966 | |
1993 | |
1967 | if (showcursor && TermWin.focus) |
1994 | if (showcursor && TermWin.focus) |
1968 | { |
1995 | { |
1969 | *srp ^= RS_RVid; |
1996 | *srp ^= RS_RVid; |
1970 | #ifndef NO_CURSORCOLOR |
1997 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1998 | if (screen.cur.row + TermWin.view_start != ocrow |
2025 | if (screen.cur.row + TermWin.view_start != ocrow |
1999 | || screen.cur.col != oldcursor.col) |
2026 | || screen.cur.col != oldcursor.col) |
2000 | { |
2027 | { |
2001 | if (ocrow < TermWin.nrow |
2028 | if (ocrow < TermWin.nrow |
2002 | && oldcursor.col < TermWin.ncol) |
2029 | && oldcursor.col < TermWin.ncol) |
2003 | { |
|
|
2004 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2030 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2005 | } |
2031 | |
2006 | if (TermWin.focus || !showcursor) |
2032 | if (TermWin.focus || !showcursor) |
2007 | oldcursor.row = -1; |
2033 | oldcursor.row = -1; |
2008 | else |
2034 | else |
2009 | setoldcursor = 1; |
2035 | setoldcursor = 1; |
2010 | } |
2036 | } |
2011 | } |
2037 | } |
2012 | else if (!TermWin.focus) |
2038 | else if (!TermWin.focus) |
2013 | setoldcursor = 1; |
2039 | setoldcursor = 1; |
|
|
2040 | |
2014 | if (setoldcursor) |
2041 | if (setoldcursor) |
2015 | { |
2042 | { |
2016 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2043 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2017 | oldcursor.row = -1; |
2044 | oldcursor.row = -1; |
2018 | else |
2045 | else |
… | |
… | |
2030 | */ |
2057 | */ |
2031 | i = num_scr; |
2058 | i = num_scr; |
2032 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2059 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2033 | && abs (i) < TermWin.nrow && !must_clear) |
2060 | && abs (i) < TermWin.nrow && !must_clear) |
2034 | { |
2061 | { |
2035 | int16_t nits; |
2062 | int16_t nits; |
2036 | int j; |
2063 | int j; |
2037 | rend_t *drp2; |
2064 | rend_t *drp2; |
2038 | text_t *dtp2; |
2065 | text_t *dtp2; |
2039 | int len, wlen; |
2066 | int len, wlen; |
2040 | |
2067 | |
2041 | j = TermWin.nrow; |
2068 | j = TermWin.nrow; |
2042 | wlen = len = -1; |
2069 | wlen = len = -1; |
2043 | row = i > 0 ? 0 : j - 1; |
2070 | row = i > 0 ? 0 : j - 1; |
2044 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2071 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
… | |
… | |
2496 | { |
2523 | { |
2497 | n = min (len - i, PROP_SIZE); |
2524 | n = min (len - i, PROP_SIZE); |
2498 | MEMCPY (ds, data + i, n); |
2525 | MEMCPY (ds, data + i, n); |
2499 | |
2526 | |
2500 | for (j = 0; j < n; j++) |
2527 | for (j = 0; j < n; j++) |
2501 | if (ds[j] == '\n') |
2528 | if (ds[j] == C0_LF) |
2502 | ds[j] = '\r'; |
2529 | ds[j] = C0_CR; |
2503 | |
2530 | |
2504 | tt_write (ds, (int)n); |
2531 | tt_write (ds, (int)n); |
2505 | } |
2532 | } |
2506 | |
2533 | |
2507 | free (ds); |
2534 | free (ds); |
… | |
… | |
2588 | |
2615 | |
2589 | nread += ct.nitems; |
2616 | nread += ct.nitems; |
2590 | |
2617 | |
2591 | char **cl; |
2618 | char **cl; |
2592 | int cr; |
2619 | int cr; |
2593 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, |
2620 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2594 | &cr) >= 0 && cl) |
|
|
2595 | { |
2621 | { |
2596 | for (int i = 0; i < cr; i++) |
2622 | for (int i = 0; i < cr; i++) |
2597 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2623 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2598 | |
2624 | |
2599 | XFreeStringList (cl); |
2625 | XFreeStringList (cl); |
… | |
… | |
2620 | void |
2646 | void |
2621 | rxvt_term::incr_cb (time_watcher &w) |
2647 | rxvt_term::incr_cb (time_watcher &w) |
2622 | { |
2648 | { |
2623 | selection_wait = Sel_none; |
2649 | selection_wait = Sel_none; |
2624 | |
2650 | |
2625 | rxvt_print_error ("data loss: timeout on INCR selection paste"); |
2651 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2626 | } |
2652 | } |
2627 | |
2653 | |
2628 | /* |
2654 | /* |
2629 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2655 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2630 | */ |
2656 | */ |
… | |
… | |
2709 | { |
2735 | { |
2710 | int i; |
2736 | int i; |
2711 | |
2737 | |
2712 | selection_request_time = tm; |
2738 | selection_request_time = tm; |
2713 | selection_wait = Sel_normal; |
2739 | selection_wait = Sel_normal; |
|
|
2740 | |
2714 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2741 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2715 | { |
2742 | { |
2716 | #if X_HAVE_UTF8_STRING |
2743 | #if X_HAVE_UTF8_STRING |
2717 | selection_type = Sel_UTF8String; |
2744 | selection_type = Sel_UTF8String; |
2718 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2745 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
… | |
… | |
2772 | want_refresh = 1; |
2799 | want_refresh = 1; |
2773 | free (selection.text); |
2800 | free (selection.text); |
2774 | selection.text = NULL; |
2801 | selection.text = NULL; |
2775 | selection.len = 0; |
2802 | selection.len = 0; |
2776 | CLEAR_SELECTION (); |
2803 | CLEAR_SELECTION (); |
|
|
2804 | |
|
|
2805 | if (display->selection_owner == this) |
|
|
2806 | display->selection_owner = 0; |
2777 | } |
2807 | } |
2778 | |
2808 | |
2779 | /* ------------------------------------------------------------------------- */ |
2809 | /* ------------------------------------------------------------------------- */ |
2780 | /* |
2810 | /* |
2781 | * Copy a selection into the cut buffer |
2811 | * Copy a selection into the cut buffer |
… | |
… | |
2854 | else |
2884 | else |
2855 | new_selection_text[ofs++] = *t++; |
2885 | new_selection_text[ofs++] = *t++; |
2856 | } |
2886 | } |
2857 | |
2887 | |
2858 | if (screen.tlen[row] != -1 && row != end_row) |
2888 | if (screen.tlen[row] != -1 && row != end_row) |
2859 | new_selection_text[ofs++] = L'\n'; |
2889 | new_selection_text[ofs++] = C0_LF; |
2860 | } |
2890 | } |
2861 | |
2891 | |
2862 | if (end_col != selection.end.col) |
2892 | if (end_col != selection.end.col) |
2863 | new_selection_text[ofs++] = L'\n'; |
2893 | new_selection_text[ofs++] = C0_LF; |
2864 | |
2894 | |
2865 | new_selection_text[ofs] = 0; |
2895 | new_selection_text[ofs] = 0; |
2866 | |
2896 | |
2867 | if (ofs == 0) |
2897 | if (ofs == 0) |
2868 | { |
2898 | { |
… | |
… | |
2878 | |
2908 | |
2879 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2909 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2880 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2910 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2881 | display->set_selection_owner (this); |
2911 | display->set_selection_owner (this); |
2882 | else |
2912 | else |
2883 | rxvt_print_error ("can't get primary selection"); |
2913 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2884 | |
2914 | |
2885 | #if 0 |
2915 | #if 0 |
2886 | XTextProperty ct; |
2916 | XTextProperty ct; |
2887 | |
2917 | |
2888 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2918 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
… | |
… | |
3095 | * Extend the selection to the specified col/row |
3125 | * Extend the selection to the specified col/row |
3096 | */ |
3126 | */ |
3097 | void |
3127 | void |
3098 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3128 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3099 | { |
3129 | { |
3100 | int16_t ncol = TermWin.ncol; |
3130 | int16_t ncol = TermWin.ncol; |
3101 | int end_col; |
3131 | int end_col; |
3102 | row_col_t pos; |
3132 | row_col_t pos; |
3103 | enum { |
3133 | enum { |
3104 | LEFT, RIGHT |
3134 | LEFT, RIGHT |
3105 | } closeto = RIGHT; |
3135 | } closeto = RIGHT; |
3106 | |
3136 | |
3107 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
3137 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
… | |
… | |
3392 | /* TODO: Handle MULTIPLE */ |
3422 | /* TODO: Handle MULTIPLE */ |
3393 | } |
3423 | } |
3394 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3424 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3395 | { |
3425 | { |
3396 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3426 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3397 | (8 * sizeof (Time)), PropModeReplace, |
3427 | (8 * sizeof (Time)), PropModeReplace, |
3398 | (unsigned char *)&selection_time, 1); |
3428 | (unsigned char *)&selection_time, 1); |
3399 | ev.property = rq.property; |
3429 | ev.property = rq.property; |
3400 | } |
3430 | } |
3401 | else if (rq.target == XA_STRING |
3431 | else if (rq.target == XA_STRING |
3402 | || rq.target == xa[XA_TEXT] |
3432 | || rq.target == xa[XA_TEXT] |
3403 | || rq.target == xa[XA_COMPOUND_TEXT] |
3433 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3490 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3520 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3491 | } |
3521 | } |
3492 | |
3522 | |
3493 | #endif |
3523 | #endif |
3494 | /* ------------------------------------------------------------------------- */ |
3524 | /* ------------------------------------------------------------------------- */ |
3495 | |
|
|
3496 | /* ------------------------------------------------------------------------- * |
|
|
3497 | * DEBUG ROUTINES * |
|
|
3498 | * ------------------------------------------------------------------------- */ |
|
|
3499 | #if 0 |
|
|
3500 | void |
|
|
3501 | rxvt_debug_colors (void) |
|
|
3502 | { |
|
|
3503 | int color; |
|
|
3504 | const char *name[] = |
|
|
3505 | { |
|
|
3506 | "fg", "bg", |
|
|
3507 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
|
|
3508 | }; |
|
|
3509 | |
|
|
3510 | fprintf (stderr, "Color ( "); |
|
|
3511 | if (rstyle & RS_RVid) |
|
|
3512 | fprintf (stderr, "rvid "); |
|
|
3513 | if (rstyle & RS_Bold) |
|
|
3514 | fprintf (stderr, "bold "); |
|
|
3515 | if (rstyle & RS_Blink) |
|
|
3516 | fprintf (stderr, "blink "); |
|
|
3517 | if (rstyle & RS_Uline) |
|
|
3518 | fprintf (stderr, "uline "); |
|
|
3519 | fprintf (stderr, "): "); |
|
|
3520 | |
|
|
3521 | color = GET_FGCOLOR (rstyle); |
|
|
3522 | #ifndef NO_BRIGHTCOLOR |
|
|
3523 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3524 | { |
|
|
3525 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3526 | fprintf (stderr, "bright "); |
|
|
3527 | } |
|
|
3528 | #endif |
|
|
3529 | fprintf (stderr, "%s on ", name[color]); |
|
|
3530 | |
|
|
3531 | color = GET_BGCOLOR (rstyle); |
|
|
3532 | #ifndef NO_BRIGHTCOLOR |
|
|
3533 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3534 | { |
|
|
3535 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3536 | fprintf (stderr, "bright "); |
|
|
3537 | } |
|
|
3538 | #endif |
|
|
3539 | fprintf (stderr, "%s\n", name[color]); |
|
|
3540 | } |
|
|
3541 | #endif |
|
|