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

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

Diff Legend

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