ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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