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.230 by root, Sun Jan 15 16:47:29 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() \
… …
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;
… …
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)
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);
… …
239 { 243 {
240 /* 244 /*
241 * add or delete rows as appropriate 245 * add or delete rows as appropriate
242 */ 246 */
243 247
244 printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
245
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 248 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)); 249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 250
249#if 0 251#if 0
250 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
… …
255 lfree (drawn_buf[row]); 257 lfree (drawn_buf[row]);
256 } 258 }
257 } 259 }
258#endif 260#endif
259 261
260 drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 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)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
263 264
264 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
265 { 266 {
266 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]); 268 lresize (swap_buf [row]);
… …
271 { 272 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 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); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 275 }
275 276
277 line_t *old_buf = row_buf;
276 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 279
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 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
282 int pend = MOD (term_start - nsaved, prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
283 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
284 283
285 while (p != pend && q > 0) 284 if (top_row)
285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288
289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
286 { 292 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 { 293 {
296 p = MOD (p - 1, prev_total_rows); 294 p = MOD (p - 1, prev_total_rows);
297 295#ifdef DEBUG_STRICT
298 llen += prev_ncol; 296 assert (old_buf [MOD (p, prev_total_rows)].t);
299 } 297#endif
300
301 int qlines = llen / ncol + 1;
302 int lofs = 0; 298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 300
304 q -= qlines; 301 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 { 302 {
303 p = MOD (p - 1, prev_total_rows);
304
305 plines++;
306 llen += prev_ncol;
307 }
308
309 int qlines = max (0, (llen - 1) / ncol) + 1;
310
311 // drop partial lines completely
312 if (q < qlines)
313 break;
314
315 q -= qlines;
316
317 int lofs = 0;
318 line_t *qline;
319
320 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++)
322 {
312 line_t &qline = row_buf [qrow]; 323 qline = row_buf + qrow;
313
314 lalloc (qline); 324 lalloc (*qline);
325 qline->l = ncol;
315 qline.set_is_longer (); 326 qline->is_longer (1);
316 327
317 int qcol = 0; 328 int qcol = 0;
318 329
319 for (;;) 330 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
320 { 332 {
321 int prow = lofs / prev_ncol + p; 333 int prow = lofs / prev_ncol;
322 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
323 335
336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
324 line_t &pline = old_buf [p]; 345 line_t &pline = old_buf [prow];
325 346
326 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327 348
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);
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); 349 assert (len);
350 assert (pline.t);
338 351
339 memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t)); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
340 memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t)); 353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
341 354
342 lofs += len; 355 lofs += len;
343 qcol += len; 356 qcol += len;
344
345 if (qcol == ncol)
346 break;
347 } 357 }
348 } 358 }
349 else 359
350 lofs += ncol; 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
351 } 363 }
364 while (p != pend && q > 0);
365
366 term_start = total_rows - nrow;
367 top_row = q - term_start;
368
369 // make sure all terminal lines exist
370 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 }
373 else
352 } 374 {
375 // if no scrollback exists (yet), wing, instead of wrap
376
377 for (int row = min (nrow, prev_nrow); row--; )
378 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row];
381
382 qline = pline;
383 lresize (qline);
384 }
385
386 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390
391 term_start = 0;
392 }
393
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
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
… …
369 414
370 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
371 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
372 417
373 tt_winch (); 418 tt_winch ();
419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
374} 421}
375 422
376/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
377/* 424/*
378 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
384 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
385 432
386 free (row_buf); 433 free (row_buf);
387 free (swap_buf); 434 free (swap_buf);
388 free (drawn_buf); 435 free (drawn_buf);
389 free (temp_buf);
390 free (tabs); 436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
391} 439}
392 440
393/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
394/* 442/*
395 * Hard reset 443 * Hard reset
… …
451 min_it (s->cur.row, nrow - 1); 499 min_it (s->cur.row, nrow - 1);
452 min_it (s->cur.col, ncol - 1); 500 min_it (s->cur.col, ncol - 1);
453#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
454 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
455 assert (s->cur.col >= 0); 503 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 504#endif
460} 505}
461 506
462/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
463/* 508/*
… …
483 528
484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486 531
487#if NSCREENS 532#if NSCREENS
488 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
489 { 534 {
490 num_scr = 0; 535 num_scr = 0;
491 536
492 for (int i = nrow; i--; ) 537 for (int i = prev_nrow; i--; )
493 ::swap (ROW(i), swap_buf [i]); 538 ::swap (ROW(i), swap_buf [i]);
494 539
495 ::swap (screen.charset, swap.charset); 540 ::swap (screen.charset, swap.charset);
496 ::swap (screen.flags, swap.flags); 541 ::swap (screen.flags, swap.flags);
497 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
498 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
499 } 544 }
500 else 545 else
501#endif 546#endif
502 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
503 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504 549
505 return scrn; 550 return scrn;
506} 551}
507 552
… …
527 * Change the colour for following text 572 * Change the colour for following text
528 */ 573 */
529void 574void
530rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
531{ 576{
532 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
533 color = fgbg; 578 color = fgbg;
534 579
535 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
536 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
537 else 582 else
… …
568 want_refresh = 1; 613 want_refresh = 1;
569 num_scr += count; 614 num_scr += count;
570 615
571 if (count > 0 616 if (count > 0
572 && row1 == 0 617 && row1 == 0
573 && row2 == nrow - 1
574 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575 { 619 {
576 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
621
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
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 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --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 - 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 else
682 {
683 if (selection.op && current_screen == selection.screen)
684 {
685 if ((selection.beg.row < row1 && selection.end.row > row1)
686 || (selection.beg.row < row2 && selection.end.row > row2)
687 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
688 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
689 || (selection.end.row - count < row1 && selection.end.row >= row1)
690 || (selection.end.row - count > row2 && selection.end.row <= row2))
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 696 {
615 /* move selected region too */ 697 /* move selected region too */
616 selection.beg.row -= count; 698 selection.beg.row -= count;
617 selection.end.row -= count; 699 selection.end.row -= count;
618 selection.mark.row -= count; 700 selection.mark.row -= count;
… …
626 708
627 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
628 710
629 min_it (count, rows); 711 min_it (count, rows);
630 712
713 line_t *temp_buf = row_buf + total_rows;
714
631 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
632 { 716 {
633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
634 718
635 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
646/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
647/* 731/*
648 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
649 */ 733 */
650void 734void
651rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
652{ 736{
653 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
654 return; 738 return;
655 739
656 unsigned char checksel; 740 unsigned char checksel;
657 unicode_t c; 741 unicode_t c;
658 int row, last_col; 742 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
660 744
661 want_refresh = 1; 745 want_refresh = 1;
662 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 747
665 if (nlines > 0) 748 if (minlines > 0)
666 { 749 {
667 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
668 if (nlines > 0 752 if (minlines > 0
669 && screen.tscroll == 0 753 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 754 && screen.bscroll == nrow - 1)
671 { 755 {
672 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
675 } 759 }
676 } 760 }
677 761
678#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 765 && 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 766#endif
686 row = screen.cur.row; 767 int row = screen.cur.row;
687 768
688 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
689 770
690 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
691 772
692 while (str < strend) 773 while (str < strend)
693 { 774 {
694 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
695 776
696 if (c < 0x20) 777 if (c < 0x20)
697 if (c == C0_LF) 778 if (c == C0_LF)
698 { 779 {
699 if (!line->is_longer ()) /* XXX: think about this */
700 max_it (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
701 781
702 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
703 783
704 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
705 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
709 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
710 continue; 790 continue;
711 } 791 }
712 else if (c == C0_CR) 792 else if (c == C0_CR)
713 { 793 {
714 if (!line->is_longer ()) /* XXX: think about this */
715 max_it (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
716 795
717 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
718 screen.cur.col = 0; 797 screen.cur.col = 0;
719 continue; 798 continue;
720 } 799 }
… …
737 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
738 } 817 }
739 818
740 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
741 { 820 {
821 max_it (line->l, ncol);
742 line->set_is_longer (); 822 line->is_longer (1);
743 823
744 scr_do_wrap (); 824 scr_do_wrap ();
745 825
746 row = screen.cur.row; 826 row = screen.cur.row;
747 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
755 // do wcwidth before further replacements, as wcwidth might return -1 835 // 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 836 // for the line drawing characters below as they might be invalid in the current
757 // locale. 837 // locale.
758 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
759 839
760 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
761 { 841 {
762 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
763 // 5f-7e standard vt100 843 // 5f-7e standard vt100
764 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
765 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
817 } 897 }
818 898
819 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
820 900
821 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
822 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
823 { 903 {
824 // ...output spaces 904 // ...output spaces
825 c = ' '; 905 c = ' ';
826 // and try the same character next loop iteration 906 // and try the same character next loop iteration
827 --str; 907 --str;
828 } 908 }
829 909
910 line->touch ();
911
830 do 912 do
831 { 913 {
832 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
833 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
834 916
835 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
836 screen.cur.col++; 918 screen.cur.col++;
837 else 919 else
838 { 920 {
839 line->l = last_col; 921 line->l = ncol;
840 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
841 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
842 break; 924 break;
843 } 925 }
844 926
… …
846 } 928 }
847 while (--width > 0); 929 while (--width > 0);
848 930
849 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
850 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
851 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
852 { 937 {
853 line->t[c] = ' '; 938 line->t[c] = ' ';
854 line->r[c] = rend; 939 line->r[c] = rend;
855 } 940 }
941 }
856 } 942 }
857 else // width == 0 943 else // width == 0
858 { 944 {
859#if ENABLE_COMBINING 945#if ENABLE_COMBINING
860 // handle combining characters 946 // handle combining characters
861 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
862 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
863 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
864 text_t *tp; 951 text_t *tp;
865 rend_t *rp; 952 rend_t *rp;
866 953
867 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
868 { 955 {
956 linep = line;
869 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
870 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
871
872 while (*tp == NOCHAR && tp > line->t)
873 tp--, rp--;
874 } 959 }
875 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
876 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
877 { 962 {
878 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
879
880 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
881 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
882
883 while (*tp == NOCHAR && tp > line->t)
884 tp--, rp--;
885 } 966 }
886 else 967 else
887 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
888 974
889 // first try to find a precomposed character 975 // first try to find a precomposed character
890 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
891 if (n == NOCHAR) 977 if (n == NOCHAR)
892 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
895 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
896#endif 982#endif
897 } 983 }
898 } 984 }
899 985
900 if (!line->is_longer ()) /* XXX: think about this */
901 max_it (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
902 987
903#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
904 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
905#else /* drive with your eyes closed */
906 max_it (screen.cur.row, 0);
907#endif 990#endif
908} 991}
909 992
910/* ------------------------------------------------------------------------- */ 993/* ------------------------------------------------------------------------- */
911/* 994/*
… …
950 1033
951 if (count == 0) 1034 if (count == 0)
952 return; 1035 return;
953 else if (count > 0) 1036 else if (count > 0)
954 { 1037 {
955 int row = screen.cur.row;
956
957 line_t &l = ROW(row); 1038 line_t &l = ROW(screen.cur.row);
958 rend_t base_rend = l.r[i]; 1039 rend_t base_rend = l.r[i];
959 ht &= l.t[i] == ' '; 1040 ht &= l.t[i] == ' ';
960 1041
961 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
962 if (tabs[i]) 1043 if (tabs[i])
963 { 1044 {
964 x = i; 1045 x = i;
1046
965 if (!--count) 1047 if (!--count)
966 break; 1048 break;
967 } 1049 }
968 else 1050 else
969 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
972 if (count) 1054 if (count)
973 x = ncol - 1; 1055 x = ncol - 1;
974 1056
975 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
976 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
977 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
978 { 1060 {
979 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
980 1062
981 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
982 max_it (l.l, x);
983 1064
984 i = screen.cur.col; 1065 i = screen.cur.col;
985 1066
986 l.t[i] = '\t'; 1067 l.t[i] = '\t';
987 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1037 */ 1118 */
1038#if ENABLE_FRILLS 1119#if ENABLE_FRILLS
1039void 1120void
1040rxvt_term::scr_forwardindex () 1121rxvt_term::scr_forwardindex ()
1041{ 1122{
1042 int row;
1043
1044 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1045 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1046 else 1125 else
1047 { 1126 {
1048 row = screen.cur.row; 1127 line_t &l = ROW(screen.cur.row);
1049 1128
1050 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1129 l.touch ();
1051 ROW(row).l = ncol; 1130 l.is_longer (0);
1052 1131
1053 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1054 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1055 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1056 } 1135 }
… …
1139 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1140 */ 1219 */
1141void 1220void
1142rxvt_term::scr_erase_line (int mode) 1221rxvt_term::scr_erase_line (int mode)
1143{ 1222{
1144 unsigned int row, col, num; 1223 unsigned int col, num;
1145 1224
1146 want_refresh = 1; 1225 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1148 1227
1149 selection_check (1); 1228 selection_check (1);
1150 1229
1151 row = screen.cur.row; 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1152 1234
1153 switch (mode) 1235 switch (mode)
1154 { 1236 {
1155 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1156 col = screen.cur.col; 1238 col = screen.cur.col;
1157 num = ncol - col; 1239 num = ncol - col;
1158 min_it (ROW(row).l, col); 1240 min_it (line.l, col);
1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1161 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1162 break; 1244 break;
1163 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
… …
1168 CLEAR_SELECTION (); 1250 CLEAR_SELECTION ();
1169 break; 1251 break;
1170 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1171 col = 0; 1253 col = 0;
1172 num = ncol; 1254 num = ncol;
1173 ROW(row).l = 0; 1255 line.l = 0;
1174 if (selection.beg.row <= screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1175 && selection.end.row >= screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1176 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1177 break; 1259 break;
1178 default: 1260 default:
1179 return; 1261 return;
1180 } 1262 }
1181 1263
1182 scr_blank_line (ROW(row), col, num, rstyle); 1264 scr_blank_line (line, col, num, rstyle);
1183} 1265}
1184 1266
1185/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1186/* 1268/*
1187 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
… …
1242 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1243 } 1325 }
1244 else 1326 else
1245 { 1327 {
1246 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1247 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1248 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1250 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1251 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1252 } 1334 }
1253 1335
1254 for (; num--; row++) 1336 for (; num--; row++)
1255 { 1337 {
1256 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1257 ROW (row).l = 0;
1258 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1259 } 1340 }
1260} 1341}
1261 1342
1262#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1264rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1265{ 1346{
1266 want_refresh = 1; 1347 want_refresh = 1;
1267 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1268 1349
1269 nsaved = 0; 1350 top_row = 0;
1270} 1351}
1271#endif 1352#endif
1272 1353
1273/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1274/* 1355/*
… …
1295 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1296 1377
1297 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1298 *r1++ = fs; 1379 *r1++ = fs;
1299 1380
1300 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1301 } 1383 }
1302} 1384}
1303 1385
1304/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1305/* 1387/*
… …
1353 min_it (count, ncol - screen.cur.col); 1435 min_it (count, ncol - screen.cur.col);
1354 1436
1355 row = screen.cur.row; 1437 row = screen.cur.row;
1356 1438
1357 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1358 1443
1359 switch (insdel) 1444 switch (insdel)
1360 { 1445 {
1361 case INSERT: 1446 case INSERT:
1362 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1363 { 1448 {
1364 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1365 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1366 } 1451 }
1367 1452
1368 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1369 {
1370 line->l += count;
1371 min_it (line->l, ncol);
1372 }
1373 1454
1374 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1376 { 1457 {
1377 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1390 1471
1391 case ERASE: 1472 case ERASE:
1392 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1393 selection_check (1); 1474 selection_check (1);
1394 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1395 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1396 break; 1479 break;
1397 1480
1398 case DELETE: 1481 case DELETE:
1399 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1402 { 1485 {
1403 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1404 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1405 } 1488 }
1406 1489
1490 line->l = max (line->l - count, 0);
1407 scr_blank_line (*line, ncol - count, count, tr); 1491 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 1492
1414 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1415 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1416 { 1495 {
1417 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1529rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1530{ 1609{
1531 if (mode < 0) 1610 if (mode < 0)
1532 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1533 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1534 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1535} 1614}
1536 1615
1537/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1538/* 1617/*
1539 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1552#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1553 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1554#endif 1633#endif
1555#if TRANSPARENT 1634#if TRANSPARENT
1556 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1557#endif 1636#endif
1558 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1559 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1560 1639
1561 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1586 * Set font style 1665 * Set font style
1587 */ 1666 */
1588void 1667void
1589rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1590{ 1669{
1670#if 0
1591 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1592 { 1672 {
1593 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1594 break; 1674 break;
1595 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1596 break; 1676 break;
… …
1603 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1604 break; 1684 break;
1605 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1606 break; 1686 break;
1607 } 1687 }
1688#endif
1608} 1689}
1609 1690
1610/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1611/* 1692/*
1612 * Choose a font 1693 * Choose a font
… …
1691 y = 0; 1772 y = 0;
1692 eheight = height; 1773 eheight = height;
1693 } 1774 }
1694#endif 1775#endif
1695 1776
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
1703
1704 /* round down */ 1777 /* round down */
1705 rc[PART_BEG].col = Pixel2Col (x); 1778 rc[PART_BEG].col = Pixel2Col (x);
1706 rc[PART_BEG].row = Pixel2Row (y); 1779 rc[PART_BEG].row = Pixel2Row (y);
1707 /* round up */ 1780 /* round up */
1708 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); 1781 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
… …
1735/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1736/* 1809/*
1737 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1738 * the top of the screen 1811 * the top of the screen
1739 */ 1812 */
1740int 1813void
1741rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1742{ 1815{
1743 long p = 0; 1816 int p = len
1744 unsigned int oldviewstart; 1817 ? (top_row - nrow) * (len - y) / len + (nrow - 1)
1818 : 0;
1745 1819
1746 oldviewstart = view_start; 1820 scr_changeview (p);
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} 1821}
1759 1822
1760/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1761/* 1824/*
1762 * Page the screen up/down nlines 1825 * Page the screen up/down nlines
1763 * direction should be UP or DN 1826 * direction should be UP or DN
1764 */ 1827 */
1765int 1828bool
1766rxvt_term::scr_page (enum page_dirn direction, int nlines) 1829rxvt_term::scr_page (enum page_dirn direction, int nlines)
1767{ 1830{
1768 int n; 1831 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; 1832 direction == UP ? view_start - nlines
1781 view_start = max (n, 0); 1833 : view_start + nlines;
1782 }
1783 1834
1784 return scr_changeview (oldviewstart); 1835 return scr_changeview (new_view_start);
1785} 1836}
1786 1837
1787int 1838bool
1788rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (int new_view_start)
1789{ 1840{
1841 clamp_it (new_view_start, top_row, 0);
1842
1790 if (view_start != oldviewstart) 1843 if (new_view_start == view_start)
1791 { 1844 return false;
1845
1846 num_scr += new_view_start - view_start;
1847 view_start = new_view_start;
1848 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1792 want_refresh = 1; 1849 want_refresh = 1;
1793 num_scr -= (view_start - oldviewstart);
1794 }
1795 1850
1796 return (int) (view_start - oldviewstart); 1851 return true;
1797} 1852}
1798 1853
1799/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1800void 1855void
1801rxvt_term::scr_bell () 1856rxvt_term::scr_bell ()
1802{ 1857{
1803#ifndef NO_BELL 1858#ifndef NO_BELL
1804 1859
1805# ifndef NO_MAPALERT 1860# ifndef NO_MAPALERT
1806# ifdef MAPALERT_OPTION 1861# ifdef MAPALERT_OPTION
1807 if (options & Opt_mapAlert) 1862 if (OPTION (Opt_mapAlert))
1808# endif 1863# endif
1809 XMapWindow (display->display, parent[0]); 1864 XMapWindow (display->display, parent[0]);
1810# endif 1865# endif
1811 1866
1812 if (options & Opt_visualBell) 1867 if (OPTION (Opt_visualBell))
1813 { 1868 {
1814 scr_rvideo_mode (!rvideo); /* refresh also done */ 1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 display->flush ();
1815 rxvt_usleep (VISUAL_BELL_DURATION); 1871 rxvt_usleep (VISUAL_BELL_DURATION);
1816 scr_rvideo_mode (!rvideo); /* refresh also done */ 1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1817 } 1873 }
1818 else 1874 else
1819 XBell (display->display, 0); 1875 XBell (display->display, 0);
… …
1833 if ((fd = popen_printer ()) == NULL) 1889 if ((fd = popen_printer ()) == NULL)
1834 return; 1890 return;
1835 1891
1836 if (fullhist) 1892 if (fullhist)
1837 { 1893 {
1838 nrows = nrow + nsaved; 1894 nrows = nrow - top_row;
1839 row_start = -nsaved; 1895 row_start = top_row;
1840 } 1896 }
1841 else 1897 else
1842 { 1898 {
1843 nrows = nrow; 1899 nrows = nrow;
1844 row_start = -view_start; 1900 row_start = view_start;
1845 } 1901 }
1846 1902
1847 wctomb (0, 0); 1903 wctomb (0, 0);
1848 1904
1849 for (int r1 = 0; r1 < nrows; r1++) 1905 for (int r1 = 0; r1 < nrows; r1++)
… …
1908 1964
1909#if XPM_BACKGROUND 1965#if XPM_BACKGROUND
1910 must_clear |= bgPixmap.pixmap != None; 1966 must_clear |= bgPixmap.pixmap != None;
1911#endif 1967#endif
1912#if TRANSPARENT 1968#if TRANSPARENT
1913 must_clear |= (options & Opt_transparent) && am_transparent; 1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1914#endif 1970#endif
1915 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1916 1972
1917 /* 1973 /*
1918 * B: reverse any characters which are selected 1974 * B: reverse any characters which are selected
… …
1942 1998
1943 crp = &ROW(screen.cur.row).r[col]; 1999 crp = &ROW(screen.cur.row).r[col];
1944 2000
1945 if (showcursor && focus) 2001 if (showcursor && focus)
1946 { 2002 {
1947 if (options & Opt_cursorUnderline) 2003 if (OPTION (Opt_cursorUnderline))
1948 *crp ^= RS_Uline; 2004 *crp ^= RS_Uline;
1949 else 2005 else
1950 { 2006 {
1951 *crp ^= RS_RVid; 2007 *crp ^= RS_RVid;
1952 2008
… …
1954 cc1 = *crp & (RS_fgMask | RS_bgMask); 2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
1955 if (ISSET_PIXCOLOR (Color_cursor)) 2011 if (ISSET_PIXCOLOR (Color_cursor))
1956 ccol1 = Color_cursor; 2012 ccol1 = Color_cursor;
1957 else 2013 else
1958#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1959 ccol1 = GET_FGCOLOR (rstyle); 2015 ccol1 = fgcolor_of (rstyle);
1960#else 2016#else
1961 ccol1 = Color_fg; 2017 ccol1 = Color_fg;
1962#endif 2018#endif
1963 if (ISSET_PIXCOLOR (Color_cursor2)) 2019 if (ISSET_PIXCOLOR (Color_cursor2))
1964 ccol2 = Color_cursor2; 2020 ccol2 = Color_cursor2;
1965 else 2021 else
1966#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1967 ccol2 = GET_BGCOLOR (rstyle); 2023 ccol2 = bgcolor_of (rstyle);
1968#else 2024#else
1969 ccol2 = Color_bg; 2025 ccol2 = Color_bg;
1970#endif 2026#endif
1971 *crp = SET_FGCOLOR (*crp, ccol1); 2027 *crp = SET_FGCOLOR (*crp, ccol1);
1972 *crp = SET_BGCOLOR (*crp, ccol2); 2028 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1977 2033
1978 /* make sure no outline cursor is left around */ 2034 /* make sure no outline cursor is left around */
1979 setoldcursor = 0; 2035 setoldcursor = 0;
1980 if (ocrow != -1) 2036 if (ocrow != -1)
1981 { 2037 {
1982 if (screen.cur.row + view_start != ocrow 2038 if (screen.cur.row - view_start != ocrow
1983 || screen.cur.col != oldcursor.col) 2039 || screen.cur.col != oldcursor.col)
1984 { 2040 {
1985 if (ocrow < nrow 2041 if (ocrow < nrow
1986 && oldcursor.col < ncol) 2042 && oldcursor.col < ncol)
1987 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
1995 else if (!focus) 2051 else if (!focus)
1996 setoldcursor = 1; 2052 setoldcursor = 1;
1997 2053
1998 if (setoldcursor) 2054 if (setoldcursor)
1999 { 2055 {
2000 if (screen.cur.row + view_start >= nrow) 2056 if (screen.cur.row - view_start >= nrow)
2001 oldcursor.row = -1; 2057 oldcursor.row = -1;
2002 else 2058 else
2003 { 2059 {
2004 oldcursor.row = screen.cur.row + view_start; 2060 oldcursor.row = screen.cur.row - view_start;
2005 oldcursor.col = screen.cur.col; 2061 oldcursor.col = screen.cur.col;
2006 } 2062 }
2007 } 2063 }
2008 } 2064 }
2009 2065
2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2010#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2011 scr_swap_overlay (); 2068 scr_swap_overlay ();
2012#endif 2069#endif
2013 2070
2014#ifndef NO_SLOW_LINK_SUPPORT 2071#ifndef NO_SLOW_LINK_SUPPORT
… …
2030 row = i > 0 ? 0 : j - 1; 2087 row = i > 0 ? 0 : j - 1;
2031 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2032 { 2089 {
2033 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2034 { 2091 {
2035 line_t s = ROW(row - view_start); 2092 line_t s = ROW(view_start + row);
2036 line_t d = drawn_buf[row]; 2093 line_t d = drawn_buf[row];
2037 line_t d2 = drawn_buf[row + i]; 2094 line_t d2 = drawn_buf[row + i];
2038 2095
2039 for (nits = 0, col = ncol; col--; ) 2096 for (nits = 0, col = ncol; col--; )
2040 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2097 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2064 if (wlen < len) 2121 if (wlen < len)
2065 ::swap (wlen, len); 2122 ::swap (wlen, len);
2066 2123
2067 XCopyArea (display->display, vt, vt, 2124 XCopyArea (display->display, vt, vt,
2068 gc, 0, Row2Pixel (len + i), 2125 gc, 0, Row2Pixel (len + i),
2069 (unsigned int)TermWin_TotalWidth (), 2126 (unsigned int)this->width,
2070 (unsigned int)Height2Pixel (wlen - len + 1), 2127 (unsigned int)Height2Pixel (wlen - len + 1),
2071 0, Row2Pixel (len)); 2128 0, Row2Pixel (len));
2072 len = -1; 2129 len = -1;
2073 } 2130 }
2074 } 2131 }
… …
2078 /* 2135 /*
2079 * E: main pass across every character 2136 * E: main pass across every character
2080 */ 2137 */
2081 for (row = 0; row < nrow; row++) 2138 for (row = 0; row < nrow; row++)
2082 { 2139 {
2083 text_t *stp = ROW(row - view_start).t; 2140 text_t *stp = ROW(view_start + row).t;
2084 rend_t *srp = ROW(row - view_start).r; 2141 rend_t *srp = ROW(view_start + row).r;
2085 text_t *dtp = drawn_buf[row].t; 2142 text_t *dtp = drawn_buf[row].t;
2086 rend_t *drp = drawn_buf[row].r; 2143 rend_t *drp = drawn_buf[row].r;
2087 2144
2088 /* 2145 /*
2089 * E2: OK, now the real pass 2146 * E2: OK, now the real pass
… …
2153 count++, i--; 2210 count++, i--;
2154 2211
2155 /* 2212 /*
2156 * Determine the attributes for the string 2213 * Determine the attributes for the string
2157 */ 2214 */
2158 int fore = GET_FGCOLOR (rend); // desired foreground 2215 int fore = fgcolor_of (rend); // desired foreground
2159 int back = GET_BGCOLOR (rend); // desired background 2216 int back = bgcolor_of (rend); // desired background
2160 2217
2161 // only do special processing if any attributes are set, which is rare 2218 // 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)) 2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2163 { 2220 {
2164#if ENABLE_STYLES 2221#if ENABLE_STYLES
2165 // force redraw after "careful" characters to avoid pixel droppings 2222 // force redraw after "careful" characters to avoid pixel droppings
2166 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2277 } /* for (row....) */ 2334 } /* for (row....) */
2278 2335
2279#if ENABLE_OVERLAY 2336#if ENABLE_OVERLAY
2280 scr_swap_overlay (); 2337 scr_swap_overlay ();
2281#endif 2338#endif
2339 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2282 2340
2283 /* 2341 /*
2284 * G: cleanup cursor and display outline cursor if necessary 2342 * G: cleanup cursor and display outline cursor if necessary
2285 */ 2343 */
2286 if (showcursor) 2344 if (showcursor)
2287 { 2345 {
2288 if (focus) 2346 if (focus)
2289 { 2347 {
2290 if (options & Opt_cursorUnderline) 2348 if (OPTION (Opt_cursorUnderline))
2291 *crp ^= RS_Uline; 2349 *crp ^= RS_Uline;
2292 else 2350 else
2293 { 2351 {
2294 *crp ^= RS_RVid; 2352 *crp ^= RS_RVid;
2295#ifndef NO_CURSORCOLOR 2353#ifndef NO_CURSORCOLOR
… …
2325 /* 2383 /*
2326 * H: cleanup selection 2384 * H: cleanup selection
2327 */ 2385 */
2328 scr_reverse_selection (); 2386 scr_reverse_selection ();
2329 2387
2330 if (refresh_type & SMOOTH_REFRESH)
2331 XFlush (display->display);
2332
2333 num_scr = 0; 2388 num_scr = 0;
2334 num_scr_allow = 1; 2389 num_scr_allow = 1;
2335} 2390}
2336 2391
2337void 2392void
2338rxvt_term::scr_remap_chars (const line_t &l) 2393rxvt_term::scr_remap_chars (line_t &l)
2339{ 2394{
2340 if (!l.t) 2395 if (!l.t)
2341 return; 2396 return;
2397
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2342 2399
2343 for (int i = ncol; i--; ) 2400 for (int i = ncol; i--; )
2344 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2345} 2402}
2346 2403
… …
2399 2456
2400 if (really) 2457 if (really)
2401 XClearWindow (display->display, vt); 2458 XClearWindow (display->display, vt);
2402} 2459}
2403 2460
2461void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2463{
2464 int view_end = view_start + nrow;
2465 int row, col;
2466
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2472 for (col = beg_col; col < end_col; col++)
2473 srp[col] ^= rstyle1;
2474
2475 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= rstyle2;
2477
2478 if (++col < end_col)
2479 srp[col] ^= rstyle2;
2480 }
2481}
2482
2483void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2485{
2486 int view_end = view_start + nrow;
2487 int row, col;
2488
2489 if (beg_row >= view_start)
2490 {
2491 col = beg_col;
2492 row = beg_row;
2493 }
2494 else
2495 {
2496 col = 0;
2497 row = view_start;
2498 }
2499
2500 for (; row < min (end_row, view_end); row++, col = 0)
2501 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2502 srp[col] ^= rstyle;
2503
2504 if (row == end_row)
2505 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2506 srp[col] ^= rstyle;
2507}
2508
2404/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2405void 2510void
2406rxvt_term::scr_reverse_selection () 2511rxvt_term::scr_reverse_selection ()
2407{ 2512{
2408 if (selection.op 2513 if (selection.op
2409 && current_screen == selection.screen 2514 && current_screen == selection.screen
2410 && selection.end.row >= -view_start) 2515 && selection.end.row >= view_start)
2411 { 2516 {
2412 int view_end = -view_start + nrow;
2413 int row, col;
2414
2415#if ENABLE_FRILLS 2517#if ENABLE_FRILLS
2416 if (selection.rect) 2518 if (selection.rect)
2417 { 2519 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++) 2520 selection.end.row, selection.end.col,
2419 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2521 RS_RVid, RS_RVid | RS_Uline);
2420 srp[col] ^= RS_RVid;
2421 }
2422 else 2522 else
2423#endif 2523#endif
2424 { 2524 scr_xor_span (selection.beg.row, selection.beg.col,
2425 if (selection.beg.row >= -view_start) 2525 selection.end.row, selection.end.col,
2426 { 2526 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 } 2527 }
2445} 2528}
2446 2529
2447/* ------------------------------------------------------------------------- */ 2530/* ------------------------------------------------------------------------- */
2448/* 2531/*
… …
2486 2569
2487 if (!selection.op) 2570 if (!selection.op)
2488 return; 2571 return;
2489 2572
2490 pos.row = pos.col = 0; 2573 pos.row = pos.col = 0;
2491 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2492 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2493 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2494 || (check_more == 1 2577 || (check_more == 1
2495 && current_screen == selection.screen 2578 && current_screen == selection.screen
2496 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2497 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2498 || (check_more == 2 2581 || (check_more == 2
… …
2509/* ------------------------------------------------------------------------- */ 2592/* ------------------------------------------------------------------------- */
2510/* 2593/*
2511 * Paste a selection direct to the command fd 2594 * Paste a selection direct to the command fd
2512 */ 2595 */
2513void 2596void
2514rxvt_term::paste (unsigned char *data, unsigned int len) 2597rxvt_term::paste (char *data, unsigned int len)
2515{ 2598{
2516 /* convert normal newline chars into common keyboard Return key sequence */ 2599 /* convert normal newline chars into common keyboard Return key sequence */
2517 for (unsigned int i = 0; i < len; i++) 2600 for (unsigned int i = 0; i < len; i++)
2518 if (data[i] == C0_LF) 2601 if (data[i] == C0_LF)
2519 data[i] = C0_CR; 2602 data[i] = C0_CR;
… …
2663 { 2746 {
2664 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2665 char *s = rxvt_wcstombs (w); 2748 char *s = rxvt_wcstombs (w);
2666 free (w); 2749 free (w);
2667 // TODO: strlen == only the first element will be converted. well... 2750 // TODO: strlen == only the first element will be converted. well...
2668 paste ((unsigned char *)s, strlen (s)); 2751 paste (s, strlen (s));
2669 free (s); 2752 free (s);
2670 } 2753 }
2671 else 2754 else
2672#endif 2755#endif
2673 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2674 && cl) 2757 && cl)
2675 { 2758 {
2676 for (int i = 0; i < cr; i++) 2759 for (int i = 0; i < cr; i++)
2677 paste ((unsigned char *)cl[i], strlen (cl[i])); 2760 paste (cl[i], strlen (cl[i]));
2678 2761
2679 XFreeStringList (cl); 2762 XFreeStringList (cl);
2680 } 2763 }
2681 else 2764 else
2682 paste (ct.value, ct.nitems); // paste raw 2765 paste ((char *)ct.value, ct.nitems); // paste raw
2683 2766
2684bailout: 2767bailout:
2685 XFree (ct.value); 2768 XFree (ct.value);
2686 2769
2687 if (selection_wait == Sel_normal) 2770 if (selection_wait == Sel_normal)
… …
2725 return; /* outside window */ 2808 return; /* outside window */
2726 2809
2727 if (selection.text) 2810 if (selection.text)
2728 { /* internal selection */ 2811 { /* internal selection */
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2812 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2813 paste (str, strlen (str));
2731 free (str); 2814 free (str);
2732 return; 2815 return;
2733 } 2816 }
2734 else 2817 else
2735 { 2818 {
… …
2827 selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2828 2911
2829 if (selection.clicks == 4) 2912 if (selection.clicks == 4)
2830 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2831 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2832 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2918 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2833 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2919 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2834 2920
2835 int ofs = 0; 2921 int ofs = 0;
2836 int extra = 0; 2922 int extra = 0;
… …
2848 col = selection.beg.col; 2934 col = selection.beg.col;
2849 end_col = ncol + 1; 2935 end_col = ncol + 1;
2850 } 2936 }
2851 else 2937 else
2852#endif 2938#endif
2853 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2939 end_col = ROW(row).l;
2854 2940
2855 col = max (col, 0); 2941 col = max (col, 0);
2856 2942
2857 if (row == selection.end.row || selection.rect) 2943 if (row == selection.end.row
2944#if ENABLE_FRILLS
2945 || selection.rect
2946#endif
2947 )
2858 end_col = min (end_col, selection.end.col); 2948 min_it (end_col, selection.end.col);
2859 2949
2860 t = ROW(row).t + col; 2950 t = ROW(row).t + col;
2951
2861 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2862 { 2953 {
2863 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2864 t++; 2955 t++;
2865#if ENABLE_COMBINING 2956#if ENABLE_COMBINING
… …
2881#endif 2972#endif
2882 else 2973 else
2883 new_selection_text[ofs++] = *t++; 2974 new_selection_text[ofs++] = *t++;
2884 } 2975 }
2885 2976
2977#if ENABLE_FRILLS
2978 if (selection.rect)
2979 {
2980 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1]))
2983 --ofs;
2984
2985 new_selection_text[ofs++] = C0_LF;
2986 }
2987 else
2988#endif
2886 if (!ROW(row).is_longer () && row != selection.end.row) 2989 if (!ROW(row).is_longer () && row != selection.end.row)
2887 new_selection_text[ofs++] = C0_LF; 2990 new_selection_text[ofs++] = C0_LF;
2888 } 2991 }
2889 2992
2890 if (end_col != selection.end.col) 2993 if (end_col != selection.end.col)
2891 new_selection_text[ofs++] = C0_LF; 2994 new_selection_text[ofs++] = C0_LF;
2892 2995
… …
2902 3005
2903 // we usually allocate much more than necessary, so realloc it smaller again 3006 // we usually allocate much more than necessary, so realloc it smaller again
2904 selection.len = ofs; 3007 selection.len = ofs;
2905 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3008 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2906 3009
3010 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3011 return;
3012
3013 selection_grab (tm);
3014}
3015
3016bool
3017rxvt_term::selection_grab (Time tm)
3018{
3019 selection_time = tm;
3020
2907 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2908 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 {
2909 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3025 return true;
3026 }
2910 else 3027 else
2911 rxvt_warn ("can't get primary selection, ignoring.\n"); 3028 {
3029 selection_clear ();
3030 return false;
3031 }
2912 3032
2913#if 0 3033#if 0
2914 XTextProperty ct; 3034 XTextProperty ct;
2915 3035
2916 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2917 { 3037 {
2918 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2919 XFree (ct.value); 3039 XFree (ct.value);
2920 } 3040 }
2921#endif 3041#endif
2922
2923 selection_time = tm;
2924} 3042}
2925 3043
2926/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
2927/* 3045/*
2928 * Mark or select text based upon number of clicks: 1, 2, or 3 3046 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2932rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
2933{ 3051{
2934 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
2935 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
2936 3054
3055 if (clicks == 2 && !selection.rect
3056 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3057 {
3058 MEvent.clicks = 1; // what a mess
3059 selection.screen = current_screen;
3060 selection.op = SELECTION_CONT;
3061 return;
3062 }
3063
2937 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2938 3065
2939 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
2940 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
2941 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
2942 0, /* button 3 */ 3069 0, /* button 3 */
2943 1, /* button press */ 3070 1, /* button press */
2944 0); /* click change */ 3071 0); /* click change */
2945} 3072}
2946 3073
… …
2951void 3078void
2952rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
2953{ 3080{
2954 want_refresh = 1; 3081 want_refresh = 1;
2955 3082
2956 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
2957 selection.mark.col = col; 3084 selection.mark.col = col;
2958 3085
2959 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2960 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2961 3088
2962 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
2963 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2964 --selection.mark.col; 3091 --selection.mark.col;
… …
2992 text_t *stp; 3119 text_t *stp;
2993 rend_t *srp; 3120 rend_t *srp;
2994 3121
2995 if (dirn == UP) 3122 if (dirn == UP)
2996 { 3123 {
2997 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
2998 bound.col = 0; 3125 bound.col = 0;
2999 dirnadd = -1; 3126 dirnadd = -1;
3000 } 3127 }
3001 else 3128 else
3002 { 3129 {
… …
3050 } 3177 }
3051 } 3178 }
3052 break; 3179 break;
3053 } 3180 }
3054 3181
3055Old_Word_Selection_You_Die:
3056 if (dirn == DN) 3182 if (dirn == DN)
3057 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
3058 3184
3059 /* Poke the values back in */ 3185 /* Poke the values back in */
3060 ret->row = row; 3186 ret->row = row;
… …
3081 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * 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. 3208 * be _past_ a character for it to be selected.
3083 */ 3209 */
3084 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3085 && (col == selection.mark.col 3211 && (col == selection.mark.col
3086 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3087 { 3213 {
3088 /* select nothing */ 3214 /* select nothing */
3089 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3090 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3091 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3146 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3147 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3148 } 3274 }
3149 3275
3150 pos.col = col; 3276 pos.col = col;
3151 pos.row = row - view_start; 3277 pos.row = view_start + row;
3152 3278
3153 /* 3279 /*
3154 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3155 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3156 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3243 selection_delimit_word (DN, &selection.end, &selection.end); 3369 selection_delimit_word (DN, &selection.end, &selection.end);
3244 } 3370 }
3245 else if (selection.clicks == 3) 3371 else if (selection.clicks == 3)
3246 { 3372 {
3247#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3248 if (options & Opt_tripleclickwords) 3374 if (OPTION (Opt_tripleclickwords))
3249 { 3375 {
3250 selection_delimit_word (UP, &selection.beg, &selection.beg); 3376 selection_delimit_word (UP, &selection.beg, &selection.beg);
3251 3377
3252 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3253 { 3379 {
… …
3314 { 3440 {
3315 stp = ROW(end_row).t; 3441 stp = ROW(end_row).t;
3316 3442
3317 while (--end_col >= 0) 3443 while (--end_col >= 0)
3318 { 3444 {
3319 if (stp[end_col] != ' ' 3445 if (stp[end_col] != NOCHAR
3320 && stp[end_col] != '\t' 3446 && !unicode::is_space (stp[end_col]))
3321 && stp[end_col] != NOCHAR)
3322 break; 3447 break;
3323 } 3448 }
3324 3449
3325 if (end_col >= 0 3450 if (end_col >= 0
3326 || !ROW(end_row - 1).is_longer ()) 3451 || !ROW(end_row - 1).is_longer ())
… …
3525 3650
3526#if ENABLE_OVERLAY 3651#if ENABLE_OVERLAY
3527void 3652void
3528rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3653rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3529{ 3654{
3530 if (nrow < 3 || ncol < 3) 3655 if (nrow < 1 || ncol < 1)
3531 return; 3656 return;
3532 3657
3533 want_refresh = 1; 3658 want_refresh = 1;
3534 3659
3535 scr_overlay_off (); 3660 scr_overlay_off ();
… …
3642 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3643 { 3768 {
3644 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3645 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3646 3771
3647 text_t *t2 = ROW(y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3648 rend_t *r2 = ROW(y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3649 3774
3650 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3651 { 3776 {
3652 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3653 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3778 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