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.177 by root, Tue Dec 20 21:49:55 2005 UTC vs.
Revision 1.249 by root, Wed Jan 25 00:42:21 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
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-2006 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#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 85 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) \ 86#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) 87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
87 88
88#define LINENO(n) (((n) + term_start + total_rows) % total_rows)
89#define ROW(n) (save [LINENO (n)])
90
91/* 89/*
92 * CLEAR_ROWS : clear <num> rows starting from row <row> 90 * CLEAR_ROWS : clear <num> rows starting from row <row>
93 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
94 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
95 */ 93 */
… …
117 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
118 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
119 117
120/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
121void 119void
122rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
123{ 121{
124 if (!l.t) 122 if (!l.t)
125 { 123 {
126 lalloc (l); 124 lalloc (l);
127 col = 0; 125 col = 0;
128 width = ncol; 126 width = ncol;
129 } 127 }
130 128
129 l.touch ();
130
131 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 133
134 text_t *et = l.t + col; 134 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
146void 146void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
158
155void 159void
156rxvt_term::scr_reset () 160rxvt_term::scr_reset ()
157{ 161{
158 unsigned int p, q;
159 int k;
160
161#if ENABLE_OVERLAY 162#if ENABLE_OVERLAY
162 scr_overlay_off (); 163 scr_overlay_off ();
163#endif 164#endif
164 165
165 view_start = 0; 166 view_start = 0;
… …
172 nrow = 24; 173 nrow = 24;
173 174
174 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 176 return;
176 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
177 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
178 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
179 { 183 {
184 //TODO//FIXME
180 saveLines++; 185 saveLines++;
181 prev_nrow--; 186 prev_nrow--;
182 nsaved++; 187 top_row--;
183 } 188 }
184 189
185 want_refresh = 1; 190 want_refresh = 1;
186 191
187 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
188 total_rows = nrow + saveLines; 193 total_rows = nrow + saveLines;
189 194
190 screen.tscroll = 0; 195 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 196 screen.bscroll = nrow - 1;
192 197
193 if (!save) 198 if (!row_buf)
194 { 199 {
195 /* 200 /*
196 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
197 * Note: this is still needed so that all the scrollback lines are NULL
198 */ 202 */
199 nsaved = 0; /* no saved lines */ 203 top_row = 0;
200 term_start = 0; 204 term_start = 0;
201 205
202 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
203 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
204 208
205 save = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_save = (line_t *)rxvt_calloc (nrow, sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 212
210 for (p = nrow; p--; ) 213 for (int row = nrow; row--; )
211 { 214 {
212 scr_blank_screen_mem (ROW(p), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE); 217 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 } 218 }
216 219
217 memset (charsets, 'B', sizeof (charsets)); 220 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 221 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 222 screen.flags = Screen_DefaultFlags;
… …
234 selection.text = NULL; 237 selection.text = NULL;
235 selection.len = 0; 238 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
238 selection.clicks = 0; 241 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
246 */ 248 */
247 249
248 rxvt_salloc *old_ta; 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
249 rxvt_salloc *old_ra; 251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250 252
253#if 0
251 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
252 { 255 {
253 /* delete rows */
254 k = min (nsaved, prev_nrow - nrow);
255 // k = max (0, - ( (nrow - 1) - r->screen.cur.row)); // mmc's http://maruska.dyndns.org/wiki/scrolling-bug //make configurable? //D TODO
256 scr_scroll_text (0, (int)prev_nrow - 1, k);
257
258 for (p = nrow; p < prev_nrow; p++) 256 for (int row = nrow; row < prev_nrow; row++)
259 { 257 {
260 lfree (ROW(p));
261 lfree (swap_save[p]); 258 lfree (swap_buf [row]);
262 lfree (drawn[p]); 259 lfree (drawn_buf[row]);
263 } 260 }
261 }
262#endif
264 263
265 /* we have fewer rows so fix up cursor position */ 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 266
268 scr_reset_realloc (); /* realloc _last_ */ 267 for (int row = min (nrow, prev_nrow); row--; )
268 {
269 lresize (drawn_buf[row]);
270 lresize (swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 {
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
269 } 281
270 else if (nrow > prev_nrow) 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row
285
286 if (top_row)
287 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm.
290
291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
271 { 294 do
272 /* add rows */
273 scr_reset_realloc (); /* realloc _first_ */
274
275 int ocol = ncol;
276 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
277
278 k = min (nsaved, nrow - prev_nrow);
279
280 for (p = prev_total_rows; p < total_rows; p++)
281 save[p].clear ();
282
283 for (p = prev_total_rows; p < total_rows - k; p++)
284 scr_blank_screen_mem (save[p], DEFAULT_RSTYLE);
285
286 for (p = prev_nrow; p < nrow; p++)
287 { 295 {
288 swap_save[p].clear (); scr_blank_screen_mem (swap_save[p], DEFAULT_RSTYLE); 296 p = MOD (p - 1, prev_total_rows);
289 drawn[p].clear (); scr_blank_screen_mem (drawn[p], DEFAULT_RSTYLE);
290 }
291
292 if (k > 0)
293 {
294 scr_scroll_text (0, (int)nrow - 1, -k);
295 screen.cur.row += k;
296 screen.s_cur.row += k;
297 nsaved -= k;
298 }
299
300#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
301 assert (screen.cur.row < nrow); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
302#else /* drive with your eyes closed */
303 MIN_IT (screen.cur.row, nrow - 1);
304#endif 299#endif
305 ncol = ocol; // save b/c scr_blank_screen_mem uses this
306 }
307
308 /* resize columns */
309 if (ncol != prev_ncol)
310 {
311 old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
312 old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
313
314 for (p = total_rows; p--; )
315 lresize (save[p]);
316
317 for (p = nrow; p--; )
318 {
319 lresize (drawn[p]);
320 lresize (swap_save[p]);
321 }
322
323 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
324
325 delete old_ta;
326 delete old_ra;
327 }
328
329#if 0
330 // re-wrap lines, this is rather ugly, possibly because I am too dumb
331 // to come up with a lean and mean algorithm.
332 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
333 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
334
335 text_t **tp = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
336 rend_t **rp = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
337 tlen_t *tl = (tlen_t *) rxvt_calloc (total_rows, sizeof (tlen_t));
338
339 for (p = 0; p < prev_total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D
340
341 p = prev_total_rows;
342 q = total_rows;
343
344 while (p > 0 && q > 0)
345 {
346 --p;
347
348 printf ("pq %d:%d\n", p, q);
349 if (save[p].t)
350 {
351 int llen = save[p].l; 300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
352 302
353 assert (llen >= 0); 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
354
355 while (p && save[p - 1].l < 0)
356 { 304 {
305 p = MOD (p - 1, prev_total_rows);
306
357 --p; 307 plines++;
358 llen += prev_ncol; 308 llen += prev_ncol;
359 } 309 }
360 310
361 int qlines = llen / ncol + 1; 311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
362 int lofs = 0; 319 int lofs = 0;
320 line_t *qline;
363 321
364 q -= qlines; 322 // re-assemble the full line by destination lines
365
366 int qrow = q;
367
368 printf ("QL %d llen %d\n", qlines, llen);//D
369 for (; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
370 { 324 {
325 qline = row_buf + qrow;
326 lalloc (*qline);
327 qline->l = ncol;
328 qline->is_longer (1);
329
330 int qcol = 0;
331
332 // see below for cursor adjustment rationale
371 if (qrow >= 0) 333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
336 // fill a single destination line
337 while (lofs < llen && qcol < ncol)
372 { 338 {
373 tp [qrow] = (text_t *)ta->alloc ();
374 rp [qrow] = (rend_t *)ra->alloc ();
375 tl [qrow] = LINE_CONT1;
376
377 int qcol = 0;
378
379 for (;;)
380 {
381 int prow = lofs / prev_ncol + p; 339 int prow = lofs / prev_ncol;
382 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
383 341
342 prow = MOD (p + prow, prev_total_rows);
343
344 // we only adjust the cursor _row_ and put it into
345 // the topmost line of "long line" it was in, as
346 // this seems to upset applications/shells/readline
347 // least.
348 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow);
350
351 line_t &pline = old_buf [prow];
352
384 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
385 354
386 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
387
388 if (len <= 0)
389 {
390 tl [qrow] = qcol;
391
392 TODO
393 scr_blank_line (tp [qrow] + qcol, rp [qrow] + qcol,
394 ncol - qcol, DEFAULT_RSTYLE);
395
396 break;
397 }
398
399 assert (lofs < 1000);
400
401 memcpy (tp [qrow] + qcol, save[prow].t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
402 memcpy (rp [qrow] + qcol, save[prow].r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
403 357
404 lofs += len; 358 lofs += len;
405 qcol += len; 359 qcol += len;
406
407 if (qcol == ncol)
408 break;
409 }
410 } 360 }
411 else
412 lofs += ncol;
413 } 361 }
362
363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
364 qline->is_longer (0);
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
414 } 366 }
367 while (p != pend && q > 0);
368
369 term_start = total_rows - nrow;
370 top_row = q - term_start;
371
372 // make sure all terminal lines exist
373 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 }
376 else
415 } 377 {
378 // if no scrollback exists (yet), wing, instead of wrap
379
380 for (int row = min (nrow, prev_nrow); row--; )
381 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row];
416 384
417 free (screen.text); screen.text = tp; 385 qline = pline;
418 free (screen.rend); screen.rend = rp; 386 lresize (qline);
419 free (screen.tlen); screen.tlen = tl; 387 }
420 388
421 for (p = 0; p < total_rows; p++) printf ("P %p %d\n", save[p].t, save[p].l);//D 389 for (int row = prev_nrow; row < nrow; row++)
422#endif 390 {
391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
392 }
423 393
424 if (tabs) 394 term_start = 0;
395 }
396
397 free (old_buf);
398 delete old_ta;
399 delete old_ra;
400
401 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1);
403
425 free (tabs); 404 free (tabs);
426 } 405 }
406
407 CLEAR_ALL_SELECTION ();
427 408
428 prev_nrow = nrow; 409 prev_nrow = nrow;
429 prev_ncol = ncol; 410 prev_ncol = ncol;
430 411
431 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
432 413
433 for (p = 0; p < ncol; p++) 414 for (int col = ncol; col--; )
434 tabs[p] = (p % TABSIZE == 0) ? 1 : 0; 415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
435 419
436 tt_winch (); 420 tt_winch ();
437}
438 421
439void 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
440rxvt_term::scr_reset_realloc ()
441{
442 swap_save = (line_t *) rxvt_realloc (swap_save , nrow * sizeof (line_t));
443 drawn = (line_t *) rxvt_realloc (drawn , nrow * sizeof (line_t));
444 buf = (line_t *) rxvt_realloc (buf , nrow * sizeof (line_t));
445 save = (line_t *) rxvt_realloc (save , total_rows * sizeof (line_t));
446} 423}
447 424
448/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
449/* 426/*
450 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
451 */ 428 */
452void 429void
453rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
454{ 431{
432 if (row_buf)
433 {
455 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
456 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
457 436
458 free (save); 437 free (row_buf);
459 free (swap_save); 438 free (swap_buf);
460 free (drawn); 439 free (drawn_buf);
461 free (buf);
462 free (tabs); 440 free (tabs);
441
442 row_buf = 0; // signal that we freed all the arrays
443 }
463} 444}
464 445
465/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
466/* 447/*
467 * Hard reset 448 * Hard reset
… …
472 scr_release (); 453 scr_release ();
473 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
474 scr_reset (); 455 scr_reset ();
475 456
476 scr_clear (true); 457 scr_clear (true);
477 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
478} 459}
479 460
480/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
481 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
482 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
484 * Save and Restore cursor 465 * Save and Restore cursor
485 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
486 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
487 */ 468 */
488void 469void
489rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
490{ 471{
491 screen_t *s; 472 screen_t *s;
492 473
493#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
494 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
518 set_font_style (); 499 set_font_style ();
519 break; 500 break;
520 } 501 }
521 502
522 /* boundary check in case screen size changed between SAVE and RESTORE */ 503 /* boundary check in case screen size changed between SAVE and RESTORE */
523 MIN_IT (s->cur.row, nrow - 1); 504 min_it (s->cur.row, nrow - 1);
524 MIN_IT (s->cur.col, ncol - 1); 505 min_it (s->cur.col, ncol - 1);
525#ifdef DEBUG_STRICT 506#ifdef DEBUG_STRICT
526 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
527 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
528#else /* drive with your eyes closed */
529 MAX_IT (s->cur.row, 0);
530 MAX_IT (s->cur.col, 0);
531#endif 509#endif
510}
511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
532} 525}
533 526
534/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
535/* 528/*
536 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
537 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
538 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
539 */ 532 */
540int 533void
541rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
542{ 535{
536 if (scrn == current_screen)
537 return;
538
543 want_refresh = 1; 539 want_refresh = 1;
544 view_start = 0; 540 view_start = 0;
545 541
546 if (current_screen == scrn)
547 return scrn;
548
549 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
550 543
551 SWAP_IT (scrn, current_screen, int); 544 int i = current_screen; current_screen = scrn; scrn = i;
552
553 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
554 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
555 MAX_IT (screen.cur.row, 0);
556 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
557 MAX_IT (screen.cur.col, 0);
558 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
559 545
560#if NSCREENS 546#if NSCREENS
561 if (options & Opt_secondaryScreen) 547 if (OPTION (Opt_secondaryScreen))
562 { 548 {
563 num_scr = 0; 549 num_scr = 0;
564 550
565 for (int i = nrow; i--; ) 551 scr_swap_screen ();
566 SWAP_IT (ROW(i), swap_save[i], line_t);
567 552
568 SWAP_IT (screen.charset, swap.charset, int16_t); 553 ::swap (screen.charset, swap.charset);
569 SWAP_IT (screen.flags, swap.flags, int); 554 ::swap (screen.flags, swap.flags);
570 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
571 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
572 } 557 }
573 else 558 else
574#endif 559#endif
575 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
576 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
577
578 return scrn;
579} 562}
580 563
581// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
582void 565void
583rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
584{ 567{
585 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
586 return; 569 return;
587 570
588 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
598/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
599/* 582/*
600 * Change the colour for following text 583 * Change the colour for following text
601 */ 584 */
602void 585void
603rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
604{ 587{
605 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
606 color = fgbg; 589 color = fgbg;
607 590
608 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
609 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
610 else 593 else
… …
614/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
615/* 598/*
616 * Change the rendition style for following text 599 * Change the rendition style for following text
617 */ 600 */
618void 601void
619rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
620 { 603 {
621 if (set) 604 if (set)
622 rstyle |= style; 605 rstyle |= style;
623 else if (style == ~RS_None) 606 else if (style == ~RS_None)
624 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
631 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
632 * count positive ==> scroll up 615 * count positive ==> scroll up
633 * count negative ==> scroll down 616 * count negative ==> scroll down
634 */ 617 */
635int 618int
636rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
637{ 620{
638 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
639 return 0; 622 return 0;
640 623
641 want_refresh = 1; 624 want_refresh = 1;
642 num_scr += count; 625 num_scr += count;
643 626
644 if (count > 0 627 if (count > 0
645 && row1 == 0 628 && row1 == 0
646 && row2 == nrow - 1
647 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
648 { 630 {
649 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
650 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
651 635
636 // sever bottommost line
637 {
638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
642
643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i);
649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any
652 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
653 { 670 {
654 selection.beg.row -= count; 671 selection.beg.row -= count;
655 selection.end.row -= count; 672 selection.end.row -= count;
656 selection.mark.row -= count; 673 selection.mark.row -= count;
657 674
658 selection_check (0); 675 if (selection.beg.row < top_row
659 } 676 || selection.end.row < top_row
660 677 || selection.mark.row < top_row)
661 for (int i = count; i--; )
662 scr_blank_screen_mem (ROW(row2 - i), rstyle);
663
664 if ((options & Opt_scrollWithBuffer)
665 && view_start != 0
666 && view_start != saveLines)
667 scr_page (UP, count);
668 }
669 else
670 {
671 if (selection.op && current_screen == selection.screen)
672 {
673 int i = selection.beg.row;
674 int j = selection.end.row;
675
676 if ((i < row1 && j > row1)
677 || (i < row2 && j > row2)
678 || (i - count < row1 && i >= row1)
679 || (i - count > row2 && i <= row2)
680 || (j - count < row1 && j >= row1)
681 || (j - count > row2 && j <= row2))
682 { 678 {
683 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 680 selection.op = SELECTION_CLEAR;
685 } 681 }
686 else if (j >= row1 && j <= row2) 682 }
683
684 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer)
686 && view_start != 0
687 && view_start != -saveLines)
688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
692 }
693 else
694 {
695 if (selection.op && current_screen == selection.screen)
696 {
697 if ((selection.beg.row < row1 && selection.end.row > row1)
698 || (selection.beg.row < row2 && selection.end.row > row2)
699 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
700 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
701 || (selection.end.row - count < row1 && selection.end.row >= row1)
702 || (selection.end.row - count > row2 && selection.end.row <= row2))
703 {
704 CLEAR_ALL_SELECTION ();
705 selection.op = SELECTION_CLEAR;
706 }
707 else if (selection.end.row >= row1 && selection.end.row <= row2)
687 { 708 {
688 /* move selected region too */ 709 /* move selected region too */
689 selection.beg.row -= count; 710 selection.beg.row -= count;
690 selection.end.row -= count; 711 selection.end.row -= count;
691 selection.mark.row -= count; 712 selection.mark.row -= count;
… …
697 // use a simple and robust scrolling algorithm, this 718 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 719 // part of scr_scroll_text is not time-critical.
699 720
700 int rows = row2 - row1 + 1; 721 int rows = row2 - row1 + 1;
701 722
723 min_it (count, rows);
724
725 line_t *temp_buf = row_buf + total_rows;
726
702 for (int row = 0; row < rows; row++) 727 for (int row = 0; row < rows; row++)
703 { 728 {
704 buf [row] = ROW(row1 + (row + count + rows) % rows); 729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
705 730
706 if (!IN_RANGE_EXC (row + count, 0, rows)) 731 if (!IN_RANGE_EXC (row + count, 0, rows))
707 scr_blank_screen_mem (buf [row], rstyle); 732 scr_blank_screen_mem (temp_buf [row], rstyle);
708 } 733 }
709 734
710 for (int row = 0; row < rows; row++) 735 for (int row = 0; row < rows; row++)
711 ROW(row1 + row) = buf [row]; 736 ROW(row1 + row) = temp_buf [row];
712 } 737 }
713 738
714 return count; 739 return count;
715} 740}
716 741
717/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
718/* 743/*
719 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
720 */ 745 */
721void 746void
722rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
723{ 748{
724 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
725 return; 750 return;
726 751
727 unsigned char checksel; 752 unsigned char checksel;
728 unicode_t c; 753 unicode_t c;
729 int row, last_col; 754 int ncol = this->ncol;
730 const unicode_t *strend = str + len; 755 const wchar_t *strend = str + len;
731 756
732 want_refresh = 1; 757 want_refresh = 1;
733 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
734 last_col = ncol;
735 759
736 if (nlines > 0) 760 if (minlines > 0)
737 { 761 {
738 nlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
764
739 if ((nlines > 0) 765 if (minlines > 0
740 && (screen.tscroll == 0) 766 && screen.tscroll == 0
741 && (screen.bscroll == (nrow - 1))) 767 && screen.bscroll == nrow - 1)
742 { 768 {
743 /* _at least_ this many lines need to be scrolled */ 769 /* _at least_ this many lines need to be scrolled */
744 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
745 screen.cur.row -= nlines; 771 screen.cur.row -= minlines;
746 } 772 }
747 } 773 }
748 774
749#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
750 assert (screen.cur.col < last_col); 776 assert (screen.cur.col < ncol);
751 assert ((screen.cur.row < nrow) 777 assert (screen.cur.row < nrow
752 && (screen.cur.row >= - (int32_t)nsaved)); 778 && screen.cur.row >= top_row);
753#else /* drive with your eyes closed */
754 MIN_IT (screen.cur.col, last_col - 1);
755 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
756 MAX_IT (screen.cur.row, - (int32_t)nsaved);
757#endif 779#endif
758 row = screen.cur.row; 780 int row = screen.cur.row;
759 781
760 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
761 783
762 line_t *line = &ROW(row); 784 line_t *line = &ROW(row);
763 785
764 while (str < strend) 786 while (str < strend)
765 { 787 {
766 c = *str++; 788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
767 789
768 if (c < 0x20) 790 if (c < 0x20)
769 if (c == C0_LF) 791 if (c == C0_LF)
770 { 792 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 MAX_IT (line->l, screen.cur.col); 793 max_it (line->l, screen.cur.col);
773 794
774 screen.flags &= ~Screen_WrapNext; 795 screen.flags &= ~Screen_WrapNext;
775 796
776 if (screen.cur.row == screen.bscroll) 797 if (screen.cur.row == screen.bscroll)
777 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 798 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
781 line = &ROW(row); /* _must_ refresh */ 802 line = &ROW(row); /* _must_ refresh */
782 continue; 803 continue;
783 } 804 }
784 else if (c == C0_CR) 805 else if (c == C0_CR)
785 { 806 {
786 if (!line->is_longer ()) /* XXX: think about this */
787 MAX_IT (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
788 808
789 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
790 screen.cur.col = 0; 810 screen.cur.col = 0;
791 continue; 811 continue;
792 } 812 }
… …
809 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
810 } 830 }
811 831
812 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
813 { 833 {
814 line->set_is_longer ();
815
816 scr_do_wrap (); 834 scr_do_wrap ();
817 835
836 line->l = ncol;
837 line->is_longer (1);
838
818 row = screen.cur.row; 839 row = screen.cur.row;
819 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
820 } 841 }
821 842
822 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
823 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
824 c = 0xfffd; 845 c = 0xfffd;
825 846
826 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
827 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
828 // for the line drawing characters below as they might be invalid in the current 849 // drawing characters below as they might be invalid in the current
829 // locale. 850 // locale.
830 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
831 852
832 if (charsets[screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
833 { 854 {
834 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
835 // 5f-7e standard vt100 856 // 5f-7e standard vt100
836 // 40-5e rxvt extension for extra curses acs chars 857 // 40-5e rxvt extension for extra curses acs chars
837 static uint16_t vt100_0[62] = { // 41 .. 7e 858 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 } 910 }
890 911
891 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
892 913
893 // if the character doesn't fit into the remaining columns... 914 // if the character doesn't fit into the remaining columns...
894 if (screen.cur.col > last_col - width && last_col >= width) 915 if (screen.cur.col > ncol - width && ncol >= width)
895 { 916 {
896 // ...output spaces 917 // ...output spaces
897 c = ' '; 918 c = ' ';
898 // and try the same character next loop iteration 919 // and try the same character next loop iteration
899 --str; 920 --str;
900 } 921 }
901 922
923 line->touch ();
924
902 do 925 do
903 { 926 {
904 line->t[screen.cur.col] = c; 927 line->t[screen.cur.col] = c;
905 line->r[screen.cur.col] = rend; 928 line->r[screen.cur.col] = rend;
906 929
907 if (screen.cur.col < last_col - 1) 930 if (screen.cur.col < ncol - 1)
908 screen.cur.col++; 931 screen.cur.col++;
909 else 932 else
910 { 933 {
911 line->l = last_col; 934 line->l = ncol;
912 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
913 screen.flags |= Screen_WrapNext; 936 screen.flags |= Screen_WrapNext;
914 break; 937 break;
915 } 938 }
916 939
… …
918 } 941 }
919 while (--width > 0); 942 while (--width > 0);
920 943
921 // pad with spaces when overwriting wide character with smaller one 944 // pad with spaces when overwriting wide character with smaller one
922 if (!width) 945 if (!width)
946 {
947 line->touch ();
948
923 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
924 { 950 {
925 line->t[c] = ' '; 951 line->t[c] = ' ';
926 line->r[c] = rend; 952 line->r[c] = rend;
927 } 953 }
954 }
928 } 955 }
929 else // width == 0 956 else // width == 0
930 { 957 {
931#if ENABLE_COMBINING 958#if ENABLE_COMBINING
932 // handle combining characters 959 // handle combining characters
933 // we just tag the accent on the previous on-screen character. 960 // we just tag the accent on the previous on-screen character.
934 // this is arguably not correct, but also arguably not wrong. 961 // this is arguably not correct, but also arguably not wrong.
935 // we don't handle double-width characters nicely yet. 962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
936 text_t *tp; 964 text_t *tp;
937 rend_t *rp; 965 rend_t *rp;
938 966
939 if (screen.cur.col > 0) 967 if (screen.cur.col > 0)
940 { 968 {
969 linep = line;
941 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
942 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
943
944 while (*tp == NOCHAR && tp > line->t)
945 tp--, rp--;
946 } 972 }
947 else if (screen.cur.row > 0 973 else if (screen.cur.row > 0
948 && ROW(screen.cur.row - 1).is_longer ()) 974 && ROW(screen.cur.row - 1).is_longer ())
949 { 975 {
950 line_t *line = &ROW(screen.cur.row - 1); 976 linep = &ROW(screen.cur.row - 1);
951
952 tp = line->t + last_col - 1; 977 tp = line->t + ncol - 1;
953 rp = line->r + last_col - 1; 978 rp = line->r + ncol - 1;
954
955 while (*tp == NOCHAR && tp > line->t)
956 tp--, rp--;
957 } 979 }
958 else 980 else
959 continue; 981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
960 987
961 // first try to find a precomposed character 988 // first try to find a precomposed character
962 unicode_t n = rxvt_compose (*tp, c); 989 unicode_t n = rxvt_compose (*tp, c);
963 if (n == NOCHAR) 990 if (n == NOCHAR)
964 n = rxvt_composite.compose (*tp, c); 991 n = rxvt_composite.compose (*tp, c);
… …
967 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
968#endif 995#endif
969 } 996 }
970 } 997 }
971 998
972 if (!line->is_longer ()) /* XXX: think about this */
973 MAX_IT (line->l, screen.cur.col); 999 max_it (line->l, screen.cur.col);
974 1000
975#ifdef DEBUG_STRICT 1001#ifdef DEBUG_STRICT
976 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
977#else /* drive with your eyes closed */
978 MAX_IT (screen.cur.row, 0);
979#endif 1003#endif
980} 1004}
981 1005
982/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
983/* 1007/*
984 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
985 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
986 */ 1010 */
987void 1011void
988rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
989{ 1013{
990 want_refresh = 1; 1014 want_refresh = 1;
991 1015
992 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
993 { 1017 {
… …
1011 * Process Horizontal Tab 1035 * Process Horizontal Tab
1012 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
1013 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
1014 */ 1038 */
1015void 1039void
1016rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
1017{ 1041{
1018 int i, x; 1042 int i, x;
1019 1043
1020 want_refresh = 1; 1044 want_refresh = 1;
1021 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
1022 1046
1023 if (count == 0) 1047 if (count == 0)
1024 return; 1048 return;
1025 else if (count > 0) 1049 else if (count > 0)
1026 { 1050 {
1027 int row = screen.cur.row;
1028
1029 line_t &l = ROW(row); 1051 line_t &l = ROW(screen.cur.row);
1030 rend_t base_rend = l.r[i]; 1052 rend_t base_rend = l.r[i];
1031 ht &= l.t[i] == ' '; 1053 ht &= l.t[i] == ' ';
1032 1054
1033 for (; ++i < ncol; ) 1055 for (; ++i < ncol; )
1034 if (tabs[i]) 1056 if (tabs[i])
1035 { 1057 {
1036 x = i; 1058 x = i;
1059
1037 if (!--count) 1060 if (!--count)
1038 break; 1061 break;
1039 } 1062 }
1040 else 1063 else
1041 ht &= l.t[i] == ' ' 1064 ht &= l.t[i] == ' '
… …
1044 if (count) 1067 if (count)
1045 x = ncol - 1; 1068 x = ncol - 1;
1046 1069
1047 // store horizontal tab commands as characters inside the text 1070 // store horizontal tab commands as characters inside the text
1048 // buffer so they can be selected and pasted. 1071 // buffer so they can be selected and pasted.
1049 if (ht && options & Opt_pastableTabs) 1072 if (ht && OPTION (Opt_pastableTabs))
1050 { 1073 {
1051 base_rend = SET_FONT (base_rend, 0); 1074 base_rend = SET_FONT (base_rend, 0);
1052 1075
1053 if (!l.is_longer ()) /* XXX: think about this */ 1076 l.touch (x);
1054 MAX_IT (l.l, x);
1055 1077
1056 i = screen.cur.col; 1078 i = screen.cur.col;
1057 1079
1058 l.t[i] = '\t'; 1080 l.t[i] = '\t';
1059 l.r[i] = base_rend; 1081 l.r[i] = base_rend;
… …
1090 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1091 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1092 */ 1114 */
1093#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1094void 1116void
1095rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1096{ 1118{
1097 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1098 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1099 else 1121 else
1100 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
… …
1107 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1108 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1109 */ 1131 */
1110#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1111void 1133void
1112rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1113{ 1135{
1114 int row;
1115
1116 if (screen.cur.col < ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1117 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1118 else 1138 else
1119 { 1139 {
1120 row = screen.cur.row; 1140 line_t &l = ROW(screen.cur.row);
1121 1141
1122 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1142 l.touch ();
1123 ROW(row).l = ncol; 1143 l.is_longer (0);
1124 1144
1125 scr_gotorc (0, 0, R_RELATIVE); 1145 scr_gotorc (0, 0, R_RELATIVE);
1126 scr_insdel_chars (1, DELETE); 1146 scr_insdel_chars (1, DELETE);
1127 scr_gotorc (0, ncol - 1, R_RELATIVE); 1147 scr_gotorc (0, ncol - 1, R_RELATIVE);
1128 } 1148 }
… …
1132/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1133/* 1153/*
1134 * Goto Row/Column 1154 * Goto Row/Column
1135 */ 1155 */
1136void 1156void
1137rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1138{ 1158{
1139 want_refresh = 1; 1159 want_refresh = 1;
1140 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1141 1161
1142 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1143 MAX_IT (screen.cur.col, 0); 1163 clamp_it (screen.cur.col, 0, ncol - 1);
1144 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1145 1164
1146 screen.flags &= ~Screen_WrapNext; 1165 screen.flags &= ~Screen_WrapNext;
1147 1166
1148 if (relative & R_RELATIVE) 1167 if (relative & R_RELATIVE)
1149 { 1168 {
… …
1167 else 1186 else
1168 { 1187 {
1169 if (screen.flags & Screen_Relative) 1188 if (screen.flags & Screen_Relative)
1170 { /* relative origin mode */ 1189 { /* relative origin mode */
1171 screen.cur.row = row + screen.tscroll; 1190 screen.cur.row = row + screen.tscroll;
1172 MIN_IT (screen.cur.row, screen.bscroll); 1191 min_it (screen.cur.row, screen.bscroll);
1173 } 1192 }
1174 else 1193 else
1175 screen.cur.row = row; 1194 screen.cur.row = row;
1176 } 1195 }
1177 1196
1178 MAX_IT (screen.cur.row, 0); 1197 clamp_it (screen.cur.row, 0, nrow - 1);
1179 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1180} 1198}
1181 1199
1182/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1183/* 1201/*
1184 * direction should be UP or DN 1202 * direction should be UP or DN
1185 */ 1203 */
1186void 1204void
1187rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1188{ 1206{
1189 int dirn; 1207 int dirn;
1190 1208
1191 want_refresh = 1; 1209 want_refresh = 1;
1192 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1199 || (screen.cur.row == screen.tscroll && direction == DN)) 1217 || (screen.cur.row == screen.tscroll && direction == DN))
1200 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1218 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1201 else 1219 else
1202 screen.cur.row += dirn; 1220 screen.cur.row += dirn;
1203 1221
1204 MAX_IT (screen.cur.row, 0); 1222 clamp_it (screen.cur.row, 0, nrow - 1);
1205 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1206 selection_check (0); 1223 selection_check (0);
1207} 1224}
1208 1225
1209/* ------------------------------------------------------------------------- */ 1226/* ------------------------------------------------------------------------- */
1210/* 1227/*
… …
1212 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1213 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1214 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1215 */ 1232 */
1216void 1233void
1217rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1218{ 1235{
1219 unsigned int row, col, num; 1236 unsigned int col, num;
1220 1237
1221 want_refresh = 1; 1238 want_refresh = 1;
1222 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
1223 1240
1224 selection_check (1); 1241 selection_check (1);
1225 1242
1226 row = screen.cur.row; 1243 line_t &line = ROW(screen.cur.row);
1244
1245 line.touch ();
1246 line.is_longer (0);
1227 1247
1228 switch (mode) 1248 switch (mode)
1229 { 1249 {
1230 case 0: /* erase to end of line */ 1250 case 0: /* erase to end of line */
1231 col = screen.cur.col; 1251 col = screen.cur.col;
1232 num = ncol - col; 1252 num = ncol - col;
1233 MIN_IT (ROW(row).l, (int16_t)col); 1253 min_it (line.l, col);
1234 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1235 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1236 CLEAR_SELECTION (); 1256 CLEAR_SELECTION ();
1237 break; 1257 break;
1238 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
… …
1243 CLEAR_SELECTION (); 1263 CLEAR_SELECTION ();
1244 break; 1264 break;
1245 case 2: /* erase whole line */ 1265 case 2: /* erase whole line */
1246 col = 0; 1266 col = 0;
1247 num = ncol; 1267 num = ncol;
1248 ROW(row).l = 0; 1268 line.l = 0;
1249 if (selection.beg.row <= screen.cur.row 1269 if (selection.beg.row <= screen.cur.row
1250 && selection.end.row >= screen.cur.row) 1270 && selection.end.row >= screen.cur.row)
1251 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1252 break; 1272 break;
1253 default: 1273 default:
1254 return; 1274 return;
1255 } 1275 }
1256 1276
1257 scr_blank_line (ROW(row), col, num, rstyle); 1277 scr_blank_line (line, col, num, rstyle);
1258} 1278}
1259 1279
1260/* ------------------------------------------------------------------------- */ 1280/* ------------------------------------------------------------------------- */
1261/* 1281/*
1262 * Erase part of whole of the screen 1282 * Erase part of whole of the screen
1263 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1264 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1265 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1266 */ 1286 */
1267void 1287void
1268rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1269{ 1289{
1270 int num; 1290 int num;
1271 int32_t row; 1291 int32_t row;
1272 rend_t ren; 1292 rend_t ren;
1273 XGCValues gcvalue; 1293 XGCValues gcvalue;
… …
1305 CLEAR_SELECTION (); 1325 CLEAR_SELECTION ();
1306 1326
1307 if (row >= nrow) /* Out Of Bounds */ 1327 if (row >= nrow) /* Out Of Bounds */
1308 return; 1328 return;
1309 1329
1310 MIN_IT (num, (nrow - row)); 1330 min_it (num, nrow - row);
1311 1331
1312 if (rstyle & (RS_RVid | RS_Uline)) 1332 if (rstyle & (RS_RVid | RS_Uline))
1313 ren = (rend_t) ~RS_None; 1333 ren = (rend_t) ~RS_None;
1314 else if (GET_BASEBG (rstyle) == Color_bg) 1334 else if (GET_BASEBG (rstyle) == Color_bg)
1315 { 1335 {
… …
1317 CLEAR_ROWS (row, num); 1337 CLEAR_ROWS (row, num);
1318 } 1338 }
1319 else 1339 else
1320 { 1340 {
1321 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1322 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1323 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1343 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1324 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1325 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1326 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1327 } 1347 }
1328 1348
1329 for (; num--; row++) 1349 for (; num--; row++)
1330 { 1350 {
1331 scr_blank_screen_mem (ROW (row), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1332 ROW (row).l = 0;
1333 scr_blank_line (drawn[row], 0, ncol, ren); 1352 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1334 } 1353 }
1335} 1354}
1336 1355
1337#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1338void 1357void
1339rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1340{ 1359{
1341 want_refresh = 1; 1360 want_refresh = 1;
1342 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1343 1362
1344 nsaved = 0; 1363 top_row = 0;
1345} 1364}
1346#endif 1365#endif
1347 1366
1348/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1349/* 1368/*
1350 * Fill the screen with `E's 1369 * Fill the screen with `E's
1351 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1352 */ 1371 */
1353void 1372void
1354rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1355{ 1374{
1356 rend_t fs; 1375 rend_t fs;
1357 1376
1358 want_refresh = 1; 1377 want_refresh = 1;
1359 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
… …
1370 rend_t *r1 = line.r; 1389 rend_t *r1 = line.r;
1371 1390
1372 for (int j = ncol; j--; ) 1391 for (int j = ncol; j--; )
1373 *r1++ = fs; 1392 *r1++ = fs;
1374 1393
1375 line.l = ncol; /* make the `E's selectable */ 1394 line.is_longer (0);
1395 line.touch (ncol);
1376 } 1396 }
1377} 1397}
1378 1398
1379/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1380/* 1400/*
1381 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1382 */ 1402 */
1383void 1403void
1384rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1385{ 1405{
1386 int end; 1406 int end;
1387 1407
1388 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1389 1409
… …
1409/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1410/* 1430/*
1411 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1412 */ 1432 */
1413void 1433void
1414rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1415{ 1435{
1416 int col, row; 1436 int col, row;
1417 rend_t tr; 1437 rend_t tr;
1418 1438
1419 want_refresh = 1; 1439 want_refresh = 1;
… …
1423 return; 1443 return;
1424 1444
1425 scr_do_wrap (); 1445 scr_do_wrap ();
1426 1446
1427 selection_check (1); 1447 selection_check (1);
1428 MIN_IT (count, (ncol - screen.cur.col)); 1448 min_it (count, ncol - screen.cur.col);
1429 1449
1430 row = screen.cur.row; 1450 row = screen.cur.row;
1431 1451
1432 line_t *line = &ROW(row); 1452 line_t *line = &ROW(row);
1453
1454 line->touch ();
1455 line->is_longer (0);
1433 1456
1434 switch (insdel) 1457 switch (insdel)
1435 { 1458 {
1436 case INSERT: 1459 case INSERT:
1437 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1438 { 1461 {
1439 line->t[col] = line->t[col - count]; 1462 line->t[col] = line->t[col - count];
1440 line->r[col] = line->r[col - count]; 1463 line->r[col] = line->r[col - count];
1441 } 1464 }
1442 1465
1443 if (!line->is_longer ()) 1466 line->l = min (line->l + count, ncol);
1444 {
1445 line->l += count;
1446 MIN_IT (line->l, ncol);
1447 }
1448 1467
1449 if (selection.op && current_screen == selection.screen 1468 if (selection.op && current_screen == selection.screen
1450 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1451 { 1470 {
1452 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
… …
1465 1484
1466 case ERASE: 1485 case ERASE:
1467 screen.cur.col += count; /* don't worry if > ncol */ 1486 screen.cur.col += count; /* don't worry if > ncol */
1468 selection_check (1); 1487 selection_check (1);
1469 screen.cur.col -= count; 1488 screen.cur.col -= count;
1489
1490 line->l = max (line->l - count, 0);
1470 scr_blank_line (*line, screen.cur.col, count, rstyle); 1491 scr_blank_line (*line, screen.cur.col, count, rstyle);
1471 break; 1492 break;
1472 1493
1473 case DELETE: 1494 case DELETE:
1474 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1477 { 1498 {
1478 line->t[col] = line->t[col + count]; 1499 line->t[col] = line->t[col + count];
1479 line->r[col] = line->r[col + count]; 1500 line->r[col] = line->r[col + count];
1480 } 1501 }
1481 1502
1503 line->l = max (line->l - count, 0);
1482 scr_blank_line (*line, ncol - count, count, tr); 1504 scr_blank_line (*line, ncol - count, count, tr);
1483
1484 if (line->is_longer ()) /* break line continuation */
1485 line->l = ncol;
1486
1487 line->l = max (line->l - count, 0);
1488 1505
1489 if (selection.op && current_screen == selection.screen 1506 if (selection.op && current_screen == selection.screen
1490 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1491 { 1508 {
1492 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
… …
1510/* 1527/*
1511 * Set the scrolling region 1528 * Set the scrolling region
1512 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1513 */ 1530 */
1514void 1531void
1515rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1516{ 1533{
1517 MAX_IT (top, 0); 1534 max_it (top, 0);
1518 MIN_IT (bot, (int)nrow - 1); 1535 min_it (bot, nrow - 1);
1519 1536
1520 if (top > bot) 1537 if (top > bot)
1521 return; 1538 return;
1522 1539
1523 screen.tscroll = top; 1540 screen.tscroll = top;
… …
1530 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1531 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1532 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1533 */ 1550 */
1534void 1551void
1535rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1536{ 1553{
1537 want_refresh = 1; 1554 want_refresh = 1;
1538 1555
1539 if (mode) 1556 if (mode)
1540 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1547 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1548 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1549 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1550 */ 1567 */
1551void 1568void
1552rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1553{ 1570{
1554 if (mode) 1571 if (mode)
1555 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1556 else 1573 else
1557 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1566 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1567 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1568 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1569 */ 1586 */
1570void 1587void
1571rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1572{ 1589{
1573 if (mode) 1590 if (mode)
1574 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1575 else 1592 else
1576 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1583 * Set insert/replace mode 1600 * Set insert/replace mode
1584 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1585 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1586 */ 1603 */
1587void 1604void
1588rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1589{ 1606{
1590 if (mode) 1607 if (mode)
1591 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1592 else 1609 else
1593 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1599 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1600 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1601 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1602 */ 1619 */
1603void 1620void
1604rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1605{ 1622{
1606 if (mode < 0) 1623 if (mode < 0)
1607 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1608 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1609 tabs[screen.cur.col] = (mode ? 1 : 0); 1626 tabs [screen.cur.col] = !!mode;
1610} 1627}
1611 1628
1612/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
1613/* 1630/*
1614 * Set reverse/normal video 1631 * Set reverse/normal video
1615 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1616 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1617 */ 1634 */
1618void 1635void
1619rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1620{ 1637{
1621 XGCValues gcvalue; 1638 rvideo_mode = on;
1622 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1623 if (rvideo != mode) 1644 if (rvideo_state != on)
1624 { 1645 {
1625 rvideo = mode; 1646 rvideo_state = on;
1647
1626 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1627#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1628 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1629#endif 1651#endif
1630#if TRANSPARENT 1652#if TRANSPARENT
1631 if (! (options & Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1632#endif 1654#endif
1633 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1634 pix_colors[Color_bg]);
1635 1656
1657 XGCValues gcvalue;
1636 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1637 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1638 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1639 &gcvalue); 1661
1640 scr_clear (); 1662 scr_clear ();
1641 scr_touch (true); 1663 scr_touch (true);
1642 } 1664 }
1643} 1665}
1644 1666
… …
1646/* 1668/*
1647 * Report current cursor position 1669 * Report current cursor position
1648 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1649 */ 1671 */
1650void 1672void
1651rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1652{ 1674{
1653 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1654} 1676}
1655 1677
1656/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1659 1681
1660/* 1682/*
1661 * Set font style 1683 * Set font style
1662 */ 1684 */
1663void 1685void
1664rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1665{ 1687{
1688#if 0
1666 switch (charsets[screen.charset]) 1689 switch (charsets [screen.charset])
1667 { 1690 {
1668 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
1669 break; 1692 break;
1670 case 'A': /* United Kingdom (UK) */ 1693 case 'A': /* United Kingdom (UK) */
1671 break; 1694 break;
… …
1678 case 'C': /* Finnish character set */ 1701 case 'C': /* Finnish character set */
1679 break; 1702 break;
1680 case 'K': /* German character set */ 1703 case 'K': /* German character set */
1681 break; 1704 break;
1682 } 1705 }
1706#endif
1683} 1707}
1684 1708
1685/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1686/* 1710/*
1687 * Choose a font 1711 * Choose a font
… …
1689 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1690 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1691 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1692 */ 1716 */
1693void 1717void
1694rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1695{ 1719{
1696 screen.charset = set; 1720 screen.charset = set;
1697 set_font_style (); 1721 set_font_style ();
1698} 1722}
1699 1723
… …
1705 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1706 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1707 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1708 */ 1732 */
1709void 1733void
1710rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1711{ 1735{
1712 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1713 set_font_style (); 1737 set_font_style ();
1714} 1738}
1715 1739
… …
1720 1744
1721/* 1745/*
1722 * refresh matching text. 1746 * refresh matching text.
1723 */ 1747 */
1724bool 1748bool
1725rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1726{ 1750{
1727 bool found = false; 1751 bool found = false;
1728 1752
1729 for (int i = 0; i < nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1730 { 1754 {
1731 int col = 0; 1755 int col = 0;
1732 rend_t *drp = drawn[i].r; 1756 rend_t *drp = drawn_buf[i].r;
1733 1757
1734 for (; col < ncol; col++, drp++) 1758 for (; col < ncol; col++, drp++)
1735 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1736 { 1760 {
1737 found = true; 1761 found = true;
… …
1750 PART_END, 1774 PART_END,
1751 RC_COUNT 1775 RC_COUNT
1752}; 1776};
1753 1777
1754void 1778void
1755rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1756{ 1780{
1757 int i; 1781 int i;
1758 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1759 1783
1760 if (!drawn) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
1761 return; 1785 return;
1762 1786
1763#ifndef NO_SLOW_LINK_SUPPORT 1787#ifndef NO_SLOW_LINK_SUPPORT
1764 if (refresh_type == FAST_REFRESH && !display->is_local) 1788 if (refresh_type == FAST_REFRESH && !display->is_local)
1765 { 1789 {
1766 y = 0; 1790 y = 0;
1767 eheight = height; 1791 eheight = height;
1768 } 1792 }
1769#endif
1770
1771#ifdef DEBUG_STRICT
1772 x = max (x, 0);
1773 x = min (x, (int)width);
1774 y = max (y, 0);
1775 y = min (y, (int)height);
1776#endif 1793#endif
1777 1794
1778 /* round down */ 1795 /* round down */
1779 rc[PART_BEG].col = Pixel2Col (x); 1796 rc[PART_BEG].col = Pixel2Col (x);
1780 rc[PART_BEG].row = Pixel2Row (y); 1797 rc[PART_BEG].row = Pixel2Row (y);
… …
1783 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1800 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1784 1801
1785 /* sanity checks */ 1802 /* sanity checks */
1786 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1787 { 1804 {
1788 MIN_IT (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1789 MIN_IT (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1790 } 1807 }
1791 1808
1792 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1793 fill_text (&drawn[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811
1812 num_scr_allow = 0;
1794 1813
1795 if (refresh) 1814 if (refresh)
1796 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1797} 1816}
1798 1817
1799/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1800/* 1819/*
1801 * Refresh the entire screen 1820 * Refresh the entire screen
1802 */ 1821 */
1803void 1822void
1804rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1805{ 1824{
1806 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1807} 1826}
1808 1827
1809/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1810/* 1829/*
1811 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1812 * the top of the screen 1831 * the top of the screen
1813 */ 1832 */
1814int 1833void
1815rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1816{ 1835{
1817 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1818 unsigned int oldviewstart;
1819
1820 oldviewstart = view_start;
1821
1822 if (y < len)
1823 {
1824 p = (nrow + nsaved) * (len - y) / len;
1825 p -= (long) (nrow - 1);
1826 p = max (p, 0);
1827 }
1828
1829 view_start = (unsigned int)min (p, nsaved);
1830
1831 return scr_changeview (oldviewstart);
1832} 1837}
1833 1838
1834/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1835/* 1840/*
1836 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1837 * direction should be UP or DN 1842 * direction should be UP or DN
1838 */ 1843 */
1839int 1844bool
1840rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1841{ 1846{
1842 int n; 1847 int new_view_start =
1843 unsigned int oldviewstart;
1844
1845 oldviewstart = view_start;
1846
1847 if (direction == UP)
1848 {
1849 n = view_start + nlines;
1850 view_start = min (n, nsaved);
1851 }
1852 else
1853 {
1854 n = view_start - nlines; 1848 direction == UP ? view_start - nlines
1855 view_start = max (n, 0); 1849 : view_start + nlines;
1856 }
1857 1850
1858 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1859} 1852}
1860 1853
1861int 1854bool
1862rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1863{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1864 if (view_start != oldviewstart) 1859 if (new_view_start == view_start)
1865 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1866 want_refresh = 1; 1864 want_refresh = 1;
1867 num_scr -= (view_start - oldviewstart);
1868 }
1869 1865
1870 return (int) (view_start - oldviewstart); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1871}
1872 1867
1873/* ------------------------------------------------------------------------- */ 1868 return true;
1869}
1870
1871#ifndef NO_BELL
1874void 1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1875rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1876{ 1883{
1877#ifndef NO_BELL 1884#ifndef NO_BELL
1878 1885
1879# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1880# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1881 if (options & Opt_mapAlert) 1888 if (OPTION (Opt_mapAlert))
1882# endif 1889# endif
1883 XMapWindow (display->display, parent[0]); 1890 XMapWindow (display->display, parent[0]);
1884# endif 1891# endif
1885 1892
1886 if (options & Opt_visualBell) 1893 if (OPTION (Opt_visualBell))
1887 { 1894 {
1888 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1889 rxvt_usleep (VISUAL_BELL_DURATION); 1896 scr_rvideo_mode (rvideo_mode);
1890 scr_rvideo_mode (!rvideo); /* refresh also done */ 1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1891 } 1900 }
1892 else 1901 else
1893 XBell (display->display, 0); 1902 XBell (display->display, 0);
1894 1903
1895#endif 1904#endif
1896} 1905}
1897 1906
1898/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1908/* ARGSUSED */
1900void 1909void
1901rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1902{ 1911{
1903#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1904 int nrows, row_start; 1913 int nrows, row_start;
1905 FILE *fd; 1914 FILE *fd;
1906 1915
1907 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1908 return; 1917 return;
1909 1918
1910 if (fullhist) 1919 if (fullhist)
1911 { 1920 {
1912 nrows = nrow + nsaved; 1921 nrows = nrow - top_row;
1913 row_start = -nsaved; 1922 row_start = top_row;
1914 } 1923 }
1915 else 1924 else
1916 { 1925 {
1917 nrows = nrow; 1926 nrows = nrow;
1918 row_start = -view_start; 1927 row_start = view_start;
1919 } 1928 }
1920 1929
1921 wctomb (0, 0); 1930 wctomb (0, 0);
1922 1931
1923 for (int r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
… …
1955 * Refresh the screen 1964 * Refresh the screen
1956 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
1957 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1967 */
1959void 1968void
1960rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
1961{ 1970{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1963 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
1966 int i, /* tmp */ 1975 int i; /* tmp */
1967 row_offset; /* basic offset in screen structure */
1968#ifndef NO_CURSORCOLOR 1976#ifndef NO_CURSORCOLOR
1969 rend_t cc1; /* store colours at cursor position (s) */ 1977 rend_t cc1; /* store colours at cursor position (s) */
1970#endif 1978#endif
1971 rend_t *crp; // cursor rendition pointer 1979 rend_t *crp; // cursor rendition pointer
1972 1980
… …
1979 * A: set up vars 1987 * A: set up vars
1980 */ 1988 */
1981 must_clear = 0; 1989 must_clear = 0;
1982 refresh_count = 0; 1990 refresh_count = 0;
1983 1991
1984 row_offset = term_start - view_start;
1985
1986#if XPM_BACKGROUND 1992#if XPM_BACKGROUND
1987 must_clear |= bgPixmap.pixmap != None; 1993 must_clear |= bgPixmap.pixmap != None;
1988#endif 1994#endif
1989#if TRANSPARENT 1995#if TRANSPARENT
1990 must_clear |= (options & Opt_transparent) && am_transparent; 1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1991#endif 1997#endif
1992 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1993 1999
1994 /* 2000 /*
1995 * B: reverse any characters which are selected 2001 * B: reverse any characters which are selected
… …
2019 2025
2020 crp = &ROW(screen.cur.row).r[col]; 2026 crp = &ROW(screen.cur.row).r[col];
2021 2027
2022 if (showcursor && focus) 2028 if (showcursor && focus)
2023 { 2029 {
2024 if (options & Opt_cursorUnderline) 2030 if (OPTION (Opt_cursorUnderline))
2025 *crp ^= RS_Uline; 2031 *crp ^= RS_Uline;
2026 else 2032 else
2027 { 2033 {
2028 *crp ^= RS_RVid; 2034 *crp ^= RS_RVid;
2029 2035
… …
2031 cc1 = *crp & (RS_fgMask | RS_bgMask); 2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2032 if (ISSET_PIXCOLOR (Color_cursor)) 2038 if (ISSET_PIXCOLOR (Color_cursor))
2033 ccol1 = Color_cursor; 2039 ccol1 = Color_cursor;
2034 else 2040 else
2035#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2036 ccol1 = GET_FGCOLOR (rstyle); 2042 ccol1 = fgcolor_of (rstyle);
2037#else 2043#else
2038 ccol1 = Color_fg; 2044 ccol1 = Color_fg;
2039#endif 2045#endif
2040 if (ISSET_PIXCOLOR (Color_cursor2)) 2046 if (ISSET_PIXCOLOR (Color_cursor2))
2041 ccol2 = Color_cursor2; 2047 ccol2 = Color_cursor2;
2042 else 2048 else
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044 ccol2 = GET_BGCOLOR (rstyle); 2050 ccol2 = bgcolor_of (rstyle);
2045#else 2051#else
2046 ccol2 = Color_bg; 2052 ccol2 = Color_bg;
2047#endif 2053#endif
2048 *crp = SET_FGCOLOR (*crp, ccol1); 2054 *crp = SET_FGCOLOR (*crp, ccol1);
2049 *crp = SET_BGCOLOR (*crp, ccol2); 2055 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2054 2060
2055 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
2056 setoldcursor = 0; 2062 setoldcursor = 0;
2057 if (ocrow != -1) 2063 if (ocrow != -1)
2058 { 2064 {
2059 if (screen.cur.row + view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
2060 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
2061 { 2067 {
2062 if (ocrow < nrow 2068 if (ocrow < nrow
2063 && oldcursor.col < ncol) 2069 && oldcursor.col < ncol)
2064 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2065 2071
2066 if (focus || !showcursor) 2072 if (focus || !showcursor)
2067 oldcursor.row = -1; 2073 oldcursor.row = -1;
2068 else 2074 else
2069 setoldcursor = 1; 2075 setoldcursor = 1;
… …
2072 else if (!focus) 2078 else if (!focus)
2073 setoldcursor = 1; 2079 setoldcursor = 1;
2074 2080
2075 if (setoldcursor) 2081 if (setoldcursor)
2076 { 2082 {
2077 if (screen.cur.row + view_start >= nrow) 2083 if (screen.cur.row - view_start >= nrow)
2078 oldcursor.row = -1; 2084 oldcursor.row = -1;
2079 else 2085 else
2080 { 2086 {
2081 oldcursor.row = screen.cur.row + view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2082 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2083 } 2089 }
2084 } 2090 }
2085 } 2091 }
2086 2092
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2087#if ENABLE_OVERLAY 2094#if ENABLE_OVERLAY
2088 scr_swap_overlay (); 2095 scr_swap_overlay ();
2089#endif 2096#endif
2090 2097
2091#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2092 /* 2099 /*
2093 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2094 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2095 */ 2102 */
2096 i = num_scr;
2097 if (!display->is_local 2103 if (!display->is_local
2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2099 && abs (num_scr) < nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2100 { 2106 {
2101 int16_t nits; 2107 int16_t nits;
2102 int j; 2108 int j;
2103 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2104 2111
2105 j = nrow; 2112 j = nrow;
2106 wlen = len = -1; 2113 wlen = len = -1;
2107 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2116 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2118 {
2112 line_t s = save[(row + row_offset) % total_rows]; 2119 line_t s = ROW(view_start + row);
2113 line_t d = drawn[row]; 2120 line_t d = drawn_buf[row];
2114 line_t d2 = drawn[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2115 2122
2116 for (nits = 0, col = ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2124 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2118 nits--; 2125 nits--;
2119 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2126 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2137 2144
2138 if (len != -1) 2145 if (len != -1)
2139 { 2146 {
2140 /* also comes here at end if needed because of >= above */ 2147 /* also comes here at end if needed because of >= above */
2141 if (wlen < len) 2148 if (wlen < len)
2142 SWAP_IT (wlen, len, int); 2149 ::swap (wlen, len);
2143 2150
2144 XCopyArea (display->display, vt, vt, 2151 XCopyArea (display->display, vt, vt,
2145 gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2146 (unsigned int)TermWin_TotalWidth (), 2153 (unsigned int)this->width,
2147 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2148 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2149 len = -1; 2156 len = -1;
2150 } 2157 }
2151 } 2158 }
… …
2155 /* 2162 /*
2156 * E: main pass across every character 2163 * E: main pass across every character
2157 */ 2164 */
2158 for (row = 0; row < nrow; row++) 2165 for (row = 0; row < nrow; row++)
2159 { 2166 {
2160 text_t *stp = save[(row + row_offset) % total_rows].t; 2167 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = save[(row + row_offset) % total_rows].r; 2168 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn[row].t; 2169 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn[row].r; 2170 rend_t *drp = drawn_buf[row].r;
2164 2171
2165 /* 2172 /*
2166 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
2167 */ 2174 */
2168 int ypixel = (int)Row2Pixel (row); 2175 int ypixel = (int)Row2Pixel (row);
… …
2230 count++, i--; 2237 count++, i--;
2231 2238
2232 /* 2239 /*
2233 * Determine the attributes for the string 2240 * Determine the attributes for the string
2234 */ 2241 */
2235 int fore = GET_FGCOLOR (rend); // desired foreground 2242 int fore = fgcolor_of (rend); // desired foreground
2236 int back = GET_BGCOLOR (rend); // desired background 2243 int back = bgcolor_of (rend); // desired background
2237 2244
2238 // only do special processing if any attributes are set, which is rare 2245 // only do special processing if any attributes are set, which is unlikely
2239 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2240 { 2247 {
2241#if ENABLE_STYLES 2248#if ENABLE_STYLES
2242 // force redraw after "careful" characters to avoid pixel droppings 2249 // force redraw after "careful" characters to avoid pixel droppings
2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2250 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2279 fore = Color_UL; 2286 fore = Color_UL;
2280#endif 2287#endif
2281 2288
2282 if (invert) 2289 if (invert)
2283 { 2290 {
2284 SWAP_IT (fore, back, int); 2291 ::swap (fore, back);
2285 2292
2286#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2287 if (ISSET_PIXCOLOR (Color_RV)) 2294 if (ISSET_PIXCOLOR (Color_RV))
2288 back = Color_RV; 2295 back = Color_RV;
2289 2296
… …
2354 } /* for (row....) */ 2361 } /* for (row....) */
2355 2362
2356#if ENABLE_OVERLAY 2363#if ENABLE_OVERLAY
2357 scr_swap_overlay (); 2364 scr_swap_overlay ();
2358#endif 2365#endif
2366 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2359 2367
2360 /* 2368 /*
2361 * G: cleanup cursor and display outline cursor if necessary 2369 * G: cleanup cursor and display outline cursor if necessary
2362 */ 2370 */
2363 if (showcursor) 2371 if (showcursor)
2364 { 2372 {
2365 if (focus) 2373 if (focus)
2366 { 2374 {
2367 if (options & Opt_cursorUnderline) 2375 if (OPTION (Opt_cursorUnderline))
2368 *crp ^= RS_Uline; 2376 *crp ^= RS_Uline;
2369 else 2377 else
2370 { 2378 {
2371 *crp ^= RS_RVid; 2379 *crp ^= RS_RVid;
2372#ifndef NO_CURSORCOLOR 2380#ifndef NO_CURSORCOLOR
… …
2381 2389
2382 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2390 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2383 col--; 2391 col--;
2384 2392
2385 while (col + cursorwidth < ncol 2393 while (col + cursorwidth < ncol
2386 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2394 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2387 cursorwidth++; 2395 cursorwidth++;
2388 2396
2389#ifndef NO_CURSORCOLOR 2397#ifndef NO_CURSORCOLOR
2390 if (ISSET_PIXCOLOR (Color_cursor)) 2398 if (ISSET_PIXCOLOR (Color_cursor))
2391 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2399 XSetForeground (display->display, gc, pix_colors[Color_cursor]);
… …
2402 /* 2410 /*
2403 * H: cleanup selection 2411 * H: cleanup selection
2404 */ 2412 */
2405 scr_reverse_selection (); 2413 scr_reverse_selection ();
2406 2414
2407 if (refresh_type & SMOOTH_REFRESH)
2408 XFlush (display->display);
2409
2410 num_scr = 0; 2415 num_scr = 0;
2411 num_scr_allow = 1; 2416 num_scr_allow = 1;
2412} 2417}
2413 2418
2414void 2419void
2415rxvt_term::scr_remap_chars (const line_t &l) 2420rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2416{ 2421{
2417 if (!l.t) 2422 if (!l.t)
2418 return; 2423 return;
2419 2424
2425 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2426
2420 for (int i = ncol; i--; ) 2427 for (int i = ncol; i--; )
2421 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2428 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2422} 2429}
2423 2430
2424void 2431void
2425rxvt_term::scr_remap_chars () 2432rxvt_term::scr_remap_chars () NOTHROW
2426{ 2433{
2427 for (int i = total_rows; i--; ) 2434 for (int i = total_rows; i--; )
2428 scr_remap_chars (save[i]); 2435 scr_remap_chars (row_buf [i]);
2429 2436
2430 for (int i = nrow; i--; ) 2437 for (int i = nrow; i--; )
2431 { 2438 {
2432 scr_remap_chars (drawn[i]); 2439 scr_remap_chars (drawn_buf [i]);
2433 scr_remap_chars (swap_save[i]); 2440 scr_remap_chars (swap_buf [i]);
2434 } 2441 }
2435} 2442}
2436 2443
2437void 2444void
2438rxvt_term::scr_recolour () 2445rxvt_term::scr_recolour () NOTHROW
2439{ 2446{
2440 if (1 2447 if (1
2441#if TRANSPARENT 2448#if TRANSPARENT
2442 && !am_transparent 2449 && !am_transparent
2443#endif 2450#endif
… …
2464 want_refresh = 1; 2471 want_refresh = 1;
2465} 2472}
2466 2473
2467/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2468void 2475void
2469rxvt_term::scr_clear (bool really) 2476rxvt_term::scr_clear (bool really) NOTHROW
2470{ 2477{
2471 if (!mapped) 2478 if (!mapped)
2472 return; 2479 return;
2473 2480
2474 num_scr_allow = 0; 2481 num_scr_allow = 0;
… …
2476 2483
2477 if (really) 2484 if (really)
2478 XClearWindow (display->display, vt); 2485 XClearWindow (display->display, vt);
2479} 2486}
2480 2487
2481/* ------------------------------------------------------------------------- */
2482void 2488void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{
2491 int view_end = view_start + nrow;
2492 int row, col;
2493
2494 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2495 {
2496 text_t *stp = ROW(row).t;
2497 rend_t *srp = ROW(row).r;
2498
2499 for (col = beg_col; col < end_col; col++)
2500 srp[col] ^= rstyle1;
2501
2502 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2503 srp[col] ^= rstyle2;
2504
2505 if (++col < end_col)
2506 srp[col] ^= rstyle2;
2507 }
2508}
2509
2510void
2511rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2512{
2513 int view_end = view_start + nrow;
2514 int row, col;
2515
2516 if (beg_row >= view_start)
2517 {
2518 col = beg_col;
2519 row = beg_row;
2520 }
2521 else
2522 {
2523 col = 0;
2524 row = view_start;
2525 }
2526
2527 for (; row < min (end_row, view_end); row++, col = 0)
2528 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2529 srp[col] ^= rstyle;
2530
2531 if (row == end_row)
2532 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2533 srp[col] ^= rstyle;
2534}
2535
2536/* ------------------------------------------------------------------------- */
2537void
2483rxvt_term::scr_reverse_selection () 2538rxvt_term::scr_reverse_selection () NOTHROW
2484{ 2539{
2485 if (selection.op 2540 if (selection.op
2486 && current_screen == selection.screen 2541 && current_screen == selection.screen
2487 && selection.end.row >= -view_start) 2542 && selection.end.row >= view_start)
2488 { 2543 {
2489 int view_end = -view_start + nrow;
2490 int row, col;
2491
2492#if ENABLE_FRILLS 2544#if ENABLE_FRILLS
2493 if (selection.rect) 2545 if (selection.rect)
2494 { 2546 scr_xor_rect (selection.beg.row, selection.beg.col,
2495 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2547 selection.end.row, selection.end.col,
2496 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2548 RS_RVid, RS_RVid | RS_Uline);
2497 srp[col] ^= RS_RVid;
2498 }
2499 else 2549 else
2500#endif 2550#endif
2501 { 2551 scr_xor_span (selection.beg.row, selection.beg.col,
2502 if (selection.beg.row >= -view_start) 2552 selection.end.row, selection.end.col,
2503 { 2553 RS_RVid);
2504 col = selection.beg.col;
2505 row = selection.beg.row;
2506 }
2507 else
2508 {
2509 col = 0;
2510 row = view_start;
2511 }
2512
2513 for (; row < min (selection.end.row, view_end); row++, col = 0)
2514 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2515 srp[col] ^= RS_RVid;
2516
2517 if (row == selection.end.row)
2518 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2519 srp[col] ^= RS_RVid;
2520 }
2521 } 2554 }
2522} 2555}
2523 2556
2524/* ------------------------------------------------------------------------- */ 2557/* ------------------------------------------------------------------------- */
2525/* 2558/*
2526 * Dump the whole scrollback and screen to the passed filedescriptor. The 2559 * Dump the whole scrollback and screen to the passed filedescriptor. The
2527 * invoking routine must close the fd. 2560 * invoking routine must close the fd.
2528 */ 2561 */
2529#if 0 2562#if 0
2530void 2563void
2531rxvt_term::scr_dump (int fd) 2564rxvt_term::scr_dump (int fd) NOTHROW
2532{ 2565{
2533 int row, wrote; 2566 int row, wrote;
2534 unsigned int width, towrite; 2567 unsigned int width, towrite;
2535 char r1[] = "\n"; 2568 char r1[] = "\n";
2536 2569
2537 for (row = saveLines - nsaved; 2570 for (row = saveLines - nsaved;
2538 row < saveLines + nrow - 1; row++) 2571 row < saveLines + nrow - 1; row++)
2539 { 2572 {
2540 width = save[row].l >= 0 ? save[row].l 2573 width = row_buf[row].l >= 0 ? row_buf[row].l
2541 : ncol; 2574 : ncol;
2542 for (towrite = width; towrite; towrite -= wrote) 2575 for (towrite = width; towrite; towrite -= wrote)
2543 { 2576 {
2544 wrote = write (fd, & (save[row].t[width - towrite]), 2577 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2545 towrite); 2578 towrite);
2546 if (wrote < 0) 2579 if (wrote < 0)
2547 return; /* XXX: death, no report */ 2580 return; /* XXX: death, no report */
2548 } 2581 }
2549 if (save[row].l >= 0) 2582 if (row_buf[row].l >= 0)
2550 if (write (fd, r1, 1) <= 0) 2583 if (write (fd, r1, 1) <= 0)
2551 return; /* XXX: death, no report */ 2584 return; /* XXX: death, no report */
2552 } 2585 }
2553} 2586}
2554#endif 2587#endif
2555 2588
2556/* ------------------------------------------------------------------------- * 2589/* ------------------------------------------------------------------------- *
2557 * CHARACTER SELECTION * 2590 * CHARACTER SELECTION *
2558 * ------------------------------------------------------------------------- */ 2591 * ------------------------------------------------------------------------- */
2559void 2592void
2560rxvt_term::selection_check (int check_more) 2593rxvt_term::selection_check (int check_more) NOTHROW
2561{ 2594{
2562 row_col_t pos; 2595 row_col_t pos;
2563 2596
2564 if (!selection.op) 2597 if (!selection.op)
2565 return; 2598 return;
2566 2599
2567 pos.row = pos.col = 0; 2600 pos.row = pos.col = 0;
2568 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2601 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2569 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2602 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2570 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2603 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2571 || (check_more == 1 2604 || (check_more == 1
2572 && current_screen == selection.screen 2605 && current_screen == selection.screen
2573 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2606 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2574 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2607 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2575 || (check_more == 2 2608 || (check_more == 2
… …
2586/* ------------------------------------------------------------------------- */ 2619/* ------------------------------------------------------------------------- */
2587/* 2620/*
2588 * Paste a selection direct to the command fd 2621 * Paste a selection direct to the command fd
2589 */ 2622 */
2590void 2623void
2591rxvt_term::paste (unsigned char *data, unsigned int len) 2624rxvt_term::paste (char *data, unsigned int len) NOTHROW
2592{ 2625{
2593 /* convert normal newline chars into common keyboard Return key sequence */ 2626 /* convert normal newline chars into common keyboard Return key sequence */
2594 for (unsigned int i = 0; i < len; i++) 2627 for (unsigned int i = 0; i < len; i++)
2595 if (data[i] == C0_LF) 2628 if (data[i] == C0_LF)
2596 data[i] = C0_CR; 2629 data[i] = C0_CR;
… …
2602/* 2635/*
2603 * Respond to a notification that a primary selection has been sent 2636 * Respond to a notification that a primary selection has been sent
2604 * EXT: SelectionNotify 2637 * EXT: SelectionNotify
2605 */ 2638 */
2606void 2639void
2607rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2640rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2608{ 2641{
2609 if (prop == None) /* check for failed XConvertSelection */ 2642 if (prop == None) /* check for failed XConvertSelection */
2610 { 2643 {
2611 if ((selection_type & Sel_CompoundText)) 2644 if ((selection_type & Sel_CompoundText))
2612 { 2645 {
… …
2740 { 2773 {
2741 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2774 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2742 char *s = rxvt_wcstombs (w); 2775 char *s = rxvt_wcstombs (w);
2743 free (w); 2776 free (w);
2744 // TODO: strlen == only the first element will be converted. well... 2777 // TODO: strlen == only the first element will be converted. well...
2745 paste ((unsigned char *)s, strlen (s)); 2778 paste (s, strlen (s));
2746 free (s); 2779 free (s);
2747 } 2780 }
2748 else 2781 else
2749#endif 2782#endif
2750 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2783 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2751 && cl) 2784 && cl)
2752 { 2785 {
2753 for (int i = 0; i < cr; i++) 2786 for (int i = 0; i < cr; i++)
2754 paste ((unsigned char *)cl[i], strlen (cl[i])); 2787 paste (cl[i], strlen (cl[i]));
2755 2788
2756 XFreeStringList (cl); 2789 XFreeStringList (cl);
2757 } 2790 }
2758 else 2791 else
2759 paste (ct.value, ct.nitems); // paste raw 2792 paste ((char *)ct.value, ct.nitems); // paste raw
2760 2793
2761bailout: 2794bailout:
2762 XFree (ct.value); 2795 XFree (ct.value);
2763 2796
2764 if (selection_wait == Sel_normal) 2797 if (selection_wait == Sel_normal)
2765 selection_wait = Sel_none; 2798 selection_wait = Sel_none;
2766} 2799}
2767 2800
2768void 2801void
2769rxvt_term::incr_cb (time_watcher &w) 2802rxvt_term::incr_cb (time_watcher &w) NOTHROW
2770{ 2803{
2771 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2772 2805
2773 incr_buf_size = 0; 2806 incr_buf_size = 0;
2774 free (incr_buf); 2807 free (incr_buf);
2775 2808
2776 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2809 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2777} 2810}
2778 2811
2779void 2812void
2780rxvt_term::selection_property (Window win, Atom prop) 2813rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2781{ 2814{
2782 if (prop == None || selection_wait != Sel_incr) 2815 if (prop == None || selection_wait != Sel_incr)
2783 return; 2816 return;
2784 2817
2785 selection_paste (win, prop, true); 2818 selection_paste (win, prop, true);
… …
2794 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2795 * will auto fallback to CUT_BUFFER0 2828 * will auto fallback to CUT_BUFFER0
2796 * EXT: button 2 release 2829 * EXT: button 2 release
2797 */ 2830 */
2798void 2831void
2799rxvt_term::selection_request (Time tm, int x, int y) 2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2800{ 2833{
2801 if (x < 0 || x >= width || y < 0 || y >= height) 2834 if (selection.text && selnum == Sel_Primary)
2802 return; /* outside window */
2803
2804 if (selection.text)
2805 { /* internal selection */ 2835 { /* internal selection */
2806 char *str = rxvt_wcstombs (selection.text, selection.len); 2836 char *str = rxvt_wcstombs (selection.text, selection.len);
2807 paste ((unsigned char *)str, strlen (str)); 2837 paste (str, strlen (str));
2808 free (str); 2838 free (str);
2809 return; 2839 return;
2810 } 2840 }
2811 else 2841 else
2812 { 2842 {
2813 int i;
2814
2815 selection_request_time = tm; 2843 selection_request_time = tm;
2816 selection_wait = Sel_normal; 2844 selection_wait = Sel_normal;
2817 2845
2818 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2819 {
2820#if X_HAVE_UTF8_STRING 2846#if X_HAVE_UTF8_STRING
2821 selection_type = Sel_UTF8String; 2847 selection_type = Sel_UTF8String;
2822 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2848 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2823 return; 2849 return;
2824#else 2850#else
2825 selection_type = Sel_CompoundText; 2851 selection_type = Sel_CompoundText;
2826 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2827 return; 2853 return;
2828#endif 2854#endif
2829 }
2830 } 2855 }
2831 2856
2832 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2857 selection_wait = Sel_none; /* don't loop in selection_paste () */
2833 selection_paste (display->root, XA_CUT_BUFFER0, false); 2858 selection_paste (display->root, XA_CUT_BUFFER0, false);
2834} 2859}
2835 2860
2836int 2861int
2837rxvt_term::selection_request_other (Atom target, int selnum) 2862rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2838{ 2863{
2839 Atom sel; 2864 Atom sel;
2840 2865
2841 selection_type |= selnum; 2866 selection_type |= selnum;
2842 2867
… …
2861/* 2886/*
2862 * Clear all selected text 2887 * Clear all selected text
2863 * EXT: SelectionClear 2888 * EXT: SelectionClear
2864 */ 2889 */
2865void 2890void
2866rxvt_term::selection_clear () 2891rxvt_term::selection_clear () NOTHROW
2867{ 2892{
2868 want_refresh = 1; 2893 want_refresh = 1;
2869 free (selection.text); 2894 free (selection.text);
2870 selection.text = NULL; 2895 selection.text = NULL;
2871 selection.len = 0; 2896 selection.len = 0;
… …
2904 selection.op = SELECTION_DONE; 2929 selection.op = SELECTION_DONE;
2905 2930
2906 if (selection.clicks == 4) 2931 if (selection.clicks == 4)
2907 return; /* nothing selected, go away */ 2932 return; /* nothing selected, go away */
2908 2933
2934 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2935 return;
2936
2909 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2937 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2910 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2938 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2911 2939
2912 int ofs = 0; 2940 int ofs = 0;
2913 int extra = 0; 2941 int extra = 0;
… …
2925 col = selection.beg.col; 2953 col = selection.beg.col;
2926 end_col = ncol + 1; 2954 end_col = ncol + 1;
2927 } 2955 }
2928 else 2956 else
2929#endif 2957#endif
2930 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2958 end_col = ROW(row).l;
2931 2959
2932 col = max (col, 0); 2960 col = max (col, 0);
2933 2961
2934 if (row == selection.end.row || selection.rect) 2962 if (row == selection.end.row
2963#if ENABLE_FRILLS
2964 || selection.rect
2965#endif
2966 )
2935 end_col = min (end_col, selection.end.col); 2967 min_it (end_col, selection.end.col);
2936 2968
2937 t = ROW(row).t + col; 2969 t = ROW(row).t + col;
2970
2938 for (; col < end_col; col++) 2971 for (; col < end_col; col++)
2939 { 2972 {
2940 if (*t == NOCHAR) 2973 if (*t == NOCHAR)
2941 t++; 2974 t++;
2942#if ENABLE_COMBINING 2975#if ENABLE_COMBINING
… …
2958#endif 2991#endif
2959 else 2992 else
2960 new_selection_text[ofs++] = *t++; 2993 new_selection_text[ofs++] = *t++;
2961 } 2994 }
2962 2995
2996#if ENABLE_FRILLS
2997 if (selection.rect)
2998 {
2999 while (ofs
3000 && new_selection_text[ofs - 1] != C0_LF
3001 && unicode::is_space (new_selection_text[ofs - 1]))
3002 --ofs;
3003
3004 new_selection_text[ofs++] = C0_LF;
3005 }
3006 else
3007#endif
2963 if (!ROW(row).is_longer () && row != selection.end.row) 3008 if (!ROW(row).is_longer () && row != selection.end.row)
2964 new_selection_text[ofs++] = C0_LF; 3009 new_selection_text[ofs++] = C0_LF;
2965 } 3010 }
2966 3011
2967 if (end_col != selection.end.col) 3012 if (end_col != selection.end.col)
2968 new_selection_text[ofs++] = C0_LF; 3013 new_selection_text[ofs++] = C0_LF;
2969 3014
… …
2979 3024
2980 // we usually allocate much more than necessary, so realloc it smaller again 3025 // we usually allocate much more than necessary, so realloc it smaller again
2981 selection.len = ofs; 3026 selection.len = ofs;
2982 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3027 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2983 3028
3029 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3030 return;
3031
3032 selection_grab (tm);
3033}
3034
3035bool
3036rxvt_term::selection_grab (Time tm) NOTHROW
3037{
3038 selection_time = tm;
3039
2984 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2985 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3042 {
2986 display->set_selection_owner (this); 3043 display->set_selection_owner (this);
3044 return true;
3045 }
2987 else 3046 else
2988 rxvt_warn ("can't get primary selection, ignoring.\n"); 3047 {
3048 selection_clear ();
3049 return false;
3050 }
2989 3051
2990#if 0 3052#if 0
2991 XTextProperty ct; 3053 XTextProperty ct;
2992 3054
2993 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2994 { 3056 {
2995 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3057 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2996 XFree (ct.value); 3058 XFree (ct.value);
2997 } 3059 }
2998#endif 3060#endif
2999
3000 selection_time = tm;
3001} 3061}
3002 3062
3003/* ------------------------------------------------------------------------- */ 3063/* ------------------------------------------------------------------------- */
3004/* 3064/*
3005 * Mark or select text based upon number of clicks: 1, 2, or 3 3065 * Mark or select text based upon number of clicks: 1, 2, or 3
3006 * EXT: button 1 press 3066 * EXT: button 1 press
3007 */ 3067 */
3008void 3068void
3009rxvt_term::selection_click (int clicks, int x, int y) 3069rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3010{ 3070{
3011 clicks = ((clicks - 1) % 3) + 1; 3071 clicks = ((clicks - 1) % 3) + 1;
3012 selection.clicks = clicks; /* save clicks so extend will work */ 3072 selection.clicks = clicks; /* save clicks so extend will work */
3013 3073
3074 if (clicks == 2 && !selection.rect
3075 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3076 {
3077 MEvent.clicks = 1; // what a mess
3078 selection.screen = current_screen;
3079 selection.op = SELECTION_CONT;
3080 return;
3081 }
3082
3014 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3083 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3015 3084
3016 if (clicks == 2 || clicks == 3) 3085 if (clicks == 2 || clicks == 3)
3017 selection_extend_colrow (selection.mark.col, 3086 selection_extend_colrow (selection.mark.col,
3018 selection.mark.row + view_start, 3087 selection.mark.row - view_start,
3019 0, /* button 3 */ 3088 0, /* button 3 */
3020 1, /* button press */ 3089 1, /* button press */
3021 0); /* click change */ 3090 0); /* click change */
3022} 3091}
3023 3092
3024/* ------------------------------------------------------------------------- */ 3093/* ------------------------------------------------------------------------- */
3025/* 3094/*
3026 * Mark a selection at the specified col/row 3095 * Mark a selection at the specified col/row
3027 */ 3096 */
3028void 3097void
3029rxvt_term::selection_start_colrow (int col, int row) 3098rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3030{ 3099{
3031 want_refresh = 1; 3100 want_refresh = 1;
3032 3101
3033 selection.mark.row = row - view_start; 3102 selection.mark.row = row + view_start;
3034 selection.mark.col = col; 3103 selection.mark.col = col;
3035 3104
3036 selection.mark.row = min (max (selection.mark.row, -nsaved), nrow - 1); 3105 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3037 selection.mark.col = min (max (selection.mark.col, 0), ncol - 1); 3106 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3038 3107
3039 while (selection.mark.col > 0 3108 while (selection.mark.col > 0
3040 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3109 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3041 --selection.mark.col; 3110 --selection.mark.col;
3042 3111
… …
3060#define DELIMIT_TEXT(x) \ 3129#define DELIMIT_TEXT(x) \
3061 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3130 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3062#define DELIMIT_REND(x) 1 3131#define DELIMIT_REND(x) 1
3063 3132
3064void 3133void
3065rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3134rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3066{ 3135{
3067 int col, row, dirnadd, tcol, trow, w1, w2; 3136 int col, row, dirnadd, tcol, trow, w1, w2;
3068 row_col_t bound; 3137 row_col_t bound;
3069 text_t *stp; 3138 text_t *stp;
3070 rend_t *srp; 3139 rend_t *srp;
3071 3140
3072 if (dirn == UP) 3141 if (dirn == UP)
3073 { 3142 {
3074 bound.row = - nsaved - 1; 3143 bound.row = top_row - 1;
3075 bound.col = 0; 3144 bound.col = 0;
3076 dirnadd = -1; 3145 dirnadd = -1;
3077 } 3146 }
3078 else 3147 else
3079 { 3148 {
… …
3127 } 3196 }
3128 } 3197 }
3129 break; 3198 break;
3130 } 3199 }
3131 3200
3132Old_Word_Selection_You_Die:
3133 if (dirn == DN) 3201 if (dirn == DN)
3134 col++; /* put us on one past the end */ 3202 col++; /* put us on one past the end */
3135 3203
3136 /* Poke the values back in */ 3204 /* Poke the values back in */
3137 ret->row = row; 3205 ret->row = row;
… …
3145 * flag == 0 ==> button 1 3213 * flag == 0 ==> button 1
3146 * flag == 1 ==> button 3 press 3214 * flag == 1 ==> button 3 press
3147 * flag == 2 ==> button 3 motion 3215 * flag == 2 ==> button 3 motion
3148 */ 3216 */
3149void 3217void
3150rxvt_term::selection_extend (int x, int y, int flag) 3218rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3151{ 3219{
3152 int col = min (max (Pixel2Col (x), 0), nrow - 1); 3220 int col = clamp (Pixel2Col (x), 0, ncol);
3153 int row = min (max (Pixel2Row (y), 0), ncol); 3221 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3154 3222
3155 /* 3223 /*
3156 * If we're selecting characters (single click) then we must check first 3224 * If we're selecting characters (single click) then we must check first
3157 * if we are at the same place as the original mark. If we are then 3225 * if we are at the same place as the original mark. If we are then
3158 * select nothing. Otherwise, if we're to the right of the mark, you have to 3226 * select nothing. Otherwise, if we're to the right of the mark, you have to
3159 * be _past_ a character for it to be selected. 3227 * be _past_ a character for it to be selected.
3160 */ 3228 */
3161 if (((selection.clicks % 3) == 1) && !flag 3229 if (((selection.clicks % 3) == 1) && !flag
3162 && (col == selection.mark.col 3230 && (col == selection.mark.col
3163 && (row == selection.mark.row + view_start))) 3231 && (row == selection.mark.row - view_start)))
3164 { 3232 {
3165 /* select nothing */ 3233 /* select nothing */
3166 selection.beg.row = selection.end.row = 0; 3234 selection.beg.row = selection.end.row = 0;
3167 selection.beg.col = selection.end.col = 0; 3235 selection.beg.col = selection.end.col = 0;
3168 selection.clicks = 4; 3236 selection.clicks = 4;
… …
3181/* ------------------------------------------------------------------------- */ 3249/* ------------------------------------------------------------------------- */
3182/* 3250/*
3183 * Extend the selection to the specified col/row 3251 * Extend the selection to the specified col/row
3184 */ 3252 */
3185void 3253void
3186rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3254rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3187{ 3255{
3188 row_col_t pos; 3256 row_col_t pos;
3189 enum { 3257 enum {
3190 LEFT, RIGHT 3258 LEFT, RIGHT
3191 } closeto = RIGHT; 3259 } closeto = RIGHT;
… …
3223 selection.beg.col = selection.end.col = selection.mark.col; 3291 selection.beg.col = selection.end.col = selection.mark.col;
3224 selection.beg.row = selection.end.row = selection.mark.row; 3292 selection.beg.row = selection.end.row = selection.mark.row;
3225 } 3293 }
3226 3294
3227 pos.col = col; 3295 pos.col = col;
3228 pos.row = row - view_start; 3296 pos.row = view_start + row;
3229 3297
3230 /* 3298 /*
3231 * This is mainly xterm style selection with a couple of differences, mainly 3299 * This is mainly xterm style selection with a couple of differences, mainly
3232 * in the way button3 drag extension works. 3300 * in the way button3 drag extension works.
3233 * We're either doing: button1 drag; button3 press; or button3 drag 3301 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3320 selection_delimit_word (DN, &selection.end, &selection.end); 3388 selection_delimit_word (DN, &selection.end, &selection.end);
3321 } 3389 }
3322 else if (selection.clicks == 3) 3390 else if (selection.clicks == 3)
3323 { 3391 {
3324#if ENABLE_FRILLS 3392#if ENABLE_FRILLS
3325 if (options & Opt_tripleclickwords) 3393 if (OPTION (Opt_tripleclickwords))
3326 { 3394 {
3327 selection_delimit_word (UP, &selection.beg, &selection.beg); 3395 selection_delimit_word (UP, &selection.beg, &selection.beg);
3328 3396
3329 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3397 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3330 { 3398 {
… …
3371 } 3439 }
3372 } 3440 }
3373 3441
3374#if ENABLE_FRILLS 3442#if ENABLE_FRILLS
3375 if (selection.rect && selection.beg.col > selection.end.col) 3443 if (selection.rect && selection.beg.col > selection.end.col)
3376 SWAP_IT (selection.beg.col, selection.end.col, int); 3444 ::swap (selection.beg.col, selection.end.col);
3377#endif 3445#endif
3378} 3446}
3379 3447
3380#if ENABLE_FRILLS 3448#if ENABLE_FRILLS
3381void 3449void
3382rxvt_term::selection_remove_trailing_spaces () 3450rxvt_term::selection_remove_trailing_spaces () NOTHROW
3383{ 3451{
3384 int32_t end_col, end_row; 3452 int32_t end_col, end_row;
3385 text_t *stp; 3453 text_t *stp;
3386 3454
3387 end_col = selection.end.col; 3455 end_col = selection.end.col;
… …
3391 { 3459 {
3392 stp = ROW(end_row).t; 3460 stp = ROW(end_row).t;
3393 3461
3394 while (--end_col >= 0) 3462 while (--end_col >= 0)
3395 { 3463 {
3396 if (stp[end_col] != ' ' 3464 if (stp[end_col] != NOCHAR
3397 && stp[end_col] != '\t' 3465 && !unicode::is_space (stp[end_col]))
3398 && stp[end_col] != NOCHAR)
3399 break; 3466 break;
3400 } 3467 }
3401 3468
3402 if (end_col >= 0 3469 if (end_col >= 0
3403 || !ROW(end_row - 1).is_longer ()) 3470 || !ROW(end_row - 1).is_longer ())
… …
3426/* 3493/*
3427 * Double click on button 3 when already selected 3494 * Double click on button 3 when already selected
3428 * EXT: button 3 double click 3495 * EXT: button 3 double click
3429 */ 3496 */
3430void 3497void
3431rxvt_term::selection_rotate (int x, int y) 3498rxvt_term::selection_rotate (int x, int y) NOTHROW
3432{ 3499{
3433 selection.clicks = selection.clicks % 3 + 1; 3500 selection.clicks = selection.clicks % 3 + 1;
3434 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3501 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3435} 3502}
3436 3503
… …
3438/* 3505/*
3439 * Respond to a request for our current selection 3506 * Respond to a request for our current selection
3440 * EXT: SelectionRequest 3507 * EXT: SelectionRequest
3441 */ 3508 */
3442void 3509void
3443rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3444{ 3511{
3445 XSelectionEvent ev; 3512 XSelectionEvent ev;
3446 dDisp; 3513 dDisp;
3447 3514
3448 ev.type = SelectionNotify; 3515 ev.type = SelectionNotify;
… …
3576 3643
3577/* 3644/*
3578 * return col/row values corresponding to x/y pixel values 3645 * return col/row values corresponding to x/y pixel values
3579 */ 3646 */
3580void 3647void
3581rxvt_term::pixel_position (int *x, int *y) 3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3582{ 3649{
3583 *x = Pixel2Col (*x); 3650 *x = Pixel2Col (*x);
3584 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3585 *y = Pixel2Row (*y); 3652 *y = Pixel2Row (*y);
3586 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3587} 3654}
3588 3655
3589/* ------------------------------------------------------------------------- */ 3656/* ------------------------------------------------------------------------- */
3590#ifdef USE_XIM 3657#ifdef USE_XIM
3591void 3658void
3592rxvt_term::im_set_position (XPoint &pos) 3659rxvt_term::im_set_position (XPoint &pos) NOTHROW
3593{ 3660{
3594 XWindowAttributes xwa; 3661 XWindowAttributes xwa;
3595 3662
3596 XGetWindowAttributes (display->display, vt, &xwa); 3663 XGetWindowAttributes (display->display, vt, &xwa);
3597 3664
… …
3600} 3667}
3601#endif 3668#endif
3602 3669
3603#if ENABLE_OVERLAY 3670#if ENABLE_OVERLAY
3604void 3671void
3605rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3672rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3606{ 3673{
3607 if (nrow < 3 || ncol < 3) 3674 if (nrow < 1 || ncol < 1)
3608 return; 3675 return;
3609 3676
3610 want_refresh = 1; 3677 want_refresh = 1;
3611 3678
3612 scr_overlay_off (); 3679 scr_overlay_off ();
3613 3680
3614 if (x < 0) x = ncol - w; 3681 if (x < 0) x = ncol - w;
3615 if (y < 0) y = nrow - h; 3682 if (y < 0) y = nrow - h;
3616 3683
3617 // make space for border 3684 // make space for border
3618 w += 2; MIN_IT (w, ncol); 3685 w += 2; min_it (w, ncol);
3619 h += 2; MIN_IT (h, nrow); 3686 h += 2; min_it (h, nrow);
3620 3687
3621 x -= 1; MAX_IT (x, 0); 3688 x -= 1; clamp_it (x, 0, ncol - w);
3622 y -= 1; MAX_IT (y, 0); 3689 y -= 1; clamp_it (y, 0, nrow - h);
3623
3624 MIN_IT (x, ncol - w);
3625 MIN_IT (y, nrow - h);
3626 3690
3627 ov_x = x; ov_y = y; 3691 ov_x = x; ov_y = y;
3628 ov_w = w; ov_h = h; 3692 ov_w = w; ov_h = h;
3629 3693
3630 ov_text = new text_t *[h]; 3694 ov_text = new text_t *[h];
… …
3658 *rp = r; 3722 *rp = r;
3659 } 3723 }
3660} 3724}
3661 3725
3662void 3726void
3663rxvt_term::scr_overlay_off () 3727rxvt_term::scr_overlay_off () NOTHROW
3664{ 3728{
3665 if (!ov_text) 3729 if (!ov_text)
3666 return; 3730 return;
3667 3731
3668 want_refresh = 1; 3732 want_refresh = 1;
… …
3676 delete [] ov_text; ov_text = 0; 3740 delete [] ov_text; ov_text = 0;
3677 delete [] ov_rend; ov_rend = 0; 3741 delete [] ov_rend; ov_rend = 0;
3678} 3742}
3679 3743
3680void 3744void
3681rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3745rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3682{ 3746{
3683 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3747 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3684 return; 3748 return;
3685 3749
3686 x++, y++; 3750 x++, y++;
… …
3688 ov_text[y][x] = text; 3752 ov_text[y][x] = text;
3689 ov_rend[y][x] = rend; 3753 ov_rend[y][x] = rend;
3690} 3754}
3691 3755
3692void 3756void
3693rxvt_term::scr_overlay_set (int x, int y, const char *s) 3757rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3694{ 3758{
3695 while (*s) 3759 while (*s)
3696 scr_overlay_set (x++, y, *s++); 3760 scr_overlay_set (x++, y, *s++);
3697} 3761}
3698 3762
3699void 3763void
3700rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3701{ 3765{
3702 while (*s) 3766 while (*s)
3703 { 3767 {
3704 text_t t = *s++; 3768 text_t t = *s++;
3705 int width = wcwidth (t); 3769 int width = wcwidth (t);
… …
3711 } 3775 }
3712 } 3776 }
3713} 3777}
3714 3778
3715void 3779void
3716rxvt_term::scr_swap_overlay () 3780rxvt_term::scr_swap_overlay () NOTHROW
3717{ 3781{
3718 if (!ov_text) 3782 if (!ov_text)
3719 return; 3783 return;
3720 3784
3721 // swap screen mem with overlay 3785 // swap screen mem with overlay
3722 for (int y = ov_h; y--; ) 3786 for (int y = ov_h; y--; )
3723 { 3787 {
3724 text_t *t1 = ov_text[y]; 3788 text_t *t1 = ov_text[y];
3725 rend_t *r1 = ov_rend[y]; 3789 rend_t *r1 = ov_rend[y];
3726 3790
3727 text_t *t2 = ROW(y - view_start).t + ov_x; 3791 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3728 rend_t *r2 = ROW(y - view_start).r + ov_x; 3792 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3729 3793
3730 for (int x = ov_w; x--; ) 3794 for (int x = ov_w; x--; )
3731 { 3795 {
3732 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3796 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3733 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3797 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