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.189 by root, Thu Dec 22 15:28:15 2005 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
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-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
92 */ 93 */
93#define drawBuffer vt 94#define drawBuffer vt
94 95
95#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
96 if (mapped) \ 97 if (mapped) \
97 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (xdisp, drawBuffer, 0, \
98 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
99 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
100 101
101#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
102 if (mapped) \ 103 if (mapped) \
103 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (xdisp, drawBuffer, x, y, \
104 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
105 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
106 107
107#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
108 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (xdisp, drawBuffer, gc, \
109 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
110 (unsigned int)width, \ 111 (unsigned int)width, \
111 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
112 113
113/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
120{ 121{
121 if (!l.t) 122 if (!l.t)
122 { 123 {
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
139} 142}
140 143
141/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
167 nrow = 24; 173 nrow = 24;
168 174
169 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
170 return; 176 return;
171 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
172 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
173 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
174 { 183 {
175 //TODO//FIXME 184 //TODO//FIXME
176 saveLines++; 185 saveLines++;
177 prev_nrow--; 186 prev_nrow--;
178 nsaved++; 187 top_row--;
179 } 188 }
180 189
181 want_refresh = 1; 190 want_refresh = 1;
182 191
183 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
… …
188 197
189 if (!row_buf) 198 if (!row_buf)
190 { 199 {
191 /* 200 /*
192 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 202 */
195 nsaved = 0; /* no saved lines */ 203 top_row = 0;
196 term_start = 0; 204 term_start = 0;
197 205
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 208
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 212
206 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
207 { 214 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 237 selection.text = NULL;
231 selection.len = 0; 238 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
234 selection.clicks = 0; 241 selection.clicks = 0;
235 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
236 rvideo = 0;
237 } 243 }
238 else 244 else
239 { 245 {
240 /* 246 /*
241 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
254 } 260 }
255 } 261 }
256#endif 262#endif
257 263
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 266
262 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
263 { 268 {
264 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
269 { 274 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 277 }
273 278
279 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 281
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
279 285
280 if (nsaved) 286 if (top_row)
281 { 287 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
284 290
285 while (p != pend && q > 0) 291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
294 do
286 { 295 {
287 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
288#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
289 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
290#endif 299#endif
291 300 int plines = 1;
292 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
293 302
294 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
295 { 304 {
296 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
297 306
307 plines++;
298 llen += prev_ncol; 308 llen += prev_ncol;
299 } 309 }
300 310
301 int qlines = max (0, (llen - 1) / ncol) + 1; 311 int qlines = max (0, (llen - 1) / ncol) + 1;
302 312
… …
312 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
313 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
314 { 324 {
315 qline = row_buf + qrow; 325 qline = row_buf + qrow;
316 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
317 qline->set_is_longer (); 328 qline->is_longer (1);
318 329
319 int qcol = 0; 330 int qcol = 0;
320 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
321 // fill a single destination line 336 // fill a single destination line
322 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
323 { 338 {
324 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
325 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
326 341
327 line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; 342 prow = MOD (p + prow, prev_total_rows);
343
344 // we only adjust the cursor _row_ and put it into
345 // the topmost line of "long line" it was in, as
346 // this seems to upset applications/shells/readline
347 // least.
348 if (prow == ocur.row)
349 screen.cur.row = q - (total_rows - nrow);
350
351 line_t &pline = old_buf [prow];
328 352
329 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
330
331 assert (len);
332 assert (pline.t);
333 354
334 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
335 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
336 357
337 lofs += len; 358 lofs += len;
338 qcol += len; 359 qcol += len;
339 } 360 }
340 } 361 }
341 362
342 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
364 qline->is_longer (0);
343 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
344 } 366 }
367 while (p != pend && q > 0);
345 368
346 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
347 view_start = 0; 370 top_row = q - term_start;
348 nsaved = term_start - q;
349 371
350 // make sure all terminal lines exist 372 // make sure all terminal lines exist
351 while (nsaved < 0) 373 while (top_row > 0)
352 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
353
354 } 375 }
355 else 376 else
356 { 377 {
357 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
358 379
… …
369 { 390 {
370 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 391 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
371 } 392 }
372 393
373 term_start = 0; 394 term_start = 0;
374 view_start = 0;
375 } 395 }
376
377#ifdef DEBUG_STRICT
378 for (int i = -nsaved; i < nrow; i++)
379 assert (ROW (i).t);
380#endif
381 396
382 free (old_buf); 397 free (old_buf);
383 delete old_ta; 398 delete old_ta;
384 delete old_ra; 399 delete old_ra;
385 400
386 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
387 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
388 403
389 if (tabs)
390 free (tabs); 404 free (tabs);
391 } 405 }
406
407 CLEAR_ALL_SELECTION ();
392 408
393 prev_nrow = nrow; 409 prev_nrow = nrow;
394 prev_ncol = ncol; 410 prev_ncol = ncol;
395 411
396 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
397 413
398 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
399 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
400 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
401 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
402} 423}
403 424
404/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
405/* 426/*
406 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
407 */ 428 */
408void 429void
409rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
410{ 431{
432 if (row_buf)
433 {
411 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
412 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
413 436
414 free (row_buf); 437 free (row_buf);
415 free (swap_buf); 438 free (swap_buf);
416 free (drawn_buf); 439 free (drawn_buf);
417 free (temp_buf);
418 free (tabs); 440 free (tabs);
419 441
420 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
421} 444}
422 445
423/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
424/* 447/*
425 * Hard reset 448 * Hard reset
… …
430 scr_release (); 453 scr_release ();
431 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
432 scr_reset (); 455 scr_reset ();
433 456
434 scr_clear (true); 457 scr_clear (true);
435 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
436} 459}
437 460
438/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
439 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
440 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
442 * Save and Restore cursor 465 * Save and Restore cursor
443 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
444 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
445 */ 468 */
446void 469void
447rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
448{ 471{
449 screen_t *s; 472 screen_t *s;
450 473
451#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
452 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
484 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
485 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
486#endif 509#endif
487} 510}
488 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
489/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
490/* 528/*
491 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
492 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
493 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
494 */ 532 */
495int 533void
496rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
497{ 535{
536 if (scrn == current_screen)
537 return;
538
498 want_refresh = 1; 539 want_refresh = 1;
499 view_start = 0; 540 view_start = 0;
500 541
501 if (current_screen == scrn)
502 return scrn;
503
504 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
505 543
506 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
507 545
508 ::swap (screen.cur.row, swap.cur.row);
509 ::swap (screen.cur.col, swap.cur.col);
510
511 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
512 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
513
514#if NSCREENS 546#if NSCREENS
515 if (options & Opt_secondaryScreen) 547 if (OPTION (Opt_secondaryScreen))
516 { 548 {
517 num_scr = 0; 549 num_scr = 0;
518 550
519 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
520 ::swap (ROW(i), swap_buf [i]);
521 552
522 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
523 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
524 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
525 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
526 } 557 }
527 else 558 else
528#endif 559#endif
529 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
530 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
531
532 return scrn;
533} 562}
534 563
535// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
536void 565void
537rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
538{ 567{
539 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
540 return; 569 return;
541 570
542 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
552/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
553/* 582/*
554 * Change the colour for following text 583 * Change the colour for following text
555 */ 584 */
556void 585void
557rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
558{ 587{
559 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
560 color = fgbg; 589 color = fgbg;
561 590
562 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
563 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
564 else 593 else
… …
568/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
569/* 598/*
570 * Change the rendition style for following text 599 * Change the rendition style for following text
571 */ 600 */
572void 601void
573rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
574 { 603 {
575 if (set) 604 if (set)
576 rstyle |= style; 605 rstyle |= style;
577 else if (style == ~RS_None) 606 else if (style == ~RS_None)
578 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
585 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
586 * count positive ==> scroll up 615 * count positive ==> scroll up
587 * count negative ==> scroll down 616 * count negative ==> scroll down
588 */ 617 */
589int 618int
590rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
591{ 620{
592 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
593 return 0; 622 return 0;
594 623
595 want_refresh = 1; 624 want_refresh = 1;
596 num_scr += count; 625 num_scr += count;
597 626
598 if (count > 0 627 if (count > 0
599 && row1 == 0 628 && row1 == 0
600 && row2 == nrow - 1
601 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
602 { 630 {
603 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
604 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
605 635
636 // sever bottommost line
637 {
638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
642
643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
606 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
607 { 661 {
608 selection.beg.row -= count; 662 selection.beg.row -= count;
609 selection.end.row -= count; 663 selection.end.row -= count;
610 selection.mark.row -= count; 664 selection.mark.row -= count;
611 665
612 selection_check (0); 666 if (selection.beg.row < top_row
613 } 667 || selection.end.row < top_row
614 668 || selection.mark.row < top_row)
615 for (int i = count; i--; )
616 scr_blank_screen_mem (ROW(row2 - i), rstyle);
617
618 if ((options & Opt_scrollWithBuffer)
619 && view_start != 0
620 && view_start != saveLines)
621 scr_page (UP, count);
622 }
623 else
624 {
625 if (selection.op && current_screen == selection.screen)
626 {
627 int i = selection.beg.row;
628 int j = selection.end.row;
629
630 if ((i < row1 && j > row1)
631 || (i < row2 && j > row2)
632 || (i - count < row1 && i >= row1)
633 || (i - count > row2 && i <= row2)
634 || (j - count < row1 && j >= row1)
635 || (j - count > row2 && j <= row2))
636 { 669 {
637 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
639 } 672 }
640 else if (j >= row1 && j <= row2) 673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
683 }
684 else
685 {
686 if (selection.op && current_screen == selection.screen)
687 {
688 if ((selection.beg.row < row1 && selection.end.row > row1)
689 || (selection.beg.row < row2 && selection.end.row > row2)
690 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
691 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
692 || (selection.end.row - count < row1 && selection.end.row >= row1)
693 || (selection.end.row - count > row2 && selection.end.row <= row2))
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 else if (selection.end.row >= row1 && selection.end.row <= row2)
641 { 699 {
642 /* move selected region too */ 700 /* move selected region too */
643 selection.beg.row -= count; 701 selection.beg.row -= count;
644 selection.end.row -= count; 702 selection.end.row -= count;
645 selection.mark.row -= count; 703 selection.mark.row -= count;
… …
653 711
654 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
655 713
656 min_it (count, rows); 714 min_it (count, rows);
657 715
716 line_t *temp_buf = row_buf + total_rows;
717
658 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
659 { 719 {
660 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
661 721
662 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
673/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
674/* 734/*
675 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
676 */ 736 */
677void 737void
678rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
679{ 739{
680 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
681 return; 741 return;
682 742
683 unsigned char checksel; 743 unsigned char checksel;
684 unicode_t c; 744 unicode_t c;
685 int row, last_col; 745 int ncol = this->ncol;
686 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
687 747
688 want_refresh = 1; 748 want_refresh = 1;
689 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
690 last_col = ncol;
691 750
692 if (nlines > 0) 751 if (minlines > 0)
693 { 752 {
694 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754 min_it (minlines, screen.cur.row - top_row);
755
695 if (nlines > 0 756 if (minlines > 0
696 && screen.tscroll == 0 757 && screen.tscroll == 0
697 && screen.bscroll == (nrow - 1)) 758 && screen.bscroll == nrow - 1)
698 { 759 {
699 /* _at least_ this many lines need to be scrolled */ 760 /* _at least_ this many lines need to be scrolled */
700 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 761 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
701 screen.cur.row -= nlines; 762 screen.cur.row -= minlines;
702 } 763 }
703 } 764 }
704 765
705#ifdef DEBUG_STRICT 766#ifdef DEBUG_STRICT
706 assert (screen.cur.col < last_col); 767 assert (screen.cur.col < ncol);
707 assert (screen.cur.row < nrow 768 assert (screen.cur.row < nrow
708 && screen.cur.row >= -nsaved); 769 && screen.cur.row >= top_row);
709#endif 770#endif
710 row = screen.cur.row; 771 int row = screen.cur.row;
711 772
712 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 773 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
713 774
714 line_t *line = &ROW(row); 775 line_t *line = &ROW(row);
715 776
716 while (str < strend) 777 while (str < strend)
717 { 778 {
718 c = *str++; 779 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
719 780
720 if (c < 0x20) 781 if (c < 0x20)
721 if (c == C0_LF) 782 if (c == C0_LF)
722 { 783 {
723 if (!line->is_longer ()) /* XXX: think about this */
724 max_it (line->l, screen.cur.col); 784 max_it (line->l, screen.cur.col);
725 785
726 screen.flags &= ~Screen_WrapNext; 786 screen.flags &= ~Screen_WrapNext;
727 787
728 if (screen.cur.row == screen.bscroll) 788 if (screen.cur.row == screen.bscroll)
729 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 789 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
733 line = &ROW(row); /* _must_ refresh */ 793 line = &ROW(row); /* _must_ refresh */
734 continue; 794 continue;
735 } 795 }
736 else if (c == C0_CR) 796 else if (c == C0_CR)
737 { 797 {
738 if (!line->is_longer ()) /* XXX: think about this */
739 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
740 799
741 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
742 screen.cur.col = 0; 801 screen.cur.col = 0;
743 continue; 802 continue;
744 } 803 }
… …
761 CLEAR_SELECTION (); 820 CLEAR_SELECTION ();
762 } 821 }
763 822
764 if (screen.flags & Screen_WrapNext) 823 if (screen.flags & Screen_WrapNext)
765 { 824 {
766 line->set_is_longer ();
767
768 scr_do_wrap (); 825 scr_do_wrap ();
769 826
827 line->l = ncol;
828 line->is_longer (1);
829
770 row = screen.cur.row; 830 row = screen.cur.row;
771 line = &ROW(row); /* _must_ refresh */ 831 line = &ROW(row); /* _must_ refresh */
772 } 832 }
773 833
774 // some utf-8 decoders "decode" surrogate characters: let's fix this. 834 // some utf-8 decoders "decode" surrogate characters: let's fix this.
775 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 835 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
776 c = 0xfffd; 836 c = 0xfffd;
777 837
778 // rely on wcwidth to tell us the character width, at least for non-latin1 838 // rely on wcwidth to tell us the character width, do wcwidth before
779 // do wcwidth before further replacements, as wcwidth might return -1 839 // further replacements, as wcwidth might return -1 for the line
780 // for the line drawing characters below as they might be invalid in the current 840 // drawing characters below as they might be invalid in the current
781 // locale. 841 // locale.
782 int width = c < 0x100 ? 1 : wcwidth (c); 842 int width = WCWIDTH (c);
783 843
784 if (charsets[screen.charset] == '0') // DEC SPECIAL 844 if (charsets [screen.charset] == '0') // DEC SPECIAL
785 { 845 {
786 // vt100 special graphics and line drawing 846 // vt100 special graphics and line drawing
787 // 5f-7e standard vt100 847 // 5f-7e standard vt100
788 // 40-5e rxvt extension for extra curses acs chars 848 // 40-5e rxvt extension for extra curses acs chars
789 static uint16_t vt100_0[62] = { // 41 .. 7e 849 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
841 } 901 }
842 902
843 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
844 904
845 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
846 if (screen.cur.col > last_col - width && last_col >= width) 906 if (screen.cur.col > ncol - width && ncol >= width)
847 { 907 {
848 // ...output spaces 908 // ...output spaces
849 c = ' '; 909 c = ' ';
850 // and try the same character next loop iteration 910 // and try the same character next loop iteration
851 --str; 911 --str;
852 } 912 }
853 913
914 line->touch ();
915
854 do 916 do
855 { 917 {
856 line->t[screen.cur.col] = c; 918 line->t[screen.cur.col] = c;
857 line->r[screen.cur.col] = rend; 919 line->r[screen.cur.col] = rend;
858 920
859 if (screen.cur.col < last_col - 1) 921 if (screen.cur.col < ncol - 1)
860 screen.cur.col++; 922 screen.cur.col++;
861 else 923 else
862 { 924 {
863 line->l = last_col; 925 line->l = ncol;
864 if (screen.flags & Screen_Autowrap) 926 if (screen.flags & Screen_Autowrap)
865 screen.flags |= Screen_WrapNext; 927 screen.flags |= Screen_WrapNext;
866 break; 928 break;
867 } 929 }
868 930
… …
870 } 932 }
871 while (--width > 0); 933 while (--width > 0);
872 934
873 // pad with spaces when overwriting wide character with smaller one 935 // pad with spaces when overwriting wide character with smaller one
874 if (!width) 936 if (!width)
937 {
938 line->touch ();
939
875 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 940 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
876 { 941 {
877 line->t[c] = ' '; 942 line->t[c] = ' ';
878 line->r[c] = rend; 943 line->r[c] = rend;
879 } 944 }
945 }
880 } 946 }
881 else // width == 0 947 else // width == 0
882 { 948 {
883#if ENABLE_COMBINING 949#if ENABLE_COMBINING
884 // handle combining characters 950 // handle combining characters
885 // we just tag the accent on the previous on-screen character. 951 // we just tag the accent on the previous on-screen character.
886 // this is arguably not correct, but also arguably not wrong. 952 // this is arguably not correct, but also arguably not wrong.
887 // we don't handle double-width characters nicely yet. 953 // we don't handle double-width characters nicely yet.
954 line_t *linep;
888 text_t *tp; 955 text_t *tp;
889 rend_t *rp; 956 rend_t *rp;
890 957
891 if (screen.cur.col > 0) 958 if (screen.cur.col > 0)
892 { 959 {
960 linep = line;
893 tp = line->t + screen.cur.col - 1; 961 tp = line->t + screen.cur.col - 1;
894 rp = line->r + screen.cur.col - 1; 962 rp = line->r + screen.cur.col - 1;
895
896 while (*tp == NOCHAR && tp > line->t)
897 tp--, rp--;
898 } 963 }
899 else if (screen.cur.row > 0 964 else if (screen.cur.row > 0
900 && ROW(screen.cur.row - 1).is_longer ()) 965 && ROW(screen.cur.row - 1).is_longer ())
901 { 966 {
902 line_t *line = &ROW(screen.cur.row - 1); 967 linep = &ROW(screen.cur.row - 1);
903
904 tp = line->t + last_col - 1; 968 tp = line->t + ncol - 1;
905 rp = line->r + last_col - 1; 969 rp = line->r + ncol - 1;
906
907 while (*tp == NOCHAR && tp > line->t)
908 tp--, rp--;
909 } 970 }
910 else 971 else
911 continue; 972 continue;
973
974 linep->touch ();
975
976 while (*tp == NOCHAR && tp > linep->t)
977 tp--, rp--;
912 978
913 // first try to find a precomposed character 979 // first try to find a precomposed character
914 unicode_t n = rxvt_compose (*tp, c); 980 unicode_t n = rxvt_compose (*tp, c);
915 if (n == NOCHAR) 981 if (n == NOCHAR)
916 n = rxvt_composite.compose (*tp, c); 982 n = rxvt_composite.compose (*tp, c);
… …
919 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 985 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
920#endif 986#endif
921 } 987 }
922 } 988 }
923 989
924 if (!line->is_longer ()) /* XXX: think about this */
925 max_it (line->l, screen.cur.col); 990 max_it (line->l, screen.cur.col);
926 991
927#ifdef DEBUG_STRICT 992#ifdef DEBUG_STRICT
928 assert (screen.cur.row >= 0); 993 assert (screen.cur.row >= 0);
929#endif 994#endif
930} 995}
… …
933/* 998/*
934 * Process Backspace. Move back the cursor back a position, wrap if have to 999 * Process Backspace. Move back the cursor back a position, wrap if have to
935 * XTERM_SEQ: CTRL-H 1000 * XTERM_SEQ: CTRL-H
936 */ 1001 */
937void 1002void
938rxvt_term::scr_backspace () 1003rxvt_term::scr_backspace () NOTHROW
939{ 1004{
940 want_refresh = 1; 1005 want_refresh = 1;
941 1006
942 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
943 { 1008 {
… …
961 * Process Horizontal Tab 1026 * Process Horizontal Tab
962 * count: +ve = forward; -ve = backwards 1027 * count: +ve = forward; -ve = backwards
963 * XTERM_SEQ: CTRL-I 1028 * XTERM_SEQ: CTRL-I
964 */ 1029 */
965void 1030void
966rxvt_term::scr_tab (int count, bool ht) 1031rxvt_term::scr_tab (int count, bool ht) NOTHROW
967{ 1032{
968 int i, x; 1033 int i, x;
969 1034
970 want_refresh = 1; 1035 want_refresh = 1;
971 i = x = screen.cur.col; 1036 i = x = screen.cur.col;
972 1037
973 if (count == 0) 1038 if (count == 0)
974 return; 1039 return;
975 else if (count > 0) 1040 else if (count > 0)
976 { 1041 {
977 int row = screen.cur.row;
978
979 line_t &l = ROW(row); 1042 line_t &l = ROW(screen.cur.row);
980 rend_t base_rend = l.r[i]; 1043 rend_t base_rend = l.r[i];
981 ht &= l.t[i] == ' '; 1044 ht &= l.t[i] == ' ';
982 1045
983 for (; ++i < ncol; ) 1046 for (; ++i < ncol; )
984 if (tabs[i]) 1047 if (tabs[i])
985 { 1048 {
986 x = i; 1049 x = i;
1050
987 if (!--count) 1051 if (!--count)
988 break; 1052 break;
989 } 1053 }
990 else 1054 else
991 ht &= l.t[i] == ' ' 1055 ht &= l.t[i] == ' '
… …
994 if (count) 1058 if (count)
995 x = ncol - 1; 1059 x = ncol - 1;
996 1060
997 // store horizontal tab commands as characters inside the text 1061 // store horizontal tab commands as characters inside the text
998 // buffer so they can be selected and pasted. 1062 // buffer so they can be selected and pasted.
999 if (ht && options & Opt_pastableTabs) 1063 if (ht && OPTION (Opt_pastableTabs))
1000 { 1064 {
1001 base_rend = SET_FONT (base_rend, 0); 1065 base_rend = SET_FONT (base_rend, 0);
1002 1066
1003 if (!l.is_longer ()) /* XXX: think about this */ 1067 l.touch (x);
1004 max_it (l.l, x);
1005 1068
1006 i = screen.cur.col; 1069 i = screen.cur.col;
1007 1070
1008 l.t[i] = '\t'; 1071 l.t[i] = '\t';
1009 l.r[i] = base_rend; 1072 l.r[i] = base_rend;
… …
1040 * Move cursor left in row. If we're at the left boundary, shift everything 1103 * Move cursor left in row. If we're at the left boundary, shift everything
1041 * in that row right. Clear left column. 1104 * in that row right. Clear left column.
1042 */ 1105 */
1043#if ENABLE_FRILLS 1106#if ENABLE_FRILLS
1044void 1107void
1045rxvt_term::scr_backindex () 1108rxvt_term::scr_backindex () NOTHROW
1046{ 1109{
1047 if (screen.cur.col > 0) 1110 if (screen.cur.col > 0)
1048 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1049 else 1112 else
1050 scr_insdel_chars (1, INSERT); 1113 scr_insdel_chars (1, INSERT);
… …
1057 * Move cursor right in row. If we're at the right boundary, shift everything 1120 * Move cursor right in row. If we're at the right boundary, shift everything
1058 * in that row left. Clear right column. 1121 * in that row left. Clear right column.
1059 */ 1122 */
1060#if ENABLE_FRILLS 1123#if ENABLE_FRILLS
1061void 1124void
1062rxvt_term::scr_forwardindex () 1125rxvt_term::scr_forwardindex () NOTHROW
1063{ 1126{
1064 int row;
1065
1066 if (screen.cur.col < ncol - 1) 1127 if (screen.cur.col < ncol - 1)
1067 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1068 else 1129 else
1069 { 1130 {
1070 row = screen.cur.row; 1131 line_t &l = ROW(screen.cur.row);
1071 1132
1072 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1133 l.touch ();
1073 ROW(row).l = ncol; 1134 l.is_longer (0);
1074 1135
1075 scr_gotorc (0, 0, R_RELATIVE); 1136 scr_gotorc (0, 0, R_RELATIVE);
1076 scr_insdel_chars (1, DELETE); 1137 scr_insdel_chars (1, DELETE);
1077 scr_gotorc (0, ncol - 1, R_RELATIVE); 1138 scr_gotorc (0, ncol - 1, R_RELATIVE);
1078 } 1139 }
… …
1082/* ------------------------------------------------------------------------- */ 1143/* ------------------------------------------------------------------------- */
1083/* 1144/*
1084 * Goto Row/Column 1145 * Goto Row/Column
1085 */ 1146 */
1086void 1147void
1087rxvt_term::scr_gotorc (int row, int col, int relative) 1148rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1088{ 1149{
1089 want_refresh = 1; 1150 want_refresh = 1;
1090 ZERO_SCROLLBACK (); 1151 ZERO_SCROLLBACK ();
1091 1152
1092 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1153 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1130/* ------------------------------------------------------------------------- */ 1191/* ------------------------------------------------------------------------- */
1131/* 1192/*
1132 * direction should be UP or DN 1193 * direction should be UP or DN
1133 */ 1194 */
1134void 1195void
1135rxvt_term::scr_index (enum page_dirn direction) 1196rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1136{ 1197{
1137 int dirn; 1198 int dirn;
1138 1199
1139 want_refresh = 1; 1200 want_refresh = 1;
1140 ZERO_SCROLLBACK (); 1201 ZERO_SCROLLBACK ();
… …
1159 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1160 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1161 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1162 */ 1223 */
1163void 1224void
1164rxvt_term::scr_erase_line (int mode) 1225rxvt_term::scr_erase_line (int mode) NOTHROW
1165{ 1226{
1166 unsigned int row, col, num; 1227 unsigned int col, num;
1167 1228
1168 want_refresh = 1; 1229 want_refresh = 1;
1169 ZERO_SCROLLBACK (); 1230 ZERO_SCROLLBACK ();
1170 1231
1171 selection_check (1); 1232 selection_check (1);
1172 1233
1173 row = screen.cur.row; 1234 line_t &line = ROW(screen.cur.row);
1235
1236 line.touch ();
1237 line.is_longer (0);
1174 1238
1175 switch (mode) 1239 switch (mode)
1176 { 1240 {
1177 case 0: /* erase to end of line */ 1241 case 0: /* erase to end of line */
1178 col = screen.cur.col; 1242 col = screen.cur.col;
1179 num = ncol - col; 1243 num = ncol - col;
1180 min_it (ROW(row).l, col); 1244 min_it (line.l, col);
1181 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1245 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1182 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1246 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1183 CLEAR_SELECTION (); 1247 CLEAR_SELECTION ();
1184 break; 1248 break;
1185 case 1: /* erase to beginning of line */ 1249 case 1: /* erase to beginning of line */
… …
1190 CLEAR_SELECTION (); 1254 CLEAR_SELECTION ();
1191 break; 1255 break;
1192 case 2: /* erase whole line */ 1256 case 2: /* erase whole line */
1193 col = 0; 1257 col = 0;
1194 num = ncol; 1258 num = ncol;
1195 ROW(row).l = 0; 1259 line.l = 0;
1196 if (selection.beg.row <= screen.cur.row 1260 if (selection.beg.row <= screen.cur.row
1197 && selection.end.row >= screen.cur.row) 1261 && selection.end.row >= screen.cur.row)
1198 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1199 break; 1263 break;
1200 default: 1264 default:
1201 return; 1265 return;
1202 } 1266 }
1203 1267
1204 scr_blank_line (ROW(row), col, num, rstyle); 1268 scr_blank_line (line, col, num, rstyle);
1205} 1269}
1206 1270
1207/* ------------------------------------------------------------------------- */ 1271/* ------------------------------------------------------------------------- */
1208/* 1272/*
1209 * Erase part of whole of the screen 1273 * Erase part of whole of the screen
1210 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1274 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1211 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1275 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1212 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1276 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1213 */ 1277 */
1214void 1278void
1215rxvt_term::scr_erase_screen (int mode) 1279rxvt_term::scr_erase_screen (int mode) NOTHROW
1216{ 1280{
1217 int num; 1281 int num;
1218 int32_t row; 1282 int32_t row;
1219 rend_t ren; 1283 rend_t ren;
1220 XGCValues gcvalue; 1284 XGCValues gcvalue;
… …
1264 CLEAR_ROWS (row, num); 1328 CLEAR_ROWS (row, num);
1265 } 1329 }
1266 else 1330 else
1267 { 1331 {
1268 ren = rstyle & (RS_fgMask | RS_bgMask); 1332 ren = rstyle & (RS_fgMask | RS_bgMask);
1269 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1270 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1271 ERASE_ROWS (row, num); 1335 ERASE_ROWS (row, num);
1272 gcvalue.foreground = pix_colors[Color_fg]; 1336 gcvalue.foreground = pix_colors[Color_fg];
1273 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue);
1274 } 1338 }
1275 1339
1276 for (; num--; row++) 1340 for (; num--; row++)
1277 { 1341 {
1278 scr_blank_screen_mem (ROW (row), rstyle); 1342 scr_blank_screen_mem (ROW(row), rstyle);
1279 ROW (row).l = 0;
1280 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1343 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1281 } 1344 }
1282} 1345}
1283 1346
1284#if ENABLE_FRILLS 1347#if ENABLE_FRILLS
1285void 1348void
1286rxvt_term::scr_erase_savelines () 1349rxvt_term::scr_erase_savelines () NOTHROW
1287{ 1350{
1288 want_refresh = 1; 1351 want_refresh = 1;
1289 ZERO_SCROLLBACK (); 1352 ZERO_SCROLLBACK ();
1290 1353
1291 nsaved = 0; 1354 top_row = 0;
1292} 1355}
1293#endif 1356#endif
1294 1357
1295/* ------------------------------------------------------------------------- */ 1358/* ------------------------------------------------------------------------- */
1296/* 1359/*
1297 * Fill the screen with `E's 1360 * Fill the screen with `E's
1298 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1361 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1299 */ 1362 */
1300void 1363void
1301rxvt_term::scr_E () 1364rxvt_term::scr_E () NOTHROW
1302{ 1365{
1303 rend_t fs; 1366 rend_t fs;
1304 1367
1305 want_refresh = 1; 1368 want_refresh = 1;
1306 ZERO_SCROLLBACK (); 1369 ZERO_SCROLLBACK ();
… …
1317 rend_t *r1 = line.r; 1380 rend_t *r1 = line.r;
1318 1381
1319 for (int j = ncol; j--; ) 1382 for (int j = ncol; j--; )
1320 *r1++ = fs; 1383 *r1++ = fs;
1321 1384
1322 line.l = ncol; /* make the `E's selectable */ 1385 line.is_longer (0);
1386 line.touch (ncol);
1323 } 1387 }
1324} 1388}
1325 1389
1326/* ------------------------------------------------------------------------- */ 1390/* ------------------------------------------------------------------------- */
1327/* 1391/*
1328 * Insert/Delete <count> lines 1392 * Insert/Delete <count> lines
1329 */ 1393 */
1330void 1394void
1331rxvt_term::scr_insdel_lines (int count, int insdel) 1395rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1332{ 1396{
1333 int end; 1397 int end;
1334 1398
1335 ZERO_SCROLLBACK (); 1399 ZERO_SCROLLBACK ();
1336 1400
… …
1356/* ------------------------------------------------------------------------- */ 1420/* ------------------------------------------------------------------------- */
1357/* 1421/*
1358 * Insert/Delete <count> characters from the current position 1422 * Insert/Delete <count> characters from the current position
1359 */ 1423 */
1360void 1424void
1361rxvt_term::scr_insdel_chars (int count, int insdel) 1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1362{ 1426{
1363 int col, row; 1427 int col, row;
1364 rend_t tr; 1428 rend_t tr;
1365 1429
1366 want_refresh = 1; 1430 want_refresh = 1;
… …
1375 min_it (count, ncol - screen.cur.col); 1439 min_it (count, ncol - screen.cur.col);
1376 1440
1377 row = screen.cur.row; 1441 row = screen.cur.row;
1378 1442
1379 line_t *line = &ROW(row); 1443 line_t *line = &ROW(row);
1444
1445 line->touch ();
1446 line->is_longer (0);
1380 1447
1381 switch (insdel) 1448 switch (insdel)
1382 { 1449 {
1383 case INSERT: 1450 case INSERT:
1384 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1451 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1385 { 1452 {
1386 line->t[col] = line->t[col - count]; 1453 line->t[col] = line->t[col - count];
1387 line->r[col] = line->r[col - count]; 1454 line->r[col] = line->r[col - count];
1388 } 1455 }
1389 1456
1390 if (!line->is_longer ()) 1457 line->l = min (line->l + count, ncol);
1391 {
1392 line->l += count;
1393 min_it (line->l, ncol);
1394 }
1395 1458
1396 if (selection.op && current_screen == selection.screen 1459 if (selection.op && current_screen == selection.screen
1397 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1460 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1398 { 1461 {
1399 if (selection.end.row != screen.cur.row 1462 if (selection.end.row != screen.cur.row
… …
1412 1475
1413 case ERASE: 1476 case ERASE:
1414 screen.cur.col += count; /* don't worry if > ncol */ 1477 screen.cur.col += count; /* don't worry if > ncol */
1415 selection_check (1); 1478 selection_check (1);
1416 screen.cur.col -= count; 1479 screen.cur.col -= count;
1480
1481 line->l = max (line->l - count, 0);
1417 scr_blank_line (*line, screen.cur.col, count, rstyle); 1482 scr_blank_line (*line, screen.cur.col, count, rstyle);
1418 break; 1483 break;
1419 1484
1420 case DELETE: 1485 case DELETE:
1421 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1486 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1424 { 1489 {
1425 line->t[col] = line->t[col + count]; 1490 line->t[col] = line->t[col + count];
1426 line->r[col] = line->r[col + count]; 1491 line->r[col] = line->r[col + count];
1427 } 1492 }
1428 1493
1494 line->l = max (line->l - count, 0);
1429 scr_blank_line (*line, ncol - count, count, tr); 1495 scr_blank_line (*line, ncol - count, count, tr);
1430
1431 if (line->is_longer ()) /* break line continuation */
1432 line->l = ncol;
1433
1434 line->l = max (line->l - count, 0);
1435 1496
1436 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1437 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1438 { 1499 {
1439 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
… …
1457/* 1518/*
1458 * Set the scrolling region 1519 * Set the scrolling region
1459 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1520 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1460 */ 1521 */
1461void 1522void
1462rxvt_term::scr_scroll_region (int top, int bot) 1523rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1463{ 1524{
1464 max_it (top, 0); 1525 max_it (top, 0);
1465 min_it (bot, nrow - 1); 1526 min_it (bot, nrow - 1);
1466 1527
1467 if (top > bot) 1528 if (top > bot)
… …
1477 * Make the cursor visible/invisible 1538 * Make the cursor visible/invisible
1478 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1539 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1479 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1540 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1480 */ 1541 */
1481void 1542void
1482rxvt_term::scr_cursor_visible (int mode) 1543rxvt_term::scr_cursor_visible (int mode) NOTHROW
1483{ 1544{
1484 want_refresh = 1; 1545 want_refresh = 1;
1485 1546
1486 if (mode) 1547 if (mode)
1487 screen.flags |= Screen_VisibleCursor; 1548 screen.flags |= Screen_VisibleCursor;
… …
1494 * Set/unset automatic wrapping 1555 * Set/unset automatic wrapping
1495 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1556 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1496 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1557 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1497 */ 1558 */
1498void 1559void
1499rxvt_term::scr_autowrap (int mode) 1560rxvt_term::scr_autowrap (int mode) NOTHROW
1500{ 1561{
1501 if (mode) 1562 if (mode)
1502 screen.flags |= Screen_Autowrap; 1563 screen.flags |= Screen_Autowrap;
1503 else 1564 else
1504 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1565 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1513 * and the cursor cannot be moved outside. 1574 * and the cursor cannot be moved outside.
1514 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1575 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1515 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1576 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1516 */ 1577 */
1517void 1578void
1518rxvt_term::scr_relative_origin (int mode) 1579rxvt_term::scr_relative_origin (int mode) NOTHROW
1519{ 1580{
1520 if (mode) 1581 if (mode)
1521 screen.flags |= Screen_Relative; 1582 screen.flags |= Screen_Relative;
1522 else 1583 else
1523 screen.flags &= ~Screen_Relative; 1584 screen.flags &= ~Screen_Relative;
… …
1530 * Set insert/replace mode 1591 * Set insert/replace mode
1531 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1592 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1532 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1593 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1533 */ 1594 */
1534void 1595void
1535rxvt_term::scr_insert_mode (int mode) 1596rxvt_term::scr_insert_mode (int mode) NOTHROW
1536{ 1597{
1537 if (mode) 1598 if (mode)
1538 screen.flags |= Screen_Insert; 1599 screen.flags |= Screen_Insert;
1539 else 1600 else
1540 screen.flags &= ~Screen_Insert; 1601 screen.flags &= ~Screen_Insert;
… …
1546 * XTERM_SEQ: Set tab at current column : ESC H 1607 * XTERM_SEQ: Set tab at current column : ESC H
1547 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1608 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1548 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1609 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1549 */ 1610 */
1550void 1611void
1551rxvt_term::scr_set_tab (int mode) 1612rxvt_term::scr_set_tab (int mode) NOTHROW
1552{ 1613{
1553 if (mode < 0) 1614 if (mode < 0)
1554 memset (tabs, 0, ncol * sizeof (char)); 1615 memset (tabs, 0, ncol * sizeof (char));
1555 else if (screen.cur.col < ncol) 1616 else if (screen.cur.col < ncol)
1556 tabs[screen.cur.col] = (mode ? 1 : 0); 1617 tabs [screen.cur.col] = !!mode;
1557} 1618}
1558 1619
1559/* ------------------------------------------------------------------------- */ 1620/* ------------------------------------------------------------------------- */
1560/* 1621/*
1561 * Set reverse/normal video 1622 * Set reverse/normal video
1562 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1623 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1563 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1624 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1564 */ 1625 */
1565void 1626void
1566rxvt_term::scr_rvideo_mode (int mode) 1627rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1567{ 1628{
1568 XGCValues gcvalue; 1629 rvideo_mode = on;
1569 1630
1631#ifndef NO_BELL
1632 on ^= rvideo_bell;
1633#endif
1634
1570 if (rvideo != mode) 1635 if (rvideo_state != on)
1571 { 1636 {
1572 rvideo = mode; 1637 rvideo_state = on;
1638
1573 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1574#if XPM_BACKGROUND 1640#if XPM_BACKGROUND
1575 if (bgPixmap.pixmap == None) 1641 if (bgPixmap.pixmap == None)
1576#endif 1642#endif
1577#if TRANSPARENT 1643#if TRANSPARENT
1578 if (! (options & Opt_transparent) || am_transparent == 0) 1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1579#endif 1645#endif
1580 XSetWindowBackground (display->display, vt, 1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
1581 pix_colors[Color_bg]);
1582 1647
1648 XGCValues gcvalue;
1583 gcvalue.foreground = pix_colors[Color_fg]; 1649 gcvalue.foreground = pix_colors[Color_fg];
1584 gcvalue.background = pix_colors[Color_bg]; 1650 gcvalue.background = pix_colors[Color_bg];
1585 XChangeGC (display->display, gc, GCBackground | GCForeground, 1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
1586 &gcvalue); 1652
1587 scr_clear (); 1653 scr_clear ();
1588 scr_touch (true); 1654 scr_touch (true);
1589 } 1655 }
1590} 1656}
1591 1657
… …
1593/* 1659/*
1594 * Report current cursor position 1660 * Report current cursor position
1595 * XTERM_SEQ: Report position: ESC [ 6 n 1661 * XTERM_SEQ: Report position: ESC [ 6 n
1596 */ 1662 */
1597void 1663void
1598rxvt_term::scr_report_position () 1664rxvt_term::scr_report_position () NOTHROW
1599{ 1665{
1600 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1666 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1601} 1667}
1602 1668
1603/* ------------------------------------------------------------------------- * 1669/* ------------------------------------------------------------------------- *
… …
1606 1672
1607/* 1673/*
1608 * Set font style 1674 * Set font style
1609 */ 1675 */
1610void 1676void
1611rxvt_term::set_font_style () 1677rxvt_term::set_font_style () NOTHROW
1612{ 1678{
1679#if 0
1613 switch (charsets[screen.charset]) 1680 switch (charsets [screen.charset])
1614 { 1681 {
1615 case '0': /* DEC Special Character & Line Drawing Set */ 1682 case '0': /* DEC Special Character & Line Drawing Set */
1616 break; 1683 break;
1617 case 'A': /* United Kingdom (UK) */ 1684 case 'A': /* United Kingdom (UK) */
1618 break; 1685 break;
… …
1625 case 'C': /* Finnish character set */ 1692 case 'C': /* Finnish character set */
1626 break; 1693 break;
1627 case 'K': /* German character set */ 1694 case 'K': /* German character set */
1628 break; 1695 break;
1629 } 1696 }
1697#endif
1630} 1698}
1631 1699
1632/* ------------------------------------------------------------------------- */ 1700/* ------------------------------------------------------------------------- */
1633/* 1701/*
1634 * Choose a font 1702 * Choose a font
… …
1636 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1704 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1637 * XTERM_SEQ: Invoke G2 character set: ESC N 1705 * XTERM_SEQ: Invoke G2 character set: ESC N
1638 * XTERM_SEQ: Invoke G3 character set: ESC O 1706 * XTERM_SEQ: Invoke G3 character set: ESC O
1639 */ 1707 */
1640void 1708void
1641rxvt_term::scr_charset_choose (int set) 1709rxvt_term::scr_charset_choose (int set) NOTHROW
1642{ 1710{
1643 screen.charset = set; 1711 screen.charset = set;
1644 set_font_style (); 1712 set_font_style ();
1645} 1713}
1646 1714
… …
1652 * XTERM_SEQ: Set G2 character set: ESC * <C> 1720 * XTERM_SEQ: Set G2 character set: ESC * <C>
1653 * XTERM_SEQ: Set G3 character set: ESC + <C> 1721 * XTERM_SEQ: Set G3 character set: ESC + <C>
1654 * See set_font_style for possible values for <C> 1722 * See set_font_style for possible values for <C>
1655 */ 1723 */
1656void 1724void
1657rxvt_term::scr_charset_set (int set, unsigned int ch) 1725rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1658{ 1726{
1659 charsets[set] = (unsigned char)ch; 1727 charsets[set] = (unsigned char)ch;
1660 set_font_style (); 1728 set_font_style ();
1661} 1729}
1662 1730
… …
1667 1735
1668/* 1736/*
1669 * refresh matching text. 1737 * refresh matching text.
1670 */ 1738 */
1671bool 1739bool
1672rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1740rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1673{ 1741{
1674 bool found = false; 1742 bool found = false;
1675 1743
1676 for (int i = 0; i < nrow; i++) 1744 for (int i = 0; i < nrow; i++)
1677 { 1745 {
… …
1697 PART_END, 1765 PART_END,
1698 RC_COUNT 1766 RC_COUNT
1699}; 1767};
1700 1768
1701void 1769void
1702rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1770rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1703{ 1771{
1704 int i; 1772 int i;
1705 row_col_t rc[RC_COUNT]; 1773 row_col_t rc[RC_COUNT];
1706 1774
1707 if (!drawn_buf) /* sanity check */ 1775 if (!drawn_buf) /* sanity check */
… …
1730 } 1798 }
1731 1799
1732 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1800 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1733 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1801 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1734 1802
1803 num_scr_allow = 0;
1804
1735 if (refresh) 1805 if (refresh)
1736 scr_refresh (SLOW_REFRESH); 1806 scr_refresh ();
1737} 1807}
1738 1808
1739/* ------------------------------------------------------------------------- */ 1809/* ------------------------------------------------------------------------- */
1740/* 1810/*
1741 * Refresh the entire screen 1811 * Refresh the entire screen
1742 */ 1812 */
1743void 1813void
1744rxvt_term::scr_touch (bool refresh) 1814rxvt_term::scr_touch (bool refresh) NOTHROW
1745{ 1815{
1746 scr_expose (0, 0, width, height, refresh); 1816 scr_expose (0, 0, width, height, refresh);
1747} 1817}
1748 1818
1749/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1750/* 1820/*
1751 * Move the display so that the line represented by scrollbar value Y is at 1821 * Move the display so that the line represented by scrollbar value Y is at
1752 * the top of the screen 1822 * the top of the screen
1753 */ 1823 */
1754int 1824void
1755rxvt_term::scr_move_to (int y, int len) 1825rxvt_term::scr_move_to (int y, int len) NOTHROW
1756{ 1826{
1757 long p = 0; 1827 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1758 unsigned int oldviewstart;
1759
1760 oldviewstart = view_start;
1761
1762 if (y < len)
1763 {
1764 p = (nrow + nsaved) * (len - y) / len;
1765 p -= (long) (nrow - 1);
1766 p = max (p, 0);
1767 }
1768
1769 view_start = (unsigned int)min (p, nsaved);
1770
1771 return scr_changeview (oldviewstart);
1772} 1828}
1773 1829
1774/* ------------------------------------------------------------------------- */ 1830/* ------------------------------------------------------------------------- */
1775/* 1831/*
1776 * Page the screen up/down nlines 1832 * Page the screen up/down nlines
1777 * direction should be UP or DN 1833 * direction should be UP or DN
1778 */ 1834 */
1779int 1835bool
1780rxvt_term::scr_page (enum page_dirn direction, int nlines) 1836rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1781{ 1837{
1782 int n; 1838 int new_view_start =
1783 unsigned int oldviewstart;
1784
1785 oldviewstart = view_start;
1786
1787 if (direction == UP)
1788 {
1789 n = view_start + nlines;
1790 view_start = min (n, nsaved);
1791 }
1792 else
1793 {
1794 n = view_start - nlines; 1839 direction == UP ? view_start - nlines
1795 view_start = max (n, 0); 1840 : view_start + nlines;
1796 }
1797 1841
1798 return scr_changeview (oldviewstart); 1842 return scr_changeview (new_view_start);
1799} 1843}
1800 1844
1801int 1845bool
1802rxvt_term::scr_changeview (unsigned int oldviewstart) 1846rxvt_term::scr_changeview (int new_view_start) NOTHROW
1803{ 1847{
1848 clamp_it (new_view_start, top_row, 0);
1849
1804 if (view_start != oldviewstart) 1850 if (new_view_start == view_start)
1805 { 1851 return false;
1852
1853 num_scr += new_view_start - view_start;
1854 view_start = new_view_start;
1806 want_refresh = 1; 1855 want_refresh = 1;
1807 num_scr -= (view_start - oldviewstart);
1808 }
1809 1856
1810 return (int) (view_start - oldviewstart); 1857 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1811}
1812 1858
1813/* ------------------------------------------------------------------------- */ 1859 return true;
1860}
1861
1862#ifndef NO_BELL
1814void 1863void
1864rxvt_term::bell_cb (time_watcher &w)
1865{
1866 rvideo_bell = false;
1867 scr_rvideo_mode (rvideo_mode);
1868}
1869#endif
1870
1871/* ------------------------------------------------------------------------- */
1872void
1815rxvt_term::scr_bell () 1873rxvt_term::scr_bell () NOTHROW
1816{ 1874{
1817#ifndef NO_BELL 1875#ifndef NO_BELL
1818 1876
1819# ifndef NO_MAPALERT 1877# ifndef NO_MAPALERT
1820# ifdef MAPALERT_OPTION 1878# ifdef MAPALERT_OPTION
1821 if (options & Opt_mapAlert) 1879 if (OPTION (Opt_mapAlert))
1822# endif 1880# endif
1823 XMapWindow (display->display, parent[0]); 1881 XMapWindow (xdisp, parent[0]);
1824# endif 1882# endif
1825 1883
1826 if (options & Opt_visualBell) 1884 if (OPTION (Opt_visualBell))
1827 { 1885 {
1828 scr_rvideo_mode (!rvideo); /* refresh also done */ 1886 rvideo_bell = true;
1829 rxvt_usleep (VISUAL_BELL_DURATION); 1887 scr_rvideo_mode (rvideo_mode);
1830 scr_rvideo_mode (!rvideo); /* refresh also done */ 1888 display->flush ();
1889
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1831 } 1891 }
1832 else 1892 else
1833 XBell (display->display, 0); 1893 XBell (xdisp, 0);
1834 1894
1835#endif 1895#endif
1836} 1896}
1837 1897
1838/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1839/* ARGSUSED */ 1899/* ARGSUSED */
1840void 1900void
1841rxvt_term::scr_printscreen (int fullhist) 1901rxvt_term::scr_printscreen (int fullhist) NOTHROW
1842{ 1902{
1843#ifdef PRINTPIPE 1903#ifdef PRINTPIPE
1844 int nrows, row_start; 1904 int nrows, row_start;
1845 FILE *fd; 1905 FILE *fd;
1846 1906
1847 if ((fd = popen_printer ()) == NULL) 1907 if ((fd = popen_printer ()) == NULL)
1848 return; 1908 return;
1849 1909
1850 if (fullhist) 1910 if (fullhist)
1851 { 1911 {
1852 nrows = nrow + nsaved; 1912 nrows = nrow - top_row;
1853 row_start = -nsaved; 1913 row_start = top_row;
1854 } 1914 }
1855 else 1915 else
1856 { 1916 {
1857 nrows = nrow; 1917 nrows = nrow;
1858 row_start = -view_start; 1918 row_start = view_start;
1859 } 1919 }
1860 1920
1861 wctomb (0, 0); 1921 wctomb (0, 0);
1862 1922
1863 for (int r1 = 0; r1 < nrows; r1++) 1923 for (int r1 = 0; r1 < nrows; r1++)
… …
1895 * Refresh the screen 1955 * Refresh the screen
1896 * drawn_text/drawn_rend contain the screen information before the update. 1956 * drawn_text/drawn_rend contain the screen information before the update.
1897 * screen.text/screen.rend contain what the screen will change to. 1957 * screen.text/screen.rend contain what the screen will change to.
1898 */ 1958 */
1899void 1959void
1900rxvt_term::scr_refresh (unsigned char refresh_type) 1960rxvt_term::scr_refresh () NOTHROW
1901{ 1961{
1902 unsigned char must_clear, /* use draw_string not draw_image_string */ 1962 unsigned char must_clear, /* use draw_string not draw_image_string */
1903 showcursor; /* show the cursor */ 1963 showcursor; /* show the cursor */
1904 int16_t col, row, /* column/row we're processing */ 1964 int16_t col, row, /* column/row we're processing */
1905 ocrow; /* old cursor row */ 1965 ocrow; /* old cursor row */
… …
1922 1982
1923#if XPM_BACKGROUND 1983#if XPM_BACKGROUND
1924 must_clear |= bgPixmap.pixmap != None; 1984 must_clear |= bgPixmap.pixmap != None;
1925#endif 1985#endif
1926#if TRANSPARENT 1986#if TRANSPARENT
1927 must_clear |= (options & Opt_transparent) && am_transparent; 1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
1928#endif 1988#endif
1929 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1930 1990
1931 /* 1991 /*
1932 * B: reverse any characters which are selected 1992 * B: reverse any characters which are selected
… …
1956 2016
1957 crp = &ROW(screen.cur.row).r[col]; 2017 crp = &ROW(screen.cur.row).r[col];
1958 2018
1959 if (showcursor && focus) 2019 if (showcursor && focus)
1960 { 2020 {
1961 if (options & Opt_cursorUnderline) 2021 if (OPTION (Opt_cursorUnderline))
1962 *crp ^= RS_Uline; 2022 *crp ^= RS_Uline;
1963 else 2023 else
1964 { 2024 {
1965 *crp ^= RS_RVid; 2025 *crp ^= RS_RVid;
1966 2026
… …
1968 cc1 = *crp & (RS_fgMask | RS_bgMask); 2028 cc1 = *crp & (RS_fgMask | RS_bgMask);
1969 if (ISSET_PIXCOLOR (Color_cursor)) 2029 if (ISSET_PIXCOLOR (Color_cursor))
1970 ccol1 = Color_cursor; 2030 ccol1 = Color_cursor;
1971 else 2031 else
1972#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1973 ccol1 = GET_FGCOLOR (rstyle); 2033 ccol1 = fgcolor_of (rstyle);
1974#else 2034#else
1975 ccol1 = Color_fg; 2035 ccol1 = Color_fg;
1976#endif 2036#endif
1977 if (ISSET_PIXCOLOR (Color_cursor2)) 2037 if (ISSET_PIXCOLOR (Color_cursor2))
1978 ccol2 = Color_cursor2; 2038 ccol2 = Color_cursor2;
1979 else 2039 else
1980#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1981 ccol2 = GET_BGCOLOR (rstyle); 2041 ccol2 = bgcolor_of (rstyle);
1982#else 2042#else
1983 ccol2 = Color_bg; 2043 ccol2 = Color_bg;
1984#endif 2044#endif
1985 *crp = SET_FGCOLOR (*crp, ccol1); 2045 *crp = SET_FGCOLOR (*crp, ccol1);
1986 *crp = SET_BGCOLOR (*crp, ccol2); 2046 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1991 2051
1992 /* make sure no outline cursor is left around */ 2052 /* make sure no outline cursor is left around */
1993 setoldcursor = 0; 2053 setoldcursor = 0;
1994 if (ocrow != -1) 2054 if (ocrow != -1)
1995 { 2055 {
1996 if (screen.cur.row + view_start != ocrow 2056 if (screen.cur.row - view_start != ocrow
1997 || screen.cur.col != oldcursor.col) 2057 || screen.cur.col != oldcursor.col)
1998 { 2058 {
1999 if (ocrow < nrow 2059 if (ocrow < nrow
2000 && oldcursor.col < ncol) 2060 && oldcursor.col < ncol)
2001 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2061 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2009 else if (!focus) 2069 else if (!focus)
2010 setoldcursor = 1; 2070 setoldcursor = 1;
2011 2071
2012 if (setoldcursor) 2072 if (setoldcursor)
2013 { 2073 {
2014 if (screen.cur.row + view_start >= nrow) 2074 if (screen.cur.row - view_start >= nrow)
2015 oldcursor.row = -1; 2075 oldcursor.row = -1;
2016 else 2076 else
2017 { 2077 {
2018 oldcursor.row = screen.cur.row + view_start; 2078 oldcursor.row = screen.cur.row - view_start;
2019 oldcursor.col = screen.cur.col; 2079 oldcursor.col = screen.cur.col;
2020 } 2080 }
2021 } 2081 }
2022 } 2082 }
2023 2083
2084 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2024#if ENABLE_OVERLAY 2085#if ENABLE_OVERLAY
2025 scr_swap_overlay (); 2086 scr_swap_overlay ();
2026#endif 2087#endif
2027 2088
2028#ifndef NO_SLOW_LINK_SUPPORT 2089#ifndef NO_SLOW_LINK_SUPPORT
2029 /* 2090 /*
2030 * D: CopyArea pass - very useful for slower links 2091 * D: CopyArea pass - very useful for slower links
2031 * This has been deliberately kept simple. 2092 * This has been deliberately kept simple.
2032 */ 2093 */
2033 i = num_scr;
2034 if (!display->is_local 2094 if (!display->is_local
2035 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2036 && abs (num_scr) < nrow && !must_clear) 2096 && abs (num_scr) < nrow && !must_clear)
2037 { 2097 {
2038 int16_t nits; 2098 int16_t nits;
2039 int j; 2099 int j;
2040 int len, wlen; 2100 int len, wlen;
2101 dLocal (int, num_scr);
2041 2102
2042 j = nrow; 2103 j = nrow;
2043 wlen = len = -1; 2104 wlen = len = -1;
2044 row = i > 0 ? 0 : j - 1; 2105 row = i > 0 ? 0 : j - 1;
2045 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2046 { 2107 {
2047 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2048 { 2109 {
2049 line_t s = ROW(row - view_start); 2110 line_t s = ROW(view_start + row);
2050 line_t d = drawn_buf[row]; 2111 line_t d = drawn_buf[row];
2051 line_t d2 = drawn_buf[row + i]; 2112 line_t d2 = drawn_buf[row + i];
2052 2113
2053 for (nits = 0, col = ncol; col--; ) 2114 for (nits = 0, col = ncol; col--; )
2054 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2115 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2076 { 2137 {
2077 /* also comes here at end if needed because of >= above */ 2138 /* also comes here at end if needed because of >= above */
2078 if (wlen < len) 2139 if (wlen < len)
2079 ::swap (wlen, len); 2140 ::swap (wlen, len);
2080 2141
2081 XCopyArea (display->display, vt, vt, 2142 XCopyArea (xdisp, vt, vt,
2082 gc, 0, Row2Pixel (len + i), 2143 gc, 0, Row2Pixel (len + i),
2083 (unsigned int)TermWin_TotalWidth (), 2144 (unsigned int)this->width,
2084 (unsigned int)Height2Pixel (wlen - len + 1), 2145 (unsigned int)Height2Pixel (wlen - len + 1),
2085 0, Row2Pixel (len)); 2146 0, Row2Pixel (len));
2086 len = -1; 2147 len = -1;
2087 } 2148 }
2088 } 2149 }
… …
2092 /* 2153 /*
2093 * E: main pass across every character 2154 * E: main pass across every character
2094 */ 2155 */
2095 for (row = 0; row < nrow; row++) 2156 for (row = 0; row < nrow; row++)
2096 { 2157 {
2097 text_t *stp = ROW(row - view_start).t; 2158 text_t *stp = ROW(view_start + row).t;
2098 rend_t *srp = ROW(row - view_start).r; 2159 rend_t *srp = ROW(view_start + row).r;
2099 text_t *dtp = drawn_buf[row].t; 2160 text_t *dtp = drawn_buf[row].t;
2100 rend_t *drp = drawn_buf[row].r; 2161 rend_t *drp = drawn_buf[row].r;
2101 2162
2102 /* 2163 /*
2103 * E2: OK, now the real pass 2164 * E2: OK, now the real pass
… …
2167 count++, i--; 2228 count++, i--;
2168 2229
2169 /* 2230 /*
2170 * Determine the attributes for the string 2231 * Determine the attributes for the string
2171 */ 2232 */
2172 int fore = GET_FGCOLOR (rend); // desired foreground 2233 int fore = fgcolor_of (rend); // desired foreground
2173 int back = GET_BGCOLOR (rend); // desired background 2234 int back = bgcolor_of (rend); // desired background
2174 2235
2175 // only do special processing if any attributes are set, which is rare 2236 // only do special processing if any attributes are set, which is unlikely
2176 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2177 { 2238 {
2178#if ENABLE_STYLES 2239#if ENABLE_STYLES
2179 // force redraw after "careful" characters to avoid pixel droppings 2240 // "careful" (too wide) character handling
2180 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2181 drp[col + 1] = ~srp[col + 1];
2182 2241
2183 // include previous careful character(s) if possible, looks nicer (best effort...) 2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2184 while (text > stp 2243 while (text > stp
2185 && srp[text - stp - 1] & RS_Careful 2244 && srp[text - stp - 1] & RS_Careful
2186 && RS_SAME (rend, srp[text - stp - 1])) 2245 && RS_SAME (rend, srp[text - stp - 1]))
2187 text--, count++, xpixel -= fwidth; 2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2188#endif 2255#endif
2189 2256
2190 bool invert = rend & RS_RVid; 2257 bool invert = rend & RS_RVid;
2191 2258
2192#ifndef NO_BOLD_UNDERLINE_REVERSE 2259#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2276 2343
2277 if (rend & RS_Uline && font->descent > 1 && fore != back) 2344 if (rend & RS_Uline && font->descent > 1 && fore != back)
2278 { 2345 {
2279#if ENABLE_FRILLS 2346#if ENABLE_FRILLS
2280 if (ISSET_PIXCOLOR (Color_underline)) 2347 if (ISSET_PIXCOLOR (Color_underline))
2281 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]);
2282 else 2349 else
2283#endif 2350#endif
2284 XSetForeground (display->display, gc, pix_colors[fore]); 2351 XSetForeground (xdisp, gc, pix_colors[fore]);
2285 2352
2286 XDrawLine (display->display, drawBuffer, gc, 2353 XDrawLine (xdisp, drawBuffer, gc,
2287 xpixel, ypixel + font->ascent + 1, 2354 xpixel, ypixel + font->ascent + 1,
2288 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2289 } 2356 }
2290 } /* for (col....) */ 2357 } /* for (col....) */
2291 } /* for (row....) */ 2358 } /* for (row....) */
2292 2359
2293#if ENABLE_OVERLAY 2360#if ENABLE_OVERLAY
2294 scr_swap_overlay (); 2361 scr_swap_overlay ();
2295#endif 2362#endif
2363 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2296 2364
2297 /* 2365 /*
2298 * G: cleanup cursor and display outline cursor if necessary 2366 * G: cleanup cursor and display outline cursor if necessary
2299 */ 2367 */
2300 if (showcursor) 2368 if (showcursor)
2301 { 2369 {
2302 if (focus) 2370 if (focus)
2303 { 2371 {
2304 if (options & Opt_cursorUnderline) 2372 if (OPTION (Opt_cursorUnderline))
2305 *crp ^= RS_Uline; 2373 *crp ^= RS_Uline;
2306 else 2374 else
2307 { 2375 {
2308 *crp ^= RS_RVid; 2376 *crp ^= RS_RVid;
2309#ifndef NO_CURSORCOLOR 2377#ifndef NO_CURSORCOLOR
… …
2323 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2324 cursorwidth++; 2392 cursorwidth++;
2325 2393
2326#ifndef NO_CURSORCOLOR 2394#ifndef NO_CURSORCOLOR
2327 if (ISSET_PIXCOLOR (Color_cursor)) 2395 if (ISSET_PIXCOLOR (Color_cursor))
2328 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
2329#endif 2397#endif
2330 2398
2331 XDrawRectangle (display->display, drawBuffer, gc, 2399 XDrawRectangle (xdisp, drawBuffer, gc,
2332 Col2Pixel (col), 2400 Col2Pixel (col),
2333 Row2Pixel (oldcursor.row), 2401 Row2Pixel (oldcursor.row),
2334 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2402 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2335 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2336 } 2404 }
… …
2339 /* 2407 /*
2340 * H: cleanup selection 2408 * H: cleanup selection
2341 */ 2409 */
2342 scr_reverse_selection (); 2410 scr_reverse_selection ();
2343 2411
2344 if (refresh_type & SMOOTH_REFRESH)
2345 XFlush (display->display);
2346
2347 num_scr = 0; 2412 num_scr = 0;
2348 num_scr_allow = 1; 2413 num_scr_allow = 1;
2349} 2414}
2350 2415
2351void 2416void
2352rxvt_term::scr_remap_chars (const line_t &l) 2417rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2353{ 2418{
2354 if (!l.t) 2419 if (!l.t)
2355 return; 2420 return;
2356 2421
2422 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2423
2357 for (int i = ncol; i--; ) 2424 for (int i = ncol; i--; )
2358 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2425 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2359} 2426}
2360 2427
2361void 2428void
2362rxvt_term::scr_remap_chars () 2429rxvt_term::scr_remap_chars () NOTHROW
2363{ 2430{
2364 for (int i = total_rows; i--; ) 2431 for (int i = total_rows; i--; )
2365 scr_remap_chars (row_buf [i]); 2432 scr_remap_chars (row_buf [i]);
2366 2433
2367 for (int i = nrow; i--; ) 2434 for (int i = nrow; i--; )
… …
2370 scr_remap_chars (swap_buf [i]); 2437 scr_remap_chars (swap_buf [i]);
2371 } 2438 }
2372} 2439}
2373 2440
2374void 2441void
2375rxvt_term::scr_recolour () 2442rxvt_term::scr_recolour () NOTHROW
2376{ 2443{
2377 if (1 2444 if (1
2378#if TRANSPARENT 2445#if TRANSPARENT
2379 && !am_transparent 2446 && !am_transparent
2380#endif 2447#endif
2381#if XPM_BACKGROUND 2448#if XPM_BACKGROUND
2382 && !bgPixmap.pixmap 2449 && !bgPixmap.pixmap
2383#endif 2450#endif
2384 ) 2451 )
2385 { 2452 {
2386 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
2387 XClearWindow (display->display, parent[0]); 2454 XClearWindow (xdisp, parent[0]);
2388 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
2389#if HAVE_SCROLLBARS 2456#if HAVE_SCROLLBARS
2390 if (scrollBar.win) 2457 if (scrollBar.win)
2391 { 2458 {
2392 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
2393 scrollBar.setIdle (); 2460 scrollBar.setIdle ();
2394 scrollbar_show (0); 2461 scrollbar_show (0);
2395 } 2462 }
2396#endif 2463#endif
2397 } 2464 }
… …
2401 want_refresh = 1; 2468 want_refresh = 1;
2402} 2469}
2403 2470
2404/* ------------------------------------------------------------------------- */ 2471/* ------------------------------------------------------------------------- */
2405void 2472void
2406rxvt_term::scr_clear (bool really) 2473rxvt_term::scr_clear (bool really) NOTHROW
2407{ 2474{
2408 if (!mapped) 2475 if (!mapped)
2409 return; 2476 return;
2410 2477
2411 num_scr_allow = 0; 2478 num_scr_allow = 0;
2412 want_refresh = 1; 2479 want_refresh = 1;
2413 2480
2414 if (really) 2481 if (really)
2415 XClearWindow (display->display, vt); 2482 XClearWindow (xdisp, vt);
2416} 2483}
2417 2484
2418/* ------------------------------------------------------------------------- */
2419void 2485void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{
2488 int view_end = view_start + nrow;
2489 int row, col;
2490
2491 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2492 {
2493 text_t *stp = ROW(row).t;
2494 rend_t *srp = ROW(row).r;
2495
2496 for (col = beg_col; col < end_col; col++)
2497 srp[col] ^= rstyle1;
2498
2499 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2500 srp[col] ^= rstyle2;
2501
2502 if (++col < end_col)
2503 srp[col] ^= rstyle2;
2504 }
2505}
2506
2507void
2508rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2509{
2510 int view_end = view_start + nrow;
2511 int row, col;
2512
2513 if (beg_row >= view_start)
2514 {
2515 col = beg_col;
2516 row = beg_row;
2517 }
2518 else
2519 {
2520 col = 0;
2521 row = view_start;
2522 }
2523
2524 for (; row < min (end_row, view_end); row++, col = 0)
2525 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2526 srp[col] ^= rstyle;
2527
2528 if (row == end_row)
2529 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2530 srp[col] ^= rstyle;
2531}
2532
2533/* ------------------------------------------------------------------------- */
2534void
2420rxvt_term::scr_reverse_selection () 2535rxvt_term::scr_reverse_selection () NOTHROW
2421{ 2536{
2422 if (selection.op 2537 if (selection.op
2423 && current_screen == selection.screen 2538 && current_screen == selection.screen
2424 && selection.end.row >= -view_start) 2539 && selection.end.row >= view_start)
2425 { 2540 {
2426 int view_end = -view_start + nrow;
2427 int row, col;
2428
2429#if ENABLE_FRILLS 2541#if ENABLE_FRILLS
2430 if (selection.rect) 2542 if (selection.rect)
2431 { 2543 scr_xor_rect (selection.beg.row, selection.beg.col,
2432 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2544 selection.end.row, selection.end.col,
2433 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2545 RS_RVid, RS_RVid | RS_Uline);
2434 srp[col] ^= RS_RVid;
2435 }
2436 else 2546 else
2437#endif 2547#endif
2438 { 2548 scr_xor_span (selection.beg.row, selection.beg.col,
2439 if (selection.beg.row >= -view_start) 2549 selection.end.row, selection.end.col,
2440 { 2550 RS_RVid);
2441 col = selection.beg.col;
2442 row = selection.beg.row;
2443 }
2444 else
2445 {
2446 col = 0;
2447 row = view_start;
2448 }
2449
2450 for (; row < min (selection.end.row, view_end); row++, col = 0)
2451 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2452 srp[col] ^= RS_RVid;
2453
2454 if (row == selection.end.row)
2455 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2456 srp[col] ^= RS_RVid;
2457 }
2458 } 2551 }
2459} 2552}
2460 2553
2461/* ------------------------------------------------------------------------- */ 2554/* ------------------------------------------------------------------------- */
2462/* 2555/*
2463 * Dump the whole scrollback and screen to the passed filedescriptor. The 2556 * Dump the whole scrollback and screen to the passed filedescriptor. The
2464 * invoking routine must close the fd. 2557 * invoking routine must close the fd.
2465 */ 2558 */
2466#if 0 2559#if 0
2467void 2560void
2468rxvt_term::scr_dump (int fd) 2561rxvt_term::scr_dump (int fd) NOTHROW
2469{ 2562{
2470 int row, wrote; 2563 int row, wrote;
2471 unsigned int width, towrite; 2564 unsigned int width, towrite;
2472 char r1[] = "\n"; 2565 char r1[] = "\n";
2473 2566
… …
2492 2585
2493/* ------------------------------------------------------------------------- * 2586/* ------------------------------------------------------------------------- *
2494 * CHARACTER SELECTION * 2587 * CHARACTER SELECTION *
2495 * ------------------------------------------------------------------------- */ 2588 * ------------------------------------------------------------------------- */
2496void 2589void
2497rxvt_term::selection_check (int check_more) 2590rxvt_term::selection_check (int check_more) NOTHROW
2498{ 2591{
2499 row_col_t pos; 2592 row_col_t pos;
2500 2593
2501 if (!selection.op) 2594 if (!selection.op)
2502 return; 2595 return;
2503 2596
2504 pos.row = pos.col = 0; 2597 pos.row = pos.col = 0;
2505 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2598 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2506 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2599 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2507 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2600 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2508 || (check_more == 1 2601 || (check_more == 1
2509 && current_screen == selection.screen 2602 && current_screen == selection.screen
2510 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2603 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2511 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2604 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2512 || (check_more == 2 2605 || (check_more == 2
… …
2523/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2524/* 2617/*
2525 * Paste a selection direct to the command fd 2618 * Paste a selection direct to the command fd
2526 */ 2619 */
2527void 2620void
2528rxvt_term::paste (unsigned char *data, unsigned int len) 2621rxvt_term::paste (char *data, unsigned int len) NOTHROW
2529{ 2622{
2530 /* convert normal newline chars into common keyboard Return key sequence */ 2623 /* convert normal newline chars into common keyboard Return key sequence */
2531 for (unsigned int i = 0; i < len; i++) 2624 for (unsigned int i = 0; i < len; i++)
2532 if (data[i] == C0_LF) 2625 if (data[i] == C0_LF)
2533 data[i] = C0_CR; 2626 data[i] = C0_CR;
… …
2539/* 2632/*
2540 * Respond to a notification that a primary selection has been sent 2633 * Respond to a notification that a primary selection has been sent
2541 * EXT: SelectionNotify 2634 * EXT: SelectionNotify
2542 */ 2635 */
2543void 2636void
2544rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2637rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2545{ 2638{
2546 if (prop == None) /* check for failed XConvertSelection */ 2639 if (prop == None) /* check for failed XConvertSelection */
2547 { 2640 {
2548 if ((selection_type & Sel_CompoundText)) 2641 if ((selection_type & Sel_CompoundText))
2549 { 2642 {
… …
2569 } 2662 }
2570 2663
2571 unsigned long bytes_after; 2664 unsigned long bytes_after;
2572 XTextProperty ct; 2665 XTextProperty ct;
2573 2666
2574 if (XGetWindowProperty (display->display, win, prop, 2667 if (XGetWindowProperty (xdisp, win, prop,
2575 0, PROP_SIZE / 4, 2668 0, PROP_SIZE / 4,
2576 delete_prop, AnyPropertyType, 2669 delete_prop, AnyPropertyType,
2577 &ct.encoding, &ct.format, 2670 &ct.encoding, &ct.format,
2578 &ct.nitems, &bytes_after, 2671 &ct.nitems, &bytes_after,
2579 &ct.value) != Success) 2672 &ct.value) != Success)
… …
2588 if (bytes_after) 2681 if (bytes_after)
2589 { 2682 {
2590 // fetch and append remaining data 2683 // fetch and append remaining data
2591 XTextProperty ct2; 2684 XTextProperty ct2;
2592 2685
2593 if (XGetWindowProperty (display->display, win, prop, 2686 if (XGetWindowProperty (xdisp, win, prop,
2594 ct.nitems / 4, (bytes_after + 3) / 4, 2687 ct.nitems / 4, (bytes_after + 3) / 4,
2595 delete_prop, AnyPropertyType, 2688 delete_prop, AnyPropertyType,
2596 &ct2.encoding, &ct2.format, 2689 &ct2.encoding, &ct2.format,
2597 &ct2.nitems, &bytes_after, 2690 &ct2.nitems, &bytes_after,
2598 &ct2.value) != Success) 2691 &ct2.value) != Success)
… …
2611 2704
2612 if (ct.encoding == xa[XA_INCR]) 2705 if (ct.encoding == xa[XA_INCR])
2613 { 2706 {
2614 // INCR selection, start handshake 2707 // INCR selection, start handshake
2615 if (!delete_prop) 2708 if (!delete_prop)
2616 XDeleteProperty (display->display, win, prop); 2709 XDeleteProperty (xdisp, win, prop);
2617 2710
2618 selection_wait = Sel_incr; 2711 selection_wait = Sel_incr;
2619 incr_buf_fill = 0; 2712 incr_buf_fill = 0;
2620 incr_ev.start (NOW + 10); 2713 incr_ev.start (NOW + 10);
2621 2714
… …
2677 { 2770 {
2678 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2679 char *s = rxvt_wcstombs (w); 2772 char *s = rxvt_wcstombs (w);
2680 free (w); 2773 free (w);
2681 // TODO: strlen == only the first element will be converted. well... 2774 // TODO: strlen == only the first element will be converted. well...
2682 paste ((unsigned char *)s, strlen (s)); 2775 paste (s, strlen (s));
2683 free (s); 2776 free (s);
2684 } 2777 }
2685 else 2778 else
2686#endif 2779#endif
2687 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
2688 && cl) 2781 && cl)
2689 { 2782 {
2690 for (int i = 0; i < cr; i++) 2783 for (int i = 0; i < cr; i++)
2691 paste ((unsigned char *)cl[i], strlen (cl[i])); 2784 paste (cl[i], strlen (cl[i]));
2692 2785
2693 XFreeStringList (cl); 2786 XFreeStringList (cl);
2694 } 2787 }
2695 else 2788 else
2696 paste (ct.value, ct.nitems); // paste raw 2789 paste ((char *)ct.value, ct.nitems); // paste raw
2697 2790
2698bailout: 2791bailout:
2699 XFree (ct.value); 2792 XFree (ct.value);
2700 2793
2701 if (selection_wait == Sel_normal) 2794 if (selection_wait == Sel_normal)
2702 selection_wait = Sel_none; 2795 selection_wait = Sel_none;
2703} 2796}
2704 2797
2705void 2798void
2706rxvt_term::incr_cb (time_watcher &w) 2799rxvt_term::incr_cb (time_watcher &w) NOTHROW
2707{ 2800{
2708 selection_wait = Sel_none; 2801 selection_wait = Sel_none;
2709 2802
2710 incr_buf_size = 0; 2803 incr_buf_size = 0;
2711 free (incr_buf); 2804 free (incr_buf);
2712 2805
2713 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2806 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2714} 2807}
2715 2808
2716void 2809void
2717rxvt_term::selection_property (Window win, Atom prop) 2810rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2718{ 2811{
2719 if (prop == None || selection_wait != Sel_incr) 2812 if (prop == None || selection_wait != Sel_incr)
2720 return; 2813 return;
2721 2814
2722 selection_paste (win, prop, true); 2815 selection_paste (win, prop, true);
… …
2731 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2732 * will auto fallback to CUT_BUFFER0 2825 * will auto fallback to CUT_BUFFER0
2733 * EXT: button 2 release 2826 * EXT: button 2 release
2734 */ 2827 */
2735void 2828void
2736rxvt_term::selection_request (Time tm, int x, int y) 2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2737{ 2830{
2738 if (x < 0 || x >= width || y < 0 || y >= height) 2831 if (selection.text && selnum == Sel_Primary)
2739 return; /* outside window */
2740
2741 if (selection.text)
2742 { /* internal selection */ 2832 { /* internal selection */
2743 char *str = rxvt_wcstombs (selection.text, selection.len); 2833 char *str = rxvt_wcstombs (selection.text, selection.len);
2744 paste ((unsigned char *)str, strlen (str)); 2834 paste (str, strlen (str));
2745 free (str); 2835 free (str);
2746 return; 2836 return;
2747 } 2837 }
2748 else 2838 else
2749 { 2839 {
2750 int i;
2751
2752 selection_request_time = tm; 2840 selection_request_time = tm;
2753 selection_wait = Sel_normal; 2841 selection_wait = Sel_normal;
2754 2842
2755 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2756 {
2757#if X_HAVE_UTF8_STRING 2843#if X_HAVE_UTF8_STRING
2758 selection_type = Sel_UTF8String; 2844 selection_type = Sel_UTF8String;
2759 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2845 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2760 return; 2846 return;
2761#else 2847#else
2762 selection_type = Sel_CompoundText; 2848 selection_type = Sel_CompoundText;
2763 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2849 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2764 return; 2850 return;
2765#endif 2851#endif
2766 }
2767 } 2852 }
2768 2853
2769 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2854 selection_wait = Sel_none; /* don't loop in selection_paste () */
2770 selection_paste (display->root, XA_CUT_BUFFER0, false); 2855 selection_paste (display->root, XA_CUT_BUFFER0, false);
2771} 2856}
2772 2857
2773int 2858int
2774rxvt_term::selection_request_other (Atom target, int selnum) 2859rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2775{ 2860{
2776 Atom sel; 2861 Atom sel;
2777 2862
2778 selection_type |= selnum; 2863 selection_type |= selnum;
2779 2864
… …
2782 else if (selnum == Sel_Secondary) 2867 else if (selnum == Sel_Secondary)
2783 sel = XA_SECONDARY; 2868 sel = XA_SECONDARY;
2784 else 2869 else
2785 sel = xa[XA_CLIPBOARD]; 2870 sel = xa[XA_CLIPBOARD];
2786 2871
2787 if (XGetSelectionOwner (display->display, sel) != None) 2872 if (XGetSelectionOwner (xdisp, sel) != None)
2788 { 2873 {
2789 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
2790 vt, selection_request_time); 2875 vt, selection_request_time);
2791 return 1; 2876 return 1;
2792 } 2877 }
2793 2878
2794 return 0; 2879 return 0;
… …
2798/* 2883/*
2799 * Clear all selected text 2884 * Clear all selected text
2800 * EXT: SelectionClear 2885 * EXT: SelectionClear
2801 */ 2886 */
2802void 2887void
2803rxvt_term::selection_clear () 2888rxvt_term::selection_clear () NOTHROW
2804{ 2889{
2805 want_refresh = 1; 2890 want_refresh = 1;
2806 free (selection.text); 2891 free (selection.text);
2807 selection.text = NULL; 2892 selection.text = NULL;
2808 selection.len = 0; 2893 selection.len = 0;
… …
2841 selection.op = SELECTION_DONE; 2926 selection.op = SELECTION_DONE;
2842 2927
2843 if (selection.clicks == 4) 2928 if (selection.clicks == 4)
2844 return; /* nothing selected, go away */ 2929 return; /* nothing selected, go away */
2845 2930
2931 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2932 return;
2933
2846 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2934 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2847 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2935 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2848 2936
2849 int ofs = 0; 2937 int ofs = 0;
2850 int extra = 0; 2938 int extra = 0;
… …
2862 col = selection.beg.col; 2950 col = selection.beg.col;
2863 end_col = ncol + 1; 2951 end_col = ncol + 1;
2864 } 2952 }
2865 else 2953 else
2866#endif 2954#endif
2867 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2955 end_col = ROW(row).l;
2868 2956
2869 col = max (col, 0); 2957 col = max (col, 0);
2870 2958
2871 if (row == selection.end.row || selection.rect) 2959 if (row == selection.end.row
2960#if ENABLE_FRILLS
2961 || selection.rect
2962#endif
2963 )
2872 end_col = min (end_col, selection.end.col); 2964 min_it (end_col, selection.end.col);
2873 2965
2874 t = ROW(row).t + col; 2966 t = ROW(row).t + col;
2967
2875 for (; col < end_col; col++) 2968 for (; col < end_col; col++)
2876 { 2969 {
2877 if (*t == NOCHAR) 2970 if (*t == NOCHAR)
2878 t++; 2971 t++;
2879#if ENABLE_COMBINING 2972#if ENABLE_COMBINING
… …
2895#endif 2988#endif
2896 else 2989 else
2897 new_selection_text[ofs++] = *t++; 2990 new_selection_text[ofs++] = *t++;
2898 } 2991 }
2899 2992
2993#if ENABLE_FRILLS
2994 if (selection.rect)
2995 {
2996 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1]))
2999 --ofs;
3000
3001 new_selection_text[ofs++] = C0_LF;
3002 }
3003 else
3004#endif
2900 if (!ROW(row).is_longer () && row != selection.end.row) 3005 if (!ROW(row).is_longer () && row != selection.end.row)
2901 new_selection_text[ofs++] = C0_LF; 3006 new_selection_text[ofs++] = C0_LF;
2902 } 3007 }
2903 3008
2904 if (end_col != selection.end.col) 3009 if (end_col != selection.end.col)
2905 new_selection_text[ofs++] = C0_LF; 3010 new_selection_text[ofs++] = C0_LF;
2906 3011
… …
2916 3021
2917 // we usually allocate much more than necessary, so realloc it smaller again 3022 // we usually allocate much more than necessary, so realloc it smaller again
2918 selection.len = ofs; 3023 selection.len = ofs;
2919 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3024 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2920 3025
3026 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3027 return;
3028
3029 selection_grab (tm);
3030}
3031
3032bool
3033rxvt_term::selection_grab (Time tm) NOTHROW
3034{
3035 selection_time = tm;
3036
2921 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
2922 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3039 {
2923 display->set_selection_owner (this); 3040 display->set_selection_owner (this);
3041 return true;
3042 }
2924 else 3043 else
2925 rxvt_warn ("can't get primary selection, ignoring.\n"); 3044 {
3045 selection_clear ();
3046 return false;
3047 }
2926 3048
2927#if 0 3049#if 0
2928 XTextProperty ct; 3050 XTextProperty ct;
2929 3051
2930 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
2931 { 3053 {
2932 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2933 XFree (ct.value); 3055 XFree (ct.value);
2934 } 3056 }
2935#endif 3057#endif
2936
2937 selection_time = tm;
2938} 3058}
2939 3059
2940/* ------------------------------------------------------------------------- */ 3060/* ------------------------------------------------------------------------- */
2941/* 3061/*
2942 * Mark or select text based upon number of clicks: 1, 2, or 3 3062 * Mark or select text based upon number of clicks: 1, 2, or 3
2943 * EXT: button 1 press 3063 * EXT: button 1 press
2944 */ 3064 */
2945void 3065void
2946rxvt_term::selection_click (int clicks, int x, int y) 3066rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2947{ 3067{
2948 clicks = ((clicks - 1) % 3) + 1; 3068 clicks = ((clicks - 1) % 3) + 1;
2949 selection.clicks = clicks; /* save clicks so extend will work */ 3069 selection.clicks = clicks; /* save clicks so extend will work */
2950 3070
3071 if (clicks == 2 && !selection.rect
3072 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3073 {
3074 MEvent.clicks = 1; // what a mess
3075 selection.screen = current_screen;
3076 selection.op = SELECTION_CONT;
3077 return;
3078 }
3079
2951 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3080 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2952 3081
2953 if (clicks == 2 || clicks == 3) 3082 if (clicks == 2 || clicks == 3)
2954 selection_extend_colrow (selection.mark.col, 3083 selection_extend_colrow (selection.mark.col,
2955 selection.mark.row + view_start, 3084 selection.mark.row - view_start,
2956 0, /* button 3 */ 3085 0, /* button 3 */
2957 1, /* button press */ 3086 1, /* button press */
2958 0); /* click change */ 3087 0); /* click change */
2959} 3088}
2960 3089
2961/* ------------------------------------------------------------------------- */ 3090/* ------------------------------------------------------------------------- */
2962/* 3091/*
2963 * Mark a selection at the specified col/row 3092 * Mark a selection at the specified col/row
2964 */ 3093 */
2965void 3094void
2966rxvt_term::selection_start_colrow (int col, int row) 3095rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2967{ 3096{
2968 want_refresh = 1; 3097 want_refresh = 1;
2969 3098
2970 selection.mark.row = row - view_start; 3099 selection.mark.row = row + view_start;
2971 selection.mark.col = col; 3100 selection.mark.col = col;
2972 3101
2973 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3102 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2974 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2975 3104
2976 while (selection.mark.col > 0 3105 while (selection.mark.col > 0
2977 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2978 --selection.mark.col; 3107 --selection.mark.col;
… …
2997#define DELIMIT_TEXT(x) \ 3126#define DELIMIT_TEXT(x) \
2998 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3127 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2999#define DELIMIT_REND(x) 1 3128#define DELIMIT_REND(x) 1
3000 3129
3001void 3130void
3002rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3131rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3003{ 3132{
3004 int col, row, dirnadd, tcol, trow, w1, w2; 3133 int col, row, dirnadd, tcol, trow, w1, w2;
3005 row_col_t bound; 3134 row_col_t bound;
3006 text_t *stp; 3135 text_t *stp;
3007 rend_t *srp; 3136 rend_t *srp;
3008 3137
3009 if (dirn == UP) 3138 if (dirn == UP)
3010 { 3139 {
3011 bound.row = - nsaved - 1; 3140 bound.row = top_row - 1;
3012 bound.col = 0; 3141 bound.col = 0;
3013 dirnadd = -1; 3142 dirnadd = -1;
3014 } 3143 }
3015 else 3144 else
3016 { 3145 {
… …
3064 } 3193 }
3065 } 3194 }
3066 break; 3195 break;
3067 } 3196 }
3068 3197
3069Old_Word_Selection_You_Die:
3070 if (dirn == DN) 3198 if (dirn == DN)
3071 col++; /* put us on one past the end */ 3199 col++; /* put us on one past the end */
3072 3200
3073 /* Poke the values back in */ 3201 /* Poke the values back in */
3074 ret->row = row; 3202 ret->row = row;
… …
3082 * flag == 0 ==> button 1 3210 * flag == 0 ==> button 1
3083 * flag == 1 ==> button 3 press 3211 * flag == 1 ==> button 3 press
3084 * flag == 2 ==> button 3 motion 3212 * flag == 2 ==> button 3 motion
3085 */ 3213 */
3086void 3214void
3087rxvt_term::selection_extend (int x, int y, int flag) 3215rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3088{ 3216{
3089 int col = clamp (Pixel2Col (x), 0, ncol); 3217 int col = clamp (Pixel2Col (x), 0, ncol);
3090 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3218 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3091 3219
3092 /* 3220 /*
… …
3095 * select nothing. Otherwise, if we're to the right of the mark, you have to 3223 * select nothing. Otherwise, if we're to the right of the mark, you have to
3096 * be _past_ a character for it to be selected. 3224 * be _past_ a character for it to be selected.
3097 */ 3225 */
3098 if (((selection.clicks % 3) == 1) && !flag 3226 if (((selection.clicks % 3) == 1) && !flag
3099 && (col == selection.mark.col 3227 && (col == selection.mark.col
3100 && (row == selection.mark.row + view_start))) 3228 && (row == selection.mark.row - view_start)))
3101 { 3229 {
3102 /* select nothing */ 3230 /* select nothing */
3103 selection.beg.row = selection.end.row = 0; 3231 selection.beg.row = selection.end.row = 0;
3104 selection.beg.col = selection.end.col = 0; 3232 selection.beg.col = selection.end.col = 0;
3105 selection.clicks = 4; 3233 selection.clicks = 4;
… …
3118/* ------------------------------------------------------------------------- */ 3246/* ------------------------------------------------------------------------- */
3119/* 3247/*
3120 * Extend the selection to the specified col/row 3248 * Extend the selection to the specified col/row
3121 */ 3249 */
3122void 3250void
3123rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3251rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3124{ 3252{
3125 row_col_t pos; 3253 row_col_t pos;
3126 enum { 3254 enum {
3127 LEFT, RIGHT 3255 LEFT, RIGHT
3128 } closeto = RIGHT; 3256 } closeto = RIGHT;
… …
3160 selection.beg.col = selection.end.col = selection.mark.col; 3288 selection.beg.col = selection.end.col = selection.mark.col;
3161 selection.beg.row = selection.end.row = selection.mark.row; 3289 selection.beg.row = selection.end.row = selection.mark.row;
3162 } 3290 }
3163 3291
3164 pos.col = col; 3292 pos.col = col;
3165 pos.row = row - view_start; 3293 pos.row = view_start + row;
3166 3294
3167 /* 3295 /*
3168 * This is mainly xterm style selection with a couple of differences, mainly 3296 * This is mainly xterm style selection with a couple of differences, mainly
3169 * in the way button3 drag extension works. 3297 * in the way button3 drag extension works.
3170 * We're either doing: button1 drag; button3 press; or button3 drag 3298 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3257 selection_delimit_word (DN, &selection.end, &selection.end); 3385 selection_delimit_word (DN, &selection.end, &selection.end);
3258 } 3386 }
3259 else if (selection.clicks == 3) 3387 else if (selection.clicks == 3)
3260 { 3388 {
3261#if ENABLE_FRILLS 3389#if ENABLE_FRILLS
3262 if (options & Opt_tripleclickwords) 3390 if (OPTION (Opt_tripleclickwords))
3263 { 3391 {
3264 selection_delimit_word (UP, &selection.beg, &selection.beg); 3392 selection_delimit_word (UP, &selection.beg, &selection.beg);
3265 3393
3266 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3394 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3267 { 3395 {
… …
3314#endif 3442#endif
3315} 3443}
3316 3444
3317#if ENABLE_FRILLS 3445#if ENABLE_FRILLS
3318void 3446void
3319rxvt_term::selection_remove_trailing_spaces () 3447rxvt_term::selection_remove_trailing_spaces () NOTHROW
3320{ 3448{
3321 int32_t end_col, end_row; 3449 int32_t end_col, end_row;
3322 text_t *stp; 3450 text_t *stp;
3323 3451
3324 end_col = selection.end.col; 3452 end_col = selection.end.col;
… …
3328 { 3456 {
3329 stp = ROW(end_row).t; 3457 stp = ROW(end_row).t;
3330 3458
3331 while (--end_col >= 0) 3459 while (--end_col >= 0)
3332 { 3460 {
3333 if (stp[end_col] != ' ' 3461 if (stp[end_col] != NOCHAR
3334 && stp[end_col] != '\t' 3462 && !unicode::is_space (stp[end_col]))
3335 && stp[end_col] != NOCHAR)
3336 break; 3463 break;
3337 } 3464 }
3338 3465
3339 if (end_col >= 0 3466 if (end_col >= 0
3340 || !ROW(end_row - 1).is_longer ()) 3467 || !ROW(end_row - 1).is_longer ())
… …
3363/* 3490/*
3364 * Double click on button 3 when already selected 3491 * Double click on button 3 when already selected
3365 * EXT: button 3 double click 3492 * EXT: button 3 double click
3366 */ 3493 */
3367void 3494void
3368rxvt_term::selection_rotate (int x, int y) 3495rxvt_term::selection_rotate (int x, int y) NOTHROW
3369{ 3496{
3370 selection.clicks = selection.clicks % 3 + 1; 3497 selection.clicks = selection.clicks % 3 + 1;
3371 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3498 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3372} 3499}
3373 3500
… …
3375/* 3502/*
3376 * Respond to a request for our current selection 3503 * Respond to a request for our current selection
3377 * EXT: SelectionRequest 3504 * EXT: SelectionRequest
3378 */ 3505 */
3379void 3506void
3380rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3507rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3381{ 3508{
3382 XSelectionEvent ev; 3509 XSelectionEvent ev;
3383 dDisp;
3384 3510
3385 ev.type = SelectionNotify; 3511 ev.type = SelectionNotify;
3386 ev.property = None; 3512 ev.property = None;
3387 ev.display = rq.display; 3513 ev.display = rq.display;
3388 ev.requestor = rq.requestor; 3514 ev.requestor = rq.requestor;
… …
3402 *target++ = xa[XA_COMPOUND_TEXT]; 3528 *target++ = xa[XA_COMPOUND_TEXT];
3403#if X_HAVE_UTF8_STRING 3529#if X_HAVE_UTF8_STRING
3404 *target++ = xa[XA_UTF8_STRING]; 3530 *target++ = xa[XA_UTF8_STRING];
3405#endif 3531#endif
3406 3532
3407 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
3408 32, PropModeReplace, 3534 32, PropModeReplace,
3409 (unsigned char *)target_list, target - target_list); 3535 (unsigned char *)target_list, target - target_list);
3410 ev.property = rq.property; 3536 ev.property = rq.property;
3411 } 3537 }
3412#if TODO // TODO 3538#if TODO // TODO
… …
3415 /* TODO: Handle MULTIPLE */ 3541 /* TODO: Handle MULTIPLE */
3416 } 3542 }
3417#endif 3543#endif
3418 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3419 { 3545 {
3420 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
3421 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3547 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3422 ev.property = rq.property; 3548 ev.property = rq.property;
3423 } 3549 }
3424 else if (rq.target == XA_STRING 3550 else if (rq.target == XA_STRING
3425 || rq.target == xa[XA_TEXT] 3551 || rq.target == xa[XA_TEXT]
… …
3483 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3484 ct.nitems = strlen ((char *)ct.value); 3610 ct.nitems = strlen ((char *)ct.value);
3485 } 3611 }
3486 else 3612 else
3487#endif 3613#endif
3488 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3489 freect = 1; 3615 freect = 1;
3490 else 3616 else
3491 { 3617 {
3492 /* if we failed to convert then send it raw */ 3618 /* if we failed to convert then send it raw */
3493 ct.value = (unsigned char *)cl; 3619 ct.value = (unsigned char *)cl;
3494 ct.nitems = selectlen; 3620 ct.nitems = selectlen;
3495 ct.encoding = target; 3621 ct.encoding = target;
3496 } 3622 }
3497 3623
3498 XChangeProperty (disp, rq.requestor, rq.property, 3624 XChangeProperty (xdisp, rq.requestor, rq.property,
3499 ct.encoding, 8, PropModeReplace, 3625 ct.encoding, 8, PropModeReplace,
3500 ct.value, (int)ct.nitems); 3626 ct.value, (int)ct.nitems);
3501 ev.property = rq.property; 3627 ev.property = rq.property;
3502 3628
3503 if (freect) 3629 if (freect)
3504 XFree (ct.value); 3630 XFree (ct.value);
3505 } 3631 }
3506 3632
3507 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
3508} 3634}
3509 3635
3510/* ------------------------------------------------------------------------- * 3636/* ------------------------------------------------------------------------- *
3511 * MOUSE ROUTINES * 3637 * MOUSE ROUTINES *
3512 * ------------------------------------------------------------------------- */ 3638 * ------------------------------------------------------------------------- */
3513 3639
3514/* 3640/*
3515 * return col/row values corresponding to x/y pixel values 3641 * return col/row values corresponding to x/y pixel values
3516 */ 3642 */
3517void 3643void
3518rxvt_term::pixel_position (int *x, int *y) 3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3519{ 3645{
3520 *x = Pixel2Col (*x); 3646 *x = Pixel2Col (*x);
3521 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3522 *y = Pixel2Row (*y); 3648 *y = Pixel2Row (*y);
3523 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3524} 3650}
3525 3651
3526/* ------------------------------------------------------------------------- */ 3652/* ------------------------------------------------------------------------- */
3527#ifdef USE_XIM 3653#ifdef USE_XIM
3528void 3654void
3529rxvt_term::im_set_position (XPoint &pos) 3655rxvt_term::im_set_position (XPoint &pos) NOTHROW
3530{ 3656{
3531 XWindowAttributes xwa; 3657 XWindowAttributes xwa;
3532 3658
3533 XGetWindowAttributes (display->display, vt, &xwa); 3659 XGetWindowAttributes (xdisp, vt, &xwa);
3534 3660
3535 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3661 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3536 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3537} 3663}
3538#endif 3664#endif
3539 3665
3540#if ENABLE_OVERLAY 3666#if ENABLE_OVERLAY
3541void 3667void
3542rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3668rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3543{ 3669{
3544 if (nrow < 3 || ncol < 3) 3670 if (nrow < 1 || ncol < 1)
3545 return; 3671 return;
3546 3672
3547 want_refresh = 1; 3673 want_refresh = 1;
3548 3674
3549 scr_overlay_off (); 3675 scr_overlay_off ();
… …
3592 *rp = r; 3718 *rp = r;
3593 } 3719 }
3594} 3720}
3595 3721
3596void 3722void
3597rxvt_term::scr_overlay_off () 3723rxvt_term::scr_overlay_off () NOTHROW
3598{ 3724{
3599 if (!ov_text) 3725 if (!ov_text)
3600 return; 3726 return;
3601 3727
3602 want_refresh = 1; 3728 want_refresh = 1;
… …
3610 delete [] ov_text; ov_text = 0; 3736 delete [] ov_text; ov_text = 0;
3611 delete [] ov_rend; ov_rend = 0; 3737 delete [] ov_rend; ov_rend = 0;
3612} 3738}
3613 3739
3614void 3740void
3615rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3741rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3616{ 3742{
3617 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3618 return; 3744 return;
3619 3745
3620 x++, y++; 3746 x++, y++;
… …
3622 ov_text[y][x] = text; 3748 ov_text[y][x] = text;
3623 ov_rend[y][x] = rend; 3749 ov_rend[y][x] = rend;
3624} 3750}
3625 3751
3626void 3752void
3627rxvt_term::scr_overlay_set (int x, int y, const char *s) 3753rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3628{ 3754{
3629 while (*s) 3755 while (*s)
3630 scr_overlay_set (x++, y, *s++); 3756 scr_overlay_set (x++, y, *s++);
3631} 3757}
3632 3758
3633void 3759void
3634rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3760rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3635{ 3761{
3636 while (*s) 3762 while (*s)
3637 { 3763 {
3638 text_t t = *s++; 3764 text_t t = *s++;
3639 int width = wcwidth (t); 3765 int width = WCWIDTH (t);
3640 3766
3641 while (width--) 3767 while (width--)
3642 { 3768 {
3643 scr_overlay_set (x++, y, t); 3769 scr_overlay_set (x++, y, t);
3644 t = NOCHAR; 3770 t = NOCHAR;
3645 } 3771 }
3646 } 3772 }
3647} 3773}
3648 3774
3649void 3775void
3650rxvt_term::scr_swap_overlay () 3776rxvt_term::scr_swap_overlay () NOTHROW
3651{ 3777{
3652 if (!ov_text) 3778 if (!ov_text)
3653 return; 3779 return;
3654 3780
3655 // swap screen mem with overlay 3781 // swap screen mem with overlay
3656 for (int y = ov_h; y--; ) 3782 for (int y = ov_h; y--; )
3657 { 3783 {
3658 text_t *t1 = ov_text[y]; 3784 text_t *t1 = ov_text[y];
3659 rend_t *r1 = ov_rend[y]; 3785 rend_t *r1 = ov_rend[y];
3660 3786
3661 text_t *t2 = ROW(y - view_start).t + ov_x; 3787 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3662 rend_t *r2 = ROW(y - view_start).r + ov_x; 3788 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3663 3789
3664 for (int x = ov_w; x--; ) 3790 for (int x = ov_w; x--; )
3665 { 3791 {
3666 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3792 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3667 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3793 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