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

Diff Legend

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