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.227 by root, Sun Jan 15 05:14:12 2006 UTC vs.
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC

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

Diff Legend

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