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

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

Diff Legend

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