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.274 by sasha, Mon Aug 13 22:41:34 2007 UTC vs.
Revision 1.287 by root, Fri Dec 14 02:10:33 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;
… …
1186 } 1186 }
1187 } 1187 }
1188 else 1188 else
1189 { 1189 {
1190 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1191 { /* relative origin mode */ 1192 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1194 } 1195 }
1195 else 1196 else
1196 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1472 { 1473 {
1473 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1475 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1476 CLEAR_SELECTION ();
1476 else 1477 else
1478 {
1477 { /* shift selection */ 1479 /* shift selection */
1478 selection.beg.col += count; 1480 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1481 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1482 selection.end.col += count;
1481 } 1483 }
1482 } 1484 }
… …
1621 */ 1623 */
1622void 1624void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1626{
1625 if (mode < 0) 1627 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
1629} 1631}
1630 1632
1631/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1804 {
1803 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1805 } 1807 }
1806 1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1811
1810 num_scr_allow = 0; 1812 num_scr_allow = 0;
1811 1813
… …
1866 return true; 1868 return true;
1867} 1869}
1868 1870
1869#ifndef NO_BELL 1871#ifndef NO_BELL
1870void 1872void
1871rxvt_term::bell_cb (time_watcher &w) 1873rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1874{
1873 rvideo_bell = false; 1875 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1876 scr_rvideo_mode (rvideo_mode);
1875} 1877}
1876#endif 1878#endif
… …
1885# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1888 if (option (Opt_mapAlert))
1887# endif 1889# endif
1888 XMapWindow (dpy, parent[0]); 1890 XMapWindow (dpy, parent[0]);
1889# endif 1891# endif
1892
1890# if ENABLE_FRILLS 1893# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1894 if (option (Opt_urgentOnBell))
1892 { 1895 {
1893 XWMHints *h;
1894
1895 h = XGetWMHints(dpy, parent[0]); 1896 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1896 if (h != NULL)
1897 { 1897 {
1898 h->flags |= XUrgencyHint; 1898 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h); 1899 XSetWMHints (dpy, parent[0], h);
1900 } 1900 }
1901 } 1901 }
1902# endif 1902# endif
1903 1903
1904 if (option (Opt_visualBell)) 1904 if (option (Opt_visualBell))
1905 { 1905 {
1906 rvideo_bell = true; 1906 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1908 display->flush ();
1909 1909
1910 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1910 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1911 }
1912 else 1912 else
1913 XBell (dpy, 0); 1913 XBell (dpy, 0);
1914#endif 1914#endif
1915} 1915}
… …
2319 } 2319 }
2320 2320
2321#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2323 {
2324 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2325 { 2325 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2327 hidden_text = 0; 2327 hidden_text = 0;
2328 } 2328 }
2329 else if (hidden_text) 2329 else if (hidden_text)
2330 fore = back; 2330 fore = back;
2331 } 2331 }
… …
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2488 scrollbar_show (0); 2488 scrollbar_show (0);
2489 } 2489 }
2490# endif 2490# endif
2491#endif
2492
2493 scr_clear (); 2491 scr_clear ();
2494 scr_touch (true); 2492 scr_touch (true);
2495 want_refresh = 1; 2493 want_refresh = 1;
2494#endif
2495
2496} 2496}
2497 2497
2498/* ------------------------------------------------------------------------- */ 2498/* ------------------------------------------------------------------------- */
2499void 2499void
2500rxvt_term::scr_clear (bool really) NOTHROW 2500rxvt_term::scr_clear (bool really) NOTHROW
… …
2735 if (!delete_prop) 2735 if (!delete_prop)
2736 XDeleteProperty (dpy, win, prop); 2736 XDeleteProperty (dpy, win, prop);
2737 2737
2738 selection_wait = Sel_incr; 2738 selection_wait = Sel_incr;
2739 incr_buf_fill = 0; 2739 incr_buf_fill = 0;
2740 incr_ev.start (NOW + 10); 2740 incr_ev.start (10);
2741 2741
2742 goto bailout; 2742 goto bailout;
2743 } 2743 }
2744 2744
2745 if (ct.nitems == 0) 2745 if (ct.nitems == 0)
… …
2754 ct.nitems = incr_buf_fill; 2754 ct.nitems = incr_buf_fill;
2755 incr_buf = 0; 2755 incr_buf = 0;
2756 incr_buf_size = 0; 2756 incr_buf_size = 0;
2757 incr_ev.stop (); 2757 incr_ev.stop ();
2758 } 2758 }
2759 else 2759 else
2760 { 2760 {
2761 if (selection_wait == Sel_normal 2761 if (selection_wait == Sel_normal
2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2763 { 2763 {
2764 /* 2764 /*
… …
2771 goto bailout; 2771 goto bailout;
2772 } 2772 }
2773 } 2773 }
2774 else if (selection_wait == Sel_incr) 2774 else if (selection_wait == Sel_incr)
2775 { 2775 {
2776 incr_ev.start (NOW + 10); 2776 incr_ev.start (10);
2777 2777
2778 while (incr_buf_fill + ct.nitems > incr_buf_size) 2778 while (incr_buf_fill + ct.nitems > incr_buf_size)
2779 { 2779 {
2780 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2780 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2821 if (selection_wait == Sel_normal) 2821 if (selection_wait == Sel_normal)
2822 selection_wait = Sel_none; 2822 selection_wait = Sel_none;
2823} 2823}
2824 2824
2825void 2825void
2826rxvt_term::incr_cb (time_watcher &w) NOTHROW 2826rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2827{ 2827{
2828 selection_wait = Sel_none; 2828 selection_wait = Sel_none;
2829 2829
2830 incr_buf_size = 0; 2830 incr_buf_size = 0;
2831 free (incr_buf); 2831 free (incr_buf);
… …
2842 selection_paste (win, prop, true); 2842 selection_paste (win, prop, true);
2843} 2843}
2844 2844
2845/* ------------------------------------------------------------------------- */ 2845/* ------------------------------------------------------------------------- */
2846/* 2846/*
2847 * Request the current selection: 2847 * Request the current selection:
2848 * Order: > internal selection if available 2848 * Order: > internal selection if available
2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2850 * > CUT_BUFFER0 2850 * > CUT_BUFFER0
2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2852 * will auto fallback to CUT_BUFFER0 2852 * will auto fallback to CUT_BUFFER0
… …
2854 */ 2854 */
2855void 2855void
2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2857{ 2857{
2858 if (selection.text && selnum == Sel_Primary) 2858 if (selection.text && selnum == Sel_Primary)
2859 {
2859 { /* internal selection */ 2860 /* internal selection */
2860 char *str = rxvt_wcstombs (selection.text, selection.len); 2861 char *str = rxvt_wcstombs (selection.text, selection.len);
2861 paste (str, strlen (str)); 2862 paste (str, strlen (str));
2862 free (str); 2863 free (str);
2863 return; 2864 return;
2864 } 2865 }
… …
3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3131 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3131 3132
3132 while (selection.mark.col > 0 3133 while (selection.mark.col > 0
3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3134 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3134 --selection.mark.col; 3135 --selection.mark.col;
3135 3136
3136 if (selection.op) 3137 if (selection.op)
3138 {
3137 { /* clear the old selection */ 3139 /* clear the old selection */
3138 selection.beg.row = selection.end.row = selection.mark.row; 3140 selection.beg.row = selection.end.row = selection.mark.row;
3139 selection.beg.col = selection.end.col = selection.mark.col; 3141 selection.beg.col = selection.end.col = selection.mark.col;
3140 } 3142 }
3141 3143
3142 selection.op = SELECTION_INIT; 3144 selection.op = SELECTION_INIT;
… …
3331 * a point/word/line which is either the start or end of the selection 3333 * a point/word/line which is either the start or end of the selection
3332 * and it was decided by whichever point/word/line was `fixed' at the 3334 * and it was decided by whichever point/word/line was `fixed' at the
3333 * time of the most recent button3 press 3335 * time of the most recent button3 press
3334 */ 3336 */
3335 if (button3 && buttonpress) 3337 if (button3 && buttonpress)
3338 {
3336 { /* button3 press */ 3339 /* button3 press */
3337 /* 3340 /*
3338 * first determine which edge of the selection we are closest to 3341 * first determine which edge of the selection we are closest to
3339 */ 3342 */
3340 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3343 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3341 || (!ROWCOL_IS_AFTER (pos, selection.end) 3344 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3359 selection.mark.row = selection.beg.row; 3362 selection.mark.row = selection.beg.row;
3360 selection.mark.col = selection.beg.col; 3363 selection.mark.col = selection.beg.col;
3361 } 3364 }
3362 } 3365 }
3363 else 3366 else
3367 {
3364 { /* button1 drag or button3 drag */ 3368 /* button1 drag or button3 drag */
3365 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3369 if (ROWCOL_IS_AFTER (selection.mark, pos))
3366 { 3370 {
3367 if (selection.mark.row == selection.end.row 3371 if (selection.mark.row == selection.end.row
3368 && selection.mark.col == selection.end.col 3372 && selection.mark.col == selection.end.col
3369 && clickchange 3373 && clickchange
… …
3450 selection.end.row++; 3454 selection.end.row++;
3451 } 3455 }
3452 } 3456 }
3453 3457
3454 if (button3 && buttonpress) 3458 if (button3 && buttonpress)
3459 {
3455 { /* mark may need to be changed */ 3460 /* mark may need to be changed */
3456 if (closeto == LEFT) 3461 if (closeto == LEFT)
3457 { 3462 {
3458 selection.mark.row = selection.end.row; 3463 selection.mark.row = selection.end.row;
3459 selection.mark.col = selection.end.col - (selection.clicks == 2); 3464 selection.mark.col = selection.end.col - (selection.clicks == 2);
3460 } 3465 }
… …
3659 XFree (ct.value); 3664 XFree (ct.value);
3660 } 3665 }
3661 3666
3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3667 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3663} 3668}
3664
3665/* ------------------------------------------------------------------------- *
3666 * MOUSE ROUTINES *
3667 * ------------------------------------------------------------------------- */
3668
3669/*
3670 * return col/row values corresponding to x/y pixel values
3671 */
3672void
3673rxvt_term::pixel_position (int *x, int *y) NOTHROW
3674{
3675 *x = Pixel2Col (*x);
3676 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3677 *y = Pixel2Row (*y);
3678 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3679}
3680 3669
3681/* ------------------------------------------------------------------------- */ 3670/* ------------------------------------------------------------------------- */
3682#ifdef USE_XIM 3671#ifdef USE_XIM
3683void 3672void
3684rxvt_term::im_set_position (XPoint &pos) NOTHROW 3673rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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