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.397 by root, Wed Nov 2 11:56:52 2011 UTC

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

Diff Legend

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