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.282 by ayin, Wed Oct 31 10:06:42 2007 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 2008 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.
… …
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row> 88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 91 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \ 92#define CLEAR_ROWS(row, num) \
95 if (mapped) \ 93 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \ 94 XClearArea (dpy, vt, 0, \
97 Row2Pixel (row), (unsigned int)width, \ 95 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False) 96 (unsigned int)Height2Pixel (num), False)
99 97
100#define CLEAR_CHARS(x, y, num) \ 98#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 99 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 100 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 101 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 102 (unsigned int)Height2Pixel (1), False)
105 103
106#define ERASE_ROWS(row, num) \ 104#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \ 105 XFillRectangle (dpy, vt, gc, \
108 0, Row2Pixel (row), \ 106 0, Row2Pixel (row), \
109 (unsigned int)width, \ 107 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num)) 108 (unsigned int)Height2Pixel (num))
111 109
112/* ------------------------------------------------------------------------- * 110/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 111 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 112 * ------------------------------------------------------------------------- */
… …
596/* 594/*
597 * Change the rendition style for following text 595 * Change the rendition style for following text
598 */ 596 */
599void 597void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 598rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 599{
602 if (set) 600 if (set)
603 rstyle |= style; 601 rstyle |= style;
604 else if (style == ~RS_None) 602 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 603 rstyle = DEFAULT_RSTYLE;
606 else 604 else
607 rstyle &= ~style; 605 rstyle &= ~style;
608 } 606}
609 607
610/* ------------------------------------------------------------------------- */ 608/* ------------------------------------------------------------------------- */
611/* 609/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 610 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 611 * count positive ==> scroll up
… …
1011 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1012 */ 1010 */
1013void 1011void
1014rxvt_term::scr_backspace () NOTHROW 1012rxvt_term::scr_backspace () NOTHROW
1015{ 1013{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1019 { 1015 {
1020 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1021 { 1017 {
1022#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1020 --screen.cur.row;
1025 return; 1021
1022 want_refresh = 1;
1026#endif 1023#endif
1027 } 1024 }
1028 } 1025 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1030 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1028}
1034 1029
1035/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1036/* 1031/*
1037 * Process Horizontal Tab 1032 * Process Horizontal Tab
… …
1186 } 1181 }
1187 } 1182 }
1188 else 1183 else
1189 { 1184 {
1190 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1191 { /* relative origin mode */ 1187 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1194 } 1190 }
1195 else 1191 else
1196 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1229/* 1225/*
1230 * Erase part or whole of a line 1226 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1231 */
1235void 1232void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1234{
1238 unsigned int col, num; 1235 unsigned int col, num;
… …
1247 line.touch (); 1244 line.touch ();
1248 line.is_longer (0); 1245 line.is_longer (0);
1249 1246
1250 switch (mode) 1247 switch (mode)
1251 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1252 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1256 col = screen.cur.col;
1254 num = ncol - col; 1257 num = ncol - col;
1255 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1259 break; 1263 break;
1264
1260 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1261 col = 0; 1266 col = 0;
1262 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1266 break; 1272 break;
1273
1267 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1268 col = 0; 1275 col = 0;
1269 num = ncol; 1276 num = ncol;
1270 line.l = 0; 1277 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1472 { 1479 {
1473 if (selection.end.row != screen.cur.row 1480 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1481 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1482 CLEAR_SELECTION ();
1476 else 1483 else
1484 {
1477 { /* shift selection */ 1485 /* shift selection */
1478 selection.beg.col += count; 1486 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1487 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1488 selection.end.col += count;
1481 } 1489 }
1482 } 1490 }
… …
1866 return true; 1874 return true;
1867} 1875}
1868 1876
1869#ifndef NO_BELL 1877#ifndef NO_BELL
1870void 1878void
1871rxvt_term::bell_cb (time_watcher &w) 1879rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1880{
1873 rvideo_bell = false; 1881 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1882 scr_rvideo_mode (rvideo_mode);
1883 refresh_check ();
1875} 1884}
1876#endif 1885#endif
1877 1886
1878/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1879void 1888void
… …
1901 1910
1902 if (option (Opt_visualBell)) 1911 if (option (Opt_visualBell))
1903 { 1912 {
1904 rvideo_bell = true; 1913 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1914 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1915 flush ();
1907 1916
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1917 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1918 }
1910 else 1919 else
1911 XBell (dpy, 0); 1920 XBell (dpy, 0);
1912#endif 1921#endif
1913} 1922}
… …
1994 return; 2003 return;
1995 2004
1996 /* 2005 /*
1997 * A: set up vars 2006 * A: set up vars
1998 */ 2007 */
2008 refresh_count = 0;
2009
1999 have_bg = 0; 2010 have_bg = 0;
2000 refresh_count = 0;
2001
2002#ifdef HAVE_BG_PIXMAP 2011#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2012 have_bg = bgPixmap.pixmap != None;
2004#endif 2013#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2015
2007 /* 2016 /*
2008 * B: reverse any characters which are selected 2017 * B: reverse any characters which are selected
… …
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2262 { 2271 {
2263 bool invert = rend & RS_RVid; 2272 bool invert = rend & RS_RVid;
2264 2273
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2274#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2275 if (rend & RS_Bold && fore == Color_fg)
2268 { 2276 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2277 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2278 fore = Color_BD;
2271# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2272 else 2280 else
2273 invert = !invert; 2281 invert = !invert;
2274# endif 2282# endif
2275 } 2283 }
2276 2284
2277 if (rend & RS_Italic 2285 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2286 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2287 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2288 fore = Color_IT;
2282# if !ENABLE_STYLES 2289# if !ENABLE_STYLES
2283 else 2290 else
… …
2317 } 2324 }
2318 2325
2319#ifdef TEXT_BLINK 2326#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2327 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2328 {
2322 if (!text_blink_ev.active) 2329 if (!text_blink_ev.is_active ())
2323 { 2330 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2331 text_blink_ev.again ();
2325 hidden_text = 0; 2332 hidden_text = 0;
2326 } 2333 }
2327 else if (hidden_text) 2334 else if (hidden_text)
2328 fore = back; 2335 fore = back;
2329 } 2336 }
… …
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2384 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2385 else
2379#endif 2386#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2387 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2388
2382 XDrawLine (dpy, drawBuffer, gc, 2389 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2390 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2392 }
2386 } /* for (col....) */ 2393 } /* for (col....) */
2387 } /* for (row....) */ 2394 } /* for (row....) */
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2432 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2433 else
2427#endif 2434#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2436
2430 XDrawRectangle (dpy, drawBuffer, gc, 2437 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2438 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2439 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2440 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2442 }
… …
2473rxvt_term::scr_recolour () NOTHROW 2480rxvt_term::scr_recolour () NOTHROW
2474{ 2481{
2475#ifdef HAVE_BG_PIXMAP 2482#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2483 bgPixmap.apply ();
2477#else 2484#else
2485
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]); 2487 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2489
2482 if (scrollBar.win) 2490 if (scrollBar.win)
2483 { 2491 {
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2493 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2494 scrollBar.show (0);
2487 } 2495 }
2496
2488# endif 2497#endif
2498
2499 /* bgPixmap.apply () does not do the following : */
2489 scr_clear (); 2500 scr_clear ();
2490 scr_touch (true); 2501 scr_touch (true);
2491 want_refresh = 1; 2502 want_refresh = 1;
2492#endif
2493
2494} 2503}
2495 2504
2496/* ------------------------------------------------------------------------- */ 2505/* ------------------------------------------------------------------------- */
2497void 2506void
2498rxvt_term::scr_clear (bool really) NOTHROW 2507rxvt_term::scr_clear (bool really) NOTHROW
… …
2587{ 2596{
2588 int row, wrote; 2597 int row, wrote;
2589 unsigned int width, towrite; 2598 unsigned int width, towrite;
2590 char r1[] = "\n"; 2599 char r1[] = "\n";
2591 2600
2592 for (row = saveLines - nsaved; 2601 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2602 row < saveLines + nrow - 1; row++)
2594 { 2603 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2605 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2606 for (towrite = width; towrite; towrite -= wrote)
… …
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2657 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2658 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2659 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2660 data[i] = C0_CR;
2652 2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~");
2664
2653 tt_write (data, len); 2665 tt_write (data, len);
2666
2667 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~");
2654} 2669}
2655 2670
2656/* ------------------------------------------------------------------------- */ 2671/* ------------------------------------------------------------------------- */
2657/* 2672/*
2658 * Respond to a notification that a primary selection has been sent 2673 * Respond to a notification that a primary selection has been sent
… …
2733 if (!delete_prop) 2748 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop); 2749 XDeleteProperty (dpy, win, prop);
2735 2750
2736 selection_wait = Sel_incr; 2751 selection_wait = Sel_incr;
2737 incr_buf_fill = 0; 2752 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10); 2753 incr_ev.start (10);
2739 2754
2740 goto bailout; 2755 goto bailout;
2741 } 2756 }
2742 2757
2743 if (ct.nitems == 0) 2758 if (ct.nitems == 0)
… …
2769 goto bailout; 2784 goto bailout;
2770 } 2785 }
2771 } 2786 }
2772 else if (selection_wait == Sel_incr) 2787 else if (selection_wait == Sel_incr)
2773 { 2788 {
2774 incr_ev.start (NOW + 10); 2789 incr_ev.start (10);
2775 2790
2776 while (incr_buf_fill + ct.nitems > incr_buf_size) 2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 { 2792 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2819 if (selection_wait == Sel_normal) 2834 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none; 2835 selection_wait = Sel_none;
2821} 2836}
2822 2837
2823void 2838void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2825{ 2840{
2826 selection_wait = Sel_none; 2841 selection_wait = Sel_none;
2827 2842
2828 incr_buf_size = 0; 2843 incr_buf_size = 0;
2829 free (incr_buf); 2844 free (incr_buf);
… …
2852 */ 2867 */
2853void 2868void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2870{
2856 if (selection.text && selnum == Sel_Primary) 2871 if (selection.text && selnum == Sel_Primary)
2872 {
2857 { /* internal selection */ 2873 /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len); 2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str)); 2875 paste (str, strlen (str));
2860 free (str); 2876 free (str);
2861 return; 2877 return;
2862 } 2878 }
… …
3130 while (selection.mark.col > 0 3146 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3148 --selection.mark.col;
3133 3149
3134 if (selection.op) 3150 if (selection.op)
3151 {
3135 { /* clear the old selection */ 3152 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3153 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3154 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3155 }
3139 3156
3140 selection.op = SELECTION_INIT; 3157 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3346 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3347 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3348 * time of the most recent button3 press
3332 */ 3349 */
3333 if (button3 && buttonpress) 3350 if (button3 && buttonpress)
3351 {
3334 { /* button3 press */ 3352 /* button3 press */
3335 /* 3353 /*
3336 * first determine which edge of the selection we are closest to 3354 * first determine which edge of the selection we are closest to
3337 */ 3355 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3356 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3357 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3375 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3376 selection.mark.col = selection.beg.col;
3359 } 3377 }
3360 } 3378 }
3361 else 3379 else
3380 {
3362 { /* button1 drag or button3 drag */ 3381 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3382 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3383 {
3365 if (selection.mark.row == selection.end.row 3384 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3385 && selection.mark.col == selection.end.col
3367 && clickchange 3386 && clickchange
… …
3448 selection.end.row++; 3467 selection.end.row++;
3449 } 3468 }
3450 } 3469 }
3451 3470
3452 if (button3 && buttonpress) 3471 if (button3 && buttonpress)
3472 {
3453 { /* mark may need to be changed */ 3473 /* mark may need to be changed */
3454 if (closeto == LEFT) 3474 if (closeto == LEFT)
3455 { 3475 {
3456 selection.mark.row = selection.end.row; 3476 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3477 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3478 }

Diff Legend

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