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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.246 by root, Sat Jan 21 14:25:05 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() \
… …
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 * ------------------------------------------------------------------------- */
… …
173 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
174 { 180 {
175 //TODO//FIXME 181 //TODO//FIXME
176 saveLines++; 182 saveLines++;
177 prev_nrow--; 183 prev_nrow--;
178 nsaved++; 184 top_row--;
179 } 185 }
180 186
181 want_refresh = 1; 187 want_refresh = 1;
182 188
183 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
188 194
189 if (!row_buf) 195 if (!row_buf)
190 { 196 {
191 /* 197 /*
192 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 199 */
195 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
196 term_start = 0; 201 term_start = 0;
197 202
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 205
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 209
206 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
207 { 211 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 234 selection.text = NULL;
231 selection.len = 0; 235 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
234 selection.clicks = 0; 238 selection.clicks = 0;
235 CLEAR_ALL_SELECTION (); 239 rvideo_state = rvideo_mode = false;
236 rvideo = 0;
237 } 240 }
238 else 241 else
239 { 242 {
240 /* 243 /*
241 * add or delete rows as appropriate 244 * add or delete rows as appropriate
242 */ 245 */
243
244 printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
245 246
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 247 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 248 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 249
249#if 0 250#if 0
… …
255 lfree (drawn_buf[row]); 256 lfree (drawn_buf[row]);
256 } 257 }
257 } 258 }
258#endif 259#endif
259 260
260 drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 temp_buf = (line_t *) rxvt_realloc (temp_buf , nrow * sizeof (line_t));
262 swap_buf = (line_t *) rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
263 263
264 for (int row = min (nrow, prev_nrow); row--; ) 264 for (int row = min (nrow, prev_nrow); row--; )
265 { 265 {
266 lresize (drawn_buf[row]); 266 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]); 267 lresize (swap_buf [row]);
… …
271 { 271 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 274 }
275 275
276 line_t *old_buf = row_buf;
276 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 278
278 // re-wrap lines, this is rather ugly, possibly because I am too dumb
279 // to come up with a lean and mean algorithm.
280
281 int p = MOD (term_start + nrow , prev_total_rows); // previous row 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
282 int pend = MOD (term_start - nsaved, prev_total_rows); 280 int pend = MOD (term_start + top_row , prev_total_rows);
283 int q = total_rows; // rewrapped row 281 int q = total_rows; // rewrapped row
284 282
285 while (p != pend && q > 0) 283 if (top_row)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
286 { 291 do
287 p = MOD (p - 1, prev_total_rows);
288
289 assert (old_buf [MOD (p, prev_total_rows)].t);
290 assert (!old_buf [MOD (p, prev_total_rows)].is_longer ());
291
292 int llen = old_buf [MOD (p, prev_total_rows)].l;
293
294 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
295 { 292 {
296 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
297 294#ifdef DEBUG_STRICT
298 llen += prev_ncol; 295 assert (old_buf [MOD (p, prev_total_rows)].t);
299 } 296#endif
300
301 int qlines = llen / ncol + 1;
302 int lofs = 0; 297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 299
304 q -= qlines; 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305
306 int qrow = q;
307
308 for (; qlines--; qrow++)
309 {
310 if (qrow >= 0)
311 { 301 {
302 p = MOD (p - 1, prev_total_rows);
303
304 plines++;
305 llen += prev_ncol;
306 }
307
308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
316 int lofs = 0;
317 line_t *qline;
318
319 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++)
321 {
312 line_t &qline = row_buf [qrow]; 322 qline = row_buf + qrow;
313
314 lalloc (qline); 323 lalloc (*qline);
324 qline->l = ncol;
315 qline.set_is_longer (); 325 qline->is_longer (1);
316 326
317 int qcol = 0; 327 int qcol = 0;
318 328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
319 for (;;) 332
333 // fill a single destination line
334 while (lofs < llen && qcol < ncol)
320 { 335 {
321 int prow = lofs / prev_ncol + p; 336 int prow = lofs / prev_ncol;
322 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
323 338
339 prow = MOD (p + prow, prev_total_rows);
340
341 // we only adjust the cursor _row_ and put it into
342 // the topmost line of "long line" it was in, as
343 // this seems to upset applications/shells/readline
344 // least.
345 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow);
347
324 line_t &pline = old_buf [p]; 348 line_t &pline = old_buf [prow];
325 349
326 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327 351
328 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol); 352#if DEBUG_STRICT
329
330 if (len <= 0)
331 {
332 qline.l = qcol;
333 scr_blank_line (qline, qcol, ncol - qcol, DEFAULT_RSTYLE);
334 break;
335 }
336
337 assert (lofs < 1000); 353 assert (len);
354 assert (pline.t);
355#endif
338 356
339 memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
340 memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
341 359
342 lofs += len; 360 lofs += len;
343 qcol += len; 361 qcol += len;
344
345 if (qcol == ncol)
346 break;
347 } 362 }
348 } 363 }
349 else 364
350 lofs += ncol; 365 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
366 qline->is_longer (0);
367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
351 } 368 }
369 while (p != pend && q > 0);
370
371 term_start = total_rows - nrow;
372 top_row = q - term_start;
373
374 // make sure all terminal lines exist
375 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 }
378 else
379 {
380 // if no scrollback exists (yet), wing, instead of wrap
381
382 for (int row = min (nrow, prev_nrow); row--; )
383 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row];
386
387 qline = pline;
388 lresize (qline);
389 }
390
391 for (int row = prev_nrow; row < nrow; row++)
392 {
393 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
394 }
395
396 term_start = 0;
352 } 397 }
353 398
354 free (old_buf); 399 free (old_buf);
355 delete old_ta; 400 delete old_ta;
356 delete old_ra; 401 delete old_ra;
357 402
358 min_it (screen.cur.row, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
359 min_it (screen.cur.col, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
360 405
361 if (tabs) 406 if (tabs)
362 free (tabs); 407 free (tabs);
363 } 408 }
364 409
410 CLEAR_ALL_SELECTION ();
411
365 prev_nrow = nrow; 412 prev_nrow = nrow;
366 prev_ncol = ncol; 413 prev_ncol = ncol;
367 414
368 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
369 416
370 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
371 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
372 419
373 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
374} 423}
375 424
376/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
377/* 426/*
378 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
379 */ 428 */
380void 429void
381rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
382{ 431{
383 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
384 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
385 434
386 free (row_buf); 435 free (row_buf);
387 free (swap_buf); 436 free (swap_buf);
388 free (drawn_buf); 437 free (drawn_buf);
389 free (temp_buf);
390 free (tabs); 438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays
391} 441}
392 442
393/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
394/* 444/*
395 * Hard reset 445 * Hard reset
396 */ 446 */
397void 447void
398rxvt_term::scr_poweron () 448rxvt_term::scr_poweron () NOTHROW
399{ 449{
400 scr_release (); 450 scr_release ();
401 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
402 scr_reset (); 452 scr_reset ();
403 453
404 scr_clear (true); 454 scr_clear (true);
405 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
406} 456}
407 457
408/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
409 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
410 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
412 * Save and Restore cursor 462 * Save and Restore cursor
413 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
414 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
415 */ 465 */
416void 466void
417rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
418{ 468{
419 screen_t *s; 469 screen_t *s;
420 470
421#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
422 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
451 min_it (s->cur.row, nrow - 1); 501 min_it (s->cur.row, nrow - 1);
452 min_it (s->cur.col, ncol - 1); 502 min_it (s->cur.col, ncol - 1);
453#ifdef DEBUG_STRICT 503#ifdef DEBUG_STRICT
454 assert (s->cur.row >= 0); 504 assert (s->cur.row >= 0);
455 assert (s->cur.col >= 0); 505 assert (s->cur.col >= 0);
456#else /* drive with your eyes closed */
457 max_it (s->cur.row, 0);
458 max_it (s->cur.col, 0);
459#endif 506#endif
460} 507}
461 508
462/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
463/* 510/*
464 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
465 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
466 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
467 */ 514 */
468int 515int
469rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn) NOTHROW
470{ 517{
471 want_refresh = 1; 518 want_refresh = 1;
472 view_start = 0; 519 view_start = 0;
473 520
474 if (current_screen == scrn) 521 if (current_screen == scrn)
… …
483 530
484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486 533
487#if NSCREENS 534#if NSCREENS
488 if (options & Opt_secondaryScreen) 535 if (OPTION (Opt_secondaryScreen))
489 { 536 {
490 num_scr = 0; 537 num_scr = 0;
491 538
492 for (int i = nrow; i--; ) 539 for (int i = prev_nrow; i--; )
493 ::swap (ROW(i), swap_buf [i]); 540 ::swap (ROW(i), swap_buf [i]);
494 541
495 ::swap (screen.charset, swap.charset); 542 ::swap (screen.charset, swap.charset);
496 ::swap (screen.flags, swap.flags); 543 ::swap (screen.flags, swap.flags);
497 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
498 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
499 } 546 }
500 else 547 else
501#endif 548#endif
502 if (options & Opt_secondaryScroll) 549 if (OPTION (Opt_secondaryScroll))
503 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504 551
505 return scrn; 552 return scrn;
506} 553}
507 554
508// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
509void 556void
510rxvt_term::scr_do_wrap () 557rxvt_term::scr_do_wrap () NOTHROW
511{ 558{
512 if (!(screen.flags & Screen_WrapNext)) 559 if (!(screen.flags & Screen_WrapNext))
513 return; 560 return;
514 561
515 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
… …
525/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
526/* 573/*
527 * Change the colour for following text 574 * Change the colour for following text
528 */ 575 */
529void 576void
530rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
531{ 578{
532 if (color > maxTermCOLOR) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
533 color = fgbg; 580 color = fgbg;
534 581
535 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
536 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
537 else 584 else
… …
541/* ------------------------------------------------------------------------- */ 588/* ------------------------------------------------------------------------- */
542/* 589/*
543 * Change the rendition style for following text 590 * Change the rendition style for following text
544 */ 591 */
545void 592void
546rxvt_term::scr_rendition (int set, int style) 593rxvt_term::scr_rendition (int set, int style) NOTHROW
547 { 594 {
548 if (set) 595 if (set)
549 rstyle |= style; 596 rstyle |= style;
550 else if (style == ~RS_None) 597 else if (style == ~RS_None)
551 rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
… …
558 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
559 * count positive ==> scroll up 606 * count positive ==> scroll up
560 * count negative ==> scroll down 607 * count negative ==> scroll down
561 */ 608 */
562int 609int
563rxvt_term::scr_scroll_text (int row1, int row2, int count) 610rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
564{ 611{
565 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
566 return 0; 613 return 0;
567 614
568 want_refresh = 1; 615 want_refresh = 1;
569 num_scr += count; 616 num_scr += count;
570 617
571 if (count > 0 618 if (count > 0
572 && row1 == 0 619 && row1 == 0
573 && row2 == nrow - 1
574 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575 { 621 {
576 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
577 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
578 626
627 // sever bottommost line
628 {
629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
631 l.touch ();
632 }
633
634 // erase newly scrolled-in lines
635 for (int i = count; i--; )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
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
579 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
580 { 661 {
581 selection.beg.row -= count; 662 selection.beg.row -= count;
582 selection.end.row -= count; 663 selection.end.row -= count;
583 selection.mark.row -= count; 664 selection.mark.row -= count;
584 665
585 selection_check (0); 666 if (selection.beg.row < top_row
586 } 667 || selection.end.row < top_row
587 668 || selection.mark.row < top_row)
588 for (int i = count; i--; )
589 scr_blank_screen_mem (ROW(row2 - i), rstyle);
590
591 if ((options & Opt_scrollWithBuffer)
592 && view_start != 0
593 && view_start != saveLines)
594 scr_page (UP, count);
595 }
596 else
597 {
598 if (selection.op && current_screen == selection.screen)
599 {
600 int i = selection.beg.row;
601 int j = selection.end.row;
602
603 if ((i < row1 && j > row1)
604 || (i < row2 && j > row2)
605 || (i - count < row1 && i >= row1)
606 || (i - count > row2 && i <= row2)
607 || (j - count < row1 && j >= row1)
608 || (j - count > row2 && j <= row2))
609 { 669 {
610 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
612 } 672 }
613 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)
614 { 699 {
615 /* move selected region too */ 700 /* move selected region too */
616 selection.beg.row -= count; 701 selection.beg.row -= count;
617 selection.end.row -= count; 702 selection.end.row -= count;
618 selection.mark.row -= count; 703 selection.mark.row -= count;
… …
626 711
627 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
628 713
629 min_it (count, rows); 714 min_it (count, rows);
630 715
716 line_t *temp_buf = row_buf + total_rows;
717
631 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
632 { 719 {
633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
634 721
635 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
646/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
647/* 734/*
648 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
649 */ 736 */
650void 737void
651rxvt_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
652{ 739{
653 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
654 return; 741 return;
655 742
656 unsigned char checksel; 743 unsigned char checksel;
657 unicode_t c; 744 unicode_t c;
658 int row, last_col; 745 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
660 747
661 want_refresh = 1; 748 want_refresh = 1;
662 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 750
665 if (nlines > 0) 751 if (minlines > 0)
666 { 752 {
667 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754
668 if (nlines > 0 755 if (minlines > 0
669 && screen.tscroll == 0 756 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 757 && screen.bscroll == nrow - 1)
671 { 758 {
672 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
675 } 762 }
676 } 763 }
677 764
678#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 767 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 768 && screen.cur.row >= top_row);
682#else /* drive with your eyes closed */
683 min_it (screen.cur.col, last_col - 1);
684 clamp_it (screen.cur.row, -nsaved, nrow - 1);
685#endif 769#endif
686 row = screen.cur.row; 770 int row = screen.cur.row;
687 771
688 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
689 773
690 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
691 775
692 while (str < strend) 776 while (str < strend)
693 { 777 {
694 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
695 779
696 if (c < 0x20) 780 if (c < 0x20)
697 if (c == C0_LF) 781 if (c == C0_LF)
698 { 782 {
699 if (!line->is_longer ()) /* XXX: think about this */
700 max_it (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
701 784
702 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
703 786
704 if (screen.cur.row == screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
705 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
709 line = &ROW(row); /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
710 continue; 793 continue;
711 } 794 }
712 else if (c == C0_CR) 795 else if (c == C0_CR)
713 { 796 {
714 if (!line->is_longer ()) /* XXX: think about this */
715 max_it (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
716 798
717 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
718 screen.cur.col = 0; 800 screen.cur.col = 0;
719 continue; 801 continue;
720 } 802 }
… …
737 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
738 } 820 }
739 821
740 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
741 { 823 {
742 line->set_is_longer ();
743
744 scr_do_wrap (); 824 scr_do_wrap ();
745 825
826 line->l = ncol;
827 line->is_longer (1);
828
746 row = screen.cur.row; 829 row = screen.cur.row;
747 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
748 } 831 }
749 832
750 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
755 // do wcwidth before further replacements, as wcwidth might return -1 838 // do wcwidth before further replacements, as wcwidth might return -1
756 // for the line drawing characters below as they might be invalid in the current 839 // for the line drawing characters below as they might be invalid in the current
757 // locale. 840 // locale.
758 int width = c < 0x100 ? 1 : wcwidth (c); 841 int width = c < 0x100 ? 1 : wcwidth (c);
759 842
760 if (charsets[screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
761 { 844 {
762 // vt100 special graphics and line drawing 845 // vt100 special graphics and line drawing
763 // 5f-7e standard vt100 846 // 5f-7e standard vt100
764 // 40-5e rxvt extension for extra curses acs chars 847 // 40-5e rxvt extension for extra curses acs chars
765 static uint16_t vt100_0[62] = { // 41 .. 7e 848 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
817 } 900 }
818 901
819 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
820 903
821 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
822 if (screen.cur.col > last_col - width && last_col >= width) 905 if (screen.cur.col > ncol - width && ncol >= width)
823 { 906 {
824 // ...output spaces 907 // ...output spaces
825 c = ' '; 908 c = ' ';
826 // and try the same character next loop iteration 909 // and try the same character next loop iteration
827 --str; 910 --str;
828 } 911 }
829 912
913 line->touch ();
914
830 do 915 do
831 { 916 {
832 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
833 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
834 919
835 if (screen.cur.col < last_col - 1) 920 if (screen.cur.col < ncol - 1)
836 screen.cur.col++; 921 screen.cur.col++;
837 else 922 else
838 { 923 {
839 line->l = last_col; 924 line->l = ncol;
840 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
841 screen.flags |= Screen_WrapNext; 926 screen.flags |= Screen_WrapNext;
842 break; 927 break;
843 } 928 }
844 929
… …
846 } 931 }
847 while (--width > 0); 932 while (--width > 0);
848 933
849 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
850 if (!width) 935 if (!width)
936 {
937 line->touch ();
938
851 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
852 { 940 {
853 line->t[c] = ' '; 941 line->t[c] = ' ';
854 line->r[c] = rend; 942 line->r[c] = rend;
855 } 943 }
944 }
856 } 945 }
857 else // width == 0 946 else // width == 0
858 { 947 {
859#if ENABLE_COMBINING 948#if ENABLE_COMBINING
860 // handle combining characters 949 // handle combining characters
861 // we just tag the accent on the previous on-screen character. 950 // we just tag the accent on the previous on-screen character.
862 // this is arguably not correct, but also arguably not wrong. 951 // this is arguably not correct, but also arguably not wrong.
863 // we don't handle double-width characters nicely yet. 952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
864 text_t *tp; 954 text_t *tp;
865 rend_t *rp; 955 rend_t *rp;
866 956
867 if (screen.cur.col > 0) 957 if (screen.cur.col > 0)
868 { 958 {
959 linep = line;
869 tp = line->t + screen.cur.col - 1; 960 tp = line->t + screen.cur.col - 1;
870 rp = line->r + screen.cur.col - 1; 961 rp = line->r + screen.cur.col - 1;
871
872 while (*tp == NOCHAR && tp > line->t)
873 tp--, rp--;
874 } 962 }
875 else if (screen.cur.row > 0 963 else if (screen.cur.row > 0
876 && ROW(screen.cur.row - 1).is_longer ()) 964 && ROW(screen.cur.row - 1).is_longer ())
877 { 965 {
878 line_t *line = &ROW(screen.cur.row - 1); 966 linep = &ROW(screen.cur.row - 1);
879
880 tp = line->t + last_col - 1; 967 tp = line->t + ncol - 1;
881 rp = line->r + last_col - 1; 968 rp = line->r + ncol - 1;
882
883 while (*tp == NOCHAR && tp > line->t)
884 tp--, rp--;
885 } 969 }
886 else 970 else
887 continue; 971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
888 977
889 // first try to find a precomposed character 978 // first try to find a precomposed character
890 unicode_t n = rxvt_compose (*tp, c); 979 unicode_t n = rxvt_compose (*tp, c);
891 if (n == NOCHAR) 980 if (n == NOCHAR)
892 n = rxvt_composite.compose (*tp, c); 981 n = rxvt_composite.compose (*tp, c);
… …
895 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
896#endif 985#endif
897 } 986 }
898 } 987 }
899 988
900 if (!line->is_longer ()) /* XXX: think about this */
901 max_it (line->l, screen.cur.col); 989 max_it (line->l, screen.cur.col);
902 990
903#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
904 assert (screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
905#else /* drive with your eyes closed */
906 max_it (screen.cur.row, 0);
907#endif 993#endif
908} 994}
909 995
910/* ------------------------------------------------------------------------- */ 996/* ------------------------------------------------------------------------- */
911/* 997/*
912 * Process Backspace. Move back the cursor back a position, wrap if have to 998 * Process Backspace. Move back the cursor back a position, wrap if have to
913 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
914 */ 1000 */
915void 1001void
916rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
917{ 1003{
918 want_refresh = 1; 1004 want_refresh = 1;
919 1005
920 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
921 { 1007 {
… …
939 * Process Horizontal Tab 1025 * Process Horizontal Tab
940 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
941 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
942 */ 1028 */
943void 1029void
944rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
945{ 1031{
946 int i, x; 1032 int i, x;
947 1033
948 want_refresh = 1; 1034 want_refresh = 1;
949 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
950 1036
951 if (count == 0) 1037 if (count == 0)
952 return; 1038 return;
953 else if (count > 0) 1039 else if (count > 0)
954 { 1040 {
955 int row = screen.cur.row;
956
957 line_t &l = ROW(row); 1041 line_t &l = ROW(screen.cur.row);
958 rend_t base_rend = l.r[i]; 1042 rend_t base_rend = l.r[i];
959 ht &= l.t[i] == ' '; 1043 ht &= l.t[i] == ' ';
960 1044
961 for (; ++i < ncol; ) 1045 for (; ++i < ncol; )
962 if (tabs[i]) 1046 if (tabs[i])
963 { 1047 {
964 x = i; 1048 x = i;
1049
965 if (!--count) 1050 if (!--count)
966 break; 1051 break;
967 } 1052 }
968 else 1053 else
969 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
… …
972 if (count) 1057 if (count)
973 x = ncol - 1; 1058 x = ncol - 1;
974 1059
975 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
976 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
977 if (ht && options & Opt_pastableTabs) 1062 if (ht && OPTION (Opt_pastableTabs))
978 { 1063 {
979 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
980 1065
981 if (!l.is_longer ()) /* XXX: think about this */ 1066 l.touch (x);
982 max_it (l.l, x);
983 1067
984 i = screen.cur.col; 1068 i = screen.cur.col;
985 1069
986 l.t[i] = '\t'; 1070 l.t[i] = '\t';
987 l.r[i] = base_rend; 1071 l.r[i] = base_rend;
… …
1018 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
1019 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1020 */ 1104 */
1021#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1022void 1106void
1023rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1024{ 1108{
1025 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1026 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1027 else 1111 else
1028 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1035 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
1036 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1037 */ 1121 */
1038#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1039void 1123void
1040rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1041{ 1125{
1042 int row;
1043
1044 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1045 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1046 else 1128 else
1047 { 1129 {
1048 row = screen.cur.row; 1130 line_t &l = ROW(screen.cur.row);
1049 1131
1050 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1132 l.touch ();
1051 ROW(row).l = ncol; 1133 l.is_longer (0);
1052 1134
1053 scr_gotorc (0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1054 scr_insdel_chars (1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1055 scr_gotorc (0, ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1056 } 1138 }
… …
1060/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1061/* 1143/*
1062 * Goto Row/Column 1144 * Goto Row/Column
1063 */ 1145 */
1064void 1146void
1065rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1066{ 1148{
1067 want_refresh = 1; 1149 want_refresh = 1;
1068 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1069 1151
1070 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1108/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1109/* 1191/*
1110 * direction should be UP or DN 1192 * direction should be UP or DN
1111 */ 1193 */
1112void 1194void
1113rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1114{ 1196{
1115 int dirn; 1197 int dirn;
1116 1198
1117 want_refresh = 1; 1199 want_refresh = 1;
1118 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
… …
1137 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1138 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1139 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1140 */ 1222 */
1141void 1223void
1142rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1143{ 1225{
1144 unsigned int row, col, num; 1226 unsigned int col, num;
1145 1227
1146 want_refresh = 1; 1228 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1148 1230
1149 selection_check (1); 1231 selection_check (1);
1150 1232
1151 row = screen.cur.row; 1233 line_t &line = ROW(screen.cur.row);
1234
1235 line.touch ();
1236 line.is_longer (0);
1152 1237
1153 switch (mode) 1238 switch (mode)
1154 { 1239 {
1155 case 0: /* erase to end of line */ 1240 case 0: /* erase to end of line */
1156 col = screen.cur.col; 1241 col = screen.cur.col;
1157 num = ncol - col; 1242 num = ncol - col;
1158 min_it (ROW(row).l, col); 1243 min_it (line.l, col);
1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1161 CLEAR_SELECTION (); 1246 CLEAR_SELECTION ();
1162 break; 1247 break;
1163 case 1: /* erase to beginning of line */ 1248 case 1: /* erase to beginning of line */
… …
1168 CLEAR_SELECTION (); 1253 CLEAR_SELECTION ();
1169 break; 1254 break;
1170 case 2: /* erase whole line */ 1255 case 2: /* erase whole line */
1171 col = 0; 1256 col = 0;
1172 num = ncol; 1257 num = ncol;
1173 ROW(row).l = 0; 1258 line.l = 0;
1174 if (selection.beg.row <= screen.cur.row 1259 if (selection.beg.row <= screen.cur.row
1175 && selection.end.row >= screen.cur.row) 1260 && selection.end.row >= screen.cur.row)
1176 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1177 break; 1262 break;
1178 default: 1263 default:
1179 return; 1264 return;
1180 } 1265 }
1181 1266
1182 scr_blank_line (ROW(row), col, num, rstyle); 1267 scr_blank_line (line, col, num, rstyle);
1183} 1268}
1184 1269
1185/* ------------------------------------------------------------------------- */ 1270/* ------------------------------------------------------------------------- */
1186/* 1271/*
1187 * Erase part of whole of the screen 1272 * Erase part of whole of the screen
1188 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1189 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1190 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1191 */ 1276 */
1192void 1277void
1193rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1194{ 1279{
1195 int num; 1280 int num;
1196 int32_t row; 1281 int32_t row;
1197 rend_t ren; 1282 rend_t ren;
1198 XGCValues gcvalue; 1283 XGCValues gcvalue;
… …
1242 CLEAR_ROWS (row, num); 1327 CLEAR_ROWS (row, num);
1243 } 1328 }
1244 else 1329 else
1245 { 1330 {
1246 ren = rstyle & (RS_fgMask | RS_bgMask); 1331 ren = rstyle & (RS_fgMask | RS_bgMask);
1247 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1248 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1334 ERASE_ROWS (row, num);
1250 gcvalue.foreground = pix_colors[Color_fg]; 1335 gcvalue.foreground = pix_colors[Color_fg];
1251 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1252 } 1337 }
1253 1338
1254 for (; num--; row++) 1339 for (; num--; row++)
1255 { 1340 {
1256 scr_blank_screen_mem (ROW (row), rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1257 ROW (row).l = 0;
1258 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1259 } 1343 }
1260} 1344}
1261 1345
1262#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1263void 1347void
1264rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1265{ 1349{
1266 want_refresh = 1; 1350 want_refresh = 1;
1267 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1268 1352
1269 nsaved = 0; 1353 top_row = 0;
1270} 1354}
1271#endif 1355#endif
1272 1356
1273/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1274/* 1358/*
1275 * Fill the screen with `E's 1359 * Fill the screen with `E's
1276 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1277 */ 1361 */
1278void 1362void
1279rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1280{ 1364{
1281 rend_t fs; 1365 rend_t fs;
1282 1366
1283 want_refresh = 1; 1367 want_refresh = 1;
1284 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
… …
1295 rend_t *r1 = line.r; 1379 rend_t *r1 = line.r;
1296 1380
1297 for (int j = ncol; j--; ) 1381 for (int j = ncol; j--; )
1298 *r1++ = fs; 1382 *r1++ = fs;
1299 1383
1300 line.l = ncol; /* make the `E's selectable */ 1384 line.is_longer (0);
1385 line.touch (ncol);
1301 } 1386 }
1302} 1387}
1303 1388
1304/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1305/* 1390/*
1306 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1307 */ 1392 */
1308void 1393void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1310{ 1395{
1311 int end; 1396 int end;
1312 1397
1313 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1314 1399
… …
1334/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1335/* 1420/*
1336 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1337 */ 1422 */
1338void 1423void
1339rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1340{ 1425{
1341 int col, row; 1426 int col, row;
1342 rend_t tr; 1427 rend_t tr;
1343 1428
1344 want_refresh = 1; 1429 want_refresh = 1;
… …
1353 min_it (count, ncol - screen.cur.col); 1438 min_it (count, ncol - screen.cur.col);
1354 1439
1355 row = screen.cur.row; 1440 row = screen.cur.row;
1356 1441
1357 line_t *line = &ROW(row); 1442 line_t *line = &ROW(row);
1443
1444 line->touch ();
1445 line->is_longer (0);
1358 1446
1359 switch (insdel) 1447 switch (insdel)
1360 { 1448 {
1361 case INSERT: 1449 case INSERT:
1362 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1363 { 1451 {
1364 line->t[col] = line->t[col - count]; 1452 line->t[col] = line->t[col - count];
1365 line->r[col] = line->r[col - count]; 1453 line->r[col] = line->r[col - count];
1366 } 1454 }
1367 1455
1368 if (!line->is_longer ()) 1456 line->l = min (line->l + count, ncol);
1369 {
1370 line->l += count;
1371 min_it (line->l, ncol);
1372 }
1373 1457
1374 if (selection.op && current_screen == selection.screen 1458 if (selection.op && current_screen == selection.screen
1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1376 { 1460 {
1377 if (selection.end.row != screen.cur.row 1461 if (selection.end.row != screen.cur.row
… …
1390 1474
1391 case ERASE: 1475 case ERASE:
1392 screen.cur.col += count; /* don't worry if > ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1393 selection_check (1); 1477 selection_check (1);
1394 screen.cur.col -= count; 1478 screen.cur.col -= count;
1479
1480 line->l = max (line->l - count, 0);
1395 scr_blank_line (*line, screen.cur.col, count, rstyle); 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1396 break; 1482 break;
1397 1483
1398 case DELETE: 1484 case DELETE:
1399 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1402 { 1488 {
1403 line->t[col] = line->t[col + count]; 1489 line->t[col] = line->t[col + count];
1404 line->r[col] = line->r[col + count]; 1490 line->r[col] = line->r[col + count];
1405 } 1491 }
1406 1492
1493 line->l = max (line->l - count, 0);
1407 scr_blank_line (*line, ncol - count, count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1408
1409 if (line->is_longer ()) /* break line continuation */
1410 line->l = ncol;
1411
1412 line->l = max (line->l - count, 0);
1413 1495
1414 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1415 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1416 { 1498 {
1417 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1435/* 1517/*
1436 * Set the scrolling region 1518 * Set the scrolling region
1437 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1438 */ 1520 */
1439void 1521void
1440rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1441{ 1523{
1442 max_it (top, 0); 1524 max_it (top, 0);
1443 min_it (bot, nrow - 1); 1525 min_it (bot, nrow - 1);
1444 1526
1445 if (top > bot) 1527 if (top > bot)
… …
1455 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1456 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1457 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1458 */ 1540 */
1459void 1541void
1460rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1461{ 1543{
1462 want_refresh = 1; 1544 want_refresh = 1;
1463 1545
1464 if (mode) 1546 if (mode)
1465 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
… …
1472 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1473 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1474 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1475 */ 1557 */
1476void 1558void
1477rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1478{ 1560{
1479 if (mode) 1561 if (mode)
1480 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1481 else 1563 else
1482 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1491 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1492 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1493 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1494 */ 1576 */
1495void 1577void
1496rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1497{ 1579{
1498 if (mode) 1580 if (mode)
1499 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1500 else 1582 else
1501 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
… …
1508 * Set insert/replace mode 1590 * Set insert/replace mode
1509 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1510 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1511 */ 1593 */
1512void 1594void
1513rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1514{ 1596{
1515 if (mode) 1597 if (mode)
1516 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1517 else 1599 else
1518 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
… …
1524 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1525 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1526 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1527 */ 1609 */
1528void 1610void
1529rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1530{ 1612{
1531 if (mode < 0) 1613 if (mode < 0)
1532 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1533 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1534 tabs[screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1535} 1617}
1536 1618
1537/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1538/* 1620/*
1539 * Set reverse/normal video 1621 * Set reverse/normal video
1540 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1541 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1542 */ 1624 */
1543void 1625void
1544rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1545{ 1627{
1546 XGCValues gcvalue; 1628 rvideo_mode = on;
1547 1629
1630#ifndef NO_BELL
1631 on ^= rvideo_bell;
1632#endif
1633
1548 if (rvideo != mode) 1634 if (rvideo_state != on)
1549 { 1635 {
1550 rvideo = mode; 1636 rvideo_state = on;
1637
1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1552#if XPM_BACKGROUND 1639#if XPM_BACKGROUND
1553 if (bgPixmap.pixmap == None) 1640 if (bgPixmap.pixmap == None)
1554#endif 1641#endif
1555#if TRANSPARENT 1642#if TRANSPARENT
1556 if (! (options & Opt_transparent) || am_transparent == 0) 1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1557#endif 1644#endif
1558 XSetWindowBackground (display->display, vt, 1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1559 pix_colors[Color_bg]);
1560 1646
1647 XGCValues gcvalue;
1561 gcvalue.foreground = pix_colors[Color_fg]; 1648 gcvalue.foreground = pix_colors[Color_fg];
1562 gcvalue.background = pix_colors[Color_bg]; 1649 gcvalue.background = pix_colors[Color_bg];
1563 XChangeGC (display->display, gc, GCBackground | GCForeground, 1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1564 &gcvalue); 1651
1565 scr_clear (); 1652 scr_clear ();
1566 scr_touch (true); 1653 scr_touch (true);
1567 } 1654 }
1568} 1655}
1569 1656
… …
1571/* 1658/*
1572 * Report current cursor position 1659 * Report current cursor position
1573 * XTERM_SEQ: Report position: ESC [ 6 n 1660 * XTERM_SEQ: Report position: ESC [ 6 n
1574 */ 1661 */
1575void 1662void
1576rxvt_term::scr_report_position () 1663rxvt_term::scr_report_position () NOTHROW
1577{ 1664{
1578 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1665 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1579} 1666}
1580 1667
1581/* ------------------------------------------------------------------------- * 1668/* ------------------------------------------------------------------------- *
… …
1584 1671
1585/* 1672/*
1586 * Set font style 1673 * Set font style
1587 */ 1674 */
1588void 1675void
1589rxvt_term::set_font_style () 1676rxvt_term::set_font_style () NOTHROW
1590{ 1677{
1678#if 0
1591 switch (charsets[screen.charset]) 1679 switch (charsets [screen.charset])
1592 { 1680 {
1593 case '0': /* DEC Special Character & Line Drawing Set */ 1681 case '0': /* DEC Special Character & Line Drawing Set */
1594 break; 1682 break;
1595 case 'A': /* United Kingdom (UK) */ 1683 case 'A': /* United Kingdom (UK) */
1596 break; 1684 break;
… …
1603 case 'C': /* Finnish character set */ 1691 case 'C': /* Finnish character set */
1604 break; 1692 break;
1605 case 'K': /* German character set */ 1693 case 'K': /* German character set */
1606 break; 1694 break;
1607 } 1695 }
1696#endif
1608} 1697}
1609 1698
1610/* ------------------------------------------------------------------------- */ 1699/* ------------------------------------------------------------------------- */
1611/* 1700/*
1612 * Choose a font 1701 * Choose a font
… …
1614 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1703 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1615 * XTERM_SEQ: Invoke G2 character set: ESC N 1704 * XTERM_SEQ: Invoke G2 character set: ESC N
1616 * XTERM_SEQ: Invoke G3 character set: ESC O 1705 * XTERM_SEQ: Invoke G3 character set: ESC O
1617 */ 1706 */
1618void 1707void
1619rxvt_term::scr_charset_choose (int set) 1708rxvt_term::scr_charset_choose (int set) NOTHROW
1620{ 1709{
1621 screen.charset = set; 1710 screen.charset = set;
1622 set_font_style (); 1711 set_font_style ();
1623} 1712}
1624 1713
… …
1630 * XTERM_SEQ: Set G2 character set: ESC * <C> 1719 * XTERM_SEQ: Set G2 character set: ESC * <C>
1631 * XTERM_SEQ: Set G3 character set: ESC + <C> 1720 * XTERM_SEQ: Set G3 character set: ESC + <C>
1632 * See set_font_style for possible values for <C> 1721 * See set_font_style for possible values for <C>
1633 */ 1722 */
1634void 1723void
1635rxvt_term::scr_charset_set (int set, unsigned int ch) 1724rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1636{ 1725{
1637 charsets[set] = (unsigned char)ch; 1726 charsets[set] = (unsigned char)ch;
1638 set_font_style (); 1727 set_font_style ();
1639} 1728}
1640 1729
… …
1645 1734
1646/* 1735/*
1647 * refresh matching text. 1736 * refresh matching text.
1648 */ 1737 */
1649bool 1738bool
1650rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1739rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1651{ 1740{
1652 bool found = false; 1741 bool found = false;
1653 1742
1654 for (int i = 0; i < nrow; i++) 1743 for (int i = 0; i < nrow; i++)
1655 { 1744 {
… …
1675 PART_END, 1764 PART_END,
1676 RC_COUNT 1765 RC_COUNT
1677}; 1766};
1678 1767
1679void 1768void
1680rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1769rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1681{ 1770{
1682 int i; 1771 int i;
1683 row_col_t rc[RC_COUNT]; 1772 row_col_t rc[RC_COUNT];
1684 1773
1685 if (!drawn_buf) /* sanity check */ 1774 if (!drawn_buf) /* sanity check */
… …
1689 if (refresh_type == FAST_REFRESH && !display->is_local) 1778 if (refresh_type == FAST_REFRESH && !display->is_local)
1690 { 1779 {
1691 y = 0; 1780 y = 0;
1692 eheight = height; 1781 eheight = height;
1693 } 1782 }
1694#endif
1695
1696#ifdef DEBUG_STRICT
1697#if 0
1698 // that's not debugging //TODO //FIXME
1699 clamp_it (x, 0, width);
1700 clamp_it (y, 0, height);
1701#endif
1702#endif 1783#endif
1703 1784
1704 /* round down */ 1785 /* round down */
1705 rc[PART_BEG].col = Pixel2Col (x); 1786 rc[PART_BEG].col = Pixel2Col (x);
1706 rc[PART_BEG].row = Pixel2Row (y); 1787 rc[PART_BEG].row = Pixel2Row (y);
… …
1716 } 1797 }
1717 1798
1718 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1799 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1719 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1800 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1720 1801
1802 num_scr_allow = 0;
1803
1721 if (refresh) 1804 if (refresh)
1722 scr_refresh (SLOW_REFRESH); 1805 scr_refresh ();
1723} 1806}
1724 1807
1725/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1726/* 1809/*
1727 * Refresh the entire screen 1810 * Refresh the entire screen
1728 */ 1811 */
1729void 1812void
1730rxvt_term::scr_touch (bool refresh) 1813rxvt_term::scr_touch (bool refresh) NOTHROW
1731{ 1814{
1732 scr_expose (0, 0, width, height, refresh); 1815 scr_expose (0, 0, width, height, refresh);
1733} 1816}
1734 1817
1735/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1736/* 1819/*
1737 * Move the display so that the line represented by scrollbar value Y is at 1820 * Move the display so that the line represented by scrollbar value Y is at
1738 * the top of the screen 1821 * the top of the screen
1739 */ 1822 */
1740int 1823void
1741rxvt_term::scr_move_to (int y, int len) 1824rxvt_term::scr_move_to (int y, int len) NOTHROW
1742{ 1825{
1743 long p = 0; 1826 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1744 unsigned int oldviewstart;
1745
1746 oldviewstart = view_start;
1747
1748 if (y < len)
1749 {
1750 p = (nrow + nsaved) * (len - y) / len;
1751 p -= (long) (nrow - 1);
1752 p = max (p, 0);
1753 }
1754
1755 view_start = (unsigned int)min (p, nsaved);
1756
1757 return scr_changeview (oldviewstart);
1758} 1827}
1759 1828
1760/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
1761/* 1830/*
1762 * Page the screen up/down nlines 1831 * Page the screen up/down nlines
1763 * direction should be UP or DN 1832 * direction should be UP or DN
1764 */ 1833 */
1765int 1834bool
1766rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1767{ 1836{
1768 int n; 1837 int new_view_start =
1769 unsigned int oldviewstart;
1770
1771 oldviewstart = view_start;
1772
1773 if (direction == UP)
1774 {
1775 n = view_start + nlines;
1776 view_start = min (n, nsaved);
1777 }
1778 else
1779 {
1780 n = view_start - nlines; 1838 direction == UP ? view_start - nlines
1781 view_start = max (n, 0); 1839 : view_start + nlines;
1782 }
1783 1840
1784 return scr_changeview (oldviewstart); 1841 return scr_changeview (new_view_start);
1785} 1842}
1786 1843
1787int 1844bool
1788rxvt_term::scr_changeview (unsigned int oldviewstart) 1845rxvt_term::scr_changeview (int new_view_start) NOTHROW
1789{ 1846{
1847 clamp_it (new_view_start, top_row, 0);
1848
1790 if (view_start != oldviewstart) 1849 if (new_view_start == view_start)
1791 { 1850 return false;
1851
1852 num_scr += new_view_start - view_start;
1853 view_start = new_view_start;
1792 want_refresh = 1; 1854 want_refresh = 1;
1793 num_scr -= (view_start - oldviewstart);
1794 }
1795 1855
1796 return (int) (view_start - oldviewstart); 1856 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1797}
1798 1857
1799/* ------------------------------------------------------------------------- */ 1858 return true;
1859}
1860
1861#ifndef NO_BELL
1800void 1862void
1863rxvt_term::bell_cb (time_watcher &w)
1864{
1865 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode);
1867}
1868#endif
1869
1870/* ------------------------------------------------------------------------- */
1871void
1801rxvt_term::scr_bell () 1872rxvt_term::scr_bell () NOTHROW
1802{ 1873{
1803#ifndef NO_BELL 1874#ifndef NO_BELL
1804 1875
1805# ifndef NO_MAPALERT 1876# ifndef NO_MAPALERT
1806# ifdef MAPALERT_OPTION 1877# ifdef MAPALERT_OPTION
1807 if (options & Opt_mapAlert) 1878 if (OPTION (Opt_mapAlert))
1808# endif 1879# endif
1809 XMapWindow (display->display, parent[0]); 1880 XMapWindow (display->display, parent[0]);
1810# endif 1881# endif
1811 1882
1812 if (options & Opt_visualBell) 1883 if (OPTION (Opt_visualBell))
1813 { 1884 {
1814 scr_rvideo_mode (!rvideo); /* refresh also done */ 1885 rvideo_bell = true;
1815 rxvt_usleep (VISUAL_BELL_DURATION); 1886 scr_rvideo_mode (rvideo_mode);
1816 scr_rvideo_mode (!rvideo); /* refresh also done */ 1887 display->flush ();
1888
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1817 } 1890 }
1818 else 1891 else
1819 XBell (display->display, 0); 1892 XBell (display->display, 0);
1820 1893
1821#endif 1894#endif
1822} 1895}
1823 1896
1824/* ------------------------------------------------------------------------- */ 1897/* ------------------------------------------------------------------------- */
1825/* ARGSUSED */ 1898/* ARGSUSED */
1826void 1899void
1827rxvt_term::scr_printscreen (int fullhist) 1900rxvt_term::scr_printscreen (int fullhist) NOTHROW
1828{ 1901{
1829#ifdef PRINTPIPE 1902#ifdef PRINTPIPE
1830 int nrows, row_start; 1903 int nrows, row_start;
1831 FILE *fd; 1904 FILE *fd;
1832 1905
1833 if ((fd = popen_printer ()) == NULL) 1906 if ((fd = popen_printer ()) == NULL)
1834 return; 1907 return;
1835 1908
1836 if (fullhist) 1909 if (fullhist)
1837 { 1910 {
1838 nrows = nrow + nsaved; 1911 nrows = nrow - top_row;
1839 row_start = -nsaved; 1912 row_start = top_row;
1840 } 1913 }
1841 else 1914 else
1842 { 1915 {
1843 nrows = nrow; 1916 nrows = nrow;
1844 row_start = -view_start; 1917 row_start = view_start;
1845 } 1918 }
1846 1919
1847 wctomb (0, 0); 1920 wctomb (0, 0);
1848 1921
1849 for (int r1 = 0; r1 < nrows; r1++) 1922 for (int r1 = 0; r1 < nrows; r1++)
… …
1881 * Refresh the screen 1954 * Refresh the screen
1882 * drawn_text/drawn_rend contain the screen information before the update. 1955 * drawn_text/drawn_rend contain the screen information before the update.
1883 * screen.text/screen.rend contain what the screen will change to. 1956 * screen.text/screen.rend contain what the screen will change to.
1884 */ 1957 */
1885void 1958void
1886rxvt_term::scr_refresh (unsigned char refresh_type) 1959rxvt_term::scr_refresh () NOTHROW
1887{ 1960{
1888 unsigned char must_clear, /* use draw_string not draw_image_string */ 1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1889 showcursor; /* show the cursor */ 1962 showcursor; /* show the cursor */
1890 int16_t col, row, /* column/row we're processing */ 1963 int16_t col, row, /* column/row we're processing */
1891 ocrow; /* old cursor row */ 1964 ocrow; /* old cursor row */
… …
1908 1981
1909#if XPM_BACKGROUND 1982#if XPM_BACKGROUND
1910 must_clear |= bgPixmap.pixmap != None; 1983 must_clear |= bgPixmap.pixmap != None;
1911#endif 1984#endif
1912#if TRANSPARENT 1985#if TRANSPARENT
1913 must_clear |= (options & Opt_transparent) && am_transparent; 1986 must_clear |= OPTION (Opt_transparent) && am_transparent;
1914#endif 1987#endif
1915 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1916 1989
1917 /* 1990 /*
1918 * B: reverse any characters which are selected 1991 * B: reverse any characters which are selected
… …
1942 2015
1943 crp = &ROW(screen.cur.row).r[col]; 2016 crp = &ROW(screen.cur.row).r[col];
1944 2017
1945 if (showcursor && focus) 2018 if (showcursor && focus)
1946 { 2019 {
1947 if (options & Opt_cursorUnderline) 2020 if (OPTION (Opt_cursorUnderline))
1948 *crp ^= RS_Uline; 2021 *crp ^= RS_Uline;
1949 else 2022 else
1950 { 2023 {
1951 *crp ^= RS_RVid; 2024 *crp ^= RS_RVid;
1952 2025
… …
1954 cc1 = *crp & (RS_fgMask | RS_bgMask); 2027 cc1 = *crp & (RS_fgMask | RS_bgMask);
1955 if (ISSET_PIXCOLOR (Color_cursor)) 2028 if (ISSET_PIXCOLOR (Color_cursor))
1956 ccol1 = Color_cursor; 2029 ccol1 = Color_cursor;
1957 else 2030 else
1958#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2031#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1959 ccol1 = GET_FGCOLOR (rstyle); 2032 ccol1 = fgcolor_of (rstyle);
1960#else 2033#else
1961 ccol1 = Color_fg; 2034 ccol1 = Color_fg;
1962#endif 2035#endif
1963 if (ISSET_PIXCOLOR (Color_cursor2)) 2036 if (ISSET_PIXCOLOR (Color_cursor2))
1964 ccol2 = Color_cursor2; 2037 ccol2 = Color_cursor2;
1965 else 2038 else
1966#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1967 ccol2 = GET_BGCOLOR (rstyle); 2040 ccol2 = bgcolor_of (rstyle);
1968#else 2041#else
1969 ccol2 = Color_bg; 2042 ccol2 = Color_bg;
1970#endif 2043#endif
1971 *crp = SET_FGCOLOR (*crp, ccol1); 2044 *crp = SET_FGCOLOR (*crp, ccol1);
1972 *crp = SET_BGCOLOR (*crp, ccol2); 2045 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1977 2050
1978 /* make sure no outline cursor is left around */ 2051 /* make sure no outline cursor is left around */
1979 setoldcursor = 0; 2052 setoldcursor = 0;
1980 if (ocrow != -1) 2053 if (ocrow != -1)
1981 { 2054 {
1982 if (screen.cur.row + view_start != ocrow 2055 if (screen.cur.row - view_start != ocrow
1983 || screen.cur.col != oldcursor.col) 2056 || screen.cur.col != oldcursor.col)
1984 { 2057 {
1985 if (ocrow < nrow 2058 if (ocrow < nrow
1986 && oldcursor.col < ncol) 2059 && oldcursor.col < ncol)
1987 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2060 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
1995 else if (!focus) 2068 else if (!focus)
1996 setoldcursor = 1; 2069 setoldcursor = 1;
1997 2070
1998 if (setoldcursor) 2071 if (setoldcursor)
1999 { 2072 {
2000 if (screen.cur.row + view_start >= nrow) 2073 if (screen.cur.row - view_start >= nrow)
2001 oldcursor.row = -1; 2074 oldcursor.row = -1;
2002 else 2075 else
2003 { 2076 {
2004 oldcursor.row = screen.cur.row + view_start; 2077 oldcursor.row = screen.cur.row - view_start;
2005 oldcursor.col = screen.cur.col; 2078 oldcursor.col = screen.cur.col;
2006 } 2079 }
2007 } 2080 }
2008 } 2081 }
2009 2082
2083 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2010#if ENABLE_OVERLAY 2084#if ENABLE_OVERLAY
2011 scr_swap_overlay (); 2085 scr_swap_overlay ();
2012#endif 2086#endif
2013 2087
2014#ifndef NO_SLOW_LINK_SUPPORT 2088#ifndef NO_SLOW_LINK_SUPPORT
2015 /* 2089 /*
2016 * D: CopyArea pass - very useful for slower links 2090 * D: CopyArea pass - very useful for slower links
2017 * This has been deliberately kept simple. 2091 * This has been deliberately kept simple.
2018 */ 2092 */
2019 i = num_scr;
2020 if (!display->is_local 2093 if (!display->is_local
2021 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2022 && abs (num_scr) < nrow && !must_clear) 2095 && abs (num_scr) < nrow && !must_clear)
2023 { 2096 {
2024 int16_t nits; 2097 int16_t nits;
2025 int j; 2098 int j;
2026 int len, wlen; 2099 int len, wlen;
2100 dLocal (int, num_scr);
2027 2101
2028 j = nrow; 2102 j = nrow;
2029 wlen = len = -1; 2103 wlen = len = -1;
2030 row = i > 0 ? 0 : j - 1; 2104 row = i > 0 ? 0 : j - 1;
2031 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2032 { 2106 {
2033 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2034 { 2108 {
2035 line_t s = ROW(row - view_start); 2109 line_t s = ROW(view_start + row);
2036 line_t d = drawn_buf[row]; 2110 line_t d = drawn_buf[row];
2037 line_t d2 = drawn_buf[row + i]; 2111 line_t d2 = drawn_buf[row + i];
2038 2112
2039 for (nits = 0, col = ncol; col--; ) 2113 for (nits = 0, col = ncol; col--; )
2040 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2114 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2064 if (wlen < len) 2138 if (wlen < len)
2065 ::swap (wlen, len); 2139 ::swap (wlen, len);
2066 2140
2067 XCopyArea (display->display, vt, vt, 2141 XCopyArea (display->display, vt, vt,
2068 gc, 0, Row2Pixel (len + i), 2142 gc, 0, Row2Pixel (len + i),
2069 (unsigned int)TermWin_TotalWidth (), 2143 (unsigned int)this->width,
2070 (unsigned int)Height2Pixel (wlen - len + 1), 2144 (unsigned int)Height2Pixel (wlen - len + 1),
2071 0, Row2Pixel (len)); 2145 0, Row2Pixel (len));
2072 len = -1; 2146 len = -1;
2073 } 2147 }
2074 } 2148 }
… …
2078 /* 2152 /*
2079 * E: main pass across every character 2153 * E: main pass across every character
2080 */ 2154 */
2081 for (row = 0; row < nrow; row++) 2155 for (row = 0; row < nrow; row++)
2082 { 2156 {
2083 text_t *stp = ROW(row - view_start).t; 2157 text_t *stp = ROW(view_start + row).t;
2084 rend_t *srp = ROW(row - view_start).r; 2158 rend_t *srp = ROW(view_start + row).r;
2085 text_t *dtp = drawn_buf[row].t; 2159 text_t *dtp = drawn_buf[row].t;
2086 rend_t *drp = drawn_buf[row].r; 2160 rend_t *drp = drawn_buf[row].r;
2087 2161
2088 /* 2162 /*
2089 * E2: OK, now the real pass 2163 * E2: OK, now the real pass
… …
2153 count++, i--; 2227 count++, i--;
2154 2228
2155 /* 2229 /*
2156 * Determine the attributes for the string 2230 * Determine the attributes for the string
2157 */ 2231 */
2158 int fore = GET_FGCOLOR (rend); // desired foreground 2232 int fore = fgcolor_of (rend); // desired foreground
2159 int back = GET_BGCOLOR (rend); // desired background 2233 int back = bgcolor_of (rend); // desired background
2160 2234
2161 // only do special processing if any attributes are set, which is rare 2235 // only do special processing if any attributes are set, which is unlikely
2162 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2163 { 2237 {
2164#if ENABLE_STYLES 2238#if ENABLE_STYLES
2165 // force redraw after "careful" characters to avoid pixel droppings 2239 // force redraw after "careful" characters to avoid pixel droppings
2166 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2277 } /* for (row....) */ 2351 } /* for (row....) */
2278 2352
2279#if ENABLE_OVERLAY 2353#if ENABLE_OVERLAY
2280 scr_swap_overlay (); 2354 scr_swap_overlay ();
2281#endif 2355#endif
2356 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2282 2357
2283 /* 2358 /*
2284 * G: cleanup cursor and display outline cursor if necessary 2359 * G: cleanup cursor and display outline cursor if necessary
2285 */ 2360 */
2286 if (showcursor) 2361 if (showcursor)
2287 { 2362 {
2288 if (focus) 2363 if (focus)
2289 { 2364 {
2290 if (options & Opt_cursorUnderline) 2365 if (OPTION (Opt_cursorUnderline))
2291 *crp ^= RS_Uline; 2366 *crp ^= RS_Uline;
2292 else 2367 else
2293 { 2368 {
2294 *crp ^= RS_RVid; 2369 *crp ^= RS_RVid;
2295#ifndef NO_CURSORCOLOR 2370#ifndef NO_CURSORCOLOR
… …
2325 /* 2400 /*
2326 * H: cleanup selection 2401 * H: cleanup selection
2327 */ 2402 */
2328 scr_reverse_selection (); 2403 scr_reverse_selection ();
2329 2404
2330 if (refresh_type & SMOOTH_REFRESH)
2331 XFlush (display->display);
2332
2333 num_scr = 0; 2405 num_scr = 0;
2334 num_scr_allow = 1; 2406 num_scr_allow = 1;
2335} 2407}
2336 2408
2337void 2409void
2338rxvt_term::scr_remap_chars (const line_t &l) 2410rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2339{ 2411{
2340 if (!l.t) 2412 if (!l.t)
2341 return; 2413 return;
2342 2414
2415 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2416
2343 for (int i = ncol; i--; ) 2417 for (int i = ncol; i--; )
2344 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2418 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2345} 2419}
2346 2420
2347void 2421void
2348rxvt_term::scr_remap_chars () 2422rxvt_term::scr_remap_chars () NOTHROW
2349{ 2423{
2350 for (int i = total_rows; i--; ) 2424 for (int i = total_rows; i--; )
2351 scr_remap_chars (row_buf [i]); 2425 scr_remap_chars (row_buf [i]);
2352 2426
2353 for (int i = nrow; i--; ) 2427 for (int i = nrow; i--; )
… …
2356 scr_remap_chars (swap_buf [i]); 2430 scr_remap_chars (swap_buf [i]);
2357 } 2431 }
2358} 2432}
2359 2433
2360void 2434void
2361rxvt_term::scr_recolour () 2435rxvt_term::scr_recolour () NOTHROW
2362{ 2436{
2363 if (1 2437 if (1
2364#if TRANSPARENT 2438#if TRANSPARENT
2365 && !am_transparent 2439 && !am_transparent
2366#endif 2440#endif
… …
2387 want_refresh = 1; 2461 want_refresh = 1;
2388} 2462}
2389 2463
2390/* ------------------------------------------------------------------------- */ 2464/* ------------------------------------------------------------------------- */
2391void 2465void
2392rxvt_term::scr_clear (bool really) 2466rxvt_term::scr_clear (bool really) NOTHROW
2393{ 2467{
2394 if (!mapped) 2468 if (!mapped)
2395 return; 2469 return;
2396 2470
2397 num_scr_allow = 0; 2471 num_scr_allow = 0;
… …
2399 2473
2400 if (really) 2474 if (really)
2401 XClearWindow (display->display, vt); 2475 XClearWindow (display->display, vt);
2402} 2476}
2403 2477
2404/* ------------------------------------------------------------------------- */
2405void 2478void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{
2481 int view_end = view_start + nrow;
2482 int row, col;
2483
2484 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2485 {
2486 text_t *stp = ROW(row).t;
2487 rend_t *srp = ROW(row).r;
2488
2489 for (col = beg_col; col < end_col; col++)
2490 srp[col] ^= rstyle1;
2491
2492 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2493 srp[col] ^= rstyle2;
2494
2495 if (++col < end_col)
2496 srp[col] ^= rstyle2;
2497 }
2498}
2499
2500void
2501rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2502{
2503 int view_end = view_start + nrow;
2504 int row, col;
2505
2506 if (beg_row >= view_start)
2507 {
2508 col = beg_col;
2509 row = beg_row;
2510 }
2511 else
2512 {
2513 col = 0;
2514 row = view_start;
2515 }
2516
2517 for (; row < min (end_row, view_end); row++, col = 0)
2518 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2519 srp[col] ^= rstyle;
2520
2521 if (row == end_row)
2522 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2523 srp[col] ^= rstyle;
2524}
2525
2526/* ------------------------------------------------------------------------- */
2527void
2406rxvt_term::scr_reverse_selection () 2528rxvt_term::scr_reverse_selection () NOTHROW
2407{ 2529{
2408 if (selection.op 2530 if (selection.op
2409 && current_screen == selection.screen 2531 && current_screen == selection.screen
2410 && selection.end.row >= -view_start) 2532 && selection.end.row >= view_start)
2411 { 2533 {
2412 int view_end = -view_start + nrow;
2413 int row, col;
2414
2415#if ENABLE_FRILLS 2534#if ENABLE_FRILLS
2416 if (selection.rect) 2535 if (selection.rect)
2417 { 2536 scr_xor_rect (selection.beg.row, selection.beg.col,
2418 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2537 selection.end.row, selection.end.col,
2419 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2538 RS_RVid, RS_RVid | RS_Uline);
2420 srp[col] ^= RS_RVid;
2421 }
2422 else 2539 else
2423#endif 2540#endif
2424 { 2541 scr_xor_span (selection.beg.row, selection.beg.col,
2425 if (selection.beg.row >= -view_start) 2542 selection.end.row, selection.end.col,
2426 { 2543 RS_RVid);
2427 col = selection.beg.col;
2428 row = selection.beg.row;
2429 }
2430 else
2431 {
2432 col = 0;
2433 row = view_start;
2434 }
2435
2436 for (; row < min (selection.end.row, view_end); row++, col = 0)
2437 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2438 srp[col] ^= RS_RVid;
2439
2440 if (row == selection.end.row)
2441 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2442 srp[col] ^= RS_RVid;
2443 }
2444 } 2544 }
2445} 2545}
2446 2546
2447/* ------------------------------------------------------------------------- */ 2547/* ------------------------------------------------------------------------- */
2448/* 2548/*
2449 * Dump the whole scrollback and screen to the passed filedescriptor. The 2549 * Dump the whole scrollback and screen to the passed filedescriptor. The
2450 * invoking routine must close the fd. 2550 * invoking routine must close the fd.
2451 */ 2551 */
2452#if 0 2552#if 0
2453void 2553void
2454rxvt_term::scr_dump (int fd) 2554rxvt_term::scr_dump (int fd) NOTHROW
2455{ 2555{
2456 int row, wrote; 2556 int row, wrote;
2457 unsigned int width, towrite; 2557 unsigned int width, towrite;
2458 char r1[] = "\n"; 2558 char r1[] = "\n";
2459 2559
… …
2478 2578
2479/* ------------------------------------------------------------------------- * 2579/* ------------------------------------------------------------------------- *
2480 * CHARACTER SELECTION * 2580 * CHARACTER SELECTION *
2481 * ------------------------------------------------------------------------- */ 2581 * ------------------------------------------------------------------------- */
2482void 2582void
2483rxvt_term::selection_check (int check_more) 2583rxvt_term::selection_check (int check_more) NOTHROW
2484{ 2584{
2485 row_col_t pos; 2585 row_col_t pos;
2486 2586
2487 if (!selection.op) 2587 if (!selection.op)
2488 return; 2588 return;
2489 2589
2490 pos.row = pos.col = 0; 2590 pos.row = pos.col = 0;
2491 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2591 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2492 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2592 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2493 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2593 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2494 || (check_more == 1 2594 || (check_more == 1
2495 && current_screen == selection.screen 2595 && current_screen == selection.screen
2496 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2596 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2497 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2597 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2498 || (check_more == 2 2598 || (check_more == 2
… …
2509/* ------------------------------------------------------------------------- */ 2609/* ------------------------------------------------------------------------- */
2510/* 2610/*
2511 * Paste a selection direct to the command fd 2611 * Paste a selection direct to the command fd
2512 */ 2612 */
2513void 2613void
2514rxvt_term::paste (unsigned char *data, unsigned int len) 2614rxvt_term::paste (char *data, unsigned int len) NOTHROW
2515{ 2615{
2516 /* convert normal newline chars into common keyboard Return key sequence */ 2616 /* convert normal newline chars into common keyboard Return key sequence */
2517 for (unsigned int i = 0; i < len; i++) 2617 for (unsigned int i = 0; i < len; i++)
2518 if (data[i] == C0_LF) 2618 if (data[i] == C0_LF)
2519 data[i] = C0_CR; 2619 data[i] = C0_CR;
… …
2525/* 2625/*
2526 * Respond to a notification that a primary selection has been sent 2626 * Respond to a notification that a primary selection has been sent
2527 * EXT: SelectionNotify 2627 * EXT: SelectionNotify
2528 */ 2628 */
2529void 2629void
2530rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2630rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2531{ 2631{
2532 if (prop == None) /* check for failed XConvertSelection */ 2632 if (prop == None) /* check for failed XConvertSelection */
2533 { 2633 {
2534 if ((selection_type & Sel_CompoundText)) 2634 if ((selection_type & Sel_CompoundText))
2535 { 2635 {
… …
2663 { 2763 {
2664 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2665 char *s = rxvt_wcstombs (w); 2765 char *s = rxvt_wcstombs (w);
2666 free (w); 2766 free (w);
2667 // TODO: strlen == only the first element will be converted. well... 2767 // TODO: strlen == only the first element will be converted. well...
2668 paste ((unsigned char *)s, strlen (s)); 2768 paste (s, strlen (s));
2669 free (s); 2769 free (s);
2670 } 2770 }
2671 else 2771 else
2672#endif 2772#endif
2673 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2674 && cl) 2774 && cl)
2675 { 2775 {
2676 for (int i = 0; i < cr; i++) 2776 for (int i = 0; i < cr; i++)
2677 paste ((unsigned char *)cl[i], strlen (cl[i])); 2777 paste (cl[i], strlen (cl[i]));
2678 2778
2679 XFreeStringList (cl); 2779 XFreeStringList (cl);
2680 } 2780 }
2681 else 2781 else
2682 paste (ct.value, ct.nitems); // paste raw 2782 paste ((char *)ct.value, ct.nitems); // paste raw
2683 2783
2684bailout: 2784bailout:
2685 XFree (ct.value); 2785 XFree (ct.value);
2686 2786
2687 if (selection_wait == Sel_normal) 2787 if (selection_wait == Sel_normal)
2688 selection_wait = Sel_none; 2788 selection_wait = Sel_none;
2689} 2789}
2690 2790
2691void 2791void
2692rxvt_term::incr_cb (time_watcher &w) 2792rxvt_term::incr_cb (time_watcher &w) NOTHROW
2693{ 2793{
2694 selection_wait = Sel_none; 2794 selection_wait = Sel_none;
2695 2795
2696 incr_buf_size = 0; 2796 incr_buf_size = 0;
2697 free (incr_buf); 2797 free (incr_buf);
2698 2798
2699 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2799 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2700} 2800}
2701 2801
2702void 2802void
2703rxvt_term::selection_property (Window win, Atom prop) 2803rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2704{ 2804{
2705 if (prop == None || selection_wait != Sel_incr) 2805 if (prop == None || selection_wait != Sel_incr)
2706 return; 2806 return;
2707 2807
2708 selection_paste (win, prop, true); 2808 selection_paste (win, prop, true);
… …
2717 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2718 * will auto fallback to CUT_BUFFER0 2818 * will auto fallback to CUT_BUFFER0
2719 * EXT: button 2 release 2819 * EXT: button 2 release
2720 */ 2820 */
2721void 2821void
2722rxvt_term::selection_request (Time tm, int x, int y) 2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2723{ 2823{
2724 if (x < 0 || x >= width || y < 0 || y >= height) 2824 if (selection.text && selnum == Sel_Primary)
2725 return; /* outside window */
2726
2727 if (selection.text)
2728 { /* internal selection */ 2825 { /* internal selection */
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2826 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2827 paste (str, strlen (str));
2731 free (str); 2828 free (str);
2732 return; 2829 return;
2733 } 2830 }
2734 else 2831 else
2735 { 2832 {
2736 int i;
2737
2738 selection_request_time = tm; 2833 selection_request_time = tm;
2739 selection_wait = Sel_normal; 2834 selection_wait = Sel_normal;
2740 2835
2741 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2742 {
2743#if X_HAVE_UTF8_STRING 2836#if X_HAVE_UTF8_STRING
2744 selection_type = Sel_UTF8String; 2837 selection_type = Sel_UTF8String;
2745 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2838 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2746 return; 2839 return;
2747#else 2840#else
2748 selection_type = Sel_CompoundText; 2841 selection_type = Sel_CompoundText;
2749 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2842 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2750 return; 2843 return;
2751#endif 2844#endif
2752 }
2753 } 2845 }
2754 2846
2755 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2847 selection_wait = Sel_none; /* don't loop in selection_paste () */
2756 selection_paste (display->root, XA_CUT_BUFFER0, false); 2848 selection_paste (display->root, XA_CUT_BUFFER0, false);
2757} 2849}
2758 2850
2759int 2851int
2760rxvt_term::selection_request_other (Atom target, int selnum) 2852rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2761{ 2853{
2762 Atom sel; 2854 Atom sel;
2763 2855
2764 selection_type |= selnum; 2856 selection_type |= selnum;
2765 2857
… …
2784/* 2876/*
2785 * Clear all selected text 2877 * Clear all selected text
2786 * EXT: SelectionClear 2878 * EXT: SelectionClear
2787 */ 2879 */
2788void 2880void
2789rxvt_term::selection_clear () 2881rxvt_term::selection_clear () NOTHROW
2790{ 2882{
2791 want_refresh = 1; 2883 want_refresh = 1;
2792 free (selection.text); 2884 free (selection.text);
2793 selection.text = NULL; 2885 selection.text = NULL;
2794 selection.len = 0; 2886 selection.len = 0;
… …
2827 selection.op = SELECTION_DONE; 2919 selection.op = SELECTION_DONE;
2828 2920
2829 if (selection.clicks == 4) 2921 if (selection.clicks == 4)
2830 return; /* nothing selected, go away */ 2922 return; /* nothing selected, go away */
2831 2923
2924 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2925 return;
2926
2832 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2927 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2833 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2928 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2834 2929
2835 int ofs = 0; 2930 int ofs = 0;
2836 int extra = 0; 2931 int extra = 0;
… …
2848 col = selection.beg.col; 2943 col = selection.beg.col;
2849 end_col = ncol + 1; 2944 end_col = ncol + 1;
2850 } 2945 }
2851 else 2946 else
2852#endif 2947#endif
2853 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2948 end_col = ROW(row).l;
2854 2949
2855 col = max (col, 0); 2950 col = max (col, 0);
2856 2951
2857 if (row == selection.end.row || selection.rect) 2952 if (row == selection.end.row
2953#if ENABLE_FRILLS
2954 || selection.rect
2955#endif
2956 )
2858 end_col = min (end_col, selection.end.col); 2957 min_it (end_col, selection.end.col);
2859 2958
2860 t = ROW(row).t + col; 2959 t = ROW(row).t + col;
2960
2861 for (; col < end_col; col++) 2961 for (; col < end_col; col++)
2862 { 2962 {
2863 if (*t == NOCHAR) 2963 if (*t == NOCHAR)
2864 t++; 2964 t++;
2865#if ENABLE_COMBINING 2965#if ENABLE_COMBINING
… …
2881#endif 2981#endif
2882 else 2982 else
2883 new_selection_text[ofs++] = *t++; 2983 new_selection_text[ofs++] = *t++;
2884 } 2984 }
2885 2985
2986#if ENABLE_FRILLS
2987 if (selection.rect)
2988 {
2989 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1]))
2992 --ofs;
2993
2994 new_selection_text[ofs++] = C0_LF;
2995 }
2996 else
2997#endif
2886 if (!ROW(row).is_longer () && row != selection.end.row) 2998 if (!ROW(row).is_longer () && row != selection.end.row)
2887 new_selection_text[ofs++] = C0_LF; 2999 new_selection_text[ofs++] = C0_LF;
2888 } 3000 }
2889 3001
2890 if (end_col != selection.end.col) 3002 if (end_col != selection.end.col)
2891 new_selection_text[ofs++] = C0_LF; 3003 new_selection_text[ofs++] = C0_LF;
2892 3004
… …
2902 3014
2903 // we usually allocate much more than necessary, so realloc it smaller again 3015 // we usually allocate much more than necessary, so realloc it smaller again
2904 selection.len = ofs; 3016 selection.len = ofs;
2905 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3017 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2906 3018
3019 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3020 return;
3021
3022 selection_grab (tm);
3023}
3024
3025bool
3026rxvt_term::selection_grab (Time tm) NOTHROW
3027{
3028 selection_time = tm;
3029
2907 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2908 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3032 {
2909 display->set_selection_owner (this); 3033 display->set_selection_owner (this);
3034 return true;
3035 }
2910 else 3036 else
2911 rxvt_warn ("can't get primary selection, ignoring.\n"); 3037 {
3038 selection_clear ();
3039 return false;
3040 }
2912 3041
2913#if 0 3042#if 0
2914 XTextProperty ct; 3043 XTextProperty ct;
2915 3044
2916 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2917 { 3046 {
2918 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2919 XFree (ct.value); 3048 XFree (ct.value);
2920 } 3049 }
2921#endif 3050#endif
2922
2923 selection_time = tm;
2924} 3051}
2925 3052
2926/* ------------------------------------------------------------------------- */ 3053/* ------------------------------------------------------------------------- */
2927/* 3054/*
2928 * Mark or select text based upon number of clicks: 1, 2, or 3 3055 * Mark or select text based upon number of clicks: 1, 2, or 3
2929 * EXT: button 1 press 3056 * EXT: button 1 press
2930 */ 3057 */
2931void 3058void
2932rxvt_term::selection_click (int clicks, int x, int y) 3059rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2933{ 3060{
2934 clicks = ((clicks - 1) % 3) + 1; 3061 clicks = ((clicks - 1) % 3) + 1;
2935 selection.clicks = clicks; /* save clicks so extend will work */ 3062 selection.clicks = clicks; /* save clicks so extend will work */
2936 3063
3064 if (clicks == 2 && !selection.rect
3065 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3066 {
3067 MEvent.clicks = 1; // what a mess
3068 selection.screen = current_screen;
3069 selection.op = SELECTION_CONT;
3070 return;
3071 }
3072
2937 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3073 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2938 3074
2939 if (clicks == 2 || clicks == 3) 3075 if (clicks == 2 || clicks == 3)
2940 selection_extend_colrow (selection.mark.col, 3076 selection_extend_colrow (selection.mark.col,
2941 selection.mark.row + view_start, 3077 selection.mark.row - view_start,
2942 0, /* button 3 */ 3078 0, /* button 3 */
2943 1, /* button press */ 3079 1, /* button press */
2944 0); /* click change */ 3080 0); /* click change */
2945} 3081}
2946 3082
2947/* ------------------------------------------------------------------------- */ 3083/* ------------------------------------------------------------------------- */
2948/* 3084/*
2949 * Mark a selection at the specified col/row 3085 * Mark a selection at the specified col/row
2950 */ 3086 */
2951void 3087void
2952rxvt_term::selection_start_colrow (int col, int row) 3088rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2953{ 3089{
2954 want_refresh = 1; 3090 want_refresh = 1;
2955 3091
2956 selection.mark.row = row - view_start; 3092 selection.mark.row = row + view_start;
2957 selection.mark.col = col; 3093 selection.mark.col = col;
2958 3094
2959 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3095 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2960 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2961 3097
2962 while (selection.mark.col > 0 3098 while (selection.mark.col > 0
2963 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2964 --selection.mark.col; 3100 --selection.mark.col;
… …
2983#define DELIMIT_TEXT(x) \ 3119#define DELIMIT_TEXT(x) \
2984 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3120 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2985#define DELIMIT_REND(x) 1 3121#define DELIMIT_REND(x) 1
2986 3122
2987void 3123void
2988rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3124rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
2989{ 3125{
2990 int col, row, dirnadd, tcol, trow, w1, w2; 3126 int col, row, dirnadd, tcol, trow, w1, w2;
2991 row_col_t bound; 3127 row_col_t bound;
2992 text_t *stp; 3128 text_t *stp;
2993 rend_t *srp; 3129 rend_t *srp;
2994 3130
2995 if (dirn == UP) 3131 if (dirn == UP)
2996 { 3132 {
2997 bound.row = - nsaved - 1; 3133 bound.row = top_row - 1;
2998 bound.col = 0; 3134 bound.col = 0;
2999 dirnadd = -1; 3135 dirnadd = -1;
3000 } 3136 }
3001 else 3137 else
3002 { 3138 {
… …
3050 } 3186 }
3051 } 3187 }
3052 break; 3188 break;
3053 } 3189 }
3054 3190
3055Old_Word_Selection_You_Die:
3056 if (dirn == DN) 3191 if (dirn == DN)
3057 col++; /* put us on one past the end */ 3192 col++; /* put us on one past the end */
3058 3193
3059 /* Poke the values back in */ 3194 /* Poke the values back in */
3060 ret->row = row; 3195 ret->row = row;
… …
3068 * flag == 0 ==> button 1 3203 * flag == 0 ==> button 1
3069 * flag == 1 ==> button 3 press 3204 * flag == 1 ==> button 3 press
3070 * flag == 2 ==> button 3 motion 3205 * flag == 2 ==> button 3 motion
3071 */ 3206 */
3072void 3207void
3073rxvt_term::selection_extend (int x, int y, int flag) 3208rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3074{ 3209{
3075 int col = clamp (Pixel2Col (x), 0, ncol); 3210 int col = clamp (Pixel2Col (x), 0, ncol);
3076 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3211 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3077 3212
3078 /* 3213 /*
… …
3081 * select nothing. Otherwise, if we're to the right of the mark, you have to 3216 * select nothing. Otherwise, if we're to the right of the mark, you have to
3082 * be _past_ a character for it to be selected. 3217 * be _past_ a character for it to be selected.
3083 */ 3218 */
3084 if (((selection.clicks % 3) == 1) && !flag 3219 if (((selection.clicks % 3) == 1) && !flag
3085 && (col == selection.mark.col 3220 && (col == selection.mark.col
3086 && (row == selection.mark.row + view_start))) 3221 && (row == selection.mark.row - view_start)))
3087 { 3222 {
3088 /* select nothing */ 3223 /* select nothing */
3089 selection.beg.row = selection.end.row = 0; 3224 selection.beg.row = selection.end.row = 0;
3090 selection.beg.col = selection.end.col = 0; 3225 selection.beg.col = selection.end.col = 0;
3091 selection.clicks = 4; 3226 selection.clicks = 4;
… …
3104/* ------------------------------------------------------------------------- */ 3239/* ------------------------------------------------------------------------- */
3105/* 3240/*
3106 * Extend the selection to the specified col/row 3241 * Extend the selection to the specified col/row
3107 */ 3242 */
3108void 3243void
3109rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3244rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3110{ 3245{
3111 row_col_t pos; 3246 row_col_t pos;
3112 enum { 3247 enum {
3113 LEFT, RIGHT 3248 LEFT, RIGHT
3114 } closeto = RIGHT; 3249 } closeto = RIGHT;
… …
3146 selection.beg.col = selection.end.col = selection.mark.col; 3281 selection.beg.col = selection.end.col = selection.mark.col;
3147 selection.beg.row = selection.end.row = selection.mark.row; 3282 selection.beg.row = selection.end.row = selection.mark.row;
3148 } 3283 }
3149 3284
3150 pos.col = col; 3285 pos.col = col;
3151 pos.row = row - view_start; 3286 pos.row = view_start + row;
3152 3287
3153 /* 3288 /*
3154 * This is mainly xterm style selection with a couple of differences, mainly 3289 * This is mainly xterm style selection with a couple of differences, mainly
3155 * in the way button3 drag extension works. 3290 * in the way button3 drag extension works.
3156 * We're either doing: button1 drag; button3 press; or button3 drag 3291 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3243 selection_delimit_word (DN, &selection.end, &selection.end); 3378 selection_delimit_word (DN, &selection.end, &selection.end);
3244 } 3379 }
3245 else if (selection.clicks == 3) 3380 else if (selection.clicks == 3)
3246 { 3381 {
3247#if ENABLE_FRILLS 3382#if ENABLE_FRILLS
3248 if (options & Opt_tripleclickwords) 3383 if (OPTION (Opt_tripleclickwords))
3249 { 3384 {
3250 selection_delimit_word (UP, &selection.beg, &selection.beg); 3385 selection_delimit_word (UP, &selection.beg, &selection.beg);
3251 3386
3252 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3387 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3253 { 3388 {
… …
3300#endif 3435#endif
3301} 3436}
3302 3437
3303#if ENABLE_FRILLS 3438#if ENABLE_FRILLS
3304void 3439void
3305rxvt_term::selection_remove_trailing_spaces () 3440rxvt_term::selection_remove_trailing_spaces () NOTHROW
3306{ 3441{
3307 int32_t end_col, end_row; 3442 int32_t end_col, end_row;
3308 text_t *stp; 3443 text_t *stp;
3309 3444
3310 end_col = selection.end.col; 3445 end_col = selection.end.col;
… …
3314 { 3449 {
3315 stp = ROW(end_row).t; 3450 stp = ROW(end_row).t;
3316 3451
3317 while (--end_col >= 0) 3452 while (--end_col >= 0)
3318 { 3453 {
3319 if (stp[end_col] != ' ' 3454 if (stp[end_col] != NOCHAR
3320 && stp[end_col] != '\t' 3455 && !unicode::is_space (stp[end_col]))
3321 && stp[end_col] != NOCHAR)
3322 break; 3456 break;
3323 } 3457 }
3324 3458
3325 if (end_col >= 0 3459 if (end_col >= 0
3326 || !ROW(end_row - 1).is_longer ()) 3460 || !ROW(end_row - 1).is_longer ())
… …
3349/* 3483/*
3350 * Double click on button 3 when already selected 3484 * Double click on button 3 when already selected
3351 * EXT: button 3 double click 3485 * EXT: button 3 double click
3352 */ 3486 */
3353void 3487void
3354rxvt_term::selection_rotate (int x, int y) 3488rxvt_term::selection_rotate (int x, int y) NOTHROW
3355{ 3489{
3356 selection.clicks = selection.clicks % 3 + 1; 3490 selection.clicks = selection.clicks % 3 + 1;
3357 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3491 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3358} 3492}
3359 3493
… …
3361/* 3495/*
3362 * Respond to a request for our current selection 3496 * Respond to a request for our current selection
3363 * EXT: SelectionRequest 3497 * EXT: SelectionRequest
3364 */ 3498 */
3365void 3499void
3366rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3367{ 3501{
3368 XSelectionEvent ev; 3502 XSelectionEvent ev;
3369 dDisp; 3503 dDisp;
3370 3504
3371 ev.type = SelectionNotify; 3505 ev.type = SelectionNotify;
… …
3499 3633
3500/* 3634/*
3501 * return col/row values corresponding to x/y pixel values 3635 * return col/row values corresponding to x/y pixel values
3502 */ 3636 */
3503void 3637void
3504rxvt_term::pixel_position (int *x, int *y) 3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3505{ 3639{
3506 *x = Pixel2Col (*x); 3640 *x = Pixel2Col (*x);
3507 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3508 *y = Pixel2Row (*y); 3642 *y = Pixel2Row (*y);
3509 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3510} 3644}
3511 3645
3512/* ------------------------------------------------------------------------- */ 3646/* ------------------------------------------------------------------------- */
3513#ifdef USE_XIM 3647#ifdef USE_XIM
3514void 3648void
3515rxvt_term::im_set_position (XPoint &pos) 3649rxvt_term::im_set_position (XPoint &pos) NOTHROW
3516{ 3650{
3517 XWindowAttributes xwa; 3651 XWindowAttributes xwa;
3518 3652
3519 XGetWindowAttributes (display->display, vt, &xwa); 3653 XGetWindowAttributes (display->display, vt, &xwa);
3520 3654
… …
3523} 3657}
3524#endif 3658#endif
3525 3659
3526#if ENABLE_OVERLAY 3660#if ENABLE_OVERLAY
3527void 3661void
3528rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3662rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3529{ 3663{
3530 if (nrow < 3 || ncol < 3) 3664 if (nrow < 1 || ncol < 1)
3531 return; 3665 return;
3532 3666
3533 want_refresh = 1; 3667 want_refresh = 1;
3534 3668
3535 scr_overlay_off (); 3669 scr_overlay_off ();
… …
3578 *rp = r; 3712 *rp = r;
3579 } 3713 }
3580} 3714}
3581 3715
3582void 3716void
3583rxvt_term::scr_overlay_off () 3717rxvt_term::scr_overlay_off () NOTHROW
3584{ 3718{
3585 if (!ov_text) 3719 if (!ov_text)
3586 return; 3720 return;
3587 3721
3588 want_refresh = 1; 3722 want_refresh = 1;
… …
3596 delete [] ov_text; ov_text = 0; 3730 delete [] ov_text; ov_text = 0;
3597 delete [] ov_rend; ov_rend = 0; 3731 delete [] ov_rend; ov_rend = 0;
3598} 3732}
3599 3733
3600void 3734void
3601rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3735rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3602{ 3736{
3603 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3604 return; 3738 return;
3605 3739
3606 x++, y++; 3740 x++, y++;
… …
3608 ov_text[y][x] = text; 3742 ov_text[y][x] = text;
3609 ov_rend[y][x] = rend; 3743 ov_rend[y][x] = rend;
3610} 3744}
3611 3745
3612void 3746void
3613rxvt_term::scr_overlay_set (int x, int y, const char *s) 3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3614{ 3748{
3615 while (*s) 3749 while (*s)
3616 scr_overlay_set (x++, y, *s++); 3750 scr_overlay_set (x++, y, *s++);
3617} 3751}
3618 3752
3619void 3753void
3620rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3621{ 3755{
3622 while (*s) 3756 while (*s)
3623 { 3757 {
3624 text_t t = *s++; 3758 text_t t = *s++;
3625 int width = wcwidth (t); 3759 int width = wcwidth (t);
… …
3631 } 3765 }
3632 } 3766 }
3633} 3767}
3634 3768
3635void 3769void
3636rxvt_term::scr_swap_overlay () 3770rxvt_term::scr_swap_overlay () NOTHROW
3637{ 3771{
3638 if (!ov_text) 3772 if (!ov_text)
3639 return; 3773 return;
3640 3774
3641 // swap screen mem with overlay 3775 // swap screen mem with overlay
3642 for (int y = ov_h; y--; ) 3776 for (int y = ov_h; y--; )
3643 { 3777 {
3644 text_t *t1 = ov_text[y]; 3778 text_t *t1 = ov_text[y];
3645 rend_t *r1 = ov_rend[y]; 3779 rend_t *r1 = ov_rend[y];
3646 3780
3647 text_t *t2 = ROW(y - view_start).t + ov_x; 3781 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3648 rend_t *r2 = ROW(y - view_start).r + ov_x; 3782 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3649 3783
3650 for (int x = ov_w; x--; ) 3784 for (int x = ov_w; x--; )
3651 { 3785 {
3652 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3786 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3653 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3787 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