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.215 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.270 by root, Tue Jun 26 00:40:19 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 scr_blank_screen_mem (ROW(row2 - i), rstyle);
647
648 if (OPTION (Opt_scrollWithBuffer) 689 if (option (Opt_scrollWithBuffer)
649 && view_start != 0 690 && view_start != 0
650 && view_start != saveLines) 691 && view_start != -saveLines)
651 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));
652 } 696 }
653 else 697 else
654 { 698 {
655 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen)
656 { 700 {
… …
680 724
681 int rows = row2 - row1 + 1; 725 int rows = row2 - row1 + 1;
682 726
683 min_it (count, rows); 727 min_it (count, rows);
684 728
729 line_t *temp_buf = row_buf + total_rows;
730
685 for (int row = 0; row < rows; row++) 731 for (int row = 0; row < rows; row++)
686 { 732 {
687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688 734
689 if (!IN_RANGE_EXC (row + count, 0, rows)) 735 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
700/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
701/* 747/*
702 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
703 */ 749 */
704void 750void
705rxvt_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
706{ 752{
707 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
708 return; 754 return;
709 755
710 unsigned char checksel; 756 unsigned char checksel;
… …
716 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
717 763
718 if (minlines > 0) 764 if (minlines > 0)
719 { 765 {
720 minlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
721 768
722 if (minlines > 0 769 if (minlines > 0
723 && screen.tscroll == 0 770 && screen.tscroll == 0
724 && screen.bscroll == nrow - 1) 771 && screen.bscroll == nrow - 1)
725 { 772 {
… …
730 } 777 }
731 778
732#ifdef DEBUG_STRICT 779#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 780 assert (screen.cur.col < ncol);
734 assert (screen.cur.row < nrow 781 assert (screen.cur.row < nrow
735 && screen.cur.row >= -nsaved); 782 && screen.cur.row >= top_row);
736#endif 783#endif
737 int row = screen.cur.row; 784 int row = screen.cur.row;
738 785
739 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 786 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
740 787
… …
786 CLEAR_SELECTION (); 833 CLEAR_SELECTION ();
787 } 834 }
788 835
789 if (screen.flags & Screen_WrapNext) 836 if (screen.flags & Screen_WrapNext)
790 { 837 {
791 max_it (line->l, ncol);
792 line->is_longer (1);
793
794 scr_do_wrap (); 838 scr_do_wrap ();
795 839
840 line->l = ncol;
841 line->is_longer (1);
842
796 row = screen.cur.row; 843 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 844 line = &ROW(row); /* _must_ refresh */
798 } 845 }
799 846
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
801 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802 c = 0xfffd; 849 c = 0xfffd;
803 850
804 // 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
805 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
806 // 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
807 // locale. 854 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
809 856
810 if (charsets [screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 858 {
812 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 860 // 5f-7e standard vt100
… …
964/* 1011/*
965 * 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
966 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
967 */ 1014 */
968void 1015void
969rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
970{ 1017{
971 want_refresh = 1; 1018 want_refresh = 1;
972 1019
973 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
974 { 1021 {
… …
992 * Process Horizontal Tab 1039 * Process Horizontal Tab
993 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
994 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
995 */ 1042 */
996void 1043void
997rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
998{ 1045{
999 int i, x; 1046 int i, x;
1000 1047
1001 want_refresh = 1; 1048 want_refresh = 1;
1002 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
… …
1024 if (count) 1071 if (count)
1025 x = ncol - 1; 1072 x = ncol - 1;
1026 1073
1027 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1028 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && option (Opt_pastableTabs))
1030 { 1077 {
1031 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1032 1079
1033 l.touch (x); 1080 l.touch (x);
1034 1081
… …
1067 * Process DEC Back Index 1114 * Process DEC Back Index
1068 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1069 * 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
1070 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1071 */ 1118 */
1072#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1073void 1120void
1074rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1075{ 1122{
1076 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1125 else
1079 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
1084 * Process DEC Forward Index 1131 * Process DEC Forward Index
1085 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1086 * 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
1087 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1088 */ 1135 */
1089#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1090void 1137void
1091rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1092{ 1139{
1093 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1095 else 1142 else
1096 { 1143 {
… …
1109/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1110/* 1157/*
1111 * Goto Row/Column 1158 * Goto Row/Column
1112 */ 1159 */
1113void 1160void
1114rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115{ 1162{
1116 want_refresh = 1; 1163 want_refresh = 1;
1117 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1118 1165
1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1157/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1158/* 1205/*
1159 * direction should be UP or DN 1206 * direction should be UP or DN
1160 */ 1207 */
1161void 1208void
1162rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163{ 1210{
1164 int dirn; 1211 int dirn;
1165 1212
1166 want_refresh = 1; 1213 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1189 */ 1236 */
1190void 1237void
1191rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1239{
1193 unsigned int col, num; 1240 unsigned int col, num;
1194 1241
1195 want_refresh = 1; 1242 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
… …
1240 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1241 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1242 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1243 */ 1290 */
1244void 1291void
1245rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1246{ 1293{
1247 int num; 1294 int num;
1248 int32_t row; 1295 int32_t row;
1249 rend_t ren; 1296 rend_t ren;
1250 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
1295 } 1342 }
1296 else 1343 else
1297 { 1344 {
1298 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1301 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1302 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1304 } 1351 }
1305 1352
1306 for (; num--; row++) 1353 for (; num--; row++)
1307 { 1354 {
1308 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1309 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1310 } 1357 }
1311} 1358}
1312 1359
1313#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1314void 1361void
1315rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1316{ 1363{
1317 want_refresh = 1; 1364 want_refresh = 1;
1318 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1319 1366
1320 nsaved = 0; 1367 top_row = 0;
1321} 1368}
1322#endif 1369#endif
1323 1370
1324/* ------------------------------------------------------------------------- */ 1371/* ------------------------------------------------------------------------- */
1325/* 1372/*
1326 * Fill the screen with `E's 1373 * Fill the screen with `E's
1327 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1328 */ 1375 */
1329void 1376void
1330rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1331{ 1378{
1332 rend_t fs; 1379 rend_t fs;
1333 1380
1334 want_refresh = 1; 1381 want_refresh = 1;
1335 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1356/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1357/* 1404/*
1358 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1359 */ 1406 */
1360void 1407void
1361rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1362{ 1409{
1363 int end; 1410 int end;
1364 1411
1365 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1366 1413
… …
1386/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1387/* 1434/*
1388 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1389 */ 1436 */
1390void 1437void
1391rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1392{ 1439{
1393 int col, row; 1440 int col, row;
1394 rend_t tr; 1441 rend_t tr;
1395 1442
1396 want_refresh = 1; 1443 want_refresh = 1;
… …
1484/* 1531/*
1485 * Set the scrolling region 1532 * Set the scrolling region
1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1487 */ 1534 */
1488void 1535void
1489rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1490{ 1537{
1491 max_it (top, 0); 1538 max_it (top, 0);
1492 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1493 1540
1494 if (top > bot) 1541 if (top > bot)
… …
1504 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1505 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1506 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1507 */ 1554 */
1508void 1555void
1509rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1510{ 1557{
1511 want_refresh = 1; 1558 want_refresh = 1;
1512 1559
1513 if (mode) 1560 if (mode)
1514 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1521 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1522 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1523 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1524 */ 1571 */
1525void 1572void
1526rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1527{ 1574{
1528 if (mode) 1575 if (mode)
1529 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1530 else 1577 else
1531 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1540 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1541 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1542 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1543 */ 1590 */
1544void 1591void
1545rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1546{ 1593{
1547 if (mode) 1594 if (mode)
1548 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1549 else 1596 else
1550 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1557 * Set insert/replace mode 1604 * Set insert/replace mode
1558 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1559 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1560 */ 1607 */
1561void 1608void
1562rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1563{ 1610{
1564 if (mode) 1611 if (mode)
1565 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1566 else 1613 else
1567 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1573 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1574 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1575 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1576 */ 1623 */
1577void 1624void
1578rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1579{ 1626{
1580 if (mode < 0) 1627 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1582 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1583 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
… …
1588 * Set reverse/normal video 1635 * Set reverse/normal video
1589 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1590 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1591 */ 1638 */
1592void 1639void
1593rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1594{ 1641{
1595 XGCValues gcvalue; 1642 rvideo_mode = on;
1596 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1597 if (rvideo != mode) 1648 if (rvideo_state != on)
1598 { 1649 {
1599 rvideo = mode; 1650 rvideo_state = on;
1651
1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1601#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1602 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1603#endif 1655#endif
1604#if TRANSPARENT 1656#if ENABLE_TRANSPARENCY
1605 if (! OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!option (Opt_transparent) || am_transparent == 0)
1606#endif 1658#endif
1607 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1608 pix_colors[Color_bg]);
1609 1660
1661 XGCValues gcvalue;
1610 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1611 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1612 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1613 &gcvalue); 1665
1614 scr_clear (); 1666 scr_clear ();
1615 scr_touch (true); 1667 scr_touch (true);
1616 } 1668 }
1617} 1669}
1618 1670
… …
1620/* 1672/*
1621 * Report current cursor position 1673 * Report current cursor position
1622 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1623 */ 1675 */
1624void 1676void
1625rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1626{ 1678{
1627 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);
1628} 1680}
1629 1681
1630/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1633 1685
1634/* 1686/*
1635 * Set font style 1687 * Set font style
1636 */ 1688 */
1637void 1689void
1638rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1639{ 1691{
1640#if 0 1692#if 0
1641 switch (charsets [screen.charset]) 1693 switch (charsets [screen.charset])
1642 { 1694 {
1643 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
… …
1665 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1666 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1667 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1668 */ 1720 */
1669void 1721void
1670rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1671{ 1723{
1672 screen.charset = set; 1724 screen.charset = set;
1673 set_font_style (); 1725 set_font_style ();
1674} 1726}
1675 1727
… …
1681 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1682 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1683 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1684 */ 1736 */
1685void 1737void
1686rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1687{ 1739{
1688 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1689 set_font_style (); 1741 set_font_style ();
1690} 1742}
1691 1743
… …
1696 1748
1697/* 1749/*
1698 * refresh matching text. 1750 * refresh matching text.
1699 */ 1751 */
1700bool 1752bool
1701rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1702{ 1754{
1703 bool found = false; 1755 bool found = false;
1704 1756
1705 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1706 { 1758 {
1707 int col = 0;
1708 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1709 1760
1710 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1711 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1712 { 1763 {
1713 found = true; 1764 found = true;
1714 *drp = ~value; 1765 *drp = ~value;
1715 } 1766 }
… …
1726 PART_END, 1777 PART_END,
1727 RC_COUNT 1778 RC_COUNT
1728}; 1779};
1729 1780
1730void 1781void
1731rxvt_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
1732{ 1783{
1733 int i; 1784 int i;
1734 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1735 1786
1736 if (!drawn_buf) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
… …
1759 } 1810 }
1760 1811
1761 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++)
1762 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);
1763 1814
1815 num_scr_allow = 0;
1816
1764 if (refresh) 1817 if (refresh)
1765 scr_refresh (SLOW_REFRESH); 1818 scr_refresh ();
1766} 1819}
1767 1820
1768/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1769/* 1822/*
1770 * Refresh the entire screen 1823 * Refresh the entire screen
1771 */ 1824 */
1772void 1825void
1773rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1774{ 1827{
1775 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1776} 1829}
1777 1830
1778/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1779/* 1832/*
1780 * 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
1781 * the top of the screen 1834 * the top of the screen
1782 */ 1835 */
1783int 1836void
1784rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1785{ 1838{
1786 long p = 0; 1839 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1787 unsigned int oldviewstart;
1788
1789 oldviewstart = view_start;
1790
1791 if (y < len)
1792 {
1793 p = (nrow + nsaved) * (len - y) / len;
1794 p -= (long) (nrow - 1);
1795 p = max (p, 0);
1796 }
1797
1798 view_start = (unsigned int)min (p, nsaved);
1799
1800 return scr_changeview (oldviewstart);
1801} 1840}
1802 1841
1803/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1804/* 1843/*
1805 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1806 * direction should be UP or DN 1845 * direction should be UP or DN
1807 */ 1846 */
1808int 1847bool
1809rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1810{ 1849{
1811 int n; 1850 int new_view_start =
1812 unsigned int oldviewstart;
1813
1814 oldviewstart = view_start;
1815
1816 if (direction == UP)
1817 {
1818 n = view_start + nlines;
1819 view_start = min (n, nsaved);
1820 }
1821 else
1822 {
1823 n = view_start - nlines; 1851 direction == UP ? view_start - nlines
1824 view_start = max (n, 0); 1852 : view_start + nlines;
1825 }
1826 1853
1827 return scr_changeview (oldviewstart); 1854 return scr_changeview (new_view_start);
1828} 1855}
1829 1856
1830int 1857bool
1831rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1832{ 1859{
1860 clamp_it (new_view_start, top_row, 0);
1861
1833 if (view_start != oldviewstart) 1862 if (new_view_start == view_start)
1834 { 1863 return false;
1864
1865 num_scr += new_view_start - view_start;
1866 view_start = new_view_start;
1867 want_refresh = 1;
1868
1835 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));
1836 1870
1837 want_refresh = 1; 1871 return true;
1838 num_scr -= (view_start - oldviewstart);
1839 }
1840
1841 return (int)view_start - (int)oldviewstart;
1842} 1872}
1843 1873
1844/* ------------------------------------------------------------------------- */ 1874#ifndef NO_BELL
1845void 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
1846rxvt_term::scr_bell () 1885rxvt_term::scr_bell () NOTHROW
1847{ 1886{
1848#ifndef NO_BELL 1887#ifndef NO_BELL
1849 1888
1850# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1851# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1852 if (OPTION (Opt_mapAlert)) 1891 if (option (Opt_mapAlert))
1853# endif 1892# endif
1854 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1855# endif 1894# endif
1895# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell))
1897 {
1898 XWMHints *h;
1856 1899
1857 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 }
1858 { 1906 }
1859 scr_rvideo_mode (!rvideo); /* refresh also done */ 1907# endif
1860 rxvt_usleep (VISUAL_BELL_DURATION); 1908
1861 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);
1862 } 1916 }
1863 else 1917 else
1864 XBell (display->display, 0); 1918 XBell (dpy, 0);
1865 1919
1866#endif 1920#endif
1867} 1921}
1868 1922
1869/* ------------------------------------------------------------------------- */ 1923/* ------------------------------------------------------------------------- */
1870/* ARGSUSED */ 1924/* ARGSUSED */
1871void 1925void
1872rxvt_term::scr_printscreen (int fullhist) 1926rxvt_term::scr_printscreen (int fullhist) NOTHROW
1873{ 1927{
1874#ifdef PRINTPIPE 1928#ifdef PRINTPIPE
1875 int nrows, row_start; 1929 int nrows, row_start;
1876 FILE *fd; 1930 FILE *fd;
1877 1931
1878 if ((fd = popen_printer ()) == NULL) 1932 if ((fd = popen_printer ()) == NULL)
1879 return; 1933 return;
1880 1934
1881 if (fullhist) 1935 if (fullhist)
1882 { 1936 {
1883 nrows = nrow + nsaved; 1937 nrows = nrow - top_row;
1884 row_start = -nsaved; 1938 row_start = top_row;
1885 } 1939 }
1886 else 1940 else
1887 { 1941 {
1888 nrows = nrow; 1942 nrows = nrow;
1889 row_start = -view_start; 1943 row_start = view_start;
1890 } 1944 }
1891 1945
1892 wctomb (0, 0); 1946 wctomb (0, 0);
1893 1947
1894 for (int r1 = 0; r1 < nrows; r1++) 1948 for (int r1 = 0; r1 < nrows; r1++)
… …
1926 * Refresh the screen 1980 * Refresh the screen
1927 * drawn_text/drawn_rend contain the screen information before the update. 1981 * drawn_text/drawn_rend contain the screen information before the update.
1928 * screen.text/screen.rend contain what the screen will change to. 1982 * screen.text/screen.rend contain what the screen will change to.
1929 */ 1983 */
1930void 1984void
1931rxvt_term::scr_refresh (unsigned char refresh_type) 1985rxvt_term::scr_refresh () NOTHROW
1932{ 1986{
1933 unsigned char must_clear, /* use draw_string not draw_image_string */ 1987 unsigned char have_bg,
1934 showcursor; /* show the cursor */ 1988 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 1989 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 1990 ocrow; /* old cursor row */
1937 int i; /* tmp */ 1991 int i; /* tmp */
1938#ifndef NO_CURSORCOLOR 1992#ifndef NO_CURSORCOLOR
1939 rend_t cc1; /* store colours at cursor position (s) */ 1993 rend_t cc1; /* store colours at cursor position (s) */
1940#endif 1994#endif
1941 rend_t *crp; // cursor rendition pointer 1995 rend_t *crp; // cursor rendition pointer
1996 rend_t ccol1, /* Cursor colour */
1997 ccol2; /* Cursor colour2 */
1942 1998
1943 want_refresh = 0; /* screen is current */ 1999 want_refresh = 0; /* screen is current */
1944 2000
1945 if (refresh_type == NO_REFRESH || !mapped) 2001 if (refresh_type == NO_REFRESH || !mapped)
1946 return; 2002 return;
1947 2003
1948 /* 2004 /*
1949 * A: set up vars 2005 * A: set up vars
1950 */ 2006 */
1951 must_clear = 0; 2007 have_bg = 0;
1952 refresh_count = 0; 2008 refresh_count = 0;
1953 2009
1954#if XPM_BACKGROUND 2010#if XPM_BACKGROUND
1955 must_clear |= bgPixmap.pixmap != None; 2011 have_bg |= bgPixmap.pixmap != None;
1956#endif 2012#endif
1957#if TRANSPARENT 2013#if ENABLE_TRANSPARENCY
1958 must_clear |= OPTION (Opt_transparent) && am_transparent; 2014 have_bg |= option (Opt_transparent) && am_transparent;
1959#endif 2015#endif
1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1961 2017
1962 /* 2018 /*
1963 * B: reverse any characters which are selected 2019 * B: reverse any characters which are selected
… …
1967 /* 2023 /*
1968 * C: set the cursor character (s) 2024 * C: set the cursor character (s)
1969 */ 2025 */
1970 { 2026 {
1971 unsigned char setoldcursor; 2027 unsigned char setoldcursor;
1972 rend_t ccol1, /* Cursor colour */
1973 ccol2; /* Cursor colour2 */
1974 2028
1975 showcursor = (screen.flags & Screen_VisibleCursor); 2029 showcursor = (screen.flags & Screen_VisibleCursor);
1976#ifdef CURSOR_BLINK 2030#ifdef CURSOR_BLINK
1977 if (hidden_cursor) 2031 if (hidden_cursor)
1978 showcursor = 0; 2032 showcursor = 0;
… …
1985 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2039 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1986 col--; 2040 col--;
1987 2041
1988 crp = &ROW(screen.cur.row).r[col]; 2042 crp = &ROW(screen.cur.row).r[col];
1989 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
1990 if (showcursor && focus) 2067 if (showcursor && focus)
1991 { 2068 {
1992 if (OPTION (Opt_cursorUnderline)) 2069 if (option (Opt_cursorUnderline))
1993 *crp ^= RS_Uline; 2070 *crp ^= RS_Uline;
1994 else 2071 else
1995 { 2072 {
1996 *crp ^= RS_RVid; 2073 *crp ^= RS_RVid;
1997
1998#ifndef NO_CURSORCOLOR
1999 cc1 = *crp & (RS_fgMask | RS_bgMask);
2000 if (ISSET_PIXCOLOR (Color_cursor))
2001 ccol1 = Color_cursor;
2002 else
2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2004 ccol1 = fgcolor_of (rstyle);
2005#else
2006 ccol1 = Color_fg;
2007#endif
2008 if (ISSET_PIXCOLOR (Color_cursor2))
2009 ccol2 = Color_cursor2;
2010 else
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol2 = bgcolor_of (rstyle);
2013#else
2014 ccol2 = Color_bg;
2015#endif
2016 *crp = SET_FGCOLOR (*crp, ccol1); 2074 *crp = SET_FGCOLOR (*crp, ccol1);
2017 *crp = SET_BGCOLOR (*crp, ccol2); 2075 *crp = SET_BGCOLOR (*crp, ccol2);
2018#endif
2019 } 2076 }
2020 } 2077 }
2021 } 2078 }
2022 2079
2023 /* make sure no outline cursor is left around */ 2080 /* make sure no outline cursor is left around */
2024 setoldcursor = 0; 2081 setoldcursor = 0;
2025 if (ocrow != -1) 2082 if (ocrow != -1)
2026 { 2083 {
2027 if (screen.cur.row + view_start != ocrow 2084 if (screen.cur.row - view_start != ocrow
2028 || screen.cur.col != oldcursor.col) 2085 || screen.cur.col != oldcursor.col)
2029 { 2086 {
2030 if (ocrow < nrow 2087 if (ocrow < nrow
2031 && oldcursor.col < ncol) 2088 && oldcursor.col < ncol)
2032 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2089 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2040 else if (!focus) 2097 else if (!focus)
2041 setoldcursor = 1; 2098 setoldcursor = 1;
2042 2099
2043 if (setoldcursor) 2100 if (setoldcursor)
2044 { 2101 {
2045 if (screen.cur.row + view_start >= nrow) 2102 if (screen.cur.row - view_start >= nrow)
2046 oldcursor.row = -1; 2103 oldcursor.row = -1;
2047 else 2104 else
2048 { 2105 {
2049 oldcursor.row = screen.cur.row + view_start; 2106 oldcursor.row = screen.cur.row - view_start;
2050 oldcursor.col = screen.cur.col; 2107 oldcursor.col = screen.cur.col;
2051 } 2108 }
2052 } 2109 }
2053 } 2110 }
2054 2111
… …
2060#ifndef NO_SLOW_LINK_SUPPORT 2117#ifndef NO_SLOW_LINK_SUPPORT
2061 /* 2118 /*
2062 * D: CopyArea pass - very useful for slower links 2119 * D: CopyArea pass - very useful for slower links
2063 * This has been deliberately kept simple. 2120 * This has been deliberately kept simple.
2064 */ 2121 */
2065 i = num_scr;
2066 if (!display->is_local 2122 if (!display->is_local
2067 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2123 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2068 && abs (num_scr) < nrow && !must_clear) 2124 && abs (num_scr) < nrow && !have_bg)
2069 { 2125 {
2070 int16_t nits; 2126 int16_t nits;
2127 int i = num_scr;
2071 int j; 2128 int j;
2072 int len, wlen; 2129 int len, wlen;
2130 dLocal (int, num_scr);
2073 2131
2074 j = nrow; 2132 j = nrow;
2075 wlen = len = -1; 2133 wlen = len = -1;
2076 row = i > 0 ? 0 : j - 1; 2134 row = i > 0 ? 0 : j - 1;
2135
2077 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2136 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2078 { 2137 {
2079 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2138 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2080 { 2139 {
2081 line_t s = ROW(row - view_start); 2140 line_t s = ROW(view_start + row);
2082 line_t d = drawn_buf[row]; 2141 line_t d = drawn_buf[row];
2083 line_t d2 = drawn_buf[row + i]; 2142 line_t d2 = drawn_buf[row + i];
2084 2143
2085 for (nits = 0, col = ncol; col--; ) 2144 for (nits = 0, col = ncol; col--; )
2086 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])
… …
2102 wlen = row; 2161 wlen = row;
2103 continue; 2162 continue;
2104 } 2163 }
2105 } 2164 }
2106 2165
2107 if (len != -1) 2166 if (len >= 0)
2108 { 2167 {
2109 /* also comes here at end if needed because of >= above */ 2168 /* also comes here at end if needed because of >= above */
2110 if (wlen < len) 2169 if (wlen < len)
2111 ::swap (wlen, len); 2170 ::swap (wlen, len);
2112 2171
2172 XGCValues gcv;
2173
2174 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2113 XCopyArea (display->display, vt, vt, 2175 XCopyArea (dpy, vt, vt,
2114 gc, 0, Row2Pixel (len + i), 2176 gc, 0, Row2Pixel (len + i),
2115 (unsigned int)this->width, 2177 (unsigned int)this->width,
2116 (unsigned int)Height2Pixel (wlen - len + 1), 2178 (unsigned int)Height2Pixel (wlen - len + 1),
2117 0, Row2Pixel (len)); 2179 0, Row2Pixel (len));
2180 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2181
2118 len = -1; 2182 len = -1;
2119 } 2183 }
2120 } 2184 }
2121 } 2185 }
2122#endif 2186#endif
… …
2124 /* 2188 /*
2125 * E: main pass across every character 2189 * E: main pass across every character
2126 */ 2190 */
2127 for (row = 0; row < nrow; row++) 2191 for (row = 0; row < nrow; row++)
2128 { 2192 {
2129 text_t *stp = ROW(row - view_start).t; 2193 text_t *stp = ROW(view_start + row).t;
2130 rend_t *srp = ROW(row - view_start).r; 2194 rend_t *srp = ROW(view_start + row).r;
2131 text_t *dtp = drawn_buf[row].t; 2195 text_t *dtp = drawn_buf[row].t;
2132 rend_t *drp = drawn_buf[row].r; 2196 rend_t *drp = drawn_buf[row].r;
2133 2197
2134 /* 2198 /*
2135 * E2: OK, now the real pass 2199 * E2: OK, now the real pass
… …
2178 count++; 2242 count++;
2179 2243
2180 if (stp[col] != dtp[col] 2244 if (stp[col] != dtp[col]
2181 || !RS_SAME (srp[col], drp[col])) 2245 || !RS_SAME (srp[col], drp[col]))
2182 { 2246 {
2183 if (must_clear && (i++ > count / 2)) 2247 if (have_bg && (i++ > count / 2))
2184 break; 2248 break;
2185 2249
2186 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2187 drp[col] = rend; 2251 drp[col] = rend;
2188 i = 0; 2252 i = 0;
2189 } 2253 }
2190 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2254 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2191 break; 2255 break;
2192 } 2256 }
2193 2257
2194 col--; /* went one too far. move back */ 2258 col--; /* went one too far. move back */
2195 count -= i; /* dump any matching trailing chars */ 2259 count -= i; /* dump any matching trailing chars */
… …
2205 int back = bgcolor_of (rend); // desired background 2269 int back = bgcolor_of (rend); // desired background
2206 2270
2207 // 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
2208 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))
2209 { 2273 {
2210#if ENABLE_STYLES
2211 // force redraw after "careful" characters to avoid pixel droppings
2212 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2213 drp[col + 1] = ~srp[col + 1];
2214
2215 // include previous careful character(s) if possible, looks nicer (best effort...)
2216 while (text > stp
2217 && srp[text - stp - 1] & RS_Careful
2218 && RS_SAME (rend, srp[text - stp - 1]))
2219 text--, count++, xpixel -= fwidth;
2220#endif
2221
2222 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2223 2275
2224#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
2225 if (rend & RS_Bold 2277 if (rend & RS_Bold
2226 && fore == Color_fg) 2278 && fore == Color_fg)
… …
2242 else 2294 else
2243 invert = !invert; 2295 invert = !invert;
2244# endif 2296# endif
2245 } 2297 }
2246 2298
2247 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2299 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2248 fore = Color_UL; 2300 fore = Color_UL;
2249#endif 2301#endif
2250 2302
2251 if (invert) 2303 if (invert)
2252 { 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 */
2253 ::swap (fore, back); 2311 ::swap (fore, back);
2312#ifdef OPTION_HC
2313 else if (ISSET_PIXCOLOR (Color_HC))
2314 back = Color_HC;
2315#endif
2254 2316
2255#ifndef NO_BOLD_UNDERLINE_REVERSE 2317#ifndef NO_BOLD_UNDERLINE_REVERSE
2318# ifndef OPTION_HC
2256 if (ISSET_PIXCOLOR (Color_RV)) 2319 if (ISSET_PIXCOLOR (Color_RV))
2257 back = Color_RV; 2320 back = Color_RV;
2258 2321# endif
2259 if (fore == back) 2322 if (fore == back)
2260 { 2323 {
2261 fore = Color_bg; 2324 fore = Color_bg;
2262 back = Color_fg; 2325 back = Color_fg;
2263 } 2326 }
… …
2274 } 2337 }
2275 else if (hidden_text) 2338 else if (hidden_text)
2276 fore = back; 2339 fore = back;
2277 } 2340 }
2278#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
2279 } 2360 }
2280 2361
2281 /* 2362 /*
2282 * Actually do the drawing of the string here 2363 * Actually do the drawing of the string here
2283 */ 2364 */
2284 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2365 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2285 2366
2286 if (back == fore)
2287 font->clear_rect (*drawable, xpixel, ypixel,
2288 fwidth * count, fheight,
2289 back);
2290 else if (back == Color_bg) 2367 if (have_bg && back == Color_bg)
2291 { 2368 {
2292 if (must_clear) 2369 // this is very ugly, maybe push it into ->draw?
2293 {
2294 CLEAR_CHARS (xpixel, ypixel, count);
2295 2370
2296 for (i = 0; i < count; i++) /* don't draw empty strings */ 2371 for (i = 0; i < count; i++) /* don't draw empty strings */
2297 if (text[i] != ' ') 2372 if (text[i] != ' ')
2298 { 2373 {
2299 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2374 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2300 break; 2375 goto did_clear;
2301 }
2302 } 2376 }
2303 else 2377
2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2378 CLEAR_CHARS (xpixel, ypixel, count);
2379 did_clear: ;
2305 } 2380 }
2306 else 2381 else
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2382 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2308 2383
2309 if (rend & RS_Uline && font->descent > 1 && fore != back) 2384 if (rend & RS_Uline && font->descent > 1 && fore != back)
2310 { 2385 {
2311#if ENABLE_FRILLS 2386#if ENABLE_FRILLS
2312 if (ISSET_PIXCOLOR (Color_underline)) 2387 if (ISSET_PIXCOLOR (Color_underline))
2313 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2388 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2314 else 2389 else
2315#endif 2390#endif
2316 XSetForeground (display->display, gc, pix_colors[fore]); 2391 XSetForeground (dpy, gc, pix_colors[fore]);
2317 2392
2318 XDrawLine (display->display, drawBuffer, gc, 2393 XDrawLine (dpy, drawBuffer, gc,
2319 xpixel, ypixel + font->ascent + 1, 2394 xpixel, ypixel + font->ascent + 1,
2320 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2395 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2321 } 2396 }
2322 } /* for (col....) */ 2397 } /* for (col....) */
2323 } /* for (row....) */ 2398 } /* for (row....) */
… …
2332 */ 2407 */
2333 if (showcursor) 2408 if (showcursor)
2334 { 2409 {
2335 if (focus) 2410 if (focus)
2336 { 2411 {
2337 if (OPTION (Opt_cursorUnderline)) 2412 if (option (Opt_cursorUnderline))
2338 *crp ^= RS_Uline; 2413 *crp ^= RS_Uline;
2339 else 2414 else
2340 { 2415 {
2341 *crp ^= RS_RVid; 2416 *crp ^= RS_RVid;
2342#ifndef NO_CURSORCOLOR 2417#ifndef NO_CURSORCOLOR
… …
2356 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2431 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2357 cursorwidth++; 2432 cursorwidth++;
2358 2433
2359#ifndef NO_CURSORCOLOR 2434#ifndef NO_CURSORCOLOR
2360 if (ISSET_PIXCOLOR (Color_cursor)) 2435 if (ISSET_PIXCOLOR (Color_cursor))
2361 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2436 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2437 else
2362#endif 2438#endif
2439 XSetForeground (dpy, gc, pix_colors[ccol1]);
2363 2440
2364 XDrawRectangle (display->display, drawBuffer, gc, 2441 XDrawRectangle (dpy, drawBuffer, gc,
2365 Col2Pixel (col), 2442 Col2Pixel (col),
2366 Row2Pixel (oldcursor.row), 2443 Row2Pixel (oldcursor.row),
2367 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2444 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2368 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2445 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2369 } 2446 }
… …
2372 /* 2449 /*
2373 * H: cleanup selection 2450 * H: cleanup selection
2374 */ 2451 */
2375 scr_reverse_selection (); 2452 scr_reverse_selection ();
2376 2453
2377 if (refresh_type & SMOOTH_REFRESH)
2378 XFlush (display->display);
2379
2380 num_scr = 0; 2454 num_scr = 0;
2381 num_scr_allow = 1; 2455 num_scr_allow = 1;
2382} 2456}
2383 2457
2384void 2458void
2385rxvt_term::scr_remap_chars (line_t &l) 2459rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2386{ 2460{
2387 if (!l.t) 2461 if (!l.t)
2388 return; 2462 return;
2389 2463
2390 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
… …
2392 for (int i = ncol; i--; ) 2466 for (int i = ncol; i--; )
2393 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]));
2394} 2468}
2395 2469
2396void 2470void
2397rxvt_term::scr_remap_chars () 2471rxvt_term::scr_remap_chars () NOTHROW
2398{ 2472{
2399 for (int i = total_rows; i--; ) 2473 for (int i = total_rows; i--; )
2400 scr_remap_chars (row_buf [i]); 2474 scr_remap_chars (row_buf [i]);
2401 2475
2402 for (int i = nrow; i--; ) 2476 for (int i = nrow; i--; )
… …
2405 scr_remap_chars (swap_buf [i]); 2479 scr_remap_chars (swap_buf [i]);
2406 } 2480 }
2407} 2481}
2408 2482
2409void 2483void
2410rxvt_term::scr_recolour () 2484rxvt_term::scr_recolour () NOTHROW
2411{ 2485{
2412 if (1 2486 if (1
2413#if TRANSPARENT 2487#if ENABLE_TRANSPARENCY
2414 && !am_transparent 2488 && !am_transparent
2415#endif 2489#endif
2416#if XPM_BACKGROUND 2490#if XPM_BACKGROUND
2417 && !bgPixmap.pixmap 2491 && !bgPixmap.pixmap
2418#endif 2492#endif
2419 ) 2493 )
2420 { 2494 {
2421 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2422 XClearWindow (display->display, parent[0]); 2496 XClearWindow (dpy, parent[0]);
2423 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2424#if HAVE_SCROLLBARS 2498#if HAVE_SCROLLBARS
2425 if (scrollBar.win) 2499 if (scrollBar.win)
2426 { 2500 {
2427 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2428 scrollBar.setIdle (); 2502 scrollBar.setIdle ();
2429 scrollbar_show (0); 2503 scrollbar_show (0);
2430 } 2504 }
2431#endif 2505#endif
2432 } 2506 }
… …
2436 want_refresh = 1; 2510 want_refresh = 1;
2437} 2511}
2438 2512
2439/* ------------------------------------------------------------------------- */ 2513/* ------------------------------------------------------------------------- */
2440void 2514void
2441rxvt_term::scr_clear (bool really) 2515rxvt_term::scr_clear (bool really) NOTHROW
2442{ 2516{
2443 if (!mapped) 2517 if (!mapped)
2444 return; 2518 return;
2445 2519
2446 num_scr_allow = 0; 2520 num_scr_allow = 0;
2447 want_refresh = 1; 2521 want_refresh = 1;
2448 2522
2449 if (really) 2523 if (really)
2450 XClearWindow (display->display, vt); 2524 XClearWindow (dpy, vt);
2451} 2525}
2452 2526
2453/* ------------------------------------------------------------------------- */
2454void 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
2455rxvt_term::scr_reverse_selection () 2577rxvt_term::scr_reverse_selection () NOTHROW
2456{ 2578{
2457 if (selection.op 2579 if (selection.op
2458 && current_screen == selection.screen 2580 && current_screen == selection.screen
2459 && selection.end.row >= -view_start) 2581 && selection.end.row >= view_start)
2460 { 2582 {
2461 int view_end = -view_start + nrow; 2583#if !ENABLE_MINIMAL
2462 int row, col;
2463
2464#if ENABLE_FRILLS
2465 if (selection.rect) 2584 if (selection.rect)
2466 { 2585 scr_xor_rect (selection.beg.row, selection.beg.col,
2467 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2586 selection.end.row, selection.end.col,
2468 { 2587 RS_RVid, RS_RVid | RS_Uline);
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2472 for (col = selection.beg.col; col < selection.end.col; col++)
2473 srp[col] ^= RS_RVid;
2474
2475 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= RS_RVid | RS_Uline;
2477
2478 if (++col < selection.end.col)
2479 srp[col] ^= RS_RVid | RS_Uline;
2480 }
2481 }
2482 else 2588 else
2483#endif 2589#endif
2484 { 2590 scr_xor_span (selection.beg.row, selection.beg.col,
2485 if (selection.beg.row >= -view_start) 2591 selection.end.row, selection.end.col,
2486 { 2592 RS_RVid);
2487 col = selection.beg.col;
2488 row = selection.beg.row;
2489 }
2490 else
2491 {
2492 col = 0;
2493 row = -view_start;
2494 }
2495
2496 for (; row < min (selection.end.row, view_end); row++, col = 0)
2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2498 srp[col] ^= RS_RVid;
2499
2500 if (row == selection.end.row)
2501 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2502 srp[col] ^= RS_RVid;
2503 }
2504 } 2593 }
2505} 2594}
2506 2595
2507/* ------------------------------------------------------------------------- */ 2596/* ------------------------------------------------------------------------- */
2508/* 2597/*
2509 * Dump the whole scrollback and screen to the passed filedescriptor. The 2598 * Dump the whole scrollback and screen to the passed filedescriptor. The
2510 * invoking routine must close the fd. 2599 * invoking routine must close the fd.
2511 */ 2600 */
2512#if 0 2601#if 0
2513void 2602void
2514rxvt_term::scr_dump (int fd) 2603rxvt_term::scr_dump (int fd) NOTHROW
2515{ 2604{
2516 int row, wrote; 2605 int row, wrote;
2517 unsigned int width, towrite; 2606 unsigned int width, towrite;
2518 char r1[] = "\n"; 2607 char r1[] = "\n";
2519 2608
… …
2538 2627
2539/* ------------------------------------------------------------------------- * 2628/* ------------------------------------------------------------------------- *
2540 * CHARACTER SELECTION * 2629 * CHARACTER SELECTION *
2541 * ------------------------------------------------------------------------- */ 2630 * ------------------------------------------------------------------------- */
2542void 2631void
2543rxvt_term::selection_check (int check_more) 2632rxvt_term::selection_check (int check_more) NOTHROW
2544{ 2633{
2545 row_col_t pos; 2634 row_col_t pos;
2546 2635
2547 if (!selection.op) 2636 if (!selection.op)
2548 return; 2637 return;
2549 2638
2550 pos.row = pos.col = 0; 2639 pos.row = pos.col = 0;
2551 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2640 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2552 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2641 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2553 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2642 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2554 || (check_more == 1 2643 || (check_more == 1
2555 && current_screen == selection.screen 2644 && current_screen == selection.screen
2556 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2645 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2557 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2646 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2558 || (check_more == 2 2647 || (check_more == 2
… …
2569/* ------------------------------------------------------------------------- */ 2658/* ------------------------------------------------------------------------- */
2570/* 2659/*
2571 * Paste a selection direct to the command fd 2660 * Paste a selection direct to the command fd
2572 */ 2661 */
2573void 2662void
2574rxvt_term::paste (char *data, unsigned int len) 2663rxvt_term::paste (char *data, unsigned int len) NOTHROW
2575{ 2664{
2576 /* convert normal newline chars into common keyboard Return key sequence */ 2665 /* convert normal newline chars into common keyboard Return key sequence */
2577 for (unsigned int i = 0; i < len; i++) 2666 for (unsigned int i = 0; i < len; i++)
2578 if (data[i] == C0_LF) 2667 if (data[i] == C0_LF)
2579 data[i] = C0_CR; 2668 data[i] = C0_CR;
… …
2585/* 2674/*
2586 * Respond to a notification that a primary selection has been sent 2675 * Respond to a notification that a primary selection has been sent
2587 * EXT: SelectionNotify 2676 * EXT: SelectionNotify
2588 */ 2677 */
2589void 2678void
2590rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2591{ 2680{
2592 if (prop == None) /* check for failed XConvertSelection */ 2681 if (prop == None) /* check for failed XConvertSelection */
2593 { 2682 {
2594 if ((selection_type & Sel_CompoundText)) 2683 if ((selection_type & Sel_CompoundText))
2595 { 2684 {
… …
2615 } 2704 }
2616 2705
2617 unsigned long bytes_after; 2706 unsigned long bytes_after;
2618 XTextProperty ct; 2707 XTextProperty ct;
2619 2708
2620 if (XGetWindowProperty (display->display, win, prop, 2709 if (XGetWindowProperty (dpy, win, prop,
2621 0, PROP_SIZE / 4, 2710 0, PROP_SIZE / 4,
2622 delete_prop, AnyPropertyType, 2711 delete_prop, AnyPropertyType,
2623 &ct.encoding, &ct.format, 2712 &ct.encoding, &ct.format,
2624 &ct.nitems, &bytes_after, 2713 &ct.nitems, &bytes_after,
2625 &ct.value) != Success) 2714 &ct.value) != Success)
… …
2634 if (bytes_after) 2723 if (bytes_after)
2635 { 2724 {
2636 // fetch and append remaining data 2725 // fetch and append remaining data
2637 XTextProperty ct2; 2726 XTextProperty ct2;
2638 2727
2639 if (XGetWindowProperty (display->display, win, prop, 2728 if (XGetWindowProperty (dpy, win, prop,
2640 ct.nitems / 4, (bytes_after + 3) / 4, 2729 ct.nitems / 4, (bytes_after + 3) / 4,
2641 delete_prop, AnyPropertyType, 2730 delete_prop, AnyPropertyType,
2642 &ct2.encoding, &ct2.format, 2731 &ct2.encoding, &ct2.format,
2643 &ct2.nitems, &bytes_after, 2732 &ct2.nitems, &bytes_after,
2644 &ct2.value) != Success) 2733 &ct2.value) != Success)
… …
2657 2746
2658 if (ct.encoding == xa[XA_INCR]) 2747 if (ct.encoding == xa[XA_INCR])
2659 { 2748 {
2660 // INCR selection, start handshake 2749 // INCR selection, start handshake
2661 if (!delete_prop) 2750 if (!delete_prop)
2662 XDeleteProperty (display->display, win, prop); 2751 XDeleteProperty (dpy, win, prop);
2663 2752
2664 selection_wait = Sel_incr; 2753 selection_wait = Sel_incr;
2665 incr_buf_fill = 0; 2754 incr_buf_fill = 0;
2666 incr_ev.start (NOW + 10); 2755 incr_ev.start (NOW + 10);
2667 2756
… …
2714 } 2803 }
2715 2804
2716 char **cl; 2805 char **cl;
2717 int cr; 2806 int cr;
2718 2807
2719#if ENABLE_FRILLS 2808#if !ENABLE_MINIMAL
2720 // 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
2721 // so recode it manually 2810 // so recode it manually
2722 if (ct.encoding == xa[XA_UTF8_STRING]) 2811 if (ct.encoding == xa[XA_UTF8_STRING])
2723 { 2812 {
2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2728 paste (s, strlen (s)); 2817 paste (s, strlen (s));
2729 free (s); 2818 free (s);
2730 } 2819 }
2731 else 2820 else
2732#endif 2821#endif
2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2734 && cl) 2823 && cl)
2735 { 2824 {
2736 for (int i = 0; i < cr; i++) 2825 for (int i = 0; i < cr; i++)
2737 paste (cl[i], strlen (cl[i])); 2826 paste (cl[i], strlen (cl[i]));
2738 2827
… …
2747 if (selection_wait == Sel_normal) 2836 if (selection_wait == Sel_normal)
2748 selection_wait = Sel_none; 2837 selection_wait = Sel_none;
2749} 2838}
2750 2839
2751void 2840void
2752rxvt_term::incr_cb (time_watcher &w) 2841rxvt_term::incr_cb (time_watcher &w) NOTHROW
2753{ 2842{
2754 selection_wait = Sel_none; 2843 selection_wait = Sel_none;
2755 2844
2756 incr_buf_size = 0; 2845 incr_buf_size = 0;
2757 free (incr_buf); 2846 free (incr_buf);
2758 2847
2759 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2760} 2849}
2761 2850
2762void 2851void
2763rxvt_term::selection_property (Window win, Atom prop) 2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2764{ 2853{
2765 if (prop == None || selection_wait != Sel_incr) 2854 if (prop == None || selection_wait != Sel_incr)
2766 return; 2855 return;
2767 2856
2768 selection_paste (win, prop, true); 2857 selection_paste (win, prop, true);
… …
2777 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2778 * will auto fallback to CUT_BUFFER0 2867 * will auto fallback to CUT_BUFFER0
2779 * EXT: button 2 release 2868 * EXT: button 2 release
2780 */ 2869 */
2781void 2870void
2782rxvt_term::selection_request (Time tm, int x, int y) 2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2783{ 2872{
2784 if (x < 0 || x >= width || y < 0 || y >= height) 2873 if (selection.text && selnum == Sel_Primary)
2785 return; /* outside window */
2786
2787 if (selection.text)
2788 { /* internal selection */ 2874 { /* internal selection */
2789 char *str = rxvt_wcstombs (selection.text, selection.len); 2875 char *str = rxvt_wcstombs (selection.text, selection.len);
2790 paste (str, strlen (str)); 2876 paste (str, strlen (str));
2791 free (str); 2877 free (str);
2792 return; 2878 return;
2793 } 2879 }
2794 else 2880 else
2795 { 2881 {
2796 int i;
2797
2798 selection_request_time = tm; 2882 selection_request_time = tm;
2799 selection_wait = Sel_normal; 2883 selection_wait = Sel_normal;
2800 2884
2801 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2802 {
2803#if X_HAVE_UTF8_STRING 2885#if X_HAVE_UTF8_STRING
2804 selection_type = Sel_UTF8String; 2886 selection_type = Sel_UTF8String;
2805 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2887 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2806 return; 2888 return;
2807#else 2889#else
2808 selection_type = Sel_CompoundText; 2890 selection_type = Sel_CompoundText;
2809 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2891 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2810 return; 2892 return;
2811#endif 2893#endif
2812 }
2813 } 2894 }
2814 2895
2815 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2896 selection_wait = Sel_none; /* don't loop in selection_paste () */
2816 selection_paste (display->root, XA_CUT_BUFFER0, false); 2897 selection_paste (display->root, XA_CUT_BUFFER0, false);
2817} 2898}
2818 2899
2819int 2900int
2820rxvt_term::selection_request_other (Atom target, int selnum) 2901rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2821{ 2902{
2822 Atom sel; 2903 Atom sel;
2823 2904
2824 selection_type |= selnum; 2905 selection_type |= selnum;
2825 2906
… …
2828 else if (selnum == Sel_Secondary) 2909 else if (selnum == Sel_Secondary)
2829 sel = XA_SECONDARY; 2910 sel = XA_SECONDARY;
2830 else 2911 else
2831 sel = xa[XA_CLIPBOARD]; 2912 sel = xa[XA_CLIPBOARD];
2832 2913
2833 if (XGetSelectionOwner (display->display, sel) != None) 2914 if (XGetSelectionOwner (dpy, sel) != None)
2834 { 2915 {
2835 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2916 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2836 vt, selection_request_time); 2917 vt, selection_request_time);
2837 return 1; 2918 return 1;
2838 } 2919 }
2839 2920
2840 return 0; 2921 return 0;
… …
2844/* 2925/*
2845 * Clear all selected text 2926 * Clear all selected text
2846 * EXT: SelectionClear 2927 * EXT: SelectionClear
2847 */ 2928 */
2848void 2929void
2849rxvt_term::selection_clear () 2930rxvt_term::selection_clear () NOTHROW
2850{ 2931{
2851 want_refresh = 1; 2932 want_refresh = 1;
2852 free (selection.text); 2933 free (selection.text);
2853 selection.text = NULL; 2934 selection.text = NULL;
2854 selection.len = 0; 2935 selection.len = 0;
… …
2903 2984
2904 int end_col; 2985 int end_col;
2905 2986
2906 for (; row <= selection.end.row; row++, col = 0) 2987 for (; row <= selection.end.row; row++, col = 0)
2907 { 2988 {
2908#if ENABLE_FRILLS 2989#if !ENABLE_MINIMAL
2909 if (selection.rect) 2990 if (selection.rect)
2910 { 2991 {
2911 col = selection.beg.col; 2992 col = selection.beg.col;
2912 end_col = ncol + 1; 2993 end_col = ncol + 1;
2913 } 2994 }
… …
2916 end_col = ROW(row).l; 2997 end_col = ROW(row).l;
2917 2998
2918 col = max (col, 0); 2999 col = max (col, 0);
2919 3000
2920 if (row == selection.end.row 3001 if (row == selection.end.row
2921#if ENABLE_FRILLS 3002#if !ENABLE_MINIMAL
2922 || selection.rect 3003 || selection.rect
2923#endif 3004#endif
2924 ) 3005 )
2925 min_it (end_col, selection.end.col); 3006 min_it (end_col, selection.end.col);
2926 3007
… …
2949#endif 3030#endif
2950 else 3031 else
2951 new_selection_text[ofs++] = *t++; 3032 new_selection_text[ofs++] = *t++;
2952 } 3033 }
2953 3034
2954#if ENABLE_FRILLS 3035#if !ENABLE_MINIMAL
2955 if (selection.rect) 3036 if (selection.rect)
2956 { 3037 {
2957 while (ofs 3038 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF 3039 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1])) 3040 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2989 3070
2990 selection_grab (tm); 3071 selection_grab (tm);
2991} 3072}
2992 3073
2993bool 3074bool
2994rxvt_term::selection_grab (Time tm) 3075rxvt_term::selection_grab (Time tm) NOTHROW
2995{ 3076{
2996 selection_time = tm; 3077 selection_time = tm;
2997 3078
2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3079 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3080 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3000 { 3081 {
3001 display->set_selection_owner (this); 3082 display->set_selection_owner (this);
3002 return true; 3083 return true;
3003 } 3084 }
3004 else 3085 else
3086 {
3087 selection_clear ();
3005 return false; 3088 return false;
3089 }
3006 3090
3007#if 0 3091#if 0
3008 XTextProperty ct; 3092 XTextProperty ct;
3009 3093
3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3094 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3011 { 3095 {
3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3096 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3013 XFree (ct.value); 3097 XFree (ct.value);
3014 } 3098 }
3015#endif 3099#endif
… …
3019/* 3103/*
3020 * 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
3021 * EXT: button 1 press 3105 * EXT: button 1 press
3022 */ 3106 */
3023void 3107void
3024rxvt_term::selection_click (int clicks, int x, int y) 3108rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3025{ 3109{
3026 clicks = ((clicks - 1) % 3) + 1; 3110 clicks = ((clicks - 1) % 3) + 1;
3027 selection.clicks = clicks; /* save clicks so extend will work */ 3111 selection.clicks = clicks; /* save clicks so extend will work */
3028 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
3029 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3122 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3030 3123
3031 if (clicks == 2 || clicks == 3) 3124 if (clicks == 2 || clicks == 3)
3032 selection_extend_colrow (selection.mark.col, 3125 selection_extend_colrow (selection.mark.col,
3033 selection.mark.row + view_start, 3126 selection.mark.row - view_start,
3034 0, /* button 3 */ 3127 0, /* button 3 */
3035 1, /* button press */ 3128 1, /* button press */
3036 0); /* click change */ 3129 0); /* click change */
3037} 3130}
3038 3131
3039/* ------------------------------------------------------------------------- */ 3132/* ------------------------------------------------------------------------- */
3040/* 3133/*
3041 * Mark a selection at the specified col/row 3134 * Mark a selection at the specified col/row
3042 */ 3135 */
3043void 3136void
3044rxvt_term::selection_start_colrow (int col, int row) 3137rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3045{ 3138{
3046 want_refresh = 1; 3139 want_refresh = 1;
3047 3140
3048 selection.mark.row = row - view_start; 3141 selection.mark.row = row + view_start;
3049 selection.mark.col = col; 3142 selection.mark.col = col;
3050 3143
3051 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3144 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3052 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3145 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3053 3146
3054 while (selection.mark.col > 0 3147 while (selection.mark.col > 0
3055 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3148 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3056 --selection.mark.col; 3149 --selection.mark.col;
… …
3075#define DELIMIT_TEXT(x) \ 3168#define DELIMIT_TEXT(x) \
3076 (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)))
3077#define DELIMIT_REND(x) 1 3170#define DELIMIT_REND(x) 1
3078 3171
3079void 3172void
3080rxvt_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
3081{ 3174{
3082 int col, row, dirnadd, tcol, trow, w1, w2; 3175 int col, row, dirnadd, tcol, trow, w1, w2;
3083 row_col_t bound; 3176 row_col_t bound;
3084 text_t *stp; 3177 text_t *stp;
3085 rend_t *srp; 3178 rend_t *srp;
3086 3179
3087 if (dirn == UP) 3180 if (dirn == UP)
3088 { 3181 {
3089 bound.row = - nsaved - 1; 3182 bound.row = top_row - 1;
3090 bound.col = 0; 3183 bound.col = 0;
3091 dirnadd = -1; 3184 dirnadd = -1;
3092 } 3185 }
3093 else 3186 else
3094 { 3187 {
… …
3159 * flag == 0 ==> button 1 3252 * flag == 0 ==> button 1
3160 * flag == 1 ==> button 3 press 3253 * flag == 1 ==> button 3 press
3161 * flag == 2 ==> button 3 motion 3254 * flag == 2 ==> button 3 motion
3162 */ 3255 */
3163void 3256void
3164rxvt_term::selection_extend (int x, int y, int flag) 3257rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3165{ 3258{
3166 int col = clamp (Pixel2Col (x), 0, ncol); 3259 int col = clamp (Pixel2Col (x), 0, ncol);
3167 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3260 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3168 3261
3169 /* 3262 /*
… …
3172 * 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
3173 * be _past_ a character for it to be selected. 3266 * be _past_ a character for it to be selected.
3174 */ 3267 */
3175 if (((selection.clicks % 3) == 1) && !flag 3268 if (((selection.clicks % 3) == 1) && !flag
3176 && (col == selection.mark.col 3269 && (col == selection.mark.col
3177 && (row == selection.mark.row + view_start))) 3270 && (row == selection.mark.row - view_start)))
3178 { 3271 {
3179 /* select nothing */ 3272 /* select nothing */
3180 selection.beg.row = selection.end.row = 0; 3273 selection.beg.row = selection.end.row = 0;
3181 selection.beg.col = selection.end.col = 0; 3274 selection.beg.col = selection.end.col = 0;
3182 selection.clicks = 4; 3275 selection.clicks = 4;
… …
3195/* ------------------------------------------------------------------------- */ 3288/* ------------------------------------------------------------------------- */
3196/* 3289/*
3197 * Extend the selection to the specified col/row 3290 * Extend the selection to the specified col/row
3198 */ 3291 */
3199void 3292void
3200rxvt_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
3201{ 3294{
3202 row_col_t pos; 3295 row_col_t pos;
3203 enum { 3296 enum {
3204 LEFT, RIGHT 3297 LEFT, RIGHT
3205 } closeto = RIGHT; 3298 } closeto = RIGHT;
… …
3237 selection.beg.col = selection.end.col = selection.mark.col; 3330 selection.beg.col = selection.end.col = selection.mark.col;
3238 selection.beg.row = selection.end.row = selection.mark.row; 3331 selection.beg.row = selection.end.row = selection.mark.row;
3239 } 3332 }
3240 3333
3241 pos.col = col; 3334 pos.col = col;
3242 pos.row = row - view_start; 3335 pos.row = view_start + row;
3243 3336
3244 /* 3337 /*
3245 * 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
3246 * in the way button3 drag extension works. 3339 * in the way button3 drag extension works.
3247 * We're either doing: button1 drag; button3 press; or button3 drag 3340 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3308 3401
3309 if (selection.clicks == 1) 3402 if (selection.clicks == 1)
3310 { 3403 {
3311 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
3312 && !ROW(selection.beg.row).is_longer () 3405 && !ROW(selection.beg.row).is_longer ()
3313#if ENABLE_FRILLS 3406#if !ENABLE_MINIMAL
3314 && !selection.rect 3407 && !selection.rect
3315#endif 3408#endif
3316 ) 3409 )
3317 selection.beg.col = ncol; 3410 selection.beg.col = ncol;
3318 3411
3319 if ( 3412 if (
3320 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3413 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3321 && !ROW(selection.end.row).is_longer () 3414 && !ROW(selection.end.row).is_longer ()
3322#if ENABLE_FRILLS 3415#if !ENABLE_MINIMAL
3323 && !selection.rect 3416 && !selection.rect
3324#endif 3417#endif
3325 ) 3418 )
3326 selection.end.col = ncol; 3419 selection.end.col = ncol;
3327 } 3420 }
3328 else if (selection.clicks == 2) 3421 else if (selection.clicks == 2)
3329 { 3422 {
3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3423 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3331 selection.end.col--; 3424 selection.end.col--;
3332 3425
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3335 selection_delimit_word (UP, &selection.beg, &selection.beg); 3426 selection_delimit_word (UP, &selection.beg, &selection.beg);
3336 selection_delimit_word (DN, &selection.end, &selection.end); 3427 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3338 } 3428 }
3339 else if (selection.clicks == 3) 3429 else if (selection.clicks == 3)
3340 { 3430 {
3341#if ENABLE_FRILLS 3431#if ENABLE_FRILLS
3342 if (OPTION (Opt_tripleclickwords)) 3432 if (option (Opt_tripleclickwords))
3343 { 3433 {
3344 selection_delimit_word (UP, &selection.beg, &selection.beg); 3434 selection_delimit_word (UP, &selection.beg, &selection.beg);
3345 3435
3346 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++)
3347 { 3437 {
3348 if (!ROW(end_row).is_longer ()) 3438 if (!ROW(end_row).is_longer ())
3349 { 3439 {
3350 selection.end.row = end_row; 3440 selection.end.row = end_row;
3351 selection.end.col = ROW(end_row).l; 3441 selection.end.col = ROW(end_row).l;
3442# if !ENABLE_MINIMAL
3352 selection_remove_trailing_spaces (); 3443 selection_remove_trailing_spaces ();
3444# endif
3353 break; 3445 break;
3354 } 3446 }
3355 } 3447 }
3356 } 3448 }
3357 else 3449 else
… …
3386 selection.mark.row = selection.beg.row; 3478 selection.mark.row = selection.beg.row;
3387 selection.mark.col = selection.beg.col; 3479 selection.mark.col = selection.beg.col;
3388 } 3480 }
3389 } 3481 }
3390 3482
3391#if ENABLE_FRILLS 3483#if !ENABLE_MINIMAL
3392 if (selection.rect && selection.beg.col > selection.end.col) 3484 if (selection.rect && selection.beg.col > selection.end.col)
3393 ::swap (selection.beg.col, selection.end.col); 3485 ::swap (selection.beg.col, selection.end.col);
3394#endif 3486#endif
3395} 3487}
3396 3488
3397#if ENABLE_FRILLS 3489#if !ENABLE_MINIMAL
3398void 3490void
3399rxvt_term::selection_remove_trailing_spaces () 3491rxvt_term::selection_remove_trailing_spaces () NOTHROW
3400{ 3492{
3401 int32_t end_col, end_row; 3493 int32_t end_col, end_row;
3402 text_t *stp; 3494 text_t *stp;
3403 3495
3404 end_col = selection.end.col; 3496 end_col = selection.end.col;
… …
3442/* 3534/*
3443 * Double click on button 3 when already selected 3535 * Double click on button 3 when already selected
3444 * EXT: button 3 double click 3536 * EXT: button 3 double click
3445 */ 3537 */
3446void 3538void
3447rxvt_term::selection_rotate (int x, int y) 3539rxvt_term::selection_rotate (int x, int y) NOTHROW
3448{ 3540{
3449 selection.clicks = selection.clicks % 3 + 1; 3541 selection.clicks = selection.clicks % 3 + 1;
3450 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3542 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3451} 3543}
3452 3544
… …
3454/* 3546/*
3455 * Respond to a request for our current selection 3547 * Respond to a request for our current selection
3456 * EXT: SelectionRequest 3548 * EXT: SelectionRequest
3457 */ 3549 */
3458void 3550void
3459rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3551rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3460{ 3552{
3461 XSelectionEvent ev; 3553 XSelectionEvent ev;
3462 dDisp;
3463 3554
3464 ev.type = SelectionNotify; 3555 ev.type = SelectionNotify;
3465 ev.property = None; 3556 ev.property = None;
3466 ev.display = rq.display; 3557 ev.display = rq.display;
3467 ev.requestor = rq.requestor; 3558 ev.requestor = rq.requestor;
… …
3481 *target++ = xa[XA_COMPOUND_TEXT]; 3572 *target++ = xa[XA_COMPOUND_TEXT];
3482#if X_HAVE_UTF8_STRING 3573#if X_HAVE_UTF8_STRING
3483 *target++ = xa[XA_UTF8_STRING]; 3574 *target++ = xa[XA_UTF8_STRING];
3484#endif 3575#endif
3485 3576
3486 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3577 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3487 32, PropModeReplace, 3578 32, PropModeReplace,
3488 (unsigned char *)target_list, target - target_list); 3579 (unsigned char *)target_list, target - target_list);
3489 ev.property = rq.property; 3580 ev.property = rq.property;
3490 } 3581 }
3491#if TODO // TODO 3582#if TODO // TODO
… …
3494 /* TODO: Handle MULTIPLE */ 3585 /* TODO: Handle MULTIPLE */
3495 } 3586 }
3496#endif 3587#endif
3497 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3588 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3498 { 3589 {
3499 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3590 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3500 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3591 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3501 ev.property = rq.property; 3592 ev.property = rq.property;
3502 } 3593 }
3503 else if (rq.target == XA_STRING 3594 else if (rq.target == XA_STRING
3504 || rq.target == xa[XA_TEXT] 3595 || rq.target == xa[XA_TEXT]
… …
3528 style = enc_string; 3619 style = enc_string;
3529 else if (target == xa[XA_TEXT]) 3620 else if (target == xa[XA_TEXT])
3530 style = enc_text; 3621 style = enc_text;
3531 else if (target == xa[XA_COMPOUND_TEXT]) 3622 else if (target == xa[XA_COMPOUND_TEXT])
3532 style = enc_compound_text; 3623 style = enc_compound_text;
3533#if ENABLE_FRILLS 3624#if !ENABLE_MINIMAL
3534 else if (target == xa[XA_UTF8_STRING]) 3625 else if (target == xa[XA_UTF8_STRING])
3535 style = enc_utf8; 3626 style = enc_utf8;
3536#endif 3627#endif
3537 else 3628 else
3538 { 3629 {
… …
3549 { 3640 {
3550 cl = L""; 3641 cl = L"";
3551 selectlen = 0; 3642 selectlen = 0;
3552 } 3643 }
3553 3644
3554#if ENABLE_FRILLS 3645#if !ENABLE_MINIMAL
3555 // 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
3556 // so recode it manually 3647 // so recode it manually
3557 if (style == enc_utf8) 3648 if (style == enc_utf8)
3558 { 3649 {
3559 freect = 1; 3650 freect = 1;
… …
3562 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3653 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3563 ct.nitems = strlen ((char *)ct.value); 3654 ct.nitems = strlen ((char *)ct.value);
3564 } 3655 }
3565 else 3656 else
3566#endif 3657#endif
3567 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3658 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3568 freect = 1; 3659 freect = 1;
3569 else 3660 else
3570 { 3661 {
3571 /* if we failed to convert then send it raw */ 3662 /* if we failed to convert then send it raw */
3572 ct.value = (unsigned char *)cl; 3663 ct.value = (unsigned char *)cl;
3573 ct.nitems = selectlen; 3664 ct.nitems = selectlen;
3574 ct.encoding = target; 3665 ct.encoding = target;
3575 } 3666 }
3576 3667
3577 XChangeProperty (disp, rq.requestor, rq.property, 3668 XChangeProperty (dpy, rq.requestor, rq.property,
3578 ct.encoding, 8, PropModeReplace, 3669 ct.encoding, 8, PropModeReplace,
3579 ct.value, (int)ct.nitems); 3670 ct.value, (int)ct.nitems);
3580 ev.property = rq.property; 3671 ev.property = rq.property;
3581 3672
3582 if (freect) 3673 if (freect)
3583 XFree (ct.value); 3674 XFree (ct.value);
3584 } 3675 }
3585 3676
3586 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3677 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3587} 3678}
3588 3679
3589/* ------------------------------------------------------------------------- * 3680/* ------------------------------------------------------------------------- *
3590 * MOUSE ROUTINES * 3681 * MOUSE ROUTINES *
3591 * ------------------------------------------------------------------------- */ 3682 * ------------------------------------------------------------------------- */
3592 3683
3593/* 3684/*
3594 * return col/row values corresponding to x/y pixel values 3685 * return col/row values corresponding to x/y pixel values
3595 */ 3686 */
3596void 3687void
3597rxvt_term::pixel_position (int *x, int *y) 3688rxvt_term::pixel_position (int *x, int *y) NOTHROW
3598{ 3689{
3599 *x = Pixel2Col (*x); 3690 *x = Pixel2Col (*x);
3600 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3691 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3601 *y = Pixel2Row (*y); 3692 *y = Pixel2Row (*y);
3602 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3693 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3603} 3694}
3604 3695
3605/* ------------------------------------------------------------------------- */ 3696/* ------------------------------------------------------------------------- */
3606#ifdef USE_XIM 3697#ifdef USE_XIM
3607void 3698void
3608rxvt_term::im_set_position (XPoint &pos) 3699rxvt_term::im_set_position (XPoint &pos) NOTHROW
3609{ 3700{
3610 XWindowAttributes xwa; 3701 XWindowAttributes xwa;
3611 3702
3612 XGetWindowAttributes (display->display, vt, &xwa); 3703 XGetWindowAttributes (dpy, vt, &xwa);
3613 3704
3614 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3705 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3615 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3706 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3616} 3707}
3617#endif 3708#endif
3618 3709
3619#if ENABLE_OVERLAY 3710#if ENABLE_OVERLAY
3620void 3711void
3621rxvt_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
3622{ 3713{
3623 if (nrow < 1 || ncol < 1) 3714 if (nrow < 1 || ncol < 1)
3624 return; 3715 return;
3625 3716
3626 want_refresh = 1; 3717 want_refresh = 1;
… …
3671 *rp = r; 3762 *rp = r;
3672 } 3763 }
3673} 3764}
3674 3765
3675void 3766void
3676rxvt_term::scr_overlay_off () 3767rxvt_term::scr_overlay_off () NOTHROW
3677{ 3768{
3678 if (!ov_text) 3769 if (!ov_text)
3679 return; 3770 return;
3680 3771
3681 want_refresh = 1; 3772 want_refresh = 1;
… …
3689 delete [] ov_text; ov_text = 0; 3780 delete [] ov_text; ov_text = 0;
3690 delete [] ov_rend; ov_rend = 0; 3781 delete [] ov_rend; ov_rend = 0;
3691} 3782}
3692 3783
3693void 3784void
3694rxvt_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
3695{ 3786{
3696 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3787 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3697 return; 3788 return;
3698 3789
3699 x++, y++; 3790 x++, y++;
… …
3701 ov_text[y][x] = text; 3792 ov_text[y][x] = text;
3702 ov_rend[y][x] = rend; 3793 ov_rend[y][x] = rend;
3703} 3794}
3704 3795
3705void 3796void
3706rxvt_term::scr_overlay_set (int x, int y, const char *s) 3797rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3707{ 3798{
3708 while (*s) 3799 while (*s)
3709 scr_overlay_set (x++, y, *s++); 3800 scr_overlay_set (x++, y, *s++);
3710} 3801}
3711 3802
3712void 3803void
3713rxvt_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
3714{ 3805{
3715 while (*s) 3806 while (*s)
3716 { 3807 {
3717 text_t t = *s++; 3808 text_t t = *s++;
3718 int width = wcwidth (t); 3809 int width = WCWIDTH (t);
3719 3810
3720 while (width--) 3811 while (width--)
3721 { 3812 {
3722 scr_overlay_set (x++, y, t); 3813 scr_overlay_set (x++, y, t);
3723 t = NOCHAR; 3814 t = NOCHAR;
3724 } 3815 }
3725 } 3816 }
3726} 3817}
3727 3818
3728void 3819void
3729rxvt_term::scr_swap_overlay () 3820rxvt_term::scr_swap_overlay () NOTHROW
3730{ 3821{
3731 if (!ov_text) 3822 if (!ov_text)
3732 return; 3823 return;
3733 3824
3734 // swap screen mem with overlay 3825 // swap screen mem with overlay
3735 for (int y = ov_h; y--; ) 3826 for (int y = ov_h; y--; )
3736 { 3827 {
3737 text_t *t1 = ov_text[y]; 3828 text_t *t1 = ov_text[y];
3738 rend_t *r1 = ov_rend[y]; 3829 rend_t *r1 = ov_rend[y];
3739 3830
3740 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;
3741 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;
3742 3833
3743 for (int x = ov_w; x--; ) 3834 for (int x = ov_w; x--; )
3744 { 3835 {
3745 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3836 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3746 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