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

Diff Legend

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