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.272 by root, Fri Aug 10 23:52:12 2007 UTC vs.
Revision 1.281 by ayin, Wed Oct 31 09:55:24 2007 UTC

… …
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#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
276 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);
277 } 275 }
278 276
279 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
280 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));
281 279
282 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
283 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
285 283
286 if (top_row) 284 if (top_row)
… …
330 int qcol = 0; 328 int qcol = 0;
331 329
332 // see below for cursor adjustment rationale 330 // see below for cursor adjustment rationale
333 if (p == ocur.row) 331 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 332 screen.cur.row = q - (total_rows - nrow);
335 333
336 // fill a single destination line 334 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
338 { 336 {
339 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
366 } 364 }
367 while (p != pend && q > 0); 365 while (p != pend && q > 0);
368 366
369 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
370 top_row = q - term_start; 368 top_row = q - term_start;
371 369
372 // make sure all terminal lines exist 370 // make sure all terminal lines exist
373 while (top_row > 0) 371 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 373 }
376 else 374 else
377 { 375 {
378 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
379 377
380 for (int row = min (nrow, prev_nrow); row--; ) 378 for (int row = min (nrow, prev_nrow); row--; )
381 { 379 {
382 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)];
383 line_t &qline = row_buf [row]; 381 line_t &qline = row_buf [row];
384 382
… …
407 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
408 406
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411 409
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
413 411
414 for (int col = ncol; --col; ) 412 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
416 414
417 if (current_screen != PRIMARY) 415 if (current_screen != PRIMARY)
… …
666 line_t &l2 = ROW(i); 664 line_t &l2 = ROW(i);
667 665
668 ::swap (l1, l2); 666 ::swap (l1, l2);
669 l2.touch (); 667 l2.touch ();
670 } 668 }
671 669
672 // move and/or clear selection, if any 670 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
674 { 672 {
675 selection.beg.row -= count; 673 selection.beg.row -= count;
676 selection.end.row -= count; 674 selection.end.row -= count;
… …
712 { 710 {
713 /* move selected region too */ 711 /* move selected region too */
714 selection.beg.row -= count; 712 selection.beg.row -= count;
715 selection.end.row -= count; 713 selection.end.row -= count;
716 selection.mark.row -= count; 714 selection.mark.row -= count;
717 715
718 selection_check (0); 716 selection_check (0);
719 } 717 }
720 } 718 }
721 719
722 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
834 } 832 }
835 833
836 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
837 { 835 {
838 scr_do_wrap (); 836 scr_do_wrap ();
839 837
840 line->l = ncol; 838 line->l = ncol;
841 line->is_longer (1); 839 line->is_longer (1);
842 840
843 row = screen.cur.row; 841 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
… …
1062 x = i; 1060 x = i;
1063 1061
1064 if (!--count) 1062 if (!--count)
1065 break; 1063 break;
1066 } 1064 }
1067 else 1065 else
1068 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1070 1068
1071 if (count) 1069 if (count)
1072 x = ncol - 1; 1070 x = ncol - 1;
… …
1623 */ 1621 */
1624void 1622void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1623rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1624{
1627 if (mode < 0) 1625 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1626 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1627 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1628 tabs [screen.cur.col] = !!mode;
1631} 1629}
1632 1630
1633/* ------------------------------------------------------------------------- */ 1631/* ------------------------------------------------------------------------- */
… …
1650 rvideo_state = on; 1648 rvideo_state = on;
1651 1649
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1653#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1655
1661 XGCValues gcvalue; 1656 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
… …
1676void 1671void
1677rxvt_term::scr_report_position () NOTHROW 1672rxvt_term::scr_report_position () NOTHROW
1678{ 1673{
1679 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);
1680} 1675}
1681 1676
1682/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
1683 * FONTS * 1678 * FONTS *
1684 * ------------------------------------------------------------------------- */ 1679 * ------------------------------------------------------------------------- */
1685 1680
1686/* 1681/*
… …
1739{ 1734{
1740 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1741 set_font_style (); 1736 set_font_style ();
1742} 1737}
1743 1738
1744 1739
1745/* ------------------------------------------------------------------------- * 1740/* ------------------------------------------------------------------------- *
1746 * MAJOR SCREEN MANIPULATION * 1741 * MAJOR SCREEN MANIPULATION *
1747 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1748 1743
1749/* 1744/*
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1802 {
1808 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1810 } 1805 }
1811 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1809
1815 num_scr_allow = 0; 1810 num_scr_allow = 0;
1816 1811
… …
1890# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1892# endif 1887# endif
1893 XMapWindow (dpy, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1894# endif 1889# endif
1890
1895# if ENABLE_FRILLS 1891# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1892 if (option (Opt_urgentOnBell))
1897 { 1893 {
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]); 1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1901 if (h != NULL)
1902 { 1895 {
1903 h->flags |= XUrgencyHint; 1896 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h); 1897 XSetWMHints (dpy, parent[0], h);
1905 } 1898 }
1906 } 1899 }
1907# endif 1900# endif
1908 1901
1909 if (option (Opt_visualBell)) 1902 if (option (Opt_visualBell))
… …
2006 have_bg = 0; 1999 have_bg = 0;
2007 refresh_count = 0; 2000 refresh_count = 0;
2008 2001
2009#ifdef HAVE_BG_PIXMAP 2002#ifdef HAVE_BG_PIXMAP
2010 have_bg |= bgPixmap.pixmap != None; 2003 have_bg |= bgPixmap.pixmap != None;
2011#endif
2012#if ENABLE_TRANSPARENCY
2013 have_bg |= option (Opt_transparent) && am_transparent;
2014#endif 2004#endif
2015 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2016 2006
2017 /* 2007 /*
2018 * B: reverse any characters which are selected 2008 * B: reverse any characters which are selected
… …
2480} 2470}
2481 2471
2482void 2472void
2483rxvt_term::scr_recolour () NOTHROW 2473rxvt_term::scr_recolour () NOTHROW
2484{ 2474{
2485 if (1
2486#if ENABLE_TRANSPARENCY
2487 && !am_transparent
2488#endif
2489#ifdef HAVE_BG_PIXMAP 2475#ifdef HAVE_BG_PIXMAP
2490 && !bgPixmap.pixmap 2476 bgPixmap.apply ();
2491#endif 2477#else
2492 )
2493 {
2494 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2495 XClearWindow (dpy, parent[0]); 2479 XClearWindow (dpy, parent[0]);
2496 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2497#if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2498 if (scrollBar.win) 2482 if (scrollBar.win)
2499 { 2483 {
2500 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2501 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2502 scrollbar_show (0); 2486 scrollbar_show (0);
2503 } 2487 }
2504#endif 2488# endif
2505 }
2506
2507 scr_clear (); 2489 scr_clear ();
2508 scr_touch (true); 2490 scr_touch (true);
2509 want_refresh = 1; 2491 want_refresh = 1;
2492#endif
2493
2510} 2494}
2511 2495
2512/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2513void 2497void
2514rxvt_term::scr_clear (bool really) NOTHROW 2498rxvt_term::scr_clear (bool really) NOTHROW
… …
2621 if (write (fd, r1, 1) <= 0) 2605 if (write (fd, r1, 1) <= 0)
2622 return; /* XXX: death, no report */ 2606 return; /* XXX: death, no report */
2623 } 2607 }
2624} 2608}
2625#endif 2609#endif
2626 2610
2627/* ------------------------------------------------------------------------- * 2611/* ------------------------------------------------------------------------- *
2628 * CHARACTER SELECTION * 2612 * CHARACTER SELECTION *
2629 * ------------------------------------------------------------------------- */ 2613 * ------------------------------------------------------------------------- */
2630void 2614void
2631rxvt_term::selection_check (int check_more) NOTHROW 2615rxvt_term::selection_check (int check_more) NOTHROW
… …
2768 ct.nitems = incr_buf_fill; 2752 ct.nitems = incr_buf_fill;
2769 incr_buf = 0; 2753 incr_buf = 0;
2770 incr_buf_size = 0; 2754 incr_buf_size = 0;
2771 incr_ev.stop (); 2755 incr_ev.stop ();
2772 } 2756 }
2773 else 2757 else
2774 { 2758 {
2775 if (selection_wait == Sel_normal 2759 if (selection_wait == Sel_normal
2776 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2777 { 2761 {
2778 /* 2762 /*
… …
2856 selection_paste (win, prop, true); 2840 selection_paste (win, prop, true);
2857} 2841}
2858 2842
2859/* ------------------------------------------------------------------------- */ 2843/* ------------------------------------------------------------------------- */
2860/* 2844/*
2861 * Request the current selection: 2845 * Request the current selection:
2862 * Order: > internal selection if available 2846 * Order: > internal selection if available
2863 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2864 * > CUT_BUFFER0 2848 * > CUT_BUFFER0
2865 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2866 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
… …
3144 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3145 3129
3146 while (selection.mark.col > 0 3130 while (selection.mark.col > 0
3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3148 --selection.mark.col; 3132 --selection.mark.col;
3149 3133
3150 if (selection.op) 3134 if (selection.op)
3151 { /* clear the old selection */ 3135 { /* clear the old selection */
3152 selection.beg.row = selection.end.row = selection.mark.row; 3136 selection.beg.row = selection.end.row = selection.mark.row;
3153 selection.beg.col = selection.end.col = selection.mark.col; 3137 selection.beg.col = selection.end.col = selection.mark.col;
3154 } 3138 }
… …
3673 XFree (ct.value); 3657 XFree (ct.value);
3674 } 3658 }
3675 3659
3676 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3677} 3661}
3678 3662
3679/* ------------------------------------------------------------------------- * 3663/* ------------------------------------------------------------------------- *
3680 * MOUSE ROUTINES * 3664 * MOUSE ROUTINES *
3681 * ------------------------------------------------------------------------- */ 3665 * ------------------------------------------------------------------------- */
3682
3683/*
3684 * return col/row values corresponding to x/y pixel values
3685 */
3686void
3687rxvt_term::pixel_position (int *x, int *y) NOTHROW
3688{
3689 *x = Pixel2Col (*x);
3690 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3691 *y = Pixel2Row (*y);
3692 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3693}
3694 3666
3695/* ------------------------------------------------------------------------- */ 3667/* ------------------------------------------------------------------------- */
3696#ifdef USE_XIM 3668#ifdef USE_XIM
3697void 3669void
3698rxvt_term::im_set_position (XPoint &pos) NOTHROW 3670rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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