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 | |
762 | /* ------------------------------------------------------------------------- */ |
763 | /* ------------------------------------------------------------------------- */ |
763 | /* |
764 | /* |
764 | * Add text given in <str> of length <len> to screen struct |
765 | * Add text given in <str> of length <len> to screen struct |
765 | */ |
766 | */ |
766 | void |
767 | void |
767 | rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) |
768 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
768 | { |
769 | { |
769 | unsigned char checksel, clearsel; |
770 | unsigned char checksel, clearsel; |
770 | uint32_t c; |
771 | unicode_t c; |
771 | int i, row, last_col; |
772 | int i, row, last_col; |
772 | text_t *stp; |
773 | text_t *stp; |
773 | rend_t *srp; |
774 | rend_t *srp; |
774 | |
775 | |
775 | if (len <= 0) /* sanity */ |
776 | if (len <= 0) /* sanity */ |
776 | return; |
777 | return; |
777 | |
778 | |
778 | want_refresh = 1; |
779 | want_refresh = 1; |
… | |
… | |
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 | { |
848 | checksel = 0; |
852 | checksel = 0; |
849 | clearsel = 1; |
853 | clearsel = 1; |
850 | } |
854 | } |
|
|
855 | |
851 | if (screen.flags & Screen_WrapNext) |
856 | if (screen.flags & Screen_WrapNext) |
852 | { |
857 | { |
853 | screen.tlen[row] = -1; |
858 | screen.tlen[row] = -1; |
854 | if (screen.cur.row == screen.bscroll) |
859 | if (screen.cur.row == screen.bscroll) |
855 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
860 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
856 | else if (screen.cur.row < (TermWin.nrow - 1)) |
861 | else if (screen.cur.row < (TermWin.nrow - 1)) |
857 | row = (++screen.cur.row) + TermWin.saveLines; |
862 | row = (++screen.cur.row) + TermWin.saveLines; |
|
|
863 | |
858 | stp = screen.text[row]; /* _must_ refresh */ |
864 | stp = screen.text[row]; /* _must_ refresh */ |
859 | srp = screen.rend[row]; /* _must_ refresh */ |
865 | srp = screen.rend[row]; /* _must_ refresh */ |
860 | screen.cur.col = 0; |
866 | screen.cur.col = 0; |
861 | screen.flags &= ~Screen_WrapNext; |
867 | screen.flags &= ~Screen_WrapNext; |
862 | } |
868 | } |
|
|
869 | |
863 | if (screen.flags & Screen_Insert) |
870 | if (screen.flags & Screen_Insert) |
864 | scr_insdel_chars (1, INSERT); |
871 | scr_insdel_chars (1, INSERT); |
865 | |
872 | |
|
|
873 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
|
|
874 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
|
|
875 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
|
|
876 | int width = c < 256 ? 1 : wcwidth (c); |
|
|
877 | |
866 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
878 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
867 | switch (c) |
|
|
868 | { |
879 | { |
869 | // dunno where these come from |
|
|
870 | #if 0 |
|
|
871 | case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; |
|
|
872 | case '.': c = 0x2193; break; case '0': c = 0x25ae; break; |
|
|
873 | #endif |
|
|
874 | // vt100 special graphics and line drawing |
880 | // vt100 special graphics and line drawing |
875 | case '`': c = 0x25c6; break; case '_': c = 0x0020; break; |
881 | static uint16_t vt100_0[32] = { // 5f .. 7e |
876 | case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; |
882 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
877 | case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; |
883 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
878 | case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; |
884 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
879 | case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; |
885 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
880 | case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; |
|
|
881 | case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; |
|
|
882 | case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; |
|
|
883 | case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; |
|
|
884 | case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; |
|
|
885 | case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; |
|
|
886 | } |
886 | }; |
887 | |
887 | |
|
|
888 | if (c >= 0x5f && c <= 0x7e) |
|
|
889 | { |
|
|
890 | c = vt100_0[c - 0x5f]; |
|
|
891 | width = 1; |
|
|
892 | } |
|
|
893 | } |
|
|
894 | |
|
|
895 | if (width != 0) |
|
|
896 | { |
|
|
897 | #if !UNICODE_3 && ENABLE_COMBINING |
|
|
898 | // trim characters we can't store directly :( |
|
|
899 | if (c >= 0x10000) |
|
|
900 | c = rxvt_composite.compose (c); // map to lower 16 bits |
|
|
901 | #endif |
888 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
902 | rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); |
889 | // rely on wcwidth to tell us the character width, at least for non-ascii |
|
|
890 | int width = c <= 128 ? 1 : wcwidth (c); |
|
|
891 | |
903 | |
892 | // width -1 characters (e.g. combining chars) are ignored currently. |
|
|
893 | if (width > 0) |
|
|
894 | do |
904 | do |
895 | { |
905 | { |
896 | stp[screen.cur.col] = c; |
906 | stp[screen.cur.col] = c; |
897 | srp[screen.cur.col] = rend; |
907 | srp[screen.cur.col] = rend; |
898 | |
908 | |
899 | if (screen.cur.col < last_col - 1) |
909 | if (screen.cur.col < last_col - 1) |
900 | screen.cur.col++; |
910 | screen.cur.col++; |
901 | else |
911 | else |
902 | { |
912 | { |
903 | screen.tlen[row] = last_col; |
913 | screen.tlen[row] = last_col; |
904 | if (screen.flags & Screen_Autowrap) |
914 | if (screen.flags & Screen_Autowrap) |
905 | screen.flags |= Screen_WrapNext; |
915 | screen.flags |= Screen_WrapNext; |
906 | break; |
916 | break; |
907 | } |
917 | } |
908 | |
918 | |
909 | c = NOCHAR; |
919 | c = NOCHAR; |
910 | } |
920 | } |
911 | while (--width > 0); |
921 | while (--width > 0); |
|
|
922 | |
|
|
923 | // pad with spaces when overwriting wide character with smaller one |
|
|
924 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
|
|
925 | { |
|
|
926 | stp[c] = ' '; |
|
|
927 | srp[c] = rend; |
|
|
928 | } |
|
|
929 | } |
|
|
930 | else if (width == 0) |
|
|
931 | { |
|
|
932 | #if ENABLE_COMBINING |
|
|
933 | // handle combining characters |
|
|
934 | // we just tag the accent on the previous on-screen character. |
|
|
935 | // this is arguably not correct, but also arguably not wrong. |
|
|
936 | // we don't handle double-width characters nicely yet. |
|
|
937 | |
|
|
938 | text_t *tp; |
|
|
939 | rend_t *rp; |
|
|
940 | |
|
|
941 | if (screen.cur.col > 0) |
|
|
942 | { |
|
|
943 | tp = stp + screen.cur.col - 1; |
|
|
944 | rp = srp + screen.cur.col - 1; |
|
|
945 | } |
|
|
946 | else if (screen.cur.row > 0 |
|
|
947 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
|
|
948 | { |
|
|
949 | tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
|
|
950 | rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
|
|
951 | } |
912 | else |
952 | else |
913 | (void)0; /* handle combining character etc. here. */ |
953 | continue; |
|
|
954 | |
|
|
955 | // handle double-width-chars by making them look extremely ugly |
|
|
956 | if (*tp == NOCHAR) |
|
|
957 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
|
|
958 | |
|
|
959 | // first try to find a precomposed character |
|
|
960 | unicode_t n = rxvt_compose (*tp, c); |
|
|
961 | if (n == NOCHAR) |
|
|
962 | n = rxvt_composite.compose (*tp, c); |
|
|
963 | |
|
|
964 | *tp = n; |
|
|
965 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
|
|
966 | #endif |
|
|
967 | } |
914 | } |
968 | } |
915 | |
969 | |
916 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
970 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
917 | MAX_IT (screen.tlen[row], screen.cur.col); |
971 | MAX_IT (screen.tlen[row], screen.cur.col); |
918 | |
972 | |
… | |
… | |
938 | */ |
992 | */ |
939 | void |
993 | void |
940 | rxvt_term::scr_backspace () |
994 | rxvt_term::scr_backspace () |
941 | { |
995 | { |
942 | want_refresh = 1; |
996 | want_refresh = 1; |
|
|
997 | |
943 | if (screen.cur.col == 0) |
998 | if (screen.cur.col == 0) |
944 | { |
999 | { |
945 | if (screen.cur.row > 0) |
1000 | if (screen.cur.row > 0) |
946 | { |
1001 | { |
947 | #ifdef TERMCAP_HAS_BW |
1002 | #ifdef TERMCAP_HAS_BW |
… | |
… | |
952 | |
1007 | |
953 | } |
1008 | } |
954 | } |
1009 | } |
955 | else if ((screen.flags & Screen_WrapNext) == 0) |
1010 | else if ((screen.flags & Screen_WrapNext) == 0) |
956 | scr_gotorc (0, -1, RELATIVE); |
1011 | scr_gotorc (0, -1, RELATIVE); |
|
|
1012 | |
957 | screen.flags &= ~Screen_WrapNext; |
1013 | screen.flags &= ~Screen_WrapNext; |
958 | } |
1014 | } |
959 | |
1015 | |
960 | /* ------------------------------------------------------------------------- */ |
1016 | /* ------------------------------------------------------------------------- */ |
961 | /* |
1017 | /* |
… | |
… | |
964 | * XTERM_SEQ: CTRL-I |
1020 | * XTERM_SEQ: CTRL-I |
965 | */ |
1021 | */ |
966 | void |
1022 | void |
967 | rxvt_term::scr_tab (int count) |
1023 | rxvt_term::scr_tab (int count) |
968 | { |
1024 | { |
969 | int i, x; |
1025 | int i, x; |
970 | |
1026 | |
971 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
1027 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
972 | want_refresh = 1; |
1028 | want_refresh = 1; |
973 | i = x = screen.cur.col; |
1029 | i = x = screen.cur.col; |
|
|
1030 | |
974 | if (count == 0) |
1031 | if (count == 0) |
975 | return; |
1032 | return; |
976 | else if (count > 0) |
1033 | else if (count > 0) |
977 | { |
1034 | { |
978 | for (; ++i < TermWin.ncol; ) |
1035 | for (; ++i < TermWin.ncol; ) |
… | |
… | |
980 | { |
1037 | { |
981 | x = i; |
1038 | x = i; |
982 | if (!--count) |
1039 | if (!--count) |
983 | break; |
1040 | break; |
984 | } |
1041 | } |
|
|
1042 | |
985 | if (count) |
1043 | if (count) |
986 | x = TermWin.ncol - 1; |
1044 | x = TermWin.ncol - 1; |
987 | } |
1045 | } |
988 | else /* if (count < 0) */ |
1046 | else /* if (count < 0) */ |
989 | { |
1047 | { |
… | |
… | |
992 | { |
1050 | { |
993 | x = i; |
1051 | x = i; |
994 | if (!++count) |
1052 | if (!++count) |
995 | break; |
1053 | break; |
996 | } |
1054 | } |
|
|
1055 | |
997 | if (count) |
1056 | if (count) |
998 | x = 0; |
1057 | x = 0; |
999 | } |
1058 | } |
|
|
1059 | |
1000 | if (x != screen.cur.col) |
1060 | if (x != screen.cur.col) |
1001 | scr_gotorc (0, x, R_RELATIVE); |
1061 | scr_gotorc (0, x, R_RELATIVE); |
1002 | } |
1062 | } |
1003 | |
1063 | |
1004 | /* ------------------------------------------------------------------------- */ |
1064 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1061 | want_refresh = 1; |
1121 | want_refresh = 1; |
1062 | ZERO_SCROLLBACK (); |
1122 | ZERO_SCROLLBACK (); |
1063 | |
1123 | |
1064 | 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)); |
1065 | |
1125 | |
1066 | screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) |
1126 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1067 | : col); |
|
|
1068 | MAX_IT (screen.cur.col, 0); |
1127 | MAX_IT (screen.cur.col, 0); |
1069 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1128 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1070 | |
1129 | |
1071 | screen.flags &= ~Screen_WrapNext; |
1130 | screen.flags &= ~Screen_WrapNext; |
1072 | if (relative & R_RELATIVE) |
1131 | if (relative & R_RELATIVE) |
… | |
… | |
1098 | else |
1157 | else |
1099 | screen.cur.row = row; |
1158 | screen.cur.row = row; |
1100 | } |
1159 | } |
1101 | MAX_IT (screen.cur.row, 0); |
1160 | MAX_IT (screen.cur.row, 0); |
1102 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1161 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
|
|
1162 | |
|
|
1163 | while (screen.cur.col > 0 |
|
|
1164 | && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) |
|
|
1165 | screen.cur.col--; |
1103 | } |
1166 | } |
1104 | |
1167 | |
1105 | /* ------------------------------------------------------------------------- */ |
1168 | /* ------------------------------------------------------------------------- */ |
1106 | /* |
1169 | /* |
1107 | * direction should be UP or DN |
1170 | * direction should be UP or DN |
1108 | */ |
1171 | */ |
1109 | void |
1172 | void |
1110 | rxvt_term::scr_index (enum page_dirn direction) |
1173 | rxvt_term::scr_index (enum page_dirn direction) |
1111 | { |
1174 | { |
1112 | int dirn; |
1175 | int dirn; |
1113 | |
1176 | |
1114 | want_refresh = 1; |
1177 | want_refresh = 1; |
1115 | dirn = ((direction == UP) ? 1 : -1); |
1178 | dirn = ((direction == UP) ? 1 : -1); |
1116 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1179 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
1117 | |
1180 | |
… | |
… | |
1177 | default: |
1240 | default: |
1178 | return; |
1241 | return; |
1179 | } |
1242 | } |
1180 | |
1243 | |
1181 | if (screen.text[row]) |
1244 | if (screen.text[row]) |
1182 | scr_blank_line (& (screen.text[row][col]), |
1245 | scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle); |
1183 | & (screen.rend[row][col]), num, rstyle); |
|
|
1184 | else |
1246 | else |
1185 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1247 | scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); |
1186 | } |
1248 | } |
1187 | |
1249 | |
1188 | /* ------------------------------------------------------------------------- */ |
1250 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1193 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1255 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1194 | */ |
1256 | */ |
1195 | void |
1257 | void |
1196 | rxvt_term::scr_erase_screen (int mode) |
1258 | rxvt_term::scr_erase_screen (int mode) |
1197 | { |
1259 | { |
1198 | int num; |
1260 | int num; |
1199 | int32_t row, row_offset; |
1261 | int32_t row, row_offset; |
1200 | rend_t ren; |
1262 | rend_t ren; |
1201 | XGCValues gcvalue; |
1263 | XGCValues gcvalue; |
1202 | |
1264 | |
1203 | want_refresh = 1; |
1265 | want_refresh = 1; |
1204 | 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)); |
1205 | ZERO_SCROLLBACK (); |
1267 | ZERO_SCROLLBACK (); |
1206 | row_offset = (int32_t)TermWin.saveLines; |
1268 | row_offset = (int32_t)TermWin.saveLines; |
… | |
… | |
1225 | num = TermWin.nrow; |
1287 | num = TermWin.nrow; |
1226 | break; |
1288 | break; |
1227 | default: |
1289 | default: |
1228 | return; |
1290 | return; |
1229 | } |
1291 | } |
|
|
1292 | |
1230 | refresh_type |= REFRESH_BOUNDS; |
1293 | refresh_type |= REFRESH_BOUNDS; |
|
|
1294 | |
1231 | if (selection.op && current_screen == selection.screen |
1295 | if (selection.op && current_screen == selection.screen |
1232 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1296 | && ((selection.beg.row >= row && selection.beg.row <= row + num) |
1233 | || (selection.end.row >= row |
1297 | || (selection.end.row >= row |
1234 | && selection.end.row <= row + num))) |
1298 | && selection.end.row <= row + num))) |
1235 | CLEAR_SELECTION (); |
1299 | CLEAR_SELECTION (); |
|
|
1300 | |
1236 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1301 | if (row >= TermWin.nrow) /* Out Of Bounds */ |
1237 | return; |
1302 | return; |
|
|
1303 | |
1238 | MIN_IT (num, (TermWin.nrow - row)); |
1304 | MIN_IT (num, (TermWin.nrow - row)); |
|
|
1305 | |
1239 | if (rstyle & (RS_RVid | RS_Uline)) |
1306 | if (rstyle & (RS_RVid | RS_Uline)) |
1240 | ren = (rend_t) ~RS_None; |
1307 | ren = (rend_t) ~RS_None; |
1241 | else if (GET_BASEBG (rstyle) == Color_bg) |
1308 | else if (GET_BASEBG (rstyle) == Color_bg) |
1242 | { |
1309 | { |
1243 | ren = DEFAULT_RSTYLE; |
1310 | ren = DEFAULT_RSTYLE; |
… | |
… | |
1250 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1317 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1251 | ERASE_ROWS (row, num); |
1318 | ERASE_ROWS (row, num); |
1252 | gcvalue.foreground = PixColors[Color_fg]; |
1319 | gcvalue.foreground = PixColors[Color_fg]; |
1253 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1320 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1254 | } |
1321 | } |
|
|
1322 | |
1255 | for (; num--; row++) |
1323 | for (; num--; row++) |
1256 | { |
1324 | { |
1257 | scr_blank_screen_mem (screen.text, screen.rend, |
1325 | scr_blank_screen_mem (screen.text, screen.rend, |
1258 | (unsigned int) (row + row_offset), rstyle); |
1326 | (unsigned int) (row + row_offset), rstyle); |
1259 | screen.tlen[row + row_offset] = 0; |
1327 | screen.tlen[row + row_offset] = 0; |
… | |
… | |
1293 | * Insert/Delete <count> lines |
1361 | * Insert/Delete <count> lines |
1294 | */ |
1362 | */ |
1295 | void |
1363 | void |
1296 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1364 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1297 | { |
1365 | { |
1298 | int end; |
1366 | int end; |
1299 | |
1367 | |
1300 | ZERO_SCROLLBACK (); |
1368 | ZERO_SCROLLBACK (); |
1301 | |
1369 | |
1302 | selection_check (1); |
1370 | selection_check (1); |
1303 | |
1371 | |
… | |
… | |
1322 | * Insert/Delete <count> characters from the current position |
1390 | * Insert/Delete <count> characters from the current position |
1323 | */ |
1391 | */ |
1324 | void |
1392 | void |
1325 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1393 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1326 | { |
1394 | { |
1327 | int col, row; |
1395 | int col, row; |
1328 | rend_t tr; |
1396 | rend_t tr; |
1329 | text_t *stp; |
1397 | text_t *stp; |
1330 | rend_t *srp; |
1398 | rend_t *srp; |
1331 | int16_t *slp; |
1399 | int16_t *slp; |
1332 | |
1400 | |
1333 | want_refresh = 1; |
1401 | want_refresh = 1; |
1334 | ZERO_SCROLLBACK (); |
1402 | ZERO_SCROLLBACK (); |
1335 | |
1403 | |
1336 | if (count <= 0) |
1404 | if (count <= 0) |
… | |
… | |
1343 | screen.flags &= ~Screen_WrapNext; |
1411 | screen.flags &= ~Screen_WrapNext; |
1344 | |
1412 | |
1345 | stp = screen.text[row]; |
1413 | stp = screen.text[row]; |
1346 | srp = screen.rend[row]; |
1414 | srp = screen.rend[row]; |
1347 | slp = & (screen.tlen[row]); |
1415 | slp = & (screen.tlen[row]); |
|
|
1416 | |
1348 | switch (insdel) |
1417 | switch (insdel) |
1349 | { |
1418 | { |
1350 | case INSERT: |
1419 | case INSERT: |
1351 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1420 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1352 | col--) |
1421 | col--) |
1353 | { |
1422 | { |
1354 | stp[col] = stp[col - count]; |
1423 | stp[col] = stp[col - count]; |
1355 | srp[col] = srp[col - count]; |
1424 | srp[col] = srp[col - count]; |
1356 | } |
1425 | } |
|
|
1426 | |
1357 | if (*slp != -1) |
1427 | if (*slp != -1) |
1358 | { |
1428 | { |
1359 | *slp += count; |
1429 | *slp += count; |
1360 | MIN_IT (*slp, TermWin.ncol); |
1430 | MIN_IT (*slp, TermWin.ncol); |
1361 | } |
1431 | } |
|
|
1432 | |
1362 | if (selection.op && current_screen == selection.screen |
1433 | if (selection.op && current_screen == selection.screen |
1363 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1434 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1364 | { |
1435 | { |
1365 | if (selection.end.row != screen.cur.row |
1436 | if (selection.end.row != screen.cur.row |
1366 | || (selection.end.col + count >= TermWin.ncol)) |
1437 | || (selection.end.col + count >= TermWin.ncol)) |
… | |
… | |
1370 | selection.beg.col += count; |
1441 | selection.beg.col += count; |
1371 | selection.mark.col += count; /* XXX: yes? */ |
1442 | selection.mark.col += count; /* XXX: yes? */ |
1372 | selection.end.col += count; |
1443 | selection.end.col += count; |
1373 | } |
1444 | } |
1374 | } |
1445 | } |
|
|
1446 | |
1375 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1447 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1376 | (unsigned int)count, rstyle); |
1448 | (unsigned int)count, rstyle); |
1377 | break; |
1449 | break; |
|
|
1450 | |
1378 | case ERASE: |
1451 | case ERASE: |
1379 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1452 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1380 | selection_check (1); |
1453 | selection_check (1); |
1381 | screen.cur.col -= count; |
1454 | screen.cur.col -= count; |
1382 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1455 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1383 | (unsigned int)count, rstyle); |
1456 | (unsigned int)count, rstyle); |
1384 | break; |
1457 | break; |
|
|
1458 | |
1385 | case DELETE: |
1459 | case DELETE: |
1386 | tr = srp[TermWin.ncol - 1] |
|
|
1387 | & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1460 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
|
|
1461 | |
1388 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1462 | for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) |
1389 | { |
1463 | { |
1390 | stp[col] = stp[col + count]; |
1464 | stp[col] = stp[col + count]; |
1391 | srp[col] = srp[col + count]; |
1465 | srp[col] = srp[col + count]; |
1392 | } |
1466 | } |
|
|
1467 | |
1393 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1468 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1394 | & (srp[TermWin.ncol - count]), |
1469 | & (srp[TermWin.ncol - count]), |
1395 | (unsigned int)count, tr); |
1470 | (unsigned int)count, tr); |
|
|
1471 | |
1396 | if (*slp == -1) /* break line continuation */ |
1472 | if (*slp == -1) /* break line continuation */ |
1397 | *slp = TermWin.ncol; |
1473 | *slp = TermWin.ncol; |
|
|
1474 | |
1398 | *slp -= count; |
1475 | *slp -= count; |
1399 | MAX_IT (*slp, 0); |
1476 | MAX_IT (*slp, 0); |
|
|
1477 | |
1400 | if (selection.op && current_screen == selection.screen |
1478 | if (selection.op && current_screen == selection.screen |
1401 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1479 | && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) |
1402 | { |
1480 | { |
1403 | if (selection.end.row != screen.cur.row |
1481 | if (selection.end.row != screen.cur.row |
1404 | || (screen.cur.col >= selection.beg.col - count) |
1482 | || (screen.cur.col >= selection.beg.col - count) |
… | |
… | |
1410 | selection.beg.col -= count; |
1488 | selection.beg.col -= count; |
1411 | selection.mark.col -= count; /* XXX: yes? */ |
1489 | selection.mark.col -= count; /* XXX: yes? */ |
1412 | selection.end.col -= count; |
1490 | selection.end.col -= count; |
1413 | } |
1491 | } |
1414 | } |
1492 | } |
|
|
1493 | |
1415 | break; |
1494 | break; |
1416 | } |
1495 | } |
1417 | } |
1496 | } |
1418 | |
1497 | |
1419 | /* ------------------------------------------------------------------------- */ |
1498 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1424 | void |
1503 | void |
1425 | rxvt_term::scr_scroll_region (int top, int bot) |
1504 | rxvt_term::scr_scroll_region (int top, int bot) |
1426 | { |
1505 | { |
1427 | MAX_IT (top, 0); |
1506 | MAX_IT (top, 0); |
1428 | MIN_IT (bot, (int)TermWin.nrow - 1); |
1507 | MIN_IT (bot, (int)TermWin.nrow - 1); |
|
|
1508 | |
1429 | if (top > bot) |
1509 | if (top > bot) |
1430 | return; |
1510 | return; |
|
|
1511 | |
1431 | screen.tscroll = top; |
1512 | screen.tscroll = top; |
1432 | screen.bscroll = bot; |
1513 | screen.bscroll = bot; |
1433 | scr_gotorc (0, 0, 0); |
1514 | scr_gotorc (0, 0, 0); |
1434 | } |
1515 | } |
1435 | |
1516 | |
… | |
… | |
1441 | */ |
1522 | */ |
1442 | void |
1523 | void |
1443 | rxvt_term::scr_cursor_visible (int mode) |
1524 | rxvt_term::scr_cursor_visible (int mode) |
1444 | { |
1525 | { |
1445 | want_refresh = 1; |
1526 | want_refresh = 1; |
|
|
1527 | |
1446 | if (mode) |
1528 | if (mode) |
1447 | screen.flags |= Screen_VisibleCursor; |
1529 | screen.flags |= Screen_VisibleCursor; |
1448 | else |
1530 | else |
1449 | screen.flags &= ~Screen_VisibleCursor; |
1531 | screen.flags &= ~Screen_VisibleCursor; |
1450 | } |
1532 | } |
… | |
… | |
1688 | } |
1770 | } |
1689 | |
1771 | |
1690 | 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)); |
1691 | |
1773 | |
1692 | 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++) |
1693 | 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); |
1694 | (rc[PART_END].col - rc[PART_BEG].col + 1)); |
|
|
1695 | |
1776 | |
1696 | if (refresh) |
1777 | if (refresh) |
1697 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1778 | scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); |
1698 | } |
1779 | } |
1699 | |
1780 | |
… | |
… | |
1766 | if (TermWin.view_start != oldviewstart) |
1847 | if (TermWin.view_start != oldviewstart) |
1767 | { |
1848 | { |
1768 | want_refresh = 1; |
1849 | want_refresh = 1; |
1769 | num_scr -= (TermWin.view_start - oldviewstart); |
1850 | num_scr -= (TermWin.view_start - oldviewstart); |
1770 | } |
1851 | } |
|
|
1852 | |
1771 | return (int) (TermWin.view_start - oldviewstart); |
1853 | return (int) (TermWin.view_start - oldviewstart); |
1772 | } |
1854 | } |
1773 | |
1855 | |
1774 | /* ------------------------------------------------------------------------- */ |
1856 | /* ------------------------------------------------------------------------- */ |
1775 | void |
1857 | void |
… | |
… | |
1893 | |
1975 | |
1894 | /* |
1976 | /* |
1895 | * C: set the cursor character (s) |
1977 | * C: set the cursor character (s) |
1896 | */ |
1978 | */ |
1897 | { |
1979 | { |
1898 | unsigned char setoldcursor; |
1980 | unsigned char setoldcursor; |
1899 | rend_t ccol1, /* Cursor colour */ |
1981 | rend_t ccol1, /* Cursor colour */ |
1900 | ccol2; /* Cursor colour2 */ |
1982 | ccol2; /* Cursor colour2 */ |
1901 | |
1983 | |
1902 | showcursor = (screen.flags & Screen_VisibleCursor); |
1984 | showcursor = (screen.flags & Screen_VisibleCursor); |
1903 | #ifdef CURSOR_BLINK |
1985 | #ifdef CURSOR_BLINK |
1904 | if (hidden_cursor) |
1986 | if (hidden_cursor) |
1905 | showcursor = 0; |
1987 | showcursor = 0; |
1906 | #endif |
1988 | #endif |
1907 | |
1989 | |
1908 | if (showcursor) |
1990 | if (showcursor) |
1909 | { |
1991 | { |
1910 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
1992 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
1911 | [screen.cur.col]); |
|
|
1912 | |
1993 | |
1913 | if (showcursor && TermWin.focus) |
1994 | if (showcursor && TermWin.focus) |
1914 | { |
1995 | { |
1915 | *srp ^= RS_RVid; |
1996 | *srp ^= RS_RVid; |
1916 | #ifndef NO_CURSORCOLOR |
1997 | #ifndef NO_CURSORCOLOR |
… | |
… | |
1944 | if (screen.cur.row + TermWin.view_start != ocrow |
2025 | if (screen.cur.row + TermWin.view_start != ocrow |
1945 | || screen.cur.col != oldcursor.col) |
2026 | || screen.cur.col != oldcursor.col) |
1946 | { |
2027 | { |
1947 | if (ocrow < TermWin.nrow |
2028 | if (ocrow < TermWin.nrow |
1948 | && oldcursor.col < TermWin.ncol) |
2029 | && oldcursor.col < TermWin.ncol) |
1949 | { |
|
|
1950 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
2030 | drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); |
1951 | } |
2031 | |
1952 | if (TermWin.focus || !showcursor) |
2032 | if (TermWin.focus || !showcursor) |
1953 | oldcursor.row = -1; |
2033 | oldcursor.row = -1; |
1954 | else |
2034 | else |
1955 | setoldcursor = 1; |
2035 | setoldcursor = 1; |
1956 | } |
2036 | } |
1957 | } |
2037 | } |
1958 | else if (!TermWin.focus) |
2038 | else if (!TermWin.focus) |
1959 | setoldcursor = 1; |
2039 | setoldcursor = 1; |
|
|
2040 | |
1960 | if (setoldcursor) |
2041 | if (setoldcursor) |
1961 | { |
2042 | { |
1962 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
2043 | if (screen.cur.row + TermWin.view_start >= TermWin.nrow) |
1963 | oldcursor.row = -1; |
2044 | oldcursor.row = -1; |
1964 | else |
2045 | else |
… | |
… | |
1976 | */ |
2057 | */ |
1977 | i = num_scr; |
2058 | i = num_scr; |
1978 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
2059 | if (refresh_type == FAST_REFRESH && num_scr_allow && i |
1979 | && abs (i) < TermWin.nrow && !must_clear) |
2060 | && abs (i) < TermWin.nrow && !must_clear) |
1980 | { |
2061 | { |
1981 | int16_t nits; |
2062 | int16_t nits; |
1982 | int j; |
2063 | int j; |
1983 | rend_t *drp2; |
2064 | rend_t *drp2; |
1984 | text_t *dtp2; |
2065 | text_t *dtp2; |
1985 | int len, wlen; |
2066 | int len, wlen; |
1986 | |
2067 | |
1987 | j = TermWin.nrow; |
2068 | j = TermWin.nrow; |
1988 | wlen = len = -1; |
2069 | wlen = len = -1; |
1989 | row = i > 0 ? 0 : j - 1; |
2070 | row = i > 0 ? 0 : j - 1; |
1990 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2071 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
… | |
… | |
2054 | int ypixel = (int)Row2Pixel (row); |
2135 | int ypixel = (int)Row2Pixel (row); |
2055 | |
2136 | |
2056 | for (col = 0; col < TermWin.ncol; col++) |
2137 | for (col = 0; col < TermWin.ncol; col++) |
2057 | { |
2138 | { |
2058 | /* compare new text with old - if exactly the same then continue */ |
2139 | /* compare new text with old - if exactly the same then continue */ |
|
|
2140 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
|
|
2141 | && (srp[col] == drp[col] /* Either rendition the same or */ |
|
|
2142 | || (stp[col] == ' ' /* space w/ no background change */ |
|
|
2143 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
|
|
2144 | continue; |
|
|
2145 | |
|
|
2146 | // redraw one or more characters |
|
|
2147 | |
|
|
2148 | // seek to the beginning if wide characters |
|
|
2149 | while (stp[col] == NOCHAR && col > 0) |
|
|
2150 | --col; |
|
|
2151 | |
2059 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2152 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2060 | |
|
|
2061 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
|
|
2062 | && (rend == drp[col] /* Either rendition the same or */ |
|
|
2063 | || (stp[col] == ' ' /* space w/ no background change */ |
|
|
2064 | && GET_BGATTR (rend) == GET_BGATTR (drp[col])))) |
|
|
2065 | continue; |
|
|
2066 | |
|
|
2067 | text_t *text = stp + col; |
2153 | text_t *text = stp + col; |
2068 | int count = 1; |
2154 | int count = 1; |
2069 | |
2155 | |
2070 | /* redraw one or more characters */ |
|
|
2071 | |
|
|
2072 | dtp[col] = stp[col]; |
2156 | dtp[col] = stp[col]; |
2073 | drp[col] = rend; |
2157 | drp[col] = rend; |
2074 | |
|
|
2075 | if (*text == NOCHAR) // never start redrawing at invisible characters. */ |
|
|
2076 | continue; |
|
|
2077 | |
2158 | |
2078 | int xpixel = Col2Pixel (col); |
2159 | int xpixel = Col2Pixel (col); |
2079 | |
2160 | |
2080 | // this loop looks very messy, it can probably be optimized |
2161 | // this loop looks very messy, it can probably be optimized |
2081 | // and cleaned a bit by you? |
2162 | // and cleaned a bit by you? |
… | |
… | |
2134 | else |
2215 | else |
2135 | rvid = !rvid; |
2216 | rvid = !rvid; |
2136 | } |
2217 | } |
2137 | |
2218 | |
2138 | if (rend & RS_Uline) |
2219 | if (rend & RS_Uline) |
2139 | { |
|
|
2140 | if (ISSET_PIXCOLOR (Color_UL)) |
2220 | if (ISSET_PIXCOLOR (Color_UL)) |
2141 | fore = Color_UL; |
2221 | fore = Color_UL; |
2142 | } |
|
|
2143 | #endif |
2222 | #endif |
2144 | |
2223 | |
2145 | if (rvid) |
2224 | if (rvid) |
2146 | { |
2225 | { |
2147 | SWAP_IT (fore, back, int); |
2226 | SWAP_IT (fore, back, int); |
… | |
… | |
2155 | back = Color_RV; |
2234 | back = Color_RV; |
2156 | #endif |
2235 | #endif |
2157 | } |
2236 | } |
2158 | |
2237 | |
2159 | #ifdef TEXT_BLINK |
2238 | #ifdef TEXT_BLINK |
2160 | if (rend & RS_Blink) |
2239 | if (rend & RS_Blink && back == Color_bg) |
2161 | { |
2240 | { |
2162 | if (!text_blink_ev.active) |
2241 | if (!text_blink_ev.active) |
2163 | { |
2242 | { |
2164 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2243 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2165 | hidden_text = 0; |
2244 | hidden_text = 0; |
… | |
… | |
2197 | else |
2276 | else |
2198 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2277 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2199 | |
2278 | |
2200 | if ((rend & RS_Uline) && (font->descent > 1)) |
2279 | if ((rend & RS_Uline) && (font->descent > 1)) |
2201 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2280 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2202 | xpixel, ypixel + font->ascent + 1, |
2281 | xpixel, ypixel + font->ascent + 1, |
2203 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2282 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2204 | } /* for (col....) */ |
2283 | } /* for (col....) */ |
2205 | } /* for (row....) */ |
2284 | } /* for (row....) */ |
2206 | |
2285 | |
2207 | /* |
2286 | /* |
2208 | * G: cleanup cursor and display outline cursor if necessary |
2287 | * G: cleanup cursor and display outline cursor if necessary |
… | |
… | |
2228 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2307 | while (oldcursor.col + cursorwidth < TermWin.ncol |
2229 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2308 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
2230 | cursorwidth++; |
2309 | cursorwidth++; |
2231 | |
2310 | |
2232 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2311 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2233 | Col2Pixel (oldcursor.col), |
2312 | Col2Pixel (oldcursor.col), |
2234 | Row2Pixel (oldcursor.row), |
2313 | Row2Pixel (oldcursor.row), |
2235 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2314 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2236 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2315 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2237 | } |
2316 | } |
2238 | } |
2317 | } |
2239 | |
2318 | |
2240 | /* |
2319 | /* |
2241 | * H: cleanup selection |
2320 | * H: cleanup selection |
… | |
… | |
2249 | /* |
2328 | /* |
2250 | * clear the whole screen height, note that width == 0 is treated |
2329 | * clear the whole screen height, note that width == 0 is treated |
2251 | * specially by XClearArea |
2330 | * specially by XClearArea |
2252 | */ |
2331 | */ |
2253 | XClearArea (display->display, TermWin.vt, 0, 0, |
2332 | XClearArea (display->display, TermWin.vt, 0, 0, |
2254 | (unsigned int)TermWin.int_bwidth, |
2333 | (unsigned int)TermWin.int_bwidth, |
2255 | (unsigned int)TermWin_TotalHeight (), False); |
2334 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2335 | |
2256 | if (clearlast && TermWin.int_bwidth) |
2336 | if (clearlast && TermWin.int_bwidth) |
2257 | /* |
2337 | /* |
2258 | * clear the whole screen height, note that width == 0 is treated |
2338 | * clear the whole screen height, note that width == 0 is treated |
2259 | * specially by XClearArea |
2339 | * specially by XClearArea |
2260 | */ |
2340 | */ |
2261 | XClearArea (display->display, TermWin.vt, |
2341 | XClearArea (display->display, TermWin.vt, |
2262 | TermWin.width + TermWin.int_bwidth, 0, |
2342 | TermWin.width + TermWin.int_bwidth, 0, |
2263 | (unsigned int)TermWin.int_bwidth, |
2343 | (unsigned int)TermWin.int_bwidth, |
2264 | (unsigned int)TermWin_TotalHeight (), False); |
2344 | (unsigned int)TermWin_TotalHeight (), False); |
|
|
2345 | |
2265 | if (refresh_type & SMOOTH_REFRESH) |
2346 | if (refresh_type & SMOOTH_REFRESH) |
2266 | XSync (display->display, False); |
2347 | XSync (display->display, False); |
2267 | |
2348 | |
2268 | num_scr = 0; |
2349 | num_scr = 0; |
2269 | num_scr_allow = 1; |
2350 | num_scr_allow = 1; |
… | |
… | |
2293 | } |
2374 | } |
2294 | } |
2375 | } |
2295 | |
2376 | |
2296 | /* ------------------------------------------------------------------------- */ |
2377 | /* ------------------------------------------------------------------------- */ |
2297 | void |
2378 | void |
2298 | rxvt_term::scr_clear () |
2379 | rxvt_term::scr_clear (bool really) |
2299 | { |
2380 | { |
2300 | if (!TermWin.mapped) |
2381 | if (!TermWin.mapped) |
2301 | return; |
2382 | return; |
2302 | |
2383 | |
2303 | num_scr_allow = 0; |
2384 | num_scr_allow = 0; |
2304 | want_refresh = 1; |
2385 | want_refresh = 1; |
|
|
2386 | |
2305 | #ifdef TRANSPARENT |
2387 | #ifdef TRANSPARENT |
2306 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2388 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2307 | { |
2389 | { |
2308 | int i; |
2390 | int i; |
2309 | |
2391 | |
… | |
… | |
2316 | if (TermWin.parent[i] != None) |
2398 | if (TermWin.parent[i] != None) |
2317 | XClearWindow (display->display, TermWin.parent[i]); |
2399 | XClearWindow (display->display, TermWin.parent[i]); |
2318 | } |
2400 | } |
2319 | #endif |
2401 | #endif |
2320 | |
2402 | |
|
|
2403 | if (really) |
2321 | XClearWindow (display->display, TermWin.vt); |
2404 | XClearWindow (display->display, TermWin.vt); |
2322 | } |
2405 | } |
2323 | |
2406 | |
2324 | /* ------------------------------------------------------------------------- */ |
2407 | /* ------------------------------------------------------------------------- */ |
2325 | void |
2408 | void |
2326 | rxvt_term::scr_reverse_selection () |
2409 | rxvt_term::scr_reverse_selection () |
2327 | { |
2410 | { |
2328 | int i, col, row, end_row; |
|
|
2329 | rend_t *srp; |
|
|
2330 | |
|
|
2331 | if (selection.op && current_screen == selection.screen) |
2411 | if (selection.op && current_screen == selection.screen) |
2332 | { |
2412 | { |
2333 | end_row = TermWin.saveLines - TermWin.view_start; |
2413 | int end_row = TermWin.saveLines - TermWin.view_start; |
2334 | i = selection.beg.row + TermWin.saveLines; |
2414 | int i = selection.beg.row + TermWin.saveLines; |
2335 | row = selection.end.row + TermWin.saveLines; |
2415 | int col, row = selection.end.row + TermWin.saveLines; |
|
|
2416 | rend_t *srp; |
|
|
2417 | |
2336 | if (i >= end_row) |
2418 | if (i >= end_row) |
2337 | col = selection.beg.col; |
2419 | col = selection.beg.col; |
2338 | else |
2420 | else |
2339 | { |
2421 | { |
2340 | col = 0; |
2422 | col = 0; |
2341 | i = end_row; |
2423 | i = end_row; |
2342 | } |
2424 | } |
|
|
2425 | |
2343 | end_row += TermWin.nrow; |
2426 | end_row += TermWin.nrow; |
2344 | for (; i < row && i < end_row; i++, col = 0) |
2427 | for (; i < row && i < end_row; i++, col = 0) |
2345 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2428 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2346 | srp[col] ^= RS_RVid; |
2429 | srp[col] ^= RS_RVid; |
|
|
2430 | |
2347 | if (i == row && i < end_row) |
2431 | if (i == row && i < end_row) |
2348 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2432 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2349 | srp[col] ^= RS_RVid; |
2433 | srp[col] ^= RS_RVid; |
2350 | } |
2434 | } |
2351 | } |
2435 | } |
… | |
… | |
2439 | { |
2523 | { |
2440 | n = min (len - i, PROP_SIZE); |
2524 | n = min (len - i, PROP_SIZE); |
2441 | MEMCPY (ds, data + i, n); |
2525 | MEMCPY (ds, data + i, n); |
2442 | |
2526 | |
2443 | for (j = 0; j < n; j++) |
2527 | for (j = 0; j < n; j++) |
2444 | if (ds[j] == '\n') |
2528 | if (ds[j] == C0_LF) |
2445 | ds[j] = '\r'; |
2529 | ds[j] = C0_CR; |
2446 | |
2530 | |
2447 | tt_write (ds, (int)n); |
2531 | tt_write (ds, (int)n); |
2448 | } |
2532 | } |
2449 | |
2533 | |
2450 | free (ds); |
2534 | free (ds); |
… | |
… | |
2511 | } |
2595 | } |
2512 | |
2596 | |
2513 | if (ct.nitems == 0) |
2597 | if (ct.nitems == 0) |
2514 | { |
2598 | { |
2515 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2599 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
|
|
2600 | |
2516 | if (selection_wait == Sel_normal && nread == 0 |
2601 | if (selection_wait == Sel_normal && nread == 0 |
2517 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2602 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2518 | { |
2603 | { |
2519 | /* |
2604 | /* |
2520 | * pass through again trying CUT_BUFFER0 if we've come from |
2605 | * pass through again trying CUT_BUFFER0 if we've come from |
… | |
… | |
2530 | |
2615 | |
2531 | nread += ct.nitems; |
2616 | nread += ct.nitems; |
2532 | |
2617 | |
2533 | char **cl; |
2618 | char **cl; |
2534 | int cr; |
2619 | int cr; |
2535 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, |
2620 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2536 | &cr) >= 0 && cl) |
|
|
2537 | { |
2621 | { |
2538 | for (int i = 0; i < cr; i++) |
2622 | for (int i = 0; i < cr; i++) |
2539 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2623 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2540 | |
2624 | |
2541 | XFreeStringList (cl); |
2625 | XFreeStringList (cl); |
… | |
… | |
2562 | void |
2646 | void |
2563 | rxvt_term::incr_cb (time_watcher &w) |
2647 | rxvt_term::incr_cb (time_watcher &w) |
2564 | { |
2648 | { |
2565 | selection_wait = Sel_none; |
2649 | selection_wait = Sel_none; |
2566 | |
2650 | |
2567 | rxvt_print_error ("data loss: timeout on INCR selection paste"); |
2651 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2568 | } |
2652 | } |
2569 | |
2653 | |
2570 | /* |
2654 | /* |
2571 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2655 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
2572 | */ |
2656 | */ |
… | |
… | |
2575 | { |
2659 | { |
2576 | int reget_time = 0; |
2660 | int reget_time = 0; |
2577 | |
2661 | |
2578 | if (prop == None) |
2662 | if (prop == None) |
2579 | return; |
2663 | return; |
|
|
2664 | |
2580 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
2665 | D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); |
2581 | if (selection_wait == Sel_normal) |
2666 | if (selection_wait == Sel_normal) |
2582 | { |
2667 | { |
2583 | int a, afmt; |
2668 | int a, afmt; |
2584 | Atom atype; |
2669 | Atom atype; |
2585 | unsigned long bytes_after, nitems; |
2670 | unsigned long bytes_after, nitems; |
2586 | unsigned char *s = NULL; |
2671 | unsigned char *s = NULL; |
2587 | |
2672 | |
2588 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2673 | a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, |
2589 | xa[XA_INCR], &atype, &afmt, &nitems, |
2674 | xa[XA_INCR], &atype, &afmt, &nitems, |
2590 | &bytes_after, &s); |
2675 | &bytes_after, &s); |
2591 | if (s) |
2676 | if (s) |
2592 | XFree (s); |
2677 | XFree (s); |
2593 | if (a != Success) |
2678 | if (a != Success) |
2594 | return; |
2679 | return; |
|
|
2680 | |
2595 | #ifndef __CYGWIN32__ |
2681 | #ifndef __CYGWIN32__ |
2596 | if (atype == xa[XA_INCR]) |
2682 | if (atype == xa[XA_INCR]) |
2597 | { /* start an INCR transfer */ |
2683 | { /* start an INCR transfer */ |
2598 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2684 | D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); |
2599 | XDeleteProperty (display->display, win, prop); |
2685 | XDeleteProperty (display->display, win, prop); |
… | |
… | |
2605 | |
2691 | |
2606 | } |
2692 | } |
2607 | else if (selection_wait == Sel_incr) |
2693 | else if (selection_wait == Sel_incr) |
2608 | { |
2694 | { |
2609 | reget_time = 1; |
2695 | reget_time = 1; |
|
|
2696 | |
2610 | if (selection_paste (win, prop, True) == -1) |
2697 | if (selection_paste (win, prop, True) == -1) |
2611 | { |
2698 | { |
2612 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2699 | D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); |
2613 | selection_wait = Sel_none; |
2700 | selection_wait = Sel_none; |
2614 | incr_ev.stop (); |
2701 | incr_ev.stop (); |
2615 | } |
2702 | } |
2616 | } |
2703 | } |
2617 | if (reget_time) /* received more data so reget time */ |
2704 | if (reget_time) /* received more data so reget time */ |
2618 | incr_ev.start (NOW + 10); |
2705 | incr_ev.start (NOW + 10); |
2619 | } |
2706 | } |
|
|
2707 | |
2620 | /* ------------------------------------------------------------------------- */ |
2708 | /* ------------------------------------------------------------------------- */ |
2621 | /* |
2709 | /* |
2622 | * Request the current selection: |
2710 | * Request the current selection: |
2623 | * Order: > internal selection if available |
2711 | * Order: > internal selection if available |
2624 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2712 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
… | |
… | |
2629 | */ |
2717 | */ |
2630 | void |
2718 | void |
2631 | rxvt_term::selection_request (Time tm, int x, int y) |
2719 | rxvt_term::selection_request (Time tm, int x, int y) |
2632 | { |
2720 | { |
2633 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
2721 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2722 | |
2634 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2723 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2635 | return; /* outside window */ |
2724 | return; /* outside window */ |
2636 | |
2725 | |
2637 | if (selection.text != NULL) |
2726 | if (selection.text) |
2638 | { /* internal selection */ |
2727 | { /* internal selection */ |
2639 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2728 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
2640 | paste (selection.text, selection.len); |
2729 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2730 | paste ((unsigned char *)str, strlen (str)); |
|
|
2731 | free (str); |
2641 | return; |
2732 | return; |
2642 | } |
2733 | } |
2643 | else |
2734 | else |
2644 | { |
2735 | { |
2645 | int i; |
2736 | int i; |
2646 | |
2737 | |
2647 | selection_request_time = tm; |
2738 | selection_request_time = tm; |
2648 | selection_wait = Sel_normal; |
2739 | selection_wait = Sel_normal; |
|
|
2740 | |
2649 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2741 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
2650 | { |
2742 | { |
2651 | #if X_HAVE_UTF8_STRING |
2743 | #if X_HAVE_UTF8_STRING |
2652 | selection_type = Sel_UTF8String; |
2744 | selection_type = Sel_UTF8String; |
2653 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2745 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
… | |
… | |
2658 | return; |
2750 | return; |
2659 | #endif |
2751 | #endif |
2660 | |
2752 | |
2661 | } |
2753 | } |
2662 | } |
2754 | } |
|
|
2755 | |
2663 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2756 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2664 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2757 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
2665 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2758 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2666 | } |
2759 | } |
2667 | |
2760 | |
2668 | int |
2761 | int |
2669 | rxvt_term::selection_request_other (Atom target, int selnum) |
2762 | rxvt_term::selection_request_other (Atom target, int selnum) |
2670 | { |
2763 | { |
2671 | Atom sel; |
2764 | Atom sel; |
2672 | #ifdef DEBUG_SELECT |
2765 | #ifdef DEBUG_SELECT |
2673 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2766 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
2674 | #endif |
2767 | #endif |
2675 | |
2768 | |
2676 | selection_type |= selnum; |
2769 | selection_type |= selnum; |
|
|
2770 | |
2677 | if (selnum == Sel_Primary) |
2771 | if (selnum == Sel_Primary) |
2678 | sel = XA_PRIMARY; |
2772 | sel = XA_PRIMARY; |
2679 | else if (selnum == Sel_Secondary) |
2773 | else if (selnum == Sel_Secondary) |
2680 | sel = XA_SECONDARY; |
2774 | sel = XA_SECONDARY; |
2681 | else |
2775 | else |
2682 | sel = xa[XA_CLIPBOARD]; |
2776 | sel = xa[XA_CLIPBOARD]; |
|
|
2777 | |
2683 | if (XGetSelectionOwner (display->display, sel) != None) |
2778 | if (XGetSelectionOwner (display->display, sel) != None) |
2684 | { |
2779 | { |
2685 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2780 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
2686 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2781 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2687 | TermWin.vt, selection_request_time); |
2782 | TermWin.vt, selection_request_time); |
2688 | return 1; |
2783 | return 1; |
2689 | } |
2784 | } |
|
|
2785 | |
2690 | return 0; |
2786 | return 0; |
2691 | } |
2787 | } |
2692 | |
2788 | |
2693 | /* ------------------------------------------------------------------------- */ |
2789 | /* ------------------------------------------------------------------------- */ |
2694 | /* |
2790 | /* |
… | |
… | |
2703 | want_refresh = 1; |
2799 | want_refresh = 1; |
2704 | free (selection.text); |
2800 | free (selection.text); |
2705 | selection.text = NULL; |
2801 | selection.text = NULL; |
2706 | selection.len = 0; |
2802 | selection.len = 0; |
2707 | CLEAR_SELECTION (); |
2803 | CLEAR_SELECTION (); |
|
|
2804 | |
|
|
2805 | if (display->selection_owner == this) |
|
|
2806 | display->selection_owner = 0; |
2708 | } |
2807 | } |
2709 | |
2808 | |
2710 | /* ------------------------------------------------------------------------- */ |
2809 | /* ------------------------------------------------------------------------- */ |
2711 | /* |
2810 | /* |
2712 | * Copy a selection into the cut buffer |
2811 | * Copy a selection into the cut buffer |
2713 | * EXT: button 1 or 3 release |
2812 | * EXT: button 1 or 3 release |
2714 | */ |
2813 | */ |
2715 | void |
2814 | void |
2716 | rxvt_term::selection_make (Time tm) |
2815 | rxvt_term::selection_make (Time tm) |
2717 | { |
2816 | { |
2718 | int i, col, end_col, row, end_row; |
2817 | int i, col, end_col, row, end_row; |
2719 | unsigned char *new_selection_text; |
2818 | wchar_t *new_selection_text; |
2720 | char *str; |
|
|
2721 | text_t *t; |
2819 | text_t *t; |
2722 | #ifdef ACS_ASCII |
|
|
2723 | rend_t *re; |
|
|
2724 | #endif |
|
|
2725 | |
2820 | |
2726 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2821 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
2727 | switch (selection.op) |
2822 | switch (selection.op) |
2728 | { |
2823 | { |
2729 | case SELECTION_CONT: |
2824 | case SELECTION_CONT: |
… | |
… | |
2735 | selection.op = SELECTION_DONE; |
2830 | selection.op = SELECTION_DONE; |
2736 | /* FALLTHROUGH */ |
2831 | /* FALLTHROUGH */ |
2737 | default: |
2832 | default: |
2738 | return; |
2833 | return; |
2739 | } |
2834 | } |
|
|
2835 | |
2740 | selection.op = SELECTION_DONE; |
2836 | selection.op = SELECTION_DONE; |
2741 | |
2837 | |
2742 | if (selection.clicks == 4) |
2838 | if (selection.clicks == 4) |
2743 | return; /* nothing selected, go away */ |
2839 | return; /* nothing selected, go away */ |
2744 | |
2840 | |
2745 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; |
2841 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2746 | str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); |
2842 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2747 | |
|
|
2748 | new_selection_text = (unsigned char *)str; |
|
|
2749 | |
2843 | |
2750 | col = selection.beg.col; |
2844 | col = selection.beg.col; |
2751 | MAX_IT (col, 0); |
2845 | MAX_IT (col, 0); |
2752 | row = selection.beg.row + TermWin.saveLines; |
2846 | row = selection.beg.row + TermWin.saveLines; |
2753 | end_row = selection.end.row + TermWin.saveLines; |
2847 | end_row = selection.end.row + TermWin.saveLines; |
|
|
2848 | int ofs = 0; |
|
|
2849 | int extra = 0; |
2754 | |
2850 | |
2755 | for (; row <= end_row; row++, col = 0) |
2851 | for (; row <= end_row; row++, col = 0) |
2756 | { |
2852 | { |
2757 | t = & (screen.text[row][col]); |
2853 | t = &(screen.text[row][col]); |
2758 | |
2854 | |
2759 | end_col = screen.tlen[row]; |
2855 | end_col = screen.tlen[row]; |
2760 | |
2856 | |
2761 | if (end_col == -1) |
2857 | if (end_col == -1) |
2762 | end_col = TermWin.ncol; |
2858 | end_col = TermWin.ncol; |
2763 | |
2859 | |
2764 | if (row == end_row) |
2860 | if (row == end_row) |
2765 | MIN_IT (end_col, selection.end.col); |
2861 | MIN_IT (end_col, selection.end.col); |
2766 | |
2862 | |
2767 | for (; col < end_col; col++) |
2863 | for (; col < end_col; col++) |
|
|
2864 | { |
2768 | if (*t == NOCHAR) |
2865 | if (*t == NOCHAR) |
2769 | t++; |
2866 | t++; |
|
|
2867 | #if ENABLE_COMBINING |
|
|
2868 | else if (IS_COMPOSE (*t)) |
|
|
2869 | { |
|
|
2870 | int len = rxvt_composite.expand (*t, 0); |
|
|
2871 | |
|
|
2872 | extra -= (len - 1); |
|
|
2873 | |
|
|
2874 | if (extra < 0) |
|
|
2875 | { |
|
|
2876 | extra += i; |
|
|
2877 | i += i; |
|
|
2878 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
|
|
2879 | } |
|
|
2880 | |
|
|
2881 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
|
|
2882 | } |
|
|
2883 | #endif |
2770 | else |
2884 | else |
2771 | { |
2885 | new_selection_text[ofs++] = *t++; |
2772 | int len = wctomb (str, *t++); |
|
|
2773 | if (len > 0) |
|
|
2774 | str += len; |
|
|
2775 | } |
2886 | } |
2776 | |
2887 | |
2777 | if (screen.tlen[row] != -1 && row != end_row) |
2888 | if (screen.tlen[row] != -1 && row != end_row) |
2778 | *str++ = '\n'; |
2889 | new_selection_text[ofs++] = C0_LF; |
2779 | } |
2890 | } |
2780 | |
2891 | |
2781 | #ifndef NO_OLD_SELECTION |
|
|
2782 | if (selection_style == OLD_SELECT) |
|
|
2783 | if (end_col == TermWin.ncol) |
|
|
2784 | *str++ = '\n'; |
|
|
2785 | #endif |
|
|
2786 | #ifndef NO_NEW_SELECTION |
|
|
2787 | if (selection_style != OLD_SELECT) |
|
|
2788 | if (end_col != selection.end.col) |
2892 | if (end_col != selection.end.col) |
2789 | *str++ = '\n'; |
2893 | new_selection_text[ofs++] = C0_LF; |
2790 | #endif |
|
|
2791 | *str = '\0'; |
|
|
2792 | |
2894 | |
2793 | i = str - (char *)new_selection_text; |
2895 | new_selection_text[ofs] = 0; |
|
|
2896 | |
2794 | if (i == 0) |
2897 | if (ofs == 0) |
2795 | { |
2898 | { |
2796 | free (new_selection_text); |
2899 | free (new_selection_text); |
2797 | return; |
2900 | return; |
2798 | } |
2901 | } |
2799 | |
2902 | |
2800 | // due to MB_MAX_CUR, selection wastage is usually high, so realloc |
|
|
2801 | if (str - (char *)new_selection_text > 1024) |
|
|
2802 | new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); |
|
|
2803 | |
|
|
2804 | selection.len = i; |
|
|
2805 | |
|
|
2806 | if (selection.text) |
|
|
2807 | free (selection.text); |
2903 | free (selection.text); |
2808 | |
2904 | |
2809 | selection.text = new_selection_text; |
2905 | // we usually allocate much more than necessary, so realloc it smaller again |
|
|
2906 | selection.len = ofs; |
|
|
2907 | selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); |
2810 | |
2908 | |
2811 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2909 | XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); |
2812 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2910 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) |
2813 | display->set_selection_owner (this); |
2911 | display->set_selection_owner (this); |
2814 | else |
2912 | else |
2815 | rxvt_print_error ("can't get primary selection"); |
2913 | rxvt_warn ("can't get primary selection, ignoring.\n"); |
2816 | |
2914 | |
2817 | { |
2915 | #if 0 |
2818 | XTextProperty ct; |
2916 | XTextProperty ct; |
2819 | char *cl = (char *)selection.text; |
|
|
2820 | |
2917 | |
2821 | if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) |
2918 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2822 | { |
2919 | { |
2823 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
|
|
2824 | PropModeReplace, ct.value, ct.nitems); |
|
|
2825 | XFree (ct.value); |
|
|
2826 | } |
|
|
2827 | else |
|
|
2828 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2920 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
2829 | PropModeReplace, selection.text, (int)selection.len); |
2921 | PropModeReplace, ct.value, ct.nitems); |
|
|
2922 | XFree (ct.value); |
2830 | } |
2923 | } |
|
|
2924 | #endif |
2831 | |
2925 | |
2832 | selection_time = tm; |
2926 | selection_time = tm; |
2833 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2927 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
2834 | } |
2928 | } |
2835 | |
2929 | |
… | |
… | |
2864 | rxvt_term::selection_start_colrow (int col, int row) |
2958 | rxvt_term::selection_start_colrow (int col, int row) |
2865 | { |
2959 | { |
2866 | want_refresh = 1; |
2960 | want_refresh = 1; |
2867 | selection.mark.col = col; |
2961 | selection.mark.col = col; |
2868 | selection.mark.row = row - TermWin.view_start; |
2962 | selection.mark.row = row - TermWin.view_start; |
|
|
2963 | |
2869 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2964 | MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); |
2870 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2965 | MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); |
2871 | MAX_IT (selection.mark.col, 0); |
2966 | MAX_IT (selection.mark.col, 0); |
2872 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2967 | MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); |
2873 | |
2968 | |
|
|
2969 | while (selection.mark.col > 0 |
|
|
2970 | && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR) |
|
|
2971 | --selection.mark.col; |
|
|
2972 | |
2874 | if (selection.op) |
2973 | if (selection.op) |
2875 | { /* clear the old selection */ |
2974 | { /* clear the old selection */ |
2876 | selection.beg.row = selection.end.row = selection.mark.row; |
2975 | selection.beg.row = selection.end.row = selection.mark.row; |
2877 | selection.beg.col = selection.end.col = selection.mark.col; |
2976 | selection.beg.col = selection.end.col = selection.mark.col; |
2878 | } |
2977 | } |
|
|
2978 | |
2879 | selection.op = SELECTION_INIT; |
2979 | selection.op = SELECTION_INIT; |
2880 | selection.screen = current_screen; |
2980 | selection.screen = current_screen; |
2881 | } |
2981 | } |
2882 | |
2982 | |
2883 | /* ------------------------------------------------------------------------- */ |
2983 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
2885 | * Word select: select text for 2 clicks |
2985 | * Word select: select text for 2 clicks |
2886 | * We now only find out the boundary in one direction |
2986 | * We now only find out the boundary in one direction |
2887 | */ |
2987 | */ |
2888 | |
2988 | |
2889 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2989 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2890 | #define DELIMIT_TEXT(x) \ |
2990 | #define DELIMIT_TEXT(x) \ |
2891 | (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) |
2991 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
2892 | #define DELIMIT_REND(x) 1 |
2992 | #define DELIMIT_REND(x) 1 |
2893 | |
2993 | |
2894 | void |
2994 | void |
2895 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2995 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2896 | { |
2996 | { |
2897 | int col, row, dirnadd, tcol, trow, w1, w2; |
2997 | int col, row, dirnadd, tcol, trow, w1, w2; |
2898 | row_col_t bound; |
2998 | row_col_t bound; |
2899 | text_t *stp; |
2999 | text_t *stp; |
2900 | rend_t *srp; |
3000 | rend_t *srp; |
2901 | |
3001 | |
2902 | if (dirn == UP) |
3002 | if (dirn == UP) |
2903 | { |
3003 | { |
2904 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
3004 | bound.row = TermWin.saveLines - TermWin.nscrolled - 1; |
2905 | bound.col = 0; |
3005 | bound.col = 0; |
… | |
… | |
2909 | { |
3009 | { |
2910 | bound.row = TermWin.saveLines + TermWin.nrow; |
3010 | bound.row = TermWin.saveLines + TermWin.nrow; |
2911 | bound.col = TermWin.ncol - 1; |
3011 | bound.col = TermWin.ncol - 1; |
2912 | dirnadd = 1; |
3012 | dirnadd = 1; |
2913 | } |
3013 | } |
|
|
3014 | |
2914 | row = mark->row + TermWin.saveLines; |
3015 | row = mark->row + TermWin.saveLines; |
2915 | col = mark->col; |
3016 | col = mark->col; |
2916 | MAX_IT (col, 0); |
3017 | MAX_IT (col, 0); |
2917 | /* find the edge of a word */ |
3018 | /* find the edge of a word */ |
2918 | stp = & (screen.text[row][col]); |
3019 | stp = & (screen.text[row][col]); |
2919 | w1 = DELIMIT_TEXT (*stp); |
3020 | w1 = DELIMIT_TEXT (*stp); |
2920 | |
3021 | |
2921 | if (selection_style != NEW_SELECT) |
|
|
2922 | { |
|
|
2923 | if (w1 == 1) |
|
|
2924 | { |
|
|
2925 | stp += dirnadd; |
|
|
2926 | if (DELIMIT_TEXT (*stp) == 1) |
|
|
2927 | goto Old_Word_Selection_You_Die; |
|
|
2928 | col += dirnadd; |
|
|
2929 | } |
|
|
2930 | w1 = 0; |
|
|
2931 | } |
|
|
2932 | srp = (&screen.rend[row][col]); |
3022 | srp = (&screen.rend[row][col]); |
2933 | w2 = DELIMIT_REND (*srp); |
3023 | w2 = DELIMIT_REND (*srp); |
2934 | |
3024 | |
2935 | for (;;) |
3025 | for (;;) |
2936 | { |
3026 | { |
2937 | for (; col != bound.col; col += dirnadd) |
3027 | for (; col != bound.col; col += dirnadd) |
2938 | { |
3028 | { |
2939 | stp += dirnadd; |
3029 | stp += dirnadd; |
|
|
3030 | srp += dirnadd; |
|
|
3031 | |
|
|
3032 | if (*stp == NOCHAR) |
|
|
3033 | continue; |
|
|
3034 | |
2940 | if (DELIMIT_TEXT (*stp) != w1) |
3035 | if (DELIMIT_TEXT (*stp) != w1) |
2941 | break; |
3036 | break; |
2942 | srp += dirnadd; |
|
|
2943 | if (DELIMIT_REND (*srp) != w2) |
3037 | if (DELIMIT_REND (*srp) != w2) |
2944 | break; |
3038 | break; |
2945 | } |
3039 | } |
|
|
3040 | |
2946 | if ((col == bound.col) && (row != bound.row)) |
3041 | if ((col == bound.col) && (row != bound.row)) |
2947 | { |
3042 | { |
2948 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
3043 | if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) |
2949 | { |
3044 | { |
2950 | trow = row + dirnadd; |
3045 | trow = row + dirnadd; |
2951 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
3046 | tcol = dirn == UP ? TermWin.ncol - 1 : 0; |
|
|
3047 | |
2952 | if (screen.text[trow] == NULL) |
3048 | if (screen.text[trow] == NULL) |
2953 | break; |
3049 | break; |
|
|
3050 | |
2954 | stp = & (screen.text[trow][tcol]); |
3051 | stp = & (screen.text[trow][tcol]); |
2955 | srp = & (screen.rend[trow][tcol]); |
3052 | srp = & (screen.rend[trow][tcol]); |
|
|
3053 | |
2956 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
3054 | if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) |
2957 | break; |
3055 | break; |
|
|
3056 | |
2958 | row = trow; |
3057 | row = trow; |
2959 | col = tcol; |
3058 | col = tcol; |
2960 | continue; |
3059 | continue; |
2961 | } |
3060 | } |
2962 | } |
3061 | } |
2963 | break; |
3062 | break; |
2964 | } |
3063 | } |
|
|
3064 | |
2965 | Old_Word_Selection_You_Die: |
3065 | Old_Word_Selection_You_Die: |
2966 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
3066 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
2967 | |
3067 | |
2968 | if (dirn == DN) |
3068 | if (dirn == DN) |
2969 | col++; /* put us on one past the end */ |
3069 | col++; /* put us on one past the end */ |
… | |
… | |
2991 | MAX_IT (row, 0); |
3091 | MAX_IT (row, 0); |
2992 | MIN_IT (row, (int)TermWin.nrow - 1); |
3092 | MIN_IT (row, (int)TermWin.nrow - 1); |
2993 | MAX_IT (col, 0); |
3093 | MAX_IT (col, 0); |
2994 | MIN_IT (col, (int)TermWin.ncol); |
3094 | MIN_IT (col, (int)TermWin.ncol); |
2995 | |
3095 | |
2996 | #ifndef NO_NEW_SELECTION |
|
|
2997 | /* |
3096 | /* |
2998 | * If we're selecting characters (single click) then we must check first |
3097 | * If we're selecting characters (single click) then we must check first |
2999 | * if we are at the same place as the original mark. If we are then |
3098 | * if we are at the same place as the original mark. If we are then |
3000 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3099 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3001 | * be _past_ a character for it to be selected. |
3100 | * be _past_ a character for it to be selected. |
3002 | */ |
3101 | */ |
3003 | if (selection_style != OLD_SELECT) |
|
|
3004 | { |
|
|
3005 | if (((selection.clicks % 3) == 1) && !flag |
3102 | if (((selection.clicks % 3) == 1) && !flag |
3006 | && (col == selection.mark.col |
3103 | && (col == selection.mark.col |
3007 | && (row == selection.mark.row + TermWin.view_start))) |
3104 | && (row == selection.mark.row + TermWin.view_start))) |
3008 | { |
3105 | { |
3009 | /* select nothing */ |
3106 | /* select nothing */ |
3010 | selection.beg.row = selection.end.row = 0; |
3107 | selection.beg.row = selection.end.row = 0; |
3011 | selection.beg.col = selection.end.col = 0; |
3108 | selection.beg.col = selection.end.col = 0; |
3012 | selection.clicks = 4; |
3109 | selection.clicks = 4; |
3013 | want_refresh = 1; |
3110 | want_refresh = 1; |
3014 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3111 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
3015 | return; |
3112 | return; |
3016 | } |
|
|
3017 | } |
3113 | } |
3018 | #endif |
3114 | |
3019 | if (selection.clicks == 4) |
3115 | if (selection.clicks == 4) |
3020 | selection.clicks = 1; |
3116 | selection.clicks = 1; |
3021 | |
3117 | |
3022 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3118 | selection_extend_colrow (col, row, !!flag, /* ? button 3 */ |
3023 | flag == 1 ? 1 : 0, /* ? button press */ |
3119 | flag == 1 ? 1 : 0, /* ? button press */ |
… | |
… | |
3029 | * Extend the selection to the specified col/row |
3125 | * Extend the selection to the specified col/row |
3030 | */ |
3126 | */ |
3031 | void |
3127 | void |
3032 | 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) |
3033 | { |
3129 | { |
3034 | int16_t ncol = TermWin.ncol; |
3130 | int16_t ncol = TermWin.ncol; |
3035 | int end_col; |
3131 | int end_col; |
3036 | row_col_t pos; |
3132 | row_col_t pos; |
3037 | enum { |
3133 | enum { |
3038 | LEFT, RIGHT |
3134 | LEFT, RIGHT |
3039 | } closeto = RIGHT; |
3135 | } closeto = RIGHT; |
3040 | |
3136 | |
3041 | 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)); |
… | |
… | |
3077 | pos.col = col; |
3173 | pos.col = col; |
3078 | pos.row = row; |
3174 | pos.row = row; |
3079 | |
3175 | |
3080 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3176 | pos.row -= TermWin.view_start; /* adjust for scroll */ |
3081 | |
3177 | |
3082 | #ifndef NO_OLD_SELECTION |
|
|
3083 | /* |
|
|
3084 | * This mimics some of the selection behaviour of version 2.20 and before. |
|
|
3085 | * There are no ``selection modes'', button3 is always character extension. |
|
|
3086 | * Note: button3 drag is always available, c.f. v2.20 |
|
|
3087 | * Selection always terminates (left or right as appropriate) at the mark. |
|
|
3088 | */ |
|
|
3089 | if (selection_style == OLD_SELECT) |
|
|
3090 | { |
|
|
3091 | if (selection.clicks == 1 || button3) |
|
|
3092 | { |
|
|
3093 | if (hate_those_clicks) |
|
|
3094 | { |
|
|
3095 | hate_those_clicks = 0; |
|
|
3096 | if (selection.clicks == 1) |
|
|
3097 | { |
|
|
3098 | selection.beg.row = selection.mark.row; |
|
|
3099 | selection.beg.col = selection.mark.col; |
|
|
3100 | } |
|
|
3101 | else |
|
|
3102 | { |
|
|
3103 | selection.mark.row = selection.beg.row; |
|
|
3104 | selection.mark.col = selection.beg.col; |
|
|
3105 | } |
|
|
3106 | } |
|
|
3107 | if (ROWCOL_IS_BEFORE (pos, selection.mark)) |
|
|
3108 | { |
|
|
3109 | selection.end.row = selection.mark.row; |
|
|
3110 | selection.end.col = selection.mark.col + 1; |
|
|
3111 | selection.beg.row = pos.row; |
|
|
3112 | selection.beg.col = pos.col; |
|
|
3113 | } |
|
|
3114 | else |
|
|
3115 | { |
|
|
3116 | selection.beg.row = selection.mark.row; |
|
|
3117 | selection.beg.col = selection.mark.col; |
|
|
3118 | selection.end.row = pos.row; |
|
|
3119 | selection.end.col = pos.col + 1; |
|
|
3120 | } |
|
|
3121 | } |
|
|
3122 | else if (selection.clicks == 2) |
|
|
3123 | { |
|
|
3124 | selection_delimit_word (UP, & (selection.mark), |
|
|
3125 | & (selection.beg)); |
|
|
3126 | selection_delimit_word (DN, & (selection.mark), |
|
|
3127 | & (selection.end)); |
|
|
3128 | hate_those_clicks = 1; |
|
|
3129 | } |
|
|
3130 | else if (selection.clicks == 3) |
|
|
3131 | { |
|
|
3132 | selection.beg.row = selection.end.row = selection.mark.row; |
|
|
3133 | selection.beg.col = 0; |
|
|
3134 | selection.end.col = ncol; |
|
|
3135 | hate_those_clicks = 1; |
|
|
3136 | } |
|
|
3137 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3138 | return; |
|
|
3139 | } |
|
|
3140 | #endif /* ! NO_OLD_SELECTION */ |
|
|
3141 | #ifndef NO_NEW_SELECTION |
|
|
3142 | /* selection_style must not be OLD_SELECT to get here */ |
|
|
3143 | /* |
3178 | /* |
3144 | * This is mainly xterm style selection with a couple of differences, mainly |
3179 | * This is mainly xterm style selection with a couple of differences, mainly |
3145 | * in the way button3 drag extension works. |
3180 | * in the way button3 drag extension works. |
3146 | * We're either doing: button1 drag; button3 press; or button3 drag |
3181 | * We're either doing: button1 drag; button3 press; or button3 drag |
3147 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
3182 | * a) button1 drag : select around a midpoint/word/line - that point/word/line |
… | |
… | |
3152 | * a point/word/line which is either the start or end of the selection |
3187 | * a point/word/line which is either the start or end of the selection |
3153 | * and it was decided by whichever point/word/line was `fixed' at the |
3188 | * and it was decided by whichever point/word/line was `fixed' at the |
3154 | * time of the most recent button3 press |
3189 | * time of the most recent button3 press |
3155 | */ |
3190 | */ |
3156 | if (button3 && buttonpress) |
3191 | if (button3 && buttonpress) |
3157 | { /* button3 press */ |
3192 | { /* button3 press */ |
3158 | /* |
3193 | /* |
3159 | * first determine which edge of the selection we are closest to |
3194 | * first determine which edge of the selection we are closest to |
3160 | */ |
3195 | */ |
3161 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3196 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3162 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3197 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3163 | && (((pos.col - selection.beg.col) |
3198 | && (((pos.col - selection.beg.col) |
3164 | + ((pos.row - selection.beg.row) * ncol)) |
3199 | + ((pos.row - selection.beg.row) * ncol)) |
3165 | < ((selection.end.col - pos.col) |
3200 | < ((selection.end.col - pos.col) |
3166 | + ((selection.end.row - pos.row) * ncol))))) |
3201 | + ((selection.end.row - pos.row) * ncol))))) |
3167 | closeto = LEFT; |
3202 | closeto = LEFT; |
|
|
3203 | |
3168 | if (closeto == LEFT) |
3204 | if (closeto == LEFT) |
3169 | { |
3205 | { |
3170 | selection.beg.row = pos.row; |
3206 | selection.beg.row = pos.row; |
3171 | selection.beg.col = pos.col; |
3207 | selection.beg.col = pos.col; |
3172 | selection.mark.row = selection.end.row; |
3208 | selection.mark.row = selection.end.row; |
3173 | selection.mark.col = selection.end.col |
3209 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3174 | - (selection.clicks == 2); |
|
|
3175 | } |
3210 | } |
3176 | else |
3211 | else |
3177 | { |
3212 | { |
3178 | selection.end.row = pos.row; |
3213 | selection.end.row = pos.row; |
3179 | selection.end.col = pos.col; |
3214 | selection.end.col = pos.col; |
3180 | selection.mark.row = selection.beg.row; |
3215 | selection.mark.row = selection.beg.row; |
3181 | selection.mark.col = selection.beg.col; |
3216 | selection.mark.col = selection.beg.col; |
3182 | } |
3217 | } |
3183 | } |
3218 | } |
3184 | else |
3219 | else |
3185 | { /* button1 drag or button3 drag */ |
3220 | { /* button1 drag or button3 drag */ |
3186 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3221 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3187 | { |
3222 | { |
3188 | if ((selection.mark.row == selection.end.row) |
3223 | if ((selection.mark.row == selection.end.row) |
3189 | && (selection.mark.col == selection.end.col) |
3224 | && (selection.mark.col == selection.end.col) |
3190 | && clickchange && selection.clicks == 2) |
3225 | && clickchange && selection.clicks == 2) |
3191 | selection.mark.col--; |
3226 | selection.mark.col--; |
|
|
3227 | |
3192 | selection.beg.row = pos.row; |
3228 | selection.beg.row = pos.row; |
3193 | selection.beg.col = pos.col; |
3229 | selection.beg.col = pos.col; |
3194 | selection.end.row = selection.mark.row; |
3230 | selection.end.row = selection.mark.row; |
3195 | selection.end.col = selection.mark.col |
3231 | selection.end.col = selection.mark.col + (selection.clicks == 2); |
3196 | + (selection.clicks == 2); |
|
|
3197 | } |
3232 | } |
3198 | else |
3233 | else |
3199 | { |
3234 | { |
3200 | selection.beg.row = selection.mark.row; |
3235 | selection.beg.row = selection.mark.row; |
3201 | selection.beg.col = selection.mark.col; |
3236 | selection.beg.col = selection.mark.col; |
… | |
… | |
3205 | } |
3240 | } |
3206 | |
3241 | |
3207 | if (selection.clicks == 1) |
3242 | if (selection.clicks == 1) |
3208 | { |
3243 | { |
3209 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3244 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
|
|
3245 | |
3210 | if (end_col != -1 && selection.beg.col > end_col) |
3246 | if (end_col != -1 && selection.beg.col > end_col) |
3211 | { |
3247 | { |
3212 | #if 1 |
3248 | #if 1 |
3213 | selection.beg.col = ncol; |
3249 | selection.beg.col = ncol; |
3214 | #else |
3250 | #else |
3215 | if (selection.beg.row != selection.end.row) |
3251 | if (selection.beg.row != selection.end.row) |
3216 | selection.beg.col = ncol; |
3252 | selection.beg.col = ncol; |
3217 | else |
3253 | else |
3218 | selection.beg.col = selection.mark.col; |
3254 | selection.beg.col = selection.mark.col; |
3219 | #endif |
3255 | #endif |
3220 | |
|
|
3221 | } |
3256 | } |
|
|
3257 | |
3222 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3258 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
|
|
3259 | |
3223 | if (end_col != -1 && selection.end.col > end_col) |
3260 | if (end_col != -1 && selection.end.col > end_col) |
3224 | selection.end.col = ncol; |
3261 | selection.end.col = ncol; |
3225 | |
|
|
3226 | } |
3262 | } |
3227 | else if (selection.clicks == 2) |
3263 | else if (selection.clicks == 2) |
3228 | { |
3264 | { |
3229 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3265 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3230 | selection.end.col--; |
3266 | selection.end.col--; |
|
|
3267 | |
3231 | selection_delimit_word (UP, & (selection.beg), |
3268 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3232 | & (selection.beg)); |
|
|
3233 | selection_delimit_word (DN, & (selection.end), |
3269 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3234 | & (selection.end)); |
|
|
3235 | } |
3270 | } |
3236 | else if (selection.clicks == 3) |
3271 | else if (selection.clicks == 3) |
3237 | { |
3272 | { |
3238 | #ifndef NO_FRILLS |
3273 | #ifndef NO_FRILLS |
3239 | if ((Options & Opt_tripleclickwords)) |
3274 | if ((Options & Opt_tripleclickwords)) |
3240 | { |
3275 | { |
3241 | int end_row; |
3276 | int end_row; |
3242 | |
3277 | |
3243 | selection_delimit_word (UP, & (selection.beg), |
3278 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3244 | & (selection.beg)); |
|
|
3245 | end_row = screen.tlen[selection.mark.row |
3279 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3246 | + TermWin.saveLines]; |
3280 | |
3247 | for (end_row = selection.mark.row; end_row < TermWin.nrow; |
3281 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3248 | end_row++) |
|
|
3249 | { |
3282 | { |
3250 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3283 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
|
|
3284 | |
3251 | if (end_col != -1) |
3285 | if (end_col != -1) |
3252 | { |
3286 | { |
3253 | selection.end.row = end_row; |
3287 | selection.end.row = end_row; |
3254 | selection.end.col = end_col; |
3288 | selection.end.col = end_col; |
3255 | selection_remove_trailing_spaces (); |
3289 | selection_remove_trailing_spaces (); |
… | |
… | |
3257 | } |
3291 | } |
3258 | } |
3292 | } |
3259 | } |
3293 | } |
3260 | else |
3294 | else |
3261 | #endif |
3295 | #endif |
3262 | |
|
|
3263 | { |
3296 | { |
3264 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3297 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3265 | selection.mark.col++; |
3298 | selection.mark.col++; |
3266 | selection.beg.col = 0; |
3299 | selection.beg.col = 0; |
3267 | selection.end.col = ncol; |
3300 | selection.end.col = ncol; |
3268 | } |
3301 | } |
3269 | } |
3302 | } |
|
|
3303 | |
3270 | if (button3 && buttonpress) |
3304 | if (button3 && buttonpress) |
3271 | { /* mark may need to be changed */ |
3305 | { /* mark may need to be changed */ |
3272 | if (closeto == LEFT) |
3306 | if (closeto == LEFT) |
3273 | { |
3307 | { |
3274 | selection.mark.row = selection.end.row; |
3308 | selection.mark.row = selection.end.row; |
3275 | selection.mark.col = selection.end.col |
3309 | selection.mark.col = selection.end.col |
3276 | - (selection.clicks == 2); |
3310 | - (selection.clicks == 2); |
… | |
… | |
3280 | selection.mark.row = selection.beg.row; |
3314 | selection.mark.row = selection.beg.row; |
3281 | selection.mark.col = selection.beg.col; |
3315 | selection.mark.col = selection.beg.col; |
3282 | } |
3316 | } |
3283 | } |
3317 | } |
3284 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3318 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
3285 | #endif /* ! NO_NEW_SELECTION */ |
|
|
3286 | } |
3319 | } |
3287 | |
3320 | |
3288 | #ifndef NO_FRILLS |
3321 | #ifndef NO_FRILLS |
3289 | void |
3322 | void |
3290 | rxvt_term::selection_remove_trailing_spaces () |
3323 | rxvt_term::selection_remove_trailing_spaces () |
… | |
… | |
3364 | ev.target = rq.target; |
3397 | ev.target = rq.target; |
3365 | ev.time = rq.time; |
3398 | ev.time = rq.time; |
3366 | |
3399 | |
3367 | if (rq.target == xa[XA_TARGETS]) |
3400 | if (rq.target == xa[XA_TARGETS]) |
3368 | { |
3401 | { |
3369 | Atom32 target_list[5]; |
3402 | Atom32 target_list[6]; |
3370 | Atom32 *target = target_list; |
3403 | Atom32 *target = target_list; |
3371 | |
3404 | |
3372 | *target++ = (Atom32) xa[XA_TARGETS]; |
3405 | *target++ = (Atom32) xa[XA_TARGETS]; |
|
|
3406 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3373 | *target++ = (Atom32) XA_STRING; |
3407 | *target++ = (Atom32) XA_STRING; |
3374 | *target++ = (Atom32) xa[XA_TEXT]; |
3408 | *target++ = (Atom32) xa[XA_TEXT]; |
3375 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3409 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3376 | #if X_HAVE_UTF8_STRING |
3410 | #if X_HAVE_UTF8_STRING |
3377 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3411 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3378 | #endif |
3412 | #endif |
|
|
3413 | |
3379 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3414 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3380 | (8 * sizeof (target_list[0])), PropModeReplace, |
3415 | (8 * sizeof (target_list[0])), PropModeReplace, |
3381 | (unsigned char *)target_list, |
3416 | (unsigned char *)target_list, |
3382 | target - target_list); |
3417 | target - target_list); |
3383 | ev.property = rq.property; |
3418 | ev.property = rq.property; |
3384 | } |
3419 | } |
3385 | else if (rq.target == xa[XA_MULTIPLE]) |
3420 | else if (rq.target == xa[XA_MULTIPLE]) |
3386 | { |
3421 | { |
3387 | /* TODO: Handle MULTIPLE */ |
3422 | /* TODO: Handle MULTIPLE */ |
3388 | } |
3423 | } |
3389 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3424 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3390 | { |
3425 | { |
3391 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3426 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3392 | (8 * sizeof (Time)), PropModeReplace, |
3427 | (8 * sizeof (Time)), PropModeReplace, |
3393 | (unsigned char *)&selection_time, 1); |
3428 | (unsigned char *)&selection_time, 1); |
3394 | ev.property = rq.property; |
3429 | ev.property = rq.property; |
3395 | } |
3430 | } |
3396 | else if (rq.target == XA_STRING |
3431 | else if (rq.target == XA_STRING |
3397 | || rq.target == xa[XA_TEXT] |
3432 | || rq.target == xa[XA_TEXT] |
3398 | || rq.target == xa[XA_COMPOUND_TEXT] |
3433 | || rq.target == xa[XA_COMPOUND_TEXT] |
3399 | || rq.target == xa[XA_UTF8_STRING] |
3434 | || rq.target == xa[XA_UTF8_STRING] |
3400 | ) |
3435 | ) |
3401 | { |
3436 | { |
3402 | short freect = 0; |
3437 | short freect = 0; |
3403 | int selectlen; |
3438 | int selectlen; |
3404 | char *cl; |
3439 | wchar_t *cl; |
3405 | |
3440 | |
3406 | target = rq.target; |
3441 | target = rq.target; |
3407 | |
3442 | |
3408 | if (target == XA_STRING) |
3443 | if (target == XA_STRING) |
3409 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3444 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3410 | // will ask for another format anyways. |
3445 | // will ask for another format anyways. |
3411 | style = XStringStyle; |
3446 | style = XStringStyle; |
3412 | else if (target == xa[XA_TEXT]) |
3447 | else if (target == xa[XA_TEXT]) |
3413 | style = XTextStyle; |
3448 | style = XStdICCTextStyle; |
3414 | else if (target == xa[XA_COMPOUND_TEXT]) |
3449 | else if (target == xa[XA_COMPOUND_TEXT]) |
3415 | style = XCompoundTextStyle; |
3450 | style = XCompoundTextStyle; |
3416 | #if X_HAVE_UTF8_STRING |
3451 | #if X_HAVE_UTF8_STRING |
3417 | else if (target == xa[XA_UTF8_STRING]) |
3452 | else if (target == xa[XA_UTF8_STRING]) |
3418 | style = XUTF8StringStyle; |
3453 | style = XUTF8StringStyle; |
… | |
… | |
3423 | style = XCompoundTextStyle; |
3458 | style = XCompoundTextStyle; |
3424 | } |
3459 | } |
3425 | |
3460 | |
3426 | if (selection.text) |
3461 | if (selection.text) |
3427 | { |
3462 | { |
3428 | cl = (char *)selection.text; |
3463 | cl = selection.text; |
3429 | selectlen = selection.len; |
3464 | selectlen = selection.len; |
3430 | } |
3465 | } |
3431 | else |
3466 | else |
3432 | { |
3467 | { |
3433 | cl = ""; |
3468 | cl = L""; |
3434 | selectlen = 0; |
3469 | selectlen = 0; |
3435 | } |
3470 | } |
3436 | |
3471 | |
|
|
3472 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
|
|
3473 | // manually for XUTF8StringStyle. |
3437 | if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3474 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3438 | freect = 1; |
3475 | freect = 1; |
3439 | else |
3476 | else |
3440 | { |
3477 | { |
3441 | /* if we failed to convert then send it raw */ |
3478 | /* if we failed to convert then send it raw */ |
3442 | ct.value = (unsigned char *)cl; |
3479 | ct.value = (unsigned char *)cl; |
… | |
… | |
3449 | ev.property = rq.property; |
3486 | ev.property = rq.property; |
3450 | |
3487 | |
3451 | if (freect) |
3488 | if (freect) |
3452 | XFree (ct.value); |
3489 | XFree (ct.value); |
3453 | } |
3490 | } |
|
|
3491 | |
3454 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3492 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3455 | } |
3493 | } |
3456 | |
3494 | |
3457 | /* ------------------------------------------------------------------------- * |
3495 | /* ------------------------------------------------------------------------- * |
3458 | * MOUSE ROUTINES * |
3496 | * MOUSE ROUTINES * |
… | |
… | |
3482 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3520 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3483 | } |
3521 | } |
3484 | |
3522 | |
3485 | #endif |
3523 | #endif |
3486 | /* ------------------------------------------------------------------------- */ |
3524 | /* ------------------------------------------------------------------------- */ |
3487 | |
|
|
3488 | /* ------------------------------------------------------------------------- * |
|
|
3489 | * DEBUG ROUTINES * |
|
|
3490 | * ------------------------------------------------------------------------- */ |
|
|
3491 | #if 0 |
|
|
3492 | void |
|
|
3493 | rxvt_debug_colors (void) |
|
|
3494 | { |
|
|
3495 | int color; |
|
|
3496 | const char *name[] = |
|
|
3497 | { |
|
|
3498 | "fg", "bg", |
|
|
3499 | "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" |
|
|
3500 | }; |
|
|
3501 | |
|
|
3502 | fprintf (stderr, "Color ( "); |
|
|
3503 | if (rstyle & RS_RVid) |
|
|
3504 | fprintf (stderr, "rvid "); |
|
|
3505 | if (rstyle & RS_Bold) |
|
|
3506 | fprintf (stderr, "bold "); |
|
|
3507 | if (rstyle & RS_Blink) |
|
|
3508 | fprintf (stderr, "blink "); |
|
|
3509 | if (rstyle & RS_Uline) |
|
|
3510 | fprintf (stderr, "uline "); |
|
|
3511 | fprintf (stderr, "): "); |
|
|
3512 | |
|
|
3513 | color = GET_FGCOLOR (rstyle); |
|
|
3514 | #ifndef NO_BRIGHTCOLOR |
|
|
3515 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3516 | { |
|
|
3517 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3518 | fprintf (stderr, "bright "); |
|
|
3519 | } |
|
|
3520 | #endif |
|
|
3521 | fprintf (stderr, "%s on ", name[color]); |
|
|
3522 | |
|
|
3523 | color = GET_BGCOLOR (rstyle); |
|
|
3524 | #ifndef NO_BRIGHTCOLOR |
|
|
3525 | if (color >= minBrightCOLOR && color <= maxBrightCOLOR) |
|
|
3526 | { |
|
|
3527 | color -= (minBrightCOLOR - minCOLOR); |
|
|
3528 | fprintf (stderr, "bright "); |
|
|
3529 | } |
|
|
3530 | #endif |
|
|
3531 | fprintf (stderr, "%s\n", name[color]); |
|
|
3532 | } |
|
|
3533 | #endif |
|
|