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.224 by root, Thu Jan 12 03:32:56 2006 UTC vs.
Revision 1.312 by root, Tue Nov 4 13:30:41 2008 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-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
118/* Fill part/all of a line with blanks. */ 100/* Fill part/all of a line with blanks. */
119void 101void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 103{
122 if (!l.t) 104 if (!l.t)
123 { 105 {
124 lalloc (l); 106 lalloc (l);
125 col = 0; 107 col = 0;
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
142} 124}
143 125
144/* ------------------------------------------------------------------------- */ 126/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 127/* Fill a full line with blanks - make sure it is allocated first */
146void 128void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 129rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
… …
161{ 143{
162#if ENABLE_OVERLAY 144#if ENABLE_OVERLAY
163 scr_overlay_off (); 145 scr_overlay_off ();
164#endif 146#endif
165 147
148 rvideo_mode = false;
166 view_start = 0; 149 view_start = 0;
167 num_scr = 0; 150 num_scr = 0;
168 151
169 if (ncol == 0) 152 if (ncol == 0)
170 ncol = 80; 153 ncol = 80;
… …
173 nrow = 24; 156 nrow = 24;
174 157
175 if (ncol == prev_ncol && nrow == prev_nrow) 158 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 159 return;
177 160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163
178 // we need at least two lines for wrapping to work correctly 164 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 165 while (nrow + saveLines < 2)
180 { 166 {
181 //TODO//FIXME 167 //TODO//FIXME
182 saveLines++; 168 saveLines++;
183 prev_nrow--; 169 prev_nrow--;
184 nsaved++; 170 top_row--;
185 } 171 }
186 172
187 want_refresh = 1; 173 want_refresh = 1;
188 174
189 int prev_total_rows = prev_nrow + saveLines; 175 int prev_total_rows = prev_nrow + saveLines;
… …
195 if (!row_buf) 181 if (!row_buf)
196 { 182 {
197 /* 183 /*
198 * first time called so just malloc everything: don't rely on realloc 184 * first time called so just malloc everything: don't rely on realloc
199 */ 185 */
200 nsaved = 0; /* no saved lines */ 186 top_row = 0;
201 term_start = 0; 187 term_start = 0;
202 188
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 189 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 190 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 191
… …
234 selection.text = NULL; 220 selection.text = NULL;
235 selection.len = 0; 221 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 222 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 223 selection.screen = PRIMARY;
238 selection.clicks = 0; 224 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0;
241 } 225 }
242 else 226 else
243 { 227 {
244 /* 228 /*
245 * add or delete rows as appropriate 229 * add or delete rows as appropriate
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 259 }
276 260
277 line_t *old_buf = row_buf; 261 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 263
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 265 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 266 int q = total_rows; // rewrapped row
283 267
284 if (nsaved) 268 if (top_row)
285 { 269 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 271 // to come up with a lean and mean algorithm.
288 272
289 row_col_t ocur = screen.cur; 273 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 274 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 275
… …
325 qline->l = ncol; 309 qline->l = ncol;
326 qline->is_longer (1); 310 qline->is_longer (1);
327 311
328 int qcol = 0; 312 int qcol = 0;
329 313
314 // see below for cursor adjustment rationale
315 if (p == ocur.row)
316 screen.cur.row = q - (total_rows - nrow);
317
330 // fill a single destination line 318 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 319 while (lofs < llen && qcol < ncol)
332 { 320 {
333 int prow = lofs / prev_ncol; 321 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 322 int pcol = lofs % prev_ncol;
… …
344 332
345 line_t &pline = old_buf [prow]; 333 line_t &pline = old_buf [prow];
346 334
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 336
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 339
355 lofs += len; 340 lofs += len;
356 qcol += len; 341 qcol += len;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 347 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 348 }
364 while (p != pend && q > 0); 349 while (p != pend && q > 0);
365 350
366 term_start = total_rows - nrow; 351 term_start = total_rows - nrow;
367 nsaved = term_start - q; 352 top_row = q - term_start;
368 353
369 // make sure all terminal lines exist 354 // make sure all terminal lines exist
370 while (nsaved < 0) 355 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 356 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 357 }
373 else 358 else
374 { 359 {
375 // if no scrollback exists (yet), wing, instead of wrap 360 // if no scrollback exists (yet), wing, instead of wrap
376 361
377 for (int row = min (nrow, prev_nrow); row--; ) 362 for (int row = min (nrow, prev_nrow); row--; )
378 { 363 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 365 line_t &qline = row_buf [row];
381 366
… …
389 } 374 }
390 375
391 term_start = 0; 376 term_start = 0;
392 } 377 }
393 378
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 379 free (old_buf);
400 delete old_ta; 380 delete old_ta;
401 delete old_ra; 381 delete old_ra;
402 382
403 clamp_it (screen.cur.row, 0, nrow - 1); 383 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 384 clamp_it (screen.cur.col, 0, ncol - 1);
405 385
406 if (tabs)
407 free (tabs); 386 free (tabs);
408 } 387 }
388
389 CLEAR_ALL_SELECTION ();
409 390
410 prev_nrow = nrow; 391 prev_nrow = nrow;
411 prev_ncol = ncol; 392 prev_ncol = ncol;
412 393
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 394 tabs = (char *)rxvt_malloc (ncol);
414 395
415 for (int col = ncol; col--; ) 396 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0; 397 tabs [col] = col % TABSIZE == 0;
417 398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401
418 tt_winch (); 402 tt_winch ();
419 403
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 404 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 405}
422 406
423/* ------------------------------------------------------------------------- */ 407/* ------------------------------------------------------------------------- */
424/* 408/*
425 * Free everything. That way malloc debugging can find leakage. 409 * Free everything. That way malloc debugging can find leakage.
426 */ 410 */
427void 411void
428rxvt_term::scr_release () 412rxvt_term::scr_release () NOTHROW
429{ 413{
414 if (row_buf)
415 {
430 delete talloc; talloc = 0; 416 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 417 delete ralloc; ralloc = 0;
432 418
433 free (row_buf); 419 free (row_buf);
434 free (swap_buf); 420 free (swap_buf);
435 free (drawn_buf); 421 free (drawn_buf);
436 free (tabs); 422 free (tabs);
437 423
438 row_buf = 0; // signal that we freed all the arrays 424 row_buf = 0; // signal that we freed all the arrays
425 }
439} 426}
440 427
441/* ------------------------------------------------------------------------- */ 428/* ------------------------------------------------------------------------- */
442/* 429/*
443 * Hard reset 430 * Hard reset
… …
448 scr_release (); 435 scr_release ();
449 prev_nrow = prev_ncol = 0; 436 prev_nrow = prev_ncol = 0;
450 scr_reset (); 437 scr_reset ();
451 438
452 scr_clear (true); 439 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 440 scr_refresh ();
454} 441}
455 442
456/* ------------------------------------------------------------------------- * 443/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 444 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 445 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 447 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 448 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 449 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 450 */
464void 451void
465rxvt_term::scr_cursor (int mode) 452rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 453{
467 screen_t *s; 454 screen_t *s;
468 455
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 456#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 457 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 489 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 490 assert (s->cur.col >= 0);
504#endif 491#endif
505} 492}
506 493
494void
495rxvt_term::scr_swap_screen ()
496{
497 if (!option (Opt_secondaryScreen))
498 return;
499
500 for (int i = prev_nrow; i--; )
501 ::swap (ROW(i), swap_buf [i]);
502
503 ::swap (screen.cur, swap.cur);
504
505 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
506 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
507}
508
507/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
508/* 510/*
509 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 514 */
513int 515void
514rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn)
515{ 517{
518 if (scrn == current_screen)
519 return;
520
516 want_refresh = 1; 521 want_refresh = 1;
517 view_start = 0; 522 view_start = 0;
518 523
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
523 525
524 int i = current_screen; current_screen = scrn; scrn = i; 526 int i = current_screen; current_screen = scrn; scrn = i;
525 527
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531
532#if NSCREENS 528#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 529 if (option (Opt_secondaryScreen))
534 { 530 {
535 num_scr = 0; 531 num_scr = 0;
536 532
537 for (int i = prev_nrow; i--; ) 533 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 534
540 ::swap (screen.charset, swap.charset); 535 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 536 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 537 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 538 swap.flags |= Screen_VisibleCursor;
544 } 539 }
545 else 540 else
546#endif 541#endif
547 if (OPTION (Opt_secondaryScroll)) 542 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 543 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 544}
552 545
553// clear WrapNext indicator, solidifying position on next line 546// clear WrapNext indicator, solidifying position on next line
554void 547void
555rxvt_term::scr_do_wrap () 548rxvt_term::scr_do_wrap () NOTHROW
556{ 549{
557 if (!(screen.flags & Screen_WrapNext)) 550 if (!(screen.flags & Screen_WrapNext))
558 return; 551 return;
559 552
560 screen.flags &= ~Screen_WrapNext; 553 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 563/* ------------------------------------------------------------------------- */
571/* 564/*
572 * Change the colour for following text 565 * Change the colour for following text
573 */ 566 */
574void 567void
575rxvt_term::scr_color (unsigned int color, int fgbg) 568rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 569{
577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 570 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 571 color = fgbg;
579 572
580 if (fgbg == Color_fg) 573 if (fgbg == Color_fg)
… …
586/* ------------------------------------------------------------------------- */ 579/* ------------------------------------------------------------------------- */
587/* 580/*
588 * Change the rendition style for following text 581 * Change the rendition style for following text
589 */ 582 */
590void 583void
591rxvt_term::scr_rendition (int set, int style) 584rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 585{
593 if (set) 586 if (set)
594 rstyle |= style; 587 rstyle |= style;
595 else if (style == ~RS_None) 588 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 589 rstyle = DEFAULT_RSTYLE;
597 else 590 else
598 rstyle &= ~style; 591 rstyle &= ~style;
599 } 592}
600 593
601/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
602/* 595/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 596 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 597 * count positive ==> scroll up
605 * count negative ==> scroll down 598 * count negative ==> scroll down
606 */ 599 */
607int 600int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 601rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 602{
610 if (count == 0 || (row1 > row2)) 603 if (count == 0 || (row1 > row2))
611 return 0; 604 return 0;
612 605
613 want_refresh = 1; 606 want_refresh = 1;
614 num_scr += count; 607 num_scr += count;
615 608
616 if (count > 0 609 if (count > 0
617 && row1 == 0 610 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 611 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620 { 612 {
621 nsaved = min (nsaved + count, saveLines); 613 top_row = max (top_row - count, -saveLines);
622 614
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 615 // scroll everything up 'count' lines
624
625 term_start = (term_start + count) % total_rows; 616 term_start = (term_start + count) % total_rows;
626 617
618 // sever bottommost line
619 {
620 line_t &l = ROW(row2 - count);
621 l.is_longer (0);
622 l.touch ();
623 }
624
625 // erase newly scrolled-in lines
626 for (int i = count; i--; )
627 {
628 line_t &l = ROW(nrow - 1 - i);
629
630 // optimize if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 {
634 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0;
636 l.f = 0;
637 }
638 else
639 scr_blank_screen_mem (l, rstyle);
640 }
641
642 // now copy lines below the scroll region bottom to the
643 // bottom of the screen again, so they look as if they
644 // hadn't moved.
645 for (int i = nrow; --i > row2; )
646 {
647 line_t &l1 = ROW(i - count);
648 line_t &l2 = ROW(i);
649
650 ::swap (l1, l2);
651 l2.touch ();
652 }
653
654 // move and/or clear selection, if any
627 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
628 { 656 {
629 selection.beg.row -= count; 657 selection.beg.row -= count;
630 selection.end.row -= count; 658 selection.end.row -= count;
631 selection.mark.row -= count; 659 selection.mark.row -= count;
632 660
633 if (selection.beg.row < -nsaved 661 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 662 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 663 || selection.mark.row < top_row)
636 { 664 {
637 CLEAR_ALL_SELECTION (); 665 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 666 selection.op = SELECTION_CLEAR;
639 } 667 }
640 } 668 }
641 669
642 for (int i = count; i--; ) 670 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 671 if (option (Opt_scrollWithBuffer)
655 && view_start != 0 672 && view_start != 0
656 && view_start != saveLines) 673 && view_start != -saveLines)
657 scr_page (UP, count); 674 scr_page (UP, count);
675
676 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
677 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 678 }
659 else 679 else
660 { 680 {
661 if (selection.op && current_screen == selection.screen) 681 if (selection.op && current_screen == selection.screen)
662 { 682 {
… …
674 { 694 {
675 /* move selected region too */ 695 /* move selected region too */
676 selection.beg.row -= count; 696 selection.beg.row -= count;
677 selection.end.row -= count; 697 selection.end.row -= count;
678 selection.mark.row -= count; 698 selection.mark.row -= count;
679 699
680 selection_check (0); 700 selection_check (0);
681 } 701 }
682 } 702 }
683 703
684 // use a simple and robust scrolling algorithm, this 704 // use a simple and robust scrolling algorithm, this
… …
708/* ------------------------------------------------------------------------- */ 728/* ------------------------------------------------------------------------- */
709/* 729/*
710 * Add text given in <str> of length <len> to screen struct 730 * Add text given in <str> of length <len> to screen struct
711 */ 731 */
712void 732void
713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
714{ 734{
715 if (len <= 0) /* sanity */ 735 if (len <= 0) /* sanity */
716 return; 736 return;
717 737
718 unsigned char checksel; 738 unsigned char checksel;
… …
724 ZERO_SCROLLBACK (); 744 ZERO_SCROLLBACK ();
725 745
726 if (minlines > 0) 746 if (minlines > 0)
727 { 747 {
728 minlines += screen.cur.row - screen.bscroll; 748 minlines += screen.cur.row - screen.bscroll;
749 min_it (minlines, screen.cur.row - top_row);
729 750
730 if (minlines > 0 751 if (minlines > 0
731 && screen.tscroll == 0 752 && screen.tscroll == 0
732 && screen.bscroll == nrow - 1) 753 && screen.bscroll == nrow - 1)
733 { 754 {
… …
738 } 759 }
739 760
740#ifdef DEBUG_STRICT 761#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 762 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 763 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 764 && screen.cur.row >= top_row);
744#endif 765#endif
745 int row = screen.cur.row; 766 int row = screen.cur.row;
746 767
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 768 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 769
… …
750 771
751 while (str < strend) 772 while (str < strend)
752 { 773 {
753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
754 775
755 if (c < 0x20) 776 if (expect_false (c < 0x20))
756 if (c == C0_LF) 777 if (c == C0_LF)
757 { 778 {
758 max_it (line->l, screen.cur.col); 779 max_it (line->l, screen.cur.col);
759 780
760 screen.flags &= ~Screen_WrapNext; 781 screen.flags &= ~Screen_WrapNext;
… …
779 { 800 {
780 scr_tab (1, true); 801 scr_tab (1, true);
781 continue; 802 continue;
782 } 803 }
783 804
805 if (expect_false (
784 if (checksel /* see if we're writing within selection */ 806 checksel /* see if we're writing within selection */
785 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
786 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 ))
787 { 810 {
788 checksel = 0; 811 checksel = 0;
789 /* 812 /*
790 * If we wrote anywhere in the selected area, kill the selection 813 * If we wrote anywhere in the selected area, kill the selection
791 * XXX: should we kill the mark too? Possibly, but maybe that 814 * XXX: should we kill the mark too? Possibly, but maybe that
792 * should be a similar check. 815 * should be a similar check.
793 */ 816 */
794 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
795 } 818 }
796 819
797 if (screen.flags & Screen_WrapNext) 820 if (expect_false (screen.flags & Screen_WrapNext))
798 { 821 {
822 scr_do_wrap ();
823
799 max_it (line->l, ncol); 824 line->l = ncol;
800 line->is_longer (1); 825 line->is_longer (1);
801 826
802 scr_do_wrap ();
803
804 row = screen.cur.row; 827 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
806 } 829 }
807 830
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 831 // some utf-8 decoders "decode" surrogate characters: let's fix this.
809 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
810 c = 0xfffd; 833 c = 0xfffd;
811 834
812 // rely on wcwidth to tell us the character width, at least for non-latin1 835 // rely on wcwidth to tell us the character width, do wcwidth before
813 // do wcwidth before further replacements, as wcwidth might return -1 836 // further replacements, as wcwidth might return -1 for the line
814 // for the line drawing characters below as they might be invalid in the current 837 // drawing characters below as they might be invalid in the current
815 // locale. 838 // locale.
816 int width = c < 0x100 ? 1 : wcwidth (c); 839 int width = WCWIDTH (c);
817 840
818 if (charsets [screen.charset] == '0') // DEC SPECIAL 841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
819 { 842 {
820 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
821 // 5f-7e standard vt100 844 // 5f-7e standard vt100
822 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
823 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
836 c = vt100_0[c - 0x41]; 859 c = vt100_0[c - 0x41];
837 width = 1; // vt100 line drawing characters are always single-width 860 width = 1; // vt100 line drawing characters are always single-width
838 } 861 }
839 } 862 }
840 863
841 if (screen.flags & Screen_Insert) 864 if (expect_false (screen.flags & Screen_Insert))
842 scr_insdel_chars (width, INSERT); 865 scr_insdel_chars (width, INSERT);
843 866
844 if (width != 0) 867 if (width != 0)
845 { 868 {
846#if !UNICODE_3 869#if !UNICODE_3
… …
852 c = 0xfffd; 875 c = 0xfffd;
853# endif 876# endif
854#endif 877#endif
855 878
856 // nuke the character at this position, if required 879 // nuke the character at this position, if required
880 if (expect_false (
857 if (line->t[screen.cur.col] == NOCHAR 881 line->t[screen.cur.col] == NOCHAR
858 || (screen.cur.col < ncol - 1 882 || (screen.cur.col < ncol - 1
859 && line->t[screen.cur.col + 1] == NOCHAR)) 883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
860 { 885 {
861 int col = screen.cur.col; 886 int col = screen.cur.col;
862 887
863 // find begin 888 // find begin
864 while (col > 0 && line->t[col] == NOCHAR) 889 while (col > 0 && line->t[col] == NOCHAR)
… …
875 } 900 }
876 901
877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
878 903
879 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
880 if (screen.cur.col > ncol - width && ncol >= width) 905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
881 { 906 {
882 // ...output spaces 907 // ...output spaces
883 c = ' '; 908 c = ' ';
884 // and try the same character next loop iteration 909 // and try the same character next loop iteration
885 --str; 910 --str;
… …
890 do 915 do
891 { 916 {
892 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
893 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
894 919
895 if (screen.cur.col < ncol - 1) 920 if (expect_true (screen.cur.col < ncol - 1))
896 screen.cur.col++; 921 screen.cur.col++;
897 else 922 else
898 { 923 {
899 line->l = ncol; 924 line->l = ncol;
900 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
… …
902 break; 927 break;
903 } 928 }
904 929
905 c = NOCHAR; 930 c = NOCHAR;
906 } 931 }
907 while (--width > 0); 932 while (expect_false (--width > 0));
908 933
909 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
910 if (!width) 935 if (expect_false (!width))
911 { 936 {
912 line->touch (); 937 line->touch ();
913 938
914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
915 { 940 {
916 line->t[c] = ' '; 941 line->t[c] = ' ';
917 line->r[c] = rend; 942 line->r[c] = rend;
918 } 943 }
919 } 944 }
920 } 945 }
946#if ENABLE_COMBINING
921 else // width == 0 947 else // width == 0
922 { 948 {
923#if ENABLE_COMBINING 949 if (c != 0xfeff) // ignore BOM
924 // handle combining characters
925 // we just tag the accent on the previous on-screen character.
926 // this is arguably not correct, but also arguably not wrong.
927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
929 text_t *tp;
930 rend_t *rp;
931
932 if (screen.cur.col > 0)
933 { 950 {
951 // handle combining characters
952 // we just tag the accent on the previous on-screen character.
953 // this is arguably not correct, but also arguably not wrong.
954 // we don't handle double-width characters nicely yet.
955 line_t *linep;
956 text_t *tp;
957 rend_t *rp;
958
959 if (screen.cur.col > 0)
960 {
934 linep = line; 961 linep = line;
935 tp = line->t + screen.cur.col - 1; 962 tp = line->t + screen.cur.col - 1;
936 rp = line->r + screen.cur.col - 1; 963 rp = line->r + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && ROW(screen.cur.row - 1).is_longer ())
967 {
968 linep = &ROW(screen.cur.row - 1);
969 tp = line->t + ncol - 1;
970 rp = line->r + ncol - 1;
971 }
972 else
973 continue;
974
975 linep->touch ();
976
977 while (*tp == NOCHAR && tp > linep->t)
978 tp--, rp--;
979
980 // first try to find a precomposed character
981 unicode_t n = rxvt_compose (*tp, c);
982 if (n == NOCHAR)
983 n = rxvt_composite.compose (*tp, c);
984
985 *tp = n;
986 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
937 } 987 }
938 else if (screen.cur.row > 0
939 && ROW(screen.cur.row - 1).is_longer ())
940 {
941 linep = &ROW(screen.cur.row - 1);
942 tp = line->t + ncol - 1;
943 rp = line->r + ncol - 1;
944 } 988 }
945 else
946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
952
953 // first try to find a precomposed character
954 unicode_t n = rxvt_compose (*tp, c);
955 if (n == NOCHAR)
956 n = rxvt_composite.compose (*tp, c);
957
958 *tp = n;
959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
960#endif 989#endif
961 }
962 } 990 }
963 991
964 max_it (line->l, screen.cur.col); 992 max_it (line->l, screen.cur.col);
965 993
966#ifdef DEBUG_STRICT 994#ifdef DEBUG_STRICT
… …
972/* 1000/*
973 * Process Backspace. Move back the cursor back a position, wrap if have to 1001 * Process Backspace. Move back the cursor back a position, wrap if have to
974 * XTERM_SEQ: CTRL-H 1002 * XTERM_SEQ: CTRL-H
975 */ 1003 */
976void 1004void
977rxvt_term::scr_backspace () 1005rxvt_term::scr_backspace () NOTHROW
978{ 1006{
979 want_refresh = 1;
980
981 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
982 { 1008 {
983 if (screen.cur.row > 0) 1009 if (screen.cur.row > 0)
984 { 1010 {
985#ifdef TERMCAP_HAS_BW 1011#ifdef TERMCAP_HAS_BW
986 screen.cur.col = ncol - 1; 1012 screen.cur.col = ncol - 1;
987 screen.cur.row--; 1013 --screen.cur.row;
988 return; 1014
1015 want_refresh = 1;
989#endif 1016#endif
990 } 1017 }
991 } 1018 }
992 else if (!(screen.flags & Screen_WrapNext)) 1019 else
993 scr_gotorc (0, -1, RELATIVE); 1020 scr_gotorc (0, -1, RELATIVE);
994
995 screen.flags &= ~Screen_WrapNext;
996} 1021}
997 1022
998/* ------------------------------------------------------------------------- */ 1023/* ------------------------------------------------------------------------- */
999/* 1024/*
1000 * Process Horizontal Tab 1025 * Process Horizontal Tab
1001 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
1002 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
1003 */ 1028 */
1004void 1029void
1005rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
1006{ 1031{
1007 int i, x; 1032 int i, x;
1008 1033
1009 want_refresh = 1; 1034 want_refresh = 1;
1010 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
… …
1023 x = i; 1048 x = i;
1024 1049
1025 if (!--count) 1050 if (!--count)
1026 break; 1051 break;
1027 } 1052 }
1028 else 1053 else
1029 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
1030 && RS_SAME (l.r[i], base_rend); 1055 && RS_SAME (l.r[i], base_rend);
1031 1056
1032 if (count) 1057 if (count)
1033 x = ncol - 1; 1058 x = ncol - 1;
1034 1059
1035 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
1036 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
1037 if (ht && OPTION (Opt_pastableTabs)) 1062 if (ht && option (Opt_pastableTabs))
1038 { 1063 {
1039 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
1040 1065
1041 l.touch (x); 1066 l.touch (x);
1042 1067
… …
1075 * Process DEC Back Index 1100 * Process DEC Back Index
1076 * XTERM_SEQ: ESC 6 1101 * XTERM_SEQ: ESC 6
1077 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
1078 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1079 */ 1104 */
1080#if ENABLE_FRILLS 1105#if !ENABLE_MINIMAL
1081void 1106void
1082rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1083{ 1108{
1084 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086 else 1111 else
1087 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1092 * Process DEC Forward Index 1117 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1118 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1096 */ 1121 */
1097#if ENABLE_FRILLS 1122#if !ENABLE_MINIMAL
1098void 1123void
1099rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1100{ 1125{
1101 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103 else 1128 else
1104 { 1129 {
… …
1117/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1118/* 1143/*
1119 * Goto Row/Column 1144 * Goto Row/Column
1120 */ 1145 */
1121void 1146void
1122rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1123{ 1148{
1124 want_refresh = 1; 1149 want_refresh = 1;
1125 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1126 1151
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1149 } 1174 }
1150 } 1175 }
1151 else 1176 else
1152 { 1177 {
1153 if (screen.flags & Screen_Relative) 1178 if (screen.flags & Screen_Relative)
1179 {
1154 { /* relative origin mode */ 1180 /* relative origin mode */
1155 screen.cur.row = row + screen.tscroll; 1181 screen.cur.row = row + screen.tscroll;
1156 min_it (screen.cur.row, screen.bscroll); 1182 min_it (screen.cur.row, screen.bscroll);
1157 } 1183 }
1158 else 1184 else
1159 screen.cur.row = row; 1185 screen.cur.row = row;
… …
1165/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1166/* 1192/*
1167 * direction should be UP or DN 1193 * direction should be UP or DN
1168 */ 1194 */
1169void 1195void
1170rxvt_term::scr_index (enum page_dirn direction) 1196rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1171{ 1197{
1172 int dirn; 1198 int dirn;
1173 1199
1174 want_refresh = 1; 1200 want_refresh = 1;
1175 ZERO_SCROLLBACK (); 1201 ZERO_SCROLLBACK ();
… …
1192/* 1218/*
1193 * Erase part or whole of a line 1219 * Erase part or whole of a line
1194 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1195 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1223 * extension: clear to right unless wrapped: ESC [ 3 K
1197 */ 1224 */
1198void 1225void
1199rxvt_term::scr_erase_line (int mode) 1226rxvt_term::scr_erase_line (int mode) NOTHROW
1200{ 1227{
1201 unsigned int col, num; 1228 unsigned int col, num;
1202 1229
1203 want_refresh = 1; 1230 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1231 ZERO_SCROLLBACK ();
… …
1210 line.touch (); 1237 line.touch ();
1211 line.is_longer (0); 1238 line.is_longer (0);
1212 1239
1213 switch (mode) 1240 switch (mode)
1214 { 1241 {
1242 case 3:
1243 if (screen.flags & Screen_WrapNext)
1244 return;
1245
1246 /* fall through */
1247
1215 case 0: /* erase to end of line */ 1248 case 0: /* erase to end of line */
1216 col = screen.cur.col; 1249 col = screen.cur.col;
1217 num = ncol - col; 1250 num = ncol - col;
1218 min_it (line.l, col); 1251 min_it (line.l, col);
1252
1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1221 CLEAR_SELECTION (); 1255 CLEAR_SELECTION ();
1222 break; 1256 break;
1257
1223 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
1224 col = 0; 1259 col = 0;
1225 num = screen.cur.col + 1; 1260 num = screen.cur.col + 1;
1261
1226 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1262 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1227 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1263 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1228 CLEAR_SELECTION (); 1264 CLEAR_SELECTION ();
1229 break; 1265 break;
1266
1230 case 2: /* erase whole line */ 1267 case 2: /* erase whole line */
1231 col = 0; 1268 col = 0;
1232 num = ncol; 1269 num = ncol;
1233 line.l = 0; 1270 line.l = 0;
1234 if (selection.beg.row <= screen.cur.row 1271 if (selection.beg.row <= screen.cur.row
… …
1248 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251 */ 1288 */
1252void 1289void
1253rxvt_term::scr_erase_screen (int mode) 1290rxvt_term::scr_erase_screen (int mode) NOTHROW
1254{ 1291{
1255 int num; 1292 int num;
1256 int32_t row; 1293 int32_t row;
1257 rend_t ren; 1294 rend_t ren;
1258 XGCValues gcvalue; 1295 XGCValues gcvalue;
… …
1292 if (row >= nrow) /* Out Of Bounds */ 1329 if (row >= nrow) /* Out Of Bounds */
1293 return; 1330 return;
1294 1331
1295 min_it (num, nrow - row); 1332 min_it (num, nrow - row);
1296 1333
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1297 if (rstyle & (RS_RVid | RS_Uline)) 1335 if (rstyle & (RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1336 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1337 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1338 {
1301 ren = DEFAULT_RSTYLE; 1339 ren = DEFAULT_RSTYLE;
1302 CLEAR_ROWS (row, num); 1340
1341 if (mapped)
1342 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False);
1303 } 1345 }
1304 else 1346 else
1305 { 1347 {
1306 ren = rstyle & (RS_fgMask | RS_bgMask); 1348 ren = rstyle & (RS_fgMask | RS_bgMask);
1349
1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1308 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1351 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1352 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row),
1354 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num));
1310 gcvalue.foreground = pix_colors[Color_fg]; 1356 gcvalue.foreground = pix_colors[Color_fg];
1311 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1357 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1312 } 1358 }
1313 1359
1314 for (; num--; row++) 1360 for (; num--; row++)
1315 { 1361 {
1316 scr_blank_screen_mem (ROW(row), rstyle); 1362 scr_blank_screen_mem (ROW(row), rstyle);
1317 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1363 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1318 } 1364 }
1319} 1365}
1320 1366
1321#if ENABLE_FRILLS 1367#if !ENABLE_MINIMAL
1322void 1368void
1323rxvt_term::scr_erase_savelines () 1369rxvt_term::scr_erase_savelines () NOTHROW
1324{ 1370{
1325 want_refresh = 1; 1371 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1372 ZERO_SCROLLBACK ();
1327 1373
1328 nsaved = 0; 1374 top_row = 0;
1329} 1375}
1330#endif 1376#endif
1331 1377
1332/* ------------------------------------------------------------------------- */ 1378/* ------------------------------------------------------------------------- */
1333/* 1379/*
1334 * Fill the screen with `E's 1380 * Fill the screen with `E's
1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1381 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1336 */ 1382 */
1337void 1383void
1338rxvt_term::scr_E () 1384rxvt_term::scr_E () NOTHROW
1339{ 1385{
1340 rend_t fs; 1386 rend_t fs;
1341 1387
1342 want_refresh = 1; 1388 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1389 ZERO_SCROLLBACK ();
… …
1364/* ------------------------------------------------------------------------- */ 1410/* ------------------------------------------------------------------------- */
1365/* 1411/*
1366 * Insert/Delete <count> lines 1412 * Insert/Delete <count> lines
1367 */ 1413 */
1368void 1414void
1369rxvt_term::scr_insdel_lines (int count, int insdel) 1415rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1370{ 1416{
1371 int end; 1417 int end;
1372 1418
1373 ZERO_SCROLLBACK (); 1419 ZERO_SCROLLBACK ();
1374 1420
… …
1394/* ------------------------------------------------------------------------- */ 1440/* ------------------------------------------------------------------------- */
1395/* 1441/*
1396 * Insert/Delete <count> characters from the current position 1442 * Insert/Delete <count> characters from the current position
1397 */ 1443 */
1398void 1444void
1399rxvt_term::scr_insdel_chars (int count, int insdel) 1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1400{ 1446{
1401 int col, row; 1447 int col, row;
1402 rend_t tr; 1448 rend_t tr;
1403 1449
1404 want_refresh = 1; 1450 want_refresh = 1;
… …
1435 { 1481 {
1436 if (selection.end.row != screen.cur.row 1482 if (selection.end.row != screen.cur.row
1437 || (selection.end.col + count >= ncol)) 1483 || (selection.end.col + count >= ncol))
1438 CLEAR_SELECTION (); 1484 CLEAR_SELECTION ();
1439 else 1485 else
1486 {
1440 { /* shift selection */ 1487 /* shift selection */
1441 selection.beg.col += count; 1488 selection.beg.col += count;
1442 selection.mark.col += count; /* XXX: yes? */ 1489 selection.mark.col += count; /* XXX: yes? */
1443 selection.end.col += count; 1490 selection.end.col += count;
1444 } 1491 }
1445 } 1492 }
… …
1450 case ERASE: 1497 case ERASE:
1451 screen.cur.col += count; /* don't worry if > ncol */ 1498 screen.cur.col += count; /* don't worry if > ncol */
1452 selection_check (1); 1499 selection_check (1);
1453 screen.cur.col -= count; 1500 screen.cur.col -= count;
1454 1501
1455 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, screen.cur.col, count, rstyle); 1502 scr_blank_line (*line, screen.cur.col, count, rstyle);
1457 break; 1503 break;
1458 1504
1459 case DELETE: 1505 case DELETE:
1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1492/* 1538/*
1493 * Set the scrolling region 1539 * Set the scrolling region
1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1540 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495 */ 1541 */
1496void 1542void
1497rxvt_term::scr_scroll_region (int top, int bot) 1543rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1498{ 1544{
1499 max_it (top, 0); 1545 max_it (top, 0);
1500 min_it (bot, nrow - 1); 1546 min_it (bot, nrow - 1);
1501 1547
1502 if (top > bot) 1548 if (top > bot)
… …
1512 * Make the cursor visible/invisible 1558 * Make the cursor visible/invisible
1513 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1559 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1560 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515 */ 1561 */
1516void 1562void
1517rxvt_term::scr_cursor_visible (int mode) 1563rxvt_term::scr_cursor_visible (int mode) NOTHROW
1518{ 1564{
1519 want_refresh = 1; 1565 want_refresh = 1;
1520 1566
1521 if (mode) 1567 if (mode)
1522 screen.flags |= Screen_VisibleCursor; 1568 screen.flags |= Screen_VisibleCursor;
… …
1529 * Set/unset automatic wrapping 1575 * Set/unset automatic wrapping
1530 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1576 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1577 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532 */ 1578 */
1533void 1579void
1534rxvt_term::scr_autowrap (int mode) 1580rxvt_term::scr_autowrap (int mode) NOTHROW
1535{ 1581{
1536 if (mode) 1582 if (mode)
1537 screen.flags |= Screen_Autowrap; 1583 screen.flags |= Screen_Autowrap;
1538 else 1584 else
1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1585 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1548 * and the cursor cannot be moved outside. 1594 * and the cursor cannot be moved outside.
1549 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1595 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1596 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551 */ 1597 */
1552void 1598void
1553rxvt_term::scr_relative_origin (int mode) 1599rxvt_term::scr_relative_origin (int mode) NOTHROW
1554{ 1600{
1555 if (mode) 1601 if (mode)
1556 screen.flags |= Screen_Relative; 1602 screen.flags |= Screen_Relative;
1557 else 1603 else
1558 screen.flags &= ~Screen_Relative; 1604 screen.flags &= ~Screen_Relative;
… …
1565 * Set insert/replace mode 1611 * Set insert/replace mode
1566 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1612 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1613 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568 */ 1614 */
1569void 1615void
1570rxvt_term::scr_insert_mode (int mode) 1616rxvt_term::scr_insert_mode (int mode) NOTHROW
1571{ 1617{
1572 if (mode) 1618 if (mode)
1573 screen.flags |= Screen_Insert; 1619 screen.flags |= Screen_Insert;
1574 else 1620 else
1575 screen.flags &= ~Screen_Insert; 1621 screen.flags &= ~Screen_Insert;
… …
1581 * XTERM_SEQ: Set tab at current column : ESC H 1627 * XTERM_SEQ: Set tab at current column : ESC H
1582 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1628 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1629 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584 */ 1630 */
1585void 1631void
1586rxvt_term::scr_set_tab (int mode) 1632rxvt_term::scr_set_tab (int mode) NOTHROW
1587{ 1633{
1588 if (mode < 0) 1634 if (mode < 0)
1589 memset (tabs, 0, ncol * sizeof (char)); 1635 memset (tabs, 0, ncol);
1590 else if (screen.cur.col < ncol) 1636 else if (screen.cur.col < ncol)
1591 tabs [screen.cur.col] = !!mode; 1637 tabs [screen.cur.col] = !!mode;
1592} 1638}
1593 1639
1594/* ------------------------------------------------------------------------- */ 1640/* ------------------------------------------------------------------------- */
… …
1596 * Set reverse/normal video 1642 * Set reverse/normal video
1597 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1643 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1644 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1645 */
1600void 1646void
1601rxvt_term::scr_rvideo_mode (int mode) 1647rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1602{ 1648{
1603 XGCValues gcvalue; 1649 rvideo_mode = on;
1604 1650
1651#ifndef NO_BELL
1652 on ^= rvideo_bell;
1653#endif
1654
1605 if (rvideo != mode) 1655 if (rvideo_state != on)
1606 { 1656 {
1607 rvideo = mode; 1657 rvideo_state = on;
1658
1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1659 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609#if XPM_BACKGROUND 1660#ifdef HAVE_BG_PIXMAP
1610 if (bgPixmap.pixmap == None) 1661 if (bgPixmap.pixmap == None)
1611#endif 1662#endif
1612#if TRANSPARENT 1663 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1614#endif
1615 XSetWindowBackground (display->display, vt,
1616 pix_colors[Color_bg]);
1617 1664
1665 XGCValues gcvalue;
1618 gcvalue.foreground = pix_colors[Color_fg]; 1666 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = pix_colors[Color_bg]; 1667 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, gc, GCBackground | GCForeground, 1668 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1621 &gcvalue); 1669
1622 scr_clear (); 1670 scr_clear ();
1623 scr_touch (true); 1671 scr_touch (true);
1624 } 1672 }
1625} 1673}
1626 1674
… …
1628/* 1676/*
1629 * Report current cursor position 1677 * Report current cursor position
1630 * XTERM_SEQ: Report position: ESC [ 6 n 1678 * XTERM_SEQ: Report position: ESC [ 6 n
1631 */ 1679 */
1632void 1680void
1633rxvt_term::scr_report_position () 1681rxvt_term::scr_report_position () NOTHROW
1634{ 1682{
1635 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1683 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636} 1684}
1637 1685
1638/* ------------------------------------------------------------------------- * 1686/* ------------------------------------------------------------------------- *
… …
1641 1689
1642/* 1690/*
1643 * Set font style 1691 * Set font style
1644 */ 1692 */
1645void 1693void
1646rxvt_term::set_font_style () 1694rxvt_term::set_font_style () NOTHROW
1647{ 1695{
1648#if 0 1696#if 0
1649 switch (charsets [screen.charset]) 1697 switch (charsets [screen.charset])
1650 { 1698 {
1651 case '0': /* DEC Special Character & Line Drawing Set */ 1699 case '0': /* DEC Special Character & Line Drawing Set */
… …
1673 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1721 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1674 * XTERM_SEQ: Invoke G2 character set: ESC N 1722 * XTERM_SEQ: Invoke G2 character set: ESC N
1675 * XTERM_SEQ: Invoke G3 character set: ESC O 1723 * XTERM_SEQ: Invoke G3 character set: ESC O
1676 */ 1724 */
1677void 1725void
1678rxvt_term::scr_charset_choose (int set) 1726rxvt_term::scr_charset_choose (int set) NOTHROW
1679{ 1727{
1680 screen.charset = set; 1728 screen.charset = set;
1681 set_font_style (); 1729 set_font_style ();
1682} 1730}
1683 1731
… …
1689 * XTERM_SEQ: Set G2 character set: ESC * <C> 1737 * XTERM_SEQ: Set G2 character set: ESC * <C>
1690 * XTERM_SEQ: Set G3 character set: ESC + <C> 1738 * XTERM_SEQ: Set G3 character set: ESC + <C>
1691 * See set_font_style for possible values for <C> 1739 * See set_font_style for possible values for <C>
1692 */ 1740 */
1693void 1741void
1694rxvt_term::scr_charset_set (int set, unsigned int ch) 1742rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1695{ 1743{
1696 charsets[set] = (unsigned char)ch; 1744 charsets[set] = (unsigned char)ch;
1697 set_font_style (); 1745 set_font_style ();
1698} 1746}
1699 1747
… …
1704 1752
1705/* 1753/*
1706 * refresh matching text. 1754 * refresh matching text.
1707 */ 1755 */
1708bool 1756bool
1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1757rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1710{ 1758{
1711 bool found = false; 1759 bool found = false;
1712 1760
1713 for (int i = 0; i < nrow; i++) 1761 for (int i = 0; i < nrow; i++)
1714 { 1762 {
1715 int col = 0;
1716 rend_t *drp = drawn_buf[i].r; 1763 rend_t *drp = drawn_buf[i].r;
1717 1764
1718 for (; col < ncol; col++, drp++) 1765 for (int col = 0; col < ncol; col++, drp++)
1719 if ((*drp & mask) == value) 1766 if ((*drp & mask) == value)
1720 { 1767 {
1721 found = true; 1768 found = true;
1722 *drp = ~value; 1769 *drp = ~value;
1723 } 1770 }
… …
1734 PART_END, 1781 PART_END,
1735 RC_COUNT 1782 RC_COUNT
1736}; 1783};
1737 1784
1738void 1785void
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1786rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740{ 1787{
1741 int i; 1788 int i;
1742 row_col_t rc[RC_COUNT]; 1789 row_col_t rc[RC_COUNT];
1743 1790
1744 if (!drawn_buf) /* sanity check */ 1791 if (!drawn_buf) /* sanity check */
… …
1763 for (i = PART_BEG; i < RC_COUNT; i++) 1810 for (i = PART_BEG; i < RC_COUNT; i++)
1764 { 1811 {
1765 min_it (rc[i].col, ncol - 1); 1812 min_it (rc[i].col, ncol - 1);
1766 min_it (rc[i].row, nrow - 1); 1813 min_it (rc[i].row, nrow - 1);
1767 } 1814 }
1768 1815// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1816 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1817 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1818
1819 num_scr_allow = 0;
1820
1772 if (refresh) 1821 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1822 scr_refresh ();
1774} 1823}
1775 1824
1776/* ------------------------------------------------------------------------- */ 1825/* ------------------------------------------------------------------------- */
1777/* 1826/*
1778 * Refresh the entire screen 1827 * Refresh the entire screen
1779 */ 1828 */
1780void 1829void
1781rxvt_term::scr_touch (bool refresh) 1830rxvt_term::scr_touch (bool refresh) NOTHROW
1782{ 1831{
1783 scr_expose (0, 0, width, height, refresh); 1832 scr_expose (0, 0, width, height, refresh);
1784} 1833}
1785 1834
1786/* ------------------------------------------------------------------------- */ 1835/* ------------------------------------------------------------------------- */
1787/* 1836/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1837 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1838 * the top of the screen
1790 */ 1839 */
1791int 1840void
1792rxvt_term::scr_move_to (int y, int len) 1841rxvt_term::scr_move_to (int y, int len) NOTHROW
1793{ 1842{
1794 long p = 0; 1843 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1844}
1810 1845
1811/* ------------------------------------------------------------------------- */ 1846/* ------------------------------------------------------------------------- */
1812/* 1847/*
1813 * Page the screen up/down nlines 1848 * Page the screen up/down nlines
1814 * direction should be UP or DN 1849 * direction should be UP or DN
1815 */ 1850 */
1816int 1851bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1852rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818{ 1853{
1819 int n; 1854 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1855 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1856 : view_start + nlines;
1833 }
1834 1857
1835 return scr_changeview (oldviewstart); 1858 return scr_changeview (new_view_start);
1836} 1859}
1837 1860
1838int 1861bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1862rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1863{
1864 clamp_it (new_view_start, top_row, 0);
1865
1841 if (view_start != oldviewstart) 1866 if (new_view_start == view_start)
1842 { 1867 return false;
1868
1869 num_scr += new_view_start - view_start;
1870 view_start = new_view_start;
1871 want_refresh = 1;
1872
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1873 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1874
1845 want_refresh = 1; 1875 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1876}
1851 1877
1852/* ------------------------------------------------------------------------- */ 1878#ifndef NO_BELL
1853void 1879void
1880rxvt_term::bell_cb (ev::timer &w, int revents)
1881{
1882 rvideo_bell = false;
1883 scr_rvideo_mode (rvideo_mode);
1884 refresh_check ();
1885}
1886#endif
1887
1888/* ------------------------------------------------------------------------- */
1889void
1854rxvt_term::scr_bell () 1890rxvt_term::scr_bell () NOTHROW
1855{ 1891{
1856#ifndef NO_BELL 1892#ifndef NO_BELL
1857 1893
1858# ifndef NO_MAPALERT 1894# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1895# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1896 if (option (Opt_mapAlert))
1861# endif 1897# endif
1862 XMapWindow (display->display, parent[0]); 1898 XMapWindow (dpy, parent[0]);
1863# endif 1899# endif
1864 1900
1901# if ENABLE_FRILLS
1902 if (option (Opt_urgentOnBell))
1903 set_urgency (1);
1904# endif
1905
1865 if (OPTION (Opt_visualBell)) 1906 if (option (Opt_visualBell))
1866 { 1907 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1908 rvideo_bell = true;
1909 scr_rvideo_mode (rvideo_mode);
1868 display->flush (); 1910 flush ();
1911
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1912 bell_ev.start (VISUAL_BELL_DURATION);
1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 } 1913 }
1872 else 1914 else
1873 XBell (display->display, 0); 1915 XBell (dpy, 0);
1874
1875#endif 1916#endif
1876} 1917}
1877 1918
1878/* ------------------------------------------------------------------------- */ 1919/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1920/* ARGSUSED */
1880void 1921void
1881rxvt_term::scr_printscreen (int fullhist) 1922rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1923{
1883#ifdef PRINTPIPE 1924#ifdef PRINTPIPE
1884 int nrows, row_start; 1925 int nrows, row_start;
1885 FILE *fd; 1926 FILE *fd = popen_printer ();
1886 1927
1887 if ((fd = popen_printer ()) == NULL) 1928 if (!fd)
1888 return; 1929 return;
1889 1930
1890 if (fullhist) 1931 if (fullhist)
1891 { 1932 {
1892 nrows = nrow + nsaved; 1933 nrows = nrow - top_row;
1893 row_start = -nsaved; 1934 row_start = top_row;
1894 } 1935 }
1895 else 1936 else
1896 { 1937 {
1897 nrows = nrow; 1938 nrows = nrow;
1898 row_start = -view_start; 1939 row_start = view_start;
1899 } 1940 }
1900 1941
1901 wctomb (0, 0); 1942 wctomb (0, 0);
1902 1943
1903 for (int r1 = 0; r1 < nrows; r1++) 1944 for (int r1 = 0; r1 < nrows; r1++)
… …
1935 * Refresh the screen 1976 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 1977 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 1978 * screen.text/screen.rend contain what the screen will change to.
1938 */ 1979 */
1939void 1980void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1981rxvt_term::scr_refresh () NOTHROW
1941{ 1982{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 1983 unsigned char have_bg,
1943 showcursor; /* show the cursor */ 1984 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 1985 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 1986 ocrow; /* old cursor row */
1946 int i; /* tmp */ 1987 int i; /* tmp */
1947#ifndef NO_CURSORCOLOR 1988#ifndef NO_CURSORCOLOR
1948 rend_t cc1; /* store colours at cursor position (s) */ 1989 rend_t cc1; /* store colours at cursor position (s) */
1949#endif 1990#endif
1950 rend_t *crp; // cursor rendition pointer 1991 rend_t *crp; // cursor rendition pointer
1992 rend_t ccol1, /* Cursor colour */
1993 ccol2; /* Cursor colour2 */
1951 1994
1952 want_refresh = 0; /* screen is current */ 1995 want_refresh = 0; /* screen is current */
1953 1996
1954 if (refresh_type == NO_REFRESH || !mapped) 1997 if (refresh_type == NO_REFRESH || !mapped)
1955 return; 1998 return;
1956 1999
1957 /* 2000 /*
1958 * A: set up vars 2001 * A: set up vars
1959 */ 2002 */
1960 must_clear = 0;
1961 refresh_count = 0; 2003 refresh_count = 0;
1962 2004
1963#if XPM_BACKGROUND 2005 have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP
1964 must_clear |= bgPixmap.pixmap != None; 2007 have_bg = bgPixmap.pixmap != None;
1965#endif
1966#if TRANSPARENT
1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1968#endif 2008#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 2010
1971 /* 2011 /*
1972 * B: reverse any characters which are selected 2012 * B: reverse any characters which are selected
… …
1976 /* 2016 /*
1977 * C: set the cursor character (s) 2017 * C: set the cursor character (s)
1978 */ 2018 */
1979 { 2019 {
1980 unsigned char setoldcursor; 2020 unsigned char setoldcursor;
1981 rend_t ccol1, /* Cursor colour */
1982 ccol2; /* Cursor colour2 */
1983 2021
1984 showcursor = (screen.flags & Screen_VisibleCursor); 2022 showcursor = (screen.flags & Screen_VisibleCursor);
1985#ifdef CURSOR_BLINK 2023#ifdef CURSOR_BLINK
1986 if (hidden_cursor) 2024 if (hidden_cursor)
1987 showcursor = 0; 2025 showcursor = 0;
… …
1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2032 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1995 col--; 2033 col--;
1996 2034
1997 crp = &ROW(screen.cur.row).r[col]; 2035 crp = &ROW(screen.cur.row).r[col];
1998 2036
2037#ifndef NO_CURSORCOLOR
2038 cc1 = *crp & (RS_fgMask | RS_bgMask);
2039 if (ISSET_PIXCOLOR (Color_cursor))
2040 ccol1 = Color_cursor;
2041 else
2042#endif
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044 ccol1 = fgcolor_of (rstyle);
2045#else
2046 ccol1 = Color_fg;
2047#endif
2048
2049#ifndef NO_CURSORCOLOR
2050 if (ISSET_PIXCOLOR (Color_cursor2))
2051 ccol2 = Color_cursor2;
2052 else
2053#endif
2054#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2055 ccol2 = bgcolor_of (rstyle);
2056#else
2057 ccol2 = Color_bg;
2058#endif
2059
1999 if (showcursor && focus) 2060 if (showcursor && focus)
2000 { 2061 {
2001 if (OPTION (Opt_cursorUnderline)) 2062 if (option (Opt_cursorUnderline))
2002 *crp ^= RS_Uline; 2063 *crp ^= RS_Uline;
2003 else 2064 else
2004 { 2065 {
2005 *crp ^= RS_RVid; 2066 *crp ^= RS_RVid;
2006
2007#ifndef NO_CURSORCOLOR
2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2009 if (ISSET_PIXCOLOR (Color_cursor))
2010 ccol1 = Color_cursor;
2011 else
2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2013 ccol1 = fgcolor_of (rstyle);
2014#else
2015 ccol1 = Color_fg;
2016#endif
2017 if (ISSET_PIXCOLOR (Color_cursor2))
2018 ccol2 = Color_cursor2;
2019 else
2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2021 ccol2 = bgcolor_of (rstyle);
2022#else
2023 ccol2 = Color_bg;
2024#endif
2025 *crp = SET_FGCOLOR (*crp, ccol1); 2067 *crp = SET_FGCOLOR (*crp, ccol1);
2026 *crp = SET_BGCOLOR (*crp, ccol2); 2068 *crp = SET_BGCOLOR (*crp, ccol2);
2027#endif
2028 } 2069 }
2029 } 2070 }
2030 } 2071 }
2031 2072
2032 /* make sure no outline cursor is left around */ 2073 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2074 setoldcursor = 0;
2034 if (ocrow != -1) 2075 if (ocrow != -1)
2035 { 2076 {
2036 if (screen.cur.row + view_start != ocrow 2077 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2078 || screen.cur.col != oldcursor.col)
2038 { 2079 {
2039 if (ocrow < nrow 2080 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2081 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2082 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2090 else if (!focus)
2050 setoldcursor = 1; 2091 setoldcursor = 1;
2051 2092
2052 if (setoldcursor) 2093 if (setoldcursor)
2053 { 2094 {
2054 if (screen.cur.row + view_start >= nrow) 2095 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2096 oldcursor.row = -1;
2056 else 2097 else
2057 { 2098 {
2058 oldcursor.row = screen.cur.row + view_start; 2099 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2100 oldcursor.col = screen.cur.col;
2060 } 2101 }
2061 } 2102 }
2062 } 2103 }
2063 2104
… …
2069#ifndef NO_SLOW_LINK_SUPPORT 2110#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2111 /*
2071 * D: CopyArea pass - very useful for slower links 2112 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2113 * This has been deliberately kept simple.
2073 */ 2114 */
2074 i = num_scr;
2075 if (!display->is_local 2115 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2116 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2117 && abs (num_scr) < nrow && !have_bg)
2078 { 2118 {
2079 int16_t nits; 2119 int16_t nits;
2120 int i = num_scr;
2080 int j; 2121 int j;
2081 int len, wlen; 2122 int len, wlen;
2123 dLocal (int, num_scr);
2082 2124
2083 j = nrow; 2125 j = nrow;
2084 wlen = len = -1; 2126 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2127 row = i > 0 ? 0 : j - 1;
2128
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2129 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2130 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2131 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2132 {
2090 line_t s = ROW(row - view_start); 2133 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2134 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2135 line_t d2 = drawn_buf[row + i];
2093 2136
2094 for (nits = 0, col = ncol; col--; ) 2137 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2138 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2111 wlen = row; 2154 wlen = row;
2112 continue; 2155 continue;
2113 } 2156 }
2114 } 2157 }
2115 2158
2116 if (len != -1) 2159 if (len >= 0)
2117 { 2160 {
2118 /* also comes here at end if needed because of >= above */ 2161 /* also comes here at end if needed because of >= above */
2119 if (wlen < len) 2162 if (wlen < len)
2120 ::swap (wlen, len); 2163 ::swap (wlen, len);
2121 2164
2165 XGCValues gcv;
2166
2167 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2122 XCopyArea (display->display, vt, vt, 2168 XCopyArea (dpy, vt, vt,
2123 gc, 0, Row2Pixel (len + i), 2169 gc, 0, Row2Pixel (len + i),
2124 (unsigned int)this->width, 2170 (unsigned int)this->width,
2125 (unsigned int)Height2Pixel (wlen - len + 1), 2171 (unsigned int)Height2Pixel (wlen - len + 1),
2126 0, Row2Pixel (len)); 2172 0, Row2Pixel (len));
2173 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2174
2127 len = -1; 2175 len = -1;
2128 } 2176 }
2129 } 2177 }
2130 } 2178 }
2131#endif 2179#endif
… …
2133 /* 2181 /*
2134 * E: main pass across every character 2182 * E: main pass across every character
2135 */ 2183 */
2136 for (row = 0; row < nrow; row++) 2184 for (row = 0; row < nrow; row++)
2137 { 2185 {
2138 text_t *stp = ROW(row - view_start).t; 2186 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2187 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2188 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2189 rend_t *drp = drawn_buf[row].r;
2142 2190
2143 /* 2191 /*
2144 * E2: OK, now the real pass 2192 * E2: OK, now the real pass
… …
2155 continue; 2203 continue;
2156 2204
2157 // redraw one or more characters 2205 // redraw one or more characters
2158 2206
2159 // seek to the beginning of wide characters 2207 // seek to the beginning of wide characters
2160 while (stp[col] == NOCHAR && col > 0) 2208 while (expect_false (stp[col] == NOCHAR && col > 0))
2161 --col; 2209 --col;
2162 2210
2163 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2164 text_t *text = stp + col; 2212 text_t *text = stp + col;
2165 int count = 1; 2213 int count = 1;
… …
2187 count++; 2235 count++;
2188 2236
2189 if (stp[col] != dtp[col] 2237 if (stp[col] != dtp[col]
2190 || !RS_SAME (srp[col], drp[col])) 2238 || !RS_SAME (srp[col], drp[col]))
2191 { 2239 {
2192 if (must_clear && (i++ > count / 2)) 2240 if (have_bg && (i++ > count / 2))
2193 break; 2241 break;
2194 2242
2195 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2196 drp[col] = rend; 2244 drp[col] = rend;
2197 i = 0; 2245 i = 0;
2198 } 2246 }
2199 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2247 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2200 break; 2248 break;
2201 } 2249 }
2202 2250
2203 col--; /* went one too far. move back */ 2251 col--; /* went one too far. move back */
2204 count -= i; /* dump any matching trailing chars */ 2252 count -= i; /* dump any matching trailing chars */
2205 2253
2206 // sometimes we optimize away the trailing NOCHAR's, add them back 2254 // sometimes we optimize away the trailing NOCHAR's, add them back
2207 while (i && text[count] == NOCHAR) 2255 while (expect_false (i && text[count] == NOCHAR))
2208 count++, i--; 2256 count++, i--;
2209 2257
2210 /* 2258 /*
2211 * Determine the attributes for the string 2259 * Determine the attributes for the string
2212 */ 2260 */
2213 int fore = fgcolor_of (rend); // desired foreground 2261 int fore = fgcolor_of (rend); // desired foreground
2214 int back = bgcolor_of (rend); // desired background 2262 int back = bgcolor_of (rend); // desired background
2215 2263
2216 // only do special processing if any attributes are set, which is unlikely 2264 // only do special processing if any attributes are set, which is unlikely
2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2265 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2218 { 2266 {
2219#if ENABLE_STYLES
2220 // force redraw after "careful" characters to avoid pixel droppings
2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2222 drp[col + 1] = ~srp[col + 1];
2223
2224 // include previous careful character(s) if possible, looks nicer (best effort...)
2225 while (text > stp
2226 && srp[text - stp - 1] & RS_Careful
2227 && RS_SAME (rend, srp[text - stp - 1]))
2228 text--, count++, xpixel -= fwidth;
2229#endif
2230
2231 bool invert = rend & RS_RVid; 2267 bool invert = rend & RS_RVid;
2232 2268
2233#ifndef NO_BOLD_UNDERLINE_REVERSE 2269#ifndef NO_BOLD_UNDERLINE_REVERSE
2234 if (rend & RS_Bold
2235 && fore == Color_fg) 2270 if (rend & RS_Bold && fore == Color_fg)
2236 { 2271 {
2237 if (ISSET_PIXCOLOR (Color_BD)) 2272 if (ISSET_PIXCOLOR (Color_BD))
2238 fore = Color_BD; 2273 fore = Color_BD;
2239# if !ENABLE_STYLES 2274# if !ENABLE_STYLES
2240 else 2275 else
2241 invert = !invert; 2276 invert = !invert;
2242# endif 2277# endif
2243 } 2278 }
2244 2279
2245 if (rend & RS_Italic 2280 if (rend & RS_Italic && fore == Color_fg)
2246 && fore == Color_fg)
2247 { 2281 {
2248 if (ISSET_PIXCOLOR (Color_IT)) 2282 if (ISSET_PIXCOLOR (Color_IT))
2249 fore = Color_IT; 2283 fore = Color_IT;
2250# if !ENABLE_STYLES 2284# if !ENABLE_STYLES
2251 else 2285 else
2252 invert = !invert; 2286 invert = !invert;
2253# endif 2287# endif
2254 } 2288 }
2255 2289
2256 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2257 fore = Color_UL; 2291 fore = Color_UL;
2258#endif 2292#endif
2259 2293
2260 if (invert) 2294 if (invert)
2261 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2262 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2263 2307
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2265 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2266 back = Color_RV; 2311 back = Color_RV;
2267 2312# endif
2268 if (fore == back) 2313 if (fore == back)
2269 { 2314 {
2270 fore = Color_bg; 2315 fore = Color_bg;
2271 back = Color_fg; 2316 back = Color_fg;
2272 } 2317 }
… …
2274 } 2319 }
2275 2320
2276#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2277 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2278 { 2323 {
2279 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2280 { 2325 {
2281 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2282 hidden_text = 0; 2327 hidden_text = 0;
2283 } 2328 }
2284 else if (hidden_text) 2329 else if (hidden_text)
2285 fore = back; 2330 fore = back;
2286 } 2331 }
2287#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2288 } 2351 }
2289 2352
2290 /* 2353 /*
2291 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2292 */ 2355 */
2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2294 2357
2295 if (back == fore) 2358 if (expect_true (have_bg && back == Color_bg))
2296 font->clear_rect (*drawable, xpixel, ypixel,
2297 fwidth * count, fheight,
2298 back);
2299 else if (back == Color_bg)
2300 { 2359 {
2301 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2302 {
2303 CLEAR_CHARS (xpixel, ypixel, count);
2304 2361
2305 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2306 if (text[i] != ' ') 2363 if (text[i] != ' ')
2307 { 2364 {
2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2309 break; 2366 goto did_clear;
2310 }
2311 } 2367 }
2312 else 2368
2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2314 } 2371 }
2315 else 2372 else
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2317 2374
2318 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2319 { 2376 {
2320#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2321 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2322 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2323 else 2380 else
2324#endif 2381#endif
2325 XSetForeground (display->display, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2326 2383
2327 XDrawLine (display->display, drawBuffer, gc, 2384 XDrawLine (dpy, vt, gc,
2328 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 } 2387 }
2331 } /* for (col....) */ 2388 } /* for (col....) */
2332 } /* for (row....) */ 2389 } /* for (row....) */
… …
2341 */ 2398 */
2342 if (showcursor) 2399 if (showcursor)
2343 { 2400 {
2344 if (focus) 2401 if (focus)
2345 { 2402 {
2346 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2347 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2348 else 2405 else
2349 { 2406 {
2350 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2351#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366 cursorwidth++; 2423 cursorwidth++;
2367 2424
2368#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2369 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2371#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2372 2431
2373 XDrawRectangle (display->display, drawBuffer, gc, 2432 XDrawRectangle (dpy, vt, gc,
2374 Col2Pixel (col), 2433 Col2Pixel (col),
2375 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2376 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2378 } 2437 }
… …
2386 num_scr = 0; 2445 num_scr = 0;
2387 num_scr_allow = 1; 2446 num_scr_allow = 1;
2388} 2447}
2389 2448
2390void 2449void
2391rxvt_term::scr_remap_chars (line_t &l) 2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392{ 2451{
2393 if (!l.t) 2452 if (!l.t)
2394 return; 2453 return;
2395 2454
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2398 for (int i = ncol; i--; ) 2457 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400} 2459}
2401 2460
2402void 2461void
2403rxvt_term::scr_remap_chars () 2462rxvt_term::scr_remap_chars () NOTHROW
2404{ 2463{
2405 for (int i = total_rows; i--; ) 2464 for (int i = total_rows; i--; )
2406 scr_remap_chars (row_buf [i]); 2465 scr_remap_chars (row_buf [i]);
2407 2466
2408 for (int i = nrow; i--; ) 2467 for (int i = nrow; i--; )
… …
2411 scr_remap_chars (swap_buf [i]); 2470 scr_remap_chars (swap_buf [i]);
2412 } 2471 }
2413} 2472}
2414 2473
2415void 2474void
2416rxvt_term::scr_recolour () 2475rxvt_term::scr_recolour () NOTHROW
2417{ 2476{
2418 if (1 2477#ifdef HAVE_BG_PIXMAP
2419#if TRANSPARENT 2478 bgPixmap.apply ();
2420 && !am_transparent 2479#else
2421#endif 2480
2422#if XPM_BACKGROUND
2423 && !bgPixmap.pixmap
2424#endif
2425 )
2426 {
2427 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2428 XClearWindow (display->display, parent[0]); 2482 XClearWindow (dpy, parent[0]);
2429 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2430#if HAVE_SCROLLBARS 2484
2431 if (scrollBar.win) 2485 if (scrollBar.win)
2432 { 2486 {
2433 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2434 scrollBar.setIdle (); 2488 scrollBar.state = STATE_IDLE;
2435 scrollbar_show (0); 2489 scrollBar.show (0);
2436 }
2437#endif
2438 } 2490 }
2439 2491
2492#endif
2493
2494 /* bgPixmap.apply () does not do the following : */
2440 scr_clear (); 2495 scr_clear ();
2441 scr_touch (true); 2496 scr_touch (true);
2442 want_refresh = 1; 2497 want_refresh = 1;
2443} 2498}
2444 2499
2445/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2446void 2501void
2447rxvt_term::scr_clear (bool really) 2502rxvt_term::scr_clear (bool really) NOTHROW
2448{ 2503{
2449 if (!mapped) 2504 if (!mapped)
2450 return; 2505 return;
2451 2506
2452 num_scr_allow = 0; 2507 num_scr_allow = 0;
2453 want_refresh = 1; 2508 want_refresh = 1;
2454 2509
2455 if (really) 2510 if (really)
2456 XClearWindow (display->display, vt); 2511 XClearWindow (dpy, vt);
2457} 2512}
2458 2513
2459void 2514void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2515rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461{ 2516{
2462 int view_end = -view_start + nrow; 2517 int view_end = view_start + nrow;
2463 int row, col; 2518 int row, col;
2464 2519
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2520 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 { 2521 {
2467 text_t *stp = ROW(row).t; 2522 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r; 2523 rend_t *srp = ROW(row).r;
2469 2524
2470 for (col = beg_col; col < end_col; col++) 2525 for (col = beg_col; col < end_col; col++)
… …
2477 srp[col] ^= rstyle2; 2532 srp[col] ^= rstyle2;
2478 } 2533 }
2479} 2534}
2480 2535
2481void 2536void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2537rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483{ 2538{
2484 int view_end = -view_start + nrow; 2539 int view_end = view_start + nrow;
2485 int row, col; 2540 int row, col;
2486 2541
2487 if (beg_row >= -view_start) 2542 if (beg_row >= view_start)
2488 { 2543 {
2489 col = beg_col; 2544 col = beg_col;
2490 row = beg_row; 2545 row = beg_row;
2491 } 2546 }
2492 else 2547 else
2493 { 2548 {
2494 col = 0; 2549 col = 0;
2495 row = -view_start; 2550 row = view_start;
2496 } 2551 }
2497 2552
2498 for (; row < min (end_row, view_end); row++, col = 0) 2553 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2554 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle; 2555 srp[col] ^= rstyle;
… …
2504 srp[col] ^= rstyle; 2559 srp[col] ^= rstyle;
2505} 2560}
2506 2561
2507/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2508void 2563void
2509rxvt_term::scr_reverse_selection () 2564rxvt_term::scr_reverse_selection () NOTHROW
2510{ 2565{
2511 if (selection.op 2566 if (selection.op
2512 && current_screen == selection.screen 2567 && current_screen == selection.screen
2513 && selection.end.row >= -view_start) 2568 && selection.end.row >= view_start)
2514 { 2569 {
2515#if ENABLE_FRILLS 2570#if !ENABLE_MINIMAL
2516 if (selection.rect) 2571 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2572 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2573 selection.end.row, selection.end.col,
2519 RS_RVid, RS_RVid | RS_Uline); 2574 RS_RVid, RS_RVid | RS_Uline);
2520 else 2575 else
… …
2530 * Dump the whole scrollback and screen to the passed filedescriptor. The 2585 * Dump the whole scrollback and screen to the passed filedescriptor. The
2531 * invoking routine must close the fd. 2586 * invoking routine must close the fd.
2532 */ 2587 */
2533#if 0 2588#if 0
2534void 2589void
2535rxvt_term::scr_dump (int fd) 2590rxvt_term::scr_dump (int fd) NOTHROW
2536{ 2591{
2537 int row, wrote; 2592 int row, wrote;
2538 unsigned int width, towrite; 2593 unsigned int width, towrite;
2539 char r1[] = "\n"; 2594 char r1[] = "\n";
2540 2595
2541 for (row = saveLines - nsaved; 2596 for (row = saveLines + top_row;
2542 row < saveLines + nrow - 1; row++) 2597 row < saveLines + nrow - 1; row++)
2543 { 2598 {
2544 width = row_buf[row].l >= 0 ? row_buf[row].l 2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2545 : ncol; 2600 : ncol;
2546 for (towrite = width; towrite; towrite -= wrote) 2601 for (towrite = width; towrite; towrite -= wrote)
… …
2559 2614
2560/* ------------------------------------------------------------------------- * 2615/* ------------------------------------------------------------------------- *
2561 * CHARACTER SELECTION * 2616 * CHARACTER SELECTION *
2562 * ------------------------------------------------------------------------- */ 2617 * ------------------------------------------------------------------------- */
2563void 2618void
2564rxvt_term::selection_check (int check_more) 2619rxvt_term::selection_check (int check_more) NOTHROW
2565{ 2620{
2566 row_col_t pos; 2621 row_col_t pos;
2567 2622
2568 if (!selection.op) 2623 if (!selection.op)
2569 return; 2624 return;
2570 2625
2571 pos.row = pos.col = 0; 2626 pos.row = pos.col = 0;
2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575 || (check_more == 1 2630 || (check_more == 1
2576 && current_screen == selection.screen 2631 && current_screen == selection.screen
2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2579 || (check_more == 2 2634 || (check_more == 2
… …
2590/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2591/* 2646/*
2592 * Paste a selection direct to the command fd 2647 * Paste a selection direct to the command fd
2593 */ 2648 */
2594void 2649void
2595rxvt_term::paste (char *data, unsigned int len) 2650rxvt_term::paste (char *data, unsigned int len) NOTHROW
2596{ 2651{
2597 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2598 for (unsigned int i = 0; i < len; i++) 2653 for (unsigned int i = 0; i < len; i++)
2599 if (data[i] == C0_LF) 2654 if (data[i] == C0_LF)
2600 data[i] = C0_CR; 2655 data[i] = C0_CR;
2601 2656
2657 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~");
2659
2602 tt_write (data, len); 2660 tt_write (data, len);
2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~");
2603} 2664}
2604 2665
2605/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2606/* 2667/*
2607 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
2608 * EXT: SelectionNotify 2669 * EXT: SelectionNotify
2609 */ 2670 */
2610void 2671void
2611rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2612{ 2673{
2613 if (prop == None) /* check for failed XConvertSelection */ 2674 if (prop == None) /* check for failed XConvertSelection */
2614 { 2675 {
2615 if ((selection_type & Sel_CompoundText)) 2676 if ((selection_type & Sel_CompoundText))
2616 { 2677 {
… …
2636 } 2697 }
2637 2698
2638 unsigned long bytes_after; 2699 unsigned long bytes_after;
2639 XTextProperty ct; 2700 XTextProperty ct;
2640 2701
2641 if (XGetWindowProperty (display->display, win, prop, 2702 if (XGetWindowProperty (dpy, win, prop,
2642 0, PROP_SIZE / 4, 2703 0, PROP_SIZE / 4,
2643 delete_prop, AnyPropertyType, 2704 delete_prop, AnyPropertyType,
2644 &ct.encoding, &ct.format, 2705 &ct.encoding, &ct.format,
2645 &ct.nitems, &bytes_after, 2706 &ct.nitems, &bytes_after,
2646 &ct.value) != Success) 2707 &ct.value) != Success)
… …
2655 if (bytes_after) 2716 if (bytes_after)
2656 { 2717 {
2657 // fetch and append remaining data 2718 // fetch and append remaining data
2658 XTextProperty ct2; 2719 XTextProperty ct2;
2659 2720
2660 if (XGetWindowProperty (display->display, win, prop, 2721 if (XGetWindowProperty (dpy, win, prop,
2661 ct.nitems / 4, (bytes_after + 3) / 4, 2722 ct.nitems / 4, (bytes_after + 3) / 4,
2662 delete_prop, AnyPropertyType, 2723 delete_prop, AnyPropertyType,
2663 &ct2.encoding, &ct2.format, 2724 &ct2.encoding, &ct2.format,
2664 &ct2.nitems, &bytes_after, 2725 &ct2.nitems, &bytes_after,
2665 &ct2.value) != Success) 2726 &ct2.value) != Success)
… …
2678 2739
2679 if (ct.encoding == xa[XA_INCR]) 2740 if (ct.encoding == xa[XA_INCR])
2680 { 2741 {
2681 // INCR selection, start handshake 2742 // INCR selection, start handshake
2682 if (!delete_prop) 2743 if (!delete_prop)
2683 XDeleteProperty (display->display, win, prop); 2744 XDeleteProperty (dpy, win, prop);
2684 2745
2685 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2686 incr_buf_fill = 0; 2747 incr_buf_fill = 0;
2687 incr_ev.start (NOW + 10); 2748 incr_ev.start (10);
2688 2749
2689 goto bailout; 2750 goto bailout;
2690 } 2751 }
2691 2752
2692 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
… …
2701 ct.nitems = incr_buf_fill; 2762 ct.nitems = incr_buf_fill;
2702 incr_buf = 0; 2763 incr_buf = 0;
2703 incr_buf_size = 0; 2764 incr_buf_size = 0;
2704 incr_ev.stop (); 2765 incr_ev.stop ();
2705 } 2766 }
2706 else 2767 else
2707 { 2768 {
2708 if (selection_wait == Sel_normal 2769 if (selection_wait == Sel_normal
2709 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2710 { 2771 {
2711 /* 2772 /*
… …
2718 goto bailout; 2779 goto bailout;
2719 } 2780 }
2720 } 2781 }
2721 else if (selection_wait == Sel_incr) 2782 else if (selection_wait == Sel_incr)
2722 { 2783 {
2723 incr_ev.start (NOW + 10); 2784 incr_ev.start (10);
2724 2785
2725 while (incr_buf_fill + ct.nitems > incr_buf_size) 2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2726 { 2787 {
2727 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2728 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2735 } 2796 }
2736 2797
2737 char **cl; 2798 char **cl;
2738 int cr; 2799 int cr;
2739 2800
2740#if ENABLE_FRILLS 2801#if !ENABLE_MINIMAL
2741 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2742 // so recode it manually 2803 // so recode it manually
2743 if (ct.encoding == xa[XA_UTF8_STRING]) 2804 if (ct.encoding == xa[XA_UTF8_STRING])
2744 { 2805 {
2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2749 paste (s, strlen (s)); 2810 paste (s, strlen (s));
2750 free (s); 2811 free (s);
2751 } 2812 }
2752 else 2813 else
2753#endif 2814#endif
2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2815 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2755 && cl) 2816 && cl)
2756 { 2817 {
2757 for (int i = 0; i < cr; i++) 2818 for (int i = 0; i < cr; i++)
2758 paste (cl[i], strlen (cl[i])); 2819 paste (cl[i], strlen (cl[i]));
2759 2820
… …
2768 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2769 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2770} 2831}
2771 2832
2772void 2833void
2773rxvt_term::incr_cb (time_watcher &w) 2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2774{ 2835{
2775 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2776 2837
2777 incr_buf_size = 0; 2838 incr_buf_size = 0;
2778 free (incr_buf); 2839 free (incr_buf);
2779 2840
2780 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2781} 2842}
2782 2843
2783void 2844void
2784rxvt_term::selection_property (Window win, Atom prop) 2845rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2785{ 2846{
2786 if (prop == None || selection_wait != Sel_incr) 2847 if (prop == None || selection_wait != Sel_incr)
2787 return; 2848 return;
2788 2849
2789 selection_paste (win, prop, true); 2850 selection_paste (win, prop, true);
2790} 2851}
2791 2852
2792/* ------------------------------------------------------------------------- */ 2853/* ------------------------------------------------------------------------- */
2793/* 2854/*
2794 * Request the current selection: 2855 * Request the current selection:
2795 * Order: > internal selection if available 2856 * Order: > internal selection if available
2796 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2797 * > CUT_BUFFER0 2858 * > CUT_BUFFER0
2798 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2799 * will auto fallback to CUT_BUFFER0 2860 * will auto fallback to CUT_BUFFER0
2800 * EXT: button 2 release 2861 * EXT: button 2 release
2801 */ 2862 */
2802void 2863void
2803rxvt_term::selection_request (Time tm, int x, int y) 2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804{ 2865{
2805 if (x < 0 || x >= width || y < 0 || y >= height) 2866 if (selection.text && selnum == Sel_Primary)
2806 return; /* outside window */ 2867 {
2807
2808 if (selection.text)
2809 { /* internal selection */ 2868 /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2870 paste (str, strlen (str));
2812 free (str); 2871 free (str);
2813 return; 2872 return;
2814 } 2873 }
2815 else 2874 else
2816 { 2875 {
2817 int i;
2818
2819 selection_request_time = tm; 2876 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2877 selection_wait = Sel_normal;
2821 2878
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2879#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2880 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2882 return;
2828#else 2883#else
2829 selection_type = Sel_CompoundText; 2884 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2886 return;
2832#endif 2887#endif
2833 }
2834 } 2888 }
2835 2889
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2890 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2891 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2892}
2839 2893
2840int 2894int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2895rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2896{
2843 Atom sel; 2897 Atom sel;
2844 2898
2845 selection_type |= selnum; 2899 selection_type |= selnum;
2846 2900
… …
2849 else if (selnum == Sel_Secondary) 2903 else if (selnum == Sel_Secondary)
2850 sel = XA_SECONDARY; 2904 sel = XA_SECONDARY;
2851 else 2905 else
2852 sel = xa[XA_CLIPBOARD]; 2906 sel = xa[XA_CLIPBOARD];
2853 2907
2854 if (XGetSelectionOwner (display->display, sel) != None) 2908 if (XGetSelectionOwner (dpy, sel) != None)
2855 { 2909 {
2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2910 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2857 vt, selection_request_time); 2911 vt, selection_request_time);
2858 return 1; 2912 return 1;
2859 } 2913 }
2860 2914
2861 return 0; 2915 return 0;
… …
2865/* 2919/*
2866 * Clear all selected text 2920 * Clear all selected text
2867 * EXT: SelectionClear 2921 * EXT: SelectionClear
2868 */ 2922 */
2869void 2923void
2870rxvt_term::selection_clear () 2924rxvt_term::selection_clear () NOTHROW
2871{ 2925{
2872 want_refresh = 1; 2926 want_refresh = 1;
2873 free (selection.text); 2927 free (selection.text);
2874 selection.text = NULL; 2928 selection.text = NULL;
2875 selection.len = 0; 2929 selection.len = 0;
… …
2924 2978
2925 int end_col; 2979 int end_col;
2926 2980
2927 for (; row <= selection.end.row; row++, col = 0) 2981 for (; row <= selection.end.row; row++, col = 0)
2928 { 2982 {
2929#if ENABLE_FRILLS 2983#if !ENABLE_MINIMAL
2930 if (selection.rect) 2984 if (selection.rect)
2931 { 2985 {
2932 col = selection.beg.col; 2986 col = selection.beg.col;
2933 end_col = ncol + 1; 2987 end_col = ncol + 1;
2934 } 2988 }
… …
2937 end_col = ROW(row).l; 2991 end_col = ROW(row).l;
2938 2992
2939 col = max (col, 0); 2993 col = max (col, 0);
2940 2994
2941 if (row == selection.end.row 2995 if (row == selection.end.row
2942#if ENABLE_FRILLS 2996#if !ENABLE_MINIMAL
2943 || selection.rect 2997 || selection.rect
2944#endif 2998#endif
2945 ) 2999 )
2946 min_it (end_col, selection.end.col); 3000 min_it (end_col, selection.end.col);
2947 3001
… …
2970#endif 3024#endif
2971 else 3025 else
2972 new_selection_text[ofs++] = *t++; 3026 new_selection_text[ofs++] = *t++;
2973 } 3027 }
2974 3028
2975#if ENABLE_FRILLS 3029#if !ENABLE_MINIMAL
2976 if (selection.rect) 3030 if (selection.rect)
2977 { 3031 {
2978 while (ofs 3032 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF 3033 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1])) 3034 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3010 3064
3011 selection_grab (tm); 3065 selection_grab (tm);
3012} 3066}
3013 3067
3014bool 3068bool
3015rxvt_term::selection_grab (Time tm) 3069rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3070{
3017 selection_time = tm; 3071 selection_time = tm;
3018 3072
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3021 { 3075 {
3022 display->set_selection_owner (this); 3076 display->set_selection_owner (this);
3023 return true; 3077 return true;
3024 } 3078 }
3025 else 3079 else
3080 {
3081 selection_clear ();
3026 return false; 3082 return false;
3083 }
3027 3084
3028#if 0 3085#if 0
3029 XTextProperty ct; 3086 XTextProperty ct;
3030 3087
3031 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3088 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3032 { 3089 {
3033 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3090 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3034 XFree (ct.value); 3091 XFree (ct.value);
3035 } 3092 }
3036#endif 3093#endif
… …
3040/* 3097/*
3041 * Mark or select text based upon number of clicks: 1, 2, or 3 3098 * Mark or select text based upon number of clicks: 1, 2, or 3
3042 * EXT: button 1 press 3099 * EXT: button 1 press
3043 */ 3100 */
3044void 3101void
3045rxvt_term::selection_click (int clicks, int x, int y) 3102rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3046{ 3103{
3047 clicks = ((clicks - 1) % 3) + 1; 3104 clicks = ((clicks - 1) % 3) + 1;
3048 selection.clicks = clicks; /* save clicks so extend will work */ 3105 selection.clicks = clicks; /* save clicks so extend will work */
3049 3106
3050 if (clicks == 2 && !selection.rect 3107 if (clicks == 2 && !selection.rect
3051 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) 3108 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3052 { 3109 {
3053 MEvent.clicks = 1; // what a mess 3110 MEvent.clicks = 1; // what a mess
3111 selection.screen = current_screen;
3112 selection.op = SELECTION_CONT;
3054 return; 3113 return;
3055 } 3114 }
3056 3115
3057 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3116 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3058 3117
3059 if (clicks == 2 || clicks == 3) 3118 if (clicks == 2 || clicks == 3)
3060 selection_extend_colrow (selection.mark.col, 3119 selection_extend_colrow (selection.mark.col,
3061 selection.mark.row + view_start, 3120 selection.mark.row - view_start,
3062 0, /* button 3 */ 3121 0, /* button 3 */
3063 1, /* button press */ 3122 1, /* button press */
3064 0); /* click change */ 3123 0); /* click change */
3065} 3124}
3066 3125
3067/* ------------------------------------------------------------------------- */ 3126/* ------------------------------------------------------------------------- */
3068/* 3127/*
3069 * Mark a selection at the specified col/row 3128 * Mark a selection at the specified col/row
3070 */ 3129 */
3071void 3130void
3072rxvt_term::selection_start_colrow (int col, int row) 3131rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3073{ 3132{
3074 want_refresh = 1; 3133 want_refresh = 1;
3075 3134
3076 selection.mark.row = row - view_start; 3135 selection.mark.row = row + view_start;
3077 selection.mark.col = col; 3136 selection.mark.col = col;
3078 3137
3079 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3138 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3080 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3139 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3081 3140
3082 while (selection.mark.col > 0 3141 while (selection.mark.col > 0
3083 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3142 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3084 --selection.mark.col; 3143 --selection.mark.col;
3085 3144
3086 if (selection.op) 3145 if (selection.op)
3146 {
3087 { /* clear the old selection */ 3147 /* clear the old selection */
3088 selection.beg.row = selection.end.row = selection.mark.row; 3148 selection.beg.row = selection.end.row = selection.mark.row;
3089 selection.beg.col = selection.end.col = selection.mark.col; 3149 selection.beg.col = selection.end.col = selection.mark.col;
3090 } 3150 }
3091 3151
3092 selection.op = SELECTION_INIT; 3152 selection.op = SELECTION_INIT;
… …
3103#define DELIMIT_TEXT(x) \ 3163#define DELIMIT_TEXT(x) \
3104 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3164 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3105#define DELIMIT_REND(x) 1 3165#define DELIMIT_REND(x) 1
3106 3166
3107void 3167void
3108rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3168rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3109{ 3169{
3110 int col, row, dirnadd, tcol, trow, w1, w2; 3170 int col, row, dirnadd, tcol, trow, w1, w2;
3111 row_col_t bound; 3171 row_col_t bound;
3112 text_t *stp; 3172 text_t *stp;
3113 rend_t *srp; 3173 rend_t *srp;
3114 3174
3115 if (dirn == UP) 3175 if (dirn == UP)
3116 { 3176 {
3117 bound.row = - nsaved - 1; 3177 bound.row = top_row - 1;
3118 bound.col = 0; 3178 bound.col = 0;
3119 dirnadd = -1; 3179 dirnadd = -1;
3120 } 3180 }
3121 else 3181 else
3122 { 3182 {
… …
3187 * flag == 0 ==> button 1 3247 * flag == 0 ==> button 1
3188 * flag == 1 ==> button 3 press 3248 * flag == 1 ==> button 3 press
3189 * flag == 2 ==> button 3 motion 3249 * flag == 2 ==> button 3 motion
3190 */ 3250 */
3191void 3251void
3192rxvt_term::selection_extend (int x, int y, int flag) 3252rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3193{ 3253{
3194 int col = clamp (Pixel2Col (x), 0, ncol); 3254 int col = clamp (Pixel2Col (x), 0, ncol);
3195 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3255 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3196 3256
3197 /* 3257 /*
… …
3200 * select nothing. Otherwise, if we're to the right of the mark, you have to 3260 * select nothing. Otherwise, if we're to the right of the mark, you have to
3201 * be _past_ a character for it to be selected. 3261 * be _past_ a character for it to be selected.
3202 */ 3262 */
3203 if (((selection.clicks % 3) == 1) && !flag 3263 if (((selection.clicks % 3) == 1) && !flag
3204 && (col == selection.mark.col 3264 && (col == selection.mark.col
3205 && (row == selection.mark.row + view_start))) 3265 && (row == selection.mark.row - view_start)))
3206 { 3266 {
3207 /* select nothing */ 3267 /* select nothing */
3208 selection.beg.row = selection.end.row = 0; 3268 selection.beg.row = selection.end.row = 0;
3209 selection.beg.col = selection.end.col = 0; 3269 selection.beg.col = selection.end.col = 0;
3210 selection.clicks = 4; 3270 selection.clicks = 4;
… …
3223/* ------------------------------------------------------------------------- */ 3283/* ------------------------------------------------------------------------- */
3224/* 3284/*
3225 * Extend the selection to the specified col/row 3285 * Extend the selection to the specified col/row
3226 */ 3286 */
3227void 3287void
3228rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3288rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3229{ 3289{
3230 row_col_t pos; 3290 row_col_t pos;
3231 enum { 3291 enum {
3232 LEFT, RIGHT 3292 LEFT, RIGHT
3233 } closeto = RIGHT; 3293 } closeto = RIGHT;
… …
3265 selection.beg.col = selection.end.col = selection.mark.col; 3325 selection.beg.col = selection.end.col = selection.mark.col;
3266 selection.beg.row = selection.end.row = selection.mark.row; 3326 selection.beg.row = selection.end.row = selection.mark.row;
3267 } 3327 }
3268 3328
3269 pos.col = col; 3329 pos.col = col;
3270 pos.row = row - view_start; 3330 pos.row = view_start + row;
3271 3331
3272 /* 3332 /*
3273 * This is mainly xterm style selection with a couple of differences, mainly 3333 * This is mainly xterm style selection with a couple of differences, mainly
3274 * in the way button3 drag extension works. 3334 * in the way button3 drag extension works.
3275 * We're either doing: button1 drag; button3 press; or button3 drag 3335 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3281 * a point/word/line which is either the start or end of the selection 3341 * a point/word/line which is either the start or end of the selection
3282 * and it was decided by whichever point/word/line was `fixed' at the 3342 * and it was decided by whichever point/word/line was `fixed' at the
3283 * time of the most recent button3 press 3343 * time of the most recent button3 press
3284 */ 3344 */
3285 if (button3 && buttonpress) 3345 if (button3 && buttonpress)
3346 {
3286 { /* button3 press */ 3347 /* button3 press */
3287 /* 3348 /*
3288 * first determine which edge of the selection we are closest to 3349 * first determine which edge of the selection we are closest to
3289 */ 3350 */
3290 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3351 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3291 || (!ROWCOL_IS_AFTER (pos, selection.end) 3352 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3309 selection.mark.row = selection.beg.row; 3370 selection.mark.row = selection.beg.row;
3310 selection.mark.col = selection.beg.col; 3371 selection.mark.col = selection.beg.col;
3311 } 3372 }
3312 } 3373 }
3313 else 3374 else
3375 {
3314 { /* button1 drag or button3 drag */ 3376 /* button1 drag or button3 drag */
3315 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3377 if (ROWCOL_IS_AFTER (selection.mark, pos))
3316 { 3378 {
3317 if (selection.mark.row == selection.end.row 3379 if (selection.mark.row == selection.end.row
3318 && selection.mark.col == selection.end.col 3380 && selection.mark.col == selection.end.col
3319 && clickchange 3381 && clickchange
… …
3336 3398
3337 if (selection.clicks == 1) 3399 if (selection.clicks == 1)
3338 { 3400 {
3339 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3401 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3340 && !ROW(selection.beg.row).is_longer () 3402 && !ROW(selection.beg.row).is_longer ()
3341#if ENABLE_FRILLS 3403#if !ENABLE_MINIMAL
3342 && !selection.rect 3404 && !selection.rect
3343#endif 3405#endif
3344 ) 3406 )
3345 selection.beg.col = ncol; 3407 selection.beg.col = ncol;
3346 3408
3347 if ( 3409 if (
3348 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3410 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3349 && !ROW(selection.end.row).is_longer () 3411 && !ROW(selection.end.row).is_longer ()
3350#if ENABLE_FRILLS 3412#if !ENABLE_MINIMAL
3351 && !selection.rect 3413 && !selection.rect
3352#endif 3414#endif
3353 ) 3415 )
3354 selection.end.col = ncol; 3416 selection.end.col = ncol;
3355 } 3417 }
… …
3362 selection_delimit_word (DN, &selection.end, &selection.end); 3424 selection_delimit_word (DN, &selection.end, &selection.end);
3363 } 3425 }
3364 else if (selection.clicks == 3) 3426 else if (selection.clicks == 3)
3365 { 3427 {
3366#if ENABLE_FRILLS 3428#if ENABLE_FRILLS
3367 if (OPTION (Opt_tripleclickwords)) 3429 if (option (Opt_tripleclickwords))
3368 { 3430 {
3369 selection_delimit_word (UP, &selection.beg, &selection.beg); 3431 selection_delimit_word (UP, &selection.beg, &selection.beg);
3370 3432
3371 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3433 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3372 { 3434 {
3373 if (!ROW(end_row).is_longer ()) 3435 if (!ROW(end_row).is_longer ())
3374 { 3436 {
3375 selection.end.row = end_row; 3437 selection.end.row = end_row;
3376 selection.end.col = ROW(end_row).l; 3438 selection.end.col = ROW(end_row).l;
3439# if !ENABLE_MINIMAL
3377 selection_remove_trailing_spaces (); 3440 selection_remove_trailing_spaces ();
3441# endif
3378 break; 3442 break;
3379 } 3443 }
3380 } 3444 }
3381 } 3445 }
3382 else 3446 else
… …
3398 selection.end.row++; 3462 selection.end.row++;
3399 } 3463 }
3400 } 3464 }
3401 3465
3402 if (button3 && buttonpress) 3466 if (button3 && buttonpress)
3467 {
3403 { /* mark may need to be changed */ 3468 /* mark may need to be changed */
3404 if (closeto == LEFT) 3469 if (closeto == LEFT)
3405 { 3470 {
3406 selection.mark.row = selection.end.row; 3471 selection.mark.row = selection.end.row;
3407 selection.mark.col = selection.end.col - (selection.clicks == 2); 3472 selection.mark.col = selection.end.col - (selection.clicks == 2);
3408 } 3473 }
… …
3411 selection.mark.row = selection.beg.row; 3476 selection.mark.row = selection.beg.row;
3412 selection.mark.col = selection.beg.col; 3477 selection.mark.col = selection.beg.col;
3413 } 3478 }
3414 } 3479 }
3415 3480
3416#if ENABLE_FRILLS 3481#if !ENABLE_MINIMAL
3417 if (selection.rect && selection.beg.col > selection.end.col) 3482 if (selection.rect && selection.beg.col > selection.end.col)
3418 ::swap (selection.beg.col, selection.end.col); 3483 ::swap (selection.beg.col, selection.end.col);
3419#endif 3484#endif
3420} 3485}
3421 3486
3422#if ENABLE_FRILLS 3487#if !ENABLE_MINIMAL
3423void 3488void
3424rxvt_term::selection_remove_trailing_spaces () 3489rxvt_term::selection_remove_trailing_spaces () NOTHROW
3425{ 3490{
3426 int32_t end_col, end_row; 3491 int32_t end_col, end_row;
3427 text_t *stp; 3492 text_t *stp;
3428 3493
3429 end_col = selection.end.col; 3494 end_col = selection.end.col;
… …
3467/* 3532/*
3468 * Double click on button 3 when already selected 3533 * Double click on button 3 when already selected
3469 * EXT: button 3 double click 3534 * EXT: button 3 double click
3470 */ 3535 */
3471void 3536void
3472rxvt_term::selection_rotate (int x, int y) 3537rxvt_term::selection_rotate (int x, int y) NOTHROW
3473{ 3538{
3474 selection.clicks = selection.clicks % 3 + 1; 3539 selection.clicks = selection.clicks % 3 + 1;
3475 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3540 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3476} 3541}
3477 3542
… …
3479/* 3544/*
3480 * Respond to a request for our current selection 3545 * Respond to a request for our current selection
3481 * EXT: SelectionRequest 3546 * EXT: SelectionRequest
3482 */ 3547 */
3483void 3548void
3484rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3485{ 3550{
3486 XSelectionEvent ev; 3551 XSelectionEvent ev;
3487 dDisp;
3488 3552
3489 ev.type = SelectionNotify; 3553 ev.type = SelectionNotify;
3490 ev.property = None; 3554 ev.property = None;
3491 ev.display = rq.display; 3555 ev.display = rq.display;
3492 ev.requestor = rq.requestor; 3556 ev.requestor = rq.requestor;
… …
3506 *target++ = xa[XA_COMPOUND_TEXT]; 3570 *target++ = xa[XA_COMPOUND_TEXT];
3507#if X_HAVE_UTF8_STRING 3571#if X_HAVE_UTF8_STRING
3508 *target++ = xa[XA_UTF8_STRING]; 3572 *target++ = xa[XA_UTF8_STRING];
3509#endif 3573#endif
3510 3574
3511 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3512 32, PropModeReplace, 3576 32, PropModeReplace,
3513 (unsigned char *)target_list, target - target_list); 3577 (unsigned char *)target_list, target - target_list);
3514 ev.property = rq.property; 3578 ev.property = rq.property;
3515 } 3579 }
3516#if TODO // TODO 3580#if TODO // TODO
… …
3519 /* TODO: Handle MULTIPLE */ 3583 /* TODO: Handle MULTIPLE */
3520 } 3584 }
3521#endif 3585#endif
3522 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3523 { 3587 {
3524 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3525 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3589 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3526 ev.property = rq.property; 3590 ev.property = rq.property;
3527 } 3591 }
3528 else if (rq.target == XA_STRING 3592 else if (rq.target == XA_STRING
3529 || rq.target == xa[XA_TEXT] 3593 || rq.target == xa[XA_TEXT]
… …
3553 style = enc_string; 3617 style = enc_string;
3554 else if (target == xa[XA_TEXT]) 3618 else if (target == xa[XA_TEXT])
3555 style = enc_text; 3619 style = enc_text;
3556 else if (target == xa[XA_COMPOUND_TEXT]) 3620 else if (target == xa[XA_COMPOUND_TEXT])
3557 style = enc_compound_text; 3621 style = enc_compound_text;
3558#if ENABLE_FRILLS 3622#if !ENABLE_MINIMAL
3559 else if (target == xa[XA_UTF8_STRING]) 3623 else if (target == xa[XA_UTF8_STRING])
3560 style = enc_utf8; 3624 style = enc_utf8;
3561#endif 3625#endif
3562 else 3626 else
3563 { 3627 {
… …
3574 { 3638 {
3575 cl = L""; 3639 cl = L"";
3576 selectlen = 0; 3640 selectlen = 0;
3577 } 3641 }
3578 3642
3579#if ENABLE_FRILLS 3643#if !ENABLE_MINIMAL
3580 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3644 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3581 // so recode it manually 3645 // so recode it manually
3582 if (style == enc_utf8) 3646 if (style == enc_utf8)
3583 { 3647 {
3584 freect = 1; 3648 freect = 1;
… …
3587 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3651 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3588 ct.nitems = strlen ((char *)ct.value); 3652 ct.nitems = strlen ((char *)ct.value);
3589 } 3653 }
3590 else 3654 else
3591#endif 3655#endif
3592 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3656 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3593 freect = 1; 3657 freect = 1;
3594 else 3658 else
3595 { 3659 {
3596 /* if we failed to convert then send it raw */ 3660 /* if we failed to convert then send it raw */
3597 ct.value = (unsigned char *)cl; 3661 ct.value = (unsigned char *)cl;
3598 ct.nitems = selectlen; 3662 ct.nitems = selectlen;
3599 ct.encoding = target; 3663 ct.encoding = target;
3600 } 3664 }
3601 3665
3602 XChangeProperty (disp, rq.requestor, rq.property, 3666 XChangeProperty (dpy, rq.requestor, rq.property,
3603 ct.encoding, 8, PropModeReplace, 3667 ct.encoding, 8, PropModeReplace,
3604 ct.value, (int)ct.nitems); 3668 ct.value, (int)ct.nitems);
3605 ev.property = rq.property; 3669 ev.property = rq.property;
3606 3670
3607 if (freect) 3671 if (freect)
3608 XFree (ct.value); 3672 XFree (ct.value);
3609 } 3673 }
3610 3674
3611 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3675 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3612}
3613
3614/* ------------------------------------------------------------------------- *
3615 * MOUSE ROUTINES *
3616 * ------------------------------------------------------------------------- */
3617
3618/*
3619 * return col/row values corresponding to x/y pixel values
3620 */
3621void
3622rxvt_term::pixel_position (int *x, int *y)
3623{
3624 *x = Pixel2Col (*x);
3625 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3626 *y = Pixel2Row (*y);
3627 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3628} 3676}
3629 3677
3630/* ------------------------------------------------------------------------- */ 3678/* ------------------------------------------------------------------------- */
3631#ifdef USE_XIM 3679#ifdef USE_XIM
3632void 3680void
3633rxvt_term::im_set_position (XPoint &pos) 3681rxvt_term::im_set_position (XPoint &pos) NOTHROW
3634{ 3682{
3635 XWindowAttributes xwa; 3683 XWindowAttributes xwa;
3636 3684
3637 XGetWindowAttributes (display->display, vt, &xwa); 3685 XGetWindowAttributes (dpy, vt, &xwa);
3638 3686
3639 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3687 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3640 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3688 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3641} 3689}
3642#endif 3690#endif
3643 3691
3644#if ENABLE_OVERLAY 3692#if ENABLE_OVERLAY
3645void 3693void
3646rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3694rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3647{ 3695{
3648 if (nrow < 1 || ncol < 1) 3696 if (nrow < 1 || ncol < 1)
3649 return; 3697 return;
3650 3698
3651 want_refresh = 1; 3699 want_refresh = 1;
… …
3696 *rp = r; 3744 *rp = r;
3697 } 3745 }
3698} 3746}
3699 3747
3700void 3748void
3701rxvt_term::scr_overlay_off () 3749rxvt_term::scr_overlay_off () NOTHROW
3702{ 3750{
3703 if (!ov_text) 3751 if (!ov_text)
3704 return; 3752 return;
3705 3753
3706 want_refresh = 1; 3754 want_refresh = 1;
… …
3714 delete [] ov_text; ov_text = 0; 3762 delete [] ov_text; ov_text = 0;
3715 delete [] ov_rend; ov_rend = 0; 3763 delete [] ov_rend; ov_rend = 0;
3716} 3764}
3717 3765
3718void 3766void
3719rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3720{ 3768{
3721 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3722 return; 3770 return;
3723 3771
3724 x++, y++; 3772 x++, y++;
… …
3726 ov_text[y][x] = text; 3774 ov_text[y][x] = text;
3727 ov_rend[y][x] = rend; 3775 ov_rend[y][x] = rend;
3728} 3776}
3729 3777
3730void 3778void
3731rxvt_term::scr_overlay_set (int x, int y, const char *s) 3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3732{ 3780{
3733 while (*s) 3781 while (*s)
3734 scr_overlay_set (x++, y, *s++); 3782 scr_overlay_set (x++, y, *s++);
3735} 3783}
3736 3784
3737void 3785void
3738rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3786rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3739{ 3787{
3740 while (*s) 3788 while (*s)
3741 { 3789 {
3742 text_t t = *s++; 3790 text_t t = *s++;
3743 int width = wcwidth (t); 3791 int width = WCWIDTH (t);
3744 3792
3745 while (width--) 3793 while (width--)
3746 { 3794 {
3747 scr_overlay_set (x++, y, t); 3795 scr_overlay_set (x++, y, t);
3748 t = NOCHAR; 3796 t = NOCHAR;
3749 } 3797 }
3750 } 3798 }
3751} 3799}
3752 3800
3753void 3801void
3754rxvt_term::scr_swap_overlay () 3802rxvt_term::scr_swap_overlay () NOTHROW
3755{ 3803{
3756 if (!ov_text) 3804 if (!ov_text)
3757 return; 3805 return;
3758 3806
3759 // swap screen mem with overlay 3807 // swap screen mem with overlay
3760 for (int y = ov_h; y--; ) 3808 for (int y = ov_h; y--; )
3761 { 3809 {
3762 text_t *t1 = ov_text[y]; 3810 text_t *t1 = ov_text[y];
3763 rend_t *r1 = ov_rend[y]; 3811 rend_t *r1 = ov_rend[y];
3764 3812
3765 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3766 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3767 3815
3768 for (int x = ov_w; x--; ) 3816 for (int x = ov_w; x--; )
3769 { 3817 {
3770 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3818 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3771 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3819 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