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.175 by root, Tue Dec 20 19:30:59 2005 UTC vs.
Revision 1.390 by sf-exg, Fri Jul 8 20:54:31 2011 UTC

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

Diff Legend

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