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

Diff Legend

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