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 | */ |
599 | void |
597 | void |
600 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
598 | rxvt_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 | */ |
1013 | void |
1011 | void |
1014 | rxvt_term::scr_backspace () NOTHROW |
1012 | rxvt_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; |
… | |
… | |
1472 | { |
1468 | { |
1473 | if (selection.end.row != screen.cur.row |
1469 | if (selection.end.row != screen.cur.row |
1474 | || (selection.end.col + count >= ncol)) |
1470 | || (selection.end.col + count >= ncol)) |
1475 | CLEAR_SELECTION (); |
1471 | CLEAR_SELECTION (); |
1476 | else |
1472 | else |
|
|
1473 | { |
1477 | { /* shift selection */ |
1474 | /* shift selection */ |
1478 | selection.beg.col += count; |
1475 | selection.beg.col += count; |
1479 | selection.mark.col += count; /* XXX: yes? */ |
1476 | selection.mark.col += count; /* XXX: yes? */ |
1480 | selection.end.col += count; |
1477 | selection.end.col += count; |
1481 | } |
1478 | } |
1482 | } |
1479 | } |
… | |
… | |
1866 | return true; |
1863 | return true; |
1867 | } |
1864 | } |
1868 | |
1865 | |
1869 | #ifndef NO_BELL |
1866 | #ifndef NO_BELL |
1870 | void |
1867 | void |
1871 | rxvt_term::bell_cb (time_watcher &w) |
1868 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1872 | { |
1869 | { |
1873 | rvideo_bell = false; |
1870 | rvideo_bell = false; |
1874 | scr_rvideo_mode (rvideo_mode); |
1871 | scr_rvideo_mode (rvideo_mode); |
|
|
1872 | refresh_check (); |
1875 | } |
1873 | } |
1876 | #endif |
1874 | #endif |
1877 | |
1875 | |
1878 | /* ------------------------------------------------------------------------- */ |
1876 | /* ------------------------------------------------------------------------- */ |
1879 | void |
1877 | void |
… | |
… | |
1901 | |
1899 | |
1902 | if (option (Opt_visualBell)) |
1900 | if (option (Opt_visualBell)) |
1903 | { |
1901 | { |
1904 | rvideo_bell = true; |
1902 | rvideo_bell = true; |
1905 | scr_rvideo_mode (rvideo_mode); |
1903 | scr_rvideo_mode (rvideo_mode); |
1906 | display->flush (); |
1904 | flush (); |
1907 | |
1905 | |
1908 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1906 | bell_ev.start (VISUAL_BELL_DURATION); |
1909 | } |
1907 | } |
1910 | else |
1908 | else |
1911 | XBell (dpy, 0); |
1909 | XBell (dpy, 0); |
1912 | #endif |
1910 | #endif |
1913 | } |
1911 | } |
… | |
… | |
2261 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2259 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2262 | { |
2260 | { |
2263 | bool invert = rend & RS_RVid; |
2261 | bool invert = rend & RS_RVid; |
2264 | |
2262 | |
2265 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2263 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2266 | if (rend & RS_Bold |
|
|
2267 | && fore == Color_fg) |
2264 | if (rend & RS_Bold && fore == Color_fg) |
2268 | { |
2265 | { |
2269 | if (ISSET_PIXCOLOR (Color_BD)) |
2266 | if (ISSET_PIXCOLOR (Color_BD)) |
2270 | fore = Color_BD; |
2267 | fore = Color_BD; |
2271 | # if !ENABLE_STYLES |
2268 | # if !ENABLE_STYLES |
2272 | else |
2269 | else |
2273 | invert = !invert; |
2270 | invert = !invert; |
2274 | # endif |
2271 | # endif |
2275 | } |
2272 | } |
2276 | |
2273 | |
2277 | if (rend & RS_Italic |
2274 | if (rend & RS_Italic && fore == Color_fg) |
2278 | && fore == Color_fg) |
|
|
2279 | { |
2275 | { |
2280 | if (ISSET_PIXCOLOR (Color_IT)) |
2276 | if (ISSET_PIXCOLOR (Color_IT)) |
2281 | fore = Color_IT; |
2277 | fore = Color_IT; |
2282 | # if !ENABLE_STYLES |
2278 | # if !ENABLE_STYLES |
2283 | else |
2279 | else |
… | |
… | |
2317 | } |
2313 | } |
2318 | |
2314 | |
2319 | #ifdef TEXT_BLINK |
2315 | #ifdef TEXT_BLINK |
2320 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2316 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2321 | { |
2317 | { |
2322 | if (!text_blink_ev.active) |
2318 | if (!text_blink_ev.is_active ()) |
2323 | { |
2319 | { |
2324 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2320 | text_blink_ev.again (); |
2325 | hidden_text = 0; |
2321 | hidden_text = 0; |
2326 | } |
2322 | } |
2327 | else if (hidden_text) |
2323 | else if (hidden_text) |
2328 | fore = back; |
2324 | fore = back; |
2329 | } |
2325 | } |
… | |
… | |
2377 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2373 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2378 | else |
2374 | else |
2379 | #endif |
2375 | #endif |
2380 | XSetForeground (dpy, gc, pix_colors[fore]); |
2376 | XSetForeground (dpy, gc, pix_colors[fore]); |
2381 | |
2377 | |
2382 | XDrawLine (dpy, drawBuffer, gc, |
2378 | XDrawLine (dpy, vt, gc, |
2383 | xpixel, ypixel + font->ascent + 1, |
2379 | xpixel, ypixel + font->ascent + 1, |
2384 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2380 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2385 | } |
2381 | } |
2386 | } /* for (col....) */ |
2382 | } /* for (col....) */ |
2387 | } /* for (row....) */ |
2383 | } /* for (row....) */ |
… | |
… | |
2425 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2421 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
2426 | else |
2422 | else |
2427 | #endif |
2423 | #endif |
2428 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2424 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2429 | |
2425 | |
2430 | XDrawRectangle (dpy, drawBuffer, gc, |
2426 | XDrawRectangle (dpy, vt, gc, |
2431 | Col2Pixel (col), |
2427 | Col2Pixel (col), |
2432 | Row2Pixel (oldcursor.row), |
2428 | Row2Pixel (oldcursor.row), |
2433 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2429 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2434 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2430 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2435 | } |
2431 | } |
… | |
… | |
2473 | rxvt_term::scr_recolour () NOTHROW |
2469 | rxvt_term::scr_recolour () NOTHROW |
2474 | { |
2470 | { |
2475 | #ifdef HAVE_BG_PIXMAP |
2471 | #ifdef HAVE_BG_PIXMAP |
2476 | bgPixmap.apply (); |
2472 | bgPixmap.apply (); |
2477 | #else |
2473 | #else |
|
|
2474 | |
2478 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2475 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2479 | XClearWindow (dpy, parent[0]); |
2476 | XClearWindow (dpy, parent[0]); |
2480 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2477 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2478 | |
2481 | # if HAVE_SCROLLBARS |
2479 | # if HAVE_SCROLLBARS |
2482 | if (scrollBar.win) |
2480 | if (scrollBar.win) |
2483 | { |
2481 | { |
2484 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2482 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2485 | scrollBar.setIdle (); |
2483 | scrollBar.setIdle (); |
2486 | scrollbar_show (0); |
2484 | scrollbar_show (0); |
2487 | } |
2485 | } |
2488 | # endif |
2486 | # endif |
|
|
2487 | |
2489 | scr_clear (); |
2488 | scr_clear (); |
2490 | scr_touch (true); |
2489 | scr_touch (true); |
2491 | want_refresh = 1; |
2490 | want_refresh = 1; |
2492 | #endif |
|
|
2493 | |
2491 | |
|
|
2492 | #endif |
2494 | } |
2493 | } |
2495 | |
2494 | |
2496 | /* ------------------------------------------------------------------------- */ |
2495 | /* ------------------------------------------------------------------------- */ |
2497 | void |
2496 | void |
2498 | rxvt_term::scr_clear (bool really) NOTHROW |
2497 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2648 | /* convert normal newline chars into common keyboard Return key sequence */ |
2647 | /* convert normal newline chars into common keyboard Return key sequence */ |
2649 | for (unsigned int i = 0; i < len; i++) |
2648 | for (unsigned int i = 0; i < len; i++) |
2650 | if (data[i] == C0_LF) |
2649 | if (data[i] == C0_LF) |
2651 | data[i] = C0_CR; |
2650 | data[i] = C0_CR; |
2652 | |
2651 | |
|
|
2652 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2653 | tt_printf ("\e[200~"); |
|
|
2654 | |
2653 | tt_write (data, len); |
2655 | tt_write (data, len); |
|
|
2656 | |
|
|
2657 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2658 | tt_printf ("\e[201~"); |
2654 | } |
2659 | } |
2655 | |
2660 | |
2656 | /* ------------------------------------------------------------------------- */ |
2661 | /* ------------------------------------------------------------------------- */ |
2657 | /* |
2662 | /* |
2658 | * Respond to a notification that a primary selection has been sent |
2663 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2733 | if (!delete_prop) |
2738 | if (!delete_prop) |
2734 | XDeleteProperty (dpy, win, prop); |
2739 | XDeleteProperty (dpy, win, prop); |
2735 | |
2740 | |
2736 | selection_wait = Sel_incr; |
2741 | selection_wait = Sel_incr; |
2737 | incr_buf_fill = 0; |
2742 | incr_buf_fill = 0; |
2738 | incr_ev.start (NOW + 10); |
2743 | incr_ev.start (10); |
2739 | |
2744 | |
2740 | goto bailout; |
2745 | goto bailout; |
2741 | } |
2746 | } |
2742 | |
2747 | |
2743 | if (ct.nitems == 0) |
2748 | if (ct.nitems == 0) |
… | |
… | |
2769 | goto bailout; |
2774 | goto bailout; |
2770 | } |
2775 | } |
2771 | } |
2776 | } |
2772 | else if (selection_wait == Sel_incr) |
2777 | else if (selection_wait == Sel_incr) |
2773 | { |
2778 | { |
2774 | incr_ev.start (NOW + 10); |
2779 | incr_ev.start (10); |
2775 | |
2780 | |
2776 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2781 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2777 | { |
2782 | { |
2778 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2783 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2779 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2784 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2819 | if (selection_wait == Sel_normal) |
2824 | if (selection_wait == Sel_normal) |
2820 | selection_wait = Sel_none; |
2825 | selection_wait = Sel_none; |
2821 | } |
2826 | } |
2822 | |
2827 | |
2823 | void |
2828 | void |
2824 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2829 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2825 | { |
2830 | { |
2826 | selection_wait = Sel_none; |
2831 | selection_wait = Sel_none; |
2827 | |
2832 | |
2828 | incr_buf_size = 0; |
2833 | incr_buf_size = 0; |
2829 | free (incr_buf); |
2834 | free (incr_buf); |
… | |
… | |
2852 | */ |
2857 | */ |
2853 | void |
2858 | void |
2854 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2859 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2855 | { |
2860 | { |
2856 | if (selection.text && selnum == Sel_Primary) |
2861 | if (selection.text && selnum == Sel_Primary) |
|
|
2862 | { |
2857 | { /* internal selection */ |
2863 | /* internal selection */ |
2858 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2864 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2859 | paste (str, strlen (str)); |
2865 | paste (str, strlen (str)); |
2860 | free (str); |
2866 | free (str); |
2861 | return; |
2867 | return; |
2862 | } |
2868 | } |
… | |
… | |
3130 | while (selection.mark.col > 0 |
3136 | while (selection.mark.col > 0 |
3131 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3137 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3132 | --selection.mark.col; |
3138 | --selection.mark.col; |
3133 | |
3139 | |
3134 | if (selection.op) |
3140 | if (selection.op) |
|
|
3141 | { |
3135 | { /* clear the old selection */ |
3142 | /* clear the old selection */ |
3136 | selection.beg.row = selection.end.row = selection.mark.row; |
3143 | selection.beg.row = selection.end.row = selection.mark.row; |
3137 | selection.beg.col = selection.end.col = selection.mark.col; |
3144 | selection.beg.col = selection.end.col = selection.mark.col; |
3138 | } |
3145 | } |
3139 | |
3146 | |
3140 | selection.op = SELECTION_INIT; |
3147 | selection.op = SELECTION_INIT; |
… | |
… | |
3329 | * a point/word/line which is either the start or end of the selection |
3336 | * 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 |
3337 | * and it was decided by whichever point/word/line was `fixed' at the |
3331 | * time of the most recent button3 press |
3338 | * time of the most recent button3 press |
3332 | */ |
3339 | */ |
3333 | if (button3 && buttonpress) |
3340 | if (button3 && buttonpress) |
|
|
3341 | { |
3334 | { /* button3 press */ |
3342 | /* button3 press */ |
3335 | /* |
3343 | /* |
3336 | * first determine which edge of the selection we are closest to |
3344 | * first determine which edge of the selection we are closest to |
3337 | */ |
3345 | */ |
3338 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3346 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3339 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3347 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3357 | selection.mark.row = selection.beg.row; |
3365 | selection.mark.row = selection.beg.row; |
3358 | selection.mark.col = selection.beg.col; |
3366 | selection.mark.col = selection.beg.col; |
3359 | } |
3367 | } |
3360 | } |
3368 | } |
3361 | else |
3369 | else |
|
|
3370 | { |
3362 | { /* button1 drag or button3 drag */ |
3371 | /* button1 drag or button3 drag */ |
3363 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3372 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3364 | { |
3373 | { |
3365 | if (selection.mark.row == selection.end.row |
3374 | if (selection.mark.row == selection.end.row |
3366 | && selection.mark.col == selection.end.col |
3375 | && selection.mark.col == selection.end.col |
3367 | && clickchange |
3376 | && clickchange |
… | |
… | |
3448 | selection.end.row++; |
3457 | selection.end.row++; |
3449 | } |
3458 | } |
3450 | } |
3459 | } |
3451 | |
3460 | |
3452 | if (button3 && buttonpress) |
3461 | if (button3 && buttonpress) |
|
|
3462 | { |
3453 | { /* mark may need to be changed */ |
3463 | /* mark may need to be changed */ |
3454 | if (closeto == LEFT) |
3464 | if (closeto == LEFT) |
3455 | { |
3465 | { |
3456 | selection.mark.row = selection.end.row; |
3466 | selection.mark.row = selection.end.row; |
3457 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3467 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3458 | } |
3468 | } |