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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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