… | |
… | |
294 | ralloc->free (drawn_rend[p]); |
294 | ralloc->free (drawn_rend[p]); |
295 | } |
295 | } |
296 | |
296 | |
297 | /* we have fewer rows so fix up cursor position */ |
297 | /* we have fewer rows so fix up cursor position */ |
298 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
298 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
299 | MIN_IT (swap.cur.row, (int32_t)nrow - 1); |
|
|
300 | |
299 | |
301 | scr_reset_realloc (); /* realloc _last_ */ |
300 | scr_reset_realloc (); /* realloc _last_ */ |
302 | } |
301 | } |
303 | else if (nrow > prev_nrow) |
302 | else if (nrow > prev_nrow) |
304 | { |
303 | { |
… | |
… | |
335 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
334 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
336 | screen.cur.row += k; |
335 | screen.cur.row += k; |
337 | screen.s_cur.row += k; |
336 | screen.s_cur.row += k; |
338 | TermWin.nscrolled -= k; |
337 | TermWin.nscrolled -= k; |
339 | } |
338 | } |
|
|
339 | |
340 | #ifdef DEBUG_STRICT |
340 | #ifdef DEBUG_STRICT |
341 | assert (screen.cur.row < TermWin.nrow); |
341 | assert (screen.cur.row < TermWin.nrow); |
342 | assert (swap.cur.row < TermWin.nrow); |
|
|
343 | #else /* drive with your eyes closed */ |
342 | #else /* drive with your eyes closed */ |
344 | |
|
|
345 | MIN_IT (screen.cur.row, nrow - 1); |
343 | MIN_IT (screen.cur.row, nrow - 1); |
346 | MIN_IT (swap.cur.row, nrow - 1); |
|
|
347 | #endif |
344 | #endif |
348 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
345 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
349 | } |
346 | } |
350 | |
347 | |
351 | /* resize columns */ |
348 | /* resize columns */ |
… | |
… | |
394 | } |
391 | } |
395 | |
392 | |
396 | } |
393 | } |
397 | |
394 | |
398 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
395 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
399 | MIN_IT (swap.cur.col, (int16_t)ncol - 1); |
|
|
400 | |
396 | |
401 | delete talloc; talloc = ta; |
397 | delete talloc; talloc = ta; |
402 | delete ralloc; ralloc = ra; |
398 | delete ralloc; ralloc = ra; |
403 | } |
399 | } |
404 | |
400 | |
… | |
… | |
566 | if (current_screen == scrn) |
562 | if (current_screen == scrn) |
567 | return scrn; |
563 | return scrn; |
568 | |
564 | |
569 | selection_check (2); /* check for boundary cross */ |
565 | selection_check (2); /* check for boundary cross */ |
570 | |
566 | |
571 | SWAP_IT (current_screen, scrn, int); |
567 | i = current_screen; current_screen = scrn; scrn = i; |
572 | |
568 | |
573 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
569 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
574 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
570 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
575 | # ifdef DEBUG_STRICT |
|
|
576 | assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow); |
|
|
577 | assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol); |
|
|
578 | # else /* drive with your eyes closed */ |
|
|
579 | MAX_IT (screen.cur.row, 0); |
571 | MAX_IT (screen.cur.row, 0); |
580 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
572 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
581 | MAX_IT (screen.cur.col, 0); |
573 | MAX_IT (screen.cur.col, 0); |
582 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
574 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
583 | # endif |
|
|
584 | |
575 | |
585 | #if NSCREENS |
576 | #if NSCREENS |
586 | if (options & Opt_secondaryScreen) |
577 | if (options & Opt_secondaryScreen) |
587 | { |
578 | { |
588 | num_scr = 0; |
579 | num_scr = 0; |
… | |
… | |
2400 | else |
2391 | else |
2401 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2392 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2402 | |
2393 | |
2403 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2394 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2404 | { |
2395 | { |
|
|
2396 | #if ENABLE_FRILLS |
|
|
2397 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2398 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
|
|
2399 | else |
|
|
2400 | #endif |
2405 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
2401 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
|
|
2402 | |
2406 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2403 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2407 | xpixel, ypixel + font->ascent + 1, |
2404 | xpixel, ypixel + font->ascent + 1, |
2408 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2405 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2409 | } |
2406 | } |
2410 | } /* for (col....) */ |
2407 | } /* for (col....) */ |
… | |
… | |
3412 | selection_delimit_word (DN, &selection.end, &selection.end); |
3409 | selection_delimit_word (DN, &selection.end, &selection.end); |
3413 | } |
3410 | } |
3414 | else if (selection.clicks == 3) |
3411 | else if (selection.clicks == 3) |
3415 | { |
3412 | { |
3416 | #if ENABLE_FRILLS |
3413 | #if ENABLE_FRILLS |
3417 | if ((options & Opt_tripleclickwords)) |
3414 | if (options & Opt_tripleclickwords) |
3418 | { |
3415 | { |
3419 | int end_row; |
3416 | int end_row; |
3420 | |
3417 | |
3421 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3418 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3422 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3419 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
… | |
… | |
3440 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3437 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3441 | selection.mark.col++; |
3438 | selection.mark.col++; |
3442 | |
3439 | |
3443 | selection.beg.col = 0; |
3440 | selection.beg.col = 0; |
3444 | selection.end.col = ncol; |
3441 | selection.end.col = ncol; |
|
|
3442 | |
|
|
3443 | // select a complete logical line |
|
|
3444 | while (selection.beg.row > -TermWin.saveLines |
|
|
3445 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
|
|
3446 | selection.beg.row--; |
|
|
3447 | |
|
|
3448 | while (selection.end.row < TermWin.nrow |
|
|
3449 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
|
|
3450 | selection.end.row++; |
3445 | } |
3451 | } |
3446 | } |
3452 | } |
3447 | |
3453 | |
3448 | if (button3 && buttonpress) |
3454 | if (button3 && buttonpress) |
3449 | { /* mark may need to be changed */ |
3455 | { /* mark may need to be changed */ |
… | |
… | |
3529 | */ |
3535 | */ |
3530 | void |
3536 | void |
3531 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3537 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3532 | { |
3538 | { |
3533 | XSelectionEvent ev; |
3539 | XSelectionEvent ev; |
|
|
3540 | dDisp; |
3534 | |
3541 | |
3535 | ev.type = SelectionNotify; |
3542 | ev.type = SelectionNotify; |
3536 | ev.property = None; |
3543 | ev.property = None; |
3537 | ev.display = rq.display; |
3544 | ev.display = rq.display; |
3538 | ev.requestor = rq.requestor; |
3545 | ev.requestor = rq.requestor; |
… | |
… | |
3552 | *target++ = xa[XA_COMPOUND_TEXT]; |
3559 | *target++ = xa[XA_COMPOUND_TEXT]; |
3553 | #if X_HAVE_UTF8_STRING |
3560 | #if X_HAVE_UTF8_STRING |
3554 | *target++ = xa[XA_UTF8_STRING]; |
3561 | *target++ = xa[XA_UTF8_STRING]; |
3555 | #endif |
3562 | #endif |
3556 | |
3563 | |
3557 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3564 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3558 | 32, PropModeReplace, |
3565 | 32, PropModeReplace, |
3559 | (unsigned char *)target_list, target - target_list); |
3566 | (unsigned char *)target_list, target - target_list); |
3560 | ev.property = rq.property; |
3567 | ev.property = rq.property; |
3561 | } |
3568 | } |
3562 | #if TODO // TODO |
3569 | #if TODO // TODO |
… | |
… | |
3565 | /* TODO: Handle MULTIPLE */ |
3572 | /* TODO: Handle MULTIPLE */ |
3566 | } |
3573 | } |
3567 | #endif |
3574 | #endif |
3568 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3575 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3569 | { |
3576 | { |
3570 | XChangeProperty (display->display, rq.requestor, rq.property, rq.target, |
3577 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3571 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3578 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3572 | ev.property = rq.property; |
3579 | ev.property = rq.property; |
3573 | } |
3580 | } |
3574 | else if (rq.target == XA_STRING |
3581 | else if (rq.target == XA_STRING |
3575 | || rq.target == xa[XA_TEXT] |
3582 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3633 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3640 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3634 | ct.nitems = strlen ((char *)ct.value); |
3641 | ct.nitems = strlen ((char *)ct.value); |
3635 | } |
3642 | } |
3636 | else |
3643 | else |
3637 | #endif |
3644 | #endif |
3638 | if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3645 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3639 | freect = 1; |
3646 | freect = 1; |
3640 | else |
3647 | else |
3641 | { |
3648 | { |
3642 | /* if we failed to convert then send it raw */ |
3649 | /* if we failed to convert then send it raw */ |
3643 | ct.value = (unsigned char *)cl; |
3650 | ct.value = (unsigned char *)cl; |
3644 | ct.nitems = selectlen; |
3651 | ct.nitems = selectlen; |
3645 | ct.encoding = target; |
3652 | ct.encoding = target; |
3646 | } |
3653 | } |
3647 | |
3654 | |
3648 | XChangeProperty (display->display, rq.requestor, rq.property, |
3655 | XChangeProperty (disp, rq.requestor, rq.property, |
3649 | ct.encoding, 8, PropModeReplace, |
3656 | ct.encoding, 8, PropModeReplace, |
3650 | ct.value, (int)ct.nitems); |
3657 | ct.value, (int)ct.nitems); |
3651 | ev.property = rq.property; |
3658 | ev.property = rq.property; |
3652 | |
3659 | |
3653 | if (freect) |
3660 | if (freect) |
3654 | XFree (ct.value); |
3661 | XFree (ct.value); |
3655 | } |
3662 | } |
3656 | |
3663 | |
3657 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3664 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3658 | } |
3665 | } |
3659 | |
3666 | |
3660 | /* ------------------------------------------------------------------------- * |
3667 | /* ------------------------------------------------------------------------- * |
3661 | * MOUSE ROUTINES * |
3668 | * MOUSE ROUTINES * |
3662 | * ------------------------------------------------------------------------- */ |
3669 | * ------------------------------------------------------------------------- */ |