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

Diff Legend

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