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.269 by ayin, Wed May 2 23:06:32 2007 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 UTC

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

Diff Legend

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