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.265 by root, Tue Oct 3 11:56:48 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-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() \
… …
92 */ 93 */
93#define drawBuffer vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (dpy, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (dpy, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (dpy, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
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
128 efs &= ~RS_baseattrMask; 129 l.touch ();
130
131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
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;
133 136
… …
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 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
658 }
659
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
671
672 // move and/or clear selection, if any
648 if (selection.op && current_screen == selection.screen) 673 if (selection.op && current_screen == selection.screen)
649 { 674 {
650 selection.beg.row -= count; 675 selection.beg.row -= count;
651 selection.end.row -= count; 676 selection.end.row -= count;
652 selection.mark.row -= count; 677 selection.mark.row -= count;
653 678
654 selection_check (0); 679 if (selection.beg.row < top_row
655 } 680 || selection.end.row < top_row
656 681 || 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 { 682 {
679 CLEAR_ALL_SELECTION (); 683 CLEAR_ALL_SELECTION ();
680 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 684 selection.op = SELECTION_CLEAR;
681 } 685 }
682 else if (j >= row1 && j <= row2) 686 }
687
688 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer)
690 && view_start != 0
691 && view_start != -saveLines)
692 scr_page (UP, count);
693
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
695 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
696 }
697 else
698 {
699 if (selection.op && current_screen == selection.screen)
700 {
701 if ((selection.beg.row < row1 && selection.end.row > row1)
702 || (selection.beg.row < row2 && selection.end.row > row2)
703 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
704 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
705 || (selection.end.row - count < row1 && selection.end.row >= row1)
706 || (selection.end.row - count > row2 && selection.end.row <= row2))
707 {
708 CLEAR_ALL_SELECTION ();
709 selection.op = SELECTION_CLEAR;
710 }
711 else if (selection.end.row >= row1 && selection.end.row <= row2)
683 { 712 {
684 /* move selected region too */ 713 /* move selected region too */
685 selection.beg.row -= count; 714 selection.beg.row -= count;
686 selection.end.row -= count; 715 selection.end.row -= count;
687 selection.mark.row -= count; 716 selection.mark.row -= count;
… …
693 // use a simple and robust scrolling algorithm, this 722 // use a simple and robust scrolling algorithm, this
694 // part of scr_scroll_text is not time-critical. 723 // part of scr_scroll_text is not time-critical.
695 724
696 int rows = row2 - row1 + 1; 725 int rows = row2 - row1 + 1;
697 726
727 min_it (count, rows);
728
729 line_t *temp_buf = row_buf + total_rows;
730
698 for (int row = 0; row < rows; row++) 731 for (int row = 0; row < rows; row++)
699 { 732 {
700 buf [row] = ROW(row1 + (row + count + rows) % rows); 733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
701 734
702 if (!IN_RANGE_EXC (row + count, 0, rows)) 735 if (!IN_RANGE_EXC (row + count, 0, rows))
703 scr_blank_screen_mem (buf [row], rstyle); 736 scr_blank_screen_mem (temp_buf [row], rstyle);
704 } 737 }
705 738
706 for (int row = 0; row < rows; row++) 739 for (int row = 0; row < rows; row++)
707 ROW(row1 + row) = buf [row]; 740 ROW(row1 + row) = temp_buf [row];
708 } 741 }
709 742
710 return count; 743 return count;
711} 744}
712 745
713/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
714/* 747/*
715 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
716 */ 749 */
717void 750void
718rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
719{ 752{
720 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
721 return; 754 return;
722 755
723 unsigned char checksel; 756 unsigned char checksel;
724 unicode_t c; 757 unicode_t c;
725 int row, last_col; 758 int ncol = this->ncol;
726 const unicode_t *strend = str + len; 759 const wchar_t *strend = str + len;
727 760
728 want_refresh = 1; 761 want_refresh = 1;
729 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
730 last_col = ncol;
731 763
732 if (nlines > 0) 764 if (minlines > 0)
733 { 765 {
734 nlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
768
735 if ((nlines > 0) 769 if (minlines > 0
736 && (screen.tscroll == 0) 770 && screen.tscroll == 0
737 && (screen.bscroll == (nrow - 1))) 771 && screen.bscroll == nrow - 1)
738 { 772 {
739 /* _at least_ this many lines need to be scrolled */ 773 /* _at least_ this many lines need to be scrolled */
740 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
741 screen.cur.row -= nlines; 775 screen.cur.row -= minlines;
742 } 776 }
743 } 777 }
744 778
745#ifdef DEBUG_STRICT 779#ifdef DEBUG_STRICT
746 assert (screen.cur.col < last_col); 780 assert (screen.cur.col < ncol);
747 assert ((screen.cur.row < nrow) 781 assert (screen.cur.row < nrow
748 && (screen.cur.row >= - (int32_t)nsaved)); 782 && 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 783#endif
754 row = screen.cur.row; 784 int row = screen.cur.row;
755 785
756 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 786 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
757 787
758 line_t *line = &ROW(row); 788 line_t *line = &ROW(row);
759 789
760 while (str < strend) 790 while (str < strend)
761 { 791 {
762 c = *str++; 792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
763 793
764 if (c < 0x20) 794 if (c < 0x20)
765 if (c == C0_LF) 795 if (c == C0_LF)
766 { 796 {
767 if (!line->is_longer ()) /* XXX: think about this */
768 MAX_IT (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
769 798
770 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
771 800
772 if (screen.cur.row == screen.bscroll) 801 if (screen.cur.row == screen.bscroll)
773 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 802 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
777 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
778 continue; 807 continue;
779 } 808 }
780 else if (c == C0_CR) 809 else if (c == C0_CR)
781 { 810 {
782 if (!line->is_longer ()) /* XXX: think about this */
783 MAX_IT (line->l, screen.cur.col); 811 max_it (line->l, screen.cur.col);
784 812
785 screen.flags &= ~Screen_WrapNext; 813 screen.flags &= ~Screen_WrapNext;
786 screen.cur.col = 0; 814 screen.cur.col = 0;
787 continue; 815 continue;
788 } 816 }
… …
805 CLEAR_SELECTION (); 833 CLEAR_SELECTION ();
806 } 834 }
807 835
808 if (screen.flags & Screen_WrapNext) 836 if (screen.flags & Screen_WrapNext)
809 { 837 {
810 line->set_is_longer ();
811
812 scr_do_wrap (); 838 scr_do_wrap ();
813 839
840 line->l = ncol;
841 line->is_longer (1);
842
814 row = screen.cur.row; 843 row = screen.cur.row;
815 line = &ROW(row); /* _must_ refresh */ 844 line = &ROW(row); /* _must_ refresh */
816 } 845 }
817 846
818 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
819 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
820 c = 0xfffd; 849 c = 0xfffd;
821 850
822 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
823 // do wcwidth before further replacements, as wcwidth might return -1 852 // 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 853 // drawing characters below as they might be invalid in the current
825 // locale. 854 // locale.
826 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
827 856
828 if (charsets[screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
829 { 858 {
830 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
831 // 5f-7e standard vt100 860 // 5f-7e standard vt100
832 // 40-5e rxvt extension for extra curses acs chars 861 // 40-5e rxvt extension for extra curses acs chars
833 static uint16_t vt100_0[62] = { // 41 .. 7e 862 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 } 914 }
886 915
887 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
888 917
889 // if the character doesn't fit into the remaining columns... 918 // if the character doesn't fit into the remaining columns...
890 if (screen.cur.col > last_col - width && last_col >= width) 919 if (screen.cur.col > ncol - width && ncol >= width)
891 { 920 {
892 // ...output spaces 921 // ...output spaces
893 c = ' '; 922 c = ' ';
894 // and try the same character next loop iteration 923 // and try the same character next loop iteration
895 --str; 924 --str;
896 } 925 }
897 926
927 line->touch ();
928
898 do 929 do
899 { 930 {
900 line->t[screen.cur.col] = c; 931 line->t[screen.cur.col] = c;
901 line->r[screen.cur.col] = rend; 932 line->r[screen.cur.col] = rend;
902 933
903 if (screen.cur.col < last_col - 1) 934 if (screen.cur.col < ncol - 1)
904 screen.cur.col++; 935 screen.cur.col++;
905 else 936 else
906 { 937 {
907 line->l = last_col; 938 line->l = ncol;
908 if (screen.flags & Screen_Autowrap) 939 if (screen.flags & Screen_Autowrap)
909 screen.flags |= Screen_WrapNext; 940 screen.flags |= Screen_WrapNext;
910 break; 941 break;
911 } 942 }
912 943
… …
914 } 945 }
915 while (--width > 0); 946 while (--width > 0);
916 947
917 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
918 if (!width) 949 if (!width)
950 {
951 line->touch ();
952
919 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
920 { 954 {
921 line->t[c] = ' '; 955 line->t[c] = ' ';
922 line->r[c] = rend; 956 line->r[c] = rend;
923 } 957 }
958 }
924 } 959 }
925 else // width == 0 960 else // width == 0
926 { 961 {
927#if ENABLE_COMBINING 962#if ENABLE_COMBINING
928 // handle combining characters 963 // handle combining characters
929 // we just tag the accent on the previous on-screen character. 964 // we just tag the accent on the previous on-screen character.
930 // this is arguably not correct, but also arguably not wrong. 965 // this is arguably not correct, but also arguably not wrong.
931 // we don't handle double-width characters nicely yet. 966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
932 text_t *tp; 968 text_t *tp;
933 rend_t *rp; 969 rend_t *rp;
934 970
935 if (screen.cur.col > 0) 971 if (screen.cur.col > 0)
936 { 972 {
973 linep = line;
937 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
938 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 976 }
943 else if (screen.cur.row > 0 977 else if (screen.cur.row > 0
944 && ROW(screen.cur.row - 1).is_longer ()) 978 && ROW(screen.cur.row - 1).is_longer ())
945 { 979 {
946 line_t *line = &ROW(screen.cur.row - 1); 980 linep = &ROW(screen.cur.row - 1);
947
948 tp = line->t + last_col - 1; 981 tp = line->t + ncol - 1;
949 rp = line->r + last_col - 1; 982 rp = line->r + ncol - 1;
950
951 while (*tp == NOCHAR && tp > line->t)
952 tp--, rp--;
953 } 983 }
954 else 984 else
955 continue; 985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
956 991
957 // first try to find a precomposed character 992 // first try to find a precomposed character
958 unicode_t n = rxvt_compose (*tp, c); 993 unicode_t n = rxvt_compose (*tp, c);
959 if (n == NOCHAR) 994 if (n == NOCHAR)
960 n = rxvt_composite.compose (*tp, c); 995 n = rxvt_composite.compose (*tp, c);
… …
963 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
964#endif 999#endif
965 } 1000 }
966 } 1001 }
967 1002
968 if (!line->is_longer ()) /* XXX: think about this */
969 MAX_IT (line->l, screen.cur.col); 1003 max_it (line->l, screen.cur.col);
970 1004
971#ifdef DEBUG_STRICT 1005#ifdef DEBUG_STRICT
972 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
973#else /* drive with your eyes closed */
974 MAX_IT (screen.cur.row, 0);
975#endif 1007#endif
976} 1008}
977 1009
978/* ------------------------------------------------------------------------- */ 1010/* ------------------------------------------------------------------------- */
979/* 1011/*
980 * Process Backspace. Move back the cursor back a position, wrap if have to 1012 * Process Backspace. Move back the cursor back a position, wrap if have to
981 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
982 */ 1014 */
983void 1015void
984rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
985{ 1017{
986 want_refresh = 1; 1018 want_refresh = 1;
987 1019
988 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
989 { 1021 {
… …
1007 * Process Horizontal Tab 1039 * Process Horizontal Tab
1008 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
1009 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
1010 */ 1042 */
1011void 1043void
1012rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
1013{ 1045{
1014 int i, x; 1046 int i, x;
1015 1047
1016 want_refresh = 1; 1048 want_refresh = 1;
1017 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
1018 1050
1019 if (count == 0) 1051 if (count == 0)
1020 return; 1052 return;
1021 else if (count > 0) 1053 else if (count > 0)
1022 { 1054 {
1023 int row = screen.cur.row;
1024
1025 line_t &l = ROW(row); 1055 line_t &l = ROW(screen.cur.row);
1026 rend_t base_rend = l.r[i]; 1056 rend_t base_rend = l.r[i];
1027 ht &= l.t[i] == ' '; 1057 ht &= l.t[i] == ' ';
1028 1058
1029 for (; ++i < ncol; ) 1059 for (; ++i < ncol; )
1030 if (tabs[i]) 1060 if (tabs[i])
1031 { 1061 {
1032 x = i; 1062 x = i;
1063
1033 if (!--count) 1064 if (!--count)
1034 break; 1065 break;
1035 } 1066 }
1036 else 1067 else
1037 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
… …
1040 if (count) 1071 if (count)
1041 x = ncol - 1; 1072 x = ncol - 1;
1042 1073
1043 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1044 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1045 if (ht && options & Opt_pastableTabs) 1076 if (ht && OPTION (Opt_pastableTabs))
1046 { 1077 {
1047 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1048 1079
1049 if (!l.is_longer ()) /* XXX: think about this */ 1080 l.touch (x);
1050 MAX_IT (l.l, x);
1051 1081
1052 i = screen.cur.col; 1082 i = screen.cur.col;
1053 1083
1054 l.t[i] = '\t'; 1084 l.t[i] = '\t';
1055 l.r[i] = base_rend; 1085 l.r[i] = base_rend;
… …
1084 * Process DEC Back Index 1114 * Process DEC Back Index
1085 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1086 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1087 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1088 */ 1118 */
1089#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1090void 1120void
1091rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1092{ 1122{
1093 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1094 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1095 else 1125 else
1096 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
1101 * Process DEC Forward Index 1131 * Process DEC Forward Index
1102 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1103 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1104 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1105 */ 1135 */
1106#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1107void 1137void
1108rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1109{ 1139{
1110 int row;
1111
1112 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1113 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1114 else 1142 else
1115 { 1143 {
1116 row = screen.cur.row; 1144 line_t &l = ROW(screen.cur.row);
1117 1145
1118 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1146 l.touch ();
1119 ROW(row).l = ncol; 1147 l.is_longer (0);
1120 1148
1121 scr_gotorc (0, 0, R_RELATIVE); 1149 scr_gotorc (0, 0, R_RELATIVE);
1122 scr_insdel_chars (1, DELETE); 1150 scr_insdel_chars (1, DELETE);
1123 scr_gotorc (0, ncol - 1, R_RELATIVE); 1151 scr_gotorc (0, ncol - 1, R_RELATIVE);
1124 } 1152 }
… …
1128/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1129/* 1157/*
1130 * Goto Row/Column 1158 * Goto Row/Column
1131 */ 1159 */
1132void 1160void
1133rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1134{ 1162{
1135 want_refresh = 1; 1163 want_refresh = 1;
1136 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1137 1165
1138 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1139 MAX_IT (screen.cur.col, 0); 1167 clamp_it (screen.cur.col, 0, ncol - 1);
1140 MIN_IT (screen.cur.col, (int32_t)ncol - 1);
1141 1168
1142 screen.flags &= ~Screen_WrapNext; 1169 screen.flags &= ~Screen_WrapNext;
1143 1170
1144 if (relative & R_RELATIVE) 1171 if (relative & R_RELATIVE)
1145 { 1172 {
… …
1163 else 1190 else
1164 { 1191 {
1165 if (screen.flags & Screen_Relative) 1192 if (screen.flags & Screen_Relative)
1166 { /* relative origin mode */ 1193 { /* relative origin mode */
1167 screen.cur.row = row + screen.tscroll; 1194 screen.cur.row = row + screen.tscroll;
1168 MIN_IT (screen.cur.row, screen.bscroll); 1195 min_it (screen.cur.row, screen.bscroll);
1169 } 1196 }
1170 else 1197 else
1171 screen.cur.row = row; 1198 screen.cur.row = row;
1172 } 1199 }
1173 1200
1174 MAX_IT (screen.cur.row, 0); 1201 clamp_it (screen.cur.row, 0, nrow - 1);
1175 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1176} 1202}
1177 1203
1178/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1179/* 1205/*
1180 * direction should be UP or DN 1206 * direction should be UP or DN
1181 */ 1207 */
1182void 1208void
1183rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1184{ 1210{
1185 int dirn; 1211 int dirn;
1186 1212
1187 want_refresh = 1; 1213 want_refresh = 1;
1188 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1195 || (screen.cur.row == screen.tscroll && direction == DN)) 1221 || (screen.cur.row == screen.tscroll && direction == DN))
1196 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1222 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1197 else 1223 else
1198 screen.cur.row += dirn; 1224 screen.cur.row += dirn;
1199 1225
1200 MAX_IT (screen.cur.row, 0); 1226 clamp_it (screen.cur.row, 0, nrow - 1);
1201 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
1202 selection_check (0); 1227 selection_check (0);
1203} 1228}
1204 1229
1205/* ------------------------------------------------------------------------- */ 1230/* ------------------------------------------------------------------------- */
1206/* 1231/*
… …
1208 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1209 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1210 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1211 */ 1236 */
1212void 1237void
1213rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1214{ 1239{
1215 unsigned int row, col, num; 1240 unsigned int col, num;
1216 1241
1217 want_refresh = 1; 1242 want_refresh = 1;
1218 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1219 1244
1220 selection_check (1); 1245 selection_check (1);
1221 1246
1222 row = screen.cur.row; 1247 line_t &line = ROW(screen.cur.row);
1248
1249 line.touch ();
1250 line.is_longer (0);
1223 1251
1224 switch (mode) 1252 switch (mode)
1225 { 1253 {
1226 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1227 col = screen.cur.col; 1255 col = screen.cur.col;
1228 num = ncol - col; 1256 num = ncol - col;
1229 MIN_IT (ROW(row).l, (int16_t)col); 1257 min_it (line.l, col);
1230 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1231 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1232 CLEAR_SELECTION (); 1260 CLEAR_SELECTION ();
1233 break; 1261 break;
1234 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
… …
1239 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1240 break; 1268 break;
1241 case 2: /* erase whole line */ 1269 case 2: /* erase whole line */
1242 col = 0; 1270 col = 0;
1243 num = ncol; 1271 num = ncol;
1244 ROW(row).l = 0; 1272 line.l = 0;
1245 if (selection.beg.row <= screen.cur.row 1273 if (selection.beg.row <= screen.cur.row
1246 && selection.end.row >= screen.cur.row) 1274 && selection.end.row >= screen.cur.row)
1247 CLEAR_SELECTION (); 1275 CLEAR_SELECTION ();
1248 break; 1276 break;
1249 default: 1277 default:
1250 return; 1278 return;
1251 } 1279 }
1252 1280
1253 scr_blank_line (ROW(row), col, num, rstyle); 1281 scr_blank_line (line, col, num, rstyle);
1254} 1282}
1255 1283
1256/* ------------------------------------------------------------------------- */ 1284/* ------------------------------------------------------------------------- */
1257/* 1285/*
1258 * Erase part of whole of the screen 1286 * Erase part of whole of the screen
1259 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1260 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1261 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1262 */ 1290 */
1263void 1291void
1264rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1265{ 1293{
1266 int num; 1294 int num;
1267 int32_t row; 1295 int32_t row;
1268 rend_t ren; 1296 rend_t ren;
1269 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
1301 CLEAR_SELECTION (); 1329 CLEAR_SELECTION ();
1302 1330
1303 if (row >= nrow) /* Out Of Bounds */ 1331 if (row >= nrow) /* Out Of Bounds */
1304 return; 1332 return;
1305 1333
1306 MIN_IT (num, (nrow - row)); 1334 min_it (num, nrow - row);
1307 1335
1308 if (rstyle & (RS_RVid | RS_Uline)) 1336 if (rstyle & (RS_RVid | RS_Uline))
1309 ren = (rend_t) ~RS_None; 1337 ren = (rend_t) ~RS_None;
1310 else if (GET_BASEBG (rstyle) == Color_bg) 1338 else if (GET_BASEBG (rstyle) == Color_bg)
1311 { 1339 {
… …
1313 CLEAR_ROWS (row, num); 1341 CLEAR_ROWS (row, num);
1314 } 1342 }
1315 else 1343 else
1316 { 1344 {
1317 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1318 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1319 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1320 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1321 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1322 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1323 } 1351 }
1324 1352
1325 for (; num--; row++) 1353 for (; num--; row++)
1326 { 1354 {
1327 scr_blank_screen_mem (ROW (row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1328 ROW (row).l = 0;
1329 scr_blank_line (drawn[row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1330 } 1357 }
1331} 1358}
1332 1359
1333#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1334void 1361void
1335rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1336{ 1363{
1337 want_refresh = 1; 1364 want_refresh = 1;
1338 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1339 1366
1340 nsaved = 0; 1367 top_row = 0;
1341} 1368}
1342#endif 1369#endif
1343 1370
1344/* ------------------------------------------------------------------------- */ 1371/* ------------------------------------------------------------------------- */
1345/* 1372/*
1346 * Fill the screen with `E's 1373 * Fill the screen with `E's
1347 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1348 */ 1375 */
1349void 1376void
1350rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1351{ 1378{
1352 rend_t fs; 1379 rend_t fs;
1353 1380
1354 want_refresh = 1; 1381 want_refresh = 1;
1355 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1366 rend_t *r1 = line.r; 1393 rend_t *r1 = line.r;
1367 1394
1368 for (int j = ncol; j--; ) 1395 for (int j = ncol; j--; )
1369 *r1++ = fs; 1396 *r1++ = fs;
1370 1397
1371 line.l = ncol; /* make the `E's selectable */ 1398 line.is_longer (0);
1399 line.touch (ncol);
1372 } 1400 }
1373} 1401}
1374 1402
1375/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1376/* 1404/*
1377 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1378 */ 1406 */
1379void 1407void
1380rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1381{ 1409{
1382 int end; 1410 int end;
1383 1411
1384 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1385 1413
… …
1405/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1406/* 1434/*
1407 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1408 */ 1436 */
1409void 1437void
1410rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1411{ 1439{
1412 int col, row; 1440 int col, row;
1413 rend_t tr; 1441 rend_t tr;
1414 1442
1415 want_refresh = 1; 1443 want_refresh = 1;
… …
1419 return; 1447 return;
1420 1448
1421 scr_do_wrap (); 1449 scr_do_wrap ();
1422 1450
1423 selection_check (1); 1451 selection_check (1);
1424 MIN_IT (count, (ncol - screen.cur.col)); 1452 min_it (count, ncol - screen.cur.col);
1425 1453
1426 row = screen.cur.row; 1454 row = screen.cur.row;
1427 1455
1428 line_t *line = &ROW(row); 1456 line_t *line = &ROW(row);
1457
1458 line->touch ();
1459 line->is_longer (0);
1429 1460
1430 switch (insdel) 1461 switch (insdel)
1431 { 1462 {
1432 case INSERT: 1463 case INSERT:
1433 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1434 { 1465 {
1435 line->t[col] = line->t[col - count]; 1466 line->t[col] = line->t[col - count];
1436 line->r[col] = line->r[col - count]; 1467 line->r[col] = line->r[col - count];
1437 } 1468 }
1438 1469
1439 if (!line->is_longer ()) 1470 line->l = min (line->l + count, ncol);
1440 {
1441 line->l += count;
1442 MIN_IT (line->l, ncol);
1443 }
1444 1471
1445 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1446 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1447 { 1474 {
1448 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1461 1488
1462 case ERASE: 1489 case ERASE:
1463 screen.cur.col += count; /* don't worry if > ncol */ 1490 screen.cur.col += count; /* don't worry if > ncol */
1464 selection_check (1); 1491 selection_check (1);
1465 screen.cur.col -= count; 1492 screen.cur.col -= count;
1493
1494 line->l = max (line->l - count, 0);
1466 scr_blank_line (*line, screen.cur.col, count, rstyle); 1495 scr_blank_line (*line, screen.cur.col, count, rstyle);
1467 break; 1496 break;
1468 1497
1469 case DELETE: 1498 case DELETE:
1470 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1473 { 1502 {
1474 line->t[col] = line->t[col + count]; 1503 line->t[col] = line->t[col + count];
1475 line->r[col] = line->r[col + count]; 1504 line->r[col] = line->r[col + count];
1476 } 1505 }
1477 1506
1507 line->l = max (line->l - count, 0);
1478 scr_blank_line (*line, ncol - count, count, tr); 1508 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 1509
1485 if (selection.op && current_screen == selection.screen 1510 if (selection.op && current_screen == selection.screen
1486 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1487 { 1512 {
1488 if (selection.end.row != screen.cur.row 1513 if (selection.end.row != screen.cur.row
… …
1506/* 1531/*
1507 * Set the scrolling region 1532 * Set the scrolling region
1508 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1509 */ 1534 */
1510void 1535void
1511rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1512{ 1537{
1513 MAX_IT (top, 0); 1538 max_it (top, 0);
1514 MIN_IT (bot, (int)nrow - 1); 1539 min_it (bot, nrow - 1);
1515 1540
1516 if (top > bot) 1541 if (top > bot)
1517 return; 1542 return;
1518 1543
1519 screen.tscroll = top; 1544 screen.tscroll = top;
… …
1526 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1527 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1528 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1529 */ 1554 */
1530void 1555void
1531rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1532{ 1557{
1533 want_refresh = 1; 1558 want_refresh = 1;
1534 1559
1535 if (mode) 1560 if (mode)
1536 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1543 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1544 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1545 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1546 */ 1571 */
1547void 1572void
1548rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1549{ 1574{
1550 if (mode) 1575 if (mode)
1551 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1552 else 1577 else
1553 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1562 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1563 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1564 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1565 */ 1590 */
1566void 1591void
1567rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1568{ 1593{
1569 if (mode) 1594 if (mode)
1570 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1571 else 1596 else
1572 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1579 * Set insert/replace mode 1604 * Set insert/replace mode
1580 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1581 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1582 */ 1607 */
1583void 1608void
1584rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1585{ 1610{
1586 if (mode) 1611 if (mode)
1587 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1588 else 1613 else
1589 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1595 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1596 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1597 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1598 */ 1623 */
1599void 1624void
1600rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1601{ 1626{
1602 if (mode < 0) 1627 if (mode < 0)
1603 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1604 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1605 tabs[screen.cur.col] = (mode ? 1 : 0); 1630 tabs [screen.cur.col] = !!mode;
1606} 1631}
1607 1632
1608/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
1609/* 1634/*
1610 * Set reverse/normal video 1635 * Set reverse/normal video
1611 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1612 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1613 */ 1638 */
1614void 1639void
1615rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1616{ 1641{
1617 XGCValues gcvalue; 1642 rvideo_mode = on;
1618 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1619 if (rvideo != mode) 1648 if (rvideo_state != on)
1620 { 1649 {
1621 rvideo = mode; 1650 rvideo_state = on;
1651
1622 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1623#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1624 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1625#endif 1655#endif
1626#if TRANSPARENT 1656#if TRANSPARENT
1627 if (! (options & Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1628#endif 1658#endif
1629 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1630 pix_colors[Color_bg]);
1631 1660
1661 XGCValues gcvalue;
1632 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1633 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1634 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1635 &gcvalue); 1665
1636 scr_clear (); 1666 scr_clear ();
1637 scr_touch (true); 1667 scr_touch (true);
1638 } 1668 }
1639} 1669}
1640 1670
… …
1642/* 1672/*
1643 * Report current cursor position 1673 * Report current cursor position
1644 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1645 */ 1675 */
1646void 1676void
1647rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1648{ 1678{
1649 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1650} 1680}
1651 1681
1652/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1655 1685
1656/* 1686/*
1657 * Set font style 1687 * Set font style
1658 */ 1688 */
1659void 1689void
1660rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1661{ 1691{
1692#if 0
1662 switch (charsets[screen.charset]) 1693 switch (charsets [screen.charset])
1663 { 1694 {
1664 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
1665 break; 1696 break;
1666 case 'A': /* United Kingdom (UK) */ 1697 case 'A': /* United Kingdom (UK) */
1667 break; 1698 break;
… …
1674 case 'C': /* Finnish character set */ 1705 case 'C': /* Finnish character set */
1675 break; 1706 break;
1676 case 'K': /* German character set */ 1707 case 'K': /* German character set */
1677 break; 1708 break;
1678 } 1709 }
1710#endif
1679} 1711}
1680 1712
1681/* ------------------------------------------------------------------------- */ 1713/* ------------------------------------------------------------------------- */
1682/* 1714/*
1683 * Choose a font 1715 * Choose a font
… …
1685 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1686 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1687 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1688 */ 1720 */
1689void 1721void
1690rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1691{ 1723{
1692 screen.charset = set; 1724 screen.charset = set;
1693 set_font_style (); 1725 set_font_style ();
1694} 1726}
1695 1727
… …
1701 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1702 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1703 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1704 */ 1736 */
1705void 1737void
1706rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1707{ 1739{
1708 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1709 set_font_style (); 1741 set_font_style ();
1710} 1742}
1711 1743
… …
1716 1748
1717/* 1749/*
1718 * refresh matching text. 1750 * refresh matching text.
1719 */ 1751 */
1720bool 1752bool
1721rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1722{ 1754{
1723 bool found = false; 1755 bool found = false;
1724 1756
1725 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1726 { 1758 {
1727 int col = 0;
1728 rend_t *drp = drawn[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1729 1760
1730 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1731 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1732 { 1763 {
1733 found = true; 1764 found = true;
1734 *drp = ~value; 1765 *drp = ~value;
1735 } 1766 }
… …
1746 PART_END, 1777 PART_END,
1747 RC_COUNT 1778 RC_COUNT
1748}; 1779};
1749 1780
1750void 1781void
1751rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1752{ 1783{
1753 int i; 1784 int i;
1754 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1755 1786
1756 if (!drawn) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
1757 return; 1788 return;
1758 1789
1759#ifndef NO_SLOW_LINK_SUPPORT 1790#ifndef NO_SLOW_LINK_SUPPORT
1760 if (refresh_type == FAST_REFRESH && !display->is_local) 1791 if (refresh_type == FAST_REFRESH && !display->is_local)
1761 { 1792 {
1762 y = 0; 1793 y = 0;
1763 eheight = height; 1794 eheight = height;
1764 } 1795 }
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 1796#endif
1773 1797
1774 /* round down */ 1798 /* round down */
1775 rc[PART_BEG].col = Pixel2Col (x); 1799 rc[PART_BEG].col = Pixel2Col (x);
1776 rc[PART_BEG].row = Pixel2Row (y); 1800 rc[PART_BEG].row = Pixel2Row (y);
… …
1779 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1); 1803 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1780 1804
1781 /* sanity checks */ 1805 /* sanity checks */
1782 for (i = PART_BEG; i < RC_COUNT; i++) 1806 for (i = PART_BEG; i < RC_COUNT; i++)
1783 { 1807 {
1784 MIN_IT (rc[i].col, ncol - 1); 1808 min_it (rc[i].col, ncol - 1);
1785 MIN_IT (rc[i].row, nrow - 1); 1809 min_it (rc[i].row, nrow - 1);
1786 } 1810 }
1787 1811
1788 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1812 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); 1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814
1815 num_scr_allow = 0;
1790 1816
1791 if (refresh) 1817 if (refresh)
1792 scr_refresh (SLOW_REFRESH); 1818 scr_refresh ();
1793} 1819}
1794 1820
1795/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1796/* 1822/*
1797 * Refresh the entire screen 1823 * Refresh the entire screen
1798 */ 1824 */
1799void 1825void
1800rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1801{ 1827{
1802 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1803} 1829}
1804 1830
1805/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1806/* 1832/*
1807 * Move the display so that the line represented by scrollbar value Y is at 1833 * Move the display so that the line represented by scrollbar value Y is at
1808 * the top of the screen 1834 * the top of the screen
1809 */ 1835 */
1810int 1836void
1811rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1812{ 1838{
1813 long p = 0; 1839 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} 1840}
1829 1841
1830/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1831/* 1843/*
1832 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1833 * direction should be UP or DN 1845 * direction should be UP or DN
1834 */ 1846 */
1835int 1847bool
1836rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1837{ 1849{
1838 int n; 1850 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; 1851 direction == UP ? view_start - nlines
1851 view_start = max (n, 0); 1852 : view_start + nlines;
1852 }
1853 1853
1854 return scr_changeview (oldviewstart); 1854 return scr_changeview (new_view_start);
1855} 1855}
1856 1856
1857int 1857bool
1858rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1859{ 1859{
1860 clamp_it (new_view_start, top_row, 0);
1861
1860 if (view_start != oldviewstart) 1862 if (new_view_start == view_start)
1861 { 1863 return false;
1864
1865 num_scr += new_view_start - view_start;
1866 view_start = new_view_start;
1862 want_refresh = 1; 1867 want_refresh = 1;
1863 num_scr -= (view_start - oldviewstart);
1864 }
1865 1868
1866 return (int) (view_start - oldviewstart); 1869 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1867}
1868 1870
1869/* ------------------------------------------------------------------------- */ 1871 return true;
1872}
1873
1874#ifndef NO_BELL
1870void 1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1883/* ------------------------------------------------------------------------- */
1884void
1871rxvt_term::scr_bell () 1885rxvt_term::scr_bell () NOTHROW
1872{ 1886{
1873#ifndef NO_BELL 1887#ifndef NO_BELL
1874 1888
1875# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1876# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1877 if (options & Opt_mapAlert) 1891 if (OPTION (Opt_mapAlert))
1878# endif 1892# endif
1879 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1880# endif 1894# endif
1881 1895
1882 if (options & Opt_visualBell) 1896 if (OPTION (Opt_visualBell))
1883 { 1897 {
1884 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898 rvideo_bell = true;
1885 rxvt_usleep (VISUAL_BELL_DURATION); 1899 scr_rvideo_mode (rvideo_mode);
1886 scr_rvideo_mode (!rvideo); /* refresh also done */ 1900 display->flush ();
1901
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1887 } 1903 }
1888 else 1904 else
1889 XBell (display->display, 0); 1905 XBell (dpy, 0);
1890 1906
1891#endif 1907#endif
1892} 1908}
1893 1909
1894/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1895/* ARGSUSED */ 1911/* ARGSUSED */
1896void 1912void
1897rxvt_term::scr_printscreen (int fullhist) 1913rxvt_term::scr_printscreen (int fullhist) NOTHROW
1898{ 1914{
1899#ifdef PRINTPIPE 1915#ifdef PRINTPIPE
1900 int nrows, row_start; 1916 int nrows, row_start;
1901 FILE *fd; 1917 FILE *fd;
1902 1918
1903 if ((fd = popen_printer ()) == NULL) 1919 if ((fd = popen_printer ()) == NULL)
1904 return; 1920 return;
1905 1921
1906 if (fullhist) 1922 if (fullhist)
1907 { 1923 {
1908 nrows = nrow + nsaved; 1924 nrows = nrow - top_row;
1909 row_start = -nsaved; 1925 row_start = top_row;
1910 } 1926 }
1911 else 1927 else
1912 { 1928 {
1913 nrows = nrow; 1929 nrows = nrow;
1914 row_start = -view_start; 1930 row_start = view_start;
1915 } 1931 }
1916 1932
1917 wctomb (0, 0); 1933 wctomb (0, 0);
1918 1934
1919 for (int r1 = 0; r1 < nrows; r1++) 1935 for (int r1 = 0; r1 < nrows; r1++)
… …
1951 * Refresh the screen 1967 * Refresh the screen
1952 * drawn_text/drawn_rend contain the screen information before the update. 1968 * drawn_text/drawn_rend contain the screen information before the update.
1953 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1954 */ 1970 */
1955void 1971void
1956rxvt_term::scr_refresh (unsigned char refresh_type) 1972rxvt_term::scr_refresh () NOTHROW
1957{ 1973{
1958 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1959 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1960 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1961 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1962 int i; /* tmp */ 1978 int i; /* tmp */
1963#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
1964 rend_t cc1; /* store colours at cursor position (s) */ 1980 rend_t cc1; /* store colours at cursor position (s) */
1965#endif 1981#endif
1966 rend_t *crp; // cursor rendition pointer 1982 rend_t *crp; // cursor rendition pointer
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1967 1985
1968 want_refresh = 0; /* screen is current */ 1986 want_refresh = 0; /* screen is current */
1969 1987
1970 if (refresh_type == NO_REFRESH || !mapped) 1988 if (refresh_type == NO_REFRESH || !mapped)
1971 return; 1989 return;
1972 1990
1973 /* 1991 /*
1974 * A: set up vars 1992 * A: set up vars
1975 */ 1993 */
1976 must_clear = 0; 1994 have_bg = 0;
1977 refresh_count = 0; 1995 refresh_count = 0;
1978 1996
1979#if XPM_BACKGROUND 1997#if XPM_BACKGROUND
1980 must_clear |= bgPixmap.pixmap != None; 1998 have_bg |= bgPixmap.pixmap != None;
1981#endif 1999#endif
1982#if TRANSPARENT 2000#if TRANSPARENT
1983 must_clear |= (options & Opt_transparent) && am_transparent; 2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
1984#endif 2002#endif
1985 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1986 2004
1987 /* 2005 /*
1988 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
1992 /* 2010 /*
1993 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
1994 */ 2012 */
1995 { 2013 {
1996 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
1997 rend_t ccol1, /* Cursor colour */
1998 ccol2; /* Cursor colour2 */
1999 2015
2000 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
2001#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
2002 if (hidden_cursor) 2018 if (hidden_cursor)
2003 showcursor = 0; 2019 showcursor = 0;
… …
2010 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2011 col--; 2027 col--;
2012 2028
2013 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
2014 2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053
2015 if (showcursor && focus) 2054 if (showcursor && focus)
2016 { 2055 {
2017 if (options & Opt_cursorUnderline) 2056 if (OPTION (Opt_cursorUnderline))
2018 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2019 else 2058 else
2020 { 2059 {
2021 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
2022
2023#ifndef NO_CURSORCOLOR
2024 cc1 = *crp & (RS_fgMask | RS_bgMask);
2025 if (ISSET_PIXCOLOR (Color_cursor))
2026 ccol1 = Color_cursor;
2027 else
2028#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2029 ccol1 = GET_FGCOLOR (rstyle);
2030#else
2031 ccol1 = Color_fg;
2032#endif
2033 if (ISSET_PIXCOLOR (Color_cursor2))
2034 ccol2 = Color_cursor2;
2035 else
2036#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2037 ccol2 = GET_BGCOLOR (rstyle);
2038#else
2039 ccol2 = Color_bg;
2040#endif
2041 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2042 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2043#endif
2044 } 2063 }
2045 } 2064 }
2046 } 2065 }
2047 2066
2048 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
2049 setoldcursor = 0; 2068 setoldcursor = 0;
2050 if (ocrow != -1) 2069 if (ocrow != -1)
2051 { 2070 {
2052 if (screen.cur.row + view_start != ocrow 2071 if (screen.cur.row - view_start != ocrow
2053 || screen.cur.col != oldcursor.col) 2072 || screen.cur.col != oldcursor.col)
2054 { 2073 {
2055 if (ocrow < nrow 2074 if (ocrow < nrow
2056 && oldcursor.col < ncol) 2075 && oldcursor.col < ncol)
2057 drawn[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2076 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2058 2077
2059 if (focus || !showcursor) 2078 if (focus || !showcursor)
2060 oldcursor.row = -1; 2079 oldcursor.row = -1;
2061 else 2080 else
2062 setoldcursor = 1; 2081 setoldcursor = 1;
… …
2065 else if (!focus) 2084 else if (!focus)
2066 setoldcursor = 1; 2085 setoldcursor = 1;
2067 2086
2068 if (setoldcursor) 2087 if (setoldcursor)
2069 { 2088 {
2070 if (screen.cur.row + view_start >= nrow) 2089 if (screen.cur.row - view_start >= nrow)
2071 oldcursor.row = -1; 2090 oldcursor.row = -1;
2072 else 2091 else
2073 { 2092 {
2074 oldcursor.row = screen.cur.row + view_start; 2093 oldcursor.row = screen.cur.row - view_start;
2075 oldcursor.col = screen.cur.col; 2094 oldcursor.col = screen.cur.col;
2076 } 2095 }
2077 } 2096 }
2078 } 2097 }
2079 2098
2099 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2080#if ENABLE_OVERLAY 2100#if ENABLE_OVERLAY
2081 scr_swap_overlay (); 2101 scr_swap_overlay ();
2082#endif 2102#endif
2083 2103
2084#ifndef NO_SLOW_LINK_SUPPORT 2104#ifndef NO_SLOW_LINK_SUPPORT
2085 /* 2105 /*
2086 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2087 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2088 */ 2108 */
2089 i = num_scr;
2090 if (!display->is_local 2109 if (!display->is_local
2091 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2092 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2093 { 2112 {
2094 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2095 int j; 2115 int j;
2096 int len, wlen; 2116 int len, wlen;
2117 dLocal (int, num_scr);
2097 2118
2098 j = nrow; 2119 j = nrow;
2099 wlen = len = -1; 2120 wlen = len = -1;
2100 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2101 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2102 { 2124 {
2103 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2104 { 2126 {
2105 line_t s = ROW(row - view_start); 2127 line_t s = ROW(view_start + row);
2106 line_t d = drawn[row]; 2128 line_t d = drawn_buf[row];
2107 line_t d2 = drawn[row + i]; 2129 line_t d2 = drawn_buf[row + i];
2108 2130
2109 for (nits = 0, col = ncol; col--; ) 2131 for (nits = 0, col = ncol; col--; )
2110 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2132 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2111 nits--; 2133 nits--;
2112 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col]) 2134 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
… …
2126 wlen = row; 2148 wlen = row;
2127 continue; 2149 continue;
2128 } 2150 }
2129 } 2151 }
2130 2152
2131 if (len != -1) 2153 if (len >= 0)
2132 { 2154 {
2133 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2134 if (wlen < len) 2156 if (wlen < len)
2135 SWAP_IT (wlen, len, int); 2157 ::swap (wlen, len);
2136 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2137 XCopyArea (display->display, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2138 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2139 (unsigned int)TermWin_TotalWidth (), 2164 (unsigned int)this->width,
2140 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2141 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2142 len = -1; 2169 len = -1;
2143 } 2170 }
2144 } 2171 }
2145 } 2172 }
2146#endif 2173#endif
… …
2148 /* 2175 /*
2149 * E: main pass across every character 2176 * E: main pass across every character
2150 */ 2177 */
2151 for (row = 0; row < nrow; row++) 2178 for (row = 0; row < nrow; row++)
2152 { 2179 {
2153 text_t *stp = ROW(row - view_start).t; 2180 text_t *stp = ROW(view_start + row).t;
2154 rend_t *srp = ROW(row - view_start).r; 2181 rend_t *srp = ROW(view_start + row).r;
2155 text_t *dtp = drawn[row].t; 2182 text_t *dtp = drawn_buf[row].t;
2156 rend_t *drp = drawn[row].r; 2183 rend_t *drp = drawn_buf[row].r;
2157 2184
2158 /* 2185 /*
2159 * E2: OK, now the real pass 2186 * E2: OK, now the real pass
2160 */ 2187 */
2161 int ypixel = (int)Row2Pixel (row); 2188 int ypixel = (int)Row2Pixel (row);
… …
2202 count++; 2229 count++;
2203 2230
2204 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2205 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2206 { 2233 {
2207 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2208 break; 2235 break;
2209 2236
2210 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2211 drp[col] = rend; 2238 drp[col] = rend;
2212 i = 0; 2239 i = 0;
2213 } 2240 }
2214 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2215 break; 2242 break;
2216 } 2243 }
2217 2244
2218 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2219 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2223 count++, i--; 2250 count++, i--;
2224 2251
2225 /* 2252 /*
2226 * Determine the attributes for the string 2253 * Determine the attributes for the string
2227 */ 2254 */
2228 int fore = GET_FGCOLOR (rend); // desired foreground 2255 int fore = fgcolor_of (rend); // desired foreground
2229 int back = GET_BGCOLOR (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2230 2257
2231 // only do special processing if any attributes are set, which is rare 2258 // 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)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2233 { 2260 {
2234#if ENABLE_STYLES
2235 // force redraw after "careful" characters to avoid pixel droppings
2236 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2237 drp[col + 1] = ~srp[col + 1];
2238
2239 // include previous careful character(s) if possible, looks nicer (best effort...)
2240 while (text > stp
2241 && srp[text - stp - 1] & RS_Careful
2242 && RS_SAME (rend, srp[text - stp - 1]))
2243 text--, count++, xpixel -= fwidth;
2244#endif
2245
2246 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2247 2262
2248#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2249 if (rend & RS_Bold 2264 if (rend & RS_Bold
2250 && fore == Color_fg) 2265 && fore == Color_fg)
… …
2266 else 2281 else
2267 invert = !invert; 2282 invert = !invert;
2268# endif 2283# endif
2269 } 2284 }
2270 2285
2271 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2272 fore = Color_UL; 2287 fore = Color_UL;
2273#endif 2288#endif
2274 2289
2275 if (invert) 2290 if (invert)
2276 { 2291 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2277 SWAP_IT (fore, back, int); 2298 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2278 2303
2279#ifndef NO_BOLD_UNDERLINE_REVERSE 2304#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2280 if (ISSET_PIXCOLOR (Color_RV)) 2306 if (ISSET_PIXCOLOR (Color_RV))
2281 back = Color_RV; 2307 back = Color_RV;
2282 2308# endif
2283 if (fore == back) 2309 if (fore == back)
2284 { 2310 {
2285 fore = Color_bg; 2311 fore = Color_bg;
2286 back = Color_fg; 2312 back = Color_fg;
2287 } 2313 }
… …
2298 } 2324 }
2299 else if (hidden_text) 2325 else if (hidden_text)
2300 fore = back; 2326 fore = back;
2301 } 2327 }
2302#endif 2328#endif
2329
2330#if ENABLE_STYLES
2331 // "careful" (too wide) character handling
2332
2333 // include previous careful character(s) if possible, looks nicer (best effort...)
2334 while (text > stp
2335 && srp[text - stp - 1] & RS_Careful
2336 && RS_SAME (rend, srp[text - stp - 1]))
2337 text--, count++, xpixel -= fwidth;
2338
2339 // force redraw after "careful" characters to avoid pixel droppings
2340 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2341 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2342
2343 // force redraw before "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2345 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2346#endif
2303 } 2347 }
2304 2348
2305 /* 2349 /*
2306 * Actually do the drawing of the string here 2350 * Actually do the drawing of the string here
2307 */ 2351 */
2308 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2309 2353
2310 if (back == fore) 2354 if (back == fore)
2311 font->clear_rect (*drawable, xpixel, ypixel, 2355 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2312 fwidth * count, fheight,
2313 back);
2314 else if (back == Color_bg) 2356 else if (back == Color_bg && have_bg)
2315 { 2357 {
2316 if (must_clear) 2358 // this is very ugly, maybe push it into ->draw?
2317 {
2318 CLEAR_CHARS (xpixel, ypixel, count);
2319 2359
2320 for (i = 0; i < count; i++) /* don't draw empty strings */ 2360 for (i = 0; i < count; i++) /* don't draw empty strings */
2321 if (text[i] != ' ') 2361 if (text[i] != ' ')
2322 { 2362 {
2323 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2324 break; 2364 goto did_clear;
2325 }
2326 } 2365 }
2327 else 2366
2328 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2368 did_clear: ;
2329 } 2369 }
2330 else 2370 else
2331 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2332 2372
2333 if (rend & RS_Uline && font->descent > 1 && fore != back) 2373 if (rend & RS_Uline && font->descent > 1 && fore != back)
2334 { 2374 {
2335#if ENABLE_FRILLS 2375#if ENABLE_FRILLS
2336 if (ISSET_PIXCOLOR (Color_underline)) 2376 if (ISSET_PIXCOLOR (Color_underline))
2337 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2377 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2338 else 2378 else
2339#endif 2379#endif
2340 XSetForeground (display->display, gc, pix_colors[fore]); 2380 XSetForeground (dpy, gc, pix_colors[fore]);
2341 2381
2342 XDrawLine (display->display, drawBuffer, gc, 2382 XDrawLine (dpy, drawBuffer, gc,
2343 xpixel, ypixel + font->ascent + 1, 2383 xpixel, ypixel + font->ascent + 1,
2344 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2345 } 2385 }
2346 } /* for (col....) */ 2386 } /* for (col....) */
2347 } /* for (row....) */ 2387 } /* for (row....) */
2348 2388
2349#if ENABLE_OVERLAY 2389#if ENABLE_OVERLAY
2350 scr_swap_overlay (); 2390 scr_swap_overlay ();
2351#endif 2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2352 2393
2353 /* 2394 /*
2354 * G: cleanup cursor and display outline cursor if necessary 2395 * G: cleanup cursor and display outline cursor if necessary
2355 */ 2396 */
2356 if (showcursor) 2397 if (showcursor)
2357 { 2398 {
2358 if (focus) 2399 if (focus)
2359 { 2400 {
2360 if (options & Opt_cursorUnderline) 2401 if (OPTION (Opt_cursorUnderline))
2361 *crp ^= RS_Uline; 2402 *crp ^= RS_Uline;
2362 else 2403 else
2363 { 2404 {
2364 *crp ^= RS_RVid; 2405 *crp ^= RS_RVid;
2365#ifndef NO_CURSORCOLOR 2406#ifndef NO_CURSORCOLOR
… …
2374 2415
2375 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2416 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2376 col--; 2417 col--;
2377 2418
2378 while (col + cursorwidth < ncol 2419 while (col + cursorwidth < ncol
2379 && drawn[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2420 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2380 cursorwidth++; 2421 cursorwidth++;
2381 2422
2382#ifndef NO_CURSORCOLOR 2423#ifndef NO_CURSORCOLOR
2383 if (ISSET_PIXCOLOR (Color_cursor)) 2424 if (ISSET_PIXCOLOR (Color_cursor))
2384 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else
2385#endif 2427#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]);
2386 2429
2387 XDrawRectangle (display->display, drawBuffer, gc, 2430 XDrawRectangle (dpy, drawBuffer, gc,
2388 Col2Pixel (col), 2431 Col2Pixel (col),
2389 Row2Pixel (oldcursor.row), 2432 Row2Pixel (oldcursor.row),
2390 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2433 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2391 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2392 } 2435 }
… …
2395 /* 2438 /*
2396 * H: cleanup selection 2439 * H: cleanup selection
2397 */ 2440 */
2398 scr_reverse_selection (); 2441 scr_reverse_selection ();
2399 2442
2400 if (refresh_type & SMOOTH_REFRESH)
2401 XFlush (display->display);
2402
2403 num_scr = 0; 2443 num_scr = 0;
2404 num_scr_allow = 1; 2444 num_scr_allow = 1;
2405} 2445}
2406 2446
2407void 2447void
2408rxvt_term::scr_remap_chars (const line_t &l) 2448rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2409{ 2449{
2410 if (!l.t) 2450 if (!l.t)
2411 return; 2451 return;
2412 2452
2453 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2454
2413 for (int i = ncol; i--; ) 2455 for (int i = ncol; i--; )
2414 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2456 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2415} 2457}
2416 2458
2417void 2459void
2418rxvt_term::scr_remap_chars () 2460rxvt_term::scr_remap_chars () NOTHROW
2419{ 2461{
2420 for (int i = total_rows; i--; ) 2462 for (int i = total_rows; i--; )
2421 scr_remap_chars (save[i]); 2463 scr_remap_chars (row_buf [i]);
2422 2464
2423 for (int i = nrow; i--; ) 2465 for (int i = nrow; i--; )
2424 { 2466 {
2425 scr_remap_chars (drawn[i]); 2467 scr_remap_chars (drawn_buf [i]);
2426 scr_remap_chars (swap_save[i]); 2468 scr_remap_chars (swap_buf [i]);
2427 } 2469 }
2428} 2470}
2429 2471
2430void 2472void
2431rxvt_term::scr_recolour () 2473rxvt_term::scr_recolour () NOTHROW
2432{ 2474{
2433 if (1 2475 if (1
2434#if TRANSPARENT 2476#if TRANSPARENT
2435 && !am_transparent 2477 && !am_transparent
2436#endif 2478#endif
2437#if XPM_BACKGROUND 2479#if XPM_BACKGROUND
2438 && !bgPixmap.pixmap 2480 && !bgPixmap.pixmap
2439#endif 2481#endif
2440 ) 2482 )
2441 { 2483 {
2442 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2443 XClearWindow (display->display, parent[0]); 2485 XClearWindow (dpy, parent[0]);
2444 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2486 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2445#if HAVE_SCROLLBARS 2487#if HAVE_SCROLLBARS
2446 if (scrollBar.win) 2488 if (scrollBar.win)
2447 { 2489 {
2448 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2490 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2449 scrollBar.setIdle (); 2491 scrollBar.setIdle ();
2450 scrollbar_show (0); 2492 scrollbar_show (0);
2451 } 2493 }
2452#endif 2494#endif
2453 } 2495 }
… …
2457 want_refresh = 1; 2499 want_refresh = 1;
2458} 2500}
2459 2501
2460/* ------------------------------------------------------------------------- */ 2502/* ------------------------------------------------------------------------- */
2461void 2503void
2462rxvt_term::scr_clear (bool really) 2504rxvt_term::scr_clear (bool really) NOTHROW
2463{ 2505{
2464 if (!mapped) 2506 if (!mapped)
2465 return; 2507 return;
2466 2508
2467 num_scr_allow = 0; 2509 num_scr_allow = 0;
2468 want_refresh = 1; 2510 want_refresh = 1;
2469 2511
2470 if (really) 2512 if (really)
2471 XClearWindow (display->display, vt); 2513 XClearWindow (dpy, vt);
2472} 2514}
2473 2515
2474/* ------------------------------------------------------------------------- */
2475void 2516void
2517rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2518{
2519 int view_end = view_start + nrow;
2520 int row, col;
2521
2522 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2523 {
2524 text_t *stp = ROW(row).t;
2525 rend_t *srp = ROW(row).r;
2526
2527 for (col = beg_col; col < end_col; col++)
2528 srp[col] ^= rstyle1;
2529
2530 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2531 srp[col] ^= rstyle2;
2532
2533 if (++col < end_col)
2534 srp[col] ^= rstyle2;
2535 }
2536}
2537
2538void
2539rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2540{
2541 int view_end = view_start + nrow;
2542 int row, col;
2543
2544 if (beg_row >= view_start)
2545 {
2546 col = beg_col;
2547 row = beg_row;
2548 }
2549 else
2550 {
2551 col = 0;
2552 row = view_start;
2553 }
2554
2555 for (; row < min (end_row, view_end); row++, col = 0)
2556 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2557 srp[col] ^= rstyle;
2558
2559 if (row == end_row)
2560 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2561 srp[col] ^= rstyle;
2562}
2563
2564/* ------------------------------------------------------------------------- */
2565void
2476rxvt_term::scr_reverse_selection () 2566rxvt_term::scr_reverse_selection () NOTHROW
2477{ 2567{
2478 if (selection.op 2568 if (selection.op
2479 && current_screen == selection.screen 2569 && current_screen == selection.screen
2480 && selection.end.row >= -view_start) 2570 && selection.end.row >= view_start)
2481 { 2571 {
2482 int view_end = -view_start + nrow; 2572#if !ENABLE_MINIMAL
2483 int row, col;
2484
2485#if ENABLE_FRILLS
2486 if (selection.rect) 2573 if (selection.rect)
2487 { 2574 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++) 2575 selection.end.row, selection.end.col,
2489 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2576 RS_RVid, RS_RVid | RS_Uline);
2490 srp[col] ^= RS_RVid;
2491 }
2492 else 2577 else
2493#endif 2578#endif
2494 { 2579 scr_xor_span (selection.beg.row, selection.beg.col,
2495 if (selection.beg.row >= -view_start) 2580 selection.end.row, selection.end.col,
2496 { 2581 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 } 2582 }
2515} 2583}
2516 2584
2517/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2518/* 2586/*
2519 * Dump the whole scrollback and screen to the passed filedescriptor. The 2587 * Dump the whole scrollback and screen to the passed filedescriptor. The
2520 * invoking routine must close the fd. 2588 * invoking routine must close the fd.
2521 */ 2589 */
2522#if 0 2590#if 0
2523void 2591void
2524rxvt_term::scr_dump (int fd) 2592rxvt_term::scr_dump (int fd) NOTHROW
2525{ 2593{
2526 int row, wrote; 2594 int row, wrote;
2527 unsigned int width, towrite; 2595 unsigned int width, towrite;
2528 char r1[] = "\n"; 2596 char r1[] = "\n";
2529 2597
2530 for (row = saveLines - nsaved; 2598 for (row = saveLines - nsaved;
2531 row < saveLines + nrow - 1; row++) 2599 row < saveLines + nrow - 1; row++)
2532 { 2600 {
2533 width = save[row].l >= 0 ? save[row].l 2601 width = row_buf[row].l >= 0 ? row_buf[row].l
2534 : ncol; 2602 : ncol;
2535 for (towrite = width; towrite; towrite -= wrote) 2603 for (towrite = width; towrite; towrite -= wrote)
2536 { 2604 {
2537 wrote = write (fd, & (save[row].t[width - towrite]), 2605 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2538 towrite); 2606 towrite);
2539 if (wrote < 0) 2607 if (wrote < 0)
2540 return; /* XXX: death, no report */ 2608 return; /* XXX: death, no report */
2541 } 2609 }
2542 if (save[row].l >= 0) 2610 if (row_buf[row].l >= 0)
2543 if (write (fd, r1, 1) <= 0) 2611 if (write (fd, r1, 1) <= 0)
2544 return; /* XXX: death, no report */ 2612 return; /* XXX: death, no report */
2545 } 2613 }
2546} 2614}
2547#endif 2615#endif
2548 2616
2549/* ------------------------------------------------------------------------- * 2617/* ------------------------------------------------------------------------- *
2550 * CHARACTER SELECTION * 2618 * CHARACTER SELECTION *
2551 * ------------------------------------------------------------------------- */ 2619 * ------------------------------------------------------------------------- */
2552void 2620void
2553rxvt_term::selection_check (int check_more) 2621rxvt_term::selection_check (int check_more) NOTHROW
2554{ 2622{
2555 row_col_t pos; 2623 row_col_t pos;
2556 2624
2557 if (!selection.op) 2625 if (!selection.op)
2558 return; 2626 return;
2559 2627
2560 pos.row = pos.col = 0; 2628 pos.row = pos.col = 0;
2561 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2629 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2562 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2630 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2563 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2631 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2564 || (check_more == 1 2632 || (check_more == 1
2565 && current_screen == selection.screen 2633 && current_screen == selection.screen
2566 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2634 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2567 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2635 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2568 || (check_more == 2 2636 || (check_more == 2
… …
2579/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2580/* 2648/*
2581 * Paste a selection direct to the command fd 2649 * Paste a selection direct to the command fd
2582 */ 2650 */
2583void 2651void
2584rxvt_term::paste (unsigned char *data, unsigned int len) 2652rxvt_term::paste (char *data, unsigned int len) NOTHROW
2585{ 2653{
2586 /* convert normal newline chars into common keyboard Return key sequence */ 2654 /* convert normal newline chars into common keyboard Return key sequence */
2587 for (unsigned int i = 0; i < len; i++) 2655 for (unsigned int i = 0; i < len; i++)
2588 if (data[i] == C0_LF) 2656 if (data[i] == C0_LF)
2589 data[i] = C0_CR; 2657 data[i] = C0_CR;
… …
2595/* 2663/*
2596 * Respond to a notification that a primary selection has been sent 2664 * Respond to a notification that a primary selection has been sent
2597 * EXT: SelectionNotify 2665 * EXT: SelectionNotify
2598 */ 2666 */
2599void 2667void
2600rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2668rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2601{ 2669{
2602 if (prop == None) /* check for failed XConvertSelection */ 2670 if (prop == None) /* check for failed XConvertSelection */
2603 { 2671 {
2604 if ((selection_type & Sel_CompoundText)) 2672 if ((selection_type & Sel_CompoundText))
2605 { 2673 {
… …
2625 } 2693 }
2626 2694
2627 unsigned long bytes_after; 2695 unsigned long bytes_after;
2628 XTextProperty ct; 2696 XTextProperty ct;
2629 2697
2630 if (XGetWindowProperty (display->display, win, prop, 2698 if (XGetWindowProperty (dpy, win, prop,
2631 0, PROP_SIZE / 4, 2699 0, PROP_SIZE / 4,
2632 delete_prop, AnyPropertyType, 2700 delete_prop, AnyPropertyType,
2633 &ct.encoding, &ct.format, 2701 &ct.encoding, &ct.format,
2634 &ct.nitems, &bytes_after, 2702 &ct.nitems, &bytes_after,
2635 &ct.value) != Success) 2703 &ct.value) != Success)
… …
2644 if (bytes_after) 2712 if (bytes_after)
2645 { 2713 {
2646 // fetch and append remaining data 2714 // fetch and append remaining data
2647 XTextProperty ct2; 2715 XTextProperty ct2;
2648 2716
2649 if (XGetWindowProperty (display->display, win, prop, 2717 if (XGetWindowProperty (dpy, win, prop,
2650 ct.nitems / 4, (bytes_after + 3) / 4, 2718 ct.nitems / 4, (bytes_after + 3) / 4,
2651 delete_prop, AnyPropertyType, 2719 delete_prop, AnyPropertyType,
2652 &ct2.encoding, &ct2.format, 2720 &ct2.encoding, &ct2.format,
2653 &ct2.nitems, &bytes_after, 2721 &ct2.nitems, &bytes_after,
2654 &ct2.value) != Success) 2722 &ct2.value) != Success)
… …
2667 2735
2668 if (ct.encoding == xa[XA_INCR]) 2736 if (ct.encoding == xa[XA_INCR])
2669 { 2737 {
2670 // INCR selection, start handshake 2738 // INCR selection, start handshake
2671 if (!delete_prop) 2739 if (!delete_prop)
2672 XDeleteProperty (display->display, win, prop); 2740 XDeleteProperty (dpy, win, prop);
2673 2741
2674 selection_wait = Sel_incr; 2742 selection_wait = Sel_incr;
2675 incr_buf_fill = 0; 2743 incr_buf_fill = 0;
2676 incr_ev.start (NOW + 10); 2744 incr_ev.start (NOW + 10);
2677 2745
… …
2724 } 2792 }
2725 2793
2726 char **cl; 2794 char **cl;
2727 int cr; 2795 int cr;
2728 2796
2729#if ENABLE_FRILLS 2797#if !ENABLE_MINIMAL
2730 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2798 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2731 // so recode it manually 2799 // so recode it manually
2732 if (ct.encoding == xa[XA_UTF8_STRING]) 2800 if (ct.encoding == xa[XA_UTF8_STRING])
2733 { 2801 {
2734 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2802 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2735 char *s = rxvt_wcstombs (w); 2803 char *s = rxvt_wcstombs (w);
2736 free (w); 2804 free (w);
2737 // TODO: strlen == only the first element will be converted. well... 2805 // TODO: strlen == only the first element will be converted. well...
2738 paste ((unsigned char *)s, strlen (s)); 2806 paste (s, strlen (s));
2739 free (s); 2807 free (s);
2740 } 2808 }
2741 else 2809 else
2742#endif 2810#endif
2743 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2811 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2744 && cl) 2812 && cl)
2745 { 2813 {
2746 for (int i = 0; i < cr; i++) 2814 for (int i = 0; i < cr; i++)
2747 paste ((unsigned char *)cl[i], strlen (cl[i])); 2815 paste (cl[i], strlen (cl[i]));
2748 2816
2749 XFreeStringList (cl); 2817 XFreeStringList (cl);
2750 } 2818 }
2751 else 2819 else
2752 paste (ct.value, ct.nitems); // paste raw 2820 paste ((char *)ct.value, ct.nitems); // paste raw
2753 2821
2754bailout: 2822bailout:
2755 XFree (ct.value); 2823 XFree (ct.value);
2756 2824
2757 if (selection_wait == Sel_normal) 2825 if (selection_wait == Sel_normal)
2758 selection_wait = Sel_none; 2826 selection_wait = Sel_none;
2759} 2827}
2760 2828
2761void 2829void
2762rxvt_term::incr_cb (time_watcher &w) 2830rxvt_term::incr_cb (time_watcher &w) NOTHROW
2763{ 2831{
2764 selection_wait = Sel_none; 2832 selection_wait = Sel_none;
2765 2833
2766 incr_buf_size = 0; 2834 incr_buf_size = 0;
2767 free (incr_buf); 2835 free (incr_buf);
2768 2836
2769 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2837 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2770} 2838}
2771 2839
2772void 2840void
2773rxvt_term::selection_property (Window win, Atom prop) 2841rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2774{ 2842{
2775 if (prop == None || selection_wait != Sel_incr) 2843 if (prop == None || selection_wait != Sel_incr)
2776 return; 2844 return;
2777 2845
2778 selection_paste (win, prop, true); 2846 selection_paste (win, prop, true);
… …
2787 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2855 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2788 * will auto fallback to CUT_BUFFER0 2856 * will auto fallback to CUT_BUFFER0
2789 * EXT: button 2 release 2857 * EXT: button 2 release
2790 */ 2858 */
2791void 2859void
2792rxvt_term::selection_request (Time tm, int x, int y) 2860rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2793{ 2861{
2794 if (x < 0 || x >= width || y < 0 || y >= height) 2862 if (selection.text && selnum == Sel_Primary)
2795 return; /* outside window */
2796
2797 if (selection.text)
2798 { /* internal selection */ 2863 { /* internal selection */
2799 char *str = rxvt_wcstombs (selection.text, selection.len); 2864 char *str = rxvt_wcstombs (selection.text, selection.len);
2800 paste ((unsigned char *)str, strlen (str)); 2865 paste (str, strlen (str));
2801 free (str); 2866 free (str);
2802 return; 2867 return;
2803 } 2868 }
2804 else 2869 else
2805 { 2870 {
2806 int i;
2807
2808 selection_request_time = tm; 2871 selection_request_time = tm;
2809 selection_wait = Sel_normal; 2872 selection_wait = Sel_normal;
2810 2873
2811 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2812 {
2813#if X_HAVE_UTF8_STRING 2874#if X_HAVE_UTF8_STRING
2814 selection_type = Sel_UTF8String; 2875 selection_type = Sel_UTF8String;
2815 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2876 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2816 return; 2877 return;
2817#else 2878#else
2818 selection_type = Sel_CompoundText; 2879 selection_type = Sel_CompoundText;
2819 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2880 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2820 return; 2881 return;
2821#endif 2882#endif
2822 }
2823 } 2883 }
2824 2884
2825 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2885 selection_wait = Sel_none; /* don't loop in selection_paste () */
2826 selection_paste (display->root, XA_CUT_BUFFER0, false); 2886 selection_paste (display->root, XA_CUT_BUFFER0, false);
2827} 2887}
2828 2888
2829int 2889int
2830rxvt_term::selection_request_other (Atom target, int selnum) 2890rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2831{ 2891{
2832 Atom sel; 2892 Atom sel;
2833 2893
2834 selection_type |= selnum; 2894 selection_type |= selnum;
2835 2895
… …
2838 else if (selnum == Sel_Secondary) 2898 else if (selnum == Sel_Secondary)
2839 sel = XA_SECONDARY; 2899 sel = XA_SECONDARY;
2840 else 2900 else
2841 sel = xa[XA_CLIPBOARD]; 2901 sel = xa[XA_CLIPBOARD];
2842 2902
2843 if (XGetSelectionOwner (display->display, sel) != None) 2903 if (XGetSelectionOwner (dpy, sel) != None)
2844 { 2904 {
2845 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2905 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2846 vt, selection_request_time); 2906 vt, selection_request_time);
2847 return 1; 2907 return 1;
2848 } 2908 }
2849 2909
2850 return 0; 2910 return 0;
… …
2854/* 2914/*
2855 * Clear all selected text 2915 * Clear all selected text
2856 * EXT: SelectionClear 2916 * EXT: SelectionClear
2857 */ 2917 */
2858void 2918void
2859rxvt_term::selection_clear () 2919rxvt_term::selection_clear () NOTHROW
2860{ 2920{
2861 want_refresh = 1; 2921 want_refresh = 1;
2862 free (selection.text); 2922 free (selection.text);
2863 selection.text = NULL; 2923 selection.text = NULL;
2864 selection.len = 0; 2924 selection.len = 0;
… …
2897 selection.op = SELECTION_DONE; 2957 selection.op = SELECTION_DONE;
2898 2958
2899 if (selection.clicks == 4) 2959 if (selection.clicks == 4)
2900 return; /* nothing selected, go away */ 2960 return; /* nothing selected, go away */
2901 2961
2962 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2963 return;
2964
2902 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2965 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2903 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2966 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2904 2967
2905 int ofs = 0; 2968 int ofs = 0;
2906 int extra = 0; 2969 int extra = 0;
… …
2910 2973
2911 int end_col; 2974 int end_col;
2912 2975
2913 for (; row <= selection.end.row; row++, col = 0) 2976 for (; row <= selection.end.row; row++, col = 0)
2914 { 2977 {
2915#if ENABLE_FRILLS 2978#if !ENABLE_MINIMAL
2916 if (selection.rect) 2979 if (selection.rect)
2917 { 2980 {
2918 col = selection.beg.col; 2981 col = selection.beg.col;
2919 end_col = ncol + 1; 2982 end_col = ncol + 1;
2920 } 2983 }
2921 else 2984 else
2922#endif 2985#endif
2923 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2986 end_col = ROW(row).l;
2924 2987
2925 col = max (col, 0); 2988 col = max (col, 0);
2926 2989
2927 if (row == selection.end.row || selection.rect) 2990 if (row == selection.end.row
2991#if !ENABLE_MINIMAL
2992 || selection.rect
2993#endif
2994 )
2928 end_col = min (end_col, selection.end.col); 2995 min_it (end_col, selection.end.col);
2929 2996
2930 t = ROW(row).t + col; 2997 t = ROW(row).t + col;
2998
2931 for (; col < end_col; col++) 2999 for (; col < end_col; col++)
2932 { 3000 {
2933 if (*t == NOCHAR) 3001 if (*t == NOCHAR)
2934 t++; 3002 t++;
2935#if ENABLE_COMBINING 3003#if ENABLE_COMBINING
… …
2951#endif 3019#endif
2952 else 3020 else
2953 new_selection_text[ofs++] = *t++; 3021 new_selection_text[ofs++] = *t++;
2954 } 3022 }
2955 3023
3024#if !ENABLE_MINIMAL
3025 if (selection.rect)
3026 {
3027 while (ofs
3028 && new_selection_text[ofs - 1] != C0_LF
3029 && unicode::is_space (new_selection_text[ofs - 1]))
3030 --ofs;
3031
3032 new_selection_text[ofs++] = C0_LF;
3033 }
3034 else
3035#endif
2956 if (!ROW(row).is_longer () && row != selection.end.row) 3036 if (!ROW(row).is_longer () && row != selection.end.row)
2957 new_selection_text[ofs++] = C0_LF; 3037 new_selection_text[ofs++] = C0_LF;
2958 } 3038 }
2959 3039
2960 if (end_col != selection.end.col) 3040 if (end_col != selection.end.col)
2961 new_selection_text[ofs++] = C0_LF; 3041 new_selection_text[ofs++] = C0_LF;
2962 3042
… …
2972 3052
2973 // we usually allocate much more than necessary, so realloc it smaller again 3053 // we usually allocate much more than necessary, so realloc it smaller again
2974 selection.len = ofs; 3054 selection.len = ofs;
2975 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3055 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2976 3056
3057 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3058 return;
3059
3060 selection_grab (tm);
3061}
3062
3063bool
3064rxvt_term::selection_grab (Time tm) NOTHROW
3065{
3066 selection_time = tm;
3067
2977 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3068 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2978 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3069 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3070 {
2979 display->set_selection_owner (this); 3071 display->set_selection_owner (this);
3072 return true;
3073 }
2980 else 3074 else
2981 rxvt_warn ("can't get primary selection, ignoring.\n"); 3075 {
3076 selection_clear ();
3077 return false;
3078 }
2982 3079
2983#if 0 3080#if 0
2984 XTextProperty ct; 3081 XTextProperty ct;
2985 3082
2986 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3083 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
2987 { 3084 {
2988 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3085 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2989 XFree (ct.value); 3086 XFree (ct.value);
2990 } 3087 }
2991#endif 3088#endif
2992
2993 selection_time = tm;
2994} 3089}
2995 3090
2996/* ------------------------------------------------------------------------- */ 3091/* ------------------------------------------------------------------------- */
2997/* 3092/*
2998 * Mark or select text based upon number of clicks: 1, 2, or 3 3093 * Mark or select text based upon number of clicks: 1, 2, or 3
2999 * EXT: button 1 press 3094 * EXT: button 1 press
3000 */ 3095 */
3001void 3096void
3002rxvt_term::selection_click (int clicks, int x, int y) 3097rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3003{ 3098{
3004 clicks = ((clicks - 1) % 3) + 1; 3099 clicks = ((clicks - 1) % 3) + 1;
3005 selection.clicks = clicks; /* save clicks so extend will work */ 3100 selection.clicks = clicks; /* save clicks so extend will work */
3006 3101
3102 if (clicks == 2 && !selection.rect
3103 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3104 {
3105 MEvent.clicks = 1; // what a mess
3106 selection.screen = current_screen;
3107 selection.op = SELECTION_CONT;
3108 return;
3109 }
3110
3007 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3111 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3008 3112
3009 if (clicks == 2 || clicks == 3) 3113 if (clicks == 2 || clicks == 3)
3010 selection_extend_colrow (selection.mark.col, 3114 selection_extend_colrow (selection.mark.col,
3011 selection.mark.row + view_start, 3115 selection.mark.row - view_start,
3012 0, /* button 3 */ 3116 0, /* button 3 */
3013 1, /* button press */ 3117 1, /* button press */
3014 0); /* click change */ 3118 0); /* click change */
3015} 3119}
3016 3120
3017/* ------------------------------------------------------------------------- */ 3121/* ------------------------------------------------------------------------- */
3018/* 3122/*
3019 * Mark a selection at the specified col/row 3123 * Mark a selection at the specified col/row
3020 */ 3124 */
3021void 3125void
3022rxvt_term::selection_start_colrow (int col, int row) 3126rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3023{ 3127{
3024 want_refresh = 1; 3128 want_refresh = 1;
3025 3129
3026 selection.mark.row = row - view_start; 3130 selection.mark.row = row + view_start;
3027 selection.mark.col = col; 3131 selection.mark.col = col;
3028 3132
3029 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3133 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3030 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3134 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3031 3135
3032 while (selection.mark.col > 0 3136 while (selection.mark.col > 0
3033 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3137 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3034 --selection.mark.col; 3138 --selection.mark.col;
… …
3053#define DELIMIT_TEXT(x) \ 3157#define DELIMIT_TEXT(x) \
3054 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3158 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3055#define DELIMIT_REND(x) 1 3159#define DELIMIT_REND(x) 1
3056 3160
3057void 3161void
3058rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3162rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3059{ 3163{
3060 int col, row, dirnadd, tcol, trow, w1, w2; 3164 int col, row, dirnadd, tcol, trow, w1, w2;
3061 row_col_t bound; 3165 row_col_t bound;
3062 text_t *stp; 3166 text_t *stp;
3063 rend_t *srp; 3167 rend_t *srp;
3064 3168
3065 if (dirn == UP) 3169 if (dirn == UP)
3066 { 3170 {
3067 bound.row = - nsaved - 1; 3171 bound.row = top_row - 1;
3068 bound.col = 0; 3172 bound.col = 0;
3069 dirnadd = -1; 3173 dirnadd = -1;
3070 } 3174 }
3071 else 3175 else
3072 { 3176 {
… …
3120 } 3224 }
3121 } 3225 }
3122 break; 3226 break;
3123 } 3227 }
3124 3228
3125Old_Word_Selection_You_Die:
3126 if (dirn == DN) 3229 if (dirn == DN)
3127 col++; /* put us on one past the end */ 3230 col++; /* put us on one past the end */
3128 3231
3129 /* Poke the values back in */ 3232 /* Poke the values back in */
3130 ret->row = row; 3233 ret->row = row;
… …
3138 * flag == 0 ==> button 1 3241 * flag == 0 ==> button 1
3139 * flag == 1 ==> button 3 press 3242 * flag == 1 ==> button 3 press
3140 * flag == 2 ==> button 3 motion 3243 * flag == 2 ==> button 3 motion
3141 */ 3244 */
3142void 3245void
3143rxvt_term::selection_extend (int x, int y, int flag) 3246rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3144{ 3247{
3145 int col = clamp (Pixel2Col (x), 0, ncol); 3248 int col = clamp (Pixel2Col (x), 0, ncol);
3146 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3249 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3147 3250
3148 /* 3251 /*
… …
3151 * select nothing. Otherwise, if we're to the right of the mark, you have to 3254 * 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. 3255 * be _past_ a character for it to be selected.
3153 */ 3256 */
3154 if (((selection.clicks % 3) == 1) && !flag 3257 if (((selection.clicks % 3) == 1) && !flag
3155 && (col == selection.mark.col 3258 && (col == selection.mark.col
3156 && (row == selection.mark.row + view_start))) 3259 && (row == selection.mark.row - view_start)))
3157 { 3260 {
3158 /* select nothing */ 3261 /* select nothing */
3159 selection.beg.row = selection.end.row = 0; 3262 selection.beg.row = selection.end.row = 0;
3160 selection.beg.col = selection.end.col = 0; 3263 selection.beg.col = selection.end.col = 0;
3161 selection.clicks = 4; 3264 selection.clicks = 4;
… …
3174/* ------------------------------------------------------------------------- */ 3277/* ------------------------------------------------------------------------- */
3175/* 3278/*
3176 * Extend the selection to the specified col/row 3279 * Extend the selection to the specified col/row
3177 */ 3280 */
3178void 3281void
3179rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3282rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3180{ 3283{
3181 row_col_t pos; 3284 row_col_t pos;
3182 enum { 3285 enum {
3183 LEFT, RIGHT 3286 LEFT, RIGHT
3184 } closeto = RIGHT; 3287 } closeto = RIGHT;
… …
3216 selection.beg.col = selection.end.col = selection.mark.col; 3319 selection.beg.col = selection.end.col = selection.mark.col;
3217 selection.beg.row = selection.end.row = selection.mark.row; 3320 selection.beg.row = selection.end.row = selection.mark.row;
3218 } 3321 }
3219 3322
3220 pos.col = col; 3323 pos.col = col;
3221 pos.row = row - view_start; 3324 pos.row = view_start + row;
3222 3325
3223 /* 3326 /*
3224 * This is mainly xterm style selection with a couple of differences, mainly 3327 * This is mainly xterm style selection with a couple of differences, mainly
3225 * in the way button3 drag extension works. 3328 * in the way button3 drag extension works.
3226 * We're either doing: button1 drag; button3 press; or button3 drag 3329 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3287 3390
3288 if (selection.clicks == 1) 3391 if (selection.clicks == 1)
3289 { 3392 {
3290 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3393 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3291 && !ROW(selection.beg.row).is_longer () 3394 && !ROW(selection.beg.row).is_longer ()
3292#if ENABLE_FRILLS 3395#if !ENABLE_MINIMAL
3293 && !selection.rect 3396 && !selection.rect
3294#endif 3397#endif
3295 ) 3398 )
3296 selection.beg.col = ncol; 3399 selection.beg.col = ncol;
3297 3400
3298 if ( 3401 if (
3299 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3402 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3300 && !ROW(selection.end.row).is_longer () 3403 && !ROW(selection.end.row).is_longer ()
3301#if ENABLE_FRILLS 3404#if !ENABLE_MINIMAL
3302 && !selection.rect 3405 && !selection.rect
3303#endif 3406#endif
3304 ) 3407 )
3305 selection.end.col = ncol; 3408 selection.end.col = ncol;
3306 } 3409 }
… …
3313 selection_delimit_word (DN, &selection.end, &selection.end); 3416 selection_delimit_word (DN, &selection.end, &selection.end);
3314 } 3417 }
3315 else if (selection.clicks == 3) 3418 else if (selection.clicks == 3)
3316 { 3419 {
3317#if ENABLE_FRILLS 3420#if ENABLE_FRILLS
3318 if (options & Opt_tripleclickwords) 3421 if (OPTION (Opt_tripleclickwords))
3319 { 3422 {
3320 selection_delimit_word (UP, &selection.beg, &selection.beg); 3423 selection_delimit_word (UP, &selection.beg, &selection.beg);
3321 3424
3322 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3425 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3323 { 3426 {
3324 if (!ROW(end_row).is_longer ()) 3427 if (!ROW(end_row).is_longer ())
3325 { 3428 {
3326 selection.end.row = end_row; 3429 selection.end.row = end_row;
3327 selection.end.col = ROW(end_row).l; 3430 selection.end.col = ROW(end_row).l;
3431# if !ENABLE_MINIMAL
3328 selection_remove_trailing_spaces (); 3432 selection_remove_trailing_spaces ();
3433# endif
3329 break; 3434 break;
3330 } 3435 }
3331 } 3436 }
3332 } 3437 }
3333 else 3438 else
… …
3362 selection.mark.row = selection.beg.row; 3467 selection.mark.row = selection.beg.row;
3363 selection.mark.col = selection.beg.col; 3468 selection.mark.col = selection.beg.col;
3364 } 3469 }
3365 } 3470 }
3366 3471
3367#if ENABLE_FRILLS 3472#if !ENABLE_MINIMAL
3368 if (selection.rect && selection.beg.col > selection.end.col) 3473 if (selection.rect && selection.beg.col > selection.end.col)
3369 SWAP_IT (selection.beg.col, selection.end.col, int); 3474 ::swap (selection.beg.col, selection.end.col);
3370#endif 3475#endif
3371} 3476}
3372 3477
3373#if ENABLE_FRILLS 3478#if !ENABLE_MINIMAL
3374void 3479void
3375rxvt_term::selection_remove_trailing_spaces () 3480rxvt_term::selection_remove_trailing_spaces () NOTHROW
3376{ 3481{
3377 int32_t end_col, end_row; 3482 int32_t end_col, end_row;
3378 text_t *stp; 3483 text_t *stp;
3379 3484
3380 end_col = selection.end.col; 3485 end_col = selection.end.col;
… …
3384 { 3489 {
3385 stp = ROW(end_row).t; 3490 stp = ROW(end_row).t;
3386 3491
3387 while (--end_col >= 0) 3492 while (--end_col >= 0)
3388 { 3493 {
3389 if (stp[end_col] != ' ' 3494 if (stp[end_col] != NOCHAR
3390 && stp[end_col] != '\t' 3495 && !unicode::is_space (stp[end_col]))
3391 && stp[end_col] != NOCHAR)
3392 break; 3496 break;
3393 } 3497 }
3394 3498
3395 if (end_col >= 0 3499 if (end_col >= 0
3396 || !ROW(end_row - 1).is_longer ()) 3500 || !ROW(end_row - 1).is_longer ())
… …
3419/* 3523/*
3420 * Double click on button 3 when already selected 3524 * Double click on button 3 when already selected
3421 * EXT: button 3 double click 3525 * EXT: button 3 double click
3422 */ 3526 */
3423void 3527void
3424rxvt_term::selection_rotate (int x, int y) 3528rxvt_term::selection_rotate (int x, int y) NOTHROW
3425{ 3529{
3426 selection.clicks = selection.clicks % 3 + 1; 3530 selection.clicks = selection.clicks % 3 + 1;
3427 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3531 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3428} 3532}
3429 3533
… …
3431/* 3535/*
3432 * Respond to a request for our current selection 3536 * Respond to a request for our current selection
3433 * EXT: SelectionRequest 3537 * EXT: SelectionRequest
3434 */ 3538 */
3435void 3539void
3436rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3540rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3437{ 3541{
3438 XSelectionEvent ev; 3542 XSelectionEvent ev;
3439 dDisp;
3440 3543
3441 ev.type = SelectionNotify; 3544 ev.type = SelectionNotify;
3442 ev.property = None; 3545 ev.property = None;
3443 ev.display = rq.display; 3546 ev.display = rq.display;
3444 ev.requestor = rq.requestor; 3547 ev.requestor = rq.requestor;
… …
3458 *target++ = xa[XA_COMPOUND_TEXT]; 3561 *target++ = xa[XA_COMPOUND_TEXT];
3459#if X_HAVE_UTF8_STRING 3562#if X_HAVE_UTF8_STRING
3460 *target++ = xa[XA_UTF8_STRING]; 3563 *target++ = xa[XA_UTF8_STRING];
3461#endif 3564#endif
3462 3565
3463 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3566 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3464 32, PropModeReplace, 3567 32, PropModeReplace,
3465 (unsigned char *)target_list, target - target_list); 3568 (unsigned char *)target_list, target - target_list);
3466 ev.property = rq.property; 3569 ev.property = rq.property;
3467 } 3570 }
3468#if TODO // TODO 3571#if TODO // TODO
… …
3471 /* TODO: Handle MULTIPLE */ 3574 /* TODO: Handle MULTIPLE */
3472 } 3575 }
3473#endif 3576#endif
3474 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3577 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3475 { 3578 {
3476 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3579 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3477 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3580 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3478 ev.property = rq.property; 3581 ev.property = rq.property;
3479 } 3582 }
3480 else if (rq.target == XA_STRING 3583 else if (rq.target == XA_STRING
3481 || rq.target == xa[XA_TEXT] 3584 || rq.target == xa[XA_TEXT]
… …
3505 style = enc_string; 3608 style = enc_string;
3506 else if (target == xa[XA_TEXT]) 3609 else if (target == xa[XA_TEXT])
3507 style = enc_text; 3610 style = enc_text;
3508 else if (target == xa[XA_COMPOUND_TEXT]) 3611 else if (target == xa[XA_COMPOUND_TEXT])
3509 style = enc_compound_text; 3612 style = enc_compound_text;
3510#if ENABLE_FRILLS 3613#if !ENABLE_MINIMAL
3511 else if (target == xa[XA_UTF8_STRING]) 3614 else if (target == xa[XA_UTF8_STRING])
3512 style = enc_utf8; 3615 style = enc_utf8;
3513#endif 3616#endif
3514 else 3617 else
3515 { 3618 {
… …
3526 { 3629 {
3527 cl = L""; 3630 cl = L"";
3528 selectlen = 0; 3631 selectlen = 0;
3529 } 3632 }
3530 3633
3531#if ENABLE_FRILLS 3634#if !ENABLE_MINIMAL
3532 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3635 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3533 // so recode it manually 3636 // so recode it manually
3534 if (style == enc_utf8) 3637 if (style == enc_utf8)
3535 { 3638 {
3536 freect = 1; 3639 freect = 1;
… …
3539 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3642 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3540 ct.nitems = strlen ((char *)ct.value); 3643 ct.nitems = strlen ((char *)ct.value);
3541 } 3644 }
3542 else 3645 else
3543#endif 3646#endif
3544 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3647 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3545 freect = 1; 3648 freect = 1;
3546 else 3649 else
3547 { 3650 {
3548 /* if we failed to convert then send it raw */ 3651 /* if we failed to convert then send it raw */
3549 ct.value = (unsigned char *)cl; 3652 ct.value = (unsigned char *)cl;
3550 ct.nitems = selectlen; 3653 ct.nitems = selectlen;
3551 ct.encoding = target; 3654 ct.encoding = target;
3552 } 3655 }
3553 3656
3554 XChangeProperty (disp, rq.requestor, rq.property, 3657 XChangeProperty (dpy, rq.requestor, rq.property,
3555 ct.encoding, 8, PropModeReplace, 3658 ct.encoding, 8, PropModeReplace,
3556 ct.value, (int)ct.nitems); 3659 ct.value, (int)ct.nitems);
3557 ev.property = rq.property; 3660 ev.property = rq.property;
3558 3661
3559 if (freect) 3662 if (freect)
3560 XFree (ct.value); 3663 XFree (ct.value);
3561 } 3664 }
3562 3665
3563 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3666 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3564} 3667}
3565 3668
3566/* ------------------------------------------------------------------------- * 3669/* ------------------------------------------------------------------------- *
3567 * MOUSE ROUTINES * 3670 * MOUSE ROUTINES *
3568 * ------------------------------------------------------------------------- */ 3671 * ------------------------------------------------------------------------- */
3569 3672
3570/* 3673/*
3571 * return col/row values corresponding to x/y pixel values 3674 * return col/row values corresponding to x/y pixel values
3572 */ 3675 */
3573void 3676void
3574rxvt_term::pixel_position (int *x, int *y) 3677rxvt_term::pixel_position (int *x, int *y) NOTHROW
3575{ 3678{
3576 *x = Pixel2Col (*x); 3679 *x = Pixel2Col (*x);
3577 /* MAX_IT (*x, 0); MIN_IT (*x, (int)ncol - 1); */ 3680 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3578 *y = Pixel2Row (*y); 3681 *y = Pixel2Row (*y);
3579 /* MAX_IT (*y, 0); MIN_IT (*y, (int)nrow - 1); */ 3682 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3580} 3683}
3581 3684
3582/* ------------------------------------------------------------------------- */ 3685/* ------------------------------------------------------------------------- */
3583#ifdef USE_XIM 3686#ifdef USE_XIM
3584void 3687void
3585rxvt_term::im_set_position (XPoint &pos) 3688rxvt_term::im_set_position (XPoint &pos) NOTHROW
3586{ 3689{
3587 XWindowAttributes xwa; 3690 XWindowAttributes xwa;
3588 3691
3589 XGetWindowAttributes (display->display, vt, &xwa); 3692 XGetWindowAttributes (dpy, vt, &xwa);
3590 3693
3591 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3694 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3592 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3695 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3593} 3696}
3594#endif 3697#endif
3595 3698
3596#if ENABLE_OVERLAY 3699#if ENABLE_OVERLAY
3597void 3700void
3598rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3701rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3599{ 3702{
3600 if (nrow < 3 || ncol < 3) 3703 if (nrow < 1 || ncol < 1)
3601 return; 3704 return;
3602 3705
3603 want_refresh = 1; 3706 want_refresh = 1;
3604 3707
3605 scr_overlay_off (); 3708 scr_overlay_off ();
3606 3709
3607 if (x < 0) x = ncol - w; 3710 if (x < 0) x = ncol - w;
3608 if (y < 0) y = nrow - h; 3711 if (y < 0) y = nrow - h;
3609 3712
3610 // make space for border 3713 // make space for border
3611 w += 2; MIN_IT (w, ncol); 3714 w += 2; min_it (w, ncol);
3612 h += 2; MIN_IT (h, nrow); 3715 h += 2; min_it (h, nrow);
3613 3716
3614 x -= 1; MAX_IT (x, 0); 3717 x -= 1; clamp_it (x, 0, ncol - w);
3615 y -= 1; MAX_IT (y, 0); 3718 y -= 1; clamp_it (y, 0, nrow - h);
3616
3617 MIN_IT (x, ncol - w);
3618 MIN_IT (y, nrow - h);
3619 3719
3620 ov_x = x; ov_y = y; 3720 ov_x = x; ov_y = y;
3621 ov_w = w; ov_h = h; 3721 ov_w = w; ov_h = h;
3622 3722
3623 ov_text = new text_t *[h]; 3723 ov_text = new text_t *[h];
… …
3651 *rp = r; 3751 *rp = r;
3652 } 3752 }
3653} 3753}
3654 3754
3655void 3755void
3656rxvt_term::scr_overlay_off () 3756rxvt_term::scr_overlay_off () NOTHROW
3657{ 3757{
3658 if (!ov_text) 3758 if (!ov_text)
3659 return; 3759 return;
3660 3760
3661 want_refresh = 1; 3761 want_refresh = 1;
… …
3669 delete [] ov_text; ov_text = 0; 3769 delete [] ov_text; ov_text = 0;
3670 delete [] ov_rend; ov_rend = 0; 3770 delete [] ov_rend; ov_rend = 0;
3671} 3771}
3672 3772
3673void 3773void
3674rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3675{ 3775{
3676 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3677 return; 3777 return;
3678 3778
3679 x++, y++; 3779 x++, y++;
… …
3681 ov_text[y][x] = text; 3781 ov_text[y][x] = text;
3682 ov_rend[y][x] = rend; 3782 ov_rend[y][x] = rend;
3683} 3783}
3684 3784
3685void 3785void
3686rxvt_term::scr_overlay_set (int x, int y, const char *s) 3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3687{ 3787{
3688 while (*s) 3788 while (*s)
3689 scr_overlay_set (x++, y, *s++); 3789 scr_overlay_set (x++, y, *s++);
3690} 3790}
3691 3791
3692void 3792void
3693rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3793rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3694{ 3794{
3695 while (*s) 3795 while (*s)
3696 { 3796 {
3697 text_t t = *s++; 3797 text_t t = *s++;
3698 int width = wcwidth (t); 3798 int width = WCWIDTH (t);
3699 3799
3700 while (width--) 3800 while (width--)
3701 { 3801 {
3702 scr_overlay_set (x++, y, t); 3802 scr_overlay_set (x++, y, t);
3703 t = NOCHAR; 3803 t = NOCHAR;
3704 } 3804 }
3705 } 3805 }
3706} 3806}
3707 3807
3708void 3808void
3709rxvt_term::scr_swap_overlay () 3809rxvt_term::scr_swap_overlay () NOTHROW
3710{ 3810{
3711 if (!ov_text) 3811 if (!ov_text)
3712 return; 3812 return;
3713 3813
3714 // swap screen mem with overlay 3814 // swap screen mem with overlay
3715 for (int y = ov_h; y--; ) 3815 for (int y = ov_h; y--; )
3716 { 3816 {
3717 text_t *t1 = ov_text[y]; 3817 text_t *t1 = ov_text[y];
3718 rend_t *r1 = ov_rend[y]; 3818 rend_t *r1 = ov_rend[y];
3719 3819
3720 text_t *t2 = ROW(y - view_start).t + ov_x; 3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3721 rend_t *r2 = ROW(y - view_start).r + ov_x; 3821 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3722 3822
3723 for (int x = ov_w; x--; ) 3823 for (int x = ov_w; x--; )
3724 { 3824 {
3725 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3825 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3726 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines