… | |
… | |
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 | } |
… | |
… | |
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 | } |