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