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

Diff Legend

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