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