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.192 by root, Thu Dec 22 19:25:58 2005 UTC vs.
Revision 1.394 by sf-exg, Thu Sep 1 08:11:27 2011 UTC

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

Diff Legend

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