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

Diff Legend

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