… | |
… | |
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); |
1875 | } |
1877 | } |
1876 | #endif |
1878 | #endif |
… | |
… | |
1903 | { |
1905 | { |
1904 | rvideo_bell = true; |
1906 | rvideo_bell = true; |
1905 | scr_rvideo_mode (rvideo_mode); |
1907 | scr_rvideo_mode (rvideo_mode); |
1906 | display->flush (); |
1908 | display->flush (); |
1907 | |
1909 | |
1908 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1910 | bell_ev.start (VISUAL_BELL_DURATION); |
1909 | } |
1911 | } |
1910 | else |
1912 | else |
1911 | XBell (dpy, 0); |
1913 | XBell (dpy, 0); |
1912 | #endif |
1914 | #endif |
1913 | } |
1915 | } |
… | |
… | |
2319 | #ifdef TEXT_BLINK |
2321 | #ifdef TEXT_BLINK |
2320 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2322 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2321 | { |
2323 | { |
2322 | if (!text_blink_ev.active) |
2324 | if (!text_blink_ev.active) |
2323 | { |
2325 | { |
2324 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2326 | text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL); |
2325 | hidden_text = 0; |
2327 | hidden_text = 0; |
2326 | } |
2328 | } |
2327 | else if (hidden_text) |
2329 | else if (hidden_text) |
2328 | fore = back; |
2330 | fore = back; |
2329 | } |
2331 | } |
… | |
… | |
2733 | if (!delete_prop) |
2735 | if (!delete_prop) |
2734 | XDeleteProperty (dpy, win, prop); |
2736 | XDeleteProperty (dpy, win, prop); |
2735 | |
2737 | |
2736 | selection_wait = Sel_incr; |
2738 | selection_wait = Sel_incr; |
2737 | incr_buf_fill = 0; |
2739 | incr_buf_fill = 0; |
2738 | incr_ev.start (NOW + 10); |
2740 | incr_ev.start (10); |
2739 | |
2741 | |
2740 | goto bailout; |
2742 | goto bailout; |
2741 | } |
2743 | } |
2742 | |
2744 | |
2743 | if (ct.nitems == 0) |
2745 | if (ct.nitems == 0) |
… | |
… | |
2769 | goto bailout; |
2771 | goto bailout; |
2770 | } |
2772 | } |
2771 | } |
2773 | } |
2772 | else if (selection_wait == Sel_incr) |
2774 | else if (selection_wait == Sel_incr) |
2773 | { |
2775 | { |
2774 | incr_ev.start (NOW + 10); |
2776 | incr_ev.start (10); |
2775 | |
2777 | |
2776 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2778 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2777 | { |
2779 | { |
2778 | 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; |
2779 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2781 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2819 | if (selection_wait == Sel_normal) |
2821 | if (selection_wait == Sel_normal) |
2820 | selection_wait = Sel_none; |
2822 | selection_wait = Sel_none; |
2821 | } |
2823 | } |
2822 | |
2824 | |
2823 | void |
2825 | void |
2824 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2826 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2825 | { |
2827 | { |
2826 | selection_wait = Sel_none; |
2828 | selection_wait = Sel_none; |
2827 | |
2829 | |
2828 | incr_buf_size = 0; |
2830 | incr_buf_size = 0; |
2829 | free (incr_buf); |
2831 | free (incr_buf); |
… | |
… | |
2852 | */ |
2854 | */ |
2853 | void |
2855 | void |
2854 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2856 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2855 | { |
2857 | { |
2856 | if (selection.text && selnum == Sel_Primary) |
2858 | if (selection.text && selnum == Sel_Primary) |
|
|
2859 | { |
2857 | { /* internal selection */ |
2860 | /* internal selection */ |
2858 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2861 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2859 | paste (str, strlen (str)); |
2862 | paste (str, strlen (str)); |
2860 | free (str); |
2863 | free (str); |
2861 | return; |
2864 | return; |
2862 | } |
2865 | } |
… | |
… | |
3130 | while (selection.mark.col > 0 |
3133 | while (selection.mark.col > 0 |
3131 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3134 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3132 | --selection.mark.col; |
3135 | --selection.mark.col; |
3133 | |
3136 | |
3134 | if (selection.op) |
3137 | if (selection.op) |
|
|
3138 | { |
3135 | { /* clear the old selection */ |
3139 | /* clear the old selection */ |
3136 | selection.beg.row = selection.end.row = selection.mark.row; |
3140 | selection.beg.row = selection.end.row = selection.mark.row; |
3137 | selection.beg.col = selection.end.col = selection.mark.col; |
3141 | selection.beg.col = selection.end.col = selection.mark.col; |
3138 | } |
3142 | } |
3139 | |
3143 | |
3140 | selection.op = SELECTION_INIT; |
3144 | selection.op = SELECTION_INIT; |
… | |
… | |
3329 | * 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 |
3330 | * 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 |
3331 | * time of the most recent button3 press |
3335 | * time of the most recent button3 press |
3332 | */ |
3336 | */ |
3333 | if (button3 && buttonpress) |
3337 | if (button3 && buttonpress) |
|
|
3338 | { |
3334 | { /* button3 press */ |
3339 | /* button3 press */ |
3335 | /* |
3340 | /* |
3336 | * first determine which edge of the selection we are closest to |
3341 | * first determine which edge of the selection we are closest to |
3337 | */ |
3342 | */ |
3338 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3343 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3339 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3344 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3357 | selection.mark.row = selection.beg.row; |
3362 | selection.mark.row = selection.beg.row; |
3358 | selection.mark.col = selection.beg.col; |
3363 | selection.mark.col = selection.beg.col; |
3359 | } |
3364 | } |
3360 | } |
3365 | } |
3361 | else |
3366 | else |
|
|
3367 | { |
3362 | { /* button1 drag or button3 drag */ |
3368 | /* button1 drag or button3 drag */ |
3363 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3369 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3364 | { |
3370 | { |
3365 | if (selection.mark.row == selection.end.row |
3371 | if (selection.mark.row == selection.end.row |
3366 | && selection.mark.col == selection.end.col |
3372 | && selection.mark.col == selection.end.col |
3367 | && clickchange |
3373 | && clickchange |
… | |
… | |
3448 | selection.end.row++; |
3454 | selection.end.row++; |
3449 | } |
3455 | } |
3450 | } |
3456 | } |
3451 | |
3457 | |
3452 | if (button3 && buttonpress) |
3458 | if (button3 && buttonpress) |
|
|
3459 | { |
3453 | { /* mark may need to be changed */ |
3460 | /* mark may need to be changed */ |
3454 | if (closeto == LEFT) |
3461 | if (closeto == LEFT) |
3455 | { |
3462 | { |
3456 | selection.mark.row = selection.end.row; |
3463 | selection.mark.row = selection.end.row; |
3457 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3464 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3458 | } |
3465 | } |