ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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