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

Diff Legend

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