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