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.270 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.287 by root, Fri Dec 14 02:10:33 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
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
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;
… …
1188 } 1186 }
1189 } 1187 }
1190 else 1188 else
1191 { 1189 {
1192 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1193 { /* relative origin mode */ 1192 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1196 } 1195 }
1197 else 1196 else
1198 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1474 { 1473 {
1475 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1475 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1476 CLEAR_SELECTION ();
1478 else 1477 else
1478 {
1479 { /* shift selection */ 1479 /* shift selection */
1480 selection.beg.col += count; 1480 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1481 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1482 selection.end.col += count;
1483 } 1483 }
1484 } 1484 }
… …
1623 */ 1623 */
1624void 1624void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1626{
1627 if (mode < 0) 1627 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
1631} 1631}
1632 1632
1633/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1648 if (rvideo_state != on)
1649 { 1649 {
1650 rvideo_state = on; 1650 rvideo_state = on;
1651 1651
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1653#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1655#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1657
1661 XGCValues gcvalue; 1658 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1659 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1804 {
1808 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1810 } 1807 }
1811 1808// 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++) 1809 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); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1811
1815 num_scr_allow = 0; 1812 num_scr_allow = 0;
1816 1813
… …
1871 return true; 1868 return true;
1872} 1869}
1873 1870
1874#ifndef NO_BELL 1871#ifndef NO_BELL
1875void 1872void
1876rxvt_term::bell_cb (time_watcher &w) 1873rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1874{
1878 rvideo_bell = false; 1875 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1876 scr_rvideo_mode (rvideo_mode);
1880} 1877}
1881#endif 1878#endif
… …
1890# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1888 if (option (Opt_mapAlert))
1892# endif 1889# endif
1893 XMapWindow (dpy, parent[0]); 1890 XMapWindow (dpy, parent[0]);
1894# endif 1891# endif
1892
1895# if ENABLE_FRILLS 1893# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1894 if (option (Opt_urgentOnBell))
1897 { 1895 {
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]); 1896 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1901 if (h != NULL)
1902 { 1897 {
1903 h->flags |= XUrgencyHint; 1898 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h); 1899 XSetWMHints (dpy, parent[0], h);
1905 } 1900 }
1906 } 1901 }
1907# endif 1902# endif
1908 1903
1909 if (option (Opt_visualBell)) 1904 if (option (Opt_visualBell))
1910 { 1905 {
1911 rvideo_bell = true; 1906 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1913 display->flush (); 1908 display->flush ();
1914 1909
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1910 bell_ev.start (VISUAL_BELL_DURATION);
1916 } 1911 }
1917 else 1912 else
1918 XBell (dpy, 0); 1913 XBell (dpy, 0);
1919
1920#endif 1914#endif
1921} 1915}
1922 1916
1923/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */ 1918/* ARGSUSED */
… …
2005 * A: set up vars 1999 * A: set up vars
2006 */ 2000 */
2007 have_bg = 0; 2001 have_bg = 0;
2008 refresh_count = 0; 2002 refresh_count = 0;
2009 2003
2010#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
2011 have_bg |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
2012#endif
2013#if ENABLE_TRANSPARENCY
2014 have_bg |= option (Opt_transparent) && am_transparent;
2015#endif 2006#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2008
2018 /* 2009 /*
2019 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
2328 } 2319 }
2329 2320
2330#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2331 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2332 { 2323 {
2333 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2334 { 2325 {
2335 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2336 hidden_text = 0; 2327 hidden_text = 0;
2337 } 2328 }
2338 else if (hidden_text) 2329 else if (hidden_text)
2339 fore = back; 2330 fore = back;
2340 } 2331 }
… …
2481} 2472}
2482 2473
2483void 2474void
2484rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2485{ 2476{
2486 if (1 2477#ifdef HAVE_BG_PIXMAP
2487#if ENABLE_TRANSPARENCY 2478 bgPixmap.apply ();
2488 && !am_transparent 2479#else
2489#endif
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 )
2494 {
2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2496 XClearWindow (dpy, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2499 if (scrollBar.win) 2484 if (scrollBar.win)
2500 { 2485 {
2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2503 scrollbar_show (0); 2488 scrollbar_show (0);
2504 } 2489 }
2505#endif 2490# endif
2506 }
2507
2508 scr_clear (); 2491 scr_clear ();
2509 scr_touch (true); 2492 scr_touch (true);
2510 want_refresh = 1; 2493 want_refresh = 1;
2494#endif
2495
2511} 2496}
2512 2497
2513/* ------------------------------------------------------------------------- */ 2498/* ------------------------------------------------------------------------- */
2514void 2499void
2515rxvt_term::scr_clear (bool really) NOTHROW 2500rxvt_term::scr_clear (bool really) NOTHROW
… …
2750 if (!delete_prop) 2735 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop); 2736 XDeleteProperty (dpy, win, prop);
2752 2737
2753 selection_wait = Sel_incr; 2738 selection_wait = Sel_incr;
2754 incr_buf_fill = 0; 2739 incr_buf_fill = 0;
2755 incr_ev.start (NOW + 10); 2740 incr_ev.start (10);
2756 2741
2757 goto bailout; 2742 goto bailout;
2758 } 2743 }
2759 2744
2760 if (ct.nitems == 0) 2745 if (ct.nitems == 0)
… …
2769 ct.nitems = incr_buf_fill; 2754 ct.nitems = incr_buf_fill;
2770 incr_buf = 0; 2755 incr_buf = 0;
2771 incr_buf_size = 0; 2756 incr_buf_size = 0;
2772 incr_ev.stop (); 2757 incr_ev.stop ();
2773 } 2758 }
2774 else 2759 else
2775 { 2760 {
2776 if (selection_wait == Sel_normal 2761 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 { 2763 {
2779 /* 2764 /*
… …
2786 goto bailout; 2771 goto bailout;
2787 } 2772 }
2788 } 2773 }
2789 else if (selection_wait == Sel_incr) 2774 else if (selection_wait == Sel_incr)
2790 { 2775 {
2791 incr_ev.start (NOW + 10); 2776 incr_ev.start (10);
2792 2777
2793 while (incr_buf_fill + ct.nitems > incr_buf_size) 2778 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 { 2779 {
2795 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;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2836 if (selection_wait == Sel_normal) 2821 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none; 2822 selection_wait = Sel_none;
2838} 2823}
2839 2824
2840void 2825void
2841rxvt_term::incr_cb (time_watcher &w) NOTHROW 2826rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2842{ 2827{
2843 selection_wait = Sel_none; 2828 selection_wait = Sel_none;
2844 2829
2845 incr_buf_size = 0; 2830 incr_buf_size = 0;
2846 free (incr_buf); 2831 free (incr_buf);
… …
2857 selection_paste (win, prop, true); 2842 selection_paste (win, prop, true);
2858} 2843}
2859 2844
2860/* ------------------------------------------------------------------------- */ 2845/* ------------------------------------------------------------------------- */
2861/* 2846/*
2862 * Request the current selection: 2847 * Request the current selection:
2863 * Order: > internal selection if available 2848 * Order: > internal selection if available
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2865 * > CUT_BUFFER0 2850 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0 2852 * will auto fallback to CUT_BUFFER0
… …
2869 */ 2854 */
2870void 2855void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2857{
2873 if (selection.text && selnum == Sel_Primary) 2858 if (selection.text && selnum == Sel_Primary)
2859 {
2874 { /* internal selection */ 2860 /* internal selection */
2875 char *str = rxvt_wcstombs (selection.text, selection.len); 2861 char *str = rxvt_wcstombs (selection.text, selection.len);
2876 paste (str, strlen (str)); 2862 paste (str, strlen (str));
2877 free (str); 2863 free (str);
2878 return; 2864 return;
2879 } 2865 }
… …
3145 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3131 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3146 3132
3147 while (selection.mark.col > 0 3133 while (selection.mark.col > 0
3148 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3134 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3149 --selection.mark.col; 3135 --selection.mark.col;
3150 3136
3151 if (selection.op) 3137 if (selection.op)
3138 {
3152 { /* clear the old selection */ 3139 /* clear the old selection */
3153 selection.beg.row = selection.end.row = selection.mark.row; 3140 selection.beg.row = selection.end.row = selection.mark.row;
3154 selection.beg.col = selection.end.col = selection.mark.col; 3141 selection.beg.col = selection.end.col = selection.mark.col;
3155 } 3142 }
3156 3143
3157 selection.op = SELECTION_INIT; 3144 selection.op = SELECTION_INIT;
… …
3346 * 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
3347 * 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
3348 * time of the most recent button3 press 3335 * time of the most recent button3 press
3349 */ 3336 */
3350 if (button3 && buttonpress) 3337 if (button3 && buttonpress)
3338 {
3351 { /* button3 press */ 3339 /* button3 press */
3352 /* 3340 /*
3353 * first determine which edge of the selection we are closest to 3341 * first determine which edge of the selection we are closest to
3354 */ 3342 */
3355 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3343 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3356 || (!ROWCOL_IS_AFTER (pos, selection.end) 3344 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3374 selection.mark.row = selection.beg.row; 3362 selection.mark.row = selection.beg.row;
3375 selection.mark.col = selection.beg.col; 3363 selection.mark.col = selection.beg.col;
3376 } 3364 }
3377 } 3365 }
3378 else 3366 else
3367 {
3379 { /* button1 drag or button3 drag */ 3368 /* button1 drag or button3 drag */
3380 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3369 if (ROWCOL_IS_AFTER (selection.mark, pos))
3381 { 3370 {
3382 if (selection.mark.row == selection.end.row 3371 if (selection.mark.row == selection.end.row
3383 && selection.mark.col == selection.end.col 3372 && selection.mark.col == selection.end.col
3384 && clickchange 3373 && clickchange
… …
3465 selection.end.row++; 3454 selection.end.row++;
3466 } 3455 }
3467 } 3456 }
3468 3457
3469 if (button3 && buttonpress) 3458 if (button3 && buttonpress)
3459 {
3470 { /* mark may need to be changed */ 3460 /* mark may need to be changed */
3471 if (closeto == LEFT) 3461 if (closeto == LEFT)
3472 { 3462 {
3473 selection.mark.row = selection.end.row; 3463 selection.mark.row = selection.end.row;
3474 selection.mark.col = selection.end.col - (selection.clicks == 2); 3464 selection.mark.col = selection.end.col - (selection.clicks == 2);
3475 } 3465 }
… …
3674 XFree (ct.value); 3664 XFree (ct.value);
3675 } 3665 }
3676 3666
3677 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3667 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3678} 3668}
3679
3680/* ------------------------------------------------------------------------- *
3681 * MOUSE ROUTINES *
3682 * ------------------------------------------------------------------------- */
3683
3684/*
3685 * return col/row values corresponding to x/y pixel values
3686 */
3687void
3688rxvt_term::pixel_position (int *x, int *y) NOTHROW
3689{
3690 *x = Pixel2Col (*x);
3691 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3692 *y = Pixel2Row (*y);
3693 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3694}
3695 3669
3696/* ------------------------------------------------------------------------- */ 3670/* ------------------------------------------------------------------------- */
3697#ifdef USE_XIM 3671#ifdef USE_XIM
3698void 3672void
3699rxvt_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