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.199 by root, Tue Dec 27 01:46:06 2005 UTC vs.
Revision 1.389 by root, Fri Jul 8 00:23:22 2011 UTC

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

Diff Legend

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