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.211 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.316 by root, Tue Nov 4 15:02:35 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-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a 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);
132
133 l.l = 0;
134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
150} 154}
151 155
152/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
… …
158{ 162{
159#if ENABLE_OVERLAY 163#if ENABLE_OVERLAY
160 scr_overlay_off (); 164 scr_overlay_off ();
161#endif 165#endif
162 166
167 rvideo_mode = false;
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
170 nrow = 24; 175 nrow = 24;
171 176
172 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 178 return;
174 179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182
175 // we need at least two lines for wrapping to work correctly 183 // we need at least two lines for wrapping to work correctly
176 if (nrow + saveLines < 2) 184 while (nrow + saveLines < 2)
177 { 185 {
178 //TODO//FIXME 186 //TODO//FIXME
179 saveLines++; 187 saveLines++;
180 prev_nrow--; 188 prev_nrow--;
181 nsaved++; 189 top_row--;
182 } 190 }
183 191
184 want_refresh = 1; 192 want_refresh = 1;
185 193
186 int prev_total_rows = prev_nrow + saveLines; 194 int prev_total_rows = prev_nrow + saveLines;
… …
191 199
192 if (!row_buf) 200 if (!row_buf)
193 { 201 {
194 /* 202 /*
195 * 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
196 * Note: this is still needed so that all the scrollback lines are NULL
197 */ 204 */
198 nsaved = 0; /* no saved lines */ 205 top_row = 0;
199 term_start = 0; 206 term_start = 0;
200 207
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 208 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 209 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 210
204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 211 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 212 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 213 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 214
209 for (int row = nrow; row--; ) 215 for (int row = nrow; row--; )
210 { 216 {
211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 217 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 218 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
233 selection.text = NULL; 239 selection.text = NULL;
234 selection.len = 0; 240 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 241 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 242 selection.screen = PRIMARY;
237 selection.clicks = 0; 243 selection.clicks = 0;
238 CLEAR_ALL_SELECTION ();
239 rvideo = 0;
240 } 244 }
241 else 245 else
242 { 246 {
243 /* 247 /*
244 * add or delete rows as appropriate 248 * add or delete rows as appropriate
… …
257 } 261 }
258 } 262 }
259#endif 263#endif
260 264
261 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));
262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 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));
264 267
265 for (int row = min (nrow, prev_nrow); row--; ) 268 for (int row = min (nrow, prev_nrow); row--; )
266 { 269 {
267 lresize (drawn_buf[row]); 270 lresize (drawn_buf[row]);
… …
272 { 275 {
273 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);
274 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);
275 } 278 }
276 279
280 line_t *old_buf = row_buf;
277 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));
278 282
279 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
280 int pend = MOD (term_start - nsaved , prev_total_rows); 284 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 285 int q = total_rows; // rewrapped row
282 286
283 if (nsaved) 287 if (top_row)
284 { 288 {
285 // 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
286 // to come up with a lean and mean algorithm. 290 // to come up with a lean and mean algorithm.
287 291
288 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 294
… …
324 qline->l = ncol; 328 qline->l = ncol;
325 qline->is_longer (1); 329 qline->is_longer (1);
326 330
327 int qcol = 0; 331 int qcol = 0;
328 332
333 // see below for cursor adjustment rationale
334 if (p == ocur.row)
335 screen.cur.row = q - (total_rows - nrow);
336
329 // fill a single destination line 337 // fill a single destination line
330 while (lofs < llen && qcol < ncol) 338 while (lofs < llen && qcol < ncol)
331 { 339 {
332 int prow = lofs / prev_ncol; 340 int prow = lofs / prev_ncol;
333 int pcol = lofs % prev_ncol; 341 int pcol = lofs % prev_ncol;
… …
343 351
344 line_t &pline = old_buf [prow]; 352 line_t &pline = old_buf [prow];
345 353
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 354 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347 355
348 assert (len);
349 assert (pline.t);
350
351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 356 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 357 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
353 358
354 lofs += len; 359 lofs += len;
355 qcol += len; 360 qcol += len;
… …
361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 366 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
362 } 367 }
363 while (p != pend && q > 0); 368 while (p != pend && q > 0);
364 369
365 term_start = total_rows - nrow; 370 term_start = total_rows - nrow;
366 nsaved = term_start - q; 371 top_row = q - term_start;
367 372
368 // make sure all terminal lines exist 373 // make sure all terminal lines exist
369 while (nsaved < 0) 374 while (top_row > 0)
370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 375 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
371 } 376 }
372 else 377 else
373 { 378 {
374 // if no scrollback exists (yet), wing, instead of wrap 379 // if no scrollback exists (yet), wing, instead of wrap
375 380
376 for (int row = min (nrow, prev_nrow); row--; ) 381 for (int row = min (nrow, prev_nrow); row--; )
377 { 382 {
378 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)];
379 line_t &qline = row_buf [row]; 384 line_t &qline = row_buf [row];
380 385
… …
388 } 393 }
389 394
390 term_start = 0; 395 term_start = 0;
391 } 396 }
392 397
393#ifdef DEBUG_STRICT //TODO: remove
394 for (int i = -nsaved; i < nrow; i++)
395 assert (ROW (i).t);
396#endif
397
398 free (old_buf); 398 free (old_buf);
399 delete old_ta; 399 delete old_ta;
400 delete old_ra; 400 delete old_ra;
401 401
402 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
404 404
405 if (tabs)
406 free (tabs); 405 free (tabs);
407 } 406 }
407
408 CLEAR_ALL_SELECTION ();
408 409
409 prev_nrow = nrow; 410 prev_nrow = nrow;
410 prev_ncol = ncol; 411 prev_ncol = ncol;
411 412
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol);
413 414
414 for (int col = ncol; col--; ) 415 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
416 417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420
417 tt_winch (); 421 tt_winch ();
418 422
419 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 423 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
420} 424}
421 425
422/* ------------------------------------------------------------------------- */ 426/* ------------------------------------------------------------------------- */
423/* 427/*
424 * Free everything. That way malloc debugging can find leakage. 428 * Free everything. That way malloc debugging can find leakage.
425 */ 429 */
426void 430void
427rxvt_term::scr_release () 431rxvt_term::scr_release () NOTHROW
428{ 432{
433 if (row_buf)
434 {
429 delete talloc; talloc = 0; 435 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0; 436 delete ralloc; ralloc = 0;
431 437
432 free (row_buf); 438 free (row_buf);
433 free (swap_buf); 439 free (swap_buf);
434 free (drawn_buf); 440 free (drawn_buf);
435 free (temp_buf);
436 free (tabs); 441 free (tabs);
437 442
438 row_buf = 0; // signal that we freed all the arrays 443 row_buf = 0; // signal that we freed all the arrays
444 }
439} 445}
440 446
441/* ------------------------------------------------------------------------- */ 447/* ------------------------------------------------------------------------- */
442/* 448/*
443 * Hard reset 449 * Hard reset
… …
448 scr_release (); 454 scr_release ();
449 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
450 scr_reset (); 456 scr_reset ();
451 457
452 scr_clear (true); 458 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 459 scr_refresh ();
454} 460}
455 461
456/* ------------------------------------------------------------------------- * 462/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 463 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 464 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 466 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 467 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 468 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 469 */
464void 470void
465rxvt_term::scr_cursor (int mode) 471rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 472{
467 screen_t *s; 473 screen_t *s;
468 474
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 475#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 476 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 508 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 509 assert (s->cur.col >= 0);
504#endif 510#endif
505} 511}
506 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
507/* ------------------------------------------------------------------------- */ 528/* ------------------------------------------------------------------------- */
508/* 529/*
509 * Swap between primary and secondary screens 530 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 531 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 532 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 533 */
513int 534void
514rxvt_term::scr_change_screen (int scrn) 535rxvt_term::scr_change_screen (int scrn)
515{ 536{
537 if (scrn == current_screen)
538 return;
539
516 want_refresh = 1; 540 want_refresh = 1;
517 view_start = 0; 541 view_start = 0;
518 542
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 543 selection_check (2); /* check for boundary cross */
523 544
524 int i = current_screen; current_screen = scrn; scrn = i; 545 int i = current_screen; current_screen = scrn; scrn = i;
525 546
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531
532#if NSCREENS 547#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 548 if (option (Opt_secondaryScreen))
534 { 549 {
535 num_scr = 0; 550 num_scr = 0;
536 551
537 for (int i = prev_nrow; i--; ) 552 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 553
540 ::swap (screen.charset, swap.charset); 554 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 555 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 556 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 557 swap.flags |= Screen_VisibleCursor;
544 } 558 }
545 else 559 else
546#endif 560#endif
547 if (OPTION (Opt_secondaryScroll)) 561 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 562 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 563}
552 564
553// clear WrapNext indicator, solidifying position on next line 565// clear WrapNext indicator, solidifying position on next line
554void 566void
555rxvt_term::scr_do_wrap () 567rxvt_term::scr_do_wrap () NOTHROW
556{ 568{
557 if (!(screen.flags & Screen_WrapNext)) 569 if (!(screen.flags & Screen_WrapNext))
558 return; 570 return;
559 571
560 screen.flags &= ~Screen_WrapNext; 572 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 582/* ------------------------------------------------------------------------- */
571/* 583/*
572 * Change the colour for following text 584 * Change the colour for following text
573 */ 585 */
574void 586void
575rxvt_term::scr_color (unsigned int color, int fgbg) 587rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 588{
577 if (color > maxTermCOLOR) 589 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 590 color = fgbg;
579 591
580 if (fgbg == Color_fg) 592 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 593 rstyle = SET_FGCOLOR (rstyle, color);
582 else 594 else
… …
586/* ------------------------------------------------------------------------- */ 598/* ------------------------------------------------------------------------- */
587/* 599/*
588 * Change the rendition style for following text 600 * Change the rendition style for following text
589 */ 601 */
590void 602void
591rxvt_term::scr_rendition (int set, int style) 603rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 604{
593 if (set) 605 if (set)
594 rstyle |= style; 606 rstyle |= style;
595 else if (style == ~RS_None) 607 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 608 rstyle = DEFAULT_RSTYLE;
597 else 609 else
598 rstyle &= ~style; 610 rstyle &= ~style;
599 } 611}
600 612
601/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
602/* 614/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 615 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 616 * count positive ==> scroll up
605 * count negative ==> scroll down 617 * count negative ==> scroll down
606 */ 618 */
607int 619int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 620rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 621{
610 if (count == 0 || (row1 > row2)) 622 if (count == 0 || (row1 > row2))
611 return 0; 623 return 0;
612 624
613 want_refresh = 1; 625 want_refresh = 1;
614 num_scr += count; 626 num_scr += count;
615 627
616 if (count > 0 628 if (count > 0
617 && row1 == 0 629 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 630 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620 { 631 {
621 nsaved = min (nsaved + count, saveLines); 632 top_row = max (top_row - count, -saveLines);
622 633
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 634 // scroll everything up 'count' lines
624
625 term_start = (term_start + count) % total_rows; 635 term_start = (term_start + count) % total_rows;
626 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
627 if (selection.op && current_screen == selection.screen) 674 if (selection.op && current_screen == selection.screen)
628 { 675 {
629 selection.beg.row -= count; 676 selection.beg.row -= count;
630 selection.end.row -= count; 677 selection.end.row -= count;
631 selection.mark.row -= count; 678 selection.mark.row -= count;
632 679
633 if (selection.beg.row < -nsaved 680 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 681 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 682 || selection.mark.row < top_row)
636 { 683 {
637 CLEAR_ALL_SELECTION (); 684 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 685 selection.op = SELECTION_CLEAR;
639 } 686 }
640 } 687 }
641 688
642 for (int i = count; i--; ) 689 // finally move the view window, if desired
643 {
644 ROW(row2 - i).l = 0;
645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
646 }
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 unicode_t *str, int nlines, int len) 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;
711 unicode_t c; 758 unicode_t c;
712 int ncol = this->ncol; 759 int ncol = this->ncol;
713 const unicode_t *strend = str + len; 760 const wchar_t *strend = str + len;
714 761
715 want_refresh = 1; 762 want_refresh = 1;
716 ZERO_SCROLLBACK (); 763 ZERO_SCROLLBACK ();
717 764
718 if (nlines > 0) 765 if (minlines > 0)
719 { 766 {
720 nlines += 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 (nlines > 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 {
726 /* _at least_ this many lines need to be scrolled */ 774 /* _at least_ this many lines need to be scrolled */
727 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
728 screen.cur.row -= nlines; 776 screen.cur.row -= minlines;
729 } 777 }
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
741 line_t *line = &ROW(row); 789 line_t *line = &ROW(row);
742 790
743 while (str < strend) 791 while (str < strend)
744 { 792 {
745 c = *str++; 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 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle); 1366 scr_blank_screen_mem (ROW(row), rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1367 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 } 1368 }
1314} 1369}
1315 1370
1316#if ENABLE_FRILLS 1371#if !ENABLE_MINIMAL
1317void 1372void
1318rxvt_term::scr_erase_savelines () 1373rxvt_term::scr_erase_savelines () NOTHROW
1319{ 1374{
1320 want_refresh = 1; 1375 want_refresh = 1;
1321 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
1322 1377
1323 nsaved = 0; 1378 top_row = 0;
1324} 1379}
1325#endif 1380#endif
1326 1381
1327/* ------------------------------------------------------------------------- */ 1382/* ------------------------------------------------------------------------- */
1328/* 1383/*
1329 * Fill the screen with `E's 1384 * Fill the screen with `E's
1330 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1385 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1331 */ 1386 */
1332void 1387void
1333rxvt_term::scr_E () 1388rxvt_term::scr_E () NOTHROW
1334{ 1389{
1335 rend_t fs; 1390 rend_t fs;
1336 1391
1337 want_refresh = 1; 1392 want_refresh = 1;
1338 ZERO_SCROLLBACK (); 1393 ZERO_SCROLLBACK ();
… …
1359/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1360/* 1415/*
1361 * Insert/Delete <count> lines 1416 * Insert/Delete <count> lines
1362 */ 1417 */
1363void 1418void
1364rxvt_term::scr_insdel_lines (int count, int insdel) 1419rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1365{ 1420{
1366 int end; 1421 int end;
1367 1422
1368 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1369 1424
… …
1389/* ------------------------------------------------------------------------- */ 1444/* ------------------------------------------------------------------------- */
1390/* 1445/*
1391 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1392 */ 1447 */
1393void 1448void
1394rxvt_term::scr_insdel_chars (int count, int insdel) 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1395{ 1450{
1396 int col, row;
1397 rend_t tr;
1398
1399 want_refresh = 1; 1451 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1401 1453
1402 if (count <= 0) 1454 if (count <= 0)
1403 return; 1455 return;
… …
1405 scr_do_wrap (); 1457 scr_do_wrap ();
1406 1458
1407 selection_check (1); 1459 selection_check (1);
1408 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1409 1461
1410 row = screen.cur.row; 1462 int row = screen.cur.row;
1411 1463
1412 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1413 1465
1414 line->touch (); 1466 line->touch ();
1415 line->is_longer (0); 1467 line->is_longer (0);
1416 1468
1469 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col);
1472
1417 switch (insdel) 1473 switch (insdel)
1418 { 1474 {
1419 case INSERT: 1475 case INSERT:
1420 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--)
1421 { 1482 {
1422 line->t[col] = line->t[col - count]; 1483 line->t[col] = line->t[col - count];
1423 line->r[col] = line->r[col - count]; 1484 line->r[col] = line->r[col - count];
1424 } 1485 }
1425
1426 line->l = min (line->l + count, ncol);
1427 1486
1428 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1430 { 1489 {
1431 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
1432 || (selection.end.col + count >= ncol)) 1491 || (selection.end.col + count >= ncol))
1433 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1434 else 1493 else
1494 {
1435 { /* shift selection */ 1495 /* shift selection */
1436 selection.beg.col += count; 1496 selection.beg.col += count;
1437 selection.mark.col += count; /* XXX: yes? */ 1497 selection.mark.col += count; /* XXX: yes? */
1438 selection.end.col += count; 1498 selection.end.col += count;
1439 } 1499 }
1440 } 1500 }
… …
1445 case ERASE: 1505 case ERASE:
1446 screen.cur.col += count; /* don't worry if > ncol */ 1506 screen.cur.col += count; /* don't worry if > ncol */
1447 selection_check (1); 1507 selection_check (1);
1448 screen.cur.col -= count; 1508 screen.cur.col -= count;
1449 1509
1450 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
1451 scr_blank_line (*line, screen.cur.col, count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1452 break; 1515 break;
1453 1516
1454 case DELETE: 1517 case DELETE:
1455 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1518 line->l = max (line->l - count, 0);
1456 1519
1520 // nuke wide char spanning the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1457 for (col = screen.cur.col; (col + count) < ncol; col++) 1524 for (int col = screen.cur.col; (col + count) < ncol; col++)
1458 { 1525 {
1459 line->t[col] = line->t[col + count]; 1526 line->t[col] = line->t[col + count];
1460 line->r[col] = line->r[col + count]; 1527 line->r[col] = line->r[col + count];
1461 } 1528 }
1462 1529
1463 line->l = max (line->l - count, 0);
1464 scr_blank_line (*line, ncol - count, count, tr); 1530 scr_blank_line (*line, ncol - count, count,
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1465 1532
1466 if (selection.op && current_screen == selection.screen 1533 if (selection.op && current_screen == selection.screen
1467 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1468 { 1535 {
1469 if (selection.end.row != screen.cur.row 1536 if (selection.end.row != screen.cur.row
… …
1487/* 1554/*
1488 * Set the scrolling region 1555 * Set the scrolling region
1489 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1556 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1490 */ 1557 */
1491void 1558void
1492rxvt_term::scr_scroll_region (int top, int bot) 1559rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1493{ 1560{
1494 max_it (top, 0); 1561 max_it (top, 0);
1495 min_it (bot, nrow - 1); 1562 min_it (bot, nrow - 1);
1496 1563
1497 if (top > bot) 1564 if (top > bot)
… …
1507 * Make the cursor visible/invisible 1574 * Make the cursor visible/invisible
1508 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1575 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1509 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1576 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1510 */ 1577 */
1511void 1578void
1512rxvt_term::scr_cursor_visible (int mode) 1579rxvt_term::scr_cursor_visible (int mode) NOTHROW
1513{ 1580{
1514 want_refresh = 1; 1581 want_refresh = 1;
1515 1582
1516 if (mode) 1583 if (mode)
1517 screen.flags |= Screen_VisibleCursor; 1584 screen.flags |= Screen_VisibleCursor;
… …
1524 * Set/unset automatic wrapping 1591 * Set/unset automatic wrapping
1525 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1592 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1526 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1593 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1527 */ 1594 */
1528void 1595void
1529rxvt_term::scr_autowrap (int mode) 1596rxvt_term::scr_autowrap (int mode) NOTHROW
1530{ 1597{
1531 if (mode) 1598 if (mode)
1532 screen.flags |= Screen_Autowrap; 1599 screen.flags |= Screen_Autowrap;
1533 else 1600 else
1534 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1601 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1543 * and the cursor cannot be moved outside. 1610 * and the cursor cannot be moved outside.
1544 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1611 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1545 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1612 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1546 */ 1613 */
1547void 1614void
1548rxvt_term::scr_relative_origin (int mode) 1615rxvt_term::scr_relative_origin (int mode) NOTHROW
1549{ 1616{
1550 if (mode) 1617 if (mode)
1551 screen.flags |= Screen_Relative; 1618 screen.flags |= Screen_Relative;
1552 else 1619 else
1553 screen.flags &= ~Screen_Relative; 1620 screen.flags &= ~Screen_Relative;
… …
1560 * Set insert/replace mode 1627 * Set insert/replace mode
1561 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1628 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1562 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1629 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1563 */ 1630 */
1564void 1631void
1565rxvt_term::scr_insert_mode (int mode) 1632rxvt_term::scr_insert_mode (int mode) NOTHROW
1566{ 1633{
1567 if (mode) 1634 if (mode)
1568 screen.flags |= Screen_Insert; 1635 screen.flags |= Screen_Insert;
1569 else 1636 else
1570 screen.flags &= ~Screen_Insert; 1637 screen.flags &= ~Screen_Insert;
… …
1576 * XTERM_SEQ: Set tab at current column : ESC H 1643 * XTERM_SEQ: Set tab at current column : ESC H
1577 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1644 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1578 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1645 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1579 */ 1646 */
1580void 1647void
1581rxvt_term::scr_set_tab (int mode) 1648rxvt_term::scr_set_tab (int mode) NOTHROW
1582{ 1649{
1583 if (mode < 0) 1650 if (mode < 0)
1584 memset (tabs, 0, ncol * sizeof (char)); 1651 memset (tabs, 0, ncol);
1585 else if (screen.cur.col < ncol) 1652 else if (screen.cur.col < ncol)
1586 tabs [screen.cur.col] = !!mode; 1653 tabs [screen.cur.col] = !!mode;
1587} 1654}
1588 1655
1589/* ------------------------------------------------------------------------- */ 1656/* ------------------------------------------------------------------------- */
… …
1591 * Set reverse/normal video 1658 * Set reverse/normal video
1592 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1659 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1593 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1660 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1594 */ 1661 */
1595void 1662void
1596rxvt_term::scr_rvideo_mode (int mode) 1663rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1597{ 1664{
1598 XGCValues gcvalue; 1665 rvideo_mode = on;
1599 1666
1667#ifndef NO_BELL
1668 on ^= rvideo_bell;
1669#endif
1670
1600 if (rvideo != mode) 1671 if (rvideo_state != on)
1601 { 1672 {
1602 rvideo = mode; 1673 rvideo_state = on;
1674
1603 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1604#if XPM_BACKGROUND 1676#ifdef HAVE_BG_PIXMAP
1605 if (bgPixmap.pixmap == None) 1677 if (bgPixmap.pixmap == None)
1606#endif 1678#endif
1607#if TRANSPARENT 1679 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1608 if (! OPTION (Opt_transparent) || am_transparent == 0)
1609#endif
1610 XSetWindowBackground (display->display, vt,
1611 pix_colors[Color_bg]);
1612 1680
1681 XGCValues gcvalue;
1613 gcvalue.foreground = pix_colors[Color_fg]; 1682 gcvalue.foreground = pix_colors[Color_fg];
1614 gcvalue.background = pix_colors[Color_bg]; 1683 gcvalue.background = pix_colors[Color_bg];
1615 XChangeGC (display->display, gc, GCBackground | GCForeground, 1684 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1616 &gcvalue); 1685
1617 scr_clear (); 1686 scr_clear ();
1618 scr_touch (true); 1687 scr_touch (true);
1619 } 1688 }
1620} 1689}
1621 1690
… …
1623/* 1692/*
1624 * Report current cursor position 1693 * Report current cursor position
1625 * XTERM_SEQ: Report position: ESC [ 6 n 1694 * XTERM_SEQ: Report position: ESC [ 6 n
1626 */ 1695 */
1627void 1696void
1628rxvt_term::scr_report_position () 1697rxvt_term::scr_report_position () NOTHROW
1629{ 1698{
1630 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1699 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1631} 1700}
1632 1701
1633/* ------------------------------------------------------------------------- * 1702/* ------------------------------------------------------------------------- *
… …
1636 1705
1637/* 1706/*
1638 * Set font style 1707 * Set font style
1639 */ 1708 */
1640void 1709void
1641rxvt_term::set_font_style () 1710rxvt_term::set_font_style () NOTHROW
1642{ 1711{
1643#if 0 1712#if 0
1644 switch (charsets [screen.charset]) 1713 switch (charsets [screen.charset])
1645 { 1714 {
1646 case '0': /* DEC Special Character & Line Drawing Set */ 1715 case '0': /* DEC Special Character & Line Drawing Set */
… …
1668 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1737 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1669 * XTERM_SEQ: Invoke G2 character set: ESC N 1738 * XTERM_SEQ: Invoke G2 character set: ESC N
1670 * XTERM_SEQ: Invoke G3 character set: ESC O 1739 * XTERM_SEQ: Invoke G3 character set: ESC O
1671 */ 1740 */
1672void 1741void
1673rxvt_term::scr_charset_choose (int set) 1742rxvt_term::scr_charset_choose (int set) NOTHROW
1674{ 1743{
1675 screen.charset = set; 1744 screen.charset = set;
1676 set_font_style (); 1745 set_font_style ();
1677} 1746}
1678 1747
… …
1684 * XTERM_SEQ: Set G2 character set: ESC * <C> 1753 * XTERM_SEQ: Set G2 character set: ESC * <C>
1685 * XTERM_SEQ: Set G3 character set: ESC + <C> 1754 * XTERM_SEQ: Set G3 character set: ESC + <C>
1686 * See set_font_style for possible values for <C> 1755 * See set_font_style for possible values for <C>
1687 */ 1756 */
1688void 1757void
1689rxvt_term::scr_charset_set (int set, unsigned int ch) 1758rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1690{ 1759{
1691 charsets[set] = (unsigned char)ch; 1760 charsets[set] = (unsigned char)ch;
1692 set_font_style (); 1761 set_font_style ();
1693} 1762}
1694 1763
… …
1699 1768
1700/* 1769/*
1701 * refresh matching text. 1770 * refresh matching text.
1702 */ 1771 */
1703bool 1772bool
1704rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1773rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1705{ 1774{
1706 bool found = false; 1775 bool found = false;
1707 1776
1708 for (int i = 0; i < nrow; i++) 1777 for (int i = 0; i < nrow; i++)
1709 { 1778 {
1710 int col = 0;
1711 rend_t *drp = drawn_buf[i].r; 1779 rend_t *drp = drawn_buf[i].r;
1712 1780
1713 for (; col < ncol; col++, drp++) 1781 for (int col = 0; col < ncol; col++, drp++)
1714 if ((*drp & mask) == value) 1782 if ((*drp & mask) == value)
1715 { 1783 {
1716 found = true; 1784 found = true;
1717 *drp = ~value; 1785 *drp = ~value;
1718 } 1786 }
… …
1729 PART_END, 1797 PART_END,
1730 RC_COUNT 1798 RC_COUNT
1731}; 1799};
1732 1800
1733void 1801void
1734rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1802rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1735{ 1803{
1736 int i; 1804 int i;
1737 row_col_t rc[RC_COUNT]; 1805 row_col_t rc[RC_COUNT];
1738 1806
1739 if (!drawn_buf) /* sanity check */ 1807 if (!drawn_buf) /* sanity check */
… …
1758 for (i = PART_BEG; i < RC_COUNT; i++) 1826 for (i = PART_BEG; i < RC_COUNT; i++)
1759 { 1827 {
1760 min_it (rc[i].col, ncol - 1); 1828 min_it (rc[i].col, ncol - 1);
1761 min_it (rc[i].row, nrow - 1); 1829 min_it (rc[i].row, nrow - 1);
1762 } 1830 }
1763 1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1764 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1832 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1765 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1766 1834
1835 num_scr_allow = 0;
1836
1767 if (refresh) 1837 if (refresh)
1768 scr_refresh (SLOW_REFRESH); 1838 scr_refresh ();
1769} 1839}
1770 1840
1771/* ------------------------------------------------------------------------- */ 1841/* ------------------------------------------------------------------------- */
1772/* 1842/*
1773 * Refresh the entire screen 1843 * Refresh the entire screen
1774 */ 1844 */
1775void 1845void
1776rxvt_term::scr_touch (bool refresh) 1846rxvt_term::scr_touch (bool refresh) NOTHROW
1777{ 1847{
1778 scr_expose (0, 0, width, height, refresh); 1848 scr_expose (0, 0, width, height, refresh);
1779} 1849}
1780 1850
1781/* ------------------------------------------------------------------------- */ 1851/* ------------------------------------------------------------------------- */
1782/* 1852/*
1783 * Move the display so that the line represented by scrollbar value Y is at 1853 * Move the display so that the line represented by scrollbar value Y is at
1784 * the top of the screen 1854 * the top of the screen
1785 */ 1855 */
1786int 1856void
1787rxvt_term::scr_move_to (int y, int len) 1857rxvt_term::scr_move_to (int y, int len) NOTHROW
1788{ 1858{
1789 long p = 0; 1859 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1790 unsigned int oldviewstart;
1791
1792 oldviewstart = view_start;
1793
1794 if (y < len)
1795 {
1796 p = (nrow + nsaved) * (len - y) / len;
1797 p -= (long) (nrow - 1);
1798 p = max (p, 0);
1799 }
1800
1801 view_start = (unsigned int)min (p, nsaved);
1802
1803 return scr_changeview (oldviewstart);
1804} 1860}
1805 1861
1806/* ------------------------------------------------------------------------- */ 1862/* ------------------------------------------------------------------------- */
1807/* 1863/*
1808 * Page the screen up/down nlines 1864 * Page the screen up/down nlines
1809 * direction should be UP or DN 1865 * direction should be UP or DN
1810 */ 1866 */
1811int 1867bool
1812rxvt_term::scr_page (enum page_dirn direction, int nlines) 1868rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1813{ 1869{
1814 int n; 1870 int new_view_start =
1815 unsigned int oldviewstart;
1816
1817 oldviewstart = view_start;
1818
1819 if (direction == UP)
1820 {
1821 n = view_start + nlines;
1822 view_start = min (n, nsaved);
1823 }
1824 else
1825 {
1826 n = view_start - nlines; 1871 direction == UP ? view_start - nlines
1827 view_start = max (n, 0); 1872 : view_start + nlines;
1828 }
1829 1873
1830 return scr_changeview (oldviewstart); 1874 return scr_changeview (new_view_start);
1831} 1875}
1832 1876
1833int 1877bool
1834rxvt_term::scr_changeview (unsigned int oldviewstart) 1878rxvt_term::scr_changeview (int new_view_start) NOTHROW
1835{ 1879{
1880 clamp_it (new_view_start, top_row, 0);
1881
1836 if (view_start != oldviewstart) 1882 if (new_view_start == view_start)
1837 { 1883 return false;
1884
1885 num_scr += new_view_start - view_start;
1886 view_start = new_view_start;
1887 want_refresh = 1;
1888
1838 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1889 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839 1890
1840 want_refresh = 1; 1891 return true;
1841 num_scr -= (view_start - oldviewstart);
1842 }
1843
1844 return (int)view_start - (int)oldviewstart;
1845} 1892}
1846 1893
1847/* ------------------------------------------------------------------------- */ 1894#ifndef NO_BELL
1848void 1895void
1896rxvt_term::bell_cb (ev::timer &w, int revents)
1897{
1898 rvideo_bell = false;
1899 scr_rvideo_mode (rvideo_mode);
1900 refresh_check ();
1901}
1902#endif
1903
1904/* ------------------------------------------------------------------------- */
1905void
1849rxvt_term::scr_bell () 1906rxvt_term::scr_bell () NOTHROW
1850{ 1907{
1851#ifndef NO_BELL 1908#ifndef NO_BELL
1852 1909
1853# ifndef NO_MAPALERT 1910# ifndef NO_MAPALERT
1854# ifdef MAPALERT_OPTION 1911# ifdef MAPALERT_OPTION
1855 if (OPTION (Opt_mapAlert)) 1912 if (option (Opt_mapAlert))
1856# endif 1913# endif
1857 XMapWindow (display->display, parent[0]); 1914 XMapWindow (dpy, parent[0]);
1858# endif 1915# endif
1859 1916
1917# if ENABLE_FRILLS
1918 if (option (Opt_urgentOnBell))
1919 set_urgency (1);
1920# endif
1921
1860 if (OPTION (Opt_visualBell)) 1922 if (option (Opt_visualBell))
1861 { 1923 {
1862 scr_rvideo_mode (!rvideo); /* refresh also done */ 1924 rvideo_bell = true;
1925 scr_rvideo_mode (rvideo_mode);
1926 flush ();
1927
1863 rxvt_usleep (VISUAL_BELL_DURATION); 1928 bell_ev.start (VISUAL_BELL_DURATION);
1864 scr_rvideo_mode (!rvideo); /* refresh also done */
1865 } 1929 }
1866 else 1930 else
1867 XBell (display->display, 0); 1931 XBell (dpy, 0);
1868
1869#endif 1932#endif
1870} 1933}
1871 1934
1872/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1873/* ARGSUSED */ 1936/* ARGSUSED */
1874void 1937void
1875rxvt_term::scr_printscreen (int fullhist) 1938rxvt_term::scr_printscreen (int fullhist) NOTHROW
1876{ 1939{
1877#ifdef PRINTPIPE 1940#ifdef PRINTPIPE
1878 int nrows, row_start; 1941 int nrows, row_start;
1879 FILE *fd; 1942 FILE *fd = popen_printer ();
1880 1943
1881 if ((fd = popen_printer ()) == NULL) 1944 if (!fd)
1882 return; 1945 return;
1883 1946
1884 if (fullhist) 1947 if (fullhist)
1885 { 1948 {
1886 nrows = nrow + nsaved; 1949 nrows = nrow - top_row;
1887 row_start = -nsaved; 1950 row_start = top_row;
1888 } 1951 }
1889 else 1952 else
1890 { 1953 {
1891 nrows = nrow; 1954 nrows = nrow;
1892 row_start = -view_start; 1955 row_start = view_start;
1893 } 1956 }
1894 1957
1895 wctomb (0, 0); 1958 wctomb (0, 0);
1896 1959
1897 for (int r1 = 0; r1 < nrows; r1++) 1960 for (int r1 = 0; r1 < nrows; r1++)
… …
1929 * Refresh the screen 1992 * Refresh the screen
1930 * drawn_text/drawn_rend contain the screen information before the update. 1993 * drawn_text/drawn_rend contain the screen information before the update.
1931 * screen.text/screen.rend contain what the screen will change to. 1994 * screen.text/screen.rend contain what the screen will change to.
1932 */ 1995 */
1933void 1996void
1934rxvt_term::scr_refresh (unsigned char refresh_type) 1997rxvt_term::scr_refresh () NOTHROW
1935{ 1998{
1936 unsigned char must_clear, /* use draw_string not draw_image_string */ 1999 unsigned char have_bg,
1937 showcursor; /* show the cursor */ 2000 showcursor; /* show the cursor */
1938 int16_t col, row, /* column/row we're processing */ 2001 int16_t col, row, /* column/row we're processing */
1939 ocrow; /* old cursor row */ 2002 ocrow; /* old cursor row */
1940 int i; /* tmp */ 2003 int i; /* tmp */
1941#ifndef NO_CURSORCOLOR 2004#ifndef NO_CURSORCOLOR
1942 rend_t cc1; /* store colours at cursor position (s) */ 2005 rend_t cc1; /* store colours at cursor position (s) */
1943#endif 2006#endif
1944 rend_t *crp; // cursor rendition pointer 2007 rend_t *crp; // cursor rendition pointer
2008 rend_t ccol1, /* Cursor colour */
2009 ccol2; /* Cursor colour2 */
1945 2010
1946 want_refresh = 0; /* screen is current */ 2011 want_refresh = 0; /* screen is current */
1947 2012
1948 if (refresh_type == NO_REFRESH || !mapped) 2013 if (refresh_type == NO_REFRESH || !mapped)
1949 return; 2014 return;
1950 2015
1951 /* 2016 /*
1952 * A: set up vars 2017 * A: set up vars
1953 */ 2018 */
1954 must_clear = 0;
1955 refresh_count = 0; 2019 refresh_count = 0;
1956 2020
1957#if XPM_BACKGROUND 2021 have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP
1958 must_clear |= bgPixmap.pixmap != None; 2023 have_bg = bgPixmap.pixmap != None;
1959#endif
1960#if TRANSPARENT
1961 must_clear |= OPTION (Opt_transparent) && am_transparent;
1962#endif 2024#endif
1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1964 2026
1965 /* 2027 /*
1966 * B: reverse any characters which are selected 2028 * B: reverse any characters which are selected
… …
1970 /* 2032 /*
1971 * C: set the cursor character (s) 2033 * C: set the cursor character (s)
1972 */ 2034 */
1973 { 2035 {
1974 unsigned char setoldcursor; 2036 unsigned char setoldcursor;
1975 rend_t ccol1, /* Cursor colour */
1976 ccol2; /* Cursor colour2 */
1977 2037
1978 showcursor = (screen.flags & Screen_VisibleCursor); 2038 showcursor = (screen.flags & Screen_VisibleCursor);
1979#ifdef CURSOR_BLINK 2039#ifdef CURSOR_BLINK
1980 if (hidden_cursor) 2040 if (hidden_cursor)
1981 showcursor = 0; 2041 showcursor = 0;
… …
1988 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2048 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1989 col--; 2049 col--;
1990 2050
1991 crp = &ROW(screen.cur.row).r[col]; 2051 crp = &ROW(screen.cur.row).r[col];
1992 2052
2053#ifndef NO_CURSORCOLOR
2054 cc1 = *crp & (RS_fgMask | RS_bgMask);
2055 if (ISSET_PIXCOLOR (Color_cursor))
2056 ccol1 = Color_cursor;
2057 else
2058#endif
2059#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2060 ccol1 = fgcolor_of (rstyle);
2061#else
2062 ccol1 = Color_fg;
2063#endif
2064
2065#ifndef NO_CURSORCOLOR
2066 if (ISSET_PIXCOLOR (Color_cursor2))
2067 ccol2 = Color_cursor2;
2068 else
2069#endif
2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2071 ccol2 = bgcolor_of (rstyle);
2072#else
2073 ccol2 = Color_bg;
2074#endif
2075
1993 if (showcursor && focus) 2076 if (showcursor && focus)
1994 { 2077 {
1995 if (OPTION (Opt_cursorUnderline)) 2078 if (option (Opt_cursorUnderline))
1996 *crp ^= RS_Uline; 2079 *crp ^= RS_Uline;
1997 else 2080 else
1998 { 2081 {
1999 *crp ^= RS_RVid; 2082 *crp ^= RS_RVid;
2000
2001#ifndef NO_CURSORCOLOR
2002 cc1 = *crp & (RS_fgMask | RS_bgMask);
2003 if (ISSET_PIXCOLOR (Color_cursor))
2004 ccol1 = Color_cursor;
2005 else
2006#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2007 ccol1 = fgcolor_of (rstyle);
2008#else
2009 ccol1 = Color_fg;
2010#endif
2011 if (ISSET_PIXCOLOR (Color_cursor2))
2012 ccol2 = Color_cursor2;
2013 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol2 = bgcolor_of (rstyle);
2016#else
2017 ccol2 = Color_bg;
2018#endif
2019 *crp = SET_FGCOLOR (*crp, ccol1); 2083 *crp = SET_FGCOLOR (*crp, ccol1);
2020 *crp = SET_BGCOLOR (*crp, ccol2); 2084 *crp = SET_BGCOLOR (*crp, ccol2);
2021#endif
2022 } 2085 }
2023 } 2086 }
2024 } 2087 }
2025 2088
2026 /* make sure no outline cursor is left around */ 2089 /* make sure no outline cursor is left around */
2027 setoldcursor = 0; 2090 setoldcursor = 0;
2028 if (ocrow != -1) 2091 if (ocrow != -1)
2029 { 2092 {
2030 if (screen.cur.row + view_start != ocrow 2093 if (screen.cur.row - view_start != ocrow
2031 || screen.cur.col != oldcursor.col) 2094 || screen.cur.col != oldcursor.col)
2032 { 2095 {
2033 if (ocrow < nrow 2096 if (ocrow < nrow
2034 && oldcursor.col < ncol) 2097 && oldcursor.col < ncol)
2035 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2098 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2043 else if (!focus) 2106 else if (!focus)
2044 setoldcursor = 1; 2107 setoldcursor = 1;
2045 2108
2046 if (setoldcursor) 2109 if (setoldcursor)
2047 { 2110 {
2048 if (screen.cur.row + view_start >= nrow) 2111 if (screen.cur.row - view_start >= nrow)
2049 oldcursor.row = -1; 2112 oldcursor.row = -1;
2050 else 2113 else
2051 { 2114 {
2052 oldcursor.row = screen.cur.row + view_start; 2115 oldcursor.row = screen.cur.row - view_start;
2053 oldcursor.col = screen.cur.col; 2116 oldcursor.col = screen.cur.col;
2054 } 2117 }
2055 } 2118 }
2056 } 2119 }
2057 2120
… …
2063#ifndef NO_SLOW_LINK_SUPPORT 2126#ifndef NO_SLOW_LINK_SUPPORT
2064 /* 2127 /*
2065 * D: CopyArea pass - very useful for slower links 2128 * D: CopyArea pass - very useful for slower links
2066 * This has been deliberately kept simple. 2129 * This has been deliberately kept simple.
2067 */ 2130 */
2068 i = num_scr;
2069 if (!display->is_local 2131 if (!display->is_local
2070 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2132 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2071 && abs (num_scr) < nrow && !must_clear) 2133 && abs (num_scr) < nrow && !have_bg)
2072 { 2134 {
2073 int16_t nits; 2135 int16_t nits;
2136 int i = num_scr;
2074 int j; 2137 int j;
2075 int len, wlen; 2138 int len, wlen;
2139 dLocal (int, num_scr);
2076 2140
2077 j = nrow; 2141 j = nrow;
2078 wlen = len = -1; 2142 wlen = len = -1;
2079 row = i > 0 ? 0 : j - 1; 2143 row = i > 0 ? 0 : j - 1;
2144
2080 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2145 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2081 { 2146 {
2082 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2147 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2083 { 2148 {
2084 line_t s = ROW(row - view_start); 2149 line_t s = ROW(view_start + row);
2085 line_t d = drawn_buf[row]; 2150 line_t d = drawn_buf[row];
2086 line_t d2 = drawn_buf[row + i]; 2151 line_t d2 = drawn_buf[row + i];
2087 2152
2088 for (nits = 0, col = ncol; col--; ) 2153 for (nits = 0, col = ncol; col--; )
2089 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2154 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2105 wlen = row; 2170 wlen = row;
2106 continue; 2171 continue;
2107 } 2172 }
2108 } 2173 }
2109 2174
2110 if (len != -1) 2175 if (len >= 0)
2111 { 2176 {
2112 /* also comes here at end if needed because of >= above */ 2177 /* also comes here at end if needed because of >= above */
2113 if (wlen < len) 2178 if (wlen < len)
2114 ::swap (wlen, len); 2179 ::swap (wlen, len);
2115 2180
2181 XGCValues gcv;
2182
2183 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2116 XCopyArea (display->display, vt, vt, 2184 XCopyArea (dpy, vt, vt,
2117 gc, 0, Row2Pixel (len + i), 2185 gc, 0, Row2Pixel (len + i),
2118 (unsigned int)this->width, 2186 (unsigned int)this->width,
2119 (unsigned int)Height2Pixel (wlen - len + 1), 2187 (unsigned int)Height2Pixel (wlen - len + 1),
2120 0, Row2Pixel (len)); 2188 0, Row2Pixel (len));
2189 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2190
2121 len = -1; 2191 len = -1;
2122 } 2192 }
2123 } 2193 }
2124 } 2194 }
2125#endif 2195#endif
… …
2127 /* 2197 /*
2128 * E: main pass across every character 2198 * E: main pass across every character
2129 */ 2199 */
2130 for (row = 0; row < nrow; row++) 2200 for (row = 0; row < nrow; row++)
2131 { 2201 {
2132 text_t *stp = ROW(row - view_start).t; 2202 text_t *stp = ROW(view_start + row).t;
2133 rend_t *srp = ROW(row - view_start).r; 2203 rend_t *srp = ROW(view_start + row).r;
2134 text_t *dtp = drawn_buf[row].t; 2204 text_t *dtp = drawn_buf[row].t;
2135 rend_t *drp = drawn_buf[row].r; 2205 rend_t *drp = drawn_buf[row].r;
2136 2206
2137 /* 2207 /*
2138 * E2: OK, now the real pass 2208 * E2: OK, now the real pass
… …
2149 continue; 2219 continue;
2150 2220
2151 // redraw one or more characters 2221 // redraw one or more characters
2152 2222
2153 // seek to the beginning of wide characters 2223 // seek to the beginning of wide characters
2154 while (stp[col] == NOCHAR && col > 0) 2224 while (expect_false (stp[col] == NOCHAR && col > 0))
2155 --col; 2225 --col;
2156 2226
2157 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2158 text_t *text = stp + col; 2228 text_t *text = stp + col;
2159 int count = 1; 2229 int count = 1;
… …
2181 count++; 2251 count++;
2182 2252
2183 if (stp[col] != dtp[col] 2253 if (stp[col] != dtp[col]
2184 || !RS_SAME (srp[col], drp[col])) 2254 || !RS_SAME (srp[col], drp[col]))
2185 { 2255 {
2186 if (must_clear && (i++ > count / 2)) 2256 if (have_bg && (i++ > count / 2))
2187 break; 2257 break;
2188 2258
2189 dtp[col] = stp[col]; 2259 dtp[col] = stp[col];
2190 drp[col] = rend; 2260 drp[col] = rend;
2191 i = 0; 2261 i = 0;
2192 } 2262 }
2193 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2263 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2194 break; 2264 break;
2195 } 2265 }
2196 2266
2197 col--; /* went one too far. move back */ 2267 col--; /* went one too far. move back */
2198 count -= i; /* dump any matching trailing chars */ 2268 count -= i; /* dump any matching trailing chars */
2199 2269
2200 // sometimes we optimize away the trailing NOCHAR's, add them back 2270 // sometimes we optimize away the trailing NOCHAR's, add them back
2201 while (i && text[count] == NOCHAR) 2271 while (expect_false (i && text[count] == NOCHAR))
2202 count++, i--; 2272 count++, i--;
2203 2273
2204 /* 2274 /*
2205 * Determine the attributes for the string 2275 * Determine the attributes for the string
2206 */ 2276 */
2207 int fore = fgcolor_of (rend); // desired foreground 2277 int fore = fgcolor_of (rend); // desired foreground
2208 int back = bgcolor_of (rend); // desired background 2278 int back = bgcolor_of (rend); // desired background
2209 2279
2210 // only do special processing if any attributes are set, which is unlikely 2280 // only do special processing if any attributes are set, which is unlikely
2211 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2212 { 2282 {
2213#if ENABLE_STYLES
2214 // force redraw after "careful" characters to avoid pixel droppings
2215 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2216 drp[col + 1] = ~srp[col + 1];
2217
2218 // include previous careful character(s) if possible, looks nicer (best effort...)
2219 while (text > stp
2220 && srp[text - stp - 1] & RS_Careful
2221 && RS_SAME (rend, srp[text - stp - 1]))
2222 text--, count++, xpixel -= fwidth;
2223#endif
2224
2225 bool invert = rend & RS_RVid; 2283 bool invert = rend & RS_RVid;
2226 2284
2227#ifndef NO_BOLD_UNDERLINE_REVERSE 2285#ifndef NO_BOLD_UNDERLINE_REVERSE
2228 if (rend & RS_Bold
2229 && fore == Color_fg) 2286 if (rend & RS_Bold && fore == Color_fg)
2230 { 2287 {
2231 if (ISSET_PIXCOLOR (Color_BD)) 2288 if (ISSET_PIXCOLOR (Color_BD))
2232 fore = Color_BD; 2289 fore = Color_BD;
2233# if !ENABLE_STYLES 2290# if !ENABLE_STYLES
2234 else 2291 else
2235 invert = !invert; 2292 invert = !invert;
2236# endif 2293# endif
2237 } 2294 }
2238 2295
2239 if (rend & RS_Italic 2296 if (rend & RS_Italic && fore == Color_fg)
2240 && fore == Color_fg)
2241 { 2297 {
2242 if (ISSET_PIXCOLOR (Color_IT)) 2298 if (ISSET_PIXCOLOR (Color_IT))
2243 fore = Color_IT; 2299 fore = Color_IT;
2244# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2245 else 2301 else
2246 invert = !invert; 2302 invert = !invert;
2247# endif 2303# endif
2248 } 2304 }
2249 2305
2250 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2251 fore = Color_UL; 2307 fore = Color_UL;
2252#endif 2308#endif
2253 2309
2254 if (invert) 2310 if (invert)
2255 { 2311 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2256 ::swap (fore, back); 2318 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2257 2323
2258#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2259 if (ISSET_PIXCOLOR (Color_RV)) 2326 if (ISSET_PIXCOLOR (Color_RV))
2260 back = Color_RV; 2327 back = Color_RV;
2261 2328# endif
2262 if (fore == back) 2329 if (fore == back)
2263 { 2330 {
2264 fore = Color_bg; 2331 fore = Color_bg;
2265 back = Color_fg; 2332 back = Color_fg;
2266 } 2333 }
… …
2268 } 2335 }
2269 2336
2270#ifdef TEXT_BLINK 2337#ifdef TEXT_BLINK
2271 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2338 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2272 { 2339 {
2273 if (!text_blink_ev.active) 2340 if (!text_blink_ev.is_active ())
2274 { 2341 {
2275 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2342 text_blink_ev.again ();
2276 hidden_text = 0; 2343 hidden_text = 0;
2277 } 2344 }
2278 else if (hidden_text) 2345 else if (hidden_text)
2279 fore = back; 2346 fore = back;
2280 } 2347 }
2281#endif 2348#endif
2349
2350#if ENABLE_STYLES
2351 // "careful" (too wide) character handling
2352
2353 // include previous careful character(s) if possible, looks nicer (best effort...)
2354 while (text > stp
2355 && srp[text - stp - 1] & RS_Careful
2356 && RS_SAME (rend, srp[text - stp - 1]))
2357 text--, count++, xpixel -= fwidth;
2358
2359 // force redraw after "careful" characters to avoid pixel droppings
2360 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2361 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2362
2363 // force redraw before "careful" characters to avoid pixel droppings
2364 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2365 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2366#endif
2282 } 2367 }
2283 2368
2284 /* 2369 /*
2285 * Actually do the drawing of the string here 2370 * Actually do the drawing of the string here
2286 */ 2371 */
2287 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2372 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2288 2373
2289 if (back == fore) 2374 if (expect_true (have_bg && back == Color_bg))
2290 font->clear_rect (*drawable, xpixel, ypixel,
2291 fwidth * count, fheight,
2292 back);
2293 else if (back == Color_bg)
2294 { 2375 {
2295 if (must_clear) 2376 // this is very ugly, maybe push it into ->draw?
2296 {
2297 CLEAR_CHARS (xpixel, ypixel, count);
2298 2377
2299 for (i = 0; i < count; i++) /* don't draw empty strings */ 2378 for (i = 0; i < count; i++) /* don't draw empty strings */
2300 if (text[i] != ' ') 2379 if (text[i] != ' ')
2301 { 2380 {
2302 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2303 break; 2382 goto did_clear;
2304 }
2305 } 2383 }
2306 else 2384
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2385 CLEAR_CHARS (xpixel, ypixel, count);
2386 did_clear: ;
2308 } 2387 }
2309 else 2388 else
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2311 2390
2312 if (rend & RS_Uline && font->descent > 1 && fore != back) 2391 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2313 { 2392 {
2314#if ENABLE_FRILLS 2393#if ENABLE_FRILLS
2315 if (ISSET_PIXCOLOR (Color_underline)) 2394 if (ISSET_PIXCOLOR (Color_underline))
2316 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2395 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2317 else 2396 else
2318#endif 2397#endif
2319 XSetForeground (display->display, gc, pix_colors[fore]); 2398 XSetForeground (dpy, gc, pix_colors[fore]);
2320 2399
2321 XDrawLine (display->display, drawBuffer, gc, 2400 XDrawLine (dpy, vt, gc,
2322 xpixel, ypixel + font->ascent + 1, 2401 xpixel, ypixel + font->ascent + 1,
2323 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2324 } 2403 }
2325 } /* for (col....) */ 2404 } /* for (col....) */
2326 } /* for (row....) */ 2405 } /* for (row....) */
… …
2335 */ 2414 */
2336 if (showcursor) 2415 if (showcursor)
2337 { 2416 {
2338 if (focus) 2417 if (focus)
2339 { 2418 {
2340 if (OPTION (Opt_cursorUnderline)) 2419 if (option (Opt_cursorUnderline))
2341 *crp ^= RS_Uline; 2420 *crp ^= RS_Uline;
2342 else 2421 else
2343 { 2422 {
2344 *crp ^= RS_RVid; 2423 *crp ^= RS_RVid;
2345#ifndef NO_CURSORCOLOR 2424#ifndef NO_CURSORCOLOR
… …
2359 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2438 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2360 cursorwidth++; 2439 cursorwidth++;
2361 2440
2362#ifndef NO_CURSORCOLOR 2441#ifndef NO_CURSORCOLOR
2363 if (ISSET_PIXCOLOR (Color_cursor)) 2442 if (ISSET_PIXCOLOR (Color_cursor))
2364 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2443 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2444 else
2365#endif 2445#endif
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2366 2447
2367 XDrawRectangle (display->display, drawBuffer, gc, 2448 XDrawRectangle (dpy, vt, gc,
2368 Col2Pixel (col), 2449 Col2Pixel (col),
2369 Row2Pixel (oldcursor.row), 2450 Row2Pixel (oldcursor.row),
2370 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2451 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2371 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2452 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2372 } 2453 }
… …
2375 /* 2456 /*
2376 * H: cleanup selection 2457 * H: cleanup selection
2377 */ 2458 */
2378 scr_reverse_selection (); 2459 scr_reverse_selection ();
2379 2460
2380 if (refresh_type & SMOOTH_REFRESH)
2381 XFlush (display->display);
2382
2383 num_scr = 0; 2461 num_scr = 0;
2384 num_scr_allow = 1; 2462 num_scr_allow = 1;
2385} 2463}
2386 2464
2387void 2465void
2388rxvt_term::scr_remap_chars (line_t &l) 2466rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2389{ 2467{
2390 if (!l.t) 2468 if (!l.t)
2391 return; 2469 return;
2392 2470
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant 2471 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2394 2472
2395 for (int i = ncol; i--; ) 2473 for (int i = ncol; i--; )
2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2474 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2397} 2475}
2398 2476
2399void 2477void
2400rxvt_term::scr_remap_chars () 2478rxvt_term::scr_remap_chars () NOTHROW
2401{ 2479{
2402 for (int i = total_rows; i--; ) 2480 for (int i = total_rows; i--; )
2403 scr_remap_chars (row_buf [i]); 2481 scr_remap_chars (row_buf [i]);
2404 2482
2405 for (int i = nrow; i--; ) 2483 for (int i = nrow; i--; )
… …
2408 scr_remap_chars (swap_buf [i]); 2486 scr_remap_chars (swap_buf [i]);
2409 } 2487 }
2410} 2488}
2411 2489
2412void 2490void
2413rxvt_term::scr_recolour () 2491rxvt_term::scr_recolour () NOTHROW
2414{ 2492{
2415 if (1 2493#ifdef HAVE_BG_PIXMAP
2416#if TRANSPARENT 2494 bgPixmap.apply ();
2417 && !am_transparent 2495#else
2418#endif 2496
2419#if XPM_BACKGROUND
2420 && !bgPixmap.pixmap
2421#endif
2422 )
2423 {
2424 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2425 XClearWindow (display->display, parent[0]); 2498 XClearWindow (dpy, parent[0]);
2426 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2427#if HAVE_SCROLLBARS 2500
2428 if (scrollBar.win) 2501 if (scrollBar.win)
2429 { 2502 {
2430 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2431 scrollBar.setIdle (); 2504 scrollBar.state = STATE_IDLE;
2432 scrollbar_show (0); 2505 scrollBar.show (0);
2433 }
2434#endif
2435 } 2506 }
2436 2507
2508#endif
2509
2510 /* bgPixmap.apply () does not do the following : */
2437 scr_clear (); 2511 scr_clear ();
2438 scr_touch (true); 2512 scr_touch (true);
2439 want_refresh = 1; 2513 want_refresh = 1;
2440} 2514}
2441 2515
2442/* ------------------------------------------------------------------------- */ 2516/* ------------------------------------------------------------------------- */
2443void 2517void
2444rxvt_term::scr_clear (bool really) 2518rxvt_term::scr_clear (bool really) NOTHROW
2445{ 2519{
2446 if (!mapped) 2520 if (!mapped)
2447 return; 2521 return;
2448 2522
2449 num_scr_allow = 0; 2523 num_scr_allow = 0;
2450 want_refresh = 1; 2524 want_refresh = 1;
2451 2525
2452 if (really) 2526 if (really)
2453 XClearWindow (display->display, vt); 2527 XClearWindow (dpy, vt);
2454} 2528}
2455 2529
2456/* ------------------------------------------------------------------------- */
2457void 2530void
2531rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2532{
2533 int view_end = view_start + nrow;
2534 int row, col;
2535
2536 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2537 {
2538 text_t *stp = ROW(row).t;
2539 rend_t *srp = ROW(row).r;
2540
2541 for (col = beg_col; col < end_col; col++)
2542 srp[col] ^= rstyle1;
2543
2544 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2545 srp[col] ^= rstyle2;
2546
2547 if (++col < end_col)
2548 srp[col] ^= rstyle2;
2549 }
2550}
2551
2552void
2553rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2554{
2555 int view_end = view_start + nrow;
2556 int row, col;
2557
2558 if (beg_row >= view_start)
2559 {
2560 col = beg_col;
2561 row = beg_row;
2562 }
2563 else
2564 {
2565 col = 0;
2566 row = view_start;
2567 }
2568
2569 for (; row < min (end_row, view_end); row++, col = 0)
2570 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2571 srp[col] ^= rstyle;
2572
2573 if (row == end_row)
2574 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2575 srp[col] ^= rstyle;
2576}
2577
2578/* ------------------------------------------------------------------------- */
2579void
2458rxvt_term::scr_reverse_selection () 2580rxvt_term::scr_reverse_selection () NOTHROW
2459{ 2581{
2460 if (selection.op 2582 if (selection.op
2461 && current_screen == selection.screen 2583 && current_screen == selection.screen
2462 && selection.end.row >= -view_start) 2584 && selection.end.row >= view_start)
2463 { 2585 {
2464 int view_end = -view_start + nrow; 2586#if !ENABLE_MINIMAL
2465 int row, col;
2466
2467#if ENABLE_FRILLS
2468 if (selection.rect) 2587 if (selection.rect)
2469 { 2588 scr_xor_rect (selection.beg.row, selection.beg.col,
2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2589 selection.end.row, selection.end.col,
2471 { 2590 RS_RVid, RS_RVid | RS_Uline);
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2474
2475 for (col = selection.beg.col; col < selection.end.col; col++)
2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2484 }
2485 else 2591 else
2486#endif 2592#endif
2487 { 2593 scr_xor_span (selection.beg.row, selection.beg.col,
2488 if (selection.beg.row >= -view_start) 2594 selection.end.row, selection.end.col,
2489 { 2595 RS_RVid);
2490 col = selection.beg.col;
2491 row = selection.beg.row;
2492 }
2493 else
2494 {
2495 col = 0;
2496 row = -view_start;
2497 }
2498
2499 for (; row < min (selection.end.row, view_end); row++, col = 0)
2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2501 srp[col] ^= RS_RVid;
2502
2503 if (row == selection.end.row)
2504 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2505 srp[col] ^= RS_RVid;
2506 }
2507 } 2596 }
2508} 2597}
2509 2598
2510/* ------------------------------------------------------------------------- */ 2599/* ------------------------------------------------------------------------- */
2511/* 2600/*
2512 * Dump the whole scrollback and screen to the passed filedescriptor. The 2601 * Dump the whole scrollback and screen to the passed filedescriptor. The
2513 * invoking routine must close the fd. 2602 * invoking routine must close the fd.
2514 */ 2603 */
2515#if 0 2604#if 0
2516void 2605void
2517rxvt_term::scr_dump (int fd) 2606rxvt_term::scr_dump (int fd) NOTHROW
2518{ 2607{
2519 int row, wrote; 2608 int row, wrote;
2520 unsigned int width, towrite; 2609 unsigned int width, towrite;
2521 char r1[] = "\n"; 2610 char r1[] = "\n";
2522 2611
2523 for (row = saveLines - nsaved; 2612 for (row = saveLines + top_row;
2524 row < saveLines + nrow - 1; row++) 2613 row < saveLines + nrow - 1; row++)
2525 { 2614 {
2526 width = row_buf[row].l >= 0 ? row_buf[row].l 2615 width = row_buf[row].l >= 0 ? row_buf[row].l
2527 : ncol; 2616 : ncol;
2528 for (towrite = width; towrite; towrite -= wrote) 2617 for (towrite = width; towrite; towrite -= wrote)
… …
2541 2630
2542/* ------------------------------------------------------------------------- * 2631/* ------------------------------------------------------------------------- *
2543 * CHARACTER SELECTION * 2632 * CHARACTER SELECTION *
2544 * ------------------------------------------------------------------------- */ 2633 * ------------------------------------------------------------------------- */
2545void 2634void
2546rxvt_term::selection_check (int check_more) 2635rxvt_term::selection_check (int check_more) NOTHROW
2547{ 2636{
2548 row_col_t pos; 2637 row_col_t pos;
2549 2638
2550 if (!selection.op) 2639 if (!selection.op)
2551 return; 2640 return;
2552 2641
2553 pos.row = pos.col = 0; 2642 pos.row = pos.col = 0;
2554 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2643 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2555 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2644 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2556 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2645 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2557 || (check_more == 1 2646 || (check_more == 1
2558 && current_screen == selection.screen 2647 && current_screen == selection.screen
2559 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2648 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2560 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2649 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2561 || (check_more == 2 2650 || (check_more == 2
… …
2572/* ------------------------------------------------------------------------- */ 2661/* ------------------------------------------------------------------------- */
2573/* 2662/*
2574 * Paste a selection direct to the command fd 2663 * Paste a selection direct to the command fd
2575 */ 2664 */
2576void 2665void
2577rxvt_term::paste (char *data, unsigned int len) 2666rxvt_term::paste (char *data, unsigned int len) NOTHROW
2578{ 2667{
2579 /* convert normal newline chars into common keyboard Return key sequence */ 2668 /* convert normal newline chars into common keyboard Return key sequence */
2580 for (unsigned int i = 0; i < len; i++) 2669 for (unsigned int i = 0; i < len; i++)
2581 if (data[i] == C0_LF) 2670 if (data[i] == C0_LF)
2582 data[i] = C0_CR; 2671 data[i] = C0_CR;
2583 2672
2673 if (priv_modes & PrivMode_BracketPaste)
2674 tt_printf ("\e[200~");
2675
2584 tt_write (data, len); 2676 tt_write (data, len);
2677
2678 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~");
2585} 2680}
2586 2681
2587/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2588/* 2683/*
2589 * Respond to a notification that a primary selection has been sent 2684 * Respond to a notification that a primary selection has been sent
2590 * EXT: SelectionNotify 2685 * EXT: SelectionNotify
2591 */ 2686 */
2592void 2687void
2593rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2594{ 2689{
2595 if (prop == None) /* check for failed XConvertSelection */ 2690 if (prop == None) /* check for failed XConvertSelection */
2596 { 2691 {
2597 if ((selection_type & Sel_CompoundText)) 2692 if ((selection_type & Sel_CompoundText))
2598 { 2693 {
… …
2618 } 2713 }
2619 2714
2620 unsigned long bytes_after; 2715 unsigned long bytes_after;
2621 XTextProperty ct; 2716 XTextProperty ct;
2622 2717
2623 if (XGetWindowProperty (display->display, win, prop, 2718 if (XGetWindowProperty (dpy, win, prop,
2624 0, PROP_SIZE / 4, 2719 0, PROP_SIZE / 4,
2625 delete_prop, AnyPropertyType, 2720 delete_prop, AnyPropertyType,
2626 &ct.encoding, &ct.format, 2721 &ct.encoding, &ct.format,
2627 &ct.nitems, &bytes_after, 2722 &ct.nitems, &bytes_after,
2628 &ct.value) != Success) 2723 &ct.value) != Success)
… …
2637 if (bytes_after) 2732 if (bytes_after)
2638 { 2733 {
2639 // fetch and append remaining data 2734 // fetch and append remaining data
2640 XTextProperty ct2; 2735 XTextProperty ct2;
2641 2736
2642 if (XGetWindowProperty (display->display, win, prop, 2737 if (XGetWindowProperty (dpy, win, prop,
2643 ct.nitems / 4, (bytes_after + 3) / 4, 2738 ct.nitems / 4, (bytes_after + 3) / 4,
2644 delete_prop, AnyPropertyType, 2739 delete_prop, AnyPropertyType,
2645 &ct2.encoding, &ct2.format, 2740 &ct2.encoding, &ct2.format,
2646 &ct2.nitems, &bytes_after, 2741 &ct2.nitems, &bytes_after,
2647 &ct2.value) != Success) 2742 &ct2.value) != Success)
… …
2660 2755
2661 if (ct.encoding == xa[XA_INCR]) 2756 if (ct.encoding == xa[XA_INCR])
2662 { 2757 {
2663 // INCR selection, start handshake 2758 // INCR selection, start handshake
2664 if (!delete_prop) 2759 if (!delete_prop)
2665 XDeleteProperty (display->display, win, prop); 2760 XDeleteProperty (dpy, win, prop);
2666 2761
2667 selection_wait = Sel_incr; 2762 selection_wait = Sel_incr;
2668 incr_buf_fill = 0; 2763 incr_buf_fill = 0;
2669 incr_ev.start (NOW + 10); 2764 incr_ev.start (10);
2670 2765
2671 goto bailout; 2766 goto bailout;
2672 } 2767 }
2673 2768
2674 if (ct.nitems == 0) 2769 if (ct.nitems == 0)
… …
2683 ct.nitems = incr_buf_fill; 2778 ct.nitems = incr_buf_fill;
2684 incr_buf = 0; 2779 incr_buf = 0;
2685 incr_buf_size = 0; 2780 incr_buf_size = 0;
2686 incr_ev.stop (); 2781 incr_ev.stop ();
2687 } 2782 }
2688 else 2783 else
2689 { 2784 {
2690 if (selection_wait == Sel_normal 2785 if (selection_wait == Sel_normal
2691 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2692 { 2787 {
2693 /* 2788 /*
… …
2700 goto bailout; 2795 goto bailout;
2701 } 2796 }
2702 } 2797 }
2703 else if (selection_wait == Sel_incr) 2798 else if (selection_wait == Sel_incr)
2704 { 2799 {
2705 incr_ev.start (NOW + 10); 2800 incr_ev.start (10);
2706 2801
2707 while (incr_buf_fill + ct.nitems > incr_buf_size) 2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2708 { 2803 {
2709 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2710 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2717 } 2812 }
2718 2813
2719 char **cl; 2814 char **cl;
2720 int cr; 2815 int cr;
2721 2816
2722#if ENABLE_FRILLS 2817#if !ENABLE_MINIMAL
2723 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2724 // so recode it manually 2819 // so recode it manually
2725 if (ct.encoding == xa[XA_UTF8_STRING]) 2820 if (ct.encoding == xa[XA_UTF8_STRING])
2726 { 2821 {
2727 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2731 paste (s, strlen (s)); 2826 paste (s, strlen (s));
2732 free (s); 2827 free (s);
2733 } 2828 }
2734 else 2829 else
2735#endif 2830#endif
2736 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2831 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2737 && cl) 2832 && cl)
2738 { 2833 {
2739 for (int i = 0; i < cr; i++) 2834 for (int i = 0; i < cr; i++)
2740 paste (cl[i], strlen (cl[i])); 2835 paste (cl[i], strlen (cl[i]));
2741 2836
… …
2750 if (selection_wait == Sel_normal) 2845 if (selection_wait == Sel_normal)
2751 selection_wait = Sel_none; 2846 selection_wait = Sel_none;
2752} 2847}
2753 2848
2754void 2849void
2755rxvt_term::incr_cb (time_watcher &w) 2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2756{ 2851{
2757 selection_wait = Sel_none; 2852 selection_wait = Sel_none;
2758 2853
2759 incr_buf_size = 0; 2854 incr_buf_size = 0;
2760 free (incr_buf); 2855 free (incr_buf);
2761 2856
2762 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2763} 2858}
2764 2859
2765void 2860void
2766rxvt_term::selection_property (Window win, Atom prop) 2861rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2767{ 2862{
2768 if (prop == None || selection_wait != Sel_incr) 2863 if (prop == None || selection_wait != Sel_incr)
2769 return; 2864 return;
2770 2865
2771 selection_paste (win, prop, true); 2866 selection_paste (win, prop, true);
2772} 2867}
2773 2868
2774/* ------------------------------------------------------------------------- */ 2869/* ------------------------------------------------------------------------- */
2775/* 2870/*
2776 * Request the current selection: 2871 * Request the current selection:
2777 * Order: > internal selection if available 2872 * Order: > internal selection if available
2778 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2873 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2779 * > CUT_BUFFER0 2874 * > CUT_BUFFER0
2780 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2781 * will auto fallback to CUT_BUFFER0 2876 * will auto fallback to CUT_BUFFER0
2782 * EXT: button 2 release 2877 * EXT: button 2 release
2783 */ 2878 */
2784void 2879void
2785rxvt_term::selection_request (Time tm, int x, int y) 2880rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2786{ 2881{
2787 if (x < 0 || x >= width || y < 0 || y >= height) 2882 if (selection.text && selnum == Sel_Primary)
2788 return; /* outside window */ 2883 {
2789
2790 if (selection.text)
2791 { /* internal selection */ 2884 /* internal selection */
2792 char *str = rxvt_wcstombs (selection.text, selection.len); 2885 char *str = rxvt_wcstombs (selection.text, selection.len);
2793 paste (str, strlen (str)); 2886 paste (str, strlen (str));
2794 free (str); 2887 free (str);
2795 return; 2888 return;
2796 } 2889 }
2797 else 2890 else
2798 { 2891 {
2799 int i;
2800
2801 selection_request_time = tm; 2892 selection_request_time = tm;
2802 selection_wait = Sel_normal; 2893 selection_wait = Sel_normal;
2803 2894
2804 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2805 {
2806#if X_HAVE_UTF8_STRING 2895#if X_HAVE_UTF8_STRING
2807 selection_type = Sel_UTF8String; 2896 selection_type = Sel_UTF8String;
2808 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2809 return; 2898 return;
2810#else 2899#else
2811 selection_type = Sel_CompoundText; 2900 selection_type = Sel_CompoundText;
2812 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2813 return; 2902 return;
2814#endif 2903#endif
2815 }
2816 } 2904 }
2817 2905
2818 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2906 selection_wait = Sel_none; /* don't loop in selection_paste () */
2819 selection_paste (display->root, XA_CUT_BUFFER0, false); 2907 selection_paste (display->root, XA_CUT_BUFFER0, false);
2820} 2908}
2821 2909
2822int 2910int
2823rxvt_term::selection_request_other (Atom target, int selnum) 2911rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2824{ 2912{
2825 Atom sel; 2913 Atom sel;
2826 2914
2827 selection_type |= selnum; 2915 selection_type |= selnum;
2828 2916
… …
2831 else if (selnum == Sel_Secondary) 2919 else if (selnum == Sel_Secondary)
2832 sel = XA_SECONDARY; 2920 sel = XA_SECONDARY;
2833 else 2921 else
2834 sel = xa[XA_CLIPBOARD]; 2922 sel = xa[XA_CLIPBOARD];
2835 2923
2836 if (XGetSelectionOwner (display->display, sel) != None) 2924 if (XGetSelectionOwner (dpy, sel) != None)
2837 { 2925 {
2838 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2926 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2839 vt, selection_request_time); 2927 vt, selection_request_time);
2840 return 1; 2928 return 1;
2841 } 2929 }
2842 2930
2843 return 0; 2931 return 0;
… …
2847/* 2935/*
2848 * Clear all selected text 2936 * Clear all selected text
2849 * EXT: SelectionClear 2937 * EXT: SelectionClear
2850 */ 2938 */
2851void 2939void
2852rxvt_term::selection_clear () 2940rxvt_term::selection_clear () NOTHROW
2853{ 2941{
2854 want_refresh = 1; 2942 want_refresh = 1;
2855 free (selection.text); 2943 free (selection.text);
2856 selection.text = NULL; 2944 selection.text = NULL;
2857 selection.len = 0; 2945 selection.len = 0;
… …
2906 2994
2907 int end_col; 2995 int end_col;
2908 2996
2909 for (; row <= selection.end.row; row++, col = 0) 2997 for (; row <= selection.end.row; row++, col = 0)
2910 { 2998 {
2911#if ENABLE_FRILLS 2999#if !ENABLE_MINIMAL
2912 if (selection.rect) 3000 if (selection.rect)
2913 { 3001 {
2914 col = selection.beg.col; 3002 col = selection.beg.col;
2915 end_col = ncol + 1; 3003 end_col = ncol + 1;
2916 } 3004 }
… …
2919 end_col = ROW(row).l; 3007 end_col = ROW(row).l;
2920 3008
2921 col = max (col, 0); 3009 col = max (col, 0);
2922 3010
2923 if (row == selection.end.row 3011 if (row == selection.end.row
2924#if ENABLE_FRILLS 3012#if !ENABLE_MINIMAL
2925 || selection.rect 3013 || selection.rect
2926#endif 3014#endif
2927 ) 3015 )
2928 min_it (end_col, selection.end.col); 3016 min_it (end_col, selection.end.col);
2929 3017
… …
2952#endif 3040#endif
2953 else 3041 else
2954 new_selection_text[ofs++] = *t++; 3042 new_selection_text[ofs++] = *t++;
2955 } 3043 }
2956 3044
2957#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
2958 if (selection.rect) 3046 if (selection.rect)
2959 { 3047 {
2960 while (ofs 3048 while (ofs
2961 && new_selection_text[ofs - 1] != C0_LF 3049 && new_selection_text[ofs - 1] != C0_LF
2962 && unicode::is_space (new_selection_text[ofs - 1])) 3050 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2992 3080
2993 selection_grab (tm); 3081 selection_grab (tm);
2994} 3082}
2995 3083
2996bool 3084bool
2997rxvt_term::selection_grab (Time tm) 3085rxvt_term::selection_grab (Time tm) NOTHROW
2998{ 3086{
2999 selection_time = tm; 3087 selection_time = tm;
3000 3088
3001 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3002 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3003 { 3091 {
3004 display->set_selection_owner (this); 3092 display->set_selection_owner (this);
3005 return true; 3093 return true;
3006 } 3094 }
3007 else 3095 else
3096 {
3097 selection_clear ();
3008 return false; 3098 return false;
3099 }
3009 3100
3010#if 0 3101#if 0
3011 XTextProperty ct; 3102 XTextProperty ct;
3012 3103
3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3104 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3014 { 3105 {
3015 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3106 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3016 XFree (ct.value); 3107 XFree (ct.value);
3017 } 3108 }
3018#endif 3109#endif
… …
3022/* 3113/*
3023 * Mark or select text based upon number of clicks: 1, 2, or 3 3114 * Mark or select text based upon number of clicks: 1, 2, or 3
3024 * EXT: button 1 press 3115 * EXT: button 1 press
3025 */ 3116 */
3026void 3117void
3027rxvt_term::selection_click (int clicks, int x, int y) 3118rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3028{ 3119{
3029 clicks = ((clicks - 1) % 3) + 1; 3120 clicks = ((clicks - 1) % 3) + 1;
3030 selection.clicks = clicks; /* save clicks so extend will work */ 3121 selection.clicks = clicks; /* save clicks so extend will work */
3031 3122
3123 if (clicks == 2 && !selection.rect
3124 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3125 {
3126 MEvent.clicks = 1; // what a mess
3127 selection.screen = current_screen;
3128 selection.op = SELECTION_CONT;
3129 return;
3130 }
3131
3032 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3132 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3033 3133
3034 if (clicks == 2 || clicks == 3) 3134 if (clicks == 2 || clicks == 3)
3035 selection_extend_colrow (selection.mark.col, 3135 selection_extend_colrow (selection.mark.col,
3036 selection.mark.row + view_start, 3136 selection.mark.row - view_start,
3037 0, /* button 3 */ 3137 0, /* button 3 */
3038 1, /* button press */ 3138 1, /* button press */
3039 0); /* click change */ 3139 0); /* click change */
3040} 3140}
3041 3141
3042/* ------------------------------------------------------------------------- */ 3142/* ------------------------------------------------------------------------- */
3043/* 3143/*
3044 * Mark a selection at the specified col/row 3144 * Mark a selection at the specified col/row
3045 */ 3145 */
3046void 3146void
3047rxvt_term::selection_start_colrow (int col, int row) 3147rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3048{ 3148{
3049 want_refresh = 1; 3149 want_refresh = 1;
3050 3150
3051 selection.mark.row = row - view_start; 3151 selection.mark.row = row + view_start;
3052 selection.mark.col = col; 3152 selection.mark.col = col;
3053 3153
3054 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3154 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3055 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3155 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3056 3156
3057 while (selection.mark.col > 0 3157 while (selection.mark.col > 0
3058 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3158 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3059 --selection.mark.col; 3159 --selection.mark.col;
3060 3160
3061 if (selection.op) 3161 if (selection.op)
3162 {
3062 { /* clear the old selection */ 3163 /* clear the old selection */
3063 selection.beg.row = selection.end.row = selection.mark.row; 3164 selection.beg.row = selection.end.row = selection.mark.row;
3064 selection.beg.col = selection.end.col = selection.mark.col; 3165 selection.beg.col = selection.end.col = selection.mark.col;
3065 } 3166 }
3066 3167
3067 selection.op = SELECTION_INIT; 3168 selection.op = SELECTION_INIT;
… …
3078#define DELIMIT_TEXT(x) \ 3179#define DELIMIT_TEXT(x) \
3079 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3180 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3080#define DELIMIT_REND(x) 1 3181#define DELIMIT_REND(x) 1
3081 3182
3082void 3183void
3083rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3184rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3084{ 3185{
3085 int col, row, dirnadd, tcol, trow, w1, w2; 3186 int col, row, dirnadd, tcol, trow, w1, w2;
3086 row_col_t bound; 3187 row_col_t bound;
3087 text_t *stp; 3188 text_t *stp;
3088 rend_t *srp; 3189 rend_t *srp;
3089 3190
3090 if (dirn == UP) 3191 if (dirn == UP)
3091 { 3192 {
3092 bound.row = - nsaved - 1; 3193 bound.row = top_row - 1;
3093 bound.col = 0; 3194 bound.col = 0;
3094 dirnadd = -1; 3195 dirnadd = -1;
3095 } 3196 }
3096 else 3197 else
3097 { 3198 {
… …
3162 * flag == 0 ==> button 1 3263 * flag == 0 ==> button 1
3163 * flag == 1 ==> button 3 press 3264 * flag == 1 ==> button 3 press
3164 * flag == 2 ==> button 3 motion 3265 * flag == 2 ==> button 3 motion
3165 */ 3266 */
3166void 3267void
3167rxvt_term::selection_extend (int x, int y, int flag) 3268rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3168{ 3269{
3169 int col = clamp (Pixel2Col (x), 0, ncol); 3270 int col = clamp (Pixel2Col (x), 0, ncol);
3170 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3271 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3171 3272
3172 /* 3273 /*
… …
3175 * select nothing. Otherwise, if we're to the right of the mark, you have to 3276 * select nothing. Otherwise, if we're to the right of the mark, you have to
3176 * be _past_ a character for it to be selected. 3277 * be _past_ a character for it to be selected.
3177 */ 3278 */
3178 if (((selection.clicks % 3) == 1) && !flag 3279 if (((selection.clicks % 3) == 1) && !flag
3179 && (col == selection.mark.col 3280 && (col == selection.mark.col
3180 && (row == selection.mark.row + view_start))) 3281 && (row == selection.mark.row - view_start)))
3181 { 3282 {
3182 /* select nothing */ 3283 /* select nothing */
3183 selection.beg.row = selection.end.row = 0; 3284 selection.beg.row = selection.end.row = 0;
3184 selection.beg.col = selection.end.col = 0; 3285 selection.beg.col = selection.end.col = 0;
3185 selection.clicks = 4; 3286 selection.clicks = 4;
… …
3198/* ------------------------------------------------------------------------- */ 3299/* ------------------------------------------------------------------------- */
3199/* 3300/*
3200 * Extend the selection to the specified col/row 3301 * Extend the selection to the specified col/row
3201 */ 3302 */
3202void 3303void
3203rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3304rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3204{ 3305{
3205 row_col_t pos; 3306 row_col_t pos;
3206 enum { 3307 enum {
3207 LEFT, RIGHT 3308 LEFT, RIGHT
3208 } closeto = RIGHT; 3309 } closeto = RIGHT;
… …
3240 selection.beg.col = selection.end.col = selection.mark.col; 3341 selection.beg.col = selection.end.col = selection.mark.col;
3241 selection.beg.row = selection.end.row = selection.mark.row; 3342 selection.beg.row = selection.end.row = selection.mark.row;
3242 } 3343 }
3243 3344
3244 pos.col = col; 3345 pos.col = col;
3245 pos.row = row - view_start; 3346 pos.row = view_start + row;
3246 3347
3247 /* 3348 /*
3248 * This is mainly xterm style selection with a couple of differences, mainly 3349 * This is mainly xterm style selection with a couple of differences, mainly
3249 * in the way button3 drag extension works. 3350 * in the way button3 drag extension works.
3250 * We're either doing: button1 drag; button3 press; or button3 drag 3351 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3256 * a point/word/line which is either the start or end of the selection 3357 * a point/word/line which is either the start or end of the selection
3257 * and it was decided by whichever point/word/line was `fixed' at the 3358 * and it was decided by whichever point/word/line was `fixed' at the
3258 * time of the most recent button3 press 3359 * time of the most recent button3 press
3259 */ 3360 */
3260 if (button3 && buttonpress) 3361 if (button3 && buttonpress)
3362 {
3261 { /* button3 press */ 3363 /* button3 press */
3262 /* 3364 /*
3263 * first determine which edge of the selection we are closest to 3365 * first determine which edge of the selection we are closest to
3264 */ 3366 */
3265 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3367 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3266 || (!ROWCOL_IS_AFTER (pos, selection.end) 3368 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3284 selection.mark.row = selection.beg.row; 3386 selection.mark.row = selection.beg.row;
3285 selection.mark.col = selection.beg.col; 3387 selection.mark.col = selection.beg.col;
3286 } 3388 }
3287 } 3389 }
3288 else 3390 else
3391 {
3289 { /* button1 drag or button3 drag */ 3392 /* button1 drag or button3 drag */
3290 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3393 if (ROWCOL_IS_AFTER (selection.mark, pos))
3291 { 3394 {
3292 if (selection.mark.row == selection.end.row 3395 if (selection.mark.row == selection.end.row
3293 && selection.mark.col == selection.end.col 3396 && selection.mark.col == selection.end.col
3294 && clickchange 3397 && clickchange
… …
3311 3414
3312 if (selection.clicks == 1) 3415 if (selection.clicks == 1)
3313 { 3416 {
3314 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3417 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3315 && !ROW(selection.beg.row).is_longer () 3418 && !ROW(selection.beg.row).is_longer ()
3316#if ENABLE_FRILLS 3419#if !ENABLE_MINIMAL
3317 && !selection.rect 3420 && !selection.rect
3318#endif 3421#endif
3319 ) 3422 )
3320 selection.beg.col = ncol; 3423 selection.beg.col = ncol;
3321 3424
3322 if ( 3425 if (
3323 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3426 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3324 && !ROW(selection.end.row).is_longer () 3427 && !ROW(selection.end.row).is_longer ()
3325#if ENABLE_FRILLS 3428#if !ENABLE_MINIMAL
3326 && !selection.rect 3429 && !selection.rect
3327#endif 3430#endif
3328 ) 3431 )
3329 selection.end.col = ncol; 3432 selection.end.col = ncol;
3330 } 3433 }
3331 else if (selection.clicks == 2) 3434 else if (selection.clicks == 2)
3332 { 3435 {
3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3436 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334 selection.end.col--; 3437 selection.end.col--;
3335 3438
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3338 selection_delimit_word (UP, &selection.beg, &selection.beg); 3439 selection_delimit_word (UP, &selection.beg, &selection.beg);
3339 selection_delimit_word (DN, &selection.end, &selection.end); 3440 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3341 } 3441 }
3342 else if (selection.clicks == 3) 3442 else if (selection.clicks == 3)
3343 { 3443 {
3344#if ENABLE_FRILLS 3444#if ENABLE_FRILLS
3345 if (OPTION (Opt_tripleclickwords)) 3445 if (option (Opt_tripleclickwords))
3346 { 3446 {
3347 selection_delimit_word (UP, &selection.beg, &selection.beg); 3447 selection_delimit_word (UP, &selection.beg, &selection.beg);
3348 3448
3349 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3449 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3350 { 3450 {
3351 if (!ROW(end_row).is_longer ()) 3451 if (!ROW(end_row).is_longer ())
3352 { 3452 {
3353 selection.end.row = end_row; 3453 selection.end.row = end_row;
3354 selection.end.col = ROW(end_row).l; 3454 selection.end.col = ROW(end_row).l;
3455# if !ENABLE_MINIMAL
3355 selection_remove_trailing_spaces (); 3456 selection_remove_trailing_spaces ();
3457# endif
3356 break; 3458 break;
3357 } 3459 }
3358 } 3460 }
3359 } 3461 }
3360 else 3462 else
… …
3376 selection.end.row++; 3478 selection.end.row++;
3377 } 3479 }
3378 } 3480 }
3379 3481
3380 if (button3 && buttonpress) 3482 if (button3 && buttonpress)
3483 {
3381 { /* mark may need to be changed */ 3484 /* mark may need to be changed */
3382 if (closeto == LEFT) 3485 if (closeto == LEFT)
3383 { 3486 {
3384 selection.mark.row = selection.end.row; 3487 selection.mark.row = selection.end.row;
3385 selection.mark.col = selection.end.col - (selection.clicks == 2); 3488 selection.mark.col = selection.end.col - (selection.clicks == 2);
3386 } 3489 }
… …
3389 selection.mark.row = selection.beg.row; 3492 selection.mark.row = selection.beg.row;
3390 selection.mark.col = selection.beg.col; 3493 selection.mark.col = selection.beg.col;
3391 } 3494 }
3392 } 3495 }
3393 3496
3394#if ENABLE_FRILLS 3497#if !ENABLE_MINIMAL
3395 if (selection.rect && selection.beg.col > selection.end.col) 3498 if (selection.rect && selection.beg.col > selection.end.col)
3396 ::swap (selection.beg.col, selection.end.col); 3499 ::swap (selection.beg.col, selection.end.col);
3397#endif 3500#endif
3398} 3501}
3399 3502
3400#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3401void 3504void
3402rxvt_term::selection_remove_trailing_spaces () 3505rxvt_term::selection_remove_trailing_spaces () NOTHROW
3403{ 3506{
3404 int32_t end_col, end_row; 3507 int32_t end_col, end_row;
3405 text_t *stp; 3508 text_t *stp;
3406 3509
3407 end_col = selection.end.col; 3510 end_col = selection.end.col;
… …
3445/* 3548/*
3446 * Double click on button 3 when already selected 3549 * Double click on button 3 when already selected
3447 * EXT: button 3 double click 3550 * EXT: button 3 double click
3448 */ 3551 */
3449void 3552void
3450rxvt_term::selection_rotate (int x, int y) 3553rxvt_term::selection_rotate (int x, int y) NOTHROW
3451{ 3554{
3452 selection.clicks = selection.clicks % 3 + 1; 3555 selection.clicks = selection.clicks % 3 + 1;
3453 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3556 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3454} 3557}
3455 3558
… …
3457/* 3560/*
3458 * Respond to a request for our current selection 3561 * Respond to a request for our current selection
3459 * EXT: SelectionRequest 3562 * EXT: SelectionRequest
3460 */ 3563 */
3461void 3564void
3462rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3565rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3463{ 3566{
3464 XSelectionEvent ev; 3567 XSelectionEvent ev;
3465 dDisp;
3466 3568
3467 ev.type = SelectionNotify; 3569 ev.type = SelectionNotify;
3468 ev.property = None; 3570 ev.property = None;
3469 ev.display = rq.display; 3571 ev.display = rq.display;
3470 ev.requestor = rq.requestor; 3572 ev.requestor = rq.requestor;
… …
3484 *target++ = xa[XA_COMPOUND_TEXT]; 3586 *target++ = xa[XA_COMPOUND_TEXT];
3485#if X_HAVE_UTF8_STRING 3587#if X_HAVE_UTF8_STRING
3486 *target++ = xa[XA_UTF8_STRING]; 3588 *target++ = xa[XA_UTF8_STRING];
3487#endif 3589#endif
3488 3590
3489 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3591 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3490 32, PropModeReplace, 3592 32, PropModeReplace,
3491 (unsigned char *)target_list, target - target_list); 3593 (unsigned char *)target_list, target - target_list);
3492 ev.property = rq.property; 3594 ev.property = rq.property;
3493 } 3595 }
3494#if TODO // TODO 3596#if TODO // TODO
… …
3497 /* TODO: Handle MULTIPLE */ 3599 /* TODO: Handle MULTIPLE */
3498 } 3600 }
3499#endif 3601#endif
3500 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3501 { 3603 {
3502 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3503 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3605 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3504 ev.property = rq.property; 3606 ev.property = rq.property;
3505 } 3607 }
3506 else if (rq.target == XA_STRING 3608 else if (rq.target == XA_STRING
3507 || rq.target == xa[XA_TEXT] 3609 || rq.target == xa[XA_TEXT]
… …
3531 style = enc_string; 3633 style = enc_string;
3532 else if (target == xa[XA_TEXT]) 3634 else if (target == xa[XA_TEXT])
3533 style = enc_text; 3635 style = enc_text;
3534 else if (target == xa[XA_COMPOUND_TEXT]) 3636 else if (target == xa[XA_COMPOUND_TEXT])
3535 style = enc_compound_text; 3637 style = enc_compound_text;
3536#if ENABLE_FRILLS 3638#if !ENABLE_MINIMAL
3537 else if (target == xa[XA_UTF8_STRING]) 3639 else if (target == xa[XA_UTF8_STRING])
3538 style = enc_utf8; 3640 style = enc_utf8;
3539#endif 3641#endif
3540 else 3642 else
3541 { 3643 {
… …
3552 { 3654 {
3553 cl = L""; 3655 cl = L"";
3554 selectlen = 0; 3656 selectlen = 0;
3555 } 3657 }
3556 3658
3557#if ENABLE_FRILLS 3659#if !ENABLE_MINIMAL
3558 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3660 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3559 // so recode it manually 3661 // so recode it manually
3560 if (style == enc_utf8) 3662 if (style == enc_utf8)
3561 { 3663 {
3562 freect = 1; 3664 freect = 1;
… …
3565 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3667 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3566 ct.nitems = strlen ((char *)ct.value); 3668 ct.nitems = strlen ((char *)ct.value);
3567 } 3669 }
3568 else 3670 else
3569#endif 3671#endif
3570 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3672 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3571 freect = 1; 3673 freect = 1;
3572 else 3674 else
3573 { 3675 {
3574 /* if we failed to convert then send it raw */ 3676 /* if we failed to convert then send it raw */
3575 ct.value = (unsigned char *)cl; 3677 ct.value = (unsigned char *)cl;
3576 ct.nitems = selectlen; 3678 ct.nitems = selectlen;
3577 ct.encoding = target; 3679 ct.encoding = target;
3578 } 3680 }
3579 3681
3580 XChangeProperty (disp, rq.requestor, rq.property, 3682 XChangeProperty (dpy, rq.requestor, rq.property,
3581 ct.encoding, 8, PropModeReplace, 3683 ct.encoding, 8, PropModeReplace,
3582 ct.value, (int)ct.nitems); 3684 ct.value, (int)ct.nitems);
3583 ev.property = rq.property; 3685 ev.property = rq.property;
3584 3686
3585 if (freect) 3687 if (freect)
3586 XFree (ct.value); 3688 XFree (ct.value);
3587 } 3689 }
3588 3690
3589 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3691 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3590}
3591
3592/* ------------------------------------------------------------------------- *
3593 * MOUSE ROUTINES *
3594 * ------------------------------------------------------------------------- */
3595
3596/*
3597 * return col/row values corresponding to x/y pixel values
3598 */
3599void
3600rxvt_term::pixel_position (int *x, int *y)
3601{
3602 *x = Pixel2Col (*x);
3603 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3604 *y = Pixel2Row (*y);
3605 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3606} 3692}
3607 3693
3608/* ------------------------------------------------------------------------- */ 3694/* ------------------------------------------------------------------------- */
3609#ifdef USE_XIM 3695#ifdef USE_XIM
3610void 3696void
3611rxvt_term::im_set_position (XPoint &pos) 3697rxvt_term::im_set_position (XPoint &pos) NOTHROW
3612{ 3698{
3613 XWindowAttributes xwa; 3699 XWindowAttributes xwa;
3614 3700
3615 XGetWindowAttributes (display->display, vt, &xwa); 3701 XGetWindowAttributes (dpy, vt, &xwa);
3616 3702
3617 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3703 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3618 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3704 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3619} 3705}
3620#endif 3706#endif
3621 3707
3622#if ENABLE_OVERLAY 3708#if ENABLE_OVERLAY
3623void 3709void
3624rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3710rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3625{ 3711{
3626 if (nrow < 1 || ncol < 1) 3712 if (nrow < 1 || ncol < 1)
3627 return; 3713 return;
3628 3714
3629 want_refresh = 1; 3715 want_refresh = 1;
… …
3674 *rp = r; 3760 *rp = r;
3675 } 3761 }
3676} 3762}
3677 3763
3678void 3764void
3679rxvt_term::scr_overlay_off () 3765rxvt_term::scr_overlay_off () NOTHROW
3680{ 3766{
3681 if (!ov_text) 3767 if (!ov_text)
3682 return; 3768 return;
3683 3769
3684 want_refresh = 1; 3770 want_refresh = 1;
… …
3692 delete [] ov_text; ov_text = 0; 3778 delete [] ov_text; ov_text = 0;
3693 delete [] ov_rend; ov_rend = 0; 3779 delete [] ov_rend; ov_rend = 0;
3694} 3780}
3695 3781
3696void 3782void
3697rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3783rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3698{ 3784{
3699 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3700 return; 3786 return;
3701 3787
3702 x++, y++; 3788 x++, y++;
… …
3704 ov_text[y][x] = text; 3790 ov_text[y][x] = text;
3705 ov_rend[y][x] = rend; 3791 ov_rend[y][x] = rend;
3706} 3792}
3707 3793
3708void 3794void
3709rxvt_term::scr_overlay_set (int x, int y, const char *s) 3795rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3710{ 3796{
3711 while (*s) 3797 while (*s)
3712 scr_overlay_set (x++, y, *s++); 3798 scr_overlay_set (x++, y, *s++);
3713} 3799}
3714 3800
3715void 3801void
3716rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3802rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3717{ 3803{
3718 while (*s) 3804 while (*s)
3719 { 3805 {
3720 text_t t = *s++; 3806 text_t t = *s++;
3721 int width = wcwidth (t); 3807 int width = WCWIDTH (t);
3722 3808
3723 while (width--) 3809 while (width--)
3724 { 3810 {
3725 scr_overlay_set (x++, y, t); 3811 scr_overlay_set (x++, y, t);
3726 t = NOCHAR; 3812 t = NOCHAR;
3727 } 3813 }
3728 } 3814 }
3729} 3815}
3730 3816
3731void 3817void
3732rxvt_term::scr_swap_overlay () 3818rxvt_term::scr_swap_overlay () NOTHROW
3733{ 3819{
3734 if (!ov_text) 3820 if (!ov_text)
3735 return; 3821 return;
3736 3822
3737 // swap screen mem with overlay 3823 // swap screen mem with overlay
3738 for (int y = ov_h; y--; ) 3824 for (int y = ov_h; y--; )
3739 { 3825 {
3740 text_t *t1 = ov_text[y]; 3826 text_t *t1 = ov_text[y];
3741 rend_t *r1 = ov_rend[y]; 3827 rend_t *r1 = ov_rend[y];
3742 3828
3743 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3829 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3744 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3830 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3745 3831
3746 for (int x = ov_w; x--; ) 3832 for (int x = ov_w; x--; )
3747 { 3833 {
3748 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3834 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3749 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3835 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