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.173 by root, Mon Dec 19 02:16:24 2005 UTC vs.
Revision 1.463 by root, Sat Jul 3 04:04:13 2021 UTC

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

Diff Legend

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