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

Diff Legend

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