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.253 by root, Fri Jan 27 18:36:43 2006 UTC vs.
Revision 1.466 by root, Fri Aug 5 07:54:11 2022 UTC

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

Diff Legend

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