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

Diff Legend

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