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

Diff Legend

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