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