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.197 by root, Tue Dec 27 00:52:38 2005 UTC vs.
Revision 1.406 by sf-exg, Wed Nov 16 18:26:47 2011 UTC

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

Diff Legend

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