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

Diff Legend

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