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.280 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.281 by ayin, Wed Oct 31 09:55:24 2007 UTC

… …
274 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);
275 } 275 }
276 276
277 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
283 283
284 if (top_row) 284 if (top_row)
… …
328 int qcol = 0; 328 int qcol = 0;
329 329
330 // see below for cursor adjustment rationale 330 // see below for cursor adjustment rationale
331 if (p == ocur.row) 331 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 332 screen.cur.row = q - (total_rows - nrow);
333 333
334 // fill a single destination line 334 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
336 { 336 {
337 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
364 } 364 }
365 while (p != pend && q > 0); 365 while (p != pend && q > 0);
366 366
367 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
368 top_row = q - term_start; 368 top_row = q - term_start;
369 369
370 // make sure all terminal lines exist 370 // make sure all terminal lines exist
371 while (top_row > 0) 371 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 373 }
374 else 374 else
375 { 375 {
376 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
377 377
378 for (int row = min (nrow, prev_nrow); row--; ) 378 for (int row = min (nrow, prev_nrow); row--; )
379 { 379 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 381 line_t &qline = row_buf [row];
382 382
… …
664 line_t &l2 = ROW(i); 664 line_t &l2 = ROW(i);
665 665
666 ::swap (l1, l2); 666 ::swap (l1, l2);
667 l2.touch (); 667 l2.touch ();
668 } 668 }
669 669
670 // move and/or clear selection, if any 670 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
672 { 672 {
673 selection.beg.row -= count; 673 selection.beg.row -= count;
674 selection.end.row -= count; 674 selection.end.row -= count;
… …
710 { 710 {
711 /* move selected region too */ 711 /* move selected region too */
712 selection.beg.row -= count; 712 selection.beg.row -= count;
713 selection.end.row -= count; 713 selection.end.row -= count;
714 selection.mark.row -= count; 714 selection.mark.row -= count;
715 715
716 selection_check (0); 716 selection_check (0);
717 } 717 }
718 } 718 }
719 719
720 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
832 } 832 }
833 833
834 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
835 { 835 {
836 scr_do_wrap (); 836 scr_do_wrap ();
837 837
838 line->l = ncol; 838 line->l = ncol;
839 line->is_longer (1); 839 line->is_longer (1);
840 840
841 row = screen.cur.row; 841 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
… …
1060 x = i; 1060 x = i;
1061 1061
1062 if (!--count) 1062 if (!--count)
1063 break; 1063 break;
1064 } 1064 }
1065 else 1065 else
1066 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1068 1068
1069 if (count) 1069 if (count)
1070 x = ncol - 1; 1070 x = ncol - 1;
… …
1671void 1671void
1672rxvt_term::scr_report_position () NOTHROW 1672rxvt_term::scr_report_position () NOTHROW
1673{ 1673{
1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1675} 1675}
1676 1676
1677/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
1678 * FONTS * 1678 * FONTS *
1679 * ------------------------------------------------------------------------- */ 1679 * ------------------------------------------------------------------------- */
1680 1680
1681/* 1681/*
… …
1734{ 1734{
1735 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1736 set_font_style (); 1736 set_font_style ();
1737} 1737}
1738 1738
1739 1739
1740/* ------------------------------------------------------------------------- * 1740/* ------------------------------------------------------------------------- *
1741 * MAJOR SCREEN MANIPULATION * 1741 * MAJOR SCREEN MANIPULATION *
1742 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1743 1743
1744/* 1744/*
… …
2488# endif 2488# endif
2489 scr_clear (); 2489 scr_clear ();
2490 scr_touch (true); 2490 scr_touch (true);
2491 want_refresh = 1; 2491 want_refresh = 1;
2492#endif 2492#endif
2493 2493
2494} 2494}
2495 2495
2496/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2497void 2497void
2498rxvt_term::scr_clear (bool really) NOTHROW 2498rxvt_term::scr_clear (bool really) NOTHROW
… …
2605 if (write (fd, r1, 1) <= 0) 2605 if (write (fd, r1, 1) <= 0)
2606 return; /* XXX: death, no report */ 2606 return; /* XXX: death, no report */
2607 } 2607 }
2608} 2608}
2609#endif 2609#endif
2610 2610
2611/* ------------------------------------------------------------------------- * 2611/* ------------------------------------------------------------------------- *
2612 * CHARACTER SELECTION * 2612 * CHARACTER SELECTION *
2613 * ------------------------------------------------------------------------- */ 2613 * ------------------------------------------------------------------------- */
2614void 2614void
2615rxvt_term::selection_check (int check_more) NOTHROW 2615rxvt_term::selection_check (int check_more) NOTHROW
… …
2752 ct.nitems = incr_buf_fill; 2752 ct.nitems = incr_buf_fill;
2753 incr_buf = 0; 2753 incr_buf = 0;
2754 incr_buf_size = 0; 2754 incr_buf_size = 0;
2755 incr_ev.stop (); 2755 incr_ev.stop ();
2756 } 2756 }
2757 else 2757 else
2758 { 2758 {
2759 if (selection_wait == Sel_normal 2759 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 { 2761 {
2762 /* 2762 /*
… …
2840 selection_paste (win, prop, true); 2840 selection_paste (win, prop, true);
2841} 2841}
2842 2842
2843/* ------------------------------------------------------------------------- */ 2843/* ------------------------------------------------------------------------- */
2844/* 2844/*
2845 * Request the current selection: 2845 * Request the current selection:
2846 * Order: > internal selection if available 2846 * Order: > internal selection if available
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2848 * > CUT_BUFFER0 2848 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
… …
3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3129 3129
3130 while (selection.mark.col > 0 3130 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3132 --selection.mark.col;
3133 3133
3134 if (selection.op) 3134 if (selection.op)
3135 { /* clear the old selection */ 3135 { /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3136 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3137 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3138 }
… …
3657 XFree (ct.value); 3657 XFree (ct.value);
3658 } 3658 }
3659 3659
3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3661} 3661}
3662 3662
3663/* ------------------------------------------------------------------------- * 3663/* ------------------------------------------------------------------------- *
3664 * MOUSE ROUTINES * 3664 * MOUSE ROUTINES *
3665 * ------------------------------------------------------------------------- */ 3665 * ------------------------------------------------------------------------- */
3666 3666
3667/* ------------------------------------------------------------------------- */ 3667/* ------------------------------------------------------------------------- */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines