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.217 by root, Mon Jan 9 19:01:56 2006 UTC vs.
Revision 1.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC

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

Diff Legend

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