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.273 by ayin, Mon Aug 13 07:18:58 2007 UTC vs.
Revision 1.281 by ayin, Wed Oct 31 09:55:24 2007 UTC

… …
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
34 34
35inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
… …
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
… …
405 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
406 406
407 prev_nrow = nrow; 407 prev_nrow = nrow;
408 prev_ncol = ncol; 408 prev_ncol = ncol;
409 409
410 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
411 411
412 for (int col = ncol; --col; ) 412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
414 414
415 if (current_screen != PRIMARY) 415 if (current_screen != PRIMARY)
… …
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;
… …
1621 */ 1621 */
1622void 1622void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1623rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1624{
1625 if (mode < 0) 1625 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1626 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1627 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1628 tabs [screen.cur.col] = !!mode;
1629} 1629}
1630 1630
1631/* ------------------------------------------------------------------------- */ 1631/* ------------------------------------------------------------------------- */
… …
1648 rvideo_state = on; 1648 rvideo_state = on;
1649 1649
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1652 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1653#endif
1654#if ENABLE_TRANSPARENCY
1655 if (!option (Opt_transparent) || am_transparent == 0)
1656#endif 1653#endif
1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658 1655
1659 XGCValues gcvalue; 1656 XGCValues gcvalue;
1660 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
… …
1674void 1671void
1675rxvt_term::scr_report_position () NOTHROW 1672rxvt_term::scr_report_position () NOTHROW
1676{ 1673{
1677 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);
1678} 1675}
1679 1676
1680/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
1681 * FONTS * 1678 * FONTS *
1682 * ------------------------------------------------------------------------- */ 1679 * ------------------------------------------------------------------------- */
1683 1680
1684/* 1681/*
… …
1737{ 1734{
1738 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1739 set_font_style (); 1736 set_font_style ();
1740} 1737}
1741 1738
1742 1739
1743/* ------------------------------------------------------------------------- * 1740/* ------------------------------------------------------------------------- *
1744 * MAJOR SCREEN MANIPULATION * 1741 * MAJOR SCREEN MANIPULATION *
1745 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1746 1743
1747/* 1744/*
… …
1804 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1805 { 1802 {
1806 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1807 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1808 } 1805 }
1809 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1810 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++)
1811 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);
1812 1809
1813 num_scr_allow = 0; 1810 num_scr_allow = 0;
1814 1811
… …
1888# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1889 if (option (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1890# endif 1887# endif
1891 XMapWindow (dpy, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1892# endif 1889# endif
1890
1893# if ENABLE_FRILLS 1891# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell)) 1892 if (option (Opt_urgentOnBell))
1895 { 1893 {
1896 XWMHints *h;
1897
1898 h = XGetWMHints(dpy, parent[0]); 1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 if (h != NULL)
1900 { 1895 {
1901 h->flags |= XUrgencyHint; 1896 h->flags |= XUrgencyHint;
1902 XSetWMHints(dpy, parent[0], h); 1897 XSetWMHints (dpy, parent[0], h);
1903 } 1898 }
1904 } 1899 }
1905# endif 1900# endif
1906 1901
1907 if (option (Opt_visualBell)) 1902 if (option (Opt_visualBell))
… …
2004 have_bg = 0; 1999 have_bg = 0;
2005 refresh_count = 0; 2000 refresh_count = 0;
2006 2001
2007#ifdef HAVE_BG_PIXMAP 2002#ifdef HAVE_BG_PIXMAP
2008 have_bg |= bgPixmap.pixmap != None; 2003 have_bg |= bgPixmap.pixmap != None;
2009#endif
2010#if ENABLE_TRANSPARENCY
2011 have_bg |= option (Opt_transparent) && am_transparent;
2012#endif 2004#endif
2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014 2006
2015 /* 2007 /*
2016 * B: reverse any characters which are selected 2008 * B: reverse any characters which are selected
… …
2478} 2470}
2479 2471
2480void 2472void
2481rxvt_term::scr_recolour () NOTHROW 2473rxvt_term::scr_recolour () NOTHROW
2482{ 2474{
2483 if (1
2484#if ENABLE_TRANSPARENCY
2485 && !am_transparent
2486#endif
2487#ifdef HAVE_BG_PIXMAP 2475#ifdef HAVE_BG_PIXMAP
2488 && !bgPixmap.pixmap 2476 bgPixmap.apply ();
2489#endif 2477#else
2490 )
2491 {
2492 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2493 XClearWindow (dpy, parent[0]); 2479 XClearWindow (dpy, parent[0]);
2494 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2495#if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2496 if (scrollBar.win) 2482 if (scrollBar.win)
2497 { 2483 {
2498 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2499 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2500 scrollbar_show (0); 2486 scrollbar_show (0);
2501 } 2487 }
2502#endif 2488# endif
2503 }
2504
2505 scr_clear (); 2489 scr_clear ();
2506 scr_touch (true); 2490 scr_touch (true);
2507 want_refresh = 1; 2491 want_refresh = 1;
2492#endif
2493
2508} 2494}
2509 2495
2510/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2511void 2497void
2512rxvt_term::scr_clear (bool really) NOTHROW 2498rxvt_term::scr_clear (bool really) NOTHROW
… …
2619 if (write (fd, r1, 1) <= 0) 2605 if (write (fd, r1, 1) <= 0)
2620 return; /* XXX: death, no report */ 2606 return; /* XXX: death, no report */
2621 } 2607 }
2622} 2608}
2623#endif 2609#endif
2624 2610
2625/* ------------------------------------------------------------------------- * 2611/* ------------------------------------------------------------------------- *
2626 * CHARACTER SELECTION * 2612 * CHARACTER SELECTION *
2627 * ------------------------------------------------------------------------- */ 2613 * ------------------------------------------------------------------------- */
2628void 2614void
2629rxvt_term::selection_check (int check_more) NOTHROW 2615rxvt_term::selection_check (int check_more) NOTHROW
… …
2766 ct.nitems = incr_buf_fill; 2752 ct.nitems = incr_buf_fill;
2767 incr_buf = 0; 2753 incr_buf = 0;
2768 incr_buf_size = 0; 2754 incr_buf_size = 0;
2769 incr_ev.stop (); 2755 incr_ev.stop ();
2770 } 2756 }
2771 else 2757 else
2772 { 2758 {
2773 if (selection_wait == Sel_normal 2759 if (selection_wait == Sel_normal
2774 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2775 { 2761 {
2776 /* 2762 /*
… …
2854 selection_paste (win, prop, true); 2840 selection_paste (win, prop, true);
2855} 2841}
2856 2842
2857/* ------------------------------------------------------------------------- */ 2843/* ------------------------------------------------------------------------- */
2858/* 2844/*
2859 * Request the current selection: 2845 * Request the current selection:
2860 * Order: > internal selection if available 2846 * Order: > internal selection if available
2861 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2862 * > CUT_BUFFER0 2848 * > CUT_BUFFER0
2863 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2864 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
… …
3142 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3143 3129
3144 while (selection.mark.col > 0 3130 while (selection.mark.col > 0
3145 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3146 --selection.mark.col; 3132 --selection.mark.col;
3147 3133
3148 if (selection.op) 3134 if (selection.op)
3149 { /* clear the old selection */ 3135 { /* clear the old selection */
3150 selection.beg.row = selection.end.row = selection.mark.row; 3136 selection.beg.row = selection.end.row = selection.mark.row;
3151 selection.beg.col = selection.end.col = selection.mark.col; 3137 selection.beg.col = selection.end.col = selection.mark.col;
3152 } 3138 }
… …
3671 XFree (ct.value); 3657 XFree (ct.value);
3672 } 3658 }
3673 3659
3674 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3675} 3661}
3676 3662
3677/* ------------------------------------------------------------------------- * 3663/* ------------------------------------------------------------------------- *
3678 * MOUSE ROUTINES * 3664 * MOUSE ROUTINES *
3679 * ------------------------------------------------------------------------- */ 3665 * ------------------------------------------------------------------------- */
3680
3681/*
3682 * return col/row values corresponding to x/y pixel values
3683 */
3684void
3685rxvt_term::pixel_position (int *x, int *y) NOTHROW
3686{
3687 *x = Pixel2Col (*x);
3688 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3689 *y = Pixel2Row (*y);
3690 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3691}
3692 3666
3693/* ------------------------------------------------------------------------- */ 3667/* ------------------------------------------------------------------------- */
3694#ifdef USE_XIM 3668#ifdef USE_XIM
3695void 3669void
3696rxvt_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