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.216 by root, Mon Jan 9 18:51:19 2006 UTC vs.
Revision 1.269 by ayin, Wed May 2 23:06:32 2007 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
47 47
48/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 52 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 53 view_start = 0
54#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch (); 129 l.touch ();
130 130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
136 136
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
181 //TODO//FIXME 184 //TODO//FIXME
182 saveLines++; 185 saveLines++;
183 prev_nrow--; 186 prev_nrow--;
184 nsaved++; 187 top_row--;
185 } 188 }
186 189
187 want_refresh = 1; 190 want_refresh = 1;
188 191
189 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
194 197
195 if (!row_buf) 198 if (!row_buf)
196 { 199 {
197 /* 200 /*
198 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
199 * Note: this is still needed so that all the scrollback lines are NULL
200 */ 202 */
201 nsaved = 0; /* no saved lines */ 203 top_row = 0;
202 term_start = 0; 204 term_start = 0;
203 205
204 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
205 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
206 208
207 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
208 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 212
212 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
213 { 214 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
236 selection.text = NULL; 237 selection.text = NULL;
237 selection.len = 0; 238 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
240 selection.clicks = 0; 241 selection.clicks = 0;
241 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
242 rvideo = 0;
243 } 243 }
244 else 244 else
245 { 245 {
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
260 } 260 }
261 } 261 }
262#endif 262#endif
263 263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 266
268 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
269 { 268 {
270 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
275 { 274 {
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 } 277 }
279 278
279 line_t *old_buf = row_buf;
280 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 281
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
285 285
286 if (nsaved) 286 if (top_row)
287 { 287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 290
291 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 293
327 qline->l = ncol; 327 qline->l = ncol;
328 qline->is_longer (1); 328 qline->is_longer (1);
329 329
330 int qcol = 0; 330 int qcol = 0;
331 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
332 // fill a single destination line 336 // fill a single destination line
333 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
334 { 338 {
335 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
336 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
346 350
347 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
348 352
349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
350 354
351 assert (len);
352 assert (pline.t);
353
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
356 357
357 lofs += len; 358 lofs += len;
358 qcol += len; 359 qcol += len;
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
365 } 366 }
366 while (p != pend && q > 0); 367 while (p != pend && q > 0);
367 368
368 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
369 nsaved = term_start - q; 370 top_row = q - term_start;
370 371
371 // make sure all terminal lines exist 372 // make sure all terminal lines exist
372 while (nsaved < 0) 373 while (top_row > 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
374 } 375 }
375 else 376 else
376 { 377 {
377 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
378 379
391 } 392 }
392 393
393 term_start = 0; 394 term_start = 0;
394 } 395 }
395 396
396#ifdef DEBUG_STRICT //TODO: remove
397 for (int i = -nsaved; i < nrow; i++)
398 assert (ROW (i).t);
399#endif
400
401 free (old_buf); 397 free (old_buf);
402 delete old_ta; 398 delete old_ta;
403 delete old_ra; 399 delete old_ra;
404 400
405 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
406 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
407 403
408 if (tabs)
409 free (tabs); 404 free (tabs);
410 } 405 }
406
407 CLEAR_ALL_SELECTION ();
411 408
412 prev_nrow = nrow; 409 prev_nrow = nrow;
413 prev_ncol = ncol; 410 prev_ncol = ncol;
414 411
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416 413
417 for (int col = ncol; col--; ) 414 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
419 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
420 tt_winch (); 420 tt_winch ();
421 421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 423}
424 424
425/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
426/* 426/*
427 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
428 */ 428 */
429void 429void
430rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
431{ 431{
432 if (row_buf)
433 {
432 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
434 436
435 free (row_buf); 437 free (row_buf);
436 free (swap_buf); 438 free (swap_buf);
437 free (drawn_buf); 439 free (drawn_buf);
438 free (temp_buf);
439 free (tabs); 440 free (tabs);
440 441
441 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
442} 444}
443 445
444/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
445/* 447/*
446 * Hard reset 448 * Hard reset
451 scr_release (); 453 scr_release ();
452 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
453 scr_reset (); 455 scr_reset ();
454 456
455 scr_clear (true); 457 scr_clear (true);
456 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
457} 459}
458 460
459/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
463 * Save and Restore cursor 465 * Save and Restore cursor
464 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
465 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
466 */ 468 */
467void 469void
468rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
469{ 471{
470 screen_t *s; 472 screen_t *s;
471 473
472#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
473 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
505 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
507#endif 509#endif
508} 510}
509 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!option (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
510/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
511/* 528/*
512 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
513 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
514 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
515 */ 532 */
516int 533void
517rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
518{ 535{
536 if (scrn == current_screen)
537 return;
538
519 want_refresh = 1; 539 want_refresh = 1;
520 view_start = 0; 540 view_start = 0;
521 541
522 if (current_screen == scrn)
523 return scrn;
524
525 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
526 543
527 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
528 545
529 ::swap (screen.cur.row, swap.cur.row);
530 ::swap (screen.cur.col, swap.cur.col);
531
532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
534
535#if NSCREENS 546#if NSCREENS
536 if (OPTION (Opt_secondaryScreen)) 547 if (option (Opt_secondaryScreen))
537 { 548 {
538 num_scr = 0; 549 num_scr = 0;
539 550
540 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
541 ::swap (ROW(i), swap_buf [i]);
542 552
543 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
544 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
545 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
546 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
547 } 557 }
548 else 558 else
549#endif 559#endif
550 if (OPTION (Opt_secondaryScroll)) 560 if (option (Opt_secondaryScroll))
551 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
552
553 return scrn;
554} 562}
555 563
556// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
557void 565void
558rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
559{ 567{
560 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
561 return; 569 return;
562 570
563 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
573/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
574/* 582/*
575 * Change the colour for following text 583 * Change the colour for following text
576 */ 584 */
577void 585void
578rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
579{ 587{
580 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
581 color = fgbg; 589 color = fgbg;
582 590
583 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
584 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
585 else 593 else
589/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
590/* 598/*
591 * Change the rendition style for following text 599 * Change the rendition style for following text
592 */ 600 */
593void 601void
594rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
595 { 603 {
596 if (set) 604 if (set)
597 rstyle |= style; 605 rstyle |= style;
598 else if (style == ~RS_None) 606 else if (style == ~RS_None)
599 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
606 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
607 * count positive ==> scroll up 615 * count positive ==> scroll up
608 * count negative ==> scroll down 616 * count negative ==> scroll down
609 */ 617 */
610int 618int
611rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
612{ 620{
613 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
614 return 0; 622 return 0;
615 623
616 want_refresh = 1; 624 want_refresh = 1;
617 num_scr += count; 625 num_scr += count;
618 626
619 if (count > 0 627 if (count > 0
620 && row1 == 0 628 && row1 == 0
621 && row2 == nrow - 1
622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 {
631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635
636 // sever bottommost line
623 { 637 {
624 nsaved = min (nsaved + count, saveLines); 638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
625 642
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 {
646 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
658 }
659
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
627 671
628 term_start = (term_start + count) % total_rows; 672 // move and/or clear selection, if any
629
630 if (selection.op && current_screen == selection.screen) 673 if (selection.op && current_screen == selection.screen)
631 { 674 {
632 selection.beg.row -= count; 675 selection.beg.row -= count;
633 selection.end.row -= count; 676 selection.end.row -= count;
634 selection.mark.row -= count; 677 selection.mark.row -= count;
635 678
636 if (selection.beg.row < -nsaved 679 if (selection.beg.row < top_row
637 || selection.end.row < -nsaved 680 || selection.end.row < top_row
638 || selection.mark.row < -nsaved) 681 || selection.mark.row < top_row)
639 { 682 {
640 CLEAR_ALL_SELECTION (); 683 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR; 684 selection.op = SELECTION_CLEAR;
642 } 685 }
643 } 686 }
644 687
645 for (int i = count; i--; ) 688 // finally move the view window, if desired
646 {
647 // basically thi is a slightly optimized scr_blank_screen_mem
648 // it is worth the effort on slower machines
649 line_t &l = ROW(row2 - i);
650
651 scr_blank_line (l, 0, l.l, rstyle);
652
653 l.l = 0;
654 l.f = 0;
655 }
656
657 if (OPTION (Opt_scrollWithBuffer) 689 if (option (Opt_scrollWithBuffer)
658 && view_start != 0 690 && view_start != 0
659 && view_start != saveLines) 691 && view_start != -saveLines)
660 scr_page (UP, count); 692 scr_page (UP, count);
693
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
695 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
661 } 696 }
662 else 697 else
663 { 698 {
664 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen)
665 { 700 {
689 724
690 int rows = row2 - row1 + 1; 725 int rows = row2 - row1 + 1;
691 726
692 min_it (count, rows); 727 min_it (count, rows);
693 728
729 line_t *temp_buf = row_buf + total_rows;
730
694 for (int row = 0; row < rows; row++) 731 for (int row = 0; row < rows; row++)
695 { 732 {
696 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
697 734
698 if (!IN_RANGE_EXC (row + count, 0, rows)) 735 if (!IN_RANGE_EXC (row + count, 0, rows))
709/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
710/* 747/*
711 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
712 */ 749 */
713void 750void
714rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
715{ 752{
716 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
717 return; 754 return;
718 755
719 unsigned char checksel; 756 unsigned char checksel;
725 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
726 763
727 if (minlines > 0) 764 if (minlines > 0)
728 { 765 {
729 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
730 768
731 if (minlines > 0 769 if (minlines > 0
732 && screen.tscroll == 0 770 && screen.tscroll == 0
733 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
734 { 772 {
739 } 777 }
740 778
741#ifdef DEBUG_STRICT 779#ifdef DEBUG_STRICT
742 assert (screen.cur.col < ncol); 780 assert (screen.cur.col < ncol);
743 assert (screen.cur.row < nrow 781 assert (screen.cur.row < nrow
744 && screen.cur.row >= -nsaved); 782 && screen.cur.row >= top_row);
745#endif 783#endif
746 int row = screen.cur.row; 784 int row = screen.cur.row;
747 785
748 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 786 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
749 787
795 CLEAR_SELECTION (); 833 CLEAR_SELECTION ();
796 } 834 }
797 835
798 if (screen.flags & Screen_WrapNext) 836 if (screen.flags & Screen_WrapNext)
799 { 837 {
800 max_it (line->l, ncol);
801 line->is_longer (1);
802
803 scr_do_wrap (); 838 scr_do_wrap ();
804 839
840 line->l = ncol;
841 line->is_longer (1);
842
805 row = screen.cur.row; 843 row = screen.cur.row;
806 line = &ROW(row); /* _must_ refresh */ 844 line = &ROW(row); /* _must_ refresh */
807 } 845 }
808 846
809 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
810 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
811 c = 0xfffd; 849 c = 0xfffd;
812 850
813 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
814 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
815 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
816 // locale. 854 // locale.
817 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
818 856
819 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
820 { 858 {
821 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
822 // 5f-7e standard vt100 860 // 5f-7e standard vt100
973/* 1011/*
974 * Process Backspace. Move back the cursor back a position, wrap if have to 1012 * Process Backspace. Move back the cursor back a position, wrap if have to
975 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
976 */ 1014 */
977void 1015void
978rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
979{ 1017{
980 want_refresh = 1; 1018 want_refresh = 1;
981 1019
982 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
983 { 1021 {
1001 * Process Horizontal Tab 1039 * Process Horizontal Tab
1002 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
1003 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
1004 */ 1042 */
1005void 1043void
1006rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
1007{ 1045{
1008 int i, x; 1046 int i, x;
1009 1047
1010 want_refresh = 1; 1048 want_refresh = 1;
1011 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
1033 if (count) 1071 if (count)
1034 x = ncol - 1; 1072 x = ncol - 1;
1035 1073
1036 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1037 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1038 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && option (Opt_pastableTabs))
1039 { 1077 {
1040 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1041 1079
1042 l.touch (x); 1080 l.touch (x);
1043 1081
1076 * Process DEC Back Index 1114 * Process DEC Back Index
1077 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1078 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1079 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1080 */ 1118 */
1081#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1082void 1120void
1083rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1084{ 1122{
1085 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1086 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1087 else 1125 else
1088 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
1093 * Process DEC Forward Index 1131 * Process DEC Forward Index
1094 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1095 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1096 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1097 */ 1135 */
1098#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1099void 1137void
1100rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1101{ 1139{
1102 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1104 else 1142 else
1105 { 1143 {
1118/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1119/* 1157/*
1120 * Goto Row/Column 1158 * Goto Row/Column
1121 */ 1159 */
1122void 1160void
1123rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1124{ 1162{
1125 want_refresh = 1; 1163 want_refresh = 1;
1126 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1127 1165
1128 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1166/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1167/* 1205/*
1168 * direction should be UP or DN 1206 * direction should be UP or DN
1169 */ 1207 */
1170void 1208void
1171rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1172{ 1210{
1173 int dirn; 1211 int dirn;
1174 1212
1175 want_refresh = 1; 1213 want_refresh = 1;
1176 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
1195 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1196 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1197 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1198 */ 1236 */
1199void 1237void
1200rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1201{ 1239{
1202 unsigned int col, num; 1240 unsigned int col, num;
1203 1241
1204 want_refresh = 1; 1242 want_refresh = 1;
1205 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1249 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1250 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1252 */ 1290 */
1253void 1291void
1254rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1255{ 1293{
1256 int num; 1294 int num;
1257 int32_t row; 1295 int32_t row;
1258 rend_t ren; 1296 rend_t ren;
1259 XGCValues gcvalue; 1297 XGCValues gcvalue;
1304 } 1342 }
1305 else 1343 else
1306 { 1344 {
1307 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1308 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1309 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1310 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1311 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1312 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1313 } 1351 }
1314 1352
1315 for (; num--; row++) 1353 for (; num--; row++)
1316 { 1354 {
1317 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1318 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1319 } 1357 }
1320} 1358}
1321 1359
1322#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1323void 1361void
1324rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1325{ 1363{
1326 want_refresh = 1; 1364 want_refresh = 1;
1327 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1328 1366
1329 nsaved = 0; 1367 top_row = 0;
1330} 1368}
1331#endif 1369#endif
1332 1370
1333/* ------------------------------------------------------------------------- */ 1371/* ------------------------------------------------------------------------- */
1334/* 1372/*
1335 * Fill the screen with `E's 1373 * Fill the screen with `E's
1336 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1337 */ 1375 */
1338void 1376void
1339rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1340{ 1378{
1341 rend_t fs; 1379 rend_t fs;
1342 1380
1343 want_refresh = 1; 1381 want_refresh = 1;
1344 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
1365/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1366/* 1404/*
1367 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1368 */ 1406 */
1369void 1407void
1370rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1371{ 1409{
1372 int end; 1410 int end;
1373 1411
1374 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1375 1413
1395/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1396/* 1434/*
1397 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1398 */ 1436 */
1399void 1437void
1400rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1401{ 1439{
1402 int col, row; 1440 int col, row;
1403 rend_t tr; 1441 rend_t tr;
1404 1442
1405 want_refresh = 1; 1443 want_refresh = 1;
1493/* 1531/*
1494 * Set the scrolling region 1532 * Set the scrolling region
1495 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1496 */ 1534 */
1497void 1535void
1498rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1499{ 1537{
1500 max_it (top, 0); 1538 max_it (top, 0);
1501 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1502 1540
1503 if (top > bot) 1541 if (top > bot)
1513 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1514 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1515 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1516 */ 1554 */
1517void 1555void
1518rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1519{ 1557{
1520 want_refresh = 1; 1558 want_refresh = 1;
1521 1559
1522 if (mode) 1560 if (mode)
1523 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
1530 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1531 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1532 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1533 */ 1571 */
1534void 1572void
1535rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1536{ 1574{
1537 if (mode) 1575 if (mode)
1538 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1539 else 1577 else
1540 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1549 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1550 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1551 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1552 */ 1590 */
1553void 1591void
1554rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1555{ 1593{
1556 if (mode) 1594 if (mode)
1557 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1558 else 1596 else
1559 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
1566 * Set insert/replace mode 1604 * Set insert/replace mode
1567 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1568 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1569 */ 1607 */
1570void 1608void
1571rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1572{ 1610{
1573 if (mode) 1611 if (mode)
1574 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1575 else 1613 else
1576 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
1582 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1583 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1584 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1585 */ 1623 */
1586void 1624void
1587rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1588{ 1626{
1589 if (mode < 0) 1627 if (mode < 0)
1590 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1591 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1592 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
1597 * Set reverse/normal video 1635 * Set reverse/normal video
1598 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1599 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1600 */ 1638 */
1601void 1639void
1602rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1603{ 1641{
1604 XGCValues gcvalue; 1642 rvideo_mode = on;
1605 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1606 if (rvideo != mode) 1648 if (rvideo_state != on)
1607 { 1649 {
1608 rvideo = mode; 1650 rvideo_state = on;
1651
1609 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1610#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1611 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1612#endif 1655#endif
1613#if TRANSPARENT 1656#if TRANSPARENT
1614 if (! OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!option (Opt_transparent) || am_transparent == 0)
1615#endif 1658#endif
1616 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1617 pix_colors[Color_bg]);
1618 1660
1661 XGCValues gcvalue;
1619 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1620 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1621 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1622 &gcvalue); 1665
1623 scr_clear (); 1666 scr_clear ();
1624 scr_touch (true); 1667 scr_touch (true);
1625 } 1668 }
1626} 1669}
1627 1670
1629/* 1672/*
1630 * Report current cursor position 1673 * Report current cursor position
1631 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1632 */ 1675 */
1633void 1676void
1634rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1635{ 1678{
1636 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1637} 1680}
1638 1681
1639/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
1642 1685
1643/* 1686/*
1644 * Set font style 1687 * Set font style
1645 */ 1688 */
1646void 1689void
1647rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1648{ 1691{
1649#if 0 1692#if 0
1650 switch (charsets [screen.charset]) 1693 switch (charsets [screen.charset])
1651 { 1694 {
1652 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
1674 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1675 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1676 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1677 */ 1720 */
1678void 1721void
1679rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1680{ 1723{
1681 screen.charset = set; 1724 screen.charset = set;
1682 set_font_style (); 1725 set_font_style ();
1683} 1726}
1684 1727
1690 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1691 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1692 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1693 */ 1736 */
1694void 1737void
1695rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1696{ 1739{
1697 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1698 set_font_style (); 1741 set_font_style ();
1699} 1742}
1700 1743
1705 1748
1706/* 1749/*
1707 * refresh matching text. 1750 * refresh matching text.
1708 */ 1751 */
1709bool 1752bool
1710rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1711{ 1754{
1712 bool found = false; 1755 bool found = false;
1713 1756
1714 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1715 { 1758 {
1716 int col = 0;
1717 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1718 1760
1719 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1720 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1721 { 1763 {
1722 found = true; 1764 found = true;
1723 *drp = ~value; 1765 *drp = ~value;
1724 } 1766 }
1735 PART_END, 1777 PART_END,
1736 RC_COUNT 1778 RC_COUNT
1737}; 1779};
1738 1780
1739void 1781void
1740rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1741{ 1783{
1742 int i; 1784 int i;
1743 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1744 1786
1745 if (!drawn_buf) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
1768 } 1810 }
1769 1811
1770 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1771 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1772 1814
1815 num_scr_allow = 0;
1816
1773 if (refresh) 1817 if (refresh)
1774 scr_refresh (SLOW_REFRESH); 1818 scr_refresh ();
1775} 1819}
1776 1820
1777/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1778/* 1822/*
1779 * Refresh the entire screen 1823 * Refresh the entire screen
1780 */ 1824 */
1781void 1825void
1782rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1783{ 1827{
1784 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1785} 1829}
1786 1830
1787/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1788/* 1832/*
1789 * Move the display so that the line represented by scrollbar value Y is at 1833 * Move the display so that the line represented by scrollbar value Y is at
1790 * the top of the screen 1834 * the top of the screen
1791 */ 1835 */
1792int 1836void
1793rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1794{ 1838{
1795 long p = 0; 1839 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1796 unsigned int oldviewstart;
1797
1798 oldviewstart = view_start;
1799
1800 if (y < len)
1801 {
1802 p = (nrow + nsaved) * (len - y) / len;
1803 p -= (long) (nrow - 1);
1804 p = max (p, 0);
1805 }
1806
1807 view_start = (unsigned int)min (p, nsaved);
1808
1809 return scr_changeview (oldviewstart);
1810} 1840}
1811 1841
1812/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1813/* 1843/*
1814 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1815 * direction should be UP or DN 1845 * direction should be UP or DN
1816 */ 1846 */
1817int 1847bool
1818rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1819{ 1849{
1820 int n; 1850 int new_view_start =
1821 unsigned int oldviewstart;
1822
1823 oldviewstart = view_start;
1824
1825 if (direction == UP)
1826 {
1827 n = view_start + nlines;
1828 view_start = min (n, nsaved);
1829 }
1830 else
1831 {
1832 n = view_start - nlines; 1851 direction == UP ? view_start - nlines
1833 view_start = max (n, 0); 1852 : view_start + nlines;
1834 }
1835 1853
1836 return scr_changeview (oldviewstart); 1854 return scr_changeview (new_view_start);
1837} 1855}
1838 1856
1839int 1857bool
1840rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1841{ 1859{
1860 clamp_it (new_view_start, top_row, 0);
1861
1842 if (view_start != oldviewstart) 1862 if (new_view_start == view_start)
1843 { 1863 return false;
1864
1865 num_scr += new_view_start - view_start;
1866 view_start = new_view_start;
1867 want_refresh = 1;
1868
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1869 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845 1870
1846 want_refresh = 1; 1871 return true;
1847 num_scr -= (view_start - oldviewstart);
1848 }
1849
1850 return (int)view_start - (int)oldviewstart;
1851} 1872}
1852 1873
1853/* ------------------------------------------------------------------------- */ 1874#ifndef NO_BELL
1854void 1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1883/* ------------------------------------------------------------------------- */
1884void
1855rxvt_term::scr_bell () 1885rxvt_term::scr_bell () NOTHROW
1856{ 1886{
1857#ifndef NO_BELL 1887#ifndef NO_BELL
1858 1888
1859# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1860# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1861 if (OPTION (Opt_mapAlert)) 1891 if (option (Opt_mapAlert))
1862# endif 1892# endif
1863 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1864# endif 1894# endif
1895# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell))
1897 {
1898 XWMHints *h;
1865 1899
1866 if (OPTION (Opt_visualBell)) 1900 h = XGetWMHints(dpy, parent[0]);
1901 if (h != NULL)
1902 {
1903 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h);
1905 }
1867 { 1906 }
1868 scr_rvideo_mode (!rvideo); /* refresh also done */ 1907# endif
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1908
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1909 if (option (Opt_visualBell))
1910 {
1911 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode);
1913 display->flush ();
1914
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1871 } 1916 }
1872 else 1917 else
1873 XBell (display->display, 0); 1918 XBell (dpy, 0);
1874 1919
1875#endif 1920#endif
1876} 1921}
1877 1922
1878/* ------------------------------------------------------------------------- */ 1923/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1924/* ARGSUSED */
1880void 1925void
1881rxvt_term::scr_printscreen (int fullhist) 1926rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1927{
1883#ifdef PRINTPIPE 1928#ifdef PRINTPIPE
1884 int nrows, row_start; 1929 int nrows, row_start;
1885 FILE *fd; 1930 FILE *fd;
1886 1931
1887 if ((fd = popen_printer ()) == NULL) 1932 if ((fd = popen_printer ()) == NULL)
1888 return; 1933 return;
1889 1934
1890 if (fullhist) 1935 if (fullhist)
1891 { 1936 {
1892 nrows = nrow + nsaved; 1937 nrows = nrow - top_row;
1893 row_start = -nsaved; 1938 row_start = top_row;
1894 } 1939 }
1895 else 1940 else
1896 { 1941 {
1897 nrows = nrow; 1942 nrows = nrow;
1898 row_start = -view_start; 1943 row_start = view_start;
1899 } 1944 }
1900 1945
1901 wctomb (0, 0); 1946 wctomb (0, 0);
1902 1947
1903 for (int r1 = 0; r1 < nrows; r1++) 1948 for (int r1 = 0; r1 < nrows; r1++)
1935 * Refresh the screen 1980 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 1981 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 1982 * screen.text/screen.rend contain what the screen will change to.
1938 */ 1983 */
1939void 1984void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1985rxvt_term::scr_refresh () NOTHROW
1941{ 1986{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 1987 unsigned char have_bg,
1943 showcursor; /* show the cursor */ 1988 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 1989 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 1990 ocrow; /* old cursor row */
1946 int i; /* tmp */ 1991 int i; /* tmp */
1947#ifndef NO_CURSORCOLOR 1992#ifndef NO_CURSORCOLOR
1948 rend_t cc1; /* store colours at cursor position (s) */ 1993 rend_t cc1; /* store colours at cursor position (s) */
1949#endif 1994#endif
1950 rend_t *crp; // cursor rendition pointer 1995 rend_t *crp; // cursor rendition pointer
1996 rend_t ccol1, /* Cursor colour */
1997 ccol2; /* Cursor colour2 */
1951 1998
1952 want_refresh = 0; /* screen is current */ 1999 want_refresh = 0; /* screen is current */
1953 2000
1954 if (refresh_type == NO_REFRESH || !mapped) 2001 if (refresh_type == NO_REFRESH || !mapped)
1955 return; 2002 return;
1956 2003
1957 /* 2004 /*
1958 * A: set up vars 2005 * A: set up vars
1959 */ 2006 */
1960 must_clear = 0; 2007 have_bg = 0;
1961 refresh_count = 0; 2008 refresh_count = 0;
1962 2009
1963#if XPM_BACKGROUND 2010#if XPM_BACKGROUND
1964 must_clear |= bgPixmap.pixmap != None; 2011 have_bg |= bgPixmap.pixmap != None;
1965#endif 2012#endif
1966#if TRANSPARENT 2013#if TRANSPARENT
1967 must_clear |= OPTION (Opt_transparent) && am_transparent; 2014 have_bg |= option (Opt_transparent) && am_transparent;
1968#endif 2015#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 2017
1971 /* 2018 /*
1972 * B: reverse any characters which are selected 2019 * B: reverse any characters which are selected
1976 /* 2023 /*
1977 * C: set the cursor character (s) 2024 * C: set the cursor character (s)
1978 */ 2025 */
1979 { 2026 {
1980 unsigned char setoldcursor; 2027 unsigned char setoldcursor;
1981 rend_t ccol1, /* Cursor colour */
1982 ccol2; /* Cursor colour2 */
1983 2028
1984 showcursor = (screen.flags & Screen_VisibleCursor); 2029 showcursor = (screen.flags & Screen_VisibleCursor);
1985#ifdef CURSOR_BLINK 2030#ifdef CURSOR_BLINK
1986 if (hidden_cursor) 2031 if (hidden_cursor)
1987 showcursor = 0; 2032 showcursor = 0;
1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2039 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1995 col--; 2040 col--;
1996 2041
1997 crp = &ROW(screen.cur.row).r[col]; 2042 crp = &ROW(screen.cur.row).r[col];
1998 2043
2044#ifndef NO_CURSORCOLOR
2045 cc1 = *crp & (RS_fgMask | RS_bgMask);
2046 if (ISSET_PIXCOLOR (Color_cursor))
2047 ccol1 = Color_cursor;
2048 else
2049#endif
2050#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2051 ccol1 = fgcolor_of (rstyle);
2052#else
2053 ccol1 = Color_fg;
2054#endif
2055
2056#ifndef NO_CURSORCOLOR
2057 if (ISSET_PIXCOLOR (Color_cursor2))
2058 ccol2 = Color_cursor2;
2059 else
2060#endif
2061#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2062 ccol2 = bgcolor_of (rstyle);
2063#else
2064 ccol2 = Color_bg;
2065#endif
2066
1999 if (showcursor && focus) 2067 if (showcursor && focus)
2000 { 2068 {
2001 if (OPTION (Opt_cursorUnderline)) 2069 if (option (Opt_cursorUnderline))
2002 *crp ^= RS_Uline; 2070 *crp ^= RS_Uline;
2003 else 2071 else
2004 { 2072 {
2005 *crp ^= RS_RVid; 2073 *crp ^= RS_RVid;
2006
2007#ifndef NO_CURSORCOLOR
2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2009 if (ISSET_PIXCOLOR (Color_cursor))
2010 ccol1 = Color_cursor;
2011 else
2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2013 ccol1 = fgcolor_of (rstyle);
2014#else
2015 ccol1 = Color_fg;
2016#endif
2017 if (ISSET_PIXCOLOR (Color_cursor2))
2018 ccol2 = Color_cursor2;
2019 else
2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2021 ccol2 = bgcolor_of (rstyle);
2022#else
2023 ccol2 = Color_bg;
2024#endif
2025 *crp = SET_FGCOLOR (*crp, ccol1); 2074 *crp = SET_FGCOLOR (*crp, ccol1);
2026 *crp = SET_BGCOLOR (*crp, ccol2); 2075 *crp = SET_BGCOLOR (*crp, ccol2);
2027#endif
2028 } 2076 }
2029 } 2077 }
2030 } 2078 }
2031 2079
2032 /* make sure no outline cursor is left around */ 2080 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2081 setoldcursor = 0;
2034 if (ocrow != -1) 2082 if (ocrow != -1)
2035 { 2083 {
2036 if (screen.cur.row + view_start != ocrow 2084 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2085 || screen.cur.col != oldcursor.col)
2038 { 2086 {
2039 if (ocrow < nrow 2087 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2088 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2089 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2049 else if (!focus) 2097 else if (!focus)
2050 setoldcursor = 1; 2098 setoldcursor = 1;
2051 2099
2052 if (setoldcursor) 2100 if (setoldcursor)
2053 { 2101 {
2054 if (screen.cur.row + view_start >= nrow) 2102 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2103 oldcursor.row = -1;
2056 else 2104 else
2057 { 2105 {
2058 oldcursor.row = screen.cur.row + view_start; 2106 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2107 oldcursor.col = screen.cur.col;
2060 } 2108 }
2061 } 2109 }
2062 } 2110 }
2063 2111
2069#ifndef NO_SLOW_LINK_SUPPORT 2117#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2118 /*
2071 * D: CopyArea pass - very useful for slower links 2119 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2120 * This has been deliberately kept simple.
2073 */ 2121 */
2074 i = num_scr;
2075 if (!display->is_local 2122 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2123 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2124 && abs (num_scr) < nrow && !have_bg)
2078 { 2125 {
2079 int16_t nits; 2126 int16_t nits;
2127 int i = num_scr;
2080 int j; 2128 int j;
2081 int len, wlen; 2129 int len, wlen;
2130 dLocal (int, num_scr);
2082 2131
2083 j = nrow; 2132 j = nrow;
2084 wlen = len = -1; 2133 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2134 row = i > 0 ? 0 : j - 1;
2135
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2136 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2137 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2138 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2139 {
2090 line_t s = ROW(row - view_start); 2140 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2141 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2142 line_t d2 = drawn_buf[row + i];
2093 2143
2094 for (nits = 0, col = ncol; col--; ) 2144 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2145 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2111 wlen = row; 2161 wlen = row;
2112 continue; 2162 continue;
2113 } 2163 }
2114 } 2164 }
2115 2165
2116 if (len != -1) 2166 if (len >= 0)
2117 { 2167 {
2118 /* also comes here at end if needed because of >= above */ 2168 /* also comes here at end if needed because of >= above */
2119 if (wlen < len) 2169 if (wlen < len)
2120 ::swap (wlen, len); 2170 ::swap (wlen, len);
2121 2171
2172 XGCValues gcv;
2173
2174 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2122 XCopyArea (display->display, vt, vt, 2175 XCopyArea (dpy, vt, vt,
2123 gc, 0, Row2Pixel (len + i), 2176 gc, 0, Row2Pixel (len + i),
2124 (unsigned int)this->width, 2177 (unsigned int)this->width,
2125 (unsigned int)Height2Pixel (wlen - len + 1), 2178 (unsigned int)Height2Pixel (wlen - len + 1),
2126 0, Row2Pixel (len)); 2179 0, Row2Pixel (len));
2180 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2181
2127 len = -1; 2182 len = -1;
2128 } 2183 }
2129 } 2184 }
2130 } 2185 }
2131#endif 2186#endif
2133 /* 2188 /*
2134 * E: main pass across every character 2189 * E: main pass across every character
2135 */ 2190 */
2136 for (row = 0; row < nrow; row++) 2191 for (row = 0; row < nrow; row++)
2137 { 2192 {
2138 text_t *stp = ROW(row - view_start).t; 2193 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2194 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2195 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2196 rend_t *drp = drawn_buf[row].r;
2142 2197
2143 /* 2198 /*
2144 * E2: OK, now the real pass 2199 * E2: OK, now the real pass
2187 count++; 2242 count++;
2188 2243
2189 if (stp[col] != dtp[col] 2244 if (stp[col] != dtp[col]
2190 || !RS_SAME (srp[col], drp[col])) 2245 || !RS_SAME (srp[col], drp[col]))
2191 { 2246 {
2192 if (must_clear && (i++ > count / 2)) 2247 if (have_bg && (i++ > count / 2))
2193 break; 2248 break;
2194 2249
2195 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2196 drp[col] = rend; 2251 drp[col] = rend;
2197 i = 0; 2252 i = 0;
2198 } 2253 }
2199 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2254 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2200 break; 2255 break;
2201 } 2256 }
2202 2257
2203 col--; /* went one too far. move back */ 2258 col--; /* went one too far. move back */
2204 count -= i; /* dump any matching trailing chars */ 2259 count -= i; /* dump any matching trailing chars */
2214 int back = bgcolor_of (rend); // desired background 2269 int back = bgcolor_of (rend); // desired background
2215 2270
2216 // only do special processing if any attributes are set, which is unlikely 2271 // only do special processing if any attributes are set, which is unlikely
2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2218 { 2273 {
2219#if ENABLE_STYLES
2220 // force redraw after "careful" characters to avoid pixel droppings
2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2222 drp[col + 1] = ~srp[col + 1];
2223
2224 // include previous careful character(s) if possible, looks nicer (best effort...)
2225 while (text > stp
2226 && srp[text - stp - 1] & RS_Careful
2227 && RS_SAME (rend, srp[text - stp - 1]))
2228 text--, count++, xpixel -= fwidth;
2229#endif
2230
2231 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2232 2275
2233#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
2234 if (rend & RS_Bold 2277 if (rend & RS_Bold
2235 && fore == Color_fg) 2278 && fore == Color_fg)
2251 else 2294 else
2252 invert = !invert; 2295 invert = !invert;
2253# endif 2296# endif
2254 } 2297 }
2255 2298
2256 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2299 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2257 fore = Color_UL; 2300 fore = Color_UL;
2258#endif 2301#endif
2259 2302
2260 if (invert) 2303 if (invert)
2261 { 2304 {
2305#ifdef OPTION_HC
2306 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2307 || !ISSET_PIXCOLOR (Color_HC))
2308#endif
2309 /* invert the column if no highlightColor is set or it is the
2310 * current cursor column */
2262 ::swap (fore, back); 2311 ::swap (fore, back);
2312#ifdef OPTION_HC
2313 else if (ISSET_PIXCOLOR (Color_HC))
2314 back = Color_HC;
2315#endif
2263 2316
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2317#ifndef NO_BOLD_UNDERLINE_REVERSE
2318# ifndef OPTION_HC
2265 if (ISSET_PIXCOLOR (Color_RV)) 2319 if (ISSET_PIXCOLOR (Color_RV))
2266 back = Color_RV; 2320 back = Color_RV;
2267 2321# endif
2268 if (fore == back) 2322 if (fore == back)
2269 { 2323 {
2270 fore = Color_bg; 2324 fore = Color_bg;
2271 back = Color_fg; 2325 back = Color_fg;
2272 } 2326 }
2283 } 2337 }
2284 else if (hidden_text) 2338 else if (hidden_text)
2285 fore = back; 2339 fore = back;
2286 } 2340 }
2287#endif 2341#endif
2342
2343#if ENABLE_STYLES
2344 // "careful" (too wide) character handling
2345
2346 // include previous careful character(s) if possible, looks nicer (best effort...)
2347 while (text > stp
2348 && srp[text - stp - 1] & RS_Careful
2349 && RS_SAME (rend, srp[text - stp - 1]))
2350 text--, count++, xpixel -= fwidth;
2351
2352 // force redraw after "careful" characters to avoid pixel droppings
2353 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2354 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2355
2356 // force redraw before "careful" characters to avoid pixel droppings
2357 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2358 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2359#endif
2288 } 2360 }
2289 2361
2290 /* 2362 /*
2291 * Actually do the drawing of the string here 2363 * Actually do the drawing of the string here
2292 */ 2364 */
2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2365 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2294 2366
2295 if (back == fore)
2296 font->clear_rect (*drawable, xpixel, ypixel,
2297 fwidth * count, fheight,
2298 back);
2299 else if (back == Color_bg) 2367 if (have_bg && back == Color_bg)
2300 { 2368 {
2301 if (must_clear) 2369 // this is very ugly, maybe push it into ->draw?
2302 {
2303 CLEAR_CHARS (xpixel, ypixel, count);
2304 2370
2305 for (i = 0; i < count; i++) /* don't draw empty strings */ 2371 for (i = 0; i < count; i++) /* don't draw empty strings */
2306 if (text[i] != ' ') 2372 if (text[i] != ' ')
2307 { 2373 {
2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2374 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2309 break; 2375 goto did_clear;
2310 }
2311 } 2376 }
2312 else 2377
2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2378 CLEAR_CHARS (xpixel, ypixel, count);
2379 did_clear: ;
2314 } 2380 }
2315 else 2381 else
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2382 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2317 2383
2318 if (rend & RS_Uline && font->descent > 1 && fore != back) 2384 if (rend & RS_Uline && font->descent > 1 && fore != back)
2319 { 2385 {
2320#if ENABLE_FRILLS 2386#if ENABLE_FRILLS
2321 if (ISSET_PIXCOLOR (Color_underline)) 2387 if (ISSET_PIXCOLOR (Color_underline))
2322 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2388 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2323 else 2389 else
2324#endif 2390#endif
2325 XSetForeground (display->display, gc, pix_colors[fore]); 2391 XSetForeground (dpy, gc, pix_colors[fore]);
2326 2392
2327 XDrawLine (display->display, drawBuffer, gc, 2393 XDrawLine (dpy, drawBuffer, gc,
2328 xpixel, ypixel + font->ascent + 1, 2394 xpixel, ypixel + font->ascent + 1,
2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2395 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 } 2396 }
2331 } /* for (col....) */ 2397 } /* for (col....) */
2332 } /* for (row....) */ 2398 } /* for (row....) */
2341 */ 2407 */
2342 if (showcursor) 2408 if (showcursor)
2343 { 2409 {
2344 if (focus) 2410 if (focus)
2345 { 2411 {
2346 if (OPTION (Opt_cursorUnderline)) 2412 if (option (Opt_cursorUnderline))
2347 *crp ^= RS_Uline; 2413 *crp ^= RS_Uline;
2348 else 2414 else
2349 { 2415 {
2350 *crp ^= RS_RVid; 2416 *crp ^= RS_RVid;
2351#ifndef NO_CURSORCOLOR 2417#ifndef NO_CURSORCOLOR
2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2431 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366 cursorwidth++; 2432 cursorwidth++;
2367 2433
2368#ifndef NO_CURSORCOLOR 2434#ifndef NO_CURSORCOLOR
2369 if (ISSET_PIXCOLOR (Color_cursor)) 2435 if (ISSET_PIXCOLOR (Color_cursor))
2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2436 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2437 else
2371#endif 2438#endif
2439 XSetForeground (dpy, gc, pix_colors[ccol1]);
2372 2440
2373 XDrawRectangle (display->display, drawBuffer, gc, 2441 XDrawRectangle (dpy, drawBuffer, gc,
2374 Col2Pixel (col), 2442 Col2Pixel (col),
2375 Row2Pixel (oldcursor.row), 2443 Row2Pixel (oldcursor.row),
2376 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2444 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2445 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2378 } 2446 }
2381 /* 2449 /*
2382 * H: cleanup selection 2450 * H: cleanup selection
2383 */ 2451 */
2384 scr_reverse_selection (); 2452 scr_reverse_selection ();
2385 2453
2386 if (refresh_type & SMOOTH_REFRESH)
2387 XFlush (display->display);
2388
2389 num_scr = 0; 2454 num_scr = 0;
2390 num_scr_allow = 1; 2455 num_scr_allow = 1;
2391} 2456}
2392 2457
2393void 2458void
2394rxvt_term::scr_remap_chars (line_t &l) 2459rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2395{ 2460{
2396 if (!l.t) 2461 if (!l.t)
2397 return; 2462 return;
2398 2463
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2464 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2401 for (int i = ncol; i--; ) 2466 for (int i = ncol; i--; )
2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2467 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2403} 2468}
2404 2469
2405void 2470void
2406rxvt_term::scr_remap_chars () 2471rxvt_term::scr_remap_chars () NOTHROW
2407{ 2472{
2408 for (int i = total_rows; i--; ) 2473 for (int i = total_rows; i--; )
2409 scr_remap_chars (row_buf [i]); 2474 scr_remap_chars (row_buf [i]);
2410 2475
2411 for (int i = nrow; i--; ) 2476 for (int i = nrow; i--; )
2414 scr_remap_chars (swap_buf [i]); 2479 scr_remap_chars (swap_buf [i]);
2415 } 2480 }
2416} 2481}
2417 2482
2418void 2483void
2419rxvt_term::scr_recolour () 2484rxvt_term::scr_recolour () NOTHROW
2420{ 2485{
2421 if (1 2486 if (1
2422#if TRANSPARENT 2487#if TRANSPARENT
2423 && !am_transparent 2488 && !am_transparent
2424#endif 2489#endif
2425#if XPM_BACKGROUND 2490#if XPM_BACKGROUND
2426 && !bgPixmap.pixmap 2491 && !bgPixmap.pixmap
2427#endif 2492#endif
2428 ) 2493 )
2429 { 2494 {
2430 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2431 XClearWindow (display->display, parent[0]); 2496 XClearWindow (dpy, parent[0]);
2432 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2433#if HAVE_SCROLLBARS 2498#if HAVE_SCROLLBARS
2434 if (scrollBar.win) 2499 if (scrollBar.win)
2435 { 2500 {
2436 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2437 scrollBar.setIdle (); 2502 scrollBar.setIdle ();
2438 scrollbar_show (0); 2503 scrollbar_show (0);
2439 } 2504 }
2440#endif 2505#endif
2441 } 2506 }
2445 want_refresh = 1; 2510 want_refresh = 1;
2446} 2511}
2447 2512
2448/* ------------------------------------------------------------------------- */ 2513/* ------------------------------------------------------------------------- */
2449void 2514void
2450rxvt_term::scr_clear (bool really) 2515rxvt_term::scr_clear (bool really) NOTHROW
2451{ 2516{
2452 if (!mapped) 2517 if (!mapped)
2453 return; 2518 return;
2454 2519
2455 num_scr_allow = 0; 2520 num_scr_allow = 0;
2456 want_refresh = 1; 2521 want_refresh = 1;
2457 2522
2458 if (really) 2523 if (really)
2459 XClearWindow (display->display, vt); 2524 XClearWindow (dpy, vt);
2460} 2525}
2461 2526
2462/* ------------------------------------------------------------------------- */
2463void 2527void
2528rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2529{
2530 int view_end = view_start + nrow;
2531 int row, col;
2532
2533 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2534 {
2535 text_t *stp = ROW(row).t;
2536 rend_t *srp = ROW(row).r;
2537
2538 for (col = beg_col; col < end_col; col++)
2539 srp[col] ^= rstyle1;
2540
2541 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2542 srp[col] ^= rstyle2;
2543
2544 if (++col < end_col)
2545 srp[col] ^= rstyle2;
2546 }
2547}
2548
2549void
2550rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2551{
2552 int view_end = view_start + nrow;
2553 int row, col;
2554
2555 if (beg_row >= view_start)
2556 {
2557 col = beg_col;
2558 row = beg_row;
2559 }
2560 else
2561 {
2562 col = 0;
2563 row = view_start;
2564 }
2565
2566 for (; row < min (end_row, view_end); row++, col = 0)
2567 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2568 srp[col] ^= rstyle;
2569
2570 if (row == end_row)
2571 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2572 srp[col] ^= rstyle;
2573}
2574
2575/* ------------------------------------------------------------------------- */
2576void
2464rxvt_term::scr_reverse_selection () 2577rxvt_term::scr_reverse_selection () NOTHROW
2465{ 2578{
2466 if (selection.op 2579 if (selection.op
2467 && current_screen == selection.screen 2580 && current_screen == selection.screen
2468 && selection.end.row >= -view_start) 2581 && selection.end.row >= view_start)
2469 { 2582 {
2470 int view_end = -view_start + nrow; 2583#if !ENABLE_MINIMAL
2471 int row, col;
2472
2473#if ENABLE_FRILLS
2474 if (selection.rect) 2584 if (selection.rect)
2475 { 2585 scr_xor_rect (selection.beg.row, selection.beg.col,
2476 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2586 selection.end.row, selection.end.col,
2477 { 2587 RS_RVid, RS_RVid | RS_Uline);
2478 text_t *stp = ROW(row).t;
2479 rend_t *srp = ROW(row).r;
2480
2481 for (col = selection.beg.col; col < selection.end.col; col++)
2482 srp[col] ^= RS_RVid;
2483
2484 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2485 srp[col] ^= RS_RVid | RS_Uline;
2486
2487 if (++col < selection.end.col)
2488 srp[col] ^= RS_RVid | RS_Uline;
2489 }
2490 }
2491 else 2588 else
2492#endif 2589#endif
2493 { 2590 scr_xor_span (selection.beg.row, selection.beg.col,
2494 if (selection.beg.row >= -view_start) 2591 selection.end.row, selection.end.col,
2495 { 2592 RS_RVid);
2496 col = selection.beg.col;
2497 row = selection.beg.row;
2498 }
2499 else
2500 {
2501 col = 0;
2502 row = -view_start;
2503 }
2504
2505 for (; row < min (selection.end.row, view_end); row++, col = 0)
2506 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2507 srp[col] ^= RS_RVid;
2508
2509 if (row == selection.end.row)
2510 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2511 srp[col] ^= RS_RVid;
2512 }
2513 } 2593 }
2514} 2594}
2515 2595
2516/* ------------------------------------------------------------------------- */ 2596/* ------------------------------------------------------------------------- */
2517/* 2597/*
2518 * Dump the whole scrollback and screen to the passed filedescriptor. The 2598 * Dump the whole scrollback and screen to the passed filedescriptor. The
2519 * invoking routine must close the fd. 2599 * invoking routine must close the fd.
2520 */ 2600 */
2521#if 0 2601#if 0
2522void 2602void
2523rxvt_term::scr_dump (int fd) 2603rxvt_term::scr_dump (int fd) NOTHROW
2524{ 2604{
2525 int row, wrote; 2605 int row, wrote;
2526 unsigned int width, towrite; 2606 unsigned int width, towrite;
2527 char r1[] = "\n"; 2607 char r1[] = "\n";
2528 2608
2547 2627
2548/* ------------------------------------------------------------------------- * 2628/* ------------------------------------------------------------------------- *
2549 * CHARACTER SELECTION * 2629 * CHARACTER SELECTION *
2550 * ------------------------------------------------------------------------- */ 2630 * ------------------------------------------------------------------------- */
2551void 2631void
2552rxvt_term::selection_check (int check_more) 2632rxvt_term::selection_check (int check_more) NOTHROW
2553{ 2633{
2554 row_col_t pos; 2634 row_col_t pos;
2555 2635
2556 if (!selection.op) 2636 if (!selection.op)
2557 return; 2637 return;
2558 2638
2559 pos.row = pos.col = 0; 2639 pos.row = pos.col = 0;
2560 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2640 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2561 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2641 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2562 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2642 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2563 || (check_more == 1 2643 || (check_more == 1
2564 && current_screen == selection.screen 2644 && current_screen == selection.screen
2565 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2645 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2566 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2646 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2567 || (check_more == 2 2647 || (check_more == 2
2578/* ------------------------------------------------------------------------- */ 2658/* ------------------------------------------------------------------------- */
2579/* 2659/*
2580 * Paste a selection direct to the command fd 2660 * Paste a selection direct to the command fd
2581 */ 2661 */
2582void 2662void
2583rxvt_term::paste (char *data, unsigned int len) 2663rxvt_term::paste (char *data, unsigned int len) NOTHROW
2584{ 2664{
2585 /* convert normal newline chars into common keyboard Return key sequence */ 2665 /* convert normal newline chars into common keyboard Return key sequence */
2586 for (unsigned int i = 0; i < len; i++) 2666 for (unsigned int i = 0; i < len; i++)
2587 if (data[i] == C0_LF) 2667 if (data[i] == C0_LF)
2588 data[i] = C0_CR; 2668 data[i] = C0_CR;
2594/* 2674/*
2595 * Respond to a notification that a primary selection has been sent 2675 * Respond to a notification that a primary selection has been sent
2596 * EXT: SelectionNotify 2676 * EXT: SelectionNotify
2597 */ 2677 */
2598void 2678void
2599rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2600{ 2680{
2601 if (prop == None) /* check for failed XConvertSelection */ 2681 if (prop == None) /* check for failed XConvertSelection */
2602 { 2682 {
2603 if ((selection_type & Sel_CompoundText)) 2683 if ((selection_type & Sel_CompoundText))
2604 { 2684 {
2624 } 2704 }
2625 2705
2626 unsigned long bytes_after; 2706 unsigned long bytes_after;
2627 XTextProperty ct; 2707 XTextProperty ct;
2628 2708
2629 if (XGetWindowProperty (display->display, win, prop, 2709 if (XGetWindowProperty (dpy, win, prop,
2630 0, PROP_SIZE / 4, 2710 0, PROP_SIZE / 4,
2631 delete_prop, AnyPropertyType, 2711 delete_prop, AnyPropertyType,
2632 &ct.encoding, &ct.format, 2712 &ct.encoding, &ct.format,
2633 &ct.nitems, &bytes_after, 2713 &ct.nitems, &bytes_after,
2634 &ct.value) != Success) 2714 &ct.value) != Success)
2643 if (bytes_after) 2723 if (bytes_after)
2644 { 2724 {
2645 // fetch and append remaining data 2725 // fetch and append remaining data
2646 XTextProperty ct2; 2726 XTextProperty ct2;
2647 2727
2648 if (XGetWindowProperty (display->display, win, prop, 2728 if (XGetWindowProperty (dpy, win, prop,
2649 ct.nitems / 4, (bytes_after + 3) / 4, 2729 ct.nitems / 4, (bytes_after + 3) / 4,
2650 delete_prop, AnyPropertyType, 2730 delete_prop, AnyPropertyType,
2651 &ct2.encoding, &ct2.format, 2731 &ct2.encoding, &ct2.format,
2652 &ct2.nitems, &bytes_after, 2732 &ct2.nitems, &bytes_after,
2653 &ct2.value) != Success) 2733 &ct2.value) != Success)
2666 2746
2667 if (ct.encoding == xa[XA_INCR]) 2747 if (ct.encoding == xa[XA_INCR])
2668 { 2748 {
2669 // INCR selection, start handshake 2749 // INCR selection, start handshake
2670 if (!delete_prop) 2750 if (!delete_prop)
2671 XDeleteProperty (display->display, win, prop); 2751 XDeleteProperty (dpy, win, prop);
2672 2752
2673 selection_wait = Sel_incr; 2753 selection_wait = Sel_incr;
2674 incr_buf_fill = 0; 2754 incr_buf_fill = 0;
2675 incr_ev.start (NOW + 10); 2755 incr_ev.start (NOW + 10);
2676 2756
2723 } 2803 }
2724 2804
2725 char **cl; 2805 char **cl;
2726 int cr; 2806 int cr;
2727 2807
2728#if ENABLE_FRILLS 2808#if !ENABLE_MINIMAL
2729 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2809 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2730 // so recode it manually 2810 // so recode it manually
2731 if (ct.encoding == xa[XA_UTF8_STRING]) 2811 if (ct.encoding == xa[XA_UTF8_STRING])
2732 { 2812 {
2733 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2737 paste (s, strlen (s)); 2817 paste (s, strlen (s));
2738 free (s); 2818 free (s);
2739 } 2819 }
2740 else 2820 else
2741#endif 2821#endif
2742 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2743 && cl) 2823 && cl)
2744 { 2824 {
2745 for (int i = 0; i < cr; i++) 2825 for (int i = 0; i < cr; i++)
2746 paste (cl[i], strlen (cl[i])); 2826 paste (cl[i], strlen (cl[i]));
2747 2827
2756 if (selection_wait == Sel_normal) 2836 if (selection_wait == Sel_normal)
2757 selection_wait = Sel_none; 2837 selection_wait = Sel_none;
2758} 2838}
2759 2839
2760void 2840void
2761rxvt_term::incr_cb (time_watcher &w) 2841rxvt_term::incr_cb (time_watcher &w) NOTHROW
2762{ 2842{
2763 selection_wait = Sel_none; 2843 selection_wait = Sel_none;
2764 2844
2765 incr_buf_size = 0; 2845 incr_buf_size = 0;
2766 free (incr_buf); 2846 free (incr_buf);
2767 2847
2768 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2769} 2849}
2770 2850
2771void 2851void
2772rxvt_term::selection_property (Window win, Atom prop) 2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2773{ 2853{
2774 if (prop == None || selection_wait != Sel_incr) 2854 if (prop == None || selection_wait != Sel_incr)
2775 return; 2855 return;
2776 2856
2777 selection_paste (win, prop, true); 2857 selection_paste (win, prop, true);
2786 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2787 * will auto fallback to CUT_BUFFER0 2867 * will auto fallback to CUT_BUFFER0
2788 * EXT: button 2 release 2868 * EXT: button 2 release
2789 */ 2869 */
2790void 2870void
2791rxvt_term::selection_request (Time tm, int x, int y) 2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2792{ 2872{
2793 if (x < 0 || x >= width || y < 0 || y >= height) 2873 if (selection.text && selnum == Sel_Primary)
2794 return; /* outside window */
2795
2796 if (selection.text)
2797 { /* internal selection */ 2874 { /* internal selection */
2798 char *str = rxvt_wcstombs (selection.text, selection.len); 2875 char *str = rxvt_wcstombs (selection.text, selection.len);
2799 paste (str, strlen (str)); 2876 paste (str, strlen (str));
2800 free (str); 2877 free (str);
2801 return; 2878 return;
2802 } 2879 }
2803 else 2880 else
2804 { 2881 {
2805 int i;
2806
2807 selection_request_time = tm; 2882 selection_request_time = tm;
2808 selection_wait = Sel_normal; 2883 selection_wait = Sel_normal;
2809 2884
2810 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2811 {
2812#if X_HAVE_UTF8_STRING 2885#if X_HAVE_UTF8_STRING
2813 selection_type = Sel_UTF8String; 2886 selection_type = Sel_UTF8String;
2814 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2887 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2815 return; 2888 return;
2816#else 2889#else
2817 selection_type = Sel_CompoundText; 2890 selection_type = Sel_CompoundText;
2818 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2891 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2819 return; 2892 return;
2820#endif 2893#endif
2821 }
2822 } 2894 }
2823 2895
2824 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2896 selection_wait = Sel_none; /* don't loop in selection_paste () */
2825 selection_paste (display->root, XA_CUT_BUFFER0, false); 2897 selection_paste (display->root, XA_CUT_BUFFER0, false);
2826} 2898}
2827 2899
2828int 2900int
2829rxvt_term::selection_request_other (Atom target, int selnum) 2901rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2830{ 2902{
2831 Atom sel; 2903 Atom sel;
2832 2904
2833 selection_type |= selnum; 2905 selection_type |= selnum;
2834 2906
2837 else if (selnum == Sel_Secondary) 2909 else if (selnum == Sel_Secondary)
2838 sel = XA_SECONDARY; 2910 sel = XA_SECONDARY;
2839 else 2911 else
2840 sel = xa[XA_CLIPBOARD]; 2912 sel = xa[XA_CLIPBOARD];
2841 2913
2842 if (XGetSelectionOwner (display->display, sel) != None) 2914 if (XGetSelectionOwner (dpy, sel) != None)
2843 { 2915 {
2844 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2916 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2845 vt, selection_request_time); 2917 vt, selection_request_time);
2846 return 1; 2918 return 1;
2847 } 2919 }
2848 2920
2849 return 0; 2921 return 0;
2853/* 2925/*
2854 * Clear all selected text 2926 * Clear all selected text
2855 * EXT: SelectionClear 2927 * EXT: SelectionClear
2856 */ 2928 */
2857void 2929void
2858rxvt_term::selection_clear () 2930rxvt_term::selection_clear () NOTHROW
2859{ 2931{
2860 want_refresh = 1; 2932 want_refresh = 1;
2861 free (selection.text); 2933 free (selection.text);
2862 selection.text = NULL; 2934 selection.text = NULL;
2863 selection.len = 0; 2935 selection.len = 0;
2912 2984
2913 int end_col; 2985 int end_col;
2914 2986
2915 for (; row <= selection.end.row; row++, col = 0) 2987 for (; row <= selection.end.row; row++, col = 0)
2916 { 2988 {
2917#if ENABLE_FRILLS 2989#if !ENABLE_MINIMAL
2918 if (selection.rect) 2990 if (selection.rect)
2919 { 2991 {
2920 col = selection.beg.col; 2992 col = selection.beg.col;
2921 end_col = ncol + 1; 2993 end_col = ncol + 1;
2922 } 2994 }
2925 end_col = ROW(row).l; 2997 end_col = ROW(row).l;
2926 2998
2927 col = max (col, 0); 2999 col = max (col, 0);
2928 3000
2929 if (row == selection.end.row 3001 if (row == selection.end.row
2930#if ENABLE_FRILLS 3002#if !ENABLE_MINIMAL
2931 || selection.rect 3003 || selection.rect
2932#endif 3004#endif
2933 ) 3005 )
2934 min_it (end_col, selection.end.col); 3006 min_it (end_col, selection.end.col);
2935 3007
2958#endif 3030#endif
2959 else 3031 else
2960 new_selection_text[ofs++] = *t++; 3032 new_selection_text[ofs++] = *t++;
2961 } 3033 }
2962 3034
2963#if ENABLE_FRILLS 3035#if !ENABLE_MINIMAL
2964 if (selection.rect) 3036 if (selection.rect)
2965 { 3037 {
2966 while (ofs 3038 while (ofs
2967 && new_selection_text[ofs - 1] != C0_LF 3039 && new_selection_text[ofs - 1] != C0_LF
2968 && unicode::is_space (new_selection_text[ofs - 1])) 3040 && unicode::is_space (new_selection_text[ofs - 1]))
2998 3070
2999 selection_grab (tm); 3071 selection_grab (tm);
3000} 3072}
3001 3073
3002bool 3074bool
3003rxvt_term::selection_grab (Time tm) 3075rxvt_term::selection_grab (Time tm) NOTHROW
3004{ 3076{
3005 selection_time = tm; 3077 selection_time = tm;
3006 3078
3007 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3079 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3008 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3080 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3009 { 3081 {
3010 display->set_selection_owner (this); 3082 display->set_selection_owner (this);
3011 return true; 3083 return true;
3012 } 3084 }
3013 else 3085 else
3086 {
3087 selection_clear ();
3014 return false; 3088 return false;
3089 }
3015 3090
3016#if 0 3091#if 0
3017 XTextProperty ct; 3092 XTextProperty ct;
3018 3093
3019 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3094 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3020 { 3095 {
3021 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3096 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3022 XFree (ct.value); 3097 XFree (ct.value);
3023 } 3098 }
3024#endif 3099#endif
3028/* 3103/*
3029 * Mark or select text based upon number of clicks: 1, 2, or 3 3104 * Mark or select text based upon number of clicks: 1, 2, or 3
3030 * EXT: button 1 press 3105 * EXT: button 1 press
3031 */ 3106 */
3032void 3107void
3033rxvt_term::selection_click (int clicks, int x, int y) 3108rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3034{ 3109{
3035 clicks = ((clicks - 1) % 3) + 1; 3110 clicks = ((clicks - 1) % 3) + 1;
3036 selection.clicks = clicks; /* save clicks so extend will work */ 3111 selection.clicks = clicks; /* save clicks so extend will work */
3037 3112
3113 if (clicks == 2 && !selection.rect
3114 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3115 {
3116 MEvent.clicks = 1; // what a mess
3117 selection.screen = current_screen;
3118 selection.op = SELECTION_CONT;
3119 return;
3120 }
3121
3038 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3122 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3039 3123
3040 if (clicks == 2 || clicks == 3) 3124 if (clicks == 2 || clicks == 3)
3041 selection_extend_colrow (selection.mark.col, 3125 selection_extend_colrow (selection.mark.col,
3042 selection.mark.row + view_start, 3126 selection.mark.row - view_start,
3043 0, /* button 3 */ 3127 0, /* button 3 */
3044 1, /* button press */ 3128 1, /* button press */
3045 0); /* click change */ 3129 0); /* click change */
3046} 3130}
3047 3131
3048/* ------------------------------------------------------------------------- */ 3132/* ------------------------------------------------------------------------- */
3049/* 3133/*
3050 * Mark a selection at the specified col/row 3134 * Mark a selection at the specified col/row
3051 */ 3135 */
3052void 3136void
3053rxvt_term::selection_start_colrow (int col, int row) 3137rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3054{ 3138{
3055 want_refresh = 1; 3139 want_refresh = 1;
3056 3140
3057 selection.mark.row = row - view_start; 3141 selection.mark.row = row + view_start;
3058 selection.mark.col = col; 3142 selection.mark.col = col;
3059 3143
3060 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3144 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3061 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3145 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3062 3146
3063 while (selection.mark.col > 0 3147 while (selection.mark.col > 0
3064 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3148 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3065 --selection.mark.col; 3149 --selection.mark.col;
3084#define DELIMIT_TEXT(x) \ 3168#define DELIMIT_TEXT(x) \
3085 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3169 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3086#define DELIMIT_REND(x) 1 3170#define DELIMIT_REND(x) 1
3087 3171
3088void 3172void
3089rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3173rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3090{ 3174{
3091 int col, row, dirnadd, tcol, trow, w1, w2; 3175 int col, row, dirnadd, tcol, trow, w1, w2;
3092 row_col_t bound; 3176 row_col_t bound;
3093 text_t *stp; 3177 text_t *stp;
3094 rend_t *srp; 3178 rend_t *srp;
3095 3179
3096 if (dirn == UP) 3180 if (dirn == UP)
3097 { 3181 {
3098 bound.row = - nsaved - 1; 3182 bound.row = top_row - 1;
3099 bound.col = 0; 3183 bound.col = 0;
3100 dirnadd = -1; 3184 dirnadd = -1;
3101 } 3185 }
3102 else 3186 else
3103 { 3187 {
3168 * flag == 0 ==> button 1 3252 * flag == 0 ==> button 1
3169 * flag == 1 ==> button 3 press 3253 * flag == 1 ==> button 3 press
3170 * flag == 2 ==> button 3 motion 3254 * flag == 2 ==> button 3 motion
3171 */ 3255 */
3172void 3256void
3173rxvt_term::selection_extend (int x, int y, int flag) 3257rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3174{ 3258{
3175 int col = clamp (Pixel2Col (x), 0, ncol); 3259 int col = clamp (Pixel2Col (x), 0, ncol);
3176 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3260 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3177 3261
3178 /* 3262 /*
3181 * select nothing. Otherwise, if we're to the right of the mark, you have to 3265 * select nothing. Otherwise, if we're to the right of the mark, you have to
3182 * be _past_ a character for it to be selected. 3266 * be _past_ a character for it to be selected.
3183 */ 3267 */
3184 if (((selection.clicks % 3) == 1) && !flag 3268 if (((selection.clicks % 3) == 1) && !flag
3185 && (col == selection.mark.col 3269 && (col == selection.mark.col
3186 && (row == selection.mark.row + view_start))) 3270 && (row == selection.mark.row - view_start)))
3187 { 3271 {
3188 /* select nothing */ 3272 /* select nothing */
3189 selection.beg.row = selection.end.row = 0; 3273 selection.beg.row = selection.end.row = 0;
3190 selection.beg.col = selection.end.col = 0; 3274 selection.beg.col = selection.end.col = 0;
3191 selection.clicks = 4; 3275 selection.clicks = 4;
3204/* ------------------------------------------------------------------------- */ 3288/* ------------------------------------------------------------------------- */
3205/* 3289/*
3206 * Extend the selection to the specified col/row 3290 * Extend the selection to the specified col/row
3207 */ 3291 */
3208void 3292void
3209rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3293rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3210{ 3294{
3211 row_col_t pos; 3295 row_col_t pos;
3212 enum { 3296 enum {
3213 LEFT, RIGHT 3297 LEFT, RIGHT
3214 } closeto = RIGHT; 3298 } closeto = RIGHT;
3246 selection.beg.col = selection.end.col = selection.mark.col; 3330 selection.beg.col = selection.end.col = selection.mark.col;
3247 selection.beg.row = selection.end.row = selection.mark.row; 3331 selection.beg.row = selection.end.row = selection.mark.row;
3248 } 3332 }
3249 3333
3250 pos.col = col; 3334 pos.col = col;
3251 pos.row = row - view_start; 3335 pos.row = view_start + row;
3252 3336
3253 /* 3337 /*
3254 * This is mainly xterm style selection with a couple of differences, mainly 3338 * This is mainly xterm style selection with a couple of differences, mainly
3255 * in the way button3 drag extension works. 3339 * in the way button3 drag extension works.
3256 * We're either doing: button1 drag; button3 press; or button3 drag 3340 * We're either doing: button1 drag; button3 press; or button3 drag
3317 3401
3318 if (selection.clicks == 1) 3402 if (selection.clicks == 1)
3319 { 3403 {
3320 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3404 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3321 && !ROW(selection.beg.row).is_longer () 3405 && !ROW(selection.beg.row).is_longer ()
3322#if ENABLE_FRILLS 3406#if !ENABLE_MINIMAL
3323 && !selection.rect 3407 && !selection.rect
3324#endif 3408#endif
3325 ) 3409 )
3326 selection.beg.col = ncol; 3410 selection.beg.col = ncol;
3327 3411
3328 if ( 3412 if (
3329 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3413 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3330 && !ROW(selection.end.row).is_longer () 3414 && !ROW(selection.end.row).is_longer ()
3331#if ENABLE_FRILLS 3415#if !ENABLE_MINIMAL
3332 && !selection.rect 3416 && !selection.rect
3333#endif 3417#endif
3334 ) 3418 )
3335 selection.end.col = ncol; 3419 selection.end.col = ncol;
3336 } 3420 }
3337 else if (selection.clicks == 2) 3421 else if (selection.clicks == 2)
3338 { 3422 {
3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3423 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3340 selection.end.col--; 3424 selection.end.col--;
3341 3425
3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3343 {
3344 selection_delimit_word (UP, &selection.beg, &selection.beg); 3426 selection_delimit_word (UP, &selection.beg, &selection.beg);
3345 selection_delimit_word (DN, &selection.end, &selection.end); 3427 selection_delimit_word (DN, &selection.end, &selection.end);
3346 }
3347 } 3428 }
3348 else if (selection.clicks == 3) 3429 else if (selection.clicks == 3)
3349 { 3430 {
3350#if ENABLE_FRILLS 3431#if ENABLE_FRILLS
3351 if (OPTION (Opt_tripleclickwords)) 3432 if (option (Opt_tripleclickwords))
3352 { 3433 {
3353 selection_delimit_word (UP, &selection.beg, &selection.beg); 3434 selection_delimit_word (UP, &selection.beg, &selection.beg);
3354 3435
3355 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3436 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3356 { 3437 {
3357 if (!ROW(end_row).is_longer ()) 3438 if (!ROW(end_row).is_longer ())
3358 { 3439 {
3359 selection.end.row = end_row; 3440 selection.end.row = end_row;
3360 selection.end.col = ROW(end_row).l; 3441 selection.end.col = ROW(end_row).l;
3442# if !ENABLE_MINIMAL
3361 selection_remove_trailing_spaces (); 3443 selection_remove_trailing_spaces ();
3444# endif
3362 break; 3445 break;
3363 } 3446 }
3364 } 3447 }
3365 } 3448 }
3366 else 3449 else
3395 selection.mark.row = selection.beg.row; 3478 selection.mark.row = selection.beg.row;
3396 selection.mark.col = selection.beg.col; 3479 selection.mark.col = selection.beg.col;
3397 } 3480 }
3398 } 3481 }
3399 3482
3400#if ENABLE_FRILLS 3483#if !ENABLE_MINIMAL
3401 if (selection.rect && selection.beg.col > selection.end.col) 3484 if (selection.rect && selection.beg.col > selection.end.col)
3402 ::swap (selection.beg.col, selection.end.col); 3485 ::swap (selection.beg.col, selection.end.col);
3403#endif 3486#endif
3404} 3487}
3405 3488
3406#if ENABLE_FRILLS 3489#if !ENABLE_MINIMAL
3407void 3490void
3408rxvt_term::selection_remove_trailing_spaces () 3491rxvt_term::selection_remove_trailing_spaces () NOTHROW
3409{ 3492{
3410 int32_t end_col, end_row; 3493 int32_t end_col, end_row;
3411 text_t *stp; 3494 text_t *stp;
3412 3495
3413 end_col = selection.end.col; 3496 end_col = selection.end.col;
3451/* 3534/*
3452 * Double click on button 3 when already selected 3535 * Double click on button 3 when already selected
3453 * EXT: button 3 double click 3536 * EXT: button 3 double click
3454 */ 3537 */
3455void 3538void
3456rxvt_term::selection_rotate (int x, int y) 3539rxvt_term::selection_rotate (int x, int y) NOTHROW
3457{ 3540{
3458 selection.clicks = selection.clicks % 3 + 1; 3541 selection.clicks = selection.clicks % 3 + 1;
3459 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3542 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3460} 3543}
3461 3544
3463/* 3546/*
3464 * Respond to a request for our current selection 3547 * Respond to a request for our current selection
3465 * EXT: SelectionRequest 3548 * EXT: SelectionRequest
3466 */ 3549 */
3467void 3550void
3468rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3551rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3469{ 3552{
3470 XSelectionEvent ev; 3553 XSelectionEvent ev;
3471 dDisp;
3472 3554
3473 ev.type = SelectionNotify; 3555 ev.type = SelectionNotify;
3474 ev.property = None; 3556 ev.property = None;
3475 ev.display = rq.display; 3557 ev.display = rq.display;
3476 ev.requestor = rq.requestor; 3558 ev.requestor = rq.requestor;
3490 *target++ = xa[XA_COMPOUND_TEXT]; 3572 *target++ = xa[XA_COMPOUND_TEXT];
3491#if X_HAVE_UTF8_STRING 3573#if X_HAVE_UTF8_STRING
3492 *target++ = xa[XA_UTF8_STRING]; 3574 *target++ = xa[XA_UTF8_STRING];
3493#endif 3575#endif
3494 3576
3495 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3577 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3496 32, PropModeReplace, 3578 32, PropModeReplace,
3497 (unsigned char *)target_list, target - target_list); 3579 (unsigned char *)target_list, target - target_list);
3498 ev.property = rq.property; 3580 ev.property = rq.property;
3499 } 3581 }
3500#if TODO // TODO 3582#if TODO // TODO
3503 /* TODO: Handle MULTIPLE */ 3585 /* TODO: Handle MULTIPLE */
3504 } 3586 }
3505#endif 3587#endif
3506 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3588 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3507 { 3589 {
3508 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3590 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3509 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3591 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3510 ev.property = rq.property; 3592 ev.property = rq.property;
3511 } 3593 }
3512 else if (rq.target == XA_STRING 3594 else if (rq.target == XA_STRING
3513 || rq.target == xa[XA_TEXT] 3595 || rq.target == xa[XA_TEXT]
3537 style = enc_string; 3619 style = enc_string;
3538 else if (target == xa[XA_TEXT]) 3620 else if (target == xa[XA_TEXT])
3539 style = enc_text; 3621 style = enc_text;
3540 else if (target == xa[XA_COMPOUND_TEXT]) 3622 else if (target == xa[XA_COMPOUND_TEXT])
3541 style = enc_compound_text; 3623 style = enc_compound_text;
3542#if ENABLE_FRILLS 3624#if !ENABLE_MINIMAL
3543 else if (target == xa[XA_UTF8_STRING]) 3625 else if (target == xa[XA_UTF8_STRING])
3544 style = enc_utf8; 3626 style = enc_utf8;
3545#endif 3627#endif
3546 else 3628 else
3547 { 3629 {
3558 { 3640 {
3559 cl = L""; 3641 cl = L"";
3560 selectlen = 0; 3642 selectlen = 0;
3561 } 3643 }
3562 3644
3563#if ENABLE_FRILLS 3645#if !ENABLE_MINIMAL
3564 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3646 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3565 // so recode it manually 3647 // so recode it manually
3566 if (style == enc_utf8) 3648 if (style == enc_utf8)
3567 { 3649 {
3568 freect = 1; 3650 freect = 1;
3571 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3653 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3572 ct.nitems = strlen ((char *)ct.value); 3654 ct.nitems = strlen ((char *)ct.value);
3573 } 3655 }
3574 else 3656 else
3575#endif 3657#endif
3576 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3658 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3577 freect = 1; 3659 freect = 1;
3578 else 3660 else
3579 { 3661 {
3580 /* if we failed to convert then send it raw */ 3662 /* if we failed to convert then send it raw */
3581 ct.value = (unsigned char *)cl; 3663 ct.value = (unsigned char *)cl;
3582 ct.nitems = selectlen; 3664 ct.nitems = selectlen;
3583 ct.encoding = target; 3665 ct.encoding = target;
3584 } 3666 }
3585 3667
3586 XChangeProperty (disp, rq.requestor, rq.property, 3668 XChangeProperty (dpy, rq.requestor, rq.property,
3587 ct.encoding, 8, PropModeReplace, 3669 ct.encoding, 8, PropModeReplace,
3588 ct.value, (int)ct.nitems); 3670 ct.value, (int)ct.nitems);
3589 ev.property = rq.property; 3671 ev.property = rq.property;
3590 3672
3591 if (freect) 3673 if (freect)
3592 XFree (ct.value); 3674 XFree (ct.value);
3593 } 3675 }
3594 3676
3595 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3677 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3596} 3678}
3597 3679
3598/* ------------------------------------------------------------------------- * 3680/* ------------------------------------------------------------------------- *
3599 * MOUSE ROUTINES * 3681 * MOUSE ROUTINES *
3600 * ------------------------------------------------------------------------- */ 3682 * ------------------------------------------------------------------------- */
3601 3683
3602/* 3684/*
3603 * return col/row values corresponding to x/y pixel values 3685 * return col/row values corresponding to x/y pixel values
3604 */ 3686 */
3605void 3687void
3606rxvt_term::pixel_position (int *x, int *y) 3688rxvt_term::pixel_position (int *x, int *y) NOTHROW
3607{ 3689{
3608 *x = Pixel2Col (*x); 3690 *x = Pixel2Col (*x);
3609 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3691 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3610 *y = Pixel2Row (*y); 3692 *y = Pixel2Row (*y);
3611 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3693 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3612} 3694}
3613 3695
3614/* ------------------------------------------------------------------------- */ 3696/* ------------------------------------------------------------------------- */
3615#ifdef USE_XIM 3697#ifdef USE_XIM
3616void 3698void
3617rxvt_term::im_set_position (XPoint &pos) 3699rxvt_term::im_set_position (XPoint &pos) NOTHROW
3618{ 3700{
3619 XWindowAttributes xwa; 3701 XWindowAttributes xwa;
3620 3702
3621 XGetWindowAttributes (display->display, vt, &xwa); 3703 XGetWindowAttributes (dpy, vt, &xwa);
3622 3704
3623 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3705 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3624 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3706 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3625} 3707}
3626#endif 3708#endif
3627 3709
3628#if ENABLE_OVERLAY 3710#if ENABLE_OVERLAY
3629void 3711void
3630rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3712rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3631{ 3713{
3632 if (nrow < 1 || ncol < 1) 3714 if (nrow < 1 || ncol < 1)
3633 return; 3715 return;
3634 3716
3635 want_refresh = 1; 3717 want_refresh = 1;
3680 *rp = r; 3762 *rp = r;
3681 } 3763 }
3682} 3764}
3683 3765
3684void 3766void
3685rxvt_term::scr_overlay_off () 3767rxvt_term::scr_overlay_off () NOTHROW
3686{ 3768{
3687 if (!ov_text) 3769 if (!ov_text)
3688 return; 3770 return;
3689 3771
3690 want_refresh = 1; 3772 want_refresh = 1;
3698 delete [] ov_text; ov_text = 0; 3780 delete [] ov_text; ov_text = 0;
3699 delete [] ov_rend; ov_rend = 0; 3781 delete [] ov_rend; ov_rend = 0;
3700} 3782}
3701 3783
3702void 3784void
3703rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3785rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3704{ 3786{
3705 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3787 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3706 return; 3788 return;
3707 3789
3708 x++, y++; 3790 x++, y++;
3710 ov_text[y][x] = text; 3792 ov_text[y][x] = text;
3711 ov_rend[y][x] = rend; 3793 ov_rend[y][x] = rend;
3712} 3794}
3713 3795
3714void 3796void
3715rxvt_term::scr_overlay_set (int x, int y, const char *s) 3797rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3716{ 3798{
3717 while (*s) 3799 while (*s)
3718 scr_overlay_set (x++, y, *s++); 3800 scr_overlay_set (x++, y, *s++);
3719} 3801}
3720 3802
3721void 3803void
3722rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3804rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3723{ 3805{
3724 while (*s) 3806 while (*s)
3725 { 3807 {
3726 text_t t = *s++; 3808 text_t t = *s++;
3727 int width = wcwidth (t); 3809 int width = WCWIDTH (t);
3728 3810
3729 while (width--) 3811 while (width--)
3730 { 3812 {
3731 scr_overlay_set (x++, y, t); 3813 scr_overlay_set (x++, y, t);
3732 t = NOCHAR; 3814 t = NOCHAR;
3733 } 3815 }
3734 } 3816 }
3735} 3817}
3736 3818
3737void 3819void
3738rxvt_term::scr_swap_overlay () 3820rxvt_term::scr_swap_overlay () NOTHROW
3739{ 3821{
3740 if (!ov_text) 3822 if (!ov_text)
3741 return; 3823 return;
3742 3824
3743 // swap screen mem with overlay 3825 // swap screen mem with overlay
3744 for (int y = ov_h; y--; ) 3826 for (int y = ov_h; y--; )
3745 { 3827 {
3746 text_t *t1 = ov_text[y]; 3828 text_t *t1 = ov_text[y];
3747 rend_t *r1 = ov_rend[y]; 3829 rend_t *r1 = ov_rend[y];
3748 3830
3749 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3831 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3750 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3832 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3751 3833
3752 for (int x = ov_w; x--; ) 3834 for (int x = ov_w; x--; )
3753 { 3835 {
3754 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3836 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3755 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3837 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines