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.195 by root, Mon Dec 26 23:02:34 2005 UTC vs.
Revision 1.323 by root, Tue Nov 4 23:53:29 2008 UTC

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