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.208 by root, Wed Jan 4 05:24:55 2006 UTC vs.
Revision 1.315 by root, Tue Nov 4 14:38:29 2008 UTC

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