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

Diff Legend

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