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

Diff Legend

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