ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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