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

Diff Legend

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