ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.171 by root, Fri Dec 16 13:05:49 2005 UTC

… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 29
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 31
34#include <inttypes.h> 32#include <inttypes.h>
35#include <wchar.h>
36 33
37#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
38 35
39inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
40{ 37{
41 while (len--) 38 while (len--)
42 *start++ = value; 39 *start++ = value;
43} 40}
44 41
45/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
47#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
48 46
49/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
53 if (Options & Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 52 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
113 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
114 112
115/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116
118/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
119void 118void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 120{
122 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); 122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 123
125 while (width--) 124 while (width--)
126 { 125 {
127 *et++ = ' '; 126 *et++ = ' ';
128 *er++ = efs; 127 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 155 unsigned int p, q;
157 int k; 156 int k;
158 rend_t setrstyle; 157 rend_t setrstyle;
159 158
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
161 162
162 TermWin.view_start = 0; 163 TermWin.view_start = 0;
163 num_scr = 0; 164 num_scr = 0;
164 165
165 if (TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
… …
172 nrow = TermWin.nrow; 173 nrow = TermWin.nrow;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176 177
178 // we need at least two lines for wrapping to work correctly
179 if (nrow + TermWin.saveLines < 2)
180 {
181 TermWin.saveLines++;
182 prev_nrow--;
183 TermWin.nscrolled++;
184 }
185
177 want_refresh = 1; 186 want_refresh = 1;
178 187
188 prev_total_rows = prev_nrow + TermWin.saveLines;
179 total_rows = nrow + TermWin.saveLines; 189 total_rows = nrow + TermWin.saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 190
182 screen.tscroll = 0; 191 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 192 screen.bscroll = nrow - 1;
184 193
185 if (!talloc) 194 if (!talloc)
186 { 195 {
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 196 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 197 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 } 198 }
190 199
191 if (prev_nrow == 0) 200 if (!screen.text)
192 { 201 {
193 /* 202 /*
194 * first time called so just malloc everything: don't rely on realloc 203 * 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 204 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 205 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
200 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
201 210
202 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
203 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
204 213
205 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
206 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
207 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
208 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
209 218
210 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
211 { 220 {
212 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
213 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 226 }
218 227
219 MEMSET (charsets, 'B', sizeof (charsets)); 228 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 233 screen.charset = 0;
… …
251 260
252 if (nrow < prev_nrow) 261 if (nrow < prev_nrow)
253 { 262 {
254 /* delete rows */ 263 /* delete rows */
255 k = min (TermWin.nscrolled, prev_nrow - nrow); 264 k = min (TermWin.nscrolled, prev_nrow - nrow);
265 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 266 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257 267
258 for (p = nrow; p < prev_nrow; p++) 268 for (p = nrow; p < prev_nrow; p++)
259 { 269 {
260 q = p + TermWin.saveLines; 270 q = p + TermWin.saveLines;
… …
284 ralloc->free (drawn_rend[p]); 294 ralloc->free (drawn_rend[p]);
285 } 295 }
286 296
287 /* we have fewer rows so fix up cursor position */ 297 /* we have fewer rows so fix up cursor position */
288 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 298 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
289 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
290 299
291 scr_reset_realloc (); /* realloc _last_ */ 300 scr_reset_realloc (); /* realloc _last_ */
292 } 301 }
293 else if (nrow > prev_nrow) 302 else if (nrow > prev_nrow)
294 { 303 {
… …
325 scr_scroll_text (0, (int)nrow - 1, -k, 1); 334 scr_scroll_text (0, (int)nrow - 1, -k, 1);
326 screen.cur.row += k; 335 screen.cur.row += k;
327 screen.s_cur.row += k; 336 screen.s_cur.row += k;
328 TermWin.nscrolled -= k; 337 TermWin.nscrolled -= k;
329 } 338 }
339
330#ifdef DEBUG_STRICT 340#ifdef DEBUG_STRICT
331 assert (screen.cur.row < TermWin.nrow); 341 assert (screen.cur.row < TermWin.nrow);
332 assert (swap.cur.row < TermWin.nrow);
333#else /* drive with your eyes closed */ 342#else /* drive with your eyes closed */
334
335 MIN_IT (screen.cur.row, nrow - 1); 343 MIN_IT (screen.cur.row, nrow - 1);
336 MIN_IT (swap.cur.row, nrow - 1);
337#endif 344#endif
338 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 345 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
339 } 346 }
340 347
341 /* resize columns */ 348 /* resize columns */
… …
384 } 391 }
385 392
386 } 393 }
387 394
388 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 395 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
389 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
390 396
391 delete talloc; talloc = ta; 397 delete talloc; talloc = ta;
392 delete ralloc; ralloc = ra; 398 delete ralloc; ralloc = ra;
393 } 399 }
394 400
… …
408} 414}
409 415
410void 416void
411rxvt_term::scr_reset_realloc () 417rxvt_term::scr_reset_realloc ()
412{ 418{
413 uint16_t total_rows, nrow; 419 unsigned int total_rows, nrow;
414 420
415 nrow = TermWin.nrow; 421 nrow = TermWin.nrow;
416 total_rows = nrow + TermWin.saveLines; 422 total_rows = nrow + TermWin.saveLines;
417 /* *INDENT-OFF* */ 423 /* *INDENT-OFF* */
418 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 424 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
435 * Free everything. That way malloc debugging can find leakage. 441 * Free everything. That way malloc debugging can find leakage.
436 */ 442 */
437void 443void
438rxvt_term::scr_release () 444rxvt_term::scr_release ()
439{ 445{
440 uint16_t total_rows; 446 unsigned int total_rows;
441 int i;
442 447
443 total_rows = TermWin.nrow + TermWin.saveLines; 448 total_rows = TermWin.nrow + TermWin.saveLines;
444 449
445 delete talloc; talloc = 0; 450 delete talloc; talloc = 0;
446 delete ralloc; ralloc = 0; 451 delete ralloc; ralloc = 0;
… …
471 * Hard reset 476 * Hard reset
472 */ 477 */
473void 478void
474rxvt_term::scr_poweron () 479rxvt_term::scr_poweron ()
475{ 480{
476 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
477
478 scr_release (); 481 scr_release ();
479 prev_nrow = prev_ncol = 0; 482 prev_nrow = prev_ncol = 0;
480 scr_reset (); 483 scr_reset ();
481 484
482 scr_clear (true); 485 scr_clear (true);
… …
493 */ 496 */
494void 497void
495rxvt_term::scr_cursor (int mode) 498rxvt_term::scr_cursor (int mode)
496{ 499{
497 screen_t *s; 500 screen_t *s;
498
499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
500 501
501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
502 if (current_screen == SECONDARY) 503 if (current_screen == SECONDARY)
503 s = &swap; 504 s = &swap;
504 else 505 else
… …
506 s = &screen; 507 s = &screen;
507 508
508 switch (mode) 509 switch (mode)
509 { 510 {
510 case SAVE: 511 case SAVE:
511 s->s_cur.row = s->cur.row; 512 s->s_cur.row = screen.cur.row;
512 s->s_cur.col = s->cur.col; 513 s->s_cur.col = screen.cur.col;
513 s->s_rstyle = rstyle; 514 s->s_rstyle = rstyle;
514 s->s_charset = s->charset; 515 s->s_charset = screen.charset;
515 s->s_charset_char = charsets[s->charset]; 516 s->s_charset_char = charsets[screen.charset];
516 break; 517 break;
517 518
518 case RESTORE: 519 case RESTORE:
519 want_refresh = 1; 520 want_refresh = 1;
520 s->cur.row = s->s_cur.row; 521 screen.cur.row = s->s_cur.row;
521 s->cur.col = s->s_cur.col; 522 screen.cur.col = s->s_cur.col;
522 s->flags &= ~Screen_WrapNext; 523 screen.flags &= ~Screen_WrapNext;
523 rstyle = s->s_rstyle; 524 rstyle = s->s_rstyle;
524 s->charset = s->s_charset; 525 screen.charset = s->s_charset;
525 charsets[s->charset] = s->s_charset_char; 526 charsets[screen.charset] = s->s_charset_char;
526 set_font_style (); 527 set_font_style ();
527 break; 528 break;
528 } 529 }
529 530
530 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
553 int offset; 554 int offset;
554#endif 555#endif
555 556
556 want_refresh = 1; 557 want_refresh = 1;
557 558
558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
559
560 TermWin.view_start = 0; 559 TermWin.view_start = 0;
561 560
562 if (current_screen == scrn) 561 if (current_screen == scrn)
563 return scrn; 562 return scrn;
564 563
565 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
566 565
567 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
568#if NSCREENS 575#if NSCREENS
569 if (Options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
570 { 577 {
571 num_scr = 0; 578 num_scr = 0;
572 offset = TermWin.saveLines; 579 offset = TermWin.saveLines;
580
573 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
574 { 582 {
575 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
576 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
577 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
578 } 586 }
579 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587
580 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
581# ifdef DEBUG_STRICT
582 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
583 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
584# else /* drive with your eyes closed */
585 MAX_IT (screen.cur.row, 0);
586 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
587 MAX_IT (screen.cur.col, 0);
588 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
589# endif
590 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
591 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
592 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
593 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
594 } 592 }
595 else 593 else
596#endif 594#endif
597 if (Options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
598 //if (current_screen == PRIMARY)
599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
597
600 return scrn; 598 return scrn;
601} 599}
602 600
601// clear WrapNext indicator, solidifying position on next line
602void
603rxvt_term::scr_do_wrap ()
604{
605 if (!(screen.flags & Screen_WrapNext))
606 return;
607
608 screen.flags &= ~Screen_WrapNext;
609
610 screen.cur.col = 0;
611
612 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
614 else if (screen.cur.row < TermWin.nrow - 1)
615 screen.cur.row++;
616}
617
603/* ------------------------------------------------------------------------- */ 618/* ------------------------------------------------------------------------- */
604/* 619/*
605 * Change the colour for following text 620 * Change the colour for following text
606 */ 621 */
607void 622void
608rxvt_term::scr_color (unsigned int color, int fgbg) 623rxvt_term::scr_color (unsigned int color, int fgbg)
609{ 624{
610 color &= RS_fgMask; 625 if (color > maxTermCOLOR)
626 color = fgbg;
627
611 if (fgbg == Color_fg) 628 if (fgbg == Color_fg)
612 rstyle = SET_FGCOLOR (rstyle, color); 629 rstyle = SET_FGCOLOR (rstyle, color);
613 else 630 else
614 rstyle = SET_BGCOLOR (rstyle, color); 631 rstyle = SET_BGCOLOR (rstyle, color);
615} 632}
… …
644 661
645 if (count == 0 || (row1 > row2)) 662 if (count == 0 || (row1 > row2))
646 return 0; 663 return 0;
647 664
648 want_refresh = 1; 665 want_refresh = 1;
649 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
650 666
651 if (row1 == 0 && count > 0 667 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 668 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
653 { 669 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 670 nscrolled = (long)TermWin.nscrolled + (long)count;
655 671
656 if (nscrolled > (long)TermWin.saveLines) 672 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 673 TermWin.nscrolled = TermWin.saveLines;
658 else 674 else
659 TermWin.nscrolled = (uint16_t)nscrolled; 675 TermWin.nscrolled = (unsigned int)nscrolled;
660 676
661 if ((Options & Opt_scrollWithBuffer) 677 if ((options & Opt_scrollWithBuffer)
662 && TermWin.view_start != 0 678 && TermWin.view_start != 0
663 && TermWin.view_start != TermWin.saveLines) 679 && TermWin.view_start != TermWin.saveLines)
664 scr_page (UP, count); 680 scr_page (UP, count);
665 } 681 }
666 else if (!spec) 682 else if (!spec)
… …
683 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
684 } 700 }
685 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
686 { 702 {
687 /* move selected region too */ 703 /* move selected region too */
688 selection.beg.row -= count; 704 selection.beg.row -= count;
689 selection.end.row -= count; 705 selection.end.row -= count;
690 selection.mark.row -= count; 706 selection.mark.row -= count;
691 } 707 }
692 } 708 }
693 709
694 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
702 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
703 MIN_IT (count, i); 719 MIN_IT (count, i);
704 720
705 if (j > 0) 721 if (j > 0)
706 { 722 {
707 /* A: scroll up */ 723 /* scroll up */
708 724
709 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
710 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
711 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
712 728
713 /* A2: Rotate lines */ 729 /* Rotate lines */
714 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
715 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
716 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); 732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
717 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); 733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
718 734
719 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
720 } 736 }
721 else /* if (j < 0) */ 737 else /* if (j < 0) */
722 { 738 {
723 /* B: scroll down */ 739 /* scroll down */
724 740
725 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
726 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
727 { 743 {
728 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
729 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
730 } 746 }
731 747
732 /* B2: Rotate lines */ 748 /* Rotate lines */
733 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
734 { 750 {
735 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
736 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
737 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
739 755
740 j = row1, i = count; 756 j = row1, i = count;
741 count = -count; 757 count = -count;
742 } 758 }
743 759
744 /* C: Resurrect lines */ 760 /* Resurrect lines */
745 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
746 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
747 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
748 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
749 for (; i--; j++) 765 for (; i--; j++)
… …
757 * Add text given in <str> of length <len> to screen struct 773 * Add text given in <str> of length <len> to screen struct
758 */ 774 */
759void 775void
760rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
761{ 777{
778 if (len <= 0) /* sanity */
779 return;
780
762 unsigned char checksel, clearsel; 781 unsigned char checksel;
763 unicode_t c; 782 unicode_t c;
764 int i, row, last_col; 783 int row, last_col;
765 text_t *stp; 784 text_t *stp;
766 rend_t *srp; 785 rend_t *srp;
767 786 const unicode_t *strend = str + len;
768 if (len <= 0) /* sanity */
769 return;
770 787
771 want_refresh = 1; 788 want_refresh = 1;
789 ZERO_SCROLLBACK ();
772 last_col = TermWin.ncol; 790 last_col = TermWin.ncol;
773 791
774 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
775 ZERO_SCROLLBACK ();
776 if (nlines > 0) 792 if (nlines > 0)
777 { 793 {
778 nlines += screen.cur.row - screen.bscroll; 794 nlines += screen.cur.row - screen.bscroll;
779 if ((nlines > 0) 795 if ((nlines > 0)
780 && (screen.tscroll == 0) 796 && (screen.tscroll == 0)
… …
783 /* _at least_ this many lines need to be scrolled */ 799 /* _at least_ this many lines need to be scrolled */
784 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 800 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
785 screen.cur.row -= nlines; 801 screen.cur.row -= nlines;
786 } 802 }
787 } 803 }
804
788#ifdef DEBUG_STRICT 805#ifdef DEBUG_STRICT
789 assert (screen.cur.col < last_col); 806 assert (screen.cur.col < last_col);
790 assert ((screen.cur.row < TermWin.nrow) 807 assert ((screen.cur.row < TermWin.nrow)
791 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 808 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
792#else /* drive with your eyes closed */ 809#else /* drive with your eyes closed */
… …
795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 812 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
796#endif 813#endif
797 row = screen.cur.row + TermWin.saveLines; 814 row = screen.cur.row + TermWin.saveLines;
798 815
799 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
800 clearsel = 0;
801 817
802 stp = screen.text[row]; 818 stp = screen.text[row];
803 srp = screen.rend[row]; 819 srp = screen.rend[row];
804 820
805 while (len--) 821 while (str < strend)
806 { 822 {
807 c = *str++; 823 c = *str++;
808 824
809 if (c < 0x20) 825 if (c < 0x20)
810 switch (c) 826 if (c == C0_LF)
827 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col);
830
831 screen.flags &= ~Screen_WrapNext;
832
833 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835 else if (screen.cur.row < (TermWin.nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines;
837
838 stp = screen.text[row]; /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue;
841 }
842 else if (c == C0_CR)
811 { 843 {
812 case C0_HT:
813 scr_tab (1);
814 continue;
815
816 case C0_LF:
817 if (screen.tlen[row] != -1) /* XXX: think about this */ 844 if (screen.tlen[row] != -1) /* XXX: think about this */
818 MAX_IT (screen.tlen[row], screen.cur.col); 845 MAX_IT (screen.tlen[row], screen.cur.col);
819 846
820 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
821
822 if (screen.cur.row == screen.bscroll)
823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
824 else if (screen.cur.row < (TermWin.nrow - 1))
825 row = (++screen.cur.row) + TermWin.saveLines;
826
827 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */
829 continue;
830
831 case C0_CR:
832 if (screen.tlen[row] != -1) /* XXX: think about this */
833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 848 screen.cur.col = 0;
837 continue; 849 continue;
850 }
851 else if (c == C0_HT)
852 {
853 scr_tab (1, true);
854 continue;
838 } 855 }
839 856
840 if (checksel /* see if we're writing within selection */ 857 if (checksel /* see if we're writing within selection */
841 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
842 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
843 { 860 {
844 checksel = 0; 861 checksel = 0;
845 clearsel = 1; 862 /*
863 * If we wrote anywhere in the selected area, kill the selection
864 * XXX: should we kill the mark too? Possibly, but maybe that
865 * should be a similar check.
866 */
867 CLEAR_SELECTION ();
846 } 868 }
847 869
848 if (screen.flags & Screen_WrapNext) 870 if (screen.flags & Screen_WrapNext)
849 { 871 {
850 screen.tlen[row] = -1; 872 screen.tlen[row] = -1;
851 if (screen.cur.row == screen.bscroll) 873
852 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 874 scr_do_wrap ();
853 else if (screen.cur.row < (TermWin.nrow - 1)) 875
854 row = (++screen.cur.row) + TermWin.saveLines; 876 row = screen.cur.row + TermWin.saveLines;
855
856 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 879 }
859 screen.flags &= ~Screen_WrapNext; 880
881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff))
883 c = 0xfffd;
884
885 // rely on wcwidth to tell us the character width, at least for non-latin1
886 // do wcwidth before further replacements, as wcwidth might return -1
887 // for the line drawing characters below as they might be invalid in the current
888 // locale.
889 int width = c < 0x100 ? 1 : wcwidth (c);
890
891 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 {
893 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[62] = { // 41 .. 7e
897 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
898 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
899 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
900 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
905 };
906
907 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
908 {
909 c = vt100_0[c - 0x41];
910 width = 1; // vt100 line drawing characters are always single-width
911 }
860 } 912 }
861 913
862 if (screen.flags & Screen_Insert) 914 if (screen.flags & Screen_Insert)
863 scr_insdel_chars (1, INSERT); 915 scr_insdel_chars (width, INSERT);
864
865 // rely on wcwidth to tell us the character width, at least for non-latin1
866 // do wcwidth before further replacements, as wcwidth says that line-drawing
867 // characters have width -1 (DOH!) on GNU/Linux sometimes.
868 int width = c < 0x100 ? 1 : wcwidth (c);
869
870 if (charsets[screen.charset] == '0') // DEC SPECIAL
871 {
872 // vt100 special graphics and line drawing
873 static uint16_t vt100_0[32] = { // 5f .. 7e
874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
877 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
878 };
879
880 if (c >= 0x5f && c <= 0x7e)
881 {
882 c = vt100_0[c - 0x5f];
883 width = 1;
884 }
885 }
886 916
887 if (width != 0) 917 if (width != 0)
888 { 918 {
889#if !UNICODE_3 && ENABLE_COMBINING 919#if !UNICODE_3
890 // trim characters we can't store directly :( 920 // trim characters we can't store directly :(
891 if (c >= 0x10000) 921 if (c >= 0x10000)
922# if ENABLE_COMBINING
892 c = rxvt_composite.compose (c); // map to lower 16 bits 923 c = rxvt_composite.compose (c); // map to lower 16 bits
924# else
925 c = 0xfffd;
893#endif 926# endif
894 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 927#endif
895 rend_t rend = SET_FONT (rstyle, 928
896 c > 0x7f || bold || c < 0x20 929 // nuke the character at this position, if required
897 ? TermWin.fontset->find_font (c, bold) 930 if (stp[screen.cur.col] == NOCHAR
898 : TermWin.ascii_map [c - 0x20]); 931 || (screen.cur.col < TermWin.ncol - 1
932 && stp[screen.cur.col + 1] == NOCHAR))
933 {
934 int col = screen.cur.col;
935
936 // find begin
937 while (col > 0 && stp[col] == NOCHAR)
938 col--;
939
940 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
941
942 // found begin, nuke
943 do {
944 stp[col] = ' ';
945 srp[col] = rend;
946 col++;
947 } while (col < TermWin.ncol && stp[col] == NOCHAR);
948 }
949
950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951
952 // if the character doesn't fit into the remaining columns...
953 if (screen.cur.col > last_col - width && last_col >= width)
954 {
955 // ...output spaces
956 c = ' ';
957 // and try the same character next loop iteration
958 --str;
959 }
899 960
900 do 961 do
901 { 962 {
902 stp[screen.cur.col] = c; 963 stp[screen.cur.col] = c;
903 srp[screen.cur.col] = rend; 964 srp[screen.cur.col] = rend;
… …
915 c = NOCHAR; 976 c = NOCHAR;
916 } 977 }
917 while (--width > 0); 978 while (--width > 0);
918 979
919 // pad with spaces when overwriting wide character with smaller one 980 // pad with spaces when overwriting wide character with smaller one
981 if (!width)
920 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 982 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
921 { 983 {
922 stp[c] = ' '; 984 stp[c] = ' ';
923 srp[c] = rend; 985 srp[c] = rend;
924 } 986 }
925 } 987 }
926 else if (width == 0) 988 else // width == 0
927 { 989 {
928#if ENABLE_COMBINING 990#if ENABLE_COMBINING
929 // handle combining characters 991 // handle combining characters
930 // we just tag the accent on the previous on-screen character. 992 // we just tag the accent on the previous on-screen character.
931 // this is arguably not correct, but also arguably not wrong. 993 // this is arguably not correct, but also arguably not wrong.
932 // we don't handle double-width characters nicely yet. 994 // we don't handle double-width characters nicely yet.
933
934 text_t *tp; 995 text_t *tp;
935 rend_t *rp; 996 rend_t *rp;
936 997
937 if (screen.cur.col > 0) 998 if (screen.cur.col > 0)
938 { 999 {
939 tp = stp + screen.cur.col - 1; 1000 tp = stp + screen.cur.col - 1;
940 rp = srp + screen.cur.col - 1; 1001 rp = srp + screen.cur.col - 1;
1002
1003 while (*tp == NOCHAR && tp > stp)
1004 tp--, rp--;
941 } 1005 }
942 else if (screen.cur.row > 0 1006 else if (screen.cur.row > 0
943 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1007 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
944 { 1008 {
945 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1009 int line = screen.cur.row - 1 + TermWin.saveLines;
946 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1010
1011 tp = screen.text[line] + last_col - 1;
1012 rp = screen.rend[line] + last_col - 1;
1013
1014 while (*tp == NOCHAR && tp > screen.text[line])
1015 tp--, rp--;
947 } 1016 }
948 else 1017 else
949 continue; 1018 continue;
950
951 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR)
953 *tp = ' '; // hack //D //TODO //--tp, --rp;
954 1019
955 // first try to find a precomposed character 1020 // first try to find a precomposed character
956 unicode_t n = rxvt_compose (*tp, c); 1021 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR) 1022 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c); 1023 n = rxvt_composite.compose (*tp, c);
959 1024
960 *tp = n; 1025 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1026 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
962#endif 1027#endif
963 } 1028 }
964 } 1029 }
965 1030
966 if (screen.tlen[row] != -1) /* XXX: think about this */ 1031 if (screen.tlen[row] != -1) /* XXX: think about this */
967 MAX_IT (screen.tlen[row], screen.cur.col); 1032 MAX_IT (screen.tlen[row], screen.cur.col);
968
969 /*
970 * If we wrote anywhere in the selected area, kill the selection
971 * XXX: should we kill the mark too? Possibly, but maybe that
972 * should be a similar check.
973 */
974 if (clearsel)
975 CLEAR_SELECTION ();
976 1033
977#ifdef DEBUG_STRICT 1034#ifdef DEBUG_STRICT
978 assert (screen.cur.row >= 0); 1035 assert (screen.cur.row >= 0);
979#else /* drive with your eyes closed */ 1036#else /* drive with your eyes closed */
980 MAX_IT (screen.cur.row, 0); 1037 MAX_IT (screen.cur.row, 0);
… …
998#ifdef TERMCAP_HAS_BW 1055#ifdef TERMCAP_HAS_BW
999 screen.cur.col = TermWin.ncol - 1; 1056 screen.cur.col = TermWin.ncol - 1;
1000 screen.cur.row--; 1057 screen.cur.row--;
1001 return; 1058 return;
1002#endif 1059#endif
1003
1004 } 1060 }
1005 } 1061 }
1006 else if ((screen.flags & Screen_WrapNext) == 0) 1062 else if (!(screen.flags & Screen_WrapNext))
1007 scr_gotorc (0, -1, RELATIVE); 1063 scr_gotorc (0, -1, RELATIVE);
1008 1064
1009 screen.flags &= ~Screen_WrapNext; 1065 screen.flags &= ~Screen_WrapNext;
1010} 1066}
1011 1067
… …
1014 * Process Horizontal Tab 1070 * Process Horizontal Tab
1015 * count: +ve = forward; -ve = backwards 1071 * count: +ve = forward; -ve = backwards
1016 * XTERM_SEQ: CTRL-I 1072 * XTERM_SEQ: CTRL-I
1017 */ 1073 */
1018void 1074void
1019rxvt_term::scr_tab (int count) 1075rxvt_term::scr_tab (int count, bool ht)
1020{ 1076{
1021 int i, x; 1077 int i, x;
1022 1078
1023 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1024 want_refresh = 1; 1079 want_refresh = 1;
1025 i = x = screen.cur.col; 1080 i = x = screen.cur.col;
1026 1081
1027 if (count == 0) 1082 if (count == 0)
1028 return; 1083 return;
1029 else if (count > 0) 1084 else if (count > 0)
1030 { 1085 {
1086 int row = TermWin.saveLines + screen.cur.row;
1087 text_t *tp = screen.text[row];
1088 rend_t *rp = screen.rend[row];
1089 rend_t base_rend = rp[i];
1090 ht &= tp[i] == ' ';
1091
1031 for (; ++i < TermWin.ncol; ) 1092 for (; ++i < TermWin.ncol; )
1032 if (tabs[i]) 1093 if (tabs[i])
1033 { 1094 {
1034 x = i; 1095 x = i;
1035 if (!--count) 1096 if (!--count)
1036 break; 1097 break;
1037 } 1098 }
1099 else
1100 ht &= tp[i] == ' '
1101 && RS_SAME (rp[i], base_rend);
1038 1102
1039 if (count) 1103 if (count)
1040 x = TermWin.ncol - 1; 1104 x = TermWin.ncol - 1;
1105
1106 // store horizontal tab commands as characters inside the text
1107 // buffer so they can be selected and pasted.
1108 if (ht && options & Opt_pastableTabs)
1109 {
1110 base_rend = SET_FONT (base_rend, 0);
1111
1112 if (screen.tlen[row] != -1) /* XXX: think about this */
1113 MAX_IT (screen.tlen[row], x);
1114
1115 i = screen.cur.col;
1116
1117 tp[i] = '\t';
1118 rp[i] = base_rend;
1119
1120 while (++i < x)
1121 {
1122 tp[i] = NOCHAR;
1123 rp[i] = base_rend;
1124 }
1125 }
1041 } 1126 }
1042 else /* if (count < 0) */ 1127 else /* if (count < 0) */
1043 { 1128 {
1044 for (; --i >= 0; ) 1129 for (; --i >= 0; )
1045 if (tabs[i]) 1130 if (tabs[i])
… …
1062 * Process DEC Back Index 1147 * Process DEC Back Index
1063 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1064 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1065 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1066 */ 1151 */
1067#ifndef NO_FRILLS 1152#if ENABLE_FRILLS
1068void 1153void
1069rxvt_term::scr_backindex () 1154rxvt_term::scr_backindex ()
1070{ 1155{
1071 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1158 else
1074 { 1159 {
1075 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1160 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1076 return; /* um, yeah? */ 1161 return; /* um, yeah? */
1162
1077 scr_insdel_chars (1, INSERT); 1163 scr_insdel_chars (1, INSERT);
1078 } 1164 }
1079} 1165}
1080#endif 1166#endif
1081/* ------------------------------------------------------------------------- */ 1167/* ------------------------------------------------------------------------- */
… …
1083 * Process DEC Forward Index 1169 * Process DEC Forward Index
1084 * XTERM_SEQ: ESC 9 1170 * XTERM_SEQ: ESC 9
1085 * Move cursor right in row. If we're at the right boundary, shift everything 1171 * Move cursor right in row. If we're at the right boundary, shift everything
1086 * in that row left. Clear right column. 1172 * in that row left. Clear right column.
1087 */ 1173 */
1088#ifndef NO_FRILLS 1174#if ENABLE_FRILLS
1089void 1175void
1090rxvt_term::scr_forwardindex () 1176rxvt_term::scr_forwardindex ()
1091{ 1177{
1092 int row; 1178 int row;
1093 1179
1094 if (screen.cur.col < TermWin.ncol - 1) 1180 if (screen.cur.col < TermWin.ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1182 else
1097 { 1183 {
1098 row = screen.cur.row + TermWin.saveLines; 1184 row = screen.cur.row + TermWin.saveLines;
1185
1099 if (screen.tlen[row] == 0) 1186 if (screen.tlen[row] == 0)
1100 return; /* um, yeah? */ 1187 return; /* um, yeah? */
1101 else if (screen.tlen[row] == -1) 1188 else if (screen.tlen[row] == -1)
1102 screen.tlen[row] = TermWin.ncol; 1189 screen.tlen[row] = TermWin.ncol;
1190
1103 scr_gotorc (0, 0, R_RELATIVE); 1191 scr_gotorc (0, 0, R_RELATIVE);
1104 scr_insdel_chars (1, DELETE); 1192 scr_insdel_chars (1, DELETE);
1105 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1193 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1106 } 1194 }
1107} 1195}
… …
1115rxvt_term::scr_gotorc (int row, int col, int relative) 1203rxvt_term::scr_gotorc (int row, int col, int relative)
1116{ 1204{
1117 want_refresh = 1; 1205 want_refresh = 1;
1118 ZERO_SCROLLBACK (); 1206 ZERO_SCROLLBACK ();
1119 1207
1120 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));
1121
1122 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1208 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1123 MAX_IT (screen.cur.col, 0); 1209 MAX_IT (screen.cur.col, 0);
1124 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1210 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1125 1211
1126 screen.flags &= ~Screen_WrapNext; 1212 screen.flags &= ~Screen_WrapNext;
1213
1127 if (relative & R_RELATIVE) 1214 if (relative & R_RELATIVE)
1128 { 1215 {
1129 if (row > 0) 1216 if (row > 0)
1130 { 1217 {
1131 if (screen.cur.row <= screen.bscroll 1218 if (screen.cur.row <= screen.bscroll
… …
1151 MIN_IT (screen.cur.row, screen.bscroll); 1238 MIN_IT (screen.cur.row, screen.bscroll);
1152 } 1239 }
1153 else 1240 else
1154 screen.cur.row = row; 1241 screen.cur.row = row;
1155 } 1242 }
1243
1156 MAX_IT (screen.cur.row, 0); 1244 MAX_IT (screen.cur.row, 0);
1157 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1245 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1158
1159 while (screen.cur.col > 0
1160 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1161 screen.cur.col--;
1162} 1246}
1163 1247
1164/* ------------------------------------------------------------------------- */ 1248/* ------------------------------------------------------------------------- */
1165/* 1249/*
1166 * direction should be UP or DN 1250 * direction should be UP or DN
1167 */ 1251 */
1168void 1252void
1169rxvt_term::scr_index (enum page_dirn direction) 1253rxvt_term::scr_index (enum page_dirn direction)
1170{ 1254{
1171 int dirn; 1255 int dirn;
1172 1256
1173 want_refresh = 1; 1257 want_refresh = 1;
1258 ZERO_SCROLLBACK ();
1259
1174 dirn = ((direction == UP) ? 1 : -1); 1260 dirn = ((direction == UP) ? 1 : -1);
1175 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1176
1177 ZERO_SCROLLBACK ();
1178 1261
1179 screen.flags &= ~Screen_WrapNext; 1262 screen.flags &= ~Screen_WrapNext;
1263
1180 if ((screen.cur.row == screen.bscroll && direction == UP) 1264 if ((screen.cur.row == screen.bscroll && direction == UP)
1181 || (screen.cur.row == screen.tscroll && direction == DN)) 1265 || (screen.cur.row == screen.tscroll && direction == DN))
1182 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1266 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1183 else 1267 else
1184 screen.cur.row += dirn; 1268 screen.cur.row += dirn;
1269
1185 MAX_IT (screen.cur.row, 0); 1270 MAX_IT (screen.cur.row, 0);
1186 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1271 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1187 selection_check (0); 1272 selection_check (0);
1188} 1273}
1189 1274
… …
1198rxvt_term::scr_erase_line (int mode) 1283rxvt_term::scr_erase_line (int mode)
1199{ 1284{
1200 unsigned int row, col, num; 1285 unsigned int row, col, num;
1201 1286
1202 want_refresh = 1; 1287 want_refresh = 1;
1203 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1204 ZERO_SCROLLBACK (); 1288 ZERO_SCROLLBACK ();
1205 1289
1206 selection_check (1); 1290 selection_check (1);
1207
1208 screen.flags &= ~Screen_WrapNext;
1209 1291
1210 row = TermWin.saveLines + screen.cur.row; 1292 row = TermWin.saveLines + screen.cur.row;
1211 switch (mode) 1293 switch (mode)
1212 { 1294 {
1213 case 0: /* erase to end of line */ 1295 case 0: /* erase to end of line */
… …
1257 int32_t row, row_offset; 1339 int32_t row, row_offset;
1258 rend_t ren; 1340 rend_t ren;
1259 XGCValues gcvalue; 1341 XGCValues gcvalue;
1260 1342
1261 want_refresh = 1; 1343 want_refresh = 1;
1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1263 ZERO_SCROLLBACK (); 1344 ZERO_SCROLLBACK ();
1345
1264 row_offset = (int32_t)TermWin.saveLines; 1346 row_offset = (int32_t)TermWin.saveLines;
1265 1347
1266 switch (mode) 1348 switch (mode)
1267 { 1349 {
1268 case 0: /* erase to end of screen */ 1350 case 0: /* erase to end of screen */
… …
1304 ren = DEFAULT_RSTYLE; 1386 ren = DEFAULT_RSTYLE;
1305 CLEAR_ROWS (row, num); 1387 CLEAR_ROWS (row, num);
1306 } 1388 }
1307 else 1389 else
1308 { 1390 {
1309 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1310 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1312 ERASE_ROWS (row, num); 1394 ERASE_ROWS (row, num);
1313 gcvalue.foreground = PixColors[Color_fg]; 1395 gcvalue.foreground = pix_colors[Color_fg];
1314 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1315 } 1397 }
1316 1398
1317 for (; num--; row++) 1399 for (; num--; row++)
1318 { 1400 {
1319 scr_blank_screen_mem (screen.text, screen.rend, 1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1320 (unsigned int) (row + row_offset), rstyle);
1321 screen.tlen[row + row_offset] = 0; 1402 screen.tlen[row + row_offset] = 0;
1322 scr_blank_line (drawn_text[row], drawn_rend[row], 1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1323 (unsigned int)TermWin.ncol, ren);
1324 } 1404 }
1325} 1405}
1406
1407#if ENABLE_FRILLS
1408void
1409rxvt_term::scr_erase_savelines ()
1410{
1411 want_refresh = 1;
1412 ZERO_SCROLLBACK ();
1413
1414 TermWin.nscrolled = 0;
1415}
1416#endif
1326 1417
1327/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1328/* 1419/*
1329 * Fill the screen with `E's 1420 * Fill the screen with `E's
1330 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1331 */ 1422 */
1332void 1423void
1333rxvt_term::scr_E () 1424rxvt_term::scr_E ()
1334{ 1425{
1335 int i, j, k; 1426 int i, j, k;
1336 rend_t *r1, fs; 1427 rend_t *r1, fs;
1337 1428
1338 want_refresh = 1; 1429 want_refresh = 1;
1430 ZERO_SCROLLBACK ();
1431
1339 num_scr_allow = 0; 1432 num_scr_allow = 0;
1340 ZERO_SCROLLBACK ();
1341 selection_check (3); 1433 selection_check (3);
1342 1434
1343 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1344 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1436 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1345 { 1437 {
1346 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1438 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1347 fill_text (screen.text[k], 'E', TermWin.ncol); 1439 fill_text (screen.text[k], 'E', TermWin.ncol);
1348 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1440 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1372 if (insdel == DELETE) 1464 if (insdel == DELETE)
1373 return; 1465 return;
1374 else if (insdel == INSERT) 1466 else if (insdel == INSERT)
1375 count = end; 1467 count = end;
1376 } 1468 }
1377 screen.flags &= ~Screen_WrapNext; 1469
1470 scr_do_wrap ();
1378 1471
1379 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1472 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1380} 1473}
1381 1474
1382/* ------------------------------------------------------------------------- */ 1475/* ------------------------------------------------------------------------- */
… …
1396 ZERO_SCROLLBACK (); 1489 ZERO_SCROLLBACK ();
1397 1490
1398 if (count <= 0) 1491 if (count <= 0)
1399 return; 1492 return;
1400 1493
1494 scr_do_wrap ();
1495
1401 selection_check (1); 1496 selection_check (1);
1402 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1497 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1403 1498
1404 row = screen.cur.row + TermWin.saveLines; 1499 row = screen.cur.row + TermWin.saveLines;
1405 screen.flags &= ~Screen_WrapNext;
1406 1500
1407 stp = screen.text[row]; 1501 stp = screen.text[row];
1408 srp = screen.rend[row]; 1502 srp = screen.rend[row];
1409 slp = & (screen.tlen[row]); 1503 slp = &screen.tlen[row];
1410 1504
1411 switch (insdel) 1505 switch (insdel)
1412 { 1506 {
1413 case INSERT: 1507 case INSERT:
1414 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1508 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1415 col--)
1416 { 1509 {
1417 stp[col] = stp[col - count]; 1510 stp[col] = stp[col - count];
1418 srp[col] = srp[col - count]; 1511 srp[col] = srp[col - count];
1419 } 1512 }
1420 1513
… …
1430 if (selection.end.row != screen.cur.row 1523 if (selection.end.row != screen.cur.row
1431 || (selection.end.col + count >= TermWin.ncol)) 1524 || (selection.end.col + count >= TermWin.ncol))
1432 CLEAR_SELECTION (); 1525 CLEAR_SELECTION ();
1433 else 1526 else
1434 { /* shift selection */ 1527 { /* shift selection */
1435 selection.beg.col += count; 1528 selection.beg.col += count;
1436 selection.mark.col += count; /* XXX: yes? */ 1529 selection.mark.col += count; /* XXX: yes? */
1437 selection.end.col += count; 1530 selection.end.col += count;
1438 } 1531 }
1439 } 1532 }
1440 1533
1441 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1534 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1442 (unsigned int)count, rstyle); 1535 (unsigned int)count, rstyle);
1443 break; 1536 break;
1444 1537
1445 case ERASE: 1538 case ERASE:
1446 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1539 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1447 selection_check (1); 1540 selection_check (1);
1448 screen.cur.col -= count; 1541 screen.cur.col -= count;
1449 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1542 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1450 (unsigned int)count, rstyle); 1543 (unsigned int)count, rstyle);
1451 break; 1544 break;
1452 1545
1453 case DELETE: 1546 case DELETE:
1454 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1547 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1457 { 1550 {
1458 stp[col] = stp[col + count]; 1551 stp[col] = stp[col + count];
1459 srp[col] = srp[col + count]; 1552 srp[col] = srp[col + count];
1460 } 1553 }
1461 1554
1462 scr_blank_line (& (stp[TermWin.ncol - count]), 1555 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1463 & (srp[TermWin.ncol - count]),
1464 (unsigned int)count, tr); 1556 (unsigned int)count, tr);
1465 1557
1466 if (*slp == -1) /* break line continuation */ 1558 if (*slp == -1) /* break line continuation */
1467 *slp = TermWin.ncol; 1559 *slp = TermWin.ncol;
1468 1560
… …
1477 || selection.end.col >= TermWin.ncol) 1569 || selection.end.col >= TermWin.ncol)
1478 CLEAR_SELECTION (); 1570 CLEAR_SELECTION ();
1479 else 1571 else
1480 { 1572 {
1481 /* shift selection */ 1573 /* shift selection */
1482 selection.beg.col -= count; 1574 selection.beg.col -= count;
1483 selection.mark.col -= count; /* XXX: yes? */ 1575 selection.mark.col -= count; /* XXX: yes? */
1484 selection.end.col -= count; 1576 selection.end.col -= count;
1485 } 1577 }
1486 } 1578 }
1487 1579
1488 break; 1580 break;
1489 } 1581 }
… …
1535rxvt_term::scr_autowrap (int mode) 1627rxvt_term::scr_autowrap (int mode)
1536{ 1628{
1537 if (mode) 1629 if (mode)
1538 screen.flags |= Screen_Autowrap; 1630 screen.flags |= Screen_Autowrap;
1539 else 1631 else
1540 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1632 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1541} 1633}
1542 1634
1543/* ------------------------------------------------------------------------- */ 1635/* ------------------------------------------------------------------------- */
1544/* 1636/*
1545 * Set/unset margin origin mode 1637 * Set/unset margin origin mode
… …
1555{ 1647{
1556 if (mode) 1648 if (mode)
1557 screen.flags |= Screen_Relative; 1649 screen.flags |= Screen_Relative;
1558 else 1650 else
1559 screen.flags &= ~Screen_Relative; 1651 screen.flags &= ~Screen_Relative;
1652
1560 scr_gotorc (0, 0, 0); 1653 scr_gotorc (0, 0, 0);
1561} 1654}
1562 1655
1563/* ------------------------------------------------------------------------- */ 1656/* ------------------------------------------------------------------------- */
1564/* 1657/*
… …
1584 */ 1677 */
1585void 1678void
1586rxvt_term::scr_set_tab (int mode) 1679rxvt_term::scr_set_tab (int mode)
1587{ 1680{
1588 if (mode < 0) 1681 if (mode < 0)
1589 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1682 memset (tabs, 0, TermWin.ncol * sizeof (char));
1590 else if (screen.cur.col < TermWin.ncol) 1683 else if (screen.cur.col < TermWin.ncol)
1591 tabs[screen.cur.col] = (mode ? 1 : 0); 1684 tabs[screen.cur.col] = (mode ? 1 : 0);
1592} 1685}
1593 1686
1594/* ------------------------------------------------------------------------- */ 1687/* ------------------------------------------------------------------------- */
… …
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1691 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1692 */
1600void 1693void
1601rxvt_term::scr_rvideo_mode (int mode) 1694rxvt_term::scr_rvideo_mode (int mode)
1602{ 1695{
1603 XGCValues gcvalue; 1696 XGCValues gcvalue;
1604 1697
1605 if (rvideo != mode) 1698 if (rvideo != mode)
1606 { 1699 {
1607 rvideo = mode; 1700 rvideo = mode;
1608 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1701 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1609#if defined(XPM_BACKGROUND) 1702#if XPM_BACKGROUND
1610 if (bgPixmap.pixmap == None) 1703 if (bgPixmap.pixmap == None)
1611#endif 1704#endif
1612#if defined(TRANSPARENT) 1705#if TRANSPARENT
1613 if (! (Options & Opt_transparent) || am_transparent == 0) 1706 if (! (options & Opt_transparent) || am_transparent == 0)
1614#endif 1707#endif
1615 XSetWindowBackground (display->display, TermWin.vt, 1708 XSetWindowBackground (display->display, TermWin.vt,
1616 PixColors[Color_bg]); 1709 pix_colors[Color_bg]);
1617 1710
1618 gcvalue.foreground = PixColors[Color_fg]; 1711 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = PixColors[Color_bg]; 1712 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1713 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1621 &gcvalue); 1714 &gcvalue);
1622 scr_clear (); 1715 scr_clear ();
1623 scr_touch (true); 1716 scr_touch (true);
1624 } 1717 }
… …
1672 * XTERM_SEQ: Invoke G2 character set: ESC N 1765 * XTERM_SEQ: Invoke G2 character set: ESC N
1673 * XTERM_SEQ: Invoke G3 character set: ESC O 1766 * XTERM_SEQ: Invoke G3 character set: ESC O
1674 */ 1767 */
1675void 1768void
1676rxvt_term::scr_charset_choose (int set) 1769rxvt_term::scr_charset_choose (int set)
1677 { 1770{
1678 screen.charset = set; 1771 screen.charset = set;
1679 set_font_style (); 1772 set_font_style ();
1680 } 1773}
1681 1774
1682/* ------------------------------------------------------------------------- */ 1775/* ------------------------------------------------------------------------- */
1683/* 1776/*
1684 * Set a font 1777 * Set a font
1685 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1778 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1688 * XTERM_SEQ: Set G3 character set: ESC + <C> 1781 * XTERM_SEQ: Set G3 character set: ESC + <C>
1689 * See set_font_style for possible values for <C> 1782 * See set_font_style for possible values for <C>
1690 */ 1783 */
1691void 1784void
1692rxvt_term::scr_charset_set (int set, unsigned int ch) 1785rxvt_term::scr_charset_set (int set, unsigned int ch)
1693 { 1786{
1694 charsets[set] = (unsigned char)ch; 1787 charsets[set] = (unsigned char)ch;
1695 set_font_style (); 1788 set_font_style ();
1696 } 1789}
1697 1790
1698 1791
1699/* ------------------------------------------------------------------------- * 1792/* ------------------------------------------------------------------------- *
1700 * MAJOR SCREEN MANIPULATION * 1793 * MAJOR SCREEN MANIPULATION *
1701 * ------------------------------------------------------------------------- */ 1794 * ------------------------------------------------------------------------- */
… …
1769 { 1862 {
1770 MIN_IT (rc[i].col, TermWin.ncol - 1); 1863 MIN_IT (rc[i].col, TermWin.ncol - 1);
1771 MIN_IT (rc[i].row, TermWin.nrow - 1); 1864 MIN_IT (rc[i].row, TermWin.nrow - 1);
1772 } 1865 }
1773 1866
1774 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));
1775
1776 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1867 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1777 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1868 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1778 1869
1779 if (refresh) 1870 if (refresh)
1780 scr_refresh (SLOW_REFRESH); 1871 scr_refresh (SLOW_REFRESH);
… …
1797 */ 1888 */
1798int 1889int
1799rxvt_term::scr_move_to (int y, int len) 1890rxvt_term::scr_move_to (int y, int len)
1800{ 1891{
1801 long p = 0; 1892 long p = 0;
1802 uint16_t oldviewstart; 1893 unsigned int oldviewstart;
1803 1894
1804 oldviewstart = TermWin.view_start; 1895 oldviewstart = TermWin.view_start;
1896
1805 if (y < len) 1897 if (y < len)
1806 { 1898 {
1807 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1899 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1808 p -= (long) (TermWin.nrow - 1); 1900 p -= (long) (TermWin.nrow - 1);
1809 p = max (p, 0); 1901 p = max (p, 0);
1810 } 1902 }
1903
1811 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1904 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1812 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1813 1905
1814 return scr_changeview (oldviewstart); 1906 return scr_changeview (oldviewstart);
1815} 1907}
1816 1908
1817/* ------------------------------------------------------------------------- */ 1909/* ------------------------------------------------------------------------- */
… …
1821 */ 1913 */
1822int 1914int
1823rxvt_term::scr_page (enum page_dirn direction, int nlines) 1915rxvt_term::scr_page (enum page_dirn direction, int nlines)
1824{ 1916{
1825 int n; 1917 int n;
1826 uint16_t oldviewstart; 1918 unsigned int oldviewstart;
1827 1919
1828 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1829#ifdef DEBUG_STRICT
1830 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1831#endif
1832 oldviewstart = TermWin.view_start; 1920 oldviewstart = TermWin.view_start;
1921
1833 if (direction == UP) 1922 if (direction == UP)
1834 { 1923 {
1835 n = TermWin.view_start + nlines; 1924 n = TermWin.view_start + nlines;
1836 TermWin.view_start = min (n, TermWin.nscrolled); 1925 TermWin.view_start = min (n, TermWin.nscrolled);
1837 } 1926 }
1838 else 1927 else
1839 { 1928 {
1840 n = TermWin.view_start - nlines; 1929 n = TermWin.view_start - nlines;
1841 TermWin.view_start = max (n, 0); 1930 TermWin.view_start = max (n, 0);
1842 } 1931 }
1932
1843 return scr_changeview (oldviewstart); 1933 return scr_changeview (oldviewstart);
1844} 1934}
1845 1935
1846int 1936int
1847rxvt_term::scr_changeview (uint16_t oldviewstart) 1937rxvt_term::scr_changeview (unsigned int oldviewstart)
1848{ 1938{
1849 if (TermWin.view_start != oldviewstart) 1939 if (TermWin.view_start != oldviewstart)
1850 { 1940 {
1851 want_refresh = 1; 1941 want_refresh = 1;
1852 num_scr -= (TermWin.view_start - oldviewstart); 1942 num_scr -= (TermWin.view_start - oldviewstart);
… …
1858/* ------------------------------------------------------------------------- */ 1948/* ------------------------------------------------------------------------- */
1859void 1949void
1860rxvt_term::scr_bell () 1950rxvt_term::scr_bell ()
1861{ 1951{
1862#ifndef NO_BELL 1952#ifndef NO_BELL
1953
1863# ifndef NO_MAPALERT 1954# ifndef NO_MAPALERT
1864# ifdef MAPALERT_OPTION 1955# ifdef MAPALERT_OPTION
1865 if (Options & Opt_mapAlert) 1956 if (options & Opt_mapAlert)
1866# endif 1957# endif
1867 XMapWindow (display->display, TermWin.parent[0]); 1958 XMapWindow (display->display, TermWin.parent[0]);
1868# endif 1959# endif
1960
1869 if (Options & Opt_visualBell) 1961 if (options & Opt_visualBell)
1870 { 1962 {
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1963 scr_rvideo_mode (!rvideo); /* refresh also done */
1964 rxvt_usleep (VISUAL_BELL_DURATION);
1872 scr_rvideo_mode (!rvideo); /* refresh also done */ 1965 scr_rvideo_mode (!rvideo); /* refresh also done */
1873 } 1966 }
1874 else 1967 else
1875 XBell (display->display, 0); 1968 XBell (display->display, 0);
1969
1876#endif 1970#endif
1877} 1971}
1878 1972
1879/* ------------------------------------------------------------------------- */ 1973/* ------------------------------------------------------------------------- */
1880/* ARGSUSED */ 1974/* ARGSUSED */
1881void 1975void
1882rxvt_term::scr_printscreen (int fullhist) 1976rxvt_term::scr_printscreen (int fullhist)
1883{ 1977{
1884#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1885 int i, r1, nrows, row_offset; 1979 int i, r1, nrows, row_offset;
1886 text_t *t; 1980 FILE *fd;
1887 FILE *fd;
1888 1981
1889 if ((fd = popen_printer ()) == NULL) 1982 if ((fd = popen_printer ()) == NULL)
1890 return; 1983 return;
1984
1891 nrows = TermWin.nrow; 1985 nrows = TermWin.nrow;
1892 row_offset = TermWin.saveLines; 1986 row_offset = TermWin.saveLines;
1987
1893 if (!fullhist) 1988 if (!fullhist)
1894 row_offset -= TermWin.view_start; 1989 row_offset -= TermWin.view_start;
1895 else 1990 else
1896 { 1991 {
1897 nrows += TermWin.nscrolled; 1992 nrows += TermWin.nscrolled;
1898 row_offset -= TermWin.nscrolled; 1993 row_offset -= TermWin.nscrolled;
1899 } 1994 }
1900 1995
1996 wctomb (0, 0);
1997
1901 for (r1 = 0; r1 < nrows; r1++) 1998 for (r1 = 0; r1 < nrows; r1++)
1902 { 1999 {
1903 t = screen.text[r1 + row_offset]; 2000 text_t *tp = screen.text[r1 + row_offset];
1904 for (i = TermWin.ncol - 1; i >= 0; i--) 2001 int len = screen.tlen[r1 + row_offset];
1905 if (!isspace (t[i])) 2002
1906 break; 2003 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1907 fprintf (fd, "%.*s\n", (i + 1), t); 2004 {
2005 char mb[MB_LEN_MAX];
2006 text_t t = *tp++;
2007 if (t == NOCHAR)
2008 continue;
2009
2010 len = wctomb (mb, t);
2011
2012 if (len <= 0)
2013 {
2014 mb[0] = ' ';
2015 len = 1;
2016 }
2017
2018 fwrite (mb, 1, len, fd);
2019 }
2020
2021 fputc ('\n', fd);
1908 } 2022 }
2023
1909 pclose_printer (fd); 2024 pclose_printer (fd);
1910#endif 2025#endif
1911} 2026}
1912 2027
1913/* ------------------------------------------------------------------------- */ 2028/* ------------------------------------------------------------------------- */
1914/* 2029/*
1915 * Refresh the screen 2030 * Refresh the screen
1916 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
1917 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
1918 */ 2033 */
1919
1920#define FONT_WIDTH(X, Y) \
1921 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1922#define FONT_RBEAR(X, Y) \
1923 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1924#define FONT_LBEAR(X, Y) \
1925 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1926#define IS_FONT_CHAR(X, Y) \
1927 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1928
1929void 2034void
1930rxvt_term::scr_refresh (unsigned char refresh_type) 2035rxvt_term::scr_refresh (unsigned char refresh_type)
1931{ 2036{
1932 unsigned char must_clear, /* use draw_string not draw_image_string */ 2037 unsigned char must_clear, /* use draw_string not draw_image_string */
1933 rvid, /* reverse video this position */
1934 showcursor; /* show the cursor */ 2038 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
1937 int i, /* tmp */ 2041 int i, /* tmp */
1938 row_offset; /* basic offset in screen structure */ 2042 row_offset; /* basic offset in screen structure */
1939#ifndef NO_CURSORCOLOR 2043#ifndef NO_CURSORCOLOR
1940 rend_t cc1; /* store colours at cursor position (s) */ 2044 rend_t cc1; /* store colours at cursor position (s) */
1941#endif 2045#endif
1942 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2046 rend_t *crp; // cursor rendition pointer
1943 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2047
2048 want_refresh = 0; /* screen is current */
1944 2049
1945 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2050 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1946 return; 2051 return;
1947 2052
1948 /* 2053 /*
1949 * A: set up vars 2054 * A: set up vars
1950 */ 2055 */
1951 must_clear = 0; 2056 must_clear = 0;
1952
1953 refresh_count = 0; 2057 refresh_count = 0;
1954 2058
1955 row_offset = TermWin.saveLines - TermWin.view_start; 2059 row_offset = TermWin.saveLines - TermWin.view_start;
1956 2060
1957#ifdef XPM_BACKGROUND 2061#if XPM_BACKGROUND
1958 must_clear |= (bgPixmap.pixmap != None); 2062 must_clear |= bgPixmap.pixmap != None;
1959#endif 2063#endif
1960#ifdef TRANSPARENT 2064#if TRANSPARENT
1961 must_clear |= ((Options & Opt_transparent) && am_transparent); 2065 must_clear |= (options & Opt_transparent) && am_transparent;
1962#endif 2066#endif
1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1964 2068
1965 /* 2069 /*
1966 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
1981 showcursor = 0; 2085 showcursor = 0;
1982#endif 2086#endif
1983 2087
1984 if (showcursor) 2088 if (showcursor)
1985 { 2089 {
2090 int col = screen.cur.col;
2091
2092 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2093 col--;
2094
1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1987 2096
1988 if (showcursor && TermWin.focus) 2097 if (showcursor && TermWin.focus)
1989 { 2098 {
2099 if (options & Opt_cursorUnderline)
2100 *crp ^= RS_Uline;
2101 else
2102 {
1990 *srp ^= RS_RVid; 2103 *crp ^= RS_RVid;
2104
1991#ifndef NO_CURSORCOLOR 2105#ifndef NO_CURSORCOLOR
1992 cc1 = *srp & (RS_fgMask | RS_bgMask); 2106 cc1 = *crp & (RS_fgMask | RS_bgMask);
1993 if (ISSET_PIXCOLOR (Color_cursor)) 2107 if (ISSET_PIXCOLOR (Color_cursor))
1994 ccol1 = Color_cursor; 2108 ccol1 = Color_cursor;
1995 else 2109 else
1996#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1997 ccol1 = GET_FGCOLOR (rstyle); 2111 ccol1 = GET_FGCOLOR (rstyle);
1998#else 2112#else
1999 ccol1 = Color_fg; 2113 ccol1 = Color_fg;
2000#endif 2114#endif
2001 if (ISSET_PIXCOLOR (Color_cursor2)) 2115 if (ISSET_PIXCOLOR (Color_cursor2))
2002 ccol2 = Color_cursor2; 2116 ccol2 = Color_cursor2;
2003 else 2117 else
2004#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2118#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2005 ccol2 = GET_BGCOLOR (rstyle); 2119 ccol2 = GET_BGCOLOR (rstyle);
2006#else 2120#else
2007 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2008#endif 2122#endif
2009 *srp = SET_FGCOLOR (*srp, ccol1); 2123 *crp = SET_FGCOLOR (*crp, ccol1);
2010 *srp = SET_BGCOLOR (*srp, ccol2); 2124 *crp = SET_BGCOLOR (*crp, ccol2);
2011#endif 2125#endif
2126 }
2012 } 2127 }
2013 } 2128 }
2014 2129
2015 /* make sure no outline cursor is left around */ 2130 /* make sure no outline cursor is left around */
2016 setoldcursor = 0; 2131 setoldcursor = 0;
… …
2042 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2043 } 2158 }
2044 } 2159 }
2045 } 2160 }
2046 2161
2162#if ENABLE_OVERLAY
2163 scr_swap_overlay ();
2164#endif
2165
2047#ifndef NO_SLOW_LINK_SUPPORT 2166#ifndef NO_SLOW_LINK_SUPPORT
2048 /* 2167 /*
2049 * D: CopyArea pass - very useful for slower links 2168 * D: CopyArea pass - very useful for slower links
2050 * This has been deliberately kept simple. 2169 * This has been deliberately kept simple.
2051 */ 2170 */
… …
2054 && refresh_type == FAST_REFRESH && num_scr_allow && i 2173 && refresh_type == FAST_REFRESH && num_scr_allow && i
2055 && abs (i) < TermWin.nrow && !must_clear) 2174 && abs (i) < TermWin.nrow && !must_clear)
2056 { 2175 {
2057 int16_t nits; 2176 int16_t nits;
2058 int j; 2177 int j;
2059 rend_t *drp2;
2060 text_t *dtp2;
2061 int len, wlen; 2178 int len, wlen;
2062 2179
2063 j = TermWin.nrow; 2180 j = TermWin.nrow;
2064 wlen = len = -1; 2181 wlen = len = -1;
2065 row = i > 0 ? 0 : j - 1; 2182 row = i > 0 ? 0 : j - 1;
2066 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2183 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2067 { 2184 {
2068 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2185 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2069 { 2186 {
2070 stp = screen.text[row + row_offset]; 2187 text_t *stp = screen.text[row + row_offset];
2071 srp = screen.rend[row + row_offset]; 2188 rend_t *srp = screen.rend[row + row_offset];
2072 dtp = drawn_text[row]; 2189 text_t *dtp = drawn_text[row];
2073 dtp2 = drawn_text[row + i]; 2190 text_t *dtp2 = drawn_text[row + i];
2074 drp = drawn_rend[row]; 2191 rend_t *drp = drawn_rend[row];
2075 drp2 = drawn_rend[row + i]; 2192 rend_t *drp2 = drawn_rend[row + i];
2076 2193
2077 for (nits = 0, col = TermWin.ncol; col--; ) 2194 for (nits = 0, col = TermWin.ncol; col--; )
2078 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2195 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2079 nits--; 2196 nits--;
2080 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2197 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2100 { 2217 {
2101 /* also comes here at end if needed because of >= above */ 2218 /* also comes here at end if needed because of >= above */
2102 if (wlen < len) 2219 if (wlen < len)
2103 SWAP_IT (wlen, len, int); 2220 SWAP_IT (wlen, len, int);
2104 2221
2105 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2106 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2222 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2107 TermWin.gc, 0, Row2Pixel (len + i), 2223 TermWin.gc, 0, Row2Pixel (len + i),
2108 (unsigned int)TermWin_TotalWidth (), 2224 (unsigned int)TermWin_TotalWidth (),
2109 (unsigned int)Height2Pixel (wlen - len + 1), 2225 (unsigned int)Height2Pixel (wlen - len + 1),
2110 0, Row2Pixel (len)); 2226 0, Row2Pixel (len));
… …
2117 /* 2233 /*
2118 * E: main pass across every character 2234 * E: main pass across every character
2119 */ 2235 */
2120 for (row = 0; row < TermWin.nrow; row++) 2236 for (row = 0; row < TermWin.nrow; row++)
2121 { 2237 {
2122 stp = screen.text[row + row_offset]; 2238 text_t *stp = screen.text[row + row_offset];
2123 srp = screen.rend[row + row_offset]; 2239 rend_t *srp = screen.rend[row + row_offset];
2124 dtp = drawn_text[row]; 2240 text_t *dtp = drawn_text[row];
2125 drp = drawn_rend[row]; 2241 rend_t *drp = drawn_rend[row];
2126 2242
2127 /* 2243 /*
2128 * E2: OK, now the real pass 2244 * E2: OK, now the real pass
2129 */ 2245 */
2130 int ypixel = (int)Row2Pixel (row); 2246 int ypixel = (int)Row2Pixel (row);
2131 2247
2132 for (col = 0; col < TermWin.ncol; col++) 2248 for (col = 0; col < TermWin.ncol; col++)
2133 { 2249 {
2134 /* compare new text with old - if exactly the same then continue */ 2250 /* compare new text with old - if exactly the same then continue */
2135 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2251 if (stp[col] == dtp[col] /* Must match characters to skip. */
2136 && (srp[col] == drp[col] /* Either rendition the same or */ 2252 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2137 || (stp[col] == ' ' /* space w/ no background change */ 2253 || (stp[col] == ' ' /* space w/ no background change */
2138 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2254 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2139 continue; 2255 continue;
2140 2256
2141 // redraw one or more characters 2257 // redraw one or more characters
2142 2258
2143 // seek to the beginning if wide characters 2259 // seek to the beginning of wide characters
2144 while (stp[col] == NOCHAR && col > 0) 2260 while (stp[col] == NOCHAR && col > 0)
2145 --col; 2261 --col;
2146 2262
2147 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2263 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2148 text_t *text = stp + col; 2264 text_t *text = stp + col;
… …
2151 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2152 drp[col] = rend; 2268 drp[col] = rend;
2153 2269
2154 int xpixel = Col2Pixel (col); 2270 int xpixel = Col2Pixel (col);
2155 2271
2156 // this loop looks very messy, it can probably be optimized
2157 // and cleaned a bit by you?
2158 for (i = 0; ++col < TermWin.ncol; ) 2272 for (i = 0; ++col < TermWin.ncol; )
2159 { 2273 {
2160 if (stp[col] == NOCHAR) 2274 if (stp[col] == NOCHAR)
2161 { 2275 {
2162 dtp[col] = stp[col]; 2276 dtp[col] = stp[col];
2163 drp[col] = rend; 2277 drp[col] = rend;
2164 count++; 2278 count++;
2165
2166 if (i) // only possible skip if char unchanged
2167 i++; 2279 i++;
2168 2280
2169 continue; 2281 continue;
2170 } 2282 }
2171 2283
2172 if (rend != srp[col]) 2284 if (!RS_SAME (rend, srp[col]))
2173 break; 2285 break;
2174 2286
2175 count++; 2287 count++;
2176 2288
2177 if (stp[col] != dtp[col] 2289 if (stp[col] != dtp[col]
2178 || srp[col] != drp[col]) 2290 || !RS_SAME (srp[col], drp[col]))
2179 { 2291 {
2180 if (must_clear && (i++ > (count / 2))) 2292 if (must_clear && (i++ > count / 2))
2181 break; 2293 break;
2182 2294
2183 dtp[col] = stp[col]; 2295 dtp[col] = stp[col];
2184 drp[col] = rend; 2296 drp[col] = rend;
2185 i = 0; 2297 i = 0;
2186 } 2298 }
2187 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2299 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2188 break; 2300 break;
2189 } 2301 }
2190 2302
2191 col--; /* went one too far. move back */ 2303 col--; /* went one too far. move back */
2192 count -= i; /* dump any matching trailing chars */ 2304 count -= i; /* dump any matching trailing chars */
2305
2306 // sometimes we optimize away the trailing NOCHAR's, add them back
2307 while (i && text[count] == NOCHAR)
2308 count++, i--;
2193 2309
2194 /* 2310 /*
2195 * Determine the attributes for the string 2311 * Determine the attributes for the string
2196 */ 2312 */
2197 int fid = GET_FONT (rend);
2198 int fore = GET_FGCOLOR (rend); // desired foreground 2313 int fore = GET_FGCOLOR (rend); // desired foreground
2199 int back = GET_BGCOLOR (rend); // desired background 2314 int back = GET_BGCOLOR (rend); // desired background
2200 2315
2201 rend = GET_ATTR (rend); 2316 // only do special processing if any attributes are set, which is rare
2317 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2318 {
2319#if ENABLE_STYLES
2320 // force redraw after "careful" characters to avoid pixel droppings
2321 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2322 drp[col + 1] = ~srp[col + 1];
2202 2323
2203 rvid = !!(rend & RS_RVid); 2324 // include previous careful character(s) if possible, looks nicer (best effort...)
2325 while (text > stp
2326 && srp[text - stp - 1] & RS_Careful
2327 && RS_SAME (rend, srp[text - stp - 1]))
2328 text--, count++, xpixel -= TermWin.fwidth;
2329#endif
2330
2331 bool invert = rend & RS_RVid;
2204 2332
2205#ifndef NO_BOLD_UNDERLINE_REVERSE 2333#ifndef NO_BOLD_UNDERLINE_REVERSE
2206 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2334 if (rend & RS_Bold
2335 && fore == Color_fg)
2207 { 2336 {
2208 if (ISSET_PIXCOLOR (Color_BD)) 2337 if (ISSET_PIXCOLOR (Color_BD))
2209 fore = Color_BD; 2338 fore = Color_BD;
2339# if !ENABLE_STYLES
2210 else 2340 else
2211 rvid = !rvid; 2341 invert = !invert;
2342# endif
2343 }
2344
2345 if (rend & RS_Italic
2346 && fore == Color_fg)
2347 {
2348 if (ISSET_PIXCOLOR (Color_IT))
2349 fore = Color_IT;
2350# if !ENABLE_STYLES
2351 else
2352 invert = !invert;
2353# endif
2354 }
2355
2356 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2357 fore = Color_UL;
2358#endif
2359
2360 if (invert)
2361 {
2362 SWAP_IT (fore, back, int);
2363
2364#ifndef NO_BOLD_UNDERLINE_REVERSE
2365 if (ISSET_PIXCOLOR (Color_RV))
2366 back = Color_RV;
2367
2368 if (fore == back)
2369 {
2370 fore = Color_bg;
2371 back = Color_fg;
2372 }
2373#endif
2374 }
2375
2376#ifdef TEXT_BLINK
2377 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2378 {
2379 if (!text_blink_ev.active)
2380 {
2381 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2382 hidden_text = 0;
2383 }
2384 else if (hidden_text)
2385 fore = back;
2386 }
2387#endif
2212 } 2388 }
2213
2214 if (rend & RS_Uline)
2215 if (ISSET_PIXCOLOR (Color_UL))
2216 fore = Color_UL;
2217#endif
2218
2219 if (rvid)
2220 {
2221 SWAP_IT (fore, back, int);
2222
2223#ifndef NO_BOLD_UNDERLINE_REVERSE
2224 if (ISSET_PIXCOLOR (Color_RV)
2225# ifndef NO_CURSORCOLOR
2226 && !ISSET_PIXCOLOR (Color_cursor)
2227# endif
2228 )
2229 back = Color_RV;
2230#endif
2231 }
2232
2233#ifdef TEXT_BLINK
2234 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2235 {
2236 if (!text_blink_ev.active)
2237 {
2238 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2239 hidden_text = 0;
2240 }
2241 else if (hidden_text)
2242 fore = back;
2243 }
2244#endif
2245 2389
2246 /* 2390 /*
2247 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2248 */ 2392 */
2249 rxvt_font *font = (*TermWin.fontset)[fid]; 2393 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2250 2394
2251 if (back == fore) 2395 if (back == fore)
2252 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2396 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2253 TermWin.fwidth * count, TermWin.fheight, 2397 TermWin.fwidth * count, TermWin.fheight,
2254 back); 2398 back);
… …
2270 } 2414 }
2271 else 2415 else
2272 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2416 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2273 2417
2274 if (rend & RS_Uline && font->descent > 1 && fore != back) 2418 if (rend & RS_Uline && font->descent > 1 && fore != back)
2419 {
2420#if ENABLE_FRILLS
2421 if (ISSET_PIXCOLOR (Color_underline))
2422 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2423 else
2424#endif
2425 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2426
2275 XDrawLine (display->display, drawBuffer, TermWin.gc, 2427 XDrawLine (display->display, drawBuffer, TermWin.gc,
2276 xpixel, ypixel + font->ascent + 1, 2428 xpixel, ypixel + font->ascent + 1,
2277 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2429 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2430 }
2278 } /* for (col....) */ 2431 } /* for (col....) */
2279 } /* for (row....) */ 2432 } /* for (row....) */
2433
2434#if ENABLE_OVERLAY
2435 scr_swap_overlay ();
2436#endif
2280 2437
2281 /* 2438 /*
2282 * G: cleanup cursor and display outline cursor if necessary 2439 * G: cleanup cursor and display outline cursor if necessary
2283 */ 2440 */
2284 if (showcursor) 2441 if (showcursor)
2285 { 2442 {
2286 if (TermWin.focus) 2443 if (TermWin.focus)
2287 { 2444 {
2288 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2445 if (options & Opt_cursorUnderline)
2289 [screen.cur.col]); 2446 *crp ^= RS_Uline;
2447 else
2448 {
2290 *srp ^= RS_RVid; 2449 *crp ^= RS_RVid;
2291#ifndef NO_CURSORCOLOR 2450#ifndef NO_CURSORCOLOR
2292 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2451 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2293#endif 2452#endif
2453 }
2294 } 2454 }
2295 else if (oldcursor.row >= 0) 2455 else if (oldcursor.row >= 0)
2296 { 2456 {
2457 int cursorwidth = 1;
2458 int col = oldcursor.col;
2459
2460 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2461 col--;
2462
2463 while (col + cursorwidth < TermWin.ncol
2464 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2465 cursorwidth++;
2466
2297#ifndef NO_CURSORCOLOR 2467#ifndef NO_CURSORCOLOR
2298 if (ISSET_PIXCOLOR (Color_cursor)) 2468 if (ISSET_PIXCOLOR (Color_cursor))
2299 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2469 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2300#endif 2470#endif
2301 int cursorwidth = 1;
2302 while (oldcursor.col + cursorwidth < TermWin.ncol
2303 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2304 cursorwidth++;
2305 2471
2306 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2472 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2307 Col2Pixel (oldcursor.col), 2473 Col2Pixel (col),
2308 Row2Pixel (oldcursor.row), 2474 Row2Pixel (oldcursor.row),
2309 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2475 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2310 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2476 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2311 } 2477 }
2312 } 2478 }
… …
2319 if (refresh_type & SMOOTH_REFRESH) 2485 if (refresh_type & SMOOTH_REFRESH)
2320 XFlush (display->display); 2486 XFlush (display->display);
2321 2487
2322 num_scr = 0; 2488 num_scr = 0;
2323 num_scr_allow = 1; 2489 num_scr_allow = 1;
2324 want_refresh = 0; /* screen is current */
2325} 2490}
2326 2491
2327void 2492void
2328rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2493rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2329{ 2494{
2330 if (!rp || !tp) 2495 if (!rp || !tp)
2331 return; 2496 return;
2332 2497
2333 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2498 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2334 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2499 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2335} 2500}
2336 2501
2337void 2502void
2338rxvt_term::scr_remap_chars () 2503rxvt_term::scr_remap_chars ()
2339{ 2504{
… …
2345 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2510 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2346 scr_remap_chars (swap.text[i], swap.rend[i]); 2511 scr_remap_chars (swap.text[i], swap.rend[i]);
2347 } 2512 }
2348} 2513}
2349 2514
2515void
2516rxvt_term::scr_recolour ()
2517{
2518 if (1
2519#if TRANSPARENT
2520 && !am_transparent
2521#endif
2522#if XPM_BACKGROUND
2523 && !bgPixmap.pixmap
2524#endif
2525 )
2526 {
2527 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2528 XClearWindow (display->display, TermWin.parent[0]);
2529 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2530#if HAVE_SCROLLBARS
2531 if (scrollBar.win)
2532 {
2533 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2534 scrollBar.setIdle ();
2535 scrollbar_show (0);
2536 }
2537#endif
2538 }
2539
2540 scr_clear ();
2541 scr_touch (true);
2542 want_refresh = 1;
2543}
2544
2350/* ------------------------------------------------------------------------- */ 2545/* ------------------------------------------------------------------------- */
2351void 2546void
2352rxvt_term::scr_clear (bool really) 2547rxvt_term::scr_clear (bool really)
2353{ 2548{
2354 if (!TermWin.mapped) 2549 if (!TermWin.mapped)
2355 return; 2550 return;
2356 2551
2357 num_scr_allow = 0; 2552 num_scr_allow = 0;
2358 want_refresh = 1; 2553 want_refresh = 1;
2359
2360#ifdef TRANSPARENT
2361 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2362 {
2363 int i;
2364
2365 if (! (Options & Opt_transparent_all))
2366 i = 0;
2367 else
2368 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2369
2370 while (i--)
2371 if (TermWin.parent[i] != None)
2372 XClearWindow (display->display, TermWin.parent[i]);
2373 }
2374#endif
2375 2554
2376 if (really) 2555 if (really)
2377 XClearWindow (display->display, TermWin.vt); 2556 XClearWindow (display->display, TermWin.vt);
2378} 2557}
2379 2558
… …
2386 int end_row = TermWin.saveLines - TermWin.view_start; 2565 int end_row = TermWin.saveLines - TermWin.view_start;
2387 int i = selection.beg.row + TermWin.saveLines; 2566 int i = selection.beg.row + TermWin.saveLines;
2388 int col, row = selection.end.row + TermWin.saveLines; 2567 int col, row = selection.end.row + TermWin.saveLines;
2389 rend_t *srp; 2568 rend_t *srp;
2390 2569
2391 if (i >= end_row) 2570#if ENABLE_FRILLS
2392 col = selection.beg.col; 2571 if (selection.rect)
2572 {
2573 end_row += TermWin.nrow;
2574
2575 for (; i <= row && i <= end_row; i++)
2576 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2577 srp[col] ^= RS_RVid;
2578 }
2393 else 2579 else
2580#endif
2581 {
2582 if (i >= end_row)
2583 col = selection.beg.col;
2584 else
2394 { 2585 {
2395 col = 0; 2586 col = 0;
2396 i = end_row; 2587 i = end_row;
2397 } 2588 }
2398 2589
2399 end_row += TermWin.nrow; 2590 end_row += TermWin.nrow;
2591
2400 for (; i < row && i < end_row; i++, col = 0) 2592 for (; i < row && i < end_row; i++, col = 0)
2401 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2593 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2402 srp[col] ^= RS_RVid; 2594 srp[col] ^= RS_RVid;
2403 2595
2404 if (i == row && i < end_row) 2596 if (i == row && i < end_row)
2405 for (srp = screen.rend[i]; col < selection.end.col; col++) 2597 for (srp = screen.rend[i]; col < selection.end.col; col++)
2406 srp[col] ^= RS_RVid; 2598 srp[col] ^= RS_RVid;
2599 }
2407 } 2600 }
2408} 2601}
2409 2602
2410/* ------------------------------------------------------------------------- */ 2603/* ------------------------------------------------------------------------- */
2411/* 2604/*
… …
2447 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2640 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2448 */ 2641 */
2449void 2642void
2450rxvt_term::selection_check (int check_more) 2643rxvt_term::selection_check (int check_more)
2451{ 2644{
2452 row_col_t pos; 2645 row_col_t pos;
2453 2646
2454 if (!selection.op) 2647 if (!selection.op)
2455 return; 2648 return;
2456 2649
2457 pos.row = pos.col = 0; 2650 pos.row = pos.col = 0;
… …
2479/* ------------------------------------------------------------------------- */ 2672/* ------------------------------------------------------------------------- */
2480/* 2673/*
2481 * Paste a selection direct to the command fd 2674 * Paste a selection direct to the command fd
2482 */ 2675 */
2483void 2676void
2484rxvt_term::paste (const unsigned char *data, unsigned int len) 2677rxvt_term::paste (unsigned char *data, unsigned int len)
2485{ 2678{
2486 unsigned int i, j, n;
2487 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2488
2489#if 0
2490 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2491 ZERO_SCROLLBACK (r);
2492#endif
2493
2494 /* convert normal newline chars into common keyboard Return key sequence */ 2679 /* convert normal newline chars into common keyboard Return key sequence */
2495 for (i = 0; i < len; i += PROP_SIZE) 2680 for (unsigned int i = 0; i < len; i++)
2496 {
2497 n = min (len - i, PROP_SIZE);
2498 MEMCPY (ds, data + i, n);
2499
2500 for (j = 0; j < n; j++)
2501 if (ds[j] == C0_LF) 2681 if (data[i] == C0_LF)
2502 ds[j] = C0_CR; 2682 data[i] = C0_CR;
2503 2683
2504 tt_write (ds, (int)n); 2684 tt_write (data, len);
2505 }
2506
2507 free (ds);
2508} 2685}
2509 2686
2510/* ------------------------------------------------------------------------- */ 2687/* ------------------------------------------------------------------------- */
2511/* 2688/*
2512 * Respond to a notification that a primary selection has been sent 2689 * Respond to a notification that a primary selection has been sent
2513 * EXT: SelectionNotify 2690 * EXT: SelectionNotify
2514 */ 2691 */
2515int 2692void
2516rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2693rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2517{ 2694{
2518 long nread = 0;
2519 unsigned long bytes_after;
2520 XTextProperty ct;
2521
2522 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2523
2524 if (prop == None) /* check for failed XConvertSelection */ 2695 if (prop == None) /* check for failed XConvertSelection */
2525 { 2696 {
2526 if ((selection_type & Sel_CompoundText)) 2697 if ((selection_type & Sel_CompoundText))
2527 { 2698 {
2528 int selnum = selection_type & Sel_whereMask; 2699 int selnum = selection_type & Sel_whereMask;
… …
2541 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2712 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2542 else 2713 else
2543 selection_type = 0; 2714 selection_type = 0;
2544 } 2715 }
2545 2716
2546 return 0; 2717 return;
2547 }
2548
2549 for (;;)
2550 { 2718 }
2719
2720 unsigned long bytes_after;
2721 XTextProperty ct;
2722
2723 if (XGetWindowProperty (display->display, win, prop,
2724 0, PROP_SIZE / 4,
2725 delete_prop, AnyPropertyType,
2726 &ct.encoding, &ct.format,
2727 &ct.nitems, &bytes_after,
2728 &ct.value) != Success)
2729 {
2730 ct.value = 0;
2731 goto bailout;
2732 }
2733
2734 if (ct.encoding == None)
2735 goto bailout;
2736
2737 if (bytes_after)
2738 {
2739 // fetch and append remaining data
2740 XTextProperty ct2;
2741
2551 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2742 if (XGetWindowProperty (display->display, win, prop,
2552 (long) (PROP_SIZE / 4), delete_prop, 2743 ct.nitems / 4, (bytes_after + 3) / 4,
2744 delete_prop, AnyPropertyType,
2553 AnyPropertyType, &ct.encoding, &ct.format, 2745 &ct2.encoding, &ct2.format,
2554 &ct.nitems, &bytes_after, 2746 &ct2.nitems, &bytes_after,
2555 &ct.value) != Success) 2747 &ct2.value) != Success)
2556 break; 2748 goto bailout;
2557 2749
2558 if (ct.encoding == 0) 2750 // realloc should be compatible to XFree, here, and elsewhere, too
2559 { 2751 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2560 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2752 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2561 break; 2753 ct.nitems += ct2.nitems;
2562 }
2563 2754
2755 XFree (ct2.value);
2756 }
2757
2564 if (ct.value == NULL) 2758 if (ct.value == 0)
2565 { 2759 goto bailout;
2566 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2567 continue;
2568 }
2569 2760
2761 if (ct.encoding == xa[XA_INCR])
2762 {
2763 // INCR selection, start handshake
2764 if (!delete_prop)
2765 XDeleteProperty (display->display, win, prop);
2766
2767 selection_wait = Sel_incr;
2768 incr_buf_fill = 0;
2769 incr_ev.start (NOW + 10);
2770
2771 goto bailout;
2772 }
2773
2570 if (ct.nitems == 0) 2774 if (ct.nitems == 0)
2775 {
2776 if (selection_wait == Sel_incr)
2777 {
2778 XFree (ct.value);
2779
2780 // finally complete, now paste the whole thing
2781 selection_wait = Sel_normal;
2782 ct.value = (unsigned char *)incr_buf;
2783 ct.nitems = incr_buf_fill;
2784 incr_buf = 0;
2785 incr_buf_size = 0;
2786 incr_ev.stop ();
2571 { 2787 }
2572 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2788 else
2573 2789 {
2574 if (selection_wait == Sel_normal && nread == 0 2790 if (selection_wait == Sel_normal
2575 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2791 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2576 { 2792 {
2577 /* 2793 /*
2578 * pass through again trying CUT_BUFFER0 if we've come from 2794 * pass through again trying CUT_BUFFER0 if we've come from
2579 * XConvertSelection () but nothing was presented 2795 * XConvertSelection () but nothing was presented
2580 */ 2796 */
2581 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2582 selection_paste (display->root, XA_CUT_BUFFER0, False); 2797 selection_paste (display->root, XA_CUT_BUFFER0, False);
2583 } 2798 }
2584 2799
2585 nread = -1; /* discount any previous stuff */ 2800 goto bailout;
2586 break; 2801 }
2802 }
2803 else if (selection_wait == Sel_incr)
2804 {
2805 incr_ev.start (NOW + 10);
2806
2807 while (incr_buf_fill + ct.nitems > incr_buf_size)
2587 } 2808 {
2809 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2810 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2811 }
2588 2812
2813 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2589 nread += ct.nitems; 2814 incr_buf_fill += ct.nitems;
2590 2815
2816 goto bailout;
2817 }
2818
2591 char **cl; 2819 char **cl;
2592 int cr; 2820 int cr;
2821
2822#if ENABLE_FRILLS
2823 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2824 // so recode it manually
2825 if (ct.encoding == xa[XA_UTF8_STRING])
2826 {
2827 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2828 char *s = rxvt_wcstombs (w);
2829 free (w);
2830 // TODO: strlen == only the first element will be converted. well...
2831 paste ((unsigned char *)s, strlen (s));
2832 free (s);
2833 }
2834 else
2835#endif
2593 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2836 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2594 { 2837 && cl)
2838 {
2595 for (int i = 0; i < cr; i++) 2839 for (int i = 0; i < cr; i++)
2596 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2840 paste ((unsigned char *)cl[i], strlen (cl[i]));
2597 2841
2598 XFreeStringList (cl); 2842 XFreeStringList (cl);
2599 } 2843 }
2600 else 2844 else
2601 paste (ct.value, ct.nitems); 2845 paste (ct.value, ct.nitems); // paste raw
2602 2846
2603 if (bytes_after == 0) 2847bailout:
2604 break;
2605
2606 XFree (ct.value);
2607 }
2608
2609 if (ct.value)
2610 XFree (ct.value); 2848 XFree (ct.value);
2611 2849
2612 if (selection_wait == Sel_normal) 2850 if (selection_wait == Sel_normal)
2613 selection_wait = Sel_none; 2851 selection_wait = Sel_none;
2614
2615 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2616 return (int)nread;
2617} 2852}
2618 2853
2619void 2854void
2620rxvt_term::incr_cb (time_watcher &w) 2855rxvt_term::incr_cb (time_watcher &w)
2621{ 2856{
2622 selection_wait = Sel_none; 2857 selection_wait = Sel_none;
2623 2858
2859 incr_buf_size = 0;
2860 free (incr_buf);
2861
2624 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2862 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2625} 2863}
2626 2864
2627/*
2628 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2629 */
2630void 2865void
2631rxvt_term::selection_property (Window win, Atom prop) 2866rxvt_term::selection_property (Window win, Atom prop)
2632{ 2867{
2633 int reget_time = 0; 2868 if (prop == None || selection_wait != Sel_incr)
2634
2635 if (prop == None)
2636 return; 2869 return;
2637 2870
2638 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2639 if (selection_wait == Sel_normal)
2640 {
2641 int a, afmt;
2642 Atom atype;
2643 unsigned long bytes_after, nitems;
2644 unsigned char *s = NULL;
2645
2646 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2647 xa[XA_INCR], &atype, &afmt, &nitems,
2648 &bytes_after, &s);
2649 if (s)
2650 XFree (s);
2651 if (a != Success)
2652 return;
2653
2654#ifndef __CYGWIN32__
2655 if (atype == xa[XA_INCR])
2656 { /* start an INCR transfer */
2657 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2658 XDeleteProperty (display->display, win, prop);
2659 XFlush (display->display);
2660 reget_time = 1;
2661 selection_wait = Sel_incr;
2662 }
2663#endif
2664
2665 }
2666 else if (selection_wait == Sel_incr)
2667 {
2668 reget_time = 1;
2669
2670 if (selection_paste (win, prop, True) == -1) 2871 selection_paste (win, prop, true);
2671 {
2672 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2673 selection_wait = Sel_none;
2674 incr_ev.stop ();
2675 }
2676 }
2677 if (reget_time) /* received more data so reget time */
2678 incr_ev.start (NOW + 10);
2679} 2872}
2680 2873
2681/* ------------------------------------------------------------------------- */ 2874/* ------------------------------------------------------------------------- */
2682/* 2875/*
2683 * Request the current selection: 2876 * Request the current selection:
… …
2689 * EXT: button 2 release 2882 * EXT: button 2 release
2690 */ 2883 */
2691void 2884void
2692rxvt_term::selection_request (Time tm, int x, int y) 2885rxvt_term::selection_request (Time tm, int x, int y)
2693{ 2886{
2694 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2695
2696 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2887 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2697 return; /* outside window */ 2888 return; /* outside window */
2698 2889
2699 if (selection.text) 2890 if (selection.text)
2700 { /* internal selection */ 2891 { /* internal selection */
2701 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2702 char *str = rxvt_wcstombs (selection.text, selection.len); 2892 char *str = rxvt_wcstombs (selection.text, selection.len);
2703 paste ((unsigned char *)str, strlen (str)); 2893 paste ((unsigned char *)str, strlen (str));
2704 free (str); 2894 free (str);
2705 return; 2895 return;
2706 } 2896 }
… …
2720#else 2910#else
2721 selection_type = Sel_CompoundText; 2911 selection_type = Sel_CompoundText;
2722 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2723 return; 2913 return;
2724#endif 2914#endif
2725
2726 } 2915 }
2727 } 2916 }
2728 2917
2729 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2918 selection_wait = Sel_none; /* don't loop in selection_paste () */
2730 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2731 selection_paste (display->root, XA_CUT_BUFFER0, False); 2919 selection_paste (display->root, XA_CUT_BUFFER0, false);
2732} 2920}
2733 2921
2734int 2922int
2735rxvt_term::selection_request_other (Atom target, int selnum) 2923rxvt_term::selection_request_other (Atom target, int selnum)
2736{ 2924{
2737 Atom sel; 2925 Atom sel;
2738#ifdef DEBUG_SELECT
2739 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2740#endif
2741 2926
2742 selection_type |= selnum; 2927 selection_type |= selnum;
2743 2928
2744 if (selnum == Sel_Primary) 2929 if (selnum == Sel_Primary)
2745 sel = XA_PRIMARY; 2930 sel = XA_PRIMARY;
… …
2748 else 2933 else
2749 sel = xa[XA_CLIPBOARD]; 2934 sel = xa[XA_CLIPBOARD];
2750 2935
2751 if (XGetSelectionOwner (display->display, sel) != None) 2936 if (XGetSelectionOwner (display->display, sel) != None)
2752 { 2937 {
2753 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2754 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2938 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2755 TermWin.vt, selection_request_time); 2939 TermWin.vt, selection_request_time);
2756 return 1; 2940 return 1;
2757 } 2941 }
2758 2942
… …
2765 * EXT: SelectionClear 2949 * EXT: SelectionClear
2766 */ 2950 */
2767void 2951void
2768rxvt_term::selection_clear () 2952rxvt_term::selection_clear ()
2769{ 2953{
2770 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2771
2772 want_refresh = 1; 2954 want_refresh = 1;
2773 free (selection.text); 2955 free (selection.text);
2774 selection.text = NULL; 2956 selection.text = NULL;
2775 selection.len = 0; 2957 selection.len = 0;
2776 CLEAR_SELECTION (); 2958 CLEAR_SELECTION ();
… …
2789{ 2971{
2790 int i, col, end_col, row, end_row; 2972 int i, col, end_col, row, end_row;
2791 wchar_t *new_selection_text; 2973 wchar_t *new_selection_text;
2792 text_t *t; 2974 text_t *t;
2793 2975
2794 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2795 switch (selection.op) 2976 switch (selection.op)
2796 { 2977 {
2797 case SELECTION_CONT: 2978 case SELECTION_CONT:
2798 break; 2979 break;
2799 case SELECTION_INIT: 2980 case SELECTION_INIT:
… …
2813 2994
2814 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2995 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2815 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2816 2997
2817 col = selection.beg.col; 2998 col = selection.beg.col;
2818 MAX_IT (col, 0);
2819 row = selection.beg.row + TermWin.saveLines; 2999 row = selection.beg.row + TermWin.saveLines;
2820 end_row = selection.end.row + TermWin.saveLines; 3000 end_row = selection.end.row + TermWin.saveLines;
2821 int ofs = 0; 3001 int ofs = 0;
2822 int extra = 0; 3002 int extra = 0;
2823 3003
2824 for (; row <= end_row; row++, col = 0) 3004 for (; row <= end_row; row++, col = 0)
2825 { 3005 {
2826 t = &(screen.text[row][col]);
2827
2828 end_col = screen.tlen[row]; 3006 end_col = screen.tlen[row];
3007
3008#if ENABLE_FRILLS
3009 if (selection.rect)
3010 {
3011 col = selection.beg.col;
3012 end_col = TermWin.ncol + 1;
3013 }
3014#endif
3015
3016 MAX_IT (col, 0);
2829 3017
2830 if (end_col == -1) 3018 if (end_col == -1)
2831 end_col = TermWin.ncol; 3019 end_col = TermWin.ncol;
2832 3020
2833 if (row == end_row) 3021 if (row == end_row || selection.rect)
2834 MIN_IT (end_col, selection.end.col); 3022 MIN_IT (end_col, selection.end.col);
2835 3023
3024 t = &screen.text[row][col];
2836 for (; col < end_col; col++) 3025 for (; col < end_col; col++)
2837 { 3026 {
2838 if (*t == NOCHAR) 3027 if (*t == NOCHAR)
2839 t++; 3028 t++;
2840#if ENABLE_COMBINING 3029#if ENABLE_COMBINING
… …
2888#if 0 3077#if 0
2889 XTextProperty ct; 3078 XTextProperty ct;
2890 3079
2891 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3080 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2892 { 3081 {
2893 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3082 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2894 PropModeReplace, ct.value, ct.nitems);
2895 XFree (ct.value); 3083 XFree (ct.value);
2896 } 3084 }
2897#endif 3085#endif
2898 3086
2899 selection_time = tm; 3087 selection_time = tm;
2900 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2901} 3088}
2902 3089
2903/* ------------------------------------------------------------------------- */ 3090/* ------------------------------------------------------------------------- */
2904/* 3091/*
2905 * Mark or select text based upon number of clicks: 1, 2, or 3 3092 * Mark or select text based upon number of clicks: 1, 2, or 3
2906 * EXT: button 1 press 3093 * EXT: button 1 press
2907 */ 3094 */
2908void 3095void
2909rxvt_term::selection_click (int clicks, int x, int y) 3096rxvt_term::selection_click (int clicks, int x, int y)
2910{ 3097{
2911 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2912
2913 clicks = ((clicks - 1) % 3) + 1; 3098 clicks = ((clicks - 1) % 3) + 1;
2914 selection.clicks = clicks; /* save clicks so extend will work */ 3099 selection.clicks = clicks; /* save clicks so extend will work */
2915 3100
2916 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3101 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2917 3102
… …
2959 * We now only find out the boundary in one direction 3144 * We now only find out the boundary in one direction
2960 */ 3145 */
2961 3146
2962/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3147/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2963#define DELIMIT_TEXT(x) \ 3148#define DELIMIT_TEXT(x) \
2964 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3149 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2965#define DELIMIT_REND(x) 1 3150#define DELIMIT_REND(x) 1
2966 3151
2967void 3152void
2968rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3153rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2969{ 3154{
… …
2987 3172
2988 row = mark->row + TermWin.saveLines; 3173 row = mark->row + TermWin.saveLines;
2989 col = mark->col; 3174 col = mark->col;
2990 MAX_IT (col, 0); 3175 MAX_IT (col, 0);
2991 /* find the edge of a word */ 3176 /* find the edge of a word */
2992 stp = & (screen.text[row][col]); 3177 stp = &screen.text[row][col];
2993 w1 = DELIMIT_TEXT (*stp); 3178 w1 = DELIMIT_TEXT (*stp);
2994 3179
2995 srp = (&screen.rend[row][col]); 3180 srp = &screen.rend[row][col];
2996 w2 = DELIMIT_REND (*srp); 3181 w2 = DELIMIT_REND (*srp);
2997 3182
2998 for (;;) 3183 for (;;)
2999 { 3184 {
3000 for (; col != bound.col; col += dirnadd) 3185 for (; col != bound.col; col += dirnadd)
… …
3034 } 3219 }
3035 break; 3220 break;
3036 } 3221 }
3037 3222
3038Old_Word_Selection_You_Die: 3223Old_Word_Selection_You_Die:
3039 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));
3040
3041 if (dirn == DN) 3224 if (dirn == DN)
3042 col++; /* put us on one past the end */ 3225 col++; /* put us on one past the end */
3043 3226
3044 /* Poke the values back in */ 3227 /* Poke the values back in */
3045 ret->row = row - TermWin.saveLines; 3228 ret->row = row - TermWin.saveLines;
… …
3079 /* select nothing */ 3262 /* select nothing */
3080 selection.beg.row = selection.end.row = 0; 3263 selection.beg.row = selection.end.row = 0;
3081 selection.beg.col = selection.end.col = 0; 3264 selection.beg.col = selection.end.col = 0;
3082 selection.clicks = 4; 3265 selection.clicks = 4;
3083 want_refresh = 1; 3266 want_refresh = 1;
3084 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3085 return; 3267 return;
3086 } 3268 }
3087 3269
3088 if (selection.clicks == 4) 3270 if (selection.clicks == 4)
3089 selection.clicks = 1; 3271 selection.clicks = 1;
… …
3105 row_col_t pos; 3287 row_col_t pos;
3106 enum { 3288 enum {
3107 LEFT, RIGHT 3289 LEFT, RIGHT
3108 } closeto = RIGHT; 3290 } closeto = RIGHT;
3109 3291
3110 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));
3111 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT 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));
3112
3113 want_refresh = 1; 3292 want_refresh = 1;
3293
3114 switch (selection.op) 3294 switch (selection.op)
3115 { 3295 {
3116 case SELECTION_INIT: 3296 case SELECTION_INIT:
3117 CLEAR_SELECTION (); 3297 CLEAR_SELECTION ();
3118 selection.op = SELECTION_BEGIN; 3298 selection.op = SELECTION_BEGIN;
… …
3131 selection_start_colrow (col, row); 3311 selection_start_colrow (col, row);
3132 /* FALLTHROUGH */ 3312 /* FALLTHROUGH */
3133 default: 3313 default:
3134 return; 3314 return;
3135 } 3315 }
3316
3136 if (selection.beg.col == selection.end.col 3317 if (selection.beg.col == selection.end.col
3137 && selection.beg.col != selection.mark.col 3318 && selection.beg.col != selection.mark.col
3138 && selection.beg.row == selection.end.row 3319 && selection.beg.row == selection.end.row
3139 && selection.beg.row != selection.mark.row) 3320 && selection.beg.row != selection.mark.row)
3140 { 3321 {
3141 selection.beg.col = selection.end.col = selection.mark.col; 3322 selection.beg.col = selection.end.col = selection.mark.col;
3142 selection.beg.row = selection.end.row = selection.mark.row; 3323 selection.beg.row = selection.end.row = selection.mark.row;
3143 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 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));
3144 } 3324 }
3145 3325
3146 pos.col = col; 3326 pos.col = col;
3147 pos.row = row; 3327 pos.row = row;
3148 3328
… …
3191 } 3371 }
3192 else 3372 else
3193 { /* button1 drag or button3 drag */ 3373 { /* button1 drag or button3 drag */
3194 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3374 if (ROWCOL_IS_AFTER (selection.mark, pos))
3195 { 3375 {
3196 if ((selection.mark.row == selection.end.row) 3376 if (selection.mark.row == selection.end.row
3197 && (selection.mark.col == selection.end.col) 3377 && selection.mark.col == selection.end.col
3378 && clickchange
3198 && clickchange && selection.clicks == 2) 3379 && selection.clicks == 2)
3199 selection.mark.col--; 3380 selection.mark.col--;
3200 3381
3201 selection.beg.row = pos.row; 3382 selection.beg.row = pos.row;
3202 selection.beg.col = pos.col; 3383 selection.beg.col = pos.col;
3203 selection.end.row = selection.mark.row; 3384 selection.end.row = selection.mark.row;
… …
3214 3395
3215 if (selection.clicks == 1) 3396 if (selection.clicks == 1)
3216 { 3397 {
3217 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3398 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3218 3399
3219 if (end_col != -1 && selection.beg.col > end_col) 3400 if (selection.beg.col > end_col
3401 && end_col != -1
3402#if ENABLE_FRILLS
3403 && !selection.rect
3404#endif
3220 { 3405 )
3221#if 1
3222 selection.beg.col = ncol; 3406 selection.beg.col = ncol;
3223#else
3224 if (selection.beg.row != selection.end.row)
3225 selection.beg.col = ncol;
3226 else
3227 selection.beg.col = selection.mark.col;
3228#endif
3229 }
3230 3407
3231 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3408 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3232 3409
3233 if (end_col != -1 && selection.end.col > end_col) 3410 if (
3411 selection.end.col > end_col
3412 && end_col != -1
3413#if ENABLE_FRILLS
3414 && !selection.rect
3415#endif
3416 )
3234 selection.end.col = ncol; 3417 selection.end.col = ncol;
3235 } 3418 }
3236 else if (selection.clicks == 2) 3419 else if (selection.clicks == 2)
3237 { 3420 {
3238 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3421 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3239 selection.end.col--; 3422 selection.end.col--;
3240 3423
3241 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3242 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3424 selection_delimit_word (UP, &selection.beg, &selection.beg);
3425 selection_delimit_word (DN, &selection.end, &selection.end);
3243 } 3426 }
3244 else if (selection.clicks == 3) 3427 else if (selection.clicks == 3)
3245 { 3428 {
3246#ifndef NO_FRILLS 3429#if ENABLE_FRILLS
3247 if ((Options & Opt_tripleclickwords)) 3430 if (options & Opt_tripleclickwords)
3248 { 3431 {
3249 int end_row; 3432 int end_row;
3250 3433
3251 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3434 selection_delimit_word (UP, &selection.beg, &selection.beg);
3252 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3435 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3253 3436
3254 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3437 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3255 { 3438 {
3256 end_col = screen.tlen[end_row + TermWin.saveLines]; 3439 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3267 else 3450 else
3268#endif 3451#endif
3269 { 3452 {
3270 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3453 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3271 selection.mark.col++; 3454 selection.mark.col++;
3455
3272 selection.beg.col = 0; 3456 selection.beg.col = 0;
3273 selection.end.col = ncol; 3457 selection.end.col = ncol;
3458
3459 // select a complete logical line
3460 while (selection.beg.row > -TermWin.saveLines
3461 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3462 selection.beg.row--;
3463
3464 while (selection.end.row < TermWin.nrow
3465 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3466 selection.end.row++;
3274 } 3467 }
3275 } 3468 }
3276 3469
3277 if (button3 && buttonpress) 3470 if (button3 && buttonpress)
3278 { /* mark may need to be changed */ 3471 { /* mark may need to be changed */
3279 if (closeto == LEFT) 3472 if (closeto == LEFT)
3280 { 3473 {
3281 selection.mark.row = selection.end.row; 3474 selection.mark.row = selection.end.row;
3282 selection.mark.col = selection.end.col 3475 selection.mark.col = selection.end.col - (selection.clicks == 2);
3283 - (selection.clicks == 2);
3284 } 3476 }
3285 else 3477 else
3286 { 3478 {
3287 selection.mark.row = selection.beg.row; 3479 selection.mark.row = selection.beg.row;
3288 selection.mark.col = selection.beg.col; 3480 selection.mark.col = selection.beg.col;
3289 } 3481 }
3290 } 3482 }
3291 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));
3292}
3293 3483
3294#ifndef NO_FRILLS 3484#if ENABLE_FRILLS
3485 if (selection.rect && selection.beg.col > selection.end.col)
3486 SWAP_IT (selection.beg.col, selection.end.col, int);
3487#endif
3488}
3489
3490#if ENABLE_FRILLS
3295void 3491void
3296rxvt_term::selection_remove_trailing_spaces () 3492rxvt_term::selection_remove_trailing_spaces ()
3297{ 3493{
3298 int32_t end_col, end_row; 3494 int32_t end_col, end_row;
3299 text_t *stp; 3495 text_t *stp;
3300 3496
3301 end_col = selection.end.col; 3497 end_col = selection.end.col;
3302 end_row = selection.end.row; 3498 end_row = selection.end.row;
3499
3303 for ( ; end_row >= selection.beg.row; ) 3500 for ( ; end_row >= selection.beg.row; )
3304 { 3501 {
3305 stp = screen.text[end_row + TermWin.saveLines]; 3502 stp = screen.text[end_row + TermWin.saveLines];
3503
3306 while (--end_col >= 0) 3504 while (--end_col >= 0)
3307 { 3505 {
3308 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3506 if (stp[end_col] != ' '
3507 && stp[end_col] != '\t'
3508 && stp[end_col] != NOCHAR)
3309 break; 3509 break;
3310 } 3510 }
3511
3311 if (end_col >= 0 3512 if (end_col >= 0
3312 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3513 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3313 { 3514 {
3314 selection.end.col = end_col + 1; 3515 selection.end.col = end_col + 1;
3315 selection.end.row = end_row; 3516 selection.end.row = end_row;
3316 break; 3517 break;
3317 } 3518 }
3519
3318 end_row--; 3520 end_row--;
3319 end_col = TermWin.ncol; 3521 end_col = TermWin.ncol;
3320 } 3522 }
3523
3321 if (selection.mark.row > selection.end.row) 3524 if (selection.mark.row > selection.end.row)
3322 { 3525 {
3323 selection.mark.row = selection.end.row; 3526 selection.mark.row = selection.end.row;
3324 selection.mark.col = selection.end.col; 3527 selection.mark.col = selection.end.col;
3325 } 3528 }
… …
3341 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3544 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3342} 3545}
3343 3546
3344/* ------------------------------------------------------------------------- */ 3547/* ------------------------------------------------------------------------- */
3345/* 3548/*
3346 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3347 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3348 * the X11 protocol.
3349 */
3350typedef CARD32 Atom32;
3351
3352/* ------------------------------------------------------------------------- */
3353/*
3354 * Respond to a request for our current selection 3549 * Respond to a request for our current selection
3355 * EXT: SelectionRequest 3550 * EXT: SelectionRequest
3356 */ 3551 */
3357void 3552void
3358rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3553rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3359{ 3554{
3360 XSelectionEvent ev; 3555 XSelectionEvent ev;
3361 XTextProperty ct; 3556 dDisp;
3362 XICCEncodingStyle style;
3363 Atom target;
3364 3557
3365 ev.type = SelectionNotify; 3558 ev.type = SelectionNotify;
3366 ev.property = None; 3559 ev.property = None;
3367 ev.display = rq.display; 3560 ev.display = rq.display;
3368 ev.requestor = rq.requestor; 3561 ev.requestor = rq.requestor;
… …
3370 ev.target = rq.target; 3563 ev.target = rq.target;
3371 ev.time = rq.time; 3564 ev.time = rq.time;
3372 3565
3373 if (rq.target == xa[XA_TARGETS]) 3566 if (rq.target == xa[XA_TARGETS])
3374 { 3567 {
3375 Atom32 target_list[6]; 3568 Atom target_list[6];
3376 Atom32 *target = target_list; 3569 Atom *target = target_list;
3377 3570
3378 *target++ = (Atom32) xa[XA_TARGETS]; 3571 *target++ = xa[XA_TARGETS];
3379 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3572 *target++ = xa[XA_TIMESTAMP];
3380 *target++ = (Atom32) XA_STRING; 3573 *target++ = XA_STRING;
3381 *target++ = (Atom32) xa[XA_TEXT]; 3574 *target++ = xa[XA_TEXT];
3382 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3575 *target++ = xa[XA_COMPOUND_TEXT];
3383#if X_HAVE_UTF8_STRING 3576#if X_HAVE_UTF8_STRING
3384 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3577 *target++ = xa[XA_UTF8_STRING];
3385#endif 3578#endif
3386 3579
3387 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3580 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3388 (8 * sizeof (target_list[0])), PropModeReplace, 3581 32, PropModeReplace,
3389 (unsigned char *)target_list, 3582 (unsigned char *)target_list, target - target_list);
3390 target - target_list);
3391 ev.property = rq.property; 3583 ev.property = rq.property;
3392 } 3584 }
3585#if TODO // TODO
3393 else if (rq.target == xa[XA_MULTIPLE]) 3586 else if (rq.target == xa[XA_MULTIPLE])
3394 { 3587 {
3395 /* TODO: Handle MULTIPLE */ 3588 /* TODO: Handle MULTIPLE */
3396 } 3589 }
3590#endif
3397 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3398 { 3592 {
3399 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3593 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3400 (8 * sizeof (Time)), PropModeReplace,
3401 (unsigned char *)&selection_time, 1); 3594 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3402 ev.property = rq.property; 3595 ev.property = rq.property;
3403 } 3596 }
3404 else if (rq.target == XA_STRING 3597 else if (rq.target == XA_STRING
3405 || rq.target == xa[XA_TEXT] 3598 || rq.target == xa[XA_TEXT]
3406 || rq.target == xa[XA_COMPOUND_TEXT] 3599 || rq.target == xa[XA_COMPOUND_TEXT]
3407 || rq.target == xa[XA_UTF8_STRING] 3600 || rq.target == xa[XA_UTF8_STRING]
3408 ) 3601 )
3409 { 3602 {
3603 XTextProperty ct;
3604 Atom target = rq.target;
3410 short freect = 0; 3605 short freect = 0;
3411 int selectlen; 3606 int selectlen;
3412 wchar_t *cl; 3607 wchar_t *cl;
3413 3608 enum {
3414 target = rq.target; 3609 enc_string = XStringStyle,
3610 enc_text = XStdICCTextStyle,
3611 enc_compound_text = XCompoundTextStyle,
3612#ifdef X_HAVE_UTF8_STRING
3613 enc_utf8 = XUTF8StringStyle,
3614#else
3615 enc_utf8 = -1,
3616#endif
3617 } style;
3415 3618
3416 if (target == XA_STRING) 3619 if (target == XA_STRING)
3417 // we actually don't do XA_STRING, but who cares, as i18n clients 3620 // we actually don't do XA_STRING, but who cares, as i18n clients
3418 // will ask for another format anyways. 3621 // will ask for another format anyways.
3419 style = XStringStyle; 3622 style = enc_string;
3420 else if (target == xa[XA_TEXT]) 3623 else if (target == xa[XA_TEXT])
3421 style = XStdICCTextStyle; 3624 style = enc_text;
3422 else if (target == xa[XA_COMPOUND_TEXT]) 3625 else if (target == xa[XA_COMPOUND_TEXT])
3423 style = XCompoundTextStyle; 3626 style = enc_compound_text;
3424#if X_HAVE_UTF8_STRING 3627#if ENABLE_FRILLS
3425 else if (target == xa[XA_UTF8_STRING]) 3628 else if (target == xa[XA_UTF8_STRING])
3426 style = XUTF8StringStyle; 3629 style = enc_utf8;
3427#endif 3630#endif
3428 else 3631 else
3429 { 3632 {
3430 target = xa[XA_COMPOUND_TEXT]; 3633 target = xa[XA_COMPOUND_TEXT];
3431 style = XCompoundTextStyle; 3634 style = enc_compound_text;
3432 } 3635 }
3433 3636
3434 if (selection.text) 3637 if (selection.text)
3435 { 3638 {
3436 cl = selection.text; 3639 cl = selection.text;
… …
3440 { 3643 {
3441 cl = L""; 3644 cl = L"";
3442 selectlen = 0; 3645 selectlen = 0;
3443 } 3646 }
3444 3647
3445 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3648#if ENABLE_FRILLS
3446 // manually for XUTF8StringStyle. 3649 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3650 // so recode it manually
3651 if (style == enc_utf8)
3652 {
3653 freect = 1;
3654 ct.encoding = target;
3655 ct.format = 8;
3656 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3657 ct.nitems = strlen ((char *)ct.value);
3658 }
3659 else
3660#endif
3447 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3661 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3448 freect = 1; 3662 freect = 1;
3449 else 3663 else
3450 { 3664 {
3451 /* if we failed to convert then send it raw */ 3665 /* if we failed to convert then send it raw */
3452 ct.value = (unsigned char *)cl; 3666 ct.value = (unsigned char *)cl;
3453 ct.nitems = selectlen; 3667 ct.nitems = selectlen;
3668 ct.encoding = target;
3454 } 3669 }
3455 3670
3456 XChangeProperty (display->display, rq.requestor, rq.property, 3671 XChangeProperty (disp, rq.requestor, rq.property,
3457 target, 8, PropModeReplace, 3672 ct.encoding, 8, PropModeReplace,
3458 ct.value, (int)ct.nitems); 3673 ct.value, (int)ct.nitems);
3459 ev.property = rq.property; 3674 ev.property = rq.property;
3460 3675
3461 if (freect) 3676 if (freect)
3462 XFree (ct.value); 3677 XFree (ct.value);
3463 } 3678 }
3464 3679
3465 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3680 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3466} 3681}
3467 3682
3468/* ------------------------------------------------------------------------- * 3683/* ------------------------------------------------------------------------- *
3469 * MOUSE ROUTINES * 3684 * MOUSE ROUTINES *
3470 * ------------------------------------------------------------------------- */ 3685 * ------------------------------------------------------------------------- */
… …
3482} 3697}
3483 3698
3484/* ------------------------------------------------------------------------- */ 3699/* ------------------------------------------------------------------------- */
3485#ifdef USE_XIM 3700#ifdef USE_XIM
3486void 3701void
3487rxvt_term::im_set_position (XPoint *pos) 3702rxvt_term::im_set_position (XPoint &pos)
3488{ 3703{
3489 XWindowAttributes xwa; 3704 XWindowAttributes xwa;
3490 3705
3491 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3706 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3707
3492 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3708 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3493 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3709 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3494} 3710}
3495
3496#endif 3711#endif
3712
3713#if ENABLE_OVERLAY
3714void
3715rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3716{
3717 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3718 return;
3719
3720 want_refresh = 1;
3721
3722 scr_overlay_off ();
3723
3724 if (x < 0) x = TermWin.ncol - w;
3725 if (y < 0) y = TermWin.nrow - h;
3726
3727 // make space for border
3728 w += 2; MIN_IT (w, TermWin.ncol);
3729 h += 2; MIN_IT (h, TermWin.nrow);
3730
3731 x -= 1; MAX_IT (x, 0);
3732 y -= 1; MAX_IT (y, 0);
3733
3734 MIN_IT (x, TermWin.ncol - w);
3735 MIN_IT (y, TermWin.nrow - h);
3736
3737 ov_x = x; ov_y = y;
3738 ov_w = w; ov_h = h;
3739
3740 ov_text = new text_t *[h];
3741 ov_rend = new rend_t *[h];
3742
3743 for (y = 0; y < h; y++)
3744 {
3745 text_t *tp = ov_text[y] = new text_t[w];
3746 rend_t *rp = ov_rend[y] = new rend_t[w];
3747
3748 text_t t0, t1, t2;
3749 rend_t r = OVERLAY_RSTYLE;
3750
3751 if (y == 0)
3752 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3753 else if (y < h - 1)
3754 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3755 else
3756 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3757
3758 *tp++ = t0;
3759 *rp++ = r;
3760
3761 for (x = w - 2; x > 0; --x)
3762 {
3763 *tp++ = t1;
3764 *rp++ = r;
3765 }
3766
3767 *tp = t2;
3768 *rp = r;
3769 }
3770}
3771
3772void
3773rxvt_term::scr_overlay_off ()
3774{
3775 if (!ov_text)
3776 return;
3777
3778 want_refresh = 1;
3779
3780 for (int y = 0; y < ov_h; y++)
3781 {
3782 delete [] ov_text[y];
3783 delete [] ov_rend[y];
3784 }
3785
3786 delete [] ov_text; ov_text = 0;
3787 delete [] ov_rend; ov_rend = 0;
3788}
3789
3790void
3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3792{
3793 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3794 return;
3795
3796 x++, y++;
3797
3798 ov_text[y][x] = text;
3799 ov_rend[y][x] = rend;
3800}
3801
3802void
3803rxvt_term::scr_overlay_set (int x, int y, const char *s)
3804{
3805 while (*s)
3806 scr_overlay_set (x++, y, *s++);
3807}
3808
3809void
3810rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3811{
3812 while (*s)
3813 {
3814 text_t t = *s++;
3815 int width = wcwidth (t);
3816
3817 while (width--)
3818 {
3819 scr_overlay_set (x++, y, t);
3820 t = NOCHAR;
3821 }
3822 }
3823}
3824
3825void
3826rxvt_term::scr_swap_overlay ()
3827{
3828 if (!ov_text)
3829 return;
3830
3831 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3832
3833 // swap screen mem with overlay
3834 for (int y = ov_h; y--; )
3835 {
3836 text_t *t1 = ov_text[y];
3837 rend_t *r1 = ov_rend[y];
3838
3839 text_t *t2 = screen.text[y + row_offset] + ov_x;
3840 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3841
3842 for (int x = ov_w; x--; )
3843 {
3844 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3845 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3846 }
3847 }
3848}
3849
3850#endif
3497/* ------------------------------------------------------------------------- */ 3851/* ------------------------------------------------------------------------- */

Diff Legend

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