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.129 by root, Wed Aug 25 03:52:09 2004 UTC vs.
Revision 1.472 by root, Mon Aug 8 10:33:14 2022 UTC

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

Diff Legend

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