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.190 by root, Thu Dec 22 15:52:57 2005 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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