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

Diff Legend

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