ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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