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.254 by root, Sat Jan 28 14:23:16 2006 UTC vs.
Revision 1.464 by root, Thu Aug 4 18:11:59 2022 UTC

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

Diff Legend

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