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

Diff Legend

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