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. |
… | |
… | |
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 | |
… | |
… | |
596 | /* |
596 | /* |
597 | * Change the rendition style for following text |
597 | * Change the rendition style for following text |
598 | */ |
598 | */ |
599 | void |
599 | void |
600 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
600 | rxvt_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 | } |
… | |
… | |
1866 | return true; |
1868 | return true; |
1867 | } |
1869 | } |
1868 | |
1870 | |
1869 | #ifndef NO_BELL |
1871 | #ifndef NO_BELL |
1870 | void |
1872 | void |
1871 | rxvt_term::bell_cb (time_watcher &w) |
1873 | rxvt_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); |
|
|
1877 | refresh_check (); |
1875 | } |
1878 | } |
1876 | #endif |
1879 | #endif |
1877 | |
1880 | |
1878 | /* ------------------------------------------------------------------------- */ |
1881 | /* ------------------------------------------------------------------------- */ |
1879 | void |
1882 | void |
… | |
… | |
1901 | |
1904 | |
1902 | if (option (Opt_visualBell)) |
1905 | if (option (Opt_visualBell)) |
1903 | { |
1906 | { |
1904 | rvideo_bell = true; |
1907 | rvideo_bell = true; |
1905 | scr_rvideo_mode (rvideo_mode); |
1908 | scr_rvideo_mode (rvideo_mode); |
1906 | display->flush (); |
1909 | flush (); |
1907 | |
1910 | |
1908 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1911 | bell_ev.start (VISUAL_BELL_DURATION); |
1909 | } |
1912 | } |
1910 | else |
1913 | else |
1911 | XBell (dpy, 0); |
1914 | XBell (dpy, 0); |
1912 | #endif |
1915 | #endif |
1913 | } |
1916 | } |
… | |
… | |
2261 | 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)) |
2262 | { |
2265 | { |
2263 | bool invert = rend & RS_RVid; |
2266 | bool invert = rend & RS_RVid; |
2264 | |
2267 | |
2265 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2268 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2266 | if (rend & RS_Bold |
|
|
2267 | && fore == Color_fg) |
2269 | if (rend & RS_Bold && fore == Color_fg) |
2268 | { |
2270 | { |
2269 | if (ISSET_PIXCOLOR (Color_BD)) |
2271 | if (ISSET_PIXCOLOR (Color_BD)) |
2270 | fore = Color_BD; |
2272 | fore = Color_BD; |
2271 | # if !ENABLE_STYLES |
2273 | # if !ENABLE_STYLES |
2272 | else |
2274 | else |
2273 | invert = !invert; |
2275 | invert = !invert; |
2274 | # endif |
2276 | # endif |
2275 | } |
2277 | } |
2276 | |
2278 | |
2277 | if (rend & RS_Italic |
2279 | if (rend & RS_Italic && fore == Color_fg) |
2278 | && fore == Color_fg) |
|
|
2279 | { |
2280 | { |
2280 | if (ISSET_PIXCOLOR (Color_IT)) |
2281 | if (ISSET_PIXCOLOR (Color_IT)) |
2281 | fore = Color_IT; |
2282 | fore = Color_IT; |
2282 | # if !ENABLE_STYLES |
2283 | # if !ENABLE_STYLES |
2283 | else |
2284 | else |
… | |
… | |
2317 | } |
2318 | } |
2318 | |
2319 | |
2319 | #ifdef TEXT_BLINK |
2320 | #ifdef TEXT_BLINK |
2320 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2321 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2321 | { |
2322 | { |
2322 | if (!text_blink_ev.active) |
2323 | if (!text_blink_ev.is_active ()) |
2323 | { |
2324 | { |
2324 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2325 | text_blink_ev.again (); |
2325 | hidden_text = 0; |
2326 | hidden_text = 0; |
2326 | } |
2327 | } |
2327 | else if (hidden_text) |
2328 | else if (hidden_text) |
2328 | fore = back; |
2329 | fore = back; |
2329 | } |
2330 | } |
… | |
… | |
2473 | rxvt_term::scr_recolour () NOTHROW |
2474 | rxvt_term::scr_recolour () NOTHROW |
2474 | { |
2475 | { |
2475 | #ifdef HAVE_BG_PIXMAP |
2476 | #ifdef HAVE_BG_PIXMAP |
2476 | bgPixmap.apply (); |
2477 | bgPixmap.apply (); |
2477 | #else |
2478 | #else |
|
|
2479 | |
2478 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2480 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2479 | XClearWindow (dpy, parent[0]); |
2481 | XClearWindow (dpy, parent[0]); |
2480 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2482 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2483 | |
2481 | # if HAVE_SCROLLBARS |
2484 | # if HAVE_SCROLLBARS |
2482 | if (scrollBar.win) |
2485 | if (scrollBar.win) |
2483 | { |
2486 | { |
2484 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2487 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2485 | scrollBar.setIdle (); |
2488 | scrollBar.setIdle (); |
2486 | scrollbar_show (0); |
2489 | scrollbar_show (0); |
2487 | } |
2490 | } |
2488 | # endif |
2491 | # endif |
|
|
2492 | |
2489 | scr_clear (); |
2493 | scr_clear (); |
2490 | scr_touch (true); |
2494 | scr_touch (true); |
2491 | want_refresh = 1; |
2495 | want_refresh = 1; |
|
|
2496 | |
2492 | #endif |
2497 | #endif |
2493 | |
|
|
2494 | } |
2498 | } |
2495 | |
2499 | |
2496 | /* ------------------------------------------------------------------------- */ |
2500 | /* ------------------------------------------------------------------------- */ |
2497 | void |
2501 | void |
2498 | rxvt_term::scr_clear (bool really) NOTHROW |
2502 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2733 | if (!delete_prop) |
2737 | if (!delete_prop) |
2734 | XDeleteProperty (dpy, win, prop); |
2738 | XDeleteProperty (dpy, win, prop); |
2735 | |
2739 | |
2736 | selection_wait = Sel_incr; |
2740 | selection_wait = Sel_incr; |
2737 | incr_buf_fill = 0; |
2741 | incr_buf_fill = 0; |
2738 | incr_ev.start (NOW + 10); |
2742 | incr_ev.start (10); |
2739 | |
2743 | |
2740 | goto bailout; |
2744 | goto bailout; |
2741 | } |
2745 | } |
2742 | |
2746 | |
2743 | if (ct.nitems == 0) |
2747 | if (ct.nitems == 0) |
… | |
… | |
2752 | ct.nitems = incr_buf_fill; |
2756 | ct.nitems = incr_buf_fill; |
2753 | incr_buf = 0; |
2757 | incr_buf = 0; |
2754 | incr_buf_size = 0; |
2758 | incr_buf_size = 0; |
2755 | incr_ev.stop (); |
2759 | incr_ev.stop (); |
2756 | } |
2760 | } |
2757 | else |
2761 | else |
2758 | { |
2762 | { |
2759 | if (selection_wait == Sel_normal |
2763 | if (selection_wait == Sel_normal |
2760 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2764 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2761 | { |
2765 | { |
2762 | /* |
2766 | /* |
… | |
… | |
2769 | goto bailout; |
2773 | goto bailout; |
2770 | } |
2774 | } |
2771 | } |
2775 | } |
2772 | else if (selection_wait == Sel_incr) |
2776 | else if (selection_wait == Sel_incr) |
2773 | { |
2777 | { |
2774 | incr_ev.start (NOW + 10); |
2778 | incr_ev.start (10); |
2775 | |
2779 | |
2776 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2780 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2777 | { |
2781 | { |
2778 | 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; |
2779 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2783 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2819 | if (selection_wait == Sel_normal) |
2823 | if (selection_wait == Sel_normal) |
2820 | selection_wait = Sel_none; |
2824 | selection_wait = Sel_none; |
2821 | } |
2825 | } |
2822 | |
2826 | |
2823 | void |
2827 | void |
2824 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2828 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2825 | { |
2829 | { |
2826 | selection_wait = Sel_none; |
2830 | selection_wait = Sel_none; |
2827 | |
2831 | |
2828 | incr_buf_size = 0; |
2832 | incr_buf_size = 0; |
2829 | free (incr_buf); |
2833 | free (incr_buf); |
… | |
… | |
2840 | selection_paste (win, prop, true); |
2844 | selection_paste (win, prop, true); |
2841 | } |
2845 | } |
2842 | |
2846 | |
2843 | /* ------------------------------------------------------------------------- */ |
2847 | /* ------------------------------------------------------------------------- */ |
2844 | /* |
2848 | /* |
2845 | * Request the current selection: |
2849 | * Request the current selection: |
2846 | * Order: > internal selection if available |
2850 | * Order: > internal selection if available |
2847 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2851 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2848 | * > CUT_BUFFER0 |
2852 | * > CUT_BUFFER0 |
2849 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2853 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2850 | * will auto fallback to CUT_BUFFER0 |
2854 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2852 | */ |
2856 | */ |
2853 | void |
2857 | void |
2854 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2858 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2855 | { |
2859 | { |
2856 | if (selection.text && selnum == Sel_Primary) |
2860 | if (selection.text && selnum == Sel_Primary) |
|
|
2861 | { |
2857 | { /* internal selection */ |
2862 | /* internal selection */ |
2858 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2863 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2859 | paste (str, strlen (str)); |
2864 | paste (str, strlen (str)); |
2860 | free (str); |
2865 | free (str); |
2861 | return; |
2866 | return; |
2862 | } |
2867 | } |
… | |
… | |
3128 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3133 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3129 | |
3134 | |
3130 | while (selection.mark.col > 0 |
3135 | while (selection.mark.col > 0 |
3131 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3136 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3132 | --selection.mark.col; |
3137 | --selection.mark.col; |
3133 | |
3138 | |
3134 | if (selection.op) |
3139 | if (selection.op) |
|
|
3140 | { |
3135 | { /* clear the old selection */ |
3141 | /* clear the old selection */ |
3136 | selection.beg.row = selection.end.row = selection.mark.row; |
3142 | selection.beg.row = selection.end.row = selection.mark.row; |
3137 | selection.beg.col = selection.end.col = selection.mark.col; |
3143 | selection.beg.col = selection.end.col = selection.mark.col; |
3138 | } |
3144 | } |
3139 | |
3145 | |
3140 | selection.op = SELECTION_INIT; |
3146 | selection.op = SELECTION_INIT; |
… | |
… | |
3329 | * 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 |
3330 | * 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 |
3331 | * time of the most recent button3 press |
3337 | * time of the most recent button3 press |
3332 | */ |
3338 | */ |
3333 | if (button3 && buttonpress) |
3339 | if (button3 && buttonpress) |
|
|
3340 | { |
3334 | { /* button3 press */ |
3341 | /* button3 press */ |
3335 | /* |
3342 | /* |
3336 | * first determine which edge of the selection we are closest to |
3343 | * first determine which edge of the selection we are closest to |
3337 | */ |
3344 | */ |
3338 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3345 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3339 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3346 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3357 | selection.mark.row = selection.beg.row; |
3364 | selection.mark.row = selection.beg.row; |
3358 | selection.mark.col = selection.beg.col; |
3365 | selection.mark.col = selection.beg.col; |
3359 | } |
3366 | } |
3360 | } |
3367 | } |
3361 | else |
3368 | else |
|
|
3369 | { |
3362 | { /* button1 drag or button3 drag */ |
3370 | /* button1 drag or button3 drag */ |
3363 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3371 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3364 | { |
3372 | { |
3365 | if (selection.mark.row == selection.end.row |
3373 | if (selection.mark.row == selection.end.row |
3366 | && selection.mark.col == selection.end.col |
3374 | && selection.mark.col == selection.end.col |
3367 | && clickchange |
3375 | && clickchange |
… | |
… | |
3448 | selection.end.row++; |
3456 | selection.end.row++; |
3449 | } |
3457 | } |
3450 | } |
3458 | } |
3451 | |
3459 | |
3452 | if (button3 && buttonpress) |
3460 | if (button3 && buttonpress) |
|
|
3461 | { |
3453 | { /* mark may need to be changed */ |
3462 | /* mark may need to be changed */ |
3454 | if (closeto == LEFT) |
3463 | if (closeto == LEFT) |
3455 | { |
3464 | { |
3456 | selection.mark.row = selection.end.row; |
3465 | selection.mark.row = selection.end.row; |
3457 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3466 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3458 | } |
3467 | } |
… | |
… | |
3657 | XFree (ct.value); |
3666 | XFree (ct.value); |
3658 | } |
3667 | } |
3659 | |
3668 | |
3660 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3669 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3661 | } |
3670 | } |
3662 | |
|
|
3663 | /* ------------------------------------------------------------------------- * |
|
|
3664 | * MOUSE ROUTINES * |
|
|
3665 | * ------------------------------------------------------------------------- */ |
|
|
3666 | |
3671 | |
3667 | /* ------------------------------------------------------------------------- */ |
3672 | /* ------------------------------------------------------------------------- */ |
3668 | #ifdef USE_XIM |
3673 | #ifdef USE_XIM |
3669 | void |
3674 | void |
3670 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3675 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |