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

Diff Legend

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