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.266 by root, Mon Oct 9 23:12:45 2006 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

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

Diff Legend

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