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