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