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

Diff Legend

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