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

Diff Legend

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