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.207 by root, Wed Jan 4 04:42:45 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);
792
727 if (nlines > 0 793 if (minlines > 0
728 && screen.tscroll == 0 794 && screen.tscroll == 0
729 && screen.bscroll == (nrow - 1)) 795 && screen.bscroll == nrow - 1)
730 { 796 {
731 /* _at least_ this many lines need to be scrolled */ 797 /* _at least_ this many lines need to be scrolled */
732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 798 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733 screen.cur.row -= nlines; 799 screen.cur.row -= minlines;
734 } 800 }
735 } 801 }
736 802
737#ifdef DEBUG_STRICT
738 assert (screen.cur.col < last_col); 803 assert (screen.cur.col < ncol);
739 assert (screen.cur.row < nrow 804 assert (screen.cur.row < nrow
740 && screen.cur.row >= -nsaved); 805 && screen.cur.row >= top_row);
741#endif
742 int row = screen.cur.row; 806 int row = screen.cur.row;
743 807
744 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
745 809
746 line_t *line = &ROW(row); 810 line_t *line = &ROW(row);
747 811
748 while (str < strend) 812 while (str < strend)
749 { 813 {
750 c = *str++; 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751 815
752 if (c < 0x20) 816 if (ecb_unlikely (c < 0x20))
753 if (c == C0_LF) 817 if (c == C0_LF)
754 { 818 {
755 if (!line->is_longer ()) /* XXX: think about this */
756 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
757 820
758 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
759 822
760 if (screen.cur.row == screen.bscroll) 823 if (screen.cur.row == screen.bscroll)
761 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 824 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
765 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
766 continue; 829 continue;
767 } 830 }
768 else if (c == C0_CR) 831 else if (c == C0_CR)
769 { 832 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col); 833 max_it (line->l, screen.cur.col);
772 834
773 screen.flags &= ~Screen_WrapNext; 835 screen.flags &= ~Screen_WrapNext;
774 screen.cur.col = 0; 836 screen.cur.col = 0;
775 continue; 837 continue;
776 } 838 }
… …
778 { 840 {
779 scr_tab (1, true); 841 scr_tab (1, true);
780 continue; 842 continue;
781 } 843 }
782 844
845 if (ecb_unlikely (
783 if (checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
784 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
785 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
849 ))
786 { 850 {
787 checksel = 0; 851 checksel = 0;
788 /* 852 /*
789 * If we wrote anywhere in the selected area, kill the selection 853 * If we wrote anywhere in the selected area, kill the selection
790 * XXX: should we kill the mark too? Possibly, but maybe that 854 * XXX: should we kill the mark too? Possibly, but maybe that
791 * should be a similar check. 855 * should be a similar check.
792 */ 856 */
793 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
794 } 858 }
795 859
796 if (screen.flags & Screen_WrapNext) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
797 { 861 {
798 line->set_is_longer ();
799
800 scr_do_wrap (); 862 scr_do_wrap ();
801 863
864 line->l = ncol;
865 line->is_longer (1);
866
802 row = screen.cur.row; 867 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
804 } 869 }
805 870
806 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
807 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
808 c = 0xfffd; 873 c = 0xfffd;
809 874
810 // 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
811 // do wcwidth before further replacements, as wcwidth might return -1 876 // further replacements, as wcwidth might return -1 for the line
812 // for the line drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
813 // locale. 878 // locale.
814 int width = c < 0x100 ? 1 : wcwidth (c); 879 int width = WCWIDTH (c);
815 880
816 if (charsets[screen.charset] == '0') // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
817 { 882 {
818 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
819 // 5f-7e standard vt100 884 // 5f-7e standard vt100
820 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
821 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
834 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
835 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
836 } 901 }
837 } 902 }
838 903
839 if (screen.flags & Screen_Insert) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
840 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
841 906
842 if (width != 0) 907 if (width != 0)
843 { 908 {
844#if !UNICODE_3 909#if !UNICODE_3
… …
849# else 914# else
850 c = 0xfffd; 915 c = 0xfffd;
851# endif 916# endif
852#endif 917#endif
853 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
854 // 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.
855 if (line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
856 || (screen.cur.col < ncol - 1 940 scr_kill_char (*line, screen.cur.col);
857 && line->t[screen.cur.col + 1] == NOCHAR))
858 {
859 int col = screen.cur.col;
860 941
861 // find begin 942 line->touch ();
862 while (col > 0 && line->t[col] == NOCHAR)
863 col--;
864
865 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
866
867 // found begin, nuke
868 do {
869 line->t[col] = ' ';
870 line->r[col] = rend;
871 col++;
872 } while (col < ncol && line->t[col] == NOCHAR);
873 }
874
875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876
877 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width)
879 {
880 // ...output spaces
881 c = ' ';
882 // and try the same character next loop iteration
883 --str;
884 }
885 943
886 do 944 do
887 { 945 {
888 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
889 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
890 948
891 if (screen.cur.col < last_col - 1) 949 if (ecb_likely (screen.cur.col < ncol - 1))
892 screen.cur.col++; 950 screen.cur.col++;
893 else 951 else
894 { 952 {
895 line->l = last_col; 953 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
898 break; 956
957 goto end_of_line;
899 } 958 }
900 959
901 c = NOCHAR; 960 c = NOCHAR;
902 } 961 }
903 while (--width > 0); 962 while (ecb_unlikely (--width > 0));
904 963
905 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
906 if (!width)
907 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
908 { 966 {
909 line->t[c] = ' '; 967 line->t[c] = ' ';
910 line->r[c] = rend; 968 line->r[c] = rend;
911 } 969 }
970
971end_of_line:
912 } 972 ;
973 }
974#if ENABLE_COMBINING
913 else // width == 0 975 else // width == 0
914 { 976 {
915#if ENABLE_COMBINING 977 if (c != 0xfeff) // ignore BOM
916 // handle combining characters
917 // we just tag the accent on the previous on-screen character.
918 // this is arguably not correct, but also arguably not wrong.
919 // we don't handle double-width characters nicely yet.
920 text_t *tp;
921 rend_t *rp;
922
923 if (screen.cur.col > 0)
924 { 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;
925 tp = line->t + screen.cur.col - 1; 990 tp = line->t + screen.cur.col - 1;
926 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;
927 1002
1003 linep->touch ();
1004
928 while (*tp == NOCHAR && tp > line->t) 1005 while (*tp == NOCHAR && tp > linep->t)
929 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));
930 } 1015 }
931 else if (screen.cur.row > 0
932 && ROW(screen.cur.row - 1).is_longer ())
933 {
934 line_t *line = &ROW(screen.cur.row - 1);
935
936 tp = line->t + last_col - 1;
937 rp = line->r + last_col - 1;
938
939 while (*tp == NOCHAR && tp > line->t)
940 tp--, rp--;
941 } 1016 }
942 else
943 continue;
944
945 // first try to find a precomposed character
946 unicode_t n = rxvt_compose (*tp, c);
947 if (n == NOCHAR)
948 n = rxvt_composite.compose (*tp, c);
949
950 *tp = n;
951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952#endif 1017#endif
953 }
954 } 1018 }
955 1019
956 if (!line->is_longer ()) /* XXX: think about this */
957 max_it (line->l, screen.cur.col); 1020 max_it (line->l, screen.cur.col);
958 1021
959#ifdef DEBUG_STRICT
960 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
961#endif
962} 1023}
963 1024
964/* ------------------------------------------------------------------------- */ 1025/* ------------------------------------------------------------------------- */
965/* 1026/*
966 * 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
967 * XTERM_SEQ: CTRL-H 1028 * XTERM_SEQ: CTRL-H
968 */ 1029 */
969void 1030void
970rxvt_term::scr_backspace () 1031rxvt_term::scr_backspace () NOTHROW
971{ 1032{
972 want_refresh = 1;
973
974 if (screen.cur.col == 0) 1033 if (screen.cur.col == 0)
975 { 1034 {
976 if (screen.cur.row > 0) 1035 if (screen.cur.row > 0)
977 { 1036 {
978#ifdef TERMCAP_HAS_BW 1037#ifdef TERMCAP_HAS_BW
979 screen.cur.col = ncol - 1; 1038 screen.cur.col = ncol - 1;
980 screen.cur.row--; 1039 --screen.cur.row;
981 return; 1040
1041 want_refresh = 1;
982#endif 1042#endif
983 } 1043 }
984 } 1044 }
985 else if (!(screen.flags & Screen_WrapNext)) 1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1047 else
986 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
987
988 screen.flags &= ~Screen_WrapNext;
989} 1049}
990 1050
991/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
992/* 1052/*
993 * Process Horizontal Tab 1053 * Process Horizontal Tab
994 * count: +ve = forward; -ve = backwards 1054 * count: +ve = forward; -ve = backwards
995 * XTERM_SEQ: CTRL-I 1055 * XTERM_SEQ: CTRL-I
996 */ 1056 */
997void 1057void
998rxvt_term::scr_tab (int count, bool ht) 1058rxvt_term::scr_tab (int count, bool ht) NOTHROW
999{ 1059{
1000 int i, x; 1060 int i, x;
1001 1061
1002 want_refresh = 1; 1062 want_refresh = 1;
1003 i = x = screen.cur.col; 1063 i = x = screen.cur.col;
… …
1012 1072
1013 for (; ++i < ncol; ) 1073 for (; ++i < ncol; )
1014 if (tabs[i]) 1074 if (tabs[i])
1015 { 1075 {
1016 x = i; 1076 x = i;
1077
1017 if (!--count) 1078 if (!--count)
1018 break; 1079 break;
1019 } 1080 }
1020 else 1081 else
1021 ht &= l.t[i] == ' ' 1082 ht &= l.t[i] == ' '
1022 && RS_SAME (l.r[i], base_rend); 1083 && RS_SAME (l.r[i], base_rend);
1023 1084
1024 if (count) 1085 if (count)
1025 x = ncol - 1; 1086 x = ncol - 1;
1026 1087
1027 // store horizontal tab commands as characters inside the text 1088 // store horizontal tab commands as characters inside the text
1028 // buffer so they can be selected and pasted. 1089 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1090 if (ht && option (Opt_pastableTabs))
1030 { 1091 {
1031 base_rend = SET_FONT (base_rend, 0); 1092 base_rend = SET_FONT (base_rend, 0);
1032 1093
1033 if (!l.is_longer ()) /* XXX: think about this */ 1094 l.touch (x);
1034 max_it (l.l, x);
1035 1095
1036 i = screen.cur.col; 1096 i = screen.cur.col;
1037 1097
1038 l.t[i] = '\t'; 1098 l.t[i] = '\t';
1039 l.r[i] = base_rend; 1099 l.r[i] = base_rend;
… …
1068 * Process DEC Back Index 1128 * Process DEC Back Index
1069 * XTERM_SEQ: ESC 6 1129 * XTERM_SEQ: ESC 6
1070 * 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
1071 * in that row right. Clear left column. 1131 * in that row right. Clear left column.
1072 */ 1132 */
1073#if ENABLE_FRILLS 1133#if !ENABLE_MINIMAL
1074void 1134void
1075rxvt_term::scr_backindex () 1135rxvt_term::scr_backindex () NOTHROW
1076{ 1136{
1077 if (screen.cur.col > 0) 1137 if (screen.cur.col > 0)
1078 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1138 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1079 else 1139 else
1080 scr_insdel_chars (1, INSERT); 1140 scr_insdel_chars (1, INSERT);
… …
1085 * Process DEC Forward Index 1145 * Process DEC Forward Index
1086 * XTERM_SEQ: ESC 9 1146 * XTERM_SEQ: ESC 9
1087 * 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
1088 * in that row left. Clear right column. 1148 * in that row left. Clear right column.
1089 */ 1149 */
1090#if ENABLE_FRILLS 1150#if !ENABLE_MINIMAL
1091void 1151void
1092rxvt_term::scr_forwardindex () 1152rxvt_term::scr_forwardindex () NOTHROW
1093{ 1153{
1094 if (screen.cur.col < ncol - 1) 1154 if (screen.cur.col < ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1156 else
1097 { 1157 {
1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1158 line_t &l = ROW(screen.cur.row);
1099 ROW(screen.cur.row).l = ncol; 1159
1160 l.touch ();
1161 l.is_longer (0);
1100 1162
1101 scr_gotorc (0, 0, R_RELATIVE); 1163 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1164 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, ncol - 1, R_RELATIVE); 1165 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1166 }
… …
1108/* ------------------------------------------------------------------------- */ 1170/* ------------------------------------------------------------------------- */
1109/* 1171/*
1110 * Goto Row/Column 1172 * Goto Row/Column
1111 */ 1173 */
1112void 1174void
1113rxvt_term::scr_gotorc (int row, int col, int relative) 1175rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1114{ 1176{
1115 want_refresh = 1; 1177 want_refresh = 1;
1116 ZERO_SCROLLBACK (); 1178 ZERO_SCROLLBACK ();
1117 1179
1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1180 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1140 } 1202 }
1141 } 1203 }
1142 else 1204 else
1143 { 1205 {
1144 if (screen.flags & Screen_Relative) 1206 if (screen.flags & Screen_Relative)
1207 {
1145 { /* relative origin mode */ 1208 /* relative origin mode */
1146 screen.cur.row = row + screen.tscroll; 1209 screen.cur.row = row + screen.tscroll;
1147 min_it (screen.cur.row, screen.bscroll); 1210 min_it (screen.cur.row, screen.bscroll);
1148 } 1211 }
1149 else 1212 else
1150 screen.cur.row = row; 1213 screen.cur.row = row;
… …
1156/* ------------------------------------------------------------------------- */ 1219/* ------------------------------------------------------------------------- */
1157/* 1220/*
1158 * direction should be UP or DN 1221 * direction should be UP or DN
1159 */ 1222 */
1160void 1223void
1161rxvt_term::scr_index (enum page_dirn direction) 1224rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1162{ 1225{
1163 int dirn; 1226 int dirn;
1164 1227
1165 want_refresh = 1; 1228 want_refresh = 1;
1166 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
… …
1183/* 1246/*
1184 * Erase part or whole of a line 1247 * Erase part or whole of a line
1185 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1248 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1186 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1249 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1187 * 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
1188 */ 1252 */
1189void 1253void
1190rxvt_term::scr_erase_line (int mode) 1254rxvt_term::scr_erase_line (int mode) NOTHROW
1191{ 1255{
1192 unsigned int col, num; 1256 unsigned int col, num;
1193 1257
1194 want_refresh = 1; 1258 want_refresh = 1;
1195 ZERO_SCROLLBACK (); 1259 ZERO_SCROLLBACK ();
1196 1260
1197 selection_check (1); 1261 selection_check (1);
1198 1262
1199 line_t &line = ROW(screen.cur.row); 1263 line_t &line = ROW(screen.cur.row);
1200 1264
1265 line.touch ();
1266 line.is_longer (0);
1267
1201 switch (mode) 1268 switch (mode)
1202 { 1269 {
1270 case 3:
1271 if (screen.flags & Screen_WrapNext)
1272 return;
1273
1274 /* fall through */
1275
1203 case 0: /* erase to end of line */ 1276 case 0: /* erase to end of line */
1204 col = screen.cur.col; 1277 col = screen.cur.col;
1205 num = ncol - col; 1278 num = ncol - col;
1206 min_it (line.l, col); 1279 min_it (line.l, col);
1280
1207 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1281 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1208 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1282 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1209 CLEAR_SELECTION (); 1283 CLEAR_SELECTION ();
1210 break; 1284 break;
1285
1211 case 1: /* erase to beginning of line */ 1286 case 1: /* erase to beginning of line */
1212 col = 0; 1287 col = 0;
1213 num = screen.cur.col + 1; 1288 num = screen.cur.col + 1;
1289
1214 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1290 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1215 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1291 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1216 CLEAR_SELECTION (); 1292 CLEAR_SELECTION ();
1217 break; 1293 break;
1294
1218 case 2: /* erase whole line */ 1295 case 2: /* erase whole line */
1219 col = 0; 1296 col = 0;
1220 num = ncol; 1297 num = ncol;
1221 line.l = 0; 1298 line.l = 0;
1222 if (selection.beg.row <= screen.cur.row 1299 if (selection.beg.row <= screen.cur.row
… …
1236 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1237 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1238 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1239 */ 1316 */
1240void 1317void
1241rxvt_term::scr_erase_screen (int mode) 1318rxvt_term::scr_erase_screen (int mode) NOTHROW
1242{ 1319{
1243 int num; 1320 int num;
1244 int32_t row; 1321 int32_t row;
1245 rend_t ren; 1322 rend_t ren;
1246 XGCValues gcvalue; 1323 XGCValues gcvalue;
… …
1280 if (row >= nrow) /* Out Of Bounds */ 1357 if (row >= nrow) /* Out Of Bounds */
1281 return; 1358 return;
1282 1359
1283 min_it (num, nrow - row); 1360 min_it (num, nrow - row);
1284 1361
1285 if (rstyle & (RS_RVid | RS_Uline)) 1362 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1286 ren = (rend_t) ~RS_None; 1363 ren = (rend_t) ~RS_None;
1287 else if (GET_BASEBG (rstyle) == Color_bg) 1364 else if (GET_BASEBG (rstyle) == Color_bg)
1288 { 1365 {
1289 ren = DEFAULT_RSTYLE; 1366 ren = DEFAULT_RSTYLE;
1290 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);
1291 } 1372 }
1292 else 1373 else
1293 { 1374 {
1294 ren = rstyle & (RS_fgMask | RS_bgMask); 1375 ren = rstyle & (RS_fgMask | RS_bgMask);
1376
1377 if (mapped)
1378 {
1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1379 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1296 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1380 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1297 ERASE_ROWS (row, num); 1381 XFillRectangle (dpy, vt, gc,
1382 0, Row2Pixel (row - view_start),
1383 (unsigned int)width,
1384 (unsigned int)Height2Pixel (num));
1298 gcvalue.foreground = pix_colors[Color_fg]; 1385 gcvalue.foreground = pix_colors[Color_fg];
1299 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1386 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 }
1300 } 1388 }
1301 1389
1302 for (; num--; row++) 1390 for (; num--; row++)
1303 { 1391 {
1304 ROW (row).l = 0;
1305 scr_blank_screen_mem (ROW (row), rstyle); 1392 scr_blank_screen_mem (ROW(row), rstyle);
1393
1394 if (row - view_start < nrow)
1306 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1395 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1307 } 1396 }
1308} 1397}
1309 1398
1310#if ENABLE_FRILLS 1399#if !ENABLE_MINIMAL
1311void 1400void
1312rxvt_term::scr_erase_savelines () 1401rxvt_term::scr_erase_savelines () NOTHROW
1313{ 1402{
1314 want_refresh = 1; 1403 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1404 ZERO_SCROLLBACK ();
1316 1405
1317 nsaved = 0; 1406 top_row = 0;
1318} 1407}
1319#endif 1408#endif
1320 1409
1321/* ------------------------------------------------------------------------- */ 1410/* ------------------------------------------------------------------------- */
1322/* 1411/*
1323 * Fill the screen with `E's 1412 * Fill the screen with `E's
1324 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1413 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1325 */ 1414 */
1326void 1415void
1327rxvt_term::scr_E () 1416rxvt_term::scr_E () NOTHROW
1328{ 1417{
1329 rend_t fs; 1418 rend_t fs;
1330 1419
1331 want_refresh = 1; 1420 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1421 ZERO_SCROLLBACK ();
… …
1343 rend_t *r1 = line.r; 1432 rend_t *r1 = line.r;
1344 1433
1345 for (int j = ncol; j--; ) 1434 for (int j = ncol; j--; )
1346 *r1++ = fs; 1435 *r1++ = fs;
1347 1436
1348 line.l = ncol; /* make the `E's selectable */ 1437 line.is_longer (0);
1438 line.touch (ncol);
1349 } 1439 }
1350} 1440}
1351 1441
1352/* ------------------------------------------------------------------------- */ 1442/* ------------------------------------------------------------------------- */
1353/* 1443/*
1354 * Insert/Delete <count> lines 1444 * Insert/Delete <count> lines
1355 */ 1445 */
1356void 1446void
1357rxvt_term::scr_insdel_lines (int count, int insdel) 1447rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1358{ 1448{
1359 int end; 1449 int end;
1360 1450
1361 ZERO_SCROLLBACK (); 1451 ZERO_SCROLLBACK ();
1362 1452
… …
1382/* ------------------------------------------------------------------------- */ 1472/* ------------------------------------------------------------------------- */
1383/* 1473/*
1384 * Insert/Delete <count> characters from the current position 1474 * Insert/Delete <count> characters from the current position
1385 */ 1475 */
1386void 1476void
1387rxvt_term::scr_insdel_chars (int count, int insdel) 1477rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1388{ 1478{
1389 int col, row;
1390 rend_t tr;
1391
1392 want_refresh = 1; 1479 want_refresh = 1;
1393 ZERO_SCROLLBACK (); 1480 ZERO_SCROLLBACK ();
1394 1481
1395 if (count <= 0) 1482 if (count <= 0)
1396 return; 1483 return;
… …
1398 scr_do_wrap (); 1485 scr_do_wrap ();
1399 1486
1400 selection_check (1); 1487 selection_check (1);
1401 min_it (count, ncol - screen.cur.col); 1488 min_it (count, ncol - screen.cur.col);
1402 1489
1403 row = screen.cur.row; 1490 int row = screen.cur.row;
1404 1491
1405 line_t *line = &ROW(row); 1492 line_t *line = &ROW(row);
1406 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
1407 switch (insdel) 1501 switch (insdel)
1408 { 1502 {
1409 case INSERT: 1503 case INSERT:
1410 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--)
1411 { 1510 {
1412 line->t[col] = line->t[col - count]; 1511 line->t[col] = line->t[col - count];
1413 line->r[col] = line->r[col - count]; 1512 line->r[col] = line->r[col - count];
1414 }
1415
1416 if (!line->is_longer ())
1417 {
1418 line->l += count;
1419 min_it (line->l, ncol);
1420 } 1513 }
1421 1514
1422 if (selection.op && current_screen == selection.screen 1515 if (selection.op && current_screen == selection.screen
1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1516 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424 { 1517 {
1425 if (selection.end.row != screen.cur.row 1518 if (selection.end.row != screen.cur.row
1426 || (selection.end.col + count >= ncol)) 1519 || (selection.end.col + count >= ncol))
1427 CLEAR_SELECTION (); 1520 CLEAR_SELECTION ();
1428 else 1521 else
1522 {
1429 { /* shift selection */ 1523 /* shift selection */
1430 selection.beg.col += count; 1524 selection.beg.col += count;
1431 selection.mark.col += count; /* XXX: yes? */ 1525 selection.mark.col += count; /* XXX: yes? */
1432 selection.end.col += count; 1526 selection.end.col += count;
1433 } 1527 }
1434 } 1528 }
… …
1438 1532
1439 case ERASE: 1533 case ERASE:
1440 screen.cur.col += count; /* don't worry if > ncol */ 1534 screen.cur.col += count; /* don't worry if > ncol */
1441 selection_check (1); 1535 selection_check (1);
1442 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
1443 scr_blank_line (*line, screen.cur.col, count, rstyle); 1542 scr_blank_line (*line, screen.cur.col, count, rstyle);
1444 break; 1543 break;
1445 1544
1446 case DELETE: 1545 case DELETE:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1546 line->l = max (line->l - count, 0);
1448 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
1449 for (col = screen.cur.col; (col + count) < ncol; col++) 1552 for (int col = screen.cur.col; (col + count) < ncol; col++)
1450 { 1553 {
1451 line->t[col] = line->t[col + count]; 1554 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1555 line->r[col] = line->r[col + count];
1453 } 1556 }
1454 1557
1455 scr_blank_line (*line, ncol - count, count, tr); 1558 scr_blank_line (*line, ncol - count, count, rstyle);
1456
1457 if (line->is_longer ()) /* break line continuation */
1458 line->l = ncol;
1459
1460 line->l = max (line->l - count, 0);
1461 1559
1462 if (selection.op && current_screen == selection.screen 1560 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1561 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1562 {
1465 if (selection.end.row != screen.cur.row 1563 if (selection.end.row != screen.cur.row
… …
1483/* 1581/*
1484 * Set the scrolling region 1582 * Set the scrolling region
1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1583 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1486 */ 1584 */
1487void 1585void
1488rxvt_term::scr_scroll_region (int top, int bot) 1586rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1489{ 1587{
1490 max_it (top, 0); 1588 max_it (top, 0);
1491 min_it (bot, nrow - 1); 1589 min_it (bot, nrow - 1);
1492 1590
1493 if (top > bot) 1591 if (top > bot)
… …
1503 * Make the cursor visible/invisible 1601 * Make the cursor visible/invisible
1504 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1602 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1505 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1603 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1506 */ 1604 */
1507void 1605void
1508rxvt_term::scr_cursor_visible (int mode) 1606rxvt_term::scr_cursor_visible (int mode) NOTHROW
1509{ 1607{
1510 want_refresh = 1; 1608 want_refresh = 1;
1511 1609
1512 if (mode) 1610 if (mode)
1513 screen.flags |= Screen_VisibleCursor; 1611 screen.flags |= Screen_VisibleCursor;
… …
1520 * Set/unset automatic wrapping 1618 * Set/unset automatic wrapping
1521 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1619 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1522 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1620 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1523 */ 1621 */
1524void 1622void
1525rxvt_term::scr_autowrap (int mode) 1623rxvt_term::scr_autowrap (int mode) NOTHROW
1526{ 1624{
1527 if (mode) 1625 if (mode)
1528 screen.flags |= Screen_Autowrap; 1626 screen.flags |= Screen_Autowrap;
1529 else 1627 else
1530 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1628 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1539 * and the cursor cannot be moved outside. 1637 * and the cursor cannot be moved outside.
1540 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1638 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1541 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1639 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1542 */ 1640 */
1543void 1641void
1544rxvt_term::scr_relative_origin (int mode) 1642rxvt_term::scr_relative_origin (int mode) NOTHROW
1545{ 1643{
1546 if (mode) 1644 if (mode)
1547 screen.flags |= Screen_Relative; 1645 screen.flags |= Screen_Relative;
1548 else 1646 else
1549 screen.flags &= ~Screen_Relative; 1647 screen.flags &= ~Screen_Relative;
… …
1556 * Set insert/replace mode 1654 * Set insert/replace mode
1557 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1655 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1558 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1656 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1559 */ 1657 */
1560void 1658void
1561rxvt_term::scr_insert_mode (int mode) 1659rxvt_term::scr_insert_mode (int mode) NOTHROW
1562{ 1660{
1563 if (mode) 1661 if (mode)
1564 screen.flags |= Screen_Insert; 1662 screen.flags |= Screen_Insert;
1565 else 1663 else
1566 screen.flags &= ~Screen_Insert; 1664 screen.flags &= ~Screen_Insert;
… …
1572 * XTERM_SEQ: Set tab at current column : ESC H 1670 * XTERM_SEQ: Set tab at current column : ESC H
1573 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1671 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1574 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1672 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1575 */ 1673 */
1576void 1674void
1577rxvt_term::scr_set_tab (int mode) 1675rxvt_term::scr_set_tab (int mode) NOTHROW
1578{ 1676{
1579 if (mode < 0) 1677 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1678 memset (tabs, 0, ncol);
1581 else if (screen.cur.col < ncol) 1679 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1680 tabs [screen.cur.col] = !!mode;
1583} 1681}
1584 1682
1585/* ------------------------------------------------------------------------- */ 1683/* ------------------------------------------------------------------------- */
1586/* 1684/*
1587 * Set reverse/normal video 1685 * Set reverse/normal video
1588 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1686 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1589 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1687 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1590 */ 1688 */
1591void 1689void
1592rxvt_term::scr_rvideo_mode (int mode) 1690rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1593{ 1691{
1594 XGCValues gcvalue; 1692 rvideo_mode = on;
1595 1693
1694#ifndef NO_BELL
1695 on ^= rvideo_bell;
1696#endif
1697
1596 if (rvideo != mode) 1698 if (rvideo_state != on)
1597 { 1699 {
1598 rvideo = mode; 1700 rvideo_state = on;
1701
1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1702 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1600#if XPM_BACKGROUND 1703#ifdef HAVE_BG_PIXMAP
1601 if (bgPixmap.pixmap == None) 1704 if (bg_pixmap == None)
1602#endif 1705#endif
1603#if TRANSPARENT 1706 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1605#endif
1606 XSetWindowBackground (display->display, vt,
1607 pix_colors[Color_bg]);
1608 1707
1708 XGCValues gcvalue;
1609 gcvalue.foreground = pix_colors[Color_fg]; 1709 gcvalue.foreground = pix_colors[Color_fg];
1610 gcvalue.background = pix_colors[Color_bg]; 1710 gcvalue.background = pix_colors[Color_bg];
1611 XChangeGC (display->display, gc, GCBackground | GCForeground, 1711 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1612 &gcvalue); 1712
1613 scr_clear (); 1713 scr_clear ();
1614 scr_touch (true); 1714 scr_touch (true);
1615 } 1715 }
1616} 1716}
1617 1717
… …
1619/* 1719/*
1620 * Report current cursor position 1720 * Report current cursor position
1621 * XTERM_SEQ: Report position: ESC [ 6 n 1721 * XTERM_SEQ: Report position: ESC [ 6 n
1622 */ 1722 */
1623void 1723void
1624rxvt_term::scr_report_position () 1724rxvt_term::scr_report_position () NOTHROW
1625{ 1725{
1626 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);
1627} 1727}
1628 1728
1629/* ------------------------------------------------------------------------- * 1729/* ------------------------------------------------------------------------- *
… …
1632 1732
1633/* 1733/*
1634 * Set font style 1734 * Set font style
1635 */ 1735 */
1636void 1736void
1637rxvt_term::set_font_style () 1737rxvt_term::set_font_style () NOTHROW
1638{ 1738{
1739#if 0
1639 switch (charsets[screen.charset]) 1740 switch (charsets [screen.charset])
1640 { 1741 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1742 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1743 break;
1643 case 'A': /* United Kingdom (UK) */ 1744 case 'A': /* United Kingdom (UK) */
1644 break; 1745 break;
… …
1651 case 'C': /* Finnish character set */ 1752 case 'C': /* Finnish character set */
1652 break; 1753 break;
1653 case 'K': /* German character set */ 1754 case 'K': /* German character set */
1654 break; 1755 break;
1655 } 1756 }
1757#endif
1656} 1758}
1657 1759
1658/* ------------------------------------------------------------------------- */ 1760/* ------------------------------------------------------------------------- */
1659/* 1761/*
1660 * Choose a font 1762 * Choose a font
… …
1662 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1764 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1663 * XTERM_SEQ: Invoke G2 character set: ESC N 1765 * XTERM_SEQ: Invoke G2 character set: ESC N
1664 * XTERM_SEQ: Invoke G3 character set: ESC O 1766 * XTERM_SEQ: Invoke G3 character set: ESC O
1665 */ 1767 */
1666void 1768void
1667rxvt_term::scr_charset_choose (int set) 1769rxvt_term::scr_charset_choose (int set) NOTHROW
1668{ 1770{
1669 screen.charset = set; 1771 screen.charset = set;
1670 set_font_style (); 1772 set_font_style ();
1671} 1773}
1672 1774
… …
1678 * XTERM_SEQ: Set G2 character set: ESC * <C> 1780 * XTERM_SEQ: Set G2 character set: ESC * <C>
1679 * XTERM_SEQ: Set G3 character set: ESC + <C> 1781 * XTERM_SEQ: Set G3 character set: ESC + <C>
1680 * See set_font_style for possible values for <C> 1782 * See set_font_style for possible values for <C>
1681 */ 1783 */
1682void 1784void
1683rxvt_term::scr_charset_set (int set, unsigned int ch) 1785rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1684{ 1786{
1685 charsets[set] = (unsigned char)ch; 1787 charsets[set] = (unsigned char)ch;
1686 set_font_style (); 1788 set_font_style ();
1687} 1789}
1688 1790
… …
1693 1795
1694/* 1796/*
1695 * refresh matching text. 1797 * refresh matching text.
1696 */ 1798 */
1697bool 1799bool
1698rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1800rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1699{ 1801{
1700 bool found = false; 1802 bool found = false;
1701 1803
1702 for (int i = 0; i < nrow; i++) 1804 for (int i = 0; i < nrow; i++)
1703 { 1805 {
1704 int col = 0;
1705 rend_t *drp = drawn_buf[i].r; 1806 rend_t *drp = drawn_buf[i].r;
1706 1807
1707 for (; col < ncol; col++, drp++) 1808 for (int col = 0; col < ncol; col++, drp++)
1708 if ((*drp & mask) == value) 1809 if ((*drp & mask) == value)
1709 { 1810 {
1710 found = true; 1811 found = true;
1711 *drp = ~value; 1812 *drp = ~value;
1712 } 1813 }
… …
1723 PART_END, 1824 PART_END,
1724 RC_COUNT 1825 RC_COUNT
1725}; 1826};
1726 1827
1727void 1828void
1728rxvt_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
1729{ 1830{
1730 int i; 1831 int i;
1731 row_col_t rc[RC_COUNT]; 1832 row_col_t rc[RC_COUNT];
1732 1833
1733 if (!drawn_buf) /* sanity check */ 1834 if (!drawn_buf) /* sanity check */
… …
1756 } 1857 }
1757 1858
1758 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++)
1759 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);
1760 1861
1862 num_scr_allow = 0;
1863
1761 if (refresh) 1864 if (refresh)
1762 scr_refresh (SLOW_REFRESH); 1865 scr_refresh ();
1763} 1866}
1764 1867
1765/* ------------------------------------------------------------------------- */ 1868/* ------------------------------------------------------------------------- */
1766/* 1869/*
1767 * Refresh the entire screen 1870 * Refresh the entire screen
1768 */ 1871 */
1769void 1872void
1770rxvt_term::scr_touch (bool refresh) 1873rxvt_term::scr_touch (bool refresh) NOTHROW
1771{ 1874{
1772 scr_expose (0, 0, width, height, refresh); 1875 scr_expose (0, 0, width, height, refresh);
1773} 1876}
1774 1877
1775/* ------------------------------------------------------------------------- */ 1878/* ------------------------------------------------------------------------- */
1776/* 1879/*
1777 * 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
1778 * the top of the screen 1881 * the top of the screen
1779 */ 1882 */
1780int 1883void
1781rxvt_term::scr_move_to (int y, int len) 1884rxvt_term::scr_move_to (int y, int len) NOTHROW
1782{ 1885{
1783 long p = 0; 1886 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1784 unsigned int oldviewstart;
1785
1786 oldviewstart = view_start;
1787
1788 if (y < len)
1789 {
1790 p = (nrow + nsaved) * (len - y) / len;
1791 p -= (long) (nrow - 1);
1792 p = max (p, 0);
1793 }
1794
1795 view_start = (unsigned int)min (p, nsaved);
1796
1797 return scr_changeview (oldviewstart);
1798} 1887}
1799 1888
1800/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1801/* 1890/*
1802 * Page the screen up/down nlines 1891 * Page the screen up/down nlines
1803 * direction should be UP or DN 1892 * direction should be UP or DN
1804 */ 1893 */
1805int 1894bool
1806rxvt_term::scr_page (enum page_dirn direction, int nlines) 1895rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1807{ 1896{
1808 int n; 1897 int new_view_start =
1809 unsigned int oldviewstart;
1810
1811 oldviewstart = view_start;
1812
1813 if (direction == UP)
1814 {
1815 n = view_start + nlines;
1816 view_start = min (n, nsaved);
1817 }
1818 else
1819 {
1820 n = view_start - nlines; 1898 direction == UP ? view_start - nlines
1821 view_start = max (n, 0); 1899 : view_start + nlines;
1822 }
1823 1900
1824 return scr_changeview (oldviewstart); 1901 return scr_changeview (new_view_start);
1825} 1902}
1826 1903
1827int 1904bool
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1905rxvt_term::scr_changeview (int new_view_start) NOTHROW
1829{ 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
1830 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));
1831 1917
1832 if (view_start != oldviewstart) 1918 return true;
1833 {
1834 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart);
1836 }
1837
1838 return (int) (view_start - oldviewstart);
1839} 1919}
1840 1920
1841/* ------------------------------------------------------------------------- */ 1921#ifndef NO_BELL
1842void 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
1843rxvt_term::scr_bell () 1933rxvt_term::scr_bell () NOTHROW
1844{ 1934{
1845#ifndef NO_BELL 1935#ifndef NO_BELL
1846 1936
1847# ifndef NO_MAPALERT 1937# ifndef NO_MAPALERT
1848# ifdef MAPALERT_OPTION 1938# ifdef MAPALERT_OPTION
1849 if (OPTION (Opt_mapAlert)) 1939 if (option (Opt_mapAlert))
1850# endif 1940# endif
1851 XMapWindow (display->display, parent[0]); 1941 XMapWindow (dpy, parent);
1852# endif 1942# endif
1853 1943
1944# if ENABLE_FRILLS
1945 if (option (Opt_urgentOnBell))
1946 set_urgency (1);
1947# endif
1948
1854 if (OPTION (Opt_visualBell)) 1949 if (option (Opt_visualBell))
1855 { 1950 {
1856 scr_rvideo_mode (!rvideo); /* refresh also done */ 1951 rvideo_bell = true;
1952 scr_rvideo_mode (rvideo_mode);
1953 flush ();
1954
1857 rxvt_usleep (VISUAL_BELL_DURATION); 1955 bell_ev.start (VISUAL_BELL_DURATION);
1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1859 } 1956 }
1860 else 1957 else
1861 XBell (display->display, 0); 1958 XBell (dpy, 0);
1862 1959 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1863#endif 1960#endif
1864} 1961}
1865 1962
1866/* ------------------------------------------------------------------------- */ 1963/* ------------------------------------------------------------------------- */
1867/* ARGSUSED */
1868void 1964void
1869rxvt_term::scr_printscreen (int fullhist) 1965rxvt_term::scr_printscreen (int fullhist) NOTHROW
1870{ 1966{
1871#ifdef PRINTPIPE 1967#ifdef PRINTPIPE
1872 int nrows, row_start; 1968 int nrows, row_start;
1873 FILE *fd; 1969 FILE *fd = popen_printer ();
1874 1970
1875 if ((fd = popen_printer ()) == NULL) 1971 if (!fd)
1876 return; 1972 return;
1877 1973
1878 if (fullhist) 1974 if (fullhist)
1879 { 1975 {
1880 nrows = nrow + nsaved; 1976 nrows = nrow - top_row;
1881 row_start = -nsaved; 1977 row_start = top_row;
1882 } 1978 }
1883 else 1979 else
1884 { 1980 {
1885 nrows = nrow; 1981 nrows = nrow;
1886 row_start = -view_start; 1982 row_start = view_start;
1887 } 1983 }
1888 1984
1889 wctomb (0, 0); 1985 wctomb (0, 0);
1890 1986
1891 for (int r1 = 0; r1 < nrows; r1++) 1987 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1892 { 1988 {
1893 text_t *tp = ROW(r1).t; 1989 text_t *tp = ROW(r1).t;
1894 int len = ROW(r1).l; 1990 int len = ROW(r1).l;
1895 1991
1896 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
… …
1923 * Refresh the screen 2019 * Refresh the screen
1924 * drawn_text/drawn_rend contain the screen information before the update. 2020 * drawn_text/drawn_rend contain the screen information before the update.
1925 * screen.text/screen.rend contain what the screen will change to. 2021 * screen.text/screen.rend contain what the screen will change to.
1926 */ 2022 */
1927void 2023void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 2024rxvt_term::scr_refresh () NOTHROW
1929{ 2025{
1930 unsigned char must_clear, /* use draw_string not draw_image_string */
1931 showcursor; /* show the cursor */
1932 int16_t col, row, /* column/row we're processing */ 2026 int16_t col, row, /* column/row we're processing */
1933 ocrow; /* old cursor row */ 2027 ocrow; /* old cursor row */
1934 int i; /* tmp */ 2028 int i; /* tmp */
1935#ifndef NO_CURSORCOLOR 2029#ifndef NO_CURSORCOLOR
1936 rend_t cc1; /* store colours at cursor position (s) */ 2030 rend_t cc1; /* store colours at cursor position (s) */
1937#endif 2031#endif
1938 rend_t *crp; // cursor rendition pointer 2032 rend_t *crp; // cursor rendition pointer
2033 rend_t ccol1, /* Cursor colour */
2034 ccol2; /* Cursor colour2 */
1939 2035
1940 want_refresh = 0; /* screen is current */ 2036 want_refresh = 0; /* screen is current */
1941 2037
1942 if (refresh_type == NO_REFRESH || !mapped) 2038 if (refresh_type == NO_REFRESH || !mapped)
1943 return; 2039 return;
1944 2040
1945 /* 2041 /*
1946 * A: set up vars 2042 * A: set up vars
1947 */ 2043 */
1948 must_clear = 0;
1949 refresh_count = 0; 2044 refresh_count = 0;
1950 2045
1951#if XPM_BACKGROUND 2046 unsigned int old_screen_flags = screen.flags;
1952 must_clear |= bgPixmap.pixmap != None; 2047 bool have_bg = 0;
1953#endif 2048#ifdef HAVE_BG_PIXMAP
1954#if TRANSPARENT 2049 have_bg = bg_pixmap != None;
1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
1956#endif 2050#endif
1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1958 2052
1959 /* 2053 /*
1960 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
1961 */ 2055 */
1962 scr_reverse_selection (); 2056 scr_reverse_selection ();
1963 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
1964 /* 2065 /*
1965 * C: set the cursor character (s) 2066 * C: set the cursor character (s)
1966 */ 2067 */
1967 { 2068 {
1968 unsigned char setoldcursor; 2069 bool setoldcursor;
1969 rend_t ccol1, /* Cursor colour */
1970 ccol2; /* Cursor colour2 */
1971 2070
1972 showcursor = (screen.flags & Screen_VisibleCursor);
1973#ifdef CURSOR_BLINK 2071#ifdef CURSOR_BLINK
1974 if (hidden_cursor) 2072 if (hidden_cursor)
1975 showcursor = 0; 2073 showcursor = 0;
1976#endif 2074#endif
1977 2075
… …
1982 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2080 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1983 col--; 2081 col--;
1984 2082
1985 crp = &ROW(screen.cur.row).r[col]; 2083 crp = &ROW(screen.cur.row).r[col];
1986 2084
1987 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)
1988 { 2109 {
1989 if (OPTION (Opt_cursorUnderline)) 2110 if (option (Opt_cursorUnderline))
1990 *crp ^= RS_Uline; 2111 *crp ^= RS_Uline;
1991 else 2112 else
1992 { 2113 {
1993 *crp ^= RS_RVid; 2114 *crp ^= RS_RVid;
1994
1995#ifndef NO_CURSORCOLOR
1996 cc1 = *crp & (RS_fgMask | RS_bgMask);
1997 if (ISSET_PIXCOLOR (Color_cursor))
1998 ccol1 = Color_cursor;
1999 else
2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2001 ccol1 = fgcolor_of (rstyle);
2002#else
2003 ccol1 = Color_fg;
2004#endif
2005 if (ISSET_PIXCOLOR (Color_cursor2))
2006 ccol2 = Color_cursor2;
2007 else
2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2009 ccol2 = bgcolor_of (rstyle);
2010#else
2011 ccol2 = Color_bg;
2012#endif
2013 *crp = SET_FGCOLOR (*crp, ccol1); 2115 *crp = SET_FGCOLOR (*crp, ccol1);
2014 *crp = SET_BGCOLOR (*crp, ccol2); 2116 *crp = SET_BGCOLOR (*crp, ccol2);
2015#endif
2016 } 2117 }
2017 } 2118 }
2018 } 2119 }
2019 2120
2020 /* make sure no outline cursor is left around */ 2121 /* make sure no outline cursor is left around */
2021 setoldcursor = 0; 2122 setoldcursor = 0;
2022 if (ocrow != -1) 2123 if (ocrow != -1)
2023 { 2124 {
2024 if (screen.cur.row + view_start != ocrow 2125 if (screen.cur.row - view_start != ocrow
2025 || screen.cur.col != oldcursor.col) 2126 || screen.cur.col != oldcursor.col)
2026 { 2127 {
2027 if (ocrow < nrow 2128 if (ocrow < nrow
2028 && oldcursor.col < ncol) 2129 && oldcursor.col < ncol)
2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2130 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2037 else if (!focus) 2138 else if (!focus)
2038 setoldcursor = 1; 2139 setoldcursor = 1;
2039 2140
2040 if (setoldcursor) 2141 if (setoldcursor)
2041 { 2142 {
2042 if (screen.cur.row + view_start >= nrow) 2143 if (screen.cur.row - view_start >= nrow)
2043 oldcursor.row = -1; 2144 oldcursor.row = -1;
2044 else 2145 else
2045 { 2146 {
2046 oldcursor.row = screen.cur.row + view_start; 2147 oldcursor.row = screen.cur.row - view_start;
2047 oldcursor.col = screen.cur.col; 2148 oldcursor.col = screen.cur.col;
2048 } 2149 }
2049 } 2150 }
2050 } 2151 }
2051
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053#if ENABLE_OVERLAY
2054 scr_swap_overlay ();
2055#endif
2056 2152
2057#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2058 /* 2154 /*
2059 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2060 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
2061 */ 2157 */
2062 i = num_scr;
2063 if (!display->is_local 2158 if (!display->is_local
2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2159 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2065 && abs (num_scr) < nrow && !must_clear) 2160 && abs (num_scr) < nrow && !have_bg)
2066 { 2161 {
2067 int16_t nits; 2162 int16_t nits;
2163 int i = num_scr;
2068 int j; 2164 int j;
2069 int len, wlen; 2165 int len, wlen;
2166 dLocal (int, num_scr);
2070 2167
2071 j = nrow; 2168 j = nrow;
2072 wlen = len = -1; 2169 wlen = len = -1;
2073 row = i > 0 ? 0 : j - 1; 2170 row = i > 0 ? 0 : j - 1;
2171
2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2172 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2075 { 2173 {
2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2174 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2077 { 2175 {
2078 line_t s = ROW(row - view_start); 2176 line_t s = ROW(view_start + row);
2079 line_t d = drawn_buf[row]; 2177 line_t d = drawn_buf[row];
2080 line_t d2 = drawn_buf[row + i]; 2178 line_t d2 = drawn_buf[row + i];
2081 2179
2082 for (nits = 0, col = ncol; col--; ) 2180 for (nits = 0, col = ncol; col--; )
2083 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])
… …
2099 wlen = row; 2197 wlen = row;
2100 continue; 2198 continue;
2101 } 2199 }
2102 } 2200 }
2103 2201
2104 if (len != -1) 2202 if (len >= 0)
2105 { 2203 {
2106 /* also comes here at end if needed because of >= above */ 2204 /* also comes here at end if needed because of >= above */
2107 if (wlen < len) 2205 if (wlen < len)
2108 ::swap (wlen, len); 2206 ::swap (wlen, len);
2109 2207
2208 XGCValues gcv;
2209
2210 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2110 XCopyArea (display->display, vt, vt, 2211 XCopyArea (dpy, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2212 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)this->width, 2213 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2214 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2215 0, Row2Pixel (len));
2216 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2217
2115 len = -1; 2218 len = -1;
2116 } 2219 }
2117 } 2220 }
2118 } 2221 }
2119#endif 2222#endif
… …
2121 /* 2224 /*
2122 * E: main pass across every character 2225 * E: main pass across every character
2123 */ 2226 */
2124 for (row = 0; row < nrow; row++) 2227 for (row = 0; row < nrow; row++)
2125 { 2228 {
2126 text_t *stp = ROW(row - view_start).t; 2229 text_t *stp = ROW(view_start + row).t;
2127 rend_t *srp = ROW(row - view_start).r; 2230 rend_t *srp = ROW(view_start + row).r;
2128 text_t *dtp = drawn_buf[row].t; 2231 text_t *dtp = drawn_buf[row].t;
2129 rend_t *drp = drawn_buf[row].r; 2232 rend_t *drp = drawn_buf[row].r;
2130 2233
2131 /* 2234 /*
2132 * E2: OK, now the real pass 2235 * E2: OK, now the real pass
… …
2143 continue; 2246 continue;
2144 2247
2145 // redraw one or more characters 2248 // redraw one or more characters
2146 2249
2147 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
2148 while (stp[col] == NOCHAR && col > 0) 2251 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2149 --col; 2252 --col;
2150 2253
2151 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2152 text_t *text = stp + col; 2255 text_t *text = stp + col;
2153 int count = 1; 2256 int count = 1;
2154 2257
2155 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2156 drp[col] = rend; 2259 drp[col] = rend;
… …
2160 for (i = 0; ++col < ncol; ) 2263 for (i = 0; ++col < ncol; )
2161 { 2264 {
2162 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2163 { 2266 {
2164 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2165 drp[col] = rend; 2268 drp[col] = srp[col];
2269
2166 count++; 2270 count++;
2167 i++; 2271 i++;
2168 2272
2169 continue; 2273 continue;
2170 } 2274 }
… …
2175 count++; 2279 count++;
2176 2280
2177 if (stp[col] != dtp[col] 2281 if (stp[col] != dtp[col]
2178 || !RS_SAME (srp[col], drp[col])) 2282 || !RS_SAME (srp[col], drp[col]))
2179 { 2283 {
2180 if (must_clear && (i++ > count / 2)) 2284 if (have_bg && (i++ > count / 2))
2181 break; 2285 break;
2182 2286
2183 dtp[col] = stp[col]; 2287 dtp[col] = stp[col];
2184 drp[col] = rend; 2288 drp[col] = rend;
2185 i = 0; 2289 i = 0;
2186 } 2290 }
2187 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2291 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2188 break; 2292 break;
2189 } 2293 }
2190 2294
2191 col--; /* went one too far. move back */ 2295 col--; /* went one too far. move back */
2192 count -= i; /* dump any matching trailing chars */ 2296 count -= i; /* dump any matching trailing chars */
2193 2297
2194 // sometimes we optimize away the trailing NOCHAR's, add them back 2298 // sometimes we optimize away the trailing NOCHAR's, add them back
2195 while (i && text[count] == NOCHAR) 2299 while (ecb_unlikely (i && text[count] == NOCHAR))
2196 count++, i--; 2300 count++, i--;
2197 2301
2198 /* 2302 /*
2199 * Determine the attributes for the string 2303 * Determine the attributes for the string
2200 */ 2304 */
2201 int fore = fgcolor_of (rend); // desired foreground 2305 int fore = fgcolor_of (rend); // desired foreground
2202 int back = bgcolor_of (rend); // desired background 2306 int back = bgcolor_of (rend); // desired background
2203 2307
2204 // 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
2205 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)))
2206 { 2310 {
2207#if ENABLE_STYLES
2208 // force redraw after "careful" characters to avoid pixel droppings
2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2210 drp[col + 1] = ~srp[col + 1];
2211
2212 // include previous careful character(s) if possible, looks nicer (best effort...)
2213 while (text > stp
2214 && srp[text - stp - 1] & RS_Careful
2215 && RS_SAME (rend, srp[text - stp - 1]))
2216 text--, count++, xpixel -= fwidth;
2217#endif
2218
2219 bool invert = rend & RS_RVid; 2311 bool invert = rend & RS_RVid;
2220 2312
2221#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2222 if (rend & RS_Bold
2223 && fore == Color_fg) 2314 if (rend & RS_Bold && fore == Color_fg)
2224 { 2315 {
2225 if (ISSET_PIXCOLOR (Color_BD)) 2316 if (ISSET_PIXCOLOR (Color_BD))
2226 fore = Color_BD; 2317 fore = Color_BD;
2227# if !ENABLE_STYLES 2318# if !ENABLE_STYLES
2228 else 2319 else
2229 invert = !invert; 2320 invert = !invert;
2230# endif 2321# endif
2231 } 2322 }
2232 2323
2233 if (rend & RS_Italic 2324 if (rend & RS_Italic && fore == Color_fg)
2234 && fore == Color_fg)
2235 { 2325 {
2236 if (ISSET_PIXCOLOR (Color_IT)) 2326 if (ISSET_PIXCOLOR (Color_IT))
2237 fore = Color_IT; 2327 fore = Color_IT;
2238# if !ENABLE_STYLES 2328# if !ENABLE_STYLES
2239 else 2329 else
2240 invert = !invert; 2330 invert = !invert;
2241# endif 2331# endif
2242 } 2332 }
2243 2333
2244 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2334 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2245 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 }
2246#endif 2356#endif
2247 2357
2248 if (invert) 2358 if (invert)
2249 { 2359 {
2250 ::swap (fore, back); 2360 ::swap (fore, back);
2251 2361
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2362#ifndef NO_BOLD_UNDERLINE_REVERSE
2253 if (ISSET_PIXCOLOR (Color_RV))
2254 back = Color_RV;
2255
2256 if (fore == back) 2363 if (fore == back)
2257 { 2364 {
2258 fore = Color_bg; 2365 fore = Color_bg;
2259 back = Color_fg; 2366 back = Color_fg;
2260 } 2367 }
… …
2262 } 2369 }
2263 2370
2264#ifdef TEXT_BLINK 2371#ifdef TEXT_BLINK
2265 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2372 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2266 { 2373 {
2267 if (!text_blink_ev.active) 2374 if (!text_blink_ev.is_active ())
2268 { 2375 {
2269 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2376 text_blink_ev.again ();
2270 hidden_text = 0; 2377 hidden_text = 0;
2271 } 2378 }
2272 else if (hidden_text) 2379 else if (hidden_text)
2273 fore = back; 2380 fore = back;
2274 } 2381 }
2275#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
2276 } 2401 }
2277 2402
2278 /* 2403 /*
2279 * Actually do the drawing of the string here 2404 * Actually do the drawing of the string here
2280 */ 2405 */
2281 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2406 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2282 2407
2283 if (back == fore) 2408 if (ecb_likely (have_bg && back == Color_bg))
2284 font->clear_rect (*drawable, xpixel, ypixel,
2285 fwidth * count, fheight,
2286 back);
2287 else if (back == Color_bg)
2288 { 2409 {
2289 if (must_clear) 2410 // this is very ugly, maybe push it into ->draw?
2290 {
2291 CLEAR_CHARS (xpixel, ypixel, count);
2292 2411
2293 for (i = 0; i < count; i++) /* don't draw empty strings */ 2412 for (i = 0; i < count; i++) /* don't draw empty strings */
2294 if (text[i] != ' ') 2413 if (text[i] != ' ')
2295 { 2414 {
2296 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2415 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2297 break; 2416 goto did_clear;
2298 }
2299 } 2417 }
2300 else 2418
2301 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2419 CLEAR_CHARS (xpixel, ypixel, count);
2420 did_clear: ;
2302 } 2421 }
2303 else 2422 else
2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2305 2424
2306 if (rend & RS_Uline && font->descent > 1 && fore != back) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2307 { 2426 {
2308#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2309 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2310 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2311 else 2430 else
2312#endif 2431#endif
2313 XSetForeground (display->display, gc, pix_colors[fore]); 2432 XSetForeground (dpy, gc, pix_colors[fore]);
2314 2433
2315 XDrawLine (display->display, drawBuffer, gc, 2434 XDrawLine (dpy, vt, gc,
2316 xpixel, ypixel + font->ascent + 1, 2435 xpixel, ypixel + font->ascent + 1,
2317 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2436 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2318 } 2437 }
2319 } /* for (col....) */ 2438 } /* for (col....) */
2320 } /* for (row....) */ 2439 } /* for (row....) */
2321 2440
2322#if ENABLE_OVERLAY
2323 scr_swap_overlay ();
2324#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326
2327 /* 2441 /*
2328 * G: cleanup cursor and display outline cursor if necessary 2442 * G: cleanup cursor and display outline cursor if necessary
2329 */ 2443 */
2330 if (showcursor) 2444 if (showcursor)
2331 { 2445 {
2332 if (focus) 2446 if (focus)
2333 { 2447 {
2334 if (OPTION (Opt_cursorUnderline)) 2448 if (option (Opt_cursorUnderline))
2335 *crp ^= RS_Uline; 2449 *crp ^= RS_Uline;
2336 else 2450 else
2337 { 2451 {
2338 *crp ^= RS_RVid; 2452 *crp ^= RS_RVid;
2339#ifndef NO_CURSORCOLOR 2453#ifndef NO_CURSORCOLOR
… …
2353 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2467 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2354 cursorwidth++; 2468 cursorwidth++;
2355 2469
2356#ifndef NO_CURSORCOLOR 2470#ifndef NO_CURSORCOLOR
2357 if (ISSET_PIXCOLOR (Color_cursor)) 2471 if (ISSET_PIXCOLOR (Color_cursor))
2358 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2472 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2473 else
2359#endif 2474#endif
2475 XSetForeground (dpy, gc, pix_colors[ccol1]);
2360 2476
2361 XDrawRectangle (display->display, drawBuffer, gc, 2477 XDrawRectangle (dpy, vt, gc,
2362 Col2Pixel (col), 2478 Col2Pixel (col),
2363 Row2Pixel (oldcursor.row), 2479 Row2Pixel (oldcursor.row),
2364 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2480 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2365 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2481 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2366 } 2482 }
2367 } 2483 }
2368 2484
2369 /* 2485 /*
2370 * H: cleanup selection 2486 * H: cleanup selection
2371 */ 2487 */
2488#if ENABLE_OVERLAY
2489 scr_swap_overlay ();
2490#endif
2491 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2492
2372 scr_reverse_selection (); 2493 scr_reverse_selection ();
2373 2494
2374 if (refresh_type & SMOOTH_REFRESH) 2495 screen.flags = old_screen_flags;
2375 XFlush (display->display);
2376
2377 num_scr = 0; 2496 num_scr = 0;
2378 num_scr_allow = 1; 2497 num_scr_allow = 1;
2379} 2498}
2380 2499
2381void 2500void
2382rxvt_term::scr_remap_chars (const line_t &l) 2501rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2383{ 2502{
2384 if (!l.t) 2503 if (!l.t)
2385 return; 2504 return;
2386 2505
2506 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2507
2387 for (int i = ncol; i--; ) 2508 for (int i = ncol; i--; )
2388 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]));
2389} 2510}
2390 2511
2391void 2512void
2392rxvt_term::scr_remap_chars () 2513rxvt_term::scr_remap_chars () NOTHROW
2393{ 2514{
2394 for (int i = total_rows; i--; ) 2515 for (int i = total_rows; i--; )
2395 scr_remap_chars (row_buf [i]); 2516 scr_remap_chars (row_buf [i]);
2396 2517
2397 for (int i = nrow; i--; ) 2518 for (int i = nrow; i--; )
… …
2400 scr_remap_chars (swap_buf [i]); 2521 scr_remap_chars (swap_buf [i]);
2401 } 2522 }
2402} 2523}
2403 2524
2404void 2525void
2405rxvt_term::scr_recolour () 2526rxvt_term::scr_recolour (bool refresh) NOTHROW
2406{ 2527{
2407 if (1 2528 bool transparent = false;
2408#if TRANSPARENT 2529
2409 && !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
2410#endif 2542# endif
2411#if XPM_BACKGROUND
2412 && !bgPixmap.pixmap
2413#endif
2414 ) 2543 {
2544 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2545 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2546 }
2415 { 2547 }
2548 else
2549#endif
2550 {
2416 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2417 XClearWindow (display->display, parent[0]);
2418 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2552 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2419#if HAVE_SCROLLBARS 2553 }
2554
2555 XClearWindow (dpy, parent);
2556
2420 if (scrollBar.win) 2557 if (scrollBar.win)
2421 { 2558 {
2559 if (transparent)
2560 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2561 else
2422 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2423 scrollBar.setIdle (); 2563 scrollBar.state = SB_STATE_IDLE;
2424 scrollbar_show (0); 2564 scrollBar.show (0);
2425 } 2565 }
2426#endif 2566
2567 if (refresh)
2427 } 2568 {
2428
2429 scr_clear (); 2569 scr_clear ();
2430 scr_touch (true); 2570 scr_touch (true);
2571 }
2431 want_refresh = 1; 2572 want_refresh = 1;
2432} 2573}
2433 2574
2434/* ------------------------------------------------------------------------- */ 2575/* ------------------------------------------------------------------------- */
2435void 2576void
2436rxvt_term::scr_clear (bool really) 2577rxvt_term::scr_clear (bool really) NOTHROW
2437{ 2578{
2438 if (!mapped) 2579 if (!mapped)
2439 return; 2580 return;
2440 2581
2441 num_scr_allow = 0; 2582 num_scr_allow = 0;
2442 want_refresh = 1; 2583 want_refresh = 1;
2443 2584
2444 if (really) 2585 if (really)
2445 XClearWindow (display->display, vt); 2586 XClearWindow (dpy, vt);
2446} 2587}
2447 2588
2448/* ------------------------------------------------------------------------- */
2449void 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
2450rxvt_term::scr_reverse_selection () 2639rxvt_term::scr_reverse_selection () NOTHROW
2451{ 2640{
2452 if (selection.op 2641 if (selection.op
2453 && current_screen == selection.screen 2642 && current_screen == selection.screen
2454 && selection.end.row >= -view_start) 2643 && selection.end.row >= view_start)
2455 { 2644 {
2456 int view_end = -view_start + nrow; 2645#if !ENABLE_MINIMAL
2457 int row, col;
2458
2459#if ENABLE_FRILLS
2460 if (selection.rect) 2646 if (selection.rect)
2461 { 2647 scr_xor_rect (selection.beg.row, selection.beg.col,
2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2648 selection.end.row, selection.end.col,
2463 { 2649 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2467 for (col = selection.beg.col; col < selection.end.col; col++)
2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2476 }
2477 else 2650 else
2478#endif 2651#endif
2479 { 2652 scr_xor_span (selection.beg.row, selection.beg.col,
2480 if (selection.beg.row >= -view_start) 2653 selection.end.row, selection.end.col,
2481 { 2654 RS_Sel | RS_RVid);
2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2485 else
2486 {
2487 col = 0;
2488 row = -view_start;
2489 }
2490
2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2493 srp[col] ^= RS_RVid;
2494
2495 if (row == selection.end.row)
2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2497 srp[col] ^= RS_RVid;
2498 }
2499 } 2655 }
2500} 2656}
2501 2657
2502/* ------------------------------------------------------------------------- */ 2658/* ------------------------------------------------------------------------- */
2503/* 2659/*
2504 * Dump the whole scrollback and screen to the passed filedescriptor. The 2660 * Dump the whole scrollback and screen to the passed filedescriptor. The
2505 * invoking routine must close the fd. 2661 * invoking routine must close the fd.
2506 */ 2662 */
2507#if 0 2663#if 0
2508void 2664void
2509rxvt_term::scr_dump (int fd) 2665rxvt_term::scr_dump (int fd) NOTHROW
2510{ 2666{
2511 int row, wrote; 2667 int row, wrote;
2512 unsigned int width, towrite; 2668 unsigned int width, towrite;
2513 char r1[] = "\n"; 2669 const char r1[] = "\n";
2514 2670
2515 for (row = saveLines - nsaved; 2671 for (row = saveLines + top_row;
2516 row < saveLines + nrow - 1; row++) 2672 row < saveLines + nrow - 1; row++)
2517 { 2673 {
2518 width = row_buf[row].l >= 0 ? row_buf[row].l 2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2519 : ncol; 2675 : ncol;
2520 for (towrite = width; towrite; towrite -= wrote) 2676 for (towrite = width; towrite; towrite -= wrote)
… …
2533 2689
2534/* ------------------------------------------------------------------------- * 2690/* ------------------------------------------------------------------------- *
2535 * CHARACTER SELECTION * 2691 * CHARACTER SELECTION *
2536 * ------------------------------------------------------------------------- */ 2692 * ------------------------------------------------------------------------- */
2537void 2693void
2538rxvt_term::selection_check (int check_more) 2694rxvt_term::selection_check (int check_more) NOTHROW
2539{ 2695{
2540 row_col_t pos;
2541
2542 if (!selection.op) 2696 if (!selection.op)
2543 return; 2697 return;
2544 2698
2699 row_col_t pos;
2545 pos.row = pos.col = 0; 2700 pos.row = pos.col = 0;
2701
2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow)
2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2549 || (check_more == 1 2704 || (check_more == 1
2550 && current_screen == selection.screen 2705 && current_screen == selection.screen
2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2706 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2553 || (check_more == 2 2708 || (check_more == 2
2554 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2555 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
2556 || (check_more == 3 2711 || (check_more == 3
2557 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && ROWCOL_IS_AFTER (selection.end, pos)))
2558 || (check_more == 4 /* screen width change */
2559 && (selection.beg.row != selection.end.row
2560 || selection.end.col > ncol)))
2561 CLEAR_SELECTION (); 2713 CLEAR_SELECTION ();
2714
2715 if (!IN_RANGE_EXC (selection.mark.row, top_row, nrow))
2716 CLEAR_SELECTION_MARK ();
2562} 2717}
2563 2718
2564/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2565/* 2720/*
2566 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
2567 */ 2722 */
2568void 2723void
2569rxvt_term::paste (char *data, unsigned int len) 2724rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2570{ 2725{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2726 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2727 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2728 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2729 data[i] = C0_CR;
2575 2730
2731 if (priv_modes & PrivMode_BracketPaste)
2732 tt_printf ("\e[200~");
2733
2576 tt_write (data, len); 2734 tt_write (data, len);
2577}
2578 2735
2579/* ------------------------------------------------------------------------- */ 2736 if (priv_modes & PrivMode_BracketPaste)
2580/* 2737 tt_printf ("\e[201~");
2581 * Respond to a notification that a primary selection has been sent
2582 * EXT: SelectionNotify
2583 */
2584void
2585rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2586{
2587 if (prop == None) /* check for failed XConvertSelection */
2588 {
2589 if ((selection_type & Sel_CompoundText))
2590 {
2591 int selnum = selection_type & Sel_whereMask;
2592
2593 selection_type = 0;
2594 if (selnum != Sel_direct)
2595 selection_request_other (XA_STRING, selnum);
2596 }
2597
2598 if ((selection_type & Sel_UTF8String))
2599 {
2600 int selnum = selection_type & Sel_whereMask;
2601
2602 selection_type = Sel_CompoundText;
2603 if (selnum != Sel_direct)
2604 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2605 else
2606 selection_type = 0;
2607 }
2608
2609 return;
2610 }
2611
2612 unsigned long bytes_after;
2613 XTextProperty ct;
2614
2615 if (XGetWindowProperty (display->display, win, prop,
2616 0, PROP_SIZE / 4,
2617 delete_prop, AnyPropertyType,
2618 &ct.encoding, &ct.format,
2619 &ct.nitems, &bytes_after,
2620 &ct.value) != Success)
2621 {
2622 ct.value = 0;
2623 goto bailout;
2624 }
2625
2626 if (ct.encoding == None)
2627 goto bailout;
2628
2629 if (bytes_after)
2630 {
2631 // fetch and append remaining data
2632 XTextProperty ct2;
2633
2634 if (XGetWindowProperty (display->display, win, prop,
2635 ct.nitems / 4, (bytes_after + 3) / 4,
2636 delete_prop, AnyPropertyType,
2637 &ct2.encoding, &ct2.format,
2638 &ct2.nitems, &bytes_after,
2639 &ct2.value) != Success)
2640 goto bailout;
2641
2642 // realloc should be compatible to XFree, here, and elsewhere, too
2643 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2644 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2645 ct.nitems += ct2.nitems;
2646
2647 XFree (ct2.value);
2648 }
2649
2650 if (ct.value == 0)
2651 goto bailout;
2652
2653 if (ct.encoding == xa[XA_INCR])
2654 {
2655 // INCR selection, start handshake
2656 if (!delete_prop)
2657 XDeleteProperty (display->display, win, prop);
2658
2659 selection_wait = Sel_incr;
2660 incr_buf_fill = 0;
2661 incr_ev.start (NOW + 10);
2662
2663 goto bailout;
2664 }
2665
2666 if (ct.nitems == 0)
2667 {
2668 if (selection_wait == Sel_incr)
2669 {
2670 XFree (ct.value);
2671
2672 // finally complete, now paste the whole thing
2673 selection_wait = Sel_normal;
2674 ct.value = (unsigned char *)incr_buf;
2675 ct.nitems = incr_buf_fill;
2676 incr_buf = 0;
2677 incr_buf_size = 0;
2678 incr_ev.stop ();
2679 }
2680 else
2681 {
2682 if (selection_wait == Sel_normal
2683 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2684 {
2685 /*
2686 * pass through again trying CUT_BUFFER0 if we've come from
2687 * XConvertSelection () but nothing was presented
2688 */
2689 selection_paste (display->root, XA_CUT_BUFFER0, False);
2690 }
2691
2692 goto bailout;
2693 }
2694 }
2695 else if (selection_wait == Sel_incr)
2696 {
2697 incr_ev.start (NOW + 10);
2698
2699 while (incr_buf_fill + ct.nitems > incr_buf_size)
2700 {
2701 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2702 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2703 }
2704
2705 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2706 incr_buf_fill += ct.nitems;
2707
2708 goto bailout;
2709 }
2710
2711 char **cl;
2712 int cr;
2713
2714#if ENABLE_FRILLS
2715 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2716 // so recode it manually
2717 if (ct.encoding == xa[XA_UTF8_STRING])
2718 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w);
2721 free (w);
2722 // TODO: strlen == only the first element will be converted. well...
2723 paste (s, strlen (s));
2724 free (s);
2725 }
2726 else
2727#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729 && cl)
2730 {
2731 for (int i = 0; i < cr; i++)
2732 paste (cl[i], strlen (cl[i]));
2733
2734 XFreeStringList (cl);
2735 }
2736 else
2737 paste ((char *)ct.value, ct.nitems); // paste raw
2738
2739bailout:
2740 XFree (ct.value);
2741
2742 if (selection_wait == Sel_normal)
2743 selection_wait = Sel_none;
2744} 2738}
2745 2739
2746void 2740void
2747rxvt_term::incr_cb (time_watcher &w) 2741rxvt_term::paste (char *data, unsigned int len) NOTHROW
2748{ 2742{
2749 selection_wait = Sel_none; 2743 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2750
2751 incr_buf_size = 0;
2752 free (incr_buf);
2753
2754 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2755}
2756
2757void
2758rxvt_term::selection_property (Window win, Atom prop)
2759{
2760 if (prop == None || selection_wait != Sel_incr)
2761 return; 2744 return;
2762 2745
2763 selection_paste (win, prop, true); 2746 tt_paste (data, len);
2764} 2747}
2765 2748
2766/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2767/* 2750/*
2768 * Request the current selection: 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2769 * Order: > internal selection if available 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2770 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2753 * as fallback
2771 * > CUT_BUFFER0
2772 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2773 * will auto fallback to CUT_BUFFER0
2774 * EXT: button 2 release 2754 * EXT: button 2 release
2775 */ 2755 */
2776void 2756void
2777rxvt_term::selection_request (Time tm, int x, int y) 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2778{ 2758{
2779 if (x < 0 || x >= width || y < 0 || y >= height)
2780 return; /* outside window */
2781
2782 if (selection.text) 2759 if (!selection_req)
2783 { /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste (str, strlen (str));
2786 free (str);
2787 return;
2788 } 2760 {
2789 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2790 { 2763 }
2791 int i;
2792
2793 selection_request_time = tm;
2794 selection_wait = Sel_normal;
2795
2796 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2797 {
2798#if X_HAVE_UTF8_STRING
2799 selection_type = Sel_UTF8String;
2800 if (selection_request_other (xa[XA_UTF8_STRING], i))
2801 return;
2802#else
2803 selection_type = Sel_CompoundText;
2804 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2805 return;
2806#endif
2807 }
2808 }
2809
2810 selection_wait = Sel_none; /* don't loop in selection_paste () */
2811 selection_paste (display->root, XA_CUT_BUFFER0, false);
2812}
2813
2814int
2815rxvt_term::selection_request_other (Atom target, int selnum)
2816{
2817 Atom sel;
2818
2819 selection_type |= selnum;
2820
2821 if (selnum == Sel_Primary)
2822 sel = XA_PRIMARY;
2823 else if (selnum == Sel_Secondary)
2824 sel = XA_SECONDARY;
2825 else
2826 sel = xa[XA_CLIPBOARD];
2827
2828 if (XGetSelectionOwner (display->display, sel) != None)
2829 {
2830 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2831 vt, selection_request_time);
2832 return 1;
2833 }
2834
2835 return 0;
2836} 2764}
2837 2765
2838/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2839/* 2767/*
2840 * Clear all selected text 2768 * Clear all selected text
2841 * EXT: SelectionClear 2769 * EXT: SelectionClear
2842 */ 2770 */
2843void 2771void
2844rxvt_term::selection_clear () 2772rxvt_term::selection_clear (bool clipboard) NOTHROW
2845{ 2773{
2774 if (!clipboard)
2775 {
2846 want_refresh = 1; 2776 want_refresh = 1;
2847 free (selection.text); 2777 free (selection.text);
2848 selection.text = NULL; 2778 selection.text = NULL;
2849 selection.len = 0; 2779 selection.len = 0;
2850 CLEAR_SELECTION (); 2780 CLEAR_SELECTION ();
2851 2781
2852 if (display->selection_owner == this) 2782 if (display->selection_owner == this)
2853 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 }
2854} 2794}
2855 2795
2856/* ------------------------------------------------------------------------- */ 2796/* ------------------------------------------------------------------------- */
2857/* 2797/*
2858 * Copy a selection into the cut buffer 2798 * Copy a selection into the cut buffer
2859 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2860 */ 2800 */
2861void 2801void
2862rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
2863{ 2803{
2864 int i; 2804 int size;
2865 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
2866 text_t *t; 2806 text_t *t;
2867 2807
2868 switch (selection.op) 2808 switch (selection.op)
2869 { 2809 {
… …
2882 selection.op = SELECTION_DONE; 2822 selection.op = SELECTION_DONE;
2883 2823
2884 if (selection.clicks == 4) 2824 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
2886 2826
2887 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)))
2888 return; 2828 return;
2889 2829
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 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));
2892 2832
2893 int ofs = 0; 2833 int ofs = 0;
2894 int extra = 0; 2834 int extra = 0;
2895 2835
2896 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
2898 2838
2899 int end_col; 2839 int end_col;
2900 2840
2901 for (; row <= selection.end.row; row++, col = 0) 2841 for (; row <= selection.end.row; row++, col = 0)
2902 { 2842 {
2903#if ENABLE_FRILLS 2843#if !ENABLE_MINIMAL
2904 if (selection.rect) 2844 if (selection.rect)
2905 { 2845 {
2906 col = selection.beg.col; 2846 col = selection.beg.col;
2907 end_col = ncol + 1; 2847 end_col = selection.end.col;
2908 } 2848 }
2909 else 2849 else
2910#endif 2850#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2851 end_col = ROW(row).l;
2912 2852
2913 col = max (col, 0); 2853 col = max (col, 0);
2914 2854
2915 if (row == selection.end.row 2855 if (row == selection.end.row)
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
2919 )
2920 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
2921 2857
2922 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
2859
2923 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
2924 { 2861 {
2925 if (*t == NOCHAR) 2862 if (*t == NOCHAR)
2926 t++; 2863 t++;
2927#if ENABLE_COMBINING 2864#if ENABLE_COMBINING
… …
2931 2868
2932 extra -= (len - 1); 2869 extra -= (len - 1);
2933 2870
2934 if (extra < 0) 2871 if (extra < 0)
2935 { 2872 {
2936 extra += i; 2873 extra += size;
2937 i += i; 2874 size += size;
2938 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));
2939 } 2876 }
2940 2877
2941 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2942 } 2879 }
2943#endif 2880#endif
2944 else 2881 else
2945 new_selection_text[ofs++] = *t++; 2882 new_selection_text[ofs++] = *t++;
2946 } 2883 }
2947 2884
2948#if ENABLE_FRILLS 2885#if !ENABLE_MINIMAL
2949 if (selection.rect) 2886 if (selection.rect)
2950 { 2887 {
2951 while (ofs 2888 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF 2889 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1])) 2890 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2955 2892
2956 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
2957 } 2894 }
2958 else 2895 else
2959#endif 2896#endif
2960 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))
2961 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
2962 } 2901 }
2963
2964 if (end_col != selection.end.col)
2965 new_selection_text[ofs++] = C0_LF;
2966 2902
2967 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
2968 2904
2969 if (ofs == 0) 2905 if (ofs == 0)
2970 { 2906 {
… …
2976 2912
2977 // 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
2978 selection.len = ofs; 2914 selection.len = ofs;
2979 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));
2980 2916
2981 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)))
2982 return; 2918 return;
2983 2919
2984 selection_grab (tm); 2920 selection_grab (tm);
2985} 2921}
2986 2922
2987bool 2923bool
2988rxvt_term::selection_grab (Time tm) 2924rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
2989{ 2925{
2926 Atom sel;
2927
2928 if (!clipboard)
2929 {
2990 selection_time = tm; 2930 selection_time = tm;
2991 2931 sel = XA_PRIMARY;
2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 { 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 {
2995 display->set_selection_owner (this); 2942 display->set_selection_owner (this, clipboard);
2996 return true; 2943 return true;
2997 } 2944 }
2998 else 2945 else
2946 {
2947 selection_clear (clipboard);
2999 return false; 2948 return false;
2949 }
3000 2950
3001#if 0 2951#if 0
3002 XTextProperty ct; 2952 XTextProperty ct;
3003 2953
3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2954 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3005 { 2955 {
3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2956 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3007 XFree (ct.value); 2957 XFree (ct.value);
3008 } 2958 }
3009#endif 2959#endif
… …
3013/* 2963/*
3014 * 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
3015 * EXT: button 1 press 2965 * EXT: button 1 press
3016 */ 2966 */
3017void 2967void
3018rxvt_term::selection_click (int clicks, int x, int y) 2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3019{ 2969{
3020 clicks = ((clicks - 1) % 3) + 1; 2970 clicks = ((clicks - 1) % 3) + 1;
3021 selection.clicks = clicks; /* save clicks so extend will work */ 2971 selection.clicks = clicks; /* save clicks so extend will work */
3022 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
3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2982 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3024 2983
3025 if (clicks == 2 || clicks == 3) 2984 if (clicks == 2 || clicks == 3)
3026 selection_extend_colrow (selection.mark.col, 2985 selection_extend_colrow (selection.mark.col,
3027 selection.mark.row + view_start, 2986 selection.mark.row - view_start,
3028 0, /* button 3 */ 2987 0, /* button 3 */
3029 1, /* button press */ 2988 1, /* button press */
3030 0); /* click change */ 2989 0); /* click change */
3031} 2990}
3032 2991
3033/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
3034/* 2993/*
3035 * Mark a selection at the specified col/row 2994 * Mark a selection at the specified col/row
3036 */ 2995 */
3037void 2996void
3038rxvt_term::selection_start_colrow (int col, int row) 2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3039{ 2998{
3040 want_refresh = 1; 2999 want_refresh = 1;
3041 3000
3042 selection.mark.row = row - view_start; 3001 selection.mark.row = row + view_start;
3043 selection.mark.col = col; 3002 selection.mark.col = col;
3044 3003
3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3004 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3005 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3047 3006
3048 while (selection.mark.col > 0 3007 while (selection.mark.col > 0
3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3008 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3050 --selection.mark.col; 3009 --selection.mark.col;
3051 3010
3052 if (selection.op) 3011 if (selection.op)
3012 {
3053 { /* clear the old selection */ 3013 /* clear the old selection */
3054 selection.beg.row = selection.end.row = selection.mark.row; 3014 selection.beg.row = selection.end.row = selection.mark.row;
3055 selection.beg.col = selection.end.col = selection.mark.col; 3015 selection.beg.col = selection.end.col = selection.mark.col;
3056 } 3016 }
3057 3017
3058 selection.op = SELECTION_INIT; 3018 selection.op = SELECTION_INIT;
… …
3069#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3070 (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)))
3071#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3072 3032
3073void 3033void
3074rxvt_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
3075{ 3035{
3076 int col, row, dirnadd, tcol, trow, w1, w2; 3036 int col, row, dirnadd, tcol, trow, w1, w2;
3077 row_col_t bound; 3037 row_col_t bound;
3078 text_t *stp; 3038 text_t *stp;
3079 rend_t *srp; 3039 rend_t *srp;
3080 3040
3081 if (dirn == UP) 3041 if (dirn == UP)
3082 { 3042 {
3083 bound.row = - nsaved - 1; 3043 bound.row = top_row - 1;
3084 bound.col = 0; 3044 bound.col = 0;
3085 dirnadd = -1; 3045 dirnadd = -1;
3086 } 3046 }
3087 else 3047 else
3088 { 3048 {
… …
3136 } 3096 }
3137 } 3097 }
3138 break; 3098 break;
3139 } 3099 }
3140 3100
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3101 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3102 col++; /* put us on one past the end */
3144 3103
3145 /* Poke the values back in */ 3104 /* Poke the values back in */
3146 ret->row = row; 3105 ret->row = row;
… …
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