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.188 by root, Thu Dec 22 00:07:47 2005 UTC vs.
Revision 1.309 by root, Mon Jul 21 16:51:31 2008 UTC

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