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.207 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.322 by root, Tue Nov 4 23:35:50 2008 UTC

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