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.206 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.316 by root, Tue Nov 4 15:02:35 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
118/* Fill part/all of a line with blanks. */ 100/* Fill part/all of a line with blanks. */
119void 101void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 103{
122 if (!l.t) 104 if (!l.t)
123 { 105 {
124 lalloc (l); 106 lalloc (l);
125 col = 0; 107 col = 0;
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 efs &= ~RS_baseattrMask; 111 l.touch ();
112
113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
131 115
132 text_t *et = l.t + col; 116 text_t *et = l.t + col;
133 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
134 118
… …
140} 124}
141 125
142/* ------------------------------------------------------------------------- */ 126/* ------------------------------------------------------------------------- */
143/* Fill a full line with blanks - make sure it is allocated first */ 127/* Fill a full line with blanks - make sure it is allocated first */
144void 128void
145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 129rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
146{ 130{
147 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
132
133 l.l = 0;
134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
148} 154}
149 155
150/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
151 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
152 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
… …
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 spanning the start
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:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1518 line->l = max (line->l - count, 0);
1448 1519
1520 // nuke wide char spanning the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1449 for (col = screen.cur.col; (col + count) < ncol; col++) 1524 for (int col = screen.cur.col; (col + count) < ncol; col++)
1450 { 1525 {
1451 line->t[col] = line->t[col + count]; 1526 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1527 line->r[col] = line->r[col + count];
1453 } 1528 }
1454 1529
1455 scr_blank_line (*line, ncol - count, count, tr); 1530 scr_blank_line (*line, ncol - count, count,
1456 1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1457 if (line->is_longer ()) /* break line continuation */
1458 line->l = ncol;
1459
1460 line->l = max (line->l - count, 0);
1461 1532
1462 if (selection.op && current_screen == selection.screen 1533 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1535 {
1465 if (selection.end.row != screen.cur.row 1536 if (selection.end.row != screen.cur.row
… …
1483/* 1554/*
1484 * Set the scrolling region 1555 * Set the scrolling region
1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1556 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1486 */ 1557 */
1487void 1558void
1488rxvt_term::scr_scroll_region (int top, int bot) 1559rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1489{ 1560{
1490 max_it (top, 0); 1561 max_it (top, 0);
1491 min_it (bot, nrow - 1); 1562 min_it (bot, nrow - 1);
1492 1563
1493 if (top > bot) 1564 if (top > bot)
… …
1503 * Make the cursor visible/invisible 1574 * Make the cursor visible/invisible
1504 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1575 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1505 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1576 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1506 */ 1577 */
1507void 1578void
1508rxvt_term::scr_cursor_visible (int mode) 1579rxvt_term::scr_cursor_visible (int mode) NOTHROW
1509{ 1580{
1510 want_refresh = 1; 1581 want_refresh = 1;
1511 1582
1512 if (mode) 1583 if (mode)
1513 screen.flags |= Screen_VisibleCursor; 1584 screen.flags |= Screen_VisibleCursor;
… …
1520 * Set/unset automatic wrapping 1591 * Set/unset automatic wrapping
1521 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1592 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1522 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1593 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1523 */ 1594 */
1524void 1595void
1525rxvt_term::scr_autowrap (int mode) 1596rxvt_term::scr_autowrap (int mode) NOTHROW
1526{ 1597{
1527 if (mode) 1598 if (mode)
1528 screen.flags |= Screen_Autowrap; 1599 screen.flags |= Screen_Autowrap;
1529 else 1600 else
1530 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1601 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1539 * and the cursor cannot be moved outside. 1610 * and the cursor cannot be moved outside.
1540 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1611 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1541 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1612 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1542 */ 1613 */
1543void 1614void
1544rxvt_term::scr_relative_origin (int mode) 1615rxvt_term::scr_relative_origin (int mode) NOTHROW
1545{ 1616{
1546 if (mode) 1617 if (mode)
1547 screen.flags |= Screen_Relative; 1618 screen.flags |= Screen_Relative;
1548 else 1619 else
1549 screen.flags &= ~Screen_Relative; 1620 screen.flags &= ~Screen_Relative;
… …
1556 * Set insert/replace mode 1627 * Set insert/replace mode
1557 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1628 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1558 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1629 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1559 */ 1630 */
1560void 1631void
1561rxvt_term::scr_insert_mode (int mode) 1632rxvt_term::scr_insert_mode (int mode) NOTHROW
1562{ 1633{
1563 if (mode) 1634 if (mode)
1564 screen.flags |= Screen_Insert; 1635 screen.flags |= Screen_Insert;
1565 else 1636 else
1566 screen.flags &= ~Screen_Insert; 1637 screen.flags &= ~Screen_Insert;
… …
1572 * XTERM_SEQ: Set tab at current column : ESC H 1643 * XTERM_SEQ: Set tab at current column : ESC H
1573 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1644 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1574 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1645 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1575 */ 1646 */
1576void 1647void
1577rxvt_term::scr_set_tab (int mode) 1648rxvt_term::scr_set_tab (int mode) NOTHROW
1578{ 1649{
1579 if (mode < 0) 1650 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1651 memset (tabs, 0, ncol);
1581 else if (screen.cur.col < ncol) 1652 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1653 tabs [screen.cur.col] = !!mode;
1583} 1654}
1584 1655
1585/* ------------------------------------------------------------------------- */ 1656/* ------------------------------------------------------------------------- */
1586/* 1657/*
1587 * Set reverse/normal video 1658 * Set reverse/normal video
1588 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1659 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1589 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1660 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1590 */ 1661 */
1591void 1662void
1592rxvt_term::scr_rvideo_mode (int mode) 1663rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1593{ 1664{
1594 XGCValues gcvalue; 1665 rvideo_mode = on;
1595 1666
1667#ifndef NO_BELL
1668 on ^= rvideo_bell;
1669#endif
1670
1596 if (rvideo != mode) 1671 if (rvideo_state != on)
1597 { 1672 {
1598 rvideo = mode; 1673 rvideo_state = on;
1674
1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1600#if XPM_BACKGROUND 1676#ifdef HAVE_BG_PIXMAP
1601 if (bgPixmap.pixmap == None) 1677 if (bgPixmap.pixmap == None)
1602#endif 1678#endif
1603#if TRANSPARENT 1679 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 1680
1681 XGCValues gcvalue;
1609 gcvalue.foreground = pix_colors[Color_fg]; 1682 gcvalue.foreground = pix_colors[Color_fg];
1610 gcvalue.background = pix_colors[Color_bg]; 1683 gcvalue.background = pix_colors[Color_bg];
1611 XChangeGC (display->display, gc, GCBackground | GCForeground, 1684 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1612 &gcvalue); 1685
1613 scr_clear (); 1686 scr_clear ();
1614 scr_touch (true); 1687 scr_touch (true);
1615 } 1688 }
1616} 1689}
1617 1690
… …
1619/* 1692/*
1620 * Report current cursor position 1693 * Report current cursor position
1621 * XTERM_SEQ: Report position: ESC [ 6 n 1694 * XTERM_SEQ: Report position: ESC [ 6 n
1622 */ 1695 */
1623void 1696void
1624rxvt_term::scr_report_position () 1697rxvt_term::scr_report_position () NOTHROW
1625{ 1698{
1626 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1699 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1627} 1700}
1628 1701
1629/* ------------------------------------------------------------------------- * 1702/* ------------------------------------------------------------------------- *
… …
1632 1705
1633/* 1706/*
1634 * Set font style 1707 * Set font style
1635 */ 1708 */
1636void 1709void
1637rxvt_term::set_font_style () 1710rxvt_term::set_font_style () NOTHROW
1638{ 1711{
1712#if 0
1639 switch (charsets[screen.charset]) 1713 switch (charsets [screen.charset])
1640 { 1714 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1715 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1716 break;
1643 case 'A': /* United Kingdom (UK) */ 1717 case 'A': /* United Kingdom (UK) */
1644 break; 1718 break;
… …
1651 case 'C': /* Finnish character set */ 1725 case 'C': /* Finnish character set */
1652 break; 1726 break;
1653 case 'K': /* German character set */ 1727 case 'K': /* German character set */
1654 break; 1728 break;
1655 } 1729 }
1730#endif
1656} 1731}
1657 1732
1658/* ------------------------------------------------------------------------- */ 1733/* ------------------------------------------------------------------------- */
1659/* 1734/*
1660 * Choose a font 1735 * Choose a font
… …
1662 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1737 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1663 * XTERM_SEQ: Invoke G2 character set: ESC N 1738 * XTERM_SEQ: Invoke G2 character set: ESC N
1664 * XTERM_SEQ: Invoke G3 character set: ESC O 1739 * XTERM_SEQ: Invoke G3 character set: ESC O
1665 */ 1740 */
1666void 1741void
1667rxvt_term::scr_charset_choose (int set) 1742rxvt_term::scr_charset_choose (int set) NOTHROW
1668{ 1743{
1669 screen.charset = set; 1744 screen.charset = set;
1670 set_font_style (); 1745 set_font_style ();
1671} 1746}
1672 1747
… …
1678 * XTERM_SEQ: Set G2 character set: ESC * <C> 1753 * XTERM_SEQ: Set G2 character set: ESC * <C>
1679 * XTERM_SEQ: Set G3 character set: ESC + <C> 1754 * XTERM_SEQ: Set G3 character set: ESC + <C>
1680 * See set_font_style for possible values for <C> 1755 * See set_font_style for possible values for <C>
1681 */ 1756 */
1682void 1757void
1683rxvt_term::scr_charset_set (int set, unsigned int ch) 1758rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1684{ 1759{
1685 charsets[set] = (unsigned char)ch; 1760 charsets[set] = (unsigned char)ch;
1686 set_font_style (); 1761 set_font_style ();
1687} 1762}
1688 1763
… …
1693 1768
1694/* 1769/*
1695 * refresh matching text. 1770 * refresh matching text.
1696 */ 1771 */
1697bool 1772bool
1698rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1773rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1699{ 1774{
1700 bool found = false; 1775 bool found = false;
1701 1776
1702 for (int i = 0; i < nrow; i++) 1777 for (int i = 0; i < nrow; i++)
1703 { 1778 {
1704 int col = 0;
1705 rend_t *drp = drawn_buf[i].r; 1779 rend_t *drp = drawn_buf[i].r;
1706 1780
1707 for (; col < ncol; col++, drp++) 1781 for (int col = 0; col < ncol; col++, drp++)
1708 if ((*drp & mask) == value) 1782 if ((*drp & mask) == value)
1709 { 1783 {
1710 found = true; 1784 found = true;
1711 *drp = ~value; 1785 *drp = ~value;
1712 } 1786 }
… …
1723 PART_END, 1797 PART_END,
1724 RC_COUNT 1798 RC_COUNT
1725}; 1799};
1726 1800
1727void 1801void
1728rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1802rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1729{ 1803{
1730 int i; 1804 int i;
1731 row_col_t rc[RC_COUNT]; 1805 row_col_t rc[RC_COUNT];
1732 1806
1733 if (!drawn_buf) /* sanity check */ 1807 if (!drawn_buf) /* sanity check */
… …
1752 for (i = PART_BEG; i < RC_COUNT; i++) 1826 for (i = PART_BEG; i < RC_COUNT; i++)
1753 { 1827 {
1754 min_it (rc[i].col, ncol - 1); 1828 min_it (rc[i].col, ncol - 1);
1755 min_it (rc[i].row, nrow - 1); 1829 min_it (rc[i].row, nrow - 1);
1756 } 1830 }
1757 1831// 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++) 1832 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); 1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1760 1834
1835 num_scr_allow = 0;
1836
1761 if (refresh) 1837 if (refresh)
1762 scr_refresh (SLOW_REFRESH); 1838 scr_refresh ();
1763} 1839}
1764 1840
1765/* ------------------------------------------------------------------------- */ 1841/* ------------------------------------------------------------------------- */
1766/* 1842/*
1767 * Refresh the entire screen 1843 * Refresh the entire screen
1768 */ 1844 */
1769void 1845void
1770rxvt_term::scr_touch (bool refresh) 1846rxvt_term::scr_touch (bool refresh) NOTHROW
1771{ 1847{
1772 scr_expose (0, 0, width, height, refresh); 1848 scr_expose (0, 0, width, height, refresh);
1773} 1849}
1774 1850
1775/* ------------------------------------------------------------------------- */ 1851/* ------------------------------------------------------------------------- */
1776/* 1852/*
1777 * Move the display so that the line represented by scrollbar value Y is at 1853 * Move the display so that the line represented by scrollbar value Y is at
1778 * the top of the screen 1854 * the top of the screen
1779 */ 1855 */
1780int 1856void
1781rxvt_term::scr_move_to (int y, int len) 1857rxvt_term::scr_move_to (int y, int len) NOTHROW
1782{ 1858{
1783 long p = 0; 1859 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} 1860}
1799 1861
1800/* ------------------------------------------------------------------------- */ 1862/* ------------------------------------------------------------------------- */
1801/* 1863/*
1802 * Page the screen up/down nlines 1864 * Page the screen up/down nlines
1803 * direction should be UP or DN 1865 * direction should be UP or DN
1804 */ 1866 */
1805int 1867bool
1806rxvt_term::scr_page (enum page_dirn direction, int nlines) 1868rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1807{ 1869{
1808 int n; 1870 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; 1871 direction == UP ? view_start - nlines
1821 view_start = max (n, 0); 1872 : view_start + nlines;
1822 }
1823 1873
1824 return scr_changeview (oldviewstart); 1874 return scr_changeview (new_view_start);
1825} 1875}
1826 1876
1827int 1877bool
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1878rxvt_term::scr_changeview (int new_view_start) NOTHROW
1829{ 1879{
1880 clamp_it (new_view_start, top_row, 0);
1881
1882 if (new_view_start == view_start)
1883 return false;
1884
1885 num_scr += new_view_start - view_start;
1886 view_start = new_view_start;
1887 want_refresh = 1;
1888
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1889 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831 1890
1832 if (view_start != oldviewstart) 1891 return true;
1833 {
1834 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart);
1836 }
1837
1838 return (int) (view_start - oldviewstart);
1839} 1892}
1840 1893
1841/* ------------------------------------------------------------------------- */ 1894#ifndef NO_BELL
1842void 1895void
1896rxvt_term::bell_cb (ev::timer &w, int revents)
1897{
1898 rvideo_bell = false;
1899 scr_rvideo_mode (rvideo_mode);
1900 refresh_check ();
1901}
1902#endif
1903
1904/* ------------------------------------------------------------------------- */
1905void
1843rxvt_term::scr_bell () 1906rxvt_term::scr_bell () NOTHROW
1844{ 1907{
1845#ifndef NO_BELL 1908#ifndef NO_BELL
1846 1909
1847# ifndef NO_MAPALERT 1910# ifndef NO_MAPALERT
1848# ifdef MAPALERT_OPTION 1911# ifdef MAPALERT_OPTION
1849 if (OPTION (Opt_mapAlert)) 1912 if (option (Opt_mapAlert))
1850# endif 1913# endif
1851 XMapWindow (display->display, parent[0]); 1914 XMapWindow (dpy, parent[0]);
1852# endif 1915# endif
1853 1916
1917# if ENABLE_FRILLS
1918 if (option (Opt_urgentOnBell))
1919 set_urgency (1);
1920# endif
1921
1854 if (OPTION (Opt_visualBell)) 1922 if (option (Opt_visualBell))
1855 { 1923 {
1856 scr_rvideo_mode (!rvideo); /* refresh also done */ 1924 rvideo_bell = true;
1925 scr_rvideo_mode (rvideo_mode);
1926 flush ();
1927
1857 rxvt_usleep (VISUAL_BELL_DURATION); 1928 bell_ev.start (VISUAL_BELL_DURATION);
1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1859 } 1929 }
1860 else 1930 else
1861 XBell (display->display, 0); 1931 XBell (dpy, 0);
1862
1863#endif 1932#endif
1864} 1933}
1865 1934
1866/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1867/* ARGSUSED */ 1936/* ARGSUSED */
1868void 1937void
1869rxvt_term::scr_printscreen (int fullhist) 1938rxvt_term::scr_printscreen (int fullhist) NOTHROW
1870{ 1939{
1871#ifdef PRINTPIPE 1940#ifdef PRINTPIPE
1872 int nrows, row_start; 1941 int nrows, row_start;
1873 FILE *fd; 1942 FILE *fd = popen_printer ();
1874 1943
1875 if ((fd = popen_printer ()) == NULL) 1944 if (!fd)
1876 return; 1945 return;
1877 1946
1878 if (fullhist) 1947 if (fullhist)
1879 { 1948 {
1880 nrows = nrow + nsaved; 1949 nrows = nrow - top_row;
1881 row_start = -nsaved; 1950 row_start = top_row;
1882 } 1951 }
1883 else 1952 else
1884 { 1953 {
1885 nrows = nrow; 1954 nrows = nrow;
1886 row_start = -view_start; 1955 row_start = view_start;
1887 } 1956 }
1888 1957
1889 wctomb (0, 0); 1958 wctomb (0, 0);
1890 1959
1891 for (int r1 = 0; r1 < nrows; r1++) 1960 for (int r1 = 0; r1 < nrows; r1++)
… …
1923 * Refresh the screen 1992 * Refresh the screen
1924 * drawn_text/drawn_rend contain the screen information before the update. 1993 * drawn_text/drawn_rend contain the screen information before the update.
1925 * screen.text/screen.rend contain what the screen will change to. 1994 * screen.text/screen.rend contain what the screen will change to.
1926 */ 1995 */
1927void 1996void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 1997rxvt_term::scr_refresh () NOTHROW
1929{ 1998{
1930 unsigned char must_clear, /* use draw_string not draw_image_string */ 1999 unsigned char have_bg,
1931 showcursor; /* show the cursor */ 2000 showcursor; /* show the cursor */
1932 int16_t col, row, /* column/row we're processing */ 2001 int16_t col, row, /* column/row we're processing */
1933 ocrow; /* old cursor row */ 2002 ocrow; /* old cursor row */
1934 int i; /* tmp */ 2003 int i; /* tmp */
1935#ifndef NO_CURSORCOLOR 2004#ifndef NO_CURSORCOLOR
1936 rend_t cc1; /* store colours at cursor position (s) */ 2005 rend_t cc1; /* store colours at cursor position (s) */
1937#endif 2006#endif
1938 rend_t *crp; // cursor rendition pointer 2007 rend_t *crp; // cursor rendition pointer
2008 rend_t ccol1, /* Cursor colour */
2009 ccol2; /* Cursor colour2 */
1939 2010
1940 want_refresh = 0; /* screen is current */ 2011 want_refresh = 0; /* screen is current */
1941 2012
1942 if (refresh_type == NO_REFRESH || !mapped) 2013 if (refresh_type == NO_REFRESH || !mapped)
1943 return; 2014 return;
1944 2015
1945 /* 2016 /*
1946 * A: set up vars 2017 * A: set up vars
1947 */ 2018 */
1948 must_clear = 0;
1949 refresh_count = 0; 2019 refresh_count = 0;
1950 2020
1951#if XPM_BACKGROUND 2021 have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP
1952 must_clear |= bgPixmap.pixmap != None; 2023 have_bg = bgPixmap.pixmap != None;
1953#endif
1954#if TRANSPARENT
1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
1956#endif 2024#endif
1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1958 2026
1959 /* 2027 /*
1960 * B: reverse any characters which are selected 2028 * B: reverse any characters which are selected
… …
1964 /* 2032 /*
1965 * C: set the cursor character (s) 2033 * C: set the cursor character (s)
1966 */ 2034 */
1967 { 2035 {
1968 unsigned char setoldcursor; 2036 unsigned char setoldcursor;
1969 rend_t ccol1, /* Cursor colour */
1970 ccol2; /* Cursor colour2 */
1971 2037
1972 showcursor = (screen.flags & Screen_VisibleCursor); 2038 showcursor = (screen.flags & Screen_VisibleCursor);
1973#ifdef CURSOR_BLINK 2039#ifdef CURSOR_BLINK
1974 if (hidden_cursor) 2040 if (hidden_cursor)
1975 showcursor = 0; 2041 showcursor = 0;
… …
1982 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2048 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1983 col--; 2049 col--;
1984 2050
1985 crp = &ROW(screen.cur.row).r[col]; 2051 crp = &ROW(screen.cur.row).r[col];
1986 2052
2053#ifndef NO_CURSORCOLOR
2054 cc1 = *crp & (RS_fgMask | RS_bgMask);
2055 if (ISSET_PIXCOLOR (Color_cursor))
2056 ccol1 = Color_cursor;
2057 else
2058#endif
2059#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2060 ccol1 = fgcolor_of (rstyle);
2061#else
2062 ccol1 = Color_fg;
2063#endif
2064
2065#ifndef NO_CURSORCOLOR
2066 if (ISSET_PIXCOLOR (Color_cursor2))
2067 ccol2 = Color_cursor2;
2068 else
2069#endif
2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2071 ccol2 = bgcolor_of (rstyle);
2072#else
2073 ccol2 = Color_bg;
2074#endif
2075
1987 if (showcursor && focus) 2076 if (showcursor && focus)
1988 { 2077 {
1989 if (OPTION (Opt_cursorUnderline)) 2078 if (option (Opt_cursorUnderline))
1990 *crp ^= RS_Uline; 2079 *crp ^= RS_Uline;
1991 else 2080 else
1992 { 2081 {
1993 *crp ^= RS_RVid; 2082 *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); 2083 *crp = SET_FGCOLOR (*crp, ccol1);
2014 *crp = SET_BGCOLOR (*crp, ccol2); 2084 *crp = SET_BGCOLOR (*crp, ccol2);
2015#endif
2016 } 2085 }
2017 } 2086 }
2018 } 2087 }
2019 2088
2020 /* make sure no outline cursor is left around */ 2089 /* make sure no outline cursor is left around */
2021 setoldcursor = 0; 2090 setoldcursor = 0;
2022 if (ocrow != -1) 2091 if (ocrow != -1)
2023 { 2092 {
2024 if (screen.cur.row + view_start != ocrow 2093 if (screen.cur.row - view_start != ocrow
2025 || screen.cur.col != oldcursor.col) 2094 || screen.cur.col != oldcursor.col)
2026 { 2095 {
2027 if (ocrow < nrow 2096 if (ocrow < nrow
2028 && oldcursor.col < ncol) 2097 && oldcursor.col < ncol)
2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2098 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2037 else if (!focus) 2106 else if (!focus)
2038 setoldcursor = 1; 2107 setoldcursor = 1;
2039 2108
2040 if (setoldcursor) 2109 if (setoldcursor)
2041 { 2110 {
2042 if (screen.cur.row + view_start >= nrow) 2111 if (screen.cur.row - view_start >= nrow)
2043 oldcursor.row = -1; 2112 oldcursor.row = -1;
2044 else 2113 else
2045 { 2114 {
2046 oldcursor.row = screen.cur.row + view_start; 2115 oldcursor.row = screen.cur.row - view_start;
2047 oldcursor.col = screen.cur.col; 2116 oldcursor.col = screen.cur.col;
2048 } 2117 }
2049 } 2118 }
2050 } 2119 }
2051 2120
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2121 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053#if ENABLE_OVERLAY 2122#if ENABLE_OVERLAY
2054 scr_swap_overlay (); 2123 scr_swap_overlay ();
2055#endif 2124#endif
2056 2125
2057#ifndef NO_SLOW_LINK_SUPPORT 2126#ifndef NO_SLOW_LINK_SUPPORT
2058 /* 2127 /*
2059 * D: CopyArea pass - very useful for slower links 2128 * D: CopyArea pass - very useful for slower links
2060 * This has been deliberately kept simple. 2129 * This has been deliberately kept simple.
2061 */ 2130 */
2062 i = num_scr;
2063 if (!display->is_local 2131 if (!display->is_local
2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2132 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2065 && abs (num_scr) < nrow && !must_clear) 2133 && abs (num_scr) < nrow && !have_bg)
2066 { 2134 {
2067 int16_t nits; 2135 int16_t nits;
2136 int i = num_scr;
2068 int j; 2137 int j;
2069 int len, wlen; 2138 int len, wlen;
2139 dLocal (int, num_scr);
2070 2140
2071 j = nrow; 2141 j = nrow;
2072 wlen = len = -1; 2142 wlen = len = -1;
2073 row = i > 0 ? 0 : j - 1; 2143 row = i > 0 ? 0 : j - 1;
2144
2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2145 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2075 { 2146 {
2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2147 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2077 { 2148 {
2078 line_t s = ROW(row - view_start); 2149 line_t s = ROW(view_start + row);
2079 line_t d = drawn_buf[row]; 2150 line_t d = drawn_buf[row];
2080 line_t d2 = drawn_buf[row + i]; 2151 line_t d2 = drawn_buf[row + i];
2081 2152
2082 for (nits = 0, col = ncol; col--; ) 2153 for (nits = 0, col = ncol; col--; )
2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2154 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2099 wlen = row; 2170 wlen = row;
2100 continue; 2171 continue;
2101 } 2172 }
2102 } 2173 }
2103 2174
2104 if (len != -1) 2175 if (len >= 0)
2105 { 2176 {
2106 /* also comes here at end if needed because of >= above */ 2177 /* also comes here at end if needed because of >= above */
2107 if (wlen < len) 2178 if (wlen < len)
2108 ::swap (wlen, len); 2179 ::swap (wlen, len);
2109 2180
2181 XGCValues gcv;
2182
2183 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2110 XCopyArea (display->display, vt, vt, 2184 XCopyArea (dpy, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2185 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)TermWin_TotalWidth (), 2186 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2187 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2188 0, Row2Pixel (len));
2189 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2190
2115 len = -1; 2191 len = -1;
2116 } 2192 }
2117 } 2193 }
2118 } 2194 }
2119#endif 2195#endif
… …
2121 /* 2197 /*
2122 * E: main pass across every character 2198 * E: main pass across every character
2123 */ 2199 */
2124 for (row = 0; row < nrow; row++) 2200 for (row = 0; row < nrow; row++)
2125 { 2201 {
2126 text_t *stp = ROW(row - view_start).t; 2202 text_t *stp = ROW(view_start + row).t;
2127 rend_t *srp = ROW(row - view_start).r; 2203 rend_t *srp = ROW(view_start + row).r;
2128 text_t *dtp = drawn_buf[row].t; 2204 text_t *dtp = drawn_buf[row].t;
2129 rend_t *drp = drawn_buf[row].r; 2205 rend_t *drp = drawn_buf[row].r;
2130 2206
2131 /* 2207 /*
2132 * E2: OK, now the real pass 2208 * E2: OK, now the real pass
… …
2143 continue; 2219 continue;
2144 2220
2145 // redraw one or more characters 2221 // redraw one or more characters
2146 2222
2147 // seek to the beginning of wide characters 2223 // seek to the beginning of wide characters
2148 while (stp[col] == NOCHAR && col > 0) 2224 while (expect_false (stp[col] == NOCHAR && col > 0))
2149 --col; 2225 --col;
2150 2226
2151 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2152 text_t *text = stp + col; 2228 text_t *text = stp + col;
2153 int count = 1; 2229 int count = 1;
… …
2175 count++; 2251 count++;
2176 2252
2177 if (stp[col] != dtp[col] 2253 if (stp[col] != dtp[col]
2178 || !RS_SAME (srp[col], drp[col])) 2254 || !RS_SAME (srp[col], drp[col]))
2179 { 2255 {
2180 if (must_clear && (i++ > count / 2)) 2256 if (have_bg && (i++ > count / 2))
2181 break; 2257 break;
2182 2258
2183 dtp[col] = stp[col]; 2259 dtp[col] = stp[col];
2184 drp[col] = rend; 2260 drp[col] = rend;
2185 i = 0; 2261 i = 0;
2186 } 2262 }
2187 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2263 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2188 break; 2264 break;
2189 } 2265 }
2190 2266
2191 col--; /* went one too far. move back */ 2267 col--; /* went one too far. move back */
2192 count -= i; /* dump any matching trailing chars */ 2268 count -= i; /* dump any matching trailing chars */
2193 2269
2194 // sometimes we optimize away the trailing NOCHAR's, add them back 2270 // sometimes we optimize away the trailing NOCHAR's, add them back
2195 while (i && text[count] == NOCHAR) 2271 while (expect_false (i && text[count] == NOCHAR))
2196 count++, i--; 2272 count++, i--;
2197 2273
2198 /* 2274 /*
2199 * Determine the attributes for the string 2275 * Determine the attributes for the string
2200 */ 2276 */
2201 int fore = fgcolor_of (rend); // desired foreground 2277 int fore = fgcolor_of (rend); // desired foreground
2202 int back = bgcolor_of (rend); // desired background 2278 int back = bgcolor_of (rend); // desired background
2203 2279
2204 // only do special processing if any attributes are set, which is unlikely 2280 // 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)) 2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2206 { 2282 {
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; 2283 bool invert = rend & RS_RVid;
2220 2284
2221#ifndef NO_BOLD_UNDERLINE_REVERSE 2285#ifndef NO_BOLD_UNDERLINE_REVERSE
2222 if (rend & RS_Bold
2223 && fore == Color_fg) 2286 if (rend & RS_Bold && fore == Color_fg)
2224 { 2287 {
2225 if (ISSET_PIXCOLOR (Color_BD)) 2288 if (ISSET_PIXCOLOR (Color_BD))
2226 fore = Color_BD; 2289 fore = Color_BD;
2227# if !ENABLE_STYLES 2290# if !ENABLE_STYLES
2228 else 2291 else
2229 invert = !invert; 2292 invert = !invert;
2230# endif 2293# endif
2231 } 2294 }
2232 2295
2233 if (rend & RS_Italic 2296 if (rend & RS_Italic && fore == Color_fg)
2234 && fore == Color_fg)
2235 { 2297 {
2236 if (ISSET_PIXCOLOR (Color_IT)) 2298 if (ISSET_PIXCOLOR (Color_IT))
2237 fore = Color_IT; 2299 fore = Color_IT;
2238# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2239 else 2301 else
2240 invert = !invert; 2302 invert = !invert;
2241# endif 2303# endif
2242 } 2304 }
2243 2305
2244 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2245 fore = Color_UL; 2307 fore = Color_UL;
2246#endif 2308#endif
2247 2309
2248 if (invert) 2310 if (invert)
2249 { 2311 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2250 ::swap (fore, back); 2318 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2251 2323
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2253 if (ISSET_PIXCOLOR (Color_RV)) 2326 if (ISSET_PIXCOLOR (Color_RV))
2254 back = Color_RV; 2327 back = Color_RV;
2255 2328# endif
2256 if (fore == back) 2329 if (fore == back)
2257 { 2330 {
2258 fore = Color_bg; 2331 fore = Color_bg;
2259 back = Color_fg; 2332 back = Color_fg;
2260 } 2333 }
… …
2262 } 2335 }
2263 2336
2264#ifdef TEXT_BLINK 2337#ifdef TEXT_BLINK
2265 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2338 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2266 { 2339 {
2267 if (!text_blink_ev.active) 2340 if (!text_blink_ev.is_active ())
2268 { 2341 {
2269 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2342 text_blink_ev.again ();
2270 hidden_text = 0; 2343 hidden_text = 0;
2271 } 2344 }
2272 else if (hidden_text) 2345 else if (hidden_text)
2273 fore = back; 2346 fore = back;
2274 } 2347 }
2275#endif 2348#endif
2349
2350#if ENABLE_STYLES
2351 // "careful" (too wide) character handling
2352
2353 // include previous careful character(s) if possible, looks nicer (best effort...)
2354 while (text > stp
2355 && srp[text - stp - 1] & RS_Careful
2356 && RS_SAME (rend, srp[text - stp - 1]))
2357 text--, count++, xpixel -= fwidth;
2358
2359 // force redraw after "careful" characters to avoid pixel droppings
2360 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2361 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2362
2363 // force redraw before "careful" characters to avoid pixel droppings
2364 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2365 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2366#endif
2276 } 2367 }
2277 2368
2278 /* 2369 /*
2279 * Actually do the drawing of the string here 2370 * Actually do the drawing of the string here
2280 */ 2371 */
2281 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2372 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2282 2373
2283 if (back == fore) 2374 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 { 2375 {
2289 if (must_clear) 2376 // this is very ugly, maybe push it into ->draw?
2290 {
2291 CLEAR_CHARS (xpixel, ypixel, count);
2292 2377
2293 for (i = 0; i < count; i++) /* don't draw empty strings */ 2378 for (i = 0; i < count; i++) /* don't draw empty strings */
2294 if (text[i] != ' ') 2379 if (text[i] != ' ')
2295 { 2380 {
2296 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2297 break; 2382 goto did_clear;
2298 }
2299 } 2383 }
2300 else 2384
2301 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2385 CLEAR_CHARS (xpixel, ypixel, count);
2386 did_clear: ;
2302 } 2387 }
2303 else 2388 else
2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2305 2390
2306 if (rend & RS_Uline && font->descent > 1 && fore != back) 2391 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2307 { 2392 {
2308#if ENABLE_FRILLS 2393#if ENABLE_FRILLS
2309 if (ISSET_PIXCOLOR (Color_underline)) 2394 if (ISSET_PIXCOLOR (Color_underline))
2310 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2395 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2311 else 2396 else
2312#endif 2397#endif
2313 XSetForeground (display->display, gc, pix_colors[fore]); 2398 XSetForeground (dpy, gc, pix_colors[fore]);
2314 2399
2315 XDrawLine (display->display, drawBuffer, gc, 2400 XDrawLine (dpy, vt, gc,
2316 xpixel, ypixel + font->ascent + 1, 2401 xpixel, ypixel + font->ascent + 1,
2317 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2318 } 2403 }
2319 } /* for (col....) */ 2404 } /* for (col....) */
2320 } /* for (row....) */ 2405 } /* for (row....) */
2321 2406
2322#if ENABLE_OVERLAY 2407#if ENABLE_OVERLAY
2323 scr_swap_overlay (); 2408 scr_swap_overlay ();
2324#endif 2409#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2410 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326 2411
2327 /* 2412 /*
2328 * G: cleanup cursor and display outline cursor if necessary 2413 * G: cleanup cursor and display outline cursor if necessary
2329 */ 2414 */
2330 if (showcursor) 2415 if (showcursor)
2331 { 2416 {
2332 if (focus) 2417 if (focus)
2333 { 2418 {
2334 if (OPTION (Opt_cursorUnderline)) 2419 if (option (Opt_cursorUnderline))
2335 *crp ^= RS_Uline; 2420 *crp ^= RS_Uline;
2336 else 2421 else
2337 { 2422 {
2338 *crp ^= RS_RVid; 2423 *crp ^= RS_RVid;
2339#ifndef NO_CURSORCOLOR 2424#ifndef NO_CURSORCOLOR
… …
2353 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2438 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2354 cursorwidth++; 2439 cursorwidth++;
2355 2440
2356#ifndef NO_CURSORCOLOR 2441#ifndef NO_CURSORCOLOR
2357 if (ISSET_PIXCOLOR (Color_cursor)) 2442 if (ISSET_PIXCOLOR (Color_cursor))
2358 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2443 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2444 else
2359#endif 2445#endif
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2360 2447
2361 XDrawRectangle (display->display, drawBuffer, gc, 2448 XDrawRectangle (dpy, vt, gc,
2362 Col2Pixel (col), 2449 Col2Pixel (col),
2363 Row2Pixel (oldcursor.row), 2450 Row2Pixel (oldcursor.row),
2364 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2451 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2365 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2452 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2366 } 2453 }
… …
2369 /* 2456 /*
2370 * H: cleanup selection 2457 * H: cleanup selection
2371 */ 2458 */
2372 scr_reverse_selection (); 2459 scr_reverse_selection ();
2373 2460
2374 if (refresh_type & SMOOTH_REFRESH)
2375 XFlush (display->display);
2376
2377 num_scr = 0; 2461 num_scr = 0;
2378 num_scr_allow = 1; 2462 num_scr_allow = 1;
2379} 2463}
2380 2464
2381void 2465void
2382rxvt_term::scr_remap_chars (const line_t &l) 2466rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2383{ 2467{
2384 if (!l.t) 2468 if (!l.t)
2385 return; 2469 return;
2386 2470
2471 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2472
2387 for (int i = ncol; i--; ) 2473 for (int i = ncol; i--; )
2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2474 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2389} 2475}
2390 2476
2391void 2477void
2392rxvt_term::scr_remap_chars () 2478rxvt_term::scr_remap_chars () NOTHROW
2393{ 2479{
2394 for (int i = total_rows; i--; ) 2480 for (int i = total_rows; i--; )
2395 scr_remap_chars (row_buf [i]); 2481 scr_remap_chars (row_buf [i]);
2396 2482
2397 for (int i = nrow; i--; ) 2483 for (int i = nrow; i--; )
… …
2400 scr_remap_chars (swap_buf [i]); 2486 scr_remap_chars (swap_buf [i]);
2401 } 2487 }
2402} 2488}
2403 2489
2404void 2490void
2405rxvt_term::scr_recolour () 2491rxvt_term::scr_recolour () NOTHROW
2406{ 2492{
2407 if (1 2493#ifdef HAVE_BG_PIXMAP
2408#if TRANSPARENT 2494 bgPixmap.apply ();
2409 && !am_transparent 2495#else
2410#endif 2496
2411#if XPM_BACKGROUND
2412 && !bgPixmap.pixmap
2413#endif
2414 )
2415 {
2416 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2417 XClearWindow (display->display, parent[0]); 2498 XClearWindow (dpy, parent[0]);
2418 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2419#if HAVE_SCROLLBARS 2500
2420 if (scrollBar.win) 2501 if (scrollBar.win)
2421 { 2502 {
2422 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2423 scrollBar.setIdle (); 2504 scrollBar.state = STATE_IDLE;
2424 scrollbar_show (0); 2505 scrollBar.show (0);
2425 }
2426#endif
2427 } 2506 }
2428 2507
2508#endif
2509
2510 /* bgPixmap.apply () does not do the following : */
2429 scr_clear (); 2511 scr_clear ();
2430 scr_touch (true); 2512 scr_touch (true);
2431 want_refresh = 1; 2513 want_refresh = 1;
2432} 2514}
2433 2515
2434/* ------------------------------------------------------------------------- */ 2516/* ------------------------------------------------------------------------- */
2435void 2517void
2436rxvt_term::scr_clear (bool really) 2518rxvt_term::scr_clear (bool really) NOTHROW
2437{ 2519{
2438 if (!mapped) 2520 if (!mapped)
2439 return; 2521 return;
2440 2522
2441 num_scr_allow = 0; 2523 num_scr_allow = 0;
2442 want_refresh = 1; 2524 want_refresh = 1;
2443 2525
2444 if (really) 2526 if (really)
2445 XClearWindow (display->display, vt); 2527 XClearWindow (dpy, vt);
2446} 2528}
2447 2529
2448/* ------------------------------------------------------------------------- */
2449void 2530void
2531rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2532{
2533 int view_end = view_start + nrow;
2534 int row, col;
2535
2536 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2537 {
2538 text_t *stp = ROW(row).t;
2539 rend_t *srp = ROW(row).r;
2540
2541 for (col = beg_col; col < end_col; col++)
2542 srp[col] ^= rstyle1;
2543
2544 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2545 srp[col] ^= rstyle2;
2546
2547 if (++col < end_col)
2548 srp[col] ^= rstyle2;
2549 }
2550}
2551
2552void
2553rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2554{
2555 int view_end = view_start + nrow;
2556 int row, col;
2557
2558 if (beg_row >= view_start)
2559 {
2560 col = beg_col;
2561 row = beg_row;
2562 }
2563 else
2564 {
2565 col = 0;
2566 row = view_start;
2567 }
2568
2569 for (; row < min (end_row, view_end); row++, col = 0)
2570 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571 srp[col] ^= rstyle;
2572
2573 if (row == end_row)
2574 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2575 srp[col] ^= rstyle;
2576}
2577
2578/* ------------------------------------------------------------------------- */
2579void
2450rxvt_term::scr_reverse_selection () 2580rxvt_term::scr_reverse_selection () NOTHROW
2451{ 2581{
2452 if (selection.op 2582 if (selection.op
2453 && current_screen == selection.screen 2583 && current_screen == selection.screen
2454 && selection.end.row >= -view_start) 2584 && selection.end.row >= view_start)
2455 { 2585 {
2456 int view_end = -view_start + nrow; 2586#if !ENABLE_MINIMAL
2457 int row, col;
2458
2459#if ENABLE_FRILLS
2460 if (selection.rect) 2587 if (selection.rect)
2461 { 2588 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++) 2589 selection.end.row, selection.end.col,
2463 { 2590 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 2591 else
2478#endif 2592#endif
2479 { 2593 scr_xor_span (selection.beg.row, selection.beg.col,
2480 if (selection.beg.row >= -view_start) 2594 selection.end.row, selection.end.col,
2481 { 2595 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 } 2596 }
2500} 2597}
2501 2598
2502/* ------------------------------------------------------------------------- */ 2599/* ------------------------------------------------------------------------- */
2503/* 2600/*
2504 * Dump the whole scrollback and screen to the passed filedescriptor. The 2601 * Dump the whole scrollback and screen to the passed filedescriptor. The
2505 * invoking routine must close the fd. 2602 * invoking routine must close the fd.
2506 */ 2603 */
2507#if 0 2604#if 0
2508void 2605void
2509rxvt_term::scr_dump (int fd) 2606rxvt_term::scr_dump (int fd) NOTHROW
2510{ 2607{
2511 int row, wrote; 2608 int row, wrote;
2512 unsigned int width, towrite; 2609 unsigned int width, towrite;
2513 char r1[] = "\n"; 2610 char r1[] = "\n";
2514 2611
2515 for (row = saveLines - nsaved; 2612 for (row = saveLines + top_row;
2516 row < saveLines + nrow - 1; row++) 2613 row < saveLines + nrow - 1; row++)
2517 { 2614 {
2518 width = row_buf[row].l >= 0 ? row_buf[row].l 2615 width = row_buf[row].l >= 0 ? row_buf[row].l
2519 : ncol; 2616 : ncol;
2520 for (towrite = width; towrite; towrite -= wrote) 2617 for (towrite = width; towrite; towrite -= wrote)
… …
2533 2630
2534/* ------------------------------------------------------------------------- * 2631/* ------------------------------------------------------------------------- *
2535 * CHARACTER SELECTION * 2632 * CHARACTER SELECTION *
2536 * ------------------------------------------------------------------------- */ 2633 * ------------------------------------------------------------------------- */
2537void 2634void
2538rxvt_term::selection_check (int check_more) 2635rxvt_term::selection_check (int check_more) NOTHROW
2539{ 2636{
2540 row_col_t pos; 2637 row_col_t pos;
2541 2638
2542 if (!selection.op) 2639 if (!selection.op)
2543 return; 2640 return;
2544 2641
2545 pos.row = pos.col = 0; 2642 pos.row = pos.col = 0;
2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2643 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2644 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2645 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2549 || (check_more == 1 2646 || (check_more == 1
2550 && current_screen == selection.screen 2647 && current_screen == selection.screen
2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2648 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2649 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2553 || (check_more == 2 2650 || (check_more == 2
… …
2564/* ------------------------------------------------------------------------- */ 2661/* ------------------------------------------------------------------------- */
2565/* 2662/*
2566 * Paste a selection direct to the command fd 2663 * Paste a selection direct to the command fd
2567 */ 2664 */
2568void 2665void
2569rxvt_term::paste (unsigned char *data, unsigned int len) 2666rxvt_term::paste (char *data, unsigned int len) NOTHROW
2570{ 2667{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2668 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2669 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2670 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2671 data[i] = C0_CR;
2575 2672
2673 if (priv_modes & PrivMode_BracketPaste)
2674 tt_printf ("\e[200~");
2675
2576 tt_write (data, len); 2676 tt_write (data, len);
2677
2678 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~");
2577} 2680}
2578 2681
2579/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2580/* 2683/*
2581 * Respond to a notification that a primary selection has been sent 2684 * Respond to a notification that a primary selection has been sent
2582 * EXT: SelectionNotify 2685 * EXT: SelectionNotify
2583 */ 2686 */
2584void 2687void
2585rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2586{ 2689{
2587 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2588 { 2691 {
2589 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2590 { 2693 {
… …
2610 } 2713 }
2611 2714
2612 unsigned long bytes_after; 2715 unsigned long bytes_after;
2613 XTextProperty ct; 2716 XTextProperty ct;
2614 2717
2615 if (XGetWindowProperty (display->display, win, prop, 2718 if (XGetWindowProperty (dpy, win, prop,
2616 0, PROP_SIZE / 4, 2719 0, PROP_SIZE / 4,
2617 delete_prop, AnyPropertyType, 2720 delete_prop, AnyPropertyType,
2618 &ct.encoding, &ct.format, 2721 &ct.encoding, &ct.format,
2619 &ct.nitems, &bytes_after, 2722 &ct.nitems, &bytes_after,
2620 &ct.value) != Success) 2723 &ct.value) != Success)
… …
2629 if (bytes_after) 2732 if (bytes_after)
2630 { 2733 {
2631 // fetch and append remaining data 2734 // fetch and append remaining data
2632 XTextProperty ct2; 2735 XTextProperty ct2;
2633 2736
2634 if (XGetWindowProperty (display->display, win, prop, 2737 if (XGetWindowProperty (dpy, win, prop,
2635 ct.nitems / 4, (bytes_after + 3) / 4, 2738 ct.nitems / 4, (bytes_after + 3) / 4,
2636 delete_prop, AnyPropertyType, 2739 delete_prop, AnyPropertyType,
2637 &ct2.encoding, &ct2.format, 2740 &ct2.encoding, &ct2.format,
2638 &ct2.nitems, &bytes_after, 2741 &ct2.nitems, &bytes_after,
2639 &ct2.value) != Success) 2742 &ct2.value) != Success)
… …
2652 2755
2653 if (ct.encoding == xa[XA_INCR]) 2756 if (ct.encoding == xa[XA_INCR])
2654 { 2757 {
2655 // INCR selection, start handshake 2758 // INCR selection, start handshake
2656 if (!delete_prop) 2759 if (!delete_prop)
2657 XDeleteProperty (display->display, win, prop); 2760 XDeleteProperty (dpy, win, prop);
2658 2761
2659 selection_wait = Sel_incr; 2762 selection_wait = Sel_incr;
2660 incr_buf_fill = 0; 2763 incr_buf_fill = 0;
2661 incr_ev.start (NOW + 10); 2764 incr_ev.start (10);
2662 2765
2663 goto bailout; 2766 goto bailout;
2664 } 2767 }
2665 2768
2666 if (ct.nitems == 0) 2769 if (ct.nitems == 0)
… …
2675 ct.nitems = incr_buf_fill; 2778 ct.nitems = incr_buf_fill;
2676 incr_buf = 0; 2779 incr_buf = 0;
2677 incr_buf_size = 0; 2780 incr_buf_size = 0;
2678 incr_ev.stop (); 2781 incr_ev.stop ();
2679 } 2782 }
2680 else 2783 else
2681 { 2784 {
2682 if (selection_wait == Sel_normal 2785 if (selection_wait == Sel_normal
2683 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2684 { 2787 {
2685 /* 2788 /*
… …
2692 goto bailout; 2795 goto bailout;
2693 } 2796 }
2694 } 2797 }
2695 else if (selection_wait == Sel_incr) 2798 else if (selection_wait == Sel_incr)
2696 { 2799 {
2697 incr_ev.start (NOW + 10); 2800 incr_ev.start (10);
2698 2801
2699 while (incr_buf_fill + ct.nitems > incr_buf_size) 2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2700 { 2803 {
2701 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2702 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2709 } 2812 }
2710 2813
2711 char **cl; 2814 char **cl;
2712 int cr; 2815 int cr;
2713 2816
2714#if ENABLE_FRILLS 2817#if !ENABLE_MINIMAL
2715 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2716 // so recode it manually 2819 // so recode it manually
2717 if (ct.encoding == xa[XA_UTF8_STRING]) 2820 if (ct.encoding == xa[XA_UTF8_STRING])
2718 { 2821 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w); 2823 char *s = rxvt_wcstombs (w);
2721 free (w); 2824 free (w);
2722 // TODO: strlen == only the first element will be converted. well... 2825 // TODO: strlen == only the first element will be converted. well...
2723 paste ((unsigned char *)s, strlen (s)); 2826 paste (s, strlen (s));
2724 free (s); 2827 free (s);
2725 } 2828 }
2726 else 2829 else
2727#endif 2830#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2831 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2729 && cl) 2832 && cl)
2730 { 2833 {
2731 for (int i = 0; i < cr; i++) 2834 for (int i = 0; i < cr; i++)
2732 paste ((unsigned char *)cl[i], strlen (cl[i])); 2835 paste (cl[i], strlen (cl[i]));
2733 2836
2734 XFreeStringList (cl); 2837 XFreeStringList (cl);
2735 } 2838 }
2736 else 2839 else
2737 paste (ct.value, ct.nitems); // paste raw 2840 paste ((char *)ct.value, ct.nitems); // paste raw
2738 2841
2739bailout: 2842bailout:
2740 XFree (ct.value); 2843 XFree (ct.value);
2741 2844
2742 if (selection_wait == Sel_normal) 2845 if (selection_wait == Sel_normal)
2743 selection_wait = Sel_none; 2846 selection_wait = Sel_none;
2744} 2847}
2745 2848
2746void 2849void
2747rxvt_term::incr_cb (time_watcher &w) 2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2748{ 2851{
2749 selection_wait = Sel_none; 2852 selection_wait = Sel_none;
2750 2853
2751 incr_buf_size = 0; 2854 incr_buf_size = 0;
2752 free (incr_buf); 2855 free (incr_buf);
2753 2856
2754 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2755} 2858}
2756 2859
2757void 2860void
2758rxvt_term::selection_property (Window win, Atom prop) 2861rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2759{ 2862{
2760 if (prop == None || selection_wait != Sel_incr) 2863 if (prop == None || selection_wait != Sel_incr)
2761 return; 2864 return;
2762 2865
2763 selection_paste (win, prop, true); 2866 selection_paste (win, prop, true);
2764} 2867}
2765 2868
2766/* ------------------------------------------------------------------------- */ 2869/* ------------------------------------------------------------------------- */
2767/* 2870/*
2768 * Request the current selection: 2871 * Request the current selection:
2769 * Order: > internal selection if available 2872 * Order: > internal selection if available
2770 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2873 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2771 * > CUT_BUFFER0 2874 * > CUT_BUFFER0
2772 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2773 * will auto fallback to CUT_BUFFER0 2876 * will auto fallback to CUT_BUFFER0
2774 * EXT: button 2 release 2877 * EXT: button 2 release
2775 */ 2878 */
2776void 2879void
2777rxvt_term::selection_request (Time tm, int x, int y) 2880rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2778{ 2881{
2779 if (x < 0 || x >= width || y < 0 || y >= height) 2882 if (selection.text && selnum == Sel_Primary)
2780 return; /* outside window */ 2883 {
2781
2782 if (selection.text)
2783 { /* internal selection */ 2884 /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len); 2885 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste ((unsigned char *)str, strlen (str)); 2886 paste (str, strlen (str));
2786 free (str); 2887 free (str);
2787 return; 2888 return;
2788 } 2889 }
2789 else 2890 else
2790 { 2891 {
2791 int i;
2792
2793 selection_request_time = tm; 2892 selection_request_time = tm;
2794 selection_wait = Sel_normal; 2893 selection_wait = Sel_normal;
2795 2894
2796 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2797 {
2798#if X_HAVE_UTF8_STRING 2895#if X_HAVE_UTF8_STRING
2799 selection_type = Sel_UTF8String; 2896 selection_type = Sel_UTF8String;
2800 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2801 return; 2898 return;
2802#else 2899#else
2803 selection_type = Sel_CompoundText; 2900 selection_type = Sel_CompoundText;
2804 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2805 return; 2902 return;
2806#endif 2903#endif
2807 }
2808 } 2904 }
2809 2905
2810 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2906 selection_wait = Sel_none; /* don't loop in selection_paste () */
2811 selection_paste (display->root, XA_CUT_BUFFER0, false); 2907 selection_paste (display->root, XA_CUT_BUFFER0, false);
2812} 2908}
2813 2909
2814int 2910int
2815rxvt_term::selection_request_other (Atom target, int selnum) 2911rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2816{ 2912{
2817 Atom sel; 2913 Atom sel;
2818 2914
2819 selection_type |= selnum; 2915 selection_type |= selnum;
2820 2916
… …
2823 else if (selnum == Sel_Secondary) 2919 else if (selnum == Sel_Secondary)
2824 sel = XA_SECONDARY; 2920 sel = XA_SECONDARY;
2825 else 2921 else
2826 sel = xa[XA_CLIPBOARD]; 2922 sel = xa[XA_CLIPBOARD];
2827 2923
2828 if (XGetSelectionOwner (display->display, sel) != None) 2924 if (XGetSelectionOwner (dpy, sel) != None)
2829 { 2925 {
2830 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2926 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2831 vt, selection_request_time); 2927 vt, selection_request_time);
2832 return 1; 2928 return 1;
2833 } 2929 }
2834 2930
2835 return 0; 2931 return 0;
… …
2839/* 2935/*
2840 * Clear all selected text 2936 * Clear all selected text
2841 * EXT: SelectionClear 2937 * EXT: SelectionClear
2842 */ 2938 */
2843void 2939void
2844rxvt_term::selection_clear () 2940rxvt_term::selection_clear () NOTHROW
2845{ 2941{
2846 want_refresh = 1; 2942 want_refresh = 1;
2847 free (selection.text); 2943 free (selection.text);
2848 selection.text = NULL; 2944 selection.text = NULL;
2849 selection.len = 0; 2945 selection.len = 0;
… …
2882 selection.op = SELECTION_DONE; 2978 selection.op = SELECTION_DONE;
2883 2979
2884 if (selection.clicks == 4) 2980 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2981 return; /* nothing selected, go away */
2886 2982
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2983 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return; 2984 return;
2889 2985
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2986 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2987 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2892 2988
… …
2898 2994
2899 int end_col; 2995 int end_col;
2900 2996
2901 for (; row <= selection.end.row; row++, col = 0) 2997 for (; row <= selection.end.row; row++, col = 0)
2902 { 2998 {
2903#if ENABLE_FRILLS 2999#if !ENABLE_MINIMAL
2904 if (selection.rect) 3000 if (selection.rect)
2905 { 3001 {
2906 col = selection.beg.col; 3002 col = selection.beg.col;
2907 end_col = ncol + 1; 3003 end_col = ncol + 1;
2908 } 3004 }
2909 else 3005 else
2910#endif 3006#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 3007 end_col = ROW(row).l;
2912 3008
2913 col = max (col, 0); 3009 col = max (col, 0);
2914 3010
2915 if (row == selection.end.row 3011 if (row == selection.end.row
2916#if ENABLE_FRILLS 3012#if !ENABLE_MINIMAL
2917 || selection.rect 3013 || selection.rect
2918#endif 3014#endif
2919 ) 3015 )
2920 min_it (end_col, selection.end.col); 3016 min_it (end_col, selection.end.col);
2921 3017
2922 t = ROW(row).t + col; 3018 t = ROW(row).t + col;
3019
2923 for (; col < end_col; col++) 3020 for (; col < end_col; col++)
2924 { 3021 {
2925 if (*t == NOCHAR) 3022 if (*t == NOCHAR)
2926 t++; 3023 t++;
2927#if ENABLE_COMBINING 3024#if ENABLE_COMBINING
… …
2943#endif 3040#endif
2944 else 3041 else
2945 new_selection_text[ofs++] = *t++; 3042 new_selection_text[ofs++] = *t++;
2946 } 3043 }
2947 3044
2948#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
2949 if (selection.rect) 3046 if (selection.rect)
2950 { 3047 {
2951 while (ofs 3048 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF 3049 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1])) 3050 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2976 3073
2977 // we usually allocate much more than necessary, so realloc it smaller again 3074 // we usually allocate much more than necessary, so realloc it smaller again
2978 selection.len = ofs; 3075 selection.len = ofs;
2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3076 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2980 3077
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 3078 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return; 3079 return;
2983 3080
2984 selection_grab (tm); 3081 selection_grab (tm);
2985} 3082}
2986 3083
2987bool 3084bool
2988rxvt_term::selection_grab (Time tm) 3085rxvt_term::selection_grab (Time tm) NOTHROW
2989{ 3086{
2990 selection_time = tm; 3087 selection_time = tm;
2991 3088
2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
2994 { 3091 {
2995 display->set_selection_owner (this); 3092 display->set_selection_owner (this);
2996 return true; 3093 return true;
2997 } 3094 }
2998 else 3095 else
3096 {
3097 selection_clear ();
2999 return false; 3098 return false;
3099 }
3000 3100
3001#if 0 3101#if 0
3002 XTextProperty ct; 3102 XTextProperty ct;
3003 3103
3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3104 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3005 { 3105 {
3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3106 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3007 XFree (ct.value); 3107 XFree (ct.value);
3008 } 3108 }
3009#endif 3109#endif
… …
3013/* 3113/*
3014 * Mark or select text based upon number of clicks: 1, 2, or 3 3114 * Mark or select text based upon number of clicks: 1, 2, or 3
3015 * EXT: button 1 press 3115 * EXT: button 1 press
3016 */ 3116 */
3017void 3117void
3018rxvt_term::selection_click (int clicks, int x, int y) 3118rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3019{ 3119{
3020 clicks = ((clicks - 1) % 3) + 1; 3120 clicks = ((clicks - 1) % 3) + 1;
3021 selection.clicks = clicks; /* save clicks so extend will work */ 3121 selection.clicks = clicks; /* save clicks so extend will work */
3022 3122
3123 if (clicks == 2 && !selection.rect
3124 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3125 {
3126 MEvent.clicks = 1; // what a mess
3127 selection.screen = current_screen;
3128 selection.op = SELECTION_CONT;
3129 return;
3130 }
3131
3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3132 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3024 3133
3025 if (clicks == 2 || clicks == 3) 3134 if (clicks == 2 || clicks == 3)
3026 selection_extend_colrow (selection.mark.col, 3135 selection_extend_colrow (selection.mark.col,
3027 selection.mark.row + view_start, 3136 selection.mark.row - view_start,
3028 0, /* button 3 */ 3137 0, /* button 3 */
3029 1, /* button press */ 3138 1, /* button press */
3030 0); /* click change */ 3139 0); /* click change */
3031} 3140}
3032 3141
3033/* ------------------------------------------------------------------------- */ 3142/* ------------------------------------------------------------------------- */
3034/* 3143/*
3035 * Mark a selection at the specified col/row 3144 * Mark a selection at the specified col/row
3036 */ 3145 */
3037void 3146void
3038rxvt_term::selection_start_colrow (int col, int row) 3147rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3039{ 3148{
3040 want_refresh = 1; 3149 want_refresh = 1;
3041 3150
3042 selection.mark.row = row - view_start; 3151 selection.mark.row = row + view_start;
3043 selection.mark.col = col; 3152 selection.mark.col = col;
3044 3153
3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3154 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3155 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3047 3156
3048 while (selection.mark.col > 0 3157 while (selection.mark.col > 0
3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3158 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3050 --selection.mark.col; 3159 --selection.mark.col;
3051 3160
3052 if (selection.op) 3161 if (selection.op)
3162 {
3053 { /* clear the old selection */ 3163 /* clear the old selection */
3054 selection.beg.row = selection.end.row = selection.mark.row; 3164 selection.beg.row = selection.end.row = selection.mark.row;
3055 selection.beg.col = selection.end.col = selection.mark.col; 3165 selection.beg.col = selection.end.col = selection.mark.col;
3056 } 3166 }
3057 3167
3058 selection.op = SELECTION_INIT; 3168 selection.op = SELECTION_INIT;
… …
3069#define DELIMIT_TEXT(x) \ 3179#define DELIMIT_TEXT(x) \
3070 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3180 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3071#define DELIMIT_REND(x) 1 3181#define DELIMIT_REND(x) 1
3072 3182
3073void 3183void
3074rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3184rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3075{ 3185{
3076 int col, row, dirnadd, tcol, trow, w1, w2; 3186 int col, row, dirnadd, tcol, trow, w1, w2;
3077 row_col_t bound; 3187 row_col_t bound;
3078 text_t *stp; 3188 text_t *stp;
3079 rend_t *srp; 3189 rend_t *srp;
3080 3190
3081 if (dirn == UP) 3191 if (dirn == UP)
3082 { 3192 {
3083 bound.row = - nsaved - 1; 3193 bound.row = top_row - 1;
3084 bound.col = 0; 3194 bound.col = 0;
3085 dirnadd = -1; 3195 dirnadd = -1;
3086 } 3196 }
3087 else 3197 else
3088 { 3198 {
… …
3136 } 3246 }
3137 } 3247 }
3138 break; 3248 break;
3139 } 3249 }
3140 3250
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3251 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3252 col++; /* put us on one past the end */
3144 3253
3145 /* Poke the values back in */ 3254 /* Poke the values back in */
3146 ret->row = row; 3255 ret->row = row;
… …
3154 * flag == 0 ==> button 1 3263 * flag == 0 ==> button 1
3155 * flag == 1 ==> button 3 press 3264 * flag == 1 ==> button 3 press
3156 * flag == 2 ==> button 3 motion 3265 * flag == 2 ==> button 3 motion
3157 */ 3266 */
3158void 3267void
3159rxvt_term::selection_extend (int x, int y, int flag) 3268rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3160{ 3269{
3161 int col = clamp (Pixel2Col (x), 0, ncol); 3270 int col = clamp (Pixel2Col (x), 0, ncol);
3162 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3271 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3163 3272
3164 /* 3273 /*
… …
3167 * select nothing. Otherwise, if we're to the right of the mark, you have to 3276 * select nothing. Otherwise, if we're to the right of the mark, you have to
3168 * be _past_ a character for it to be selected. 3277 * be _past_ a character for it to be selected.
3169 */ 3278 */
3170 if (((selection.clicks % 3) == 1) && !flag 3279 if (((selection.clicks % 3) == 1) && !flag
3171 && (col == selection.mark.col 3280 && (col == selection.mark.col
3172 && (row == selection.mark.row + view_start))) 3281 && (row == selection.mark.row - view_start)))
3173 { 3282 {
3174 /* select nothing */ 3283 /* select nothing */
3175 selection.beg.row = selection.end.row = 0; 3284 selection.beg.row = selection.end.row = 0;
3176 selection.beg.col = selection.end.col = 0; 3285 selection.beg.col = selection.end.col = 0;
3177 selection.clicks = 4; 3286 selection.clicks = 4;
… …
3190/* ------------------------------------------------------------------------- */ 3299/* ------------------------------------------------------------------------- */
3191/* 3300/*
3192 * Extend the selection to the specified col/row 3301 * Extend the selection to the specified col/row
3193 */ 3302 */
3194void 3303void
3195rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3304rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3196{ 3305{
3197 row_col_t pos; 3306 row_col_t pos;
3198 enum { 3307 enum {
3199 LEFT, RIGHT 3308 LEFT, RIGHT
3200 } closeto = RIGHT; 3309 } closeto = RIGHT;
… …
3232 selection.beg.col = selection.end.col = selection.mark.col; 3341 selection.beg.col = selection.end.col = selection.mark.col;
3233 selection.beg.row = selection.end.row = selection.mark.row; 3342 selection.beg.row = selection.end.row = selection.mark.row;
3234 } 3343 }
3235 3344
3236 pos.col = col; 3345 pos.col = col;
3237 pos.row = row - view_start; 3346 pos.row = view_start + row;
3238 3347
3239 /* 3348 /*
3240 * This is mainly xterm style selection with a couple of differences, mainly 3349 * This is mainly xterm style selection with a couple of differences, mainly
3241 * in the way button3 drag extension works. 3350 * in the way button3 drag extension works.
3242 * We're either doing: button1 drag; button3 press; or button3 drag 3351 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3248 * a point/word/line which is either the start or end of the selection 3357 * a point/word/line which is either the start or end of the selection
3249 * and it was decided by whichever point/word/line was `fixed' at the 3358 * and it was decided by whichever point/word/line was `fixed' at the
3250 * time of the most recent button3 press 3359 * time of the most recent button3 press
3251 */ 3360 */
3252 if (button3 && buttonpress) 3361 if (button3 && buttonpress)
3362 {
3253 { /* button3 press */ 3363 /* button3 press */
3254 /* 3364 /*
3255 * first determine which edge of the selection we are closest to 3365 * first determine which edge of the selection we are closest to
3256 */ 3366 */
3257 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3367 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3258 || (!ROWCOL_IS_AFTER (pos, selection.end) 3368 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3276 selection.mark.row = selection.beg.row; 3386 selection.mark.row = selection.beg.row;
3277 selection.mark.col = selection.beg.col; 3387 selection.mark.col = selection.beg.col;
3278 } 3388 }
3279 } 3389 }
3280 else 3390 else
3391 {
3281 { /* button1 drag or button3 drag */ 3392 /* button1 drag or button3 drag */
3282 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3393 if (ROWCOL_IS_AFTER (selection.mark, pos))
3283 { 3394 {
3284 if (selection.mark.row == selection.end.row 3395 if (selection.mark.row == selection.end.row
3285 && selection.mark.col == selection.end.col 3396 && selection.mark.col == selection.end.col
3286 && clickchange 3397 && clickchange
… …
3303 3414
3304 if (selection.clicks == 1) 3415 if (selection.clicks == 1)
3305 { 3416 {
3306 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3417 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3307 && !ROW(selection.beg.row).is_longer () 3418 && !ROW(selection.beg.row).is_longer ()
3308#if ENABLE_FRILLS 3419#if !ENABLE_MINIMAL
3309 && !selection.rect 3420 && !selection.rect
3310#endif 3421#endif
3311 ) 3422 )
3312 selection.beg.col = ncol; 3423 selection.beg.col = ncol;
3313 3424
3314 if ( 3425 if (
3315 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3426 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3316 && !ROW(selection.end.row).is_longer () 3427 && !ROW(selection.end.row).is_longer ()
3317#if ENABLE_FRILLS 3428#if !ENABLE_MINIMAL
3318 && !selection.rect 3429 && !selection.rect
3319#endif 3430#endif
3320 ) 3431 )
3321 selection.end.col = ncol; 3432 selection.end.col = ncol;
3322 } 3433 }
3323 else if (selection.clicks == 2) 3434 else if (selection.clicks == 2)
3324 { 3435 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3436 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3437 selection.end.col--;
3327 3438
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3439 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3440 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3333 } 3441 }
3334 else if (selection.clicks == 3) 3442 else if (selection.clicks == 3)
3335 { 3443 {
3336#if ENABLE_FRILLS 3444#if ENABLE_FRILLS
3337 if (OPTION (Opt_tripleclickwords)) 3445 if (option (Opt_tripleclickwords))
3338 { 3446 {
3339 selection_delimit_word (UP, &selection.beg, &selection.beg); 3447 selection_delimit_word (UP, &selection.beg, &selection.beg);
3340 3448
3341 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3449 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3342 { 3450 {
3343 if (!ROW(end_row).is_longer ()) 3451 if (!ROW(end_row).is_longer ())
3344 { 3452 {
3345 selection.end.row = end_row; 3453 selection.end.row = end_row;
3346 selection.end.col = ROW(end_row).l; 3454 selection.end.col = ROW(end_row).l;
3455# if !ENABLE_MINIMAL
3347 selection_remove_trailing_spaces (); 3456 selection_remove_trailing_spaces ();
3457# endif
3348 break; 3458 break;
3349 } 3459 }
3350 } 3460 }
3351 } 3461 }
3352 else 3462 else
… …
3368 selection.end.row++; 3478 selection.end.row++;
3369 } 3479 }
3370 } 3480 }
3371 3481
3372 if (button3 && buttonpress) 3482 if (button3 && buttonpress)
3483 {
3373 { /* mark may need to be changed */ 3484 /* mark may need to be changed */
3374 if (closeto == LEFT) 3485 if (closeto == LEFT)
3375 { 3486 {
3376 selection.mark.row = selection.end.row; 3487 selection.mark.row = selection.end.row;
3377 selection.mark.col = selection.end.col - (selection.clicks == 2); 3488 selection.mark.col = selection.end.col - (selection.clicks == 2);
3378 } 3489 }
… …
3381 selection.mark.row = selection.beg.row; 3492 selection.mark.row = selection.beg.row;
3382 selection.mark.col = selection.beg.col; 3493 selection.mark.col = selection.beg.col;
3383 } 3494 }
3384 } 3495 }
3385 3496
3386#if ENABLE_FRILLS 3497#if !ENABLE_MINIMAL
3387 if (selection.rect && selection.beg.col > selection.end.col) 3498 if (selection.rect && selection.beg.col > selection.end.col)
3388 ::swap (selection.beg.col, selection.end.col); 3499 ::swap (selection.beg.col, selection.end.col);
3389#endif 3500#endif
3390} 3501}
3391 3502
3392#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3393void 3504void
3394rxvt_term::selection_remove_trailing_spaces () 3505rxvt_term::selection_remove_trailing_spaces () NOTHROW
3395{ 3506{
3396 int32_t end_col, end_row; 3507 int32_t end_col, end_row;
3397 text_t *stp; 3508 text_t *stp;
3398 3509
3399 end_col = selection.end.col; 3510 end_col = selection.end.col;
… …
3437/* 3548/*
3438 * Double click on button 3 when already selected 3549 * Double click on button 3 when already selected
3439 * EXT: button 3 double click 3550 * EXT: button 3 double click
3440 */ 3551 */
3441void 3552void
3442rxvt_term::selection_rotate (int x, int y) 3553rxvt_term::selection_rotate (int x, int y) NOTHROW
3443{ 3554{
3444 selection.clicks = selection.clicks % 3 + 1; 3555 selection.clicks = selection.clicks % 3 + 1;
3445 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3556 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3446} 3557}
3447 3558
… …
3449/* 3560/*
3450 * Respond to a request for our current selection 3561 * Respond to a request for our current selection
3451 * EXT: SelectionRequest 3562 * EXT: SelectionRequest
3452 */ 3563 */
3453void 3564void
3454rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3565rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3455{ 3566{
3456 XSelectionEvent ev; 3567 XSelectionEvent ev;
3457 dDisp;
3458 3568
3459 ev.type = SelectionNotify; 3569 ev.type = SelectionNotify;
3460 ev.property = None; 3570 ev.property = None;
3461 ev.display = rq.display; 3571 ev.display = rq.display;
3462 ev.requestor = rq.requestor; 3572 ev.requestor = rq.requestor;
… …
3476 *target++ = xa[XA_COMPOUND_TEXT]; 3586 *target++ = xa[XA_COMPOUND_TEXT];
3477#if X_HAVE_UTF8_STRING 3587#if X_HAVE_UTF8_STRING
3478 *target++ = xa[XA_UTF8_STRING]; 3588 *target++ = xa[XA_UTF8_STRING];
3479#endif 3589#endif
3480 3590
3481 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3591 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3482 32, PropModeReplace, 3592 32, PropModeReplace,
3483 (unsigned char *)target_list, target - target_list); 3593 (unsigned char *)target_list, target - target_list);
3484 ev.property = rq.property; 3594 ev.property = rq.property;
3485 } 3595 }
3486#if TODO // TODO 3596#if TODO // TODO
… …
3489 /* TODO: Handle MULTIPLE */ 3599 /* TODO: Handle MULTIPLE */
3490 } 3600 }
3491#endif 3601#endif
3492 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3493 { 3603 {
3494 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3495 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3605 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3496 ev.property = rq.property; 3606 ev.property = rq.property;
3497 } 3607 }
3498 else if (rq.target == XA_STRING 3608 else if (rq.target == XA_STRING
3499 || rq.target == xa[XA_TEXT] 3609 || rq.target == xa[XA_TEXT]
… …
3523 style = enc_string; 3633 style = enc_string;
3524 else if (target == xa[XA_TEXT]) 3634 else if (target == xa[XA_TEXT])
3525 style = enc_text; 3635 style = enc_text;
3526 else if (target == xa[XA_COMPOUND_TEXT]) 3636 else if (target == xa[XA_COMPOUND_TEXT])
3527 style = enc_compound_text; 3637 style = enc_compound_text;
3528#if ENABLE_FRILLS 3638#if !ENABLE_MINIMAL
3529 else if (target == xa[XA_UTF8_STRING]) 3639 else if (target == xa[XA_UTF8_STRING])
3530 style = enc_utf8; 3640 style = enc_utf8;
3531#endif 3641#endif
3532 else 3642 else
3533 { 3643 {
… …
3544 { 3654 {
3545 cl = L""; 3655 cl = L"";
3546 selectlen = 0; 3656 selectlen = 0;
3547 } 3657 }
3548 3658
3549#if ENABLE_FRILLS 3659#if !ENABLE_MINIMAL
3550 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3660 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3551 // so recode it manually 3661 // so recode it manually
3552 if (style == enc_utf8) 3662 if (style == enc_utf8)
3553 { 3663 {
3554 freect = 1; 3664 freect = 1;
… …
3557 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3667 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3558 ct.nitems = strlen ((char *)ct.value); 3668 ct.nitems = strlen ((char *)ct.value);
3559 } 3669 }
3560 else 3670 else
3561#endif 3671#endif
3562 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3672 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3563 freect = 1; 3673 freect = 1;
3564 else 3674 else
3565 { 3675 {
3566 /* if we failed to convert then send it raw */ 3676 /* if we failed to convert then send it raw */
3567 ct.value = (unsigned char *)cl; 3677 ct.value = (unsigned char *)cl;
3568 ct.nitems = selectlen; 3678 ct.nitems = selectlen;
3569 ct.encoding = target; 3679 ct.encoding = target;
3570 } 3680 }
3571 3681
3572 XChangeProperty (disp, rq.requestor, rq.property, 3682 XChangeProperty (dpy, rq.requestor, rq.property,
3573 ct.encoding, 8, PropModeReplace, 3683 ct.encoding, 8, PropModeReplace,
3574 ct.value, (int)ct.nitems); 3684 ct.value, (int)ct.nitems);
3575 ev.property = rq.property; 3685 ev.property = rq.property;
3576 3686
3577 if (freect) 3687 if (freect)
3578 XFree (ct.value); 3688 XFree (ct.value);
3579 } 3689 }
3580 3690
3581 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3691 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3582}
3583
3584/* ------------------------------------------------------------------------- *
3585 * MOUSE ROUTINES *
3586 * ------------------------------------------------------------------------- */
3587
3588/*
3589 * return col/row values corresponding to x/y pixel values
3590 */
3591void
3592rxvt_term::pixel_position (int *x, int *y)
3593{
3594 *x = Pixel2Col (*x);
3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3596 *y = Pixel2Row (*y);
3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3598} 3692}
3599 3693
3600/* ------------------------------------------------------------------------- */ 3694/* ------------------------------------------------------------------------- */
3601#ifdef USE_XIM 3695#ifdef USE_XIM
3602void 3696void
3603rxvt_term::im_set_position (XPoint &pos) 3697rxvt_term::im_set_position (XPoint &pos) NOTHROW
3604{ 3698{
3605 XWindowAttributes xwa; 3699 XWindowAttributes xwa;
3606 3700
3607 XGetWindowAttributes (display->display, vt, &xwa); 3701 XGetWindowAttributes (dpy, vt, &xwa);
3608 3702
3609 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3703 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3610 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3704 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3611} 3705}
3612#endif 3706#endif
3613 3707
3614#if ENABLE_OVERLAY 3708#if ENABLE_OVERLAY
3615void 3709void
3616rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3710rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3617{ 3711{
3618 if (nrow < 1 || ncol < 1) 3712 if (nrow < 1 || ncol < 1)
3619 return; 3713 return;
3620 3714
3621 want_refresh = 1; 3715 want_refresh = 1;
… …
3666 *rp = r; 3760 *rp = r;
3667 } 3761 }
3668} 3762}
3669 3763
3670void 3764void
3671rxvt_term::scr_overlay_off () 3765rxvt_term::scr_overlay_off () NOTHROW
3672{ 3766{
3673 if (!ov_text) 3767 if (!ov_text)
3674 return; 3768 return;
3675 3769
3676 want_refresh = 1; 3770 want_refresh = 1;
… …
3684 delete [] ov_text; ov_text = 0; 3778 delete [] ov_text; ov_text = 0;
3685 delete [] ov_rend; ov_rend = 0; 3779 delete [] ov_rend; ov_rend = 0;
3686} 3780}
3687 3781
3688void 3782void
3689rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3783rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3690{ 3784{
3691 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3692 return; 3786 return;
3693 3787
3694 x++, y++; 3788 x++, y++;
… …
3696 ov_text[y][x] = text; 3790 ov_text[y][x] = text;
3697 ov_rend[y][x] = rend; 3791 ov_rend[y][x] = rend;
3698} 3792}
3699 3793
3700void 3794void
3701rxvt_term::scr_overlay_set (int x, int y, const char *s) 3795rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3702{ 3796{
3703 while (*s) 3797 while (*s)
3704 scr_overlay_set (x++, y, *s++); 3798 scr_overlay_set (x++, y, *s++);
3705} 3799}
3706 3800
3707void 3801void
3708rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3802rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3709{ 3803{
3710 while (*s) 3804 while (*s)
3711 { 3805 {
3712 text_t t = *s++; 3806 text_t t = *s++;
3713 int width = wcwidth (t); 3807 int width = WCWIDTH (t);
3714 3808
3715 while (width--) 3809 while (width--)
3716 { 3810 {
3717 scr_overlay_set (x++, y, t); 3811 scr_overlay_set (x++, y, t);
3718 t = NOCHAR; 3812 t = NOCHAR;
3719 } 3813 }
3720 } 3814 }
3721} 3815}
3722 3816
3723void 3817void
3724rxvt_term::scr_swap_overlay () 3818rxvt_term::scr_swap_overlay () NOTHROW
3725{ 3819{
3726 if (!ov_text) 3820 if (!ov_text)
3727 return; 3821 return;
3728 3822
3729 // swap screen mem with overlay 3823 // swap screen mem with overlay
3730 for (int y = ov_h; y--; ) 3824 for (int y = ov_h; y--; )
3731 { 3825 {
3732 text_t *t1 = ov_text[y]; 3826 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y]; 3827 rend_t *r1 = ov_rend[y];
3734 3828
3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3829 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3830 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3737 3831
3738 for (int x = ov_w; x--; ) 3832 for (int x = ov_w; x--; )
3739 { 3833 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3834 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3835 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