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.313 by root, Tue Nov 4 14:25:10 2008 UTC

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