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

Diff Legend

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