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.293 by root, Mon Dec 24 08:00:18 2007 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.
… …
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)
… …
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 */
… …
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/* ------------------------------------------------------------------------- */
… …
1648 rvideo_state = on; 1650 rvideo_state = on;
1649 1651
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1653#ifdef HAVE_BG_PIXMAP
1652 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1653#endif
1654#if ENABLE_TRANSPARENCY
1655 if (!option (Opt_transparent) || am_transparent == 0)
1656#endif 1655#endif
1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658 1657
1659 XGCValues gcvalue; 1658 XGCValues gcvalue;
1660 gcvalue.foreground = pix_colors[Color_fg]; 1659 gcvalue.foreground = pix_colors[Color_fg];
… …
1804 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1805 { 1804 {
1806 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1807 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1808 } 1807 }
1809 1808// 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++) 1809 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); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1812 1811
1813 num_scr_allow = 0; 1812 num_scr_allow = 0;
1814 1813
… …
1869 return true; 1868 return true;
1870} 1869}
1871 1870
1872#ifndef NO_BELL 1871#ifndef NO_BELL
1873void 1872void
1874rxvt_term::bell_cb (time_watcher &w) 1873rxvt_term::bell_cb (ev::timer &w, int revents)
1875{ 1874{
1876 rvideo_bell = false; 1875 rvideo_bell = false;
1877 scr_rvideo_mode (rvideo_mode); 1876 scr_rvideo_mode (rvideo_mode);
1877 refresh_check ();
1878} 1878}
1879#endif 1879#endif
1880 1880
1881/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1882void 1882void
… …
1888# ifdef MAPALERT_OPTION 1888# ifdef MAPALERT_OPTION
1889 if (option (Opt_mapAlert)) 1889 if (option (Opt_mapAlert))
1890# endif 1890# endif
1891 XMapWindow (dpy, parent[0]); 1891 XMapWindow (dpy, parent[0]);
1892# endif 1892# endif
1893
1893# if ENABLE_FRILLS 1894# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell)) 1895 if (option (Opt_urgentOnBell))
1895 { 1896 {
1896 XWMHints *h;
1897
1898 h = XGetWMHints(dpy, parent[0]); 1897 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 if (h != NULL)
1900 { 1898 {
1901 h->flags |= XUrgencyHint; 1899 h->flags |= XUrgencyHint;
1902 XSetWMHints(dpy, parent[0], h); 1900 XSetWMHints (dpy, parent[0], h);
1903 } 1901 }
1904 } 1902 }
1905# endif 1903# endif
1906 1904
1907 if (option (Opt_visualBell)) 1905 if (option (Opt_visualBell))
1908 { 1906 {
1909 rvideo_bell = true; 1907 rvideo_bell = true;
1910 scr_rvideo_mode (rvideo_mode); 1908 scr_rvideo_mode (rvideo_mode);
1911 display->flush (); 1909 flush ();
1912 1910
1913 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1911 bell_ev.start (VISUAL_BELL_DURATION);
1914 } 1912 }
1915 else 1913 else
1916 XBell (dpy, 0); 1914 XBell (dpy, 0);
1917#endif 1915#endif
1918} 1916}
… …
2004 have_bg = 0; 2002 have_bg = 0;
2005 refresh_count = 0; 2003 refresh_count = 0;
2006 2004
2007#ifdef HAVE_BG_PIXMAP 2005#ifdef HAVE_BG_PIXMAP
2008 have_bg |= bgPixmap.pixmap != None; 2006 have_bg |= bgPixmap.pixmap != None;
2009#endif
2010#if ENABLE_TRANSPARENCY
2011 have_bg |= option (Opt_transparent) && am_transparent;
2012#endif 2007#endif
2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2008 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014 2009
2015 /* 2010 /*
2016 * B: reverse any characters which are selected 2011 * B: reverse any characters which are selected
… …
2269 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2264 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2270 { 2265 {
2271 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2272 2267
2273#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2274 if (rend & RS_Bold
2275 && fore == Color_fg) 2269 if (rend & RS_Bold && fore == Color_fg)
2276 { 2270 {
2277 if (ISSET_PIXCOLOR (Color_BD)) 2271 if (ISSET_PIXCOLOR (Color_BD))
2278 fore = Color_BD; 2272 fore = Color_BD;
2279# if !ENABLE_STYLES 2273# if !ENABLE_STYLES
2280 else 2274 else
2281 invert = !invert; 2275 invert = !invert;
2282# endif 2276# endif
2283 } 2277 }
2284 2278
2285 if (rend & RS_Italic 2279 if (rend & RS_Italic && fore == Color_fg)
2286 && fore == Color_fg)
2287 { 2280 {
2288 if (ISSET_PIXCOLOR (Color_IT)) 2281 if (ISSET_PIXCOLOR (Color_IT))
2289 fore = Color_IT; 2282 fore = Color_IT;
2290# if !ENABLE_STYLES 2283# if !ENABLE_STYLES
2291 else 2284 else
… …
2325 } 2318 }
2326 2319
2327#ifdef TEXT_BLINK 2320#ifdef TEXT_BLINK
2328 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2321 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2329 { 2322 {
2330 if (!text_blink_ev.active) 2323 if (!text_blink_ev.is_active ())
2331 { 2324 {
2332 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2325 text_blink_ev.again ();
2333 hidden_text = 0; 2326 hidden_text = 0;
2334 } 2327 }
2335 else if (hidden_text) 2328 else if (hidden_text)
2336 fore = back; 2329 fore = back;
2337 } 2330 }
… …
2478} 2471}
2479 2472
2480void 2473void
2481rxvt_term::scr_recolour () NOTHROW 2474rxvt_term::scr_recolour () NOTHROW
2482{ 2475{
2483 if (1
2484#if ENABLE_TRANSPARENCY
2485 && !am_transparent
2486#endif
2487#ifdef HAVE_BG_PIXMAP 2476#ifdef HAVE_BG_PIXMAP
2488 && !bgPixmap.pixmap 2477 bgPixmap.apply ();
2489#endif 2478#else
2490 ) 2479
2491 {
2492 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2493 XClearWindow (dpy, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2494 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483
2495#if HAVE_SCROLLBARS 2484# if HAVE_SCROLLBARS
2496 if (scrollBar.win) 2485 if (scrollBar.win)
2497 { 2486 {
2498 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2499 scrollBar.setIdle (); 2488 scrollBar.setIdle ();
2500 scrollbar_show (0); 2489 scrollbar_show (0);
2501 } 2490 }
2502#endif 2491# endif
2503 }
2504 2492
2505 scr_clear (); 2493 scr_clear ();
2506 scr_touch (true); 2494 scr_touch (true);
2507 want_refresh = 1; 2495 want_refresh = 1;
2496
2497#endif
2508} 2498}
2509 2499
2510/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2511void 2501void
2512rxvt_term::scr_clear (bool really) NOTHROW 2502rxvt_term::scr_clear (bool really) NOTHROW
… …
2747 if (!delete_prop) 2737 if (!delete_prop)
2748 XDeleteProperty (dpy, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2749 2739
2750 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2751 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2752 incr_ev.start (NOW + 10); 2742 incr_ev.start (10);
2753 2743
2754 goto bailout; 2744 goto bailout;
2755 } 2745 }
2756 2746
2757 if (ct.nitems == 0) 2747 if (ct.nitems == 0)
… …
2766 ct.nitems = incr_buf_fill; 2756 ct.nitems = incr_buf_fill;
2767 incr_buf = 0; 2757 incr_buf = 0;
2768 incr_buf_size = 0; 2758 incr_buf_size = 0;
2769 incr_ev.stop (); 2759 incr_ev.stop ();
2770 } 2760 }
2771 else 2761 else
2772 { 2762 {
2773 if (selection_wait == Sel_normal 2763 if (selection_wait == Sel_normal
2774 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2775 { 2765 {
2776 /* 2766 /*
… …
2783 goto bailout; 2773 goto bailout;
2784 } 2774 }
2785 } 2775 }
2786 else if (selection_wait == Sel_incr) 2776 else if (selection_wait == Sel_incr)
2787 { 2777 {
2788 incr_ev.start (NOW + 10); 2778 incr_ev.start (10);
2789 2779
2790 while (incr_buf_fill + ct.nitems > incr_buf_size) 2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2791 { 2781 {
2792 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2793 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2833 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2834 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2835} 2825}
2836 2826
2837void 2827void
2838rxvt_term::incr_cb (time_watcher &w) NOTHROW 2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2839{ 2829{
2840 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2841 2831
2842 incr_buf_size = 0; 2832 incr_buf_size = 0;
2843 free (incr_buf); 2833 free (incr_buf);
… …
2854 selection_paste (win, prop, true); 2844 selection_paste (win, prop, true);
2855} 2845}
2856 2846
2857/* ------------------------------------------------------------------------- */ 2847/* ------------------------------------------------------------------------- */
2858/* 2848/*
2859 * Request the current selection: 2849 * Request the current selection:
2860 * Order: > internal selection if available 2850 * Order: > internal selection if available
2861 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2862 * > CUT_BUFFER0 2852 * > CUT_BUFFER0
2863 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2864 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
… …
2866 */ 2856 */
2867void 2857void
2868rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2869{ 2859{
2870 if (selection.text && selnum == Sel_Primary) 2860 if (selection.text && selnum == Sel_Primary)
2861 {
2871 { /* internal selection */ 2862 /* internal selection */
2872 char *str = rxvt_wcstombs (selection.text, selection.len); 2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2873 paste (str, strlen (str)); 2864 paste (str, strlen (str));
2874 free (str); 2865 free (str);
2875 return; 2866 return;
2876 } 2867 }
… …
3142 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3133 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3143 3134
3144 while (selection.mark.col > 0 3135 while (selection.mark.col > 0
3145 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3136 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3146 --selection.mark.col; 3137 --selection.mark.col;
3147 3138
3148 if (selection.op) 3139 if (selection.op)
3140 {
3149 { /* clear the old selection */ 3141 /* clear the old selection */
3150 selection.beg.row = selection.end.row = selection.mark.row; 3142 selection.beg.row = selection.end.row = selection.mark.row;
3151 selection.beg.col = selection.end.col = selection.mark.col; 3143 selection.beg.col = selection.end.col = selection.mark.col;
3152 } 3144 }
3153 3145
3154 selection.op = SELECTION_INIT; 3146 selection.op = SELECTION_INIT;
… …
3343 * a point/word/line which is either the start or end of the selection 3335 * a point/word/line which is either the start or end of the selection
3344 * and it was decided by whichever point/word/line was `fixed' at the 3336 * and it was decided by whichever point/word/line was `fixed' at the
3345 * time of the most recent button3 press 3337 * time of the most recent button3 press
3346 */ 3338 */
3347 if (button3 && buttonpress) 3339 if (button3 && buttonpress)
3340 {
3348 { /* button3 press */ 3341 /* button3 press */
3349 /* 3342 /*
3350 * first determine which edge of the selection we are closest to 3343 * first determine which edge of the selection we are closest to
3351 */ 3344 */
3352 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3345 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3353 || (!ROWCOL_IS_AFTER (pos, selection.end) 3346 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3371 selection.mark.row = selection.beg.row; 3364 selection.mark.row = selection.beg.row;
3372 selection.mark.col = selection.beg.col; 3365 selection.mark.col = selection.beg.col;
3373 } 3366 }
3374 } 3367 }
3375 else 3368 else
3369 {
3376 { /* button1 drag or button3 drag */ 3370 /* button1 drag or button3 drag */
3377 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3371 if (ROWCOL_IS_AFTER (selection.mark, pos))
3378 { 3372 {
3379 if (selection.mark.row == selection.end.row 3373 if (selection.mark.row == selection.end.row
3380 && selection.mark.col == selection.end.col 3374 && selection.mark.col == selection.end.col
3381 && clickchange 3375 && clickchange
… …
3462 selection.end.row++; 3456 selection.end.row++;
3463 } 3457 }
3464 } 3458 }
3465 3459
3466 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3461 {
3467 { /* mark may need to be changed */ 3462 /* mark may need to be changed */
3468 if (closeto == LEFT) 3463 if (closeto == LEFT)
3469 { 3464 {
3470 selection.mark.row = selection.end.row; 3465 selection.mark.row = selection.end.row;
3471 selection.mark.col = selection.end.col - (selection.clicks == 2); 3466 selection.mark.col = selection.end.col - (selection.clicks == 2);
3472 } 3467 }
… …
3671 XFree (ct.value); 3666 XFree (ct.value);
3672 } 3667 }
3673 3668
3674 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3669 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3675} 3670}
3676
3677/* ------------------------------------------------------------------------- *
3678 * MOUSE ROUTINES *
3679 * ------------------------------------------------------------------------- */
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 3671
3693/* ------------------------------------------------------------------------- */ 3672/* ------------------------------------------------------------------------- */
3694#ifdef USE_XIM 3673#ifdef USE_XIM
3695void 3674void
3696rxvt_term::im_set_position (XPoint &pos) NOTHROW 3675rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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