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.279 by sasha, Tue Sep 18 22:01:36 2007 UTC vs.
Revision 1.297 by root, Wed Jan 9 01:14:29 2008 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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
… …
596/* 596/*
597 * Change the rendition style for following text 597 * Change the rendition style for following text
598 */ 598 */
599void 599void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 600rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 601{
602 if (set) 602 if (set)
603 rstyle |= style; 603 rstyle |= style;
604 else if (style == ~RS_None) 604 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
606 else 606 else
607 rstyle &= ~style; 607 rstyle &= ~style;
608 } 608}
609 609
610/* ------------------------------------------------------------------------- */ 610/* ------------------------------------------------------------------------- */
611/* 611/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 613 * count positive ==> scroll up
… …
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 */
… …
1011 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
1012 */ 1012 */
1013void 1013void
1014rxvt_term::scr_backspace () NOTHROW 1014rxvt_term::scr_backspace () NOTHROW
1015{ 1015{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1019 { 1017 {
1020 if (screen.cur.row > 0) 1018 if (screen.cur.row > 0)
1021 { 1019 {
1022#ifdef TERMCAP_HAS_BW 1020#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1021 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1022 --screen.cur.row;
1025 return; 1023
1024 want_refresh = 1;
1026#endif 1025#endif
1027 } 1026 }
1028 } 1027 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1028 else
1030 scr_gotorc (0, -1, RELATIVE); 1029 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1030}
1034 1031
1035/* ------------------------------------------------------------------------- */ 1032/* ------------------------------------------------------------------------- */
1036/* 1033/*
1037 * Process Horizontal Tab 1034 * Process Horizontal Tab
… …
1060 x = i; 1057 x = i;
1061 1058
1062 if (!--count) 1059 if (!--count)
1063 break; 1060 break;
1064 } 1061 }
1065 else 1062 else
1066 ht &= l.t[i] == ' ' 1063 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1064 && RS_SAME (l.r[i], base_rend);
1068 1065
1069 if (count) 1066 if (count)
1070 x = ncol - 1; 1067 x = ncol - 1;
… …
1186 } 1183 }
1187 } 1184 }
1188 else 1185 else
1189 { 1186 {
1190 if (screen.flags & Screen_Relative) 1187 if (screen.flags & Screen_Relative)
1188 {
1191 { /* relative origin mode */ 1189 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1190 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1191 min_it (screen.cur.row, screen.bscroll);
1194 } 1192 }
1195 else 1193 else
1196 screen.cur.row = row; 1194 screen.cur.row = row;
… …
1472 { 1470 {
1473 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1472 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1473 CLEAR_SELECTION ();
1476 else 1474 else
1475 {
1477 { /* shift selection */ 1476 /* shift selection */
1478 selection.beg.col += count; 1477 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1478 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1479 selection.end.col += count;
1481 } 1480 }
1482 } 1481 }
… …
1866 return true; 1865 return true;
1867} 1866}
1868 1867
1869#ifndef NO_BELL 1868#ifndef NO_BELL
1870void 1869void
1871rxvt_term::bell_cb (time_watcher &w) 1870rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1871{
1873 rvideo_bell = false; 1872 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1873 scr_rvideo_mode (rvideo_mode);
1874 refresh_check ();
1875} 1875}
1876#endif 1876#endif
1877 1877
1878/* ------------------------------------------------------------------------- */ 1878/* ------------------------------------------------------------------------- */
1879void 1879void
… …
1901 1901
1902 if (option (Opt_visualBell)) 1902 if (option (Opt_visualBell))
1903 { 1903 {
1904 rvideo_bell = true; 1904 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1906 flush ();
1907 1907
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1908 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1909 }
1910 else 1910 else
1911 XBell (dpy, 0); 1911 XBell (dpy, 0);
1912#endif 1912#endif
1913} 1913}
… …
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2262 { 2262 {
2263 bool invert = rend & RS_RVid; 2263 bool invert = rend & RS_RVid;
2264 2264
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2265#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2266 if (rend & RS_Bold && fore == Color_fg)
2268 { 2267 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2268 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2269 fore = Color_BD;
2271# if !ENABLE_STYLES 2270# if !ENABLE_STYLES
2272 else 2271 else
2273 invert = !invert; 2272 invert = !invert;
2274# endif 2273# endif
2275 } 2274 }
2276 2275
2277 if (rend & RS_Italic 2276 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2277 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2278 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2279 fore = Color_IT;
2282# if !ENABLE_STYLES 2280# if !ENABLE_STYLES
2283 else 2281 else
… …
2317 } 2315 }
2318 2316
2319#ifdef TEXT_BLINK 2317#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2318 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2319 {
2322 if (!text_blink_ev.active) 2320 if (!text_blink_ev.is_active ())
2323 { 2321 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2322 text_blink_ev.again ();
2325 hidden_text = 0; 2323 hidden_text = 0;
2326 } 2324 }
2327 else if (hidden_text) 2325 else if (hidden_text)
2328 fore = back; 2326 fore = back;
2329 } 2327 }
… …
2473rxvt_term::scr_recolour () NOTHROW 2471rxvt_term::scr_recolour () NOTHROW
2474{ 2472{
2475#ifdef HAVE_BG_PIXMAP 2473#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2474 bgPixmap.apply ();
2477#else 2475#else
2476
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2478 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2480
2481# if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2482 if (scrollBar.win) 2482 if (scrollBar.win)
2483 { 2483 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2486 scrollbar_show (0); 2486 scrollbar_show (0);
2487 } 2487 }
2488# endif 2488# endif
2489
2489 scr_clear (); 2490 scr_clear ();
2490 scr_touch (true); 2491 scr_touch (true);
2491 want_refresh = 1; 2492 want_refresh = 1;
2493
2492#endif 2494#endif
2493
2494} 2495}
2495 2496
2496/* ------------------------------------------------------------------------- */ 2497/* ------------------------------------------------------------------------- */
2497void 2498void
2498rxvt_term::scr_clear (bool really) NOTHROW 2499rxvt_term::scr_clear (bool really) NOTHROW
… …
2733 if (!delete_prop) 2734 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop); 2735 XDeleteProperty (dpy, win, prop);
2735 2736
2736 selection_wait = Sel_incr; 2737 selection_wait = Sel_incr;
2737 incr_buf_fill = 0; 2738 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10); 2739 incr_ev.start (10);
2739 2740
2740 goto bailout; 2741 goto bailout;
2741 } 2742 }
2742 2743
2743 if (ct.nitems == 0) 2744 if (ct.nitems == 0)
… …
2752 ct.nitems = incr_buf_fill; 2753 ct.nitems = incr_buf_fill;
2753 incr_buf = 0; 2754 incr_buf = 0;
2754 incr_buf_size = 0; 2755 incr_buf_size = 0;
2755 incr_ev.stop (); 2756 incr_ev.stop ();
2756 } 2757 }
2757 else 2758 else
2758 { 2759 {
2759 if (selection_wait == Sel_normal 2760 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2761 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 { 2762 {
2762 /* 2763 /*
… …
2769 goto bailout; 2770 goto bailout;
2770 } 2771 }
2771 } 2772 }
2772 else if (selection_wait == Sel_incr) 2773 else if (selection_wait == Sel_incr)
2773 { 2774 {
2774 incr_ev.start (NOW + 10); 2775 incr_ev.start (10);
2775 2776
2776 while (incr_buf_fill + ct.nitems > incr_buf_size) 2777 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 { 2778 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2779 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2780 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2819 if (selection_wait == Sel_normal) 2820 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none; 2821 selection_wait = Sel_none;
2821} 2822}
2822 2823
2823void 2824void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2825rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2825{ 2826{
2826 selection_wait = Sel_none; 2827 selection_wait = Sel_none;
2827 2828
2828 incr_buf_size = 0; 2829 incr_buf_size = 0;
2829 free (incr_buf); 2830 free (incr_buf);
… …
2840 selection_paste (win, prop, true); 2841 selection_paste (win, prop, true);
2841} 2842}
2842 2843
2843/* ------------------------------------------------------------------------- */ 2844/* ------------------------------------------------------------------------- */
2844/* 2845/*
2845 * Request the current selection: 2846 * Request the current selection:
2846 * Order: > internal selection if available 2847 * Order: > internal selection if available
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2848 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2848 * > CUT_BUFFER0 2849 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2850 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0 2851 * will auto fallback to CUT_BUFFER0
… …
2852 */ 2853 */
2853void 2854void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2855rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2856{
2856 if (selection.text && selnum == Sel_Primary) 2857 if (selection.text && selnum == Sel_Primary)
2858 {
2857 { /* internal selection */ 2859 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2860 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2861 paste (str, strlen (str));
2860 free (str); 2862 free (str);
2861 return; 2863 return;
2862 } 2864 }
… …
3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3129 3131
3130 while (selection.mark.col > 0 3132 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3134 --selection.mark.col;
3133 3135
3134 if (selection.op) 3136 if (selection.op)
3137 {
3135 { /* clear the old selection */ 3138 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3139 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3140 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3141 }
3139 3142
3140 selection.op = SELECTION_INIT; 3143 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3332 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3333 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3334 * time of the most recent button3 press
3332 */ 3335 */
3333 if (button3 && buttonpress) 3336 if (button3 && buttonpress)
3337 {
3334 { /* button3 press */ 3338 /* button3 press */
3335 /* 3339 /*
3336 * first determine which edge of the selection we are closest to 3340 * first determine which edge of the selection we are closest to
3337 */ 3341 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3342 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3343 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3361 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3362 selection.mark.col = selection.beg.col;
3359 } 3363 }
3360 } 3364 }
3361 else 3365 else
3366 {
3362 { /* button1 drag or button3 drag */ 3367 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3368 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3369 {
3365 if (selection.mark.row == selection.end.row 3370 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3371 && selection.mark.col == selection.end.col
3367 && clickchange 3372 && clickchange
… …
3448 selection.end.row++; 3453 selection.end.row++;
3449 } 3454 }
3450 } 3455 }
3451 3456
3452 if (button3 && buttonpress) 3457 if (button3 && buttonpress)
3458 {
3453 { /* mark may need to be changed */ 3459 /* mark may need to be changed */
3454 if (closeto == LEFT) 3460 if (closeto == LEFT)
3455 { 3461 {
3456 selection.mark.row = selection.end.row; 3462 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3463 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3464 }
… …
3657 XFree (ct.value); 3663 XFree (ct.value);
3658 } 3664 }
3659 3665
3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3666 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3661} 3667}
3662
3663/* ------------------------------------------------------------------------- *
3664 * MOUSE ROUTINES *
3665 * ------------------------------------------------------------------------- */
3666
3667/*
3668 * return col/row values corresponding to x/y pixel values
3669 */
3670void
3671rxvt_term::pixel_position (int *x, int *y) NOTHROW
3672{
3673 *x = Pixel2Col (*x);
3674 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3675 *y = Pixel2Row (*y);
3676 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3677}
3678 3668
3679/* ------------------------------------------------------------------------- */ 3669/* ------------------------------------------------------------------------- */
3680#ifdef USE_XIM 3670#ifdef USE_XIM
3681void 3671void
3682rxvt_term::im_set_position (XPoint &pos) NOTHROW 3672rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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