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.179 by root, Tue Dec 20 22:47:14 2005 UTC vs.
Revision 1.466 by root, Fri Aug 5 07:54:11 2022 UTC

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

Diff Legend

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