… | |
… | |
279 | } |
279 | } |
280 | |
280 | |
281 | iso14755buf = 0; |
281 | iso14755buf = 0; |
282 | } |
282 | } |
283 | |
283 | |
284 | int |
284 | static int |
285 | rxvt_term::hex_keyval (XKeyEvent &ev) |
285 | hex_keyval (XKeyEvent &ev) |
286 | { |
286 | { |
287 | // check wether this event corresponds to a hex digit |
287 | // check wether this event corresponds to a hex digit |
288 | // if the modifiers had not been pressed. |
288 | // if the modifiers had not been pressed. |
289 | for (int index = 0; index < 8; index++) |
289 | for (int index = 0; index < 8; index++) |
290 | { |
290 | { |
… | |
… | |
298 | |
298 | |
299 | return -1; |
299 | return -1; |
300 | } |
300 | } |
301 | #endif |
301 | #endif |
302 | |
302 | |
|
|
303 | static inline KeySym |
|
|
304 | translate_keypad (KeySym keysym, bool kp) |
|
|
305 | { |
|
|
306 | #ifdef XK_KP_Home |
|
|
307 | static const KeySym keypadtrans[] = { |
|
|
308 | XK_KP_7, // XK_KP_Home |
|
|
309 | XK_KP_4, // XK_KP_Left |
|
|
310 | XK_KP_8, // XK_KP_Up |
|
|
311 | XK_KP_6, // XK_KP_Right |
|
|
312 | XK_KP_2, // XK_KP_Down |
|
|
313 | # ifndef UNSHIFTED_SCROLLKEYS |
|
|
314 | XK_KP_9, // XK_KP_Prior |
|
|
315 | XK_KP_3, // XK_KP_Next |
|
|
316 | # else |
|
|
317 | XK_Prior, |
|
|
318 | XK_Next, |
|
|
319 | # endif |
|
|
320 | XK_KP_1, // XK_KP_End |
|
|
321 | XK_KP_5, // XK_KP_Begin |
|
|
322 | }; |
|
|
323 | |
|
|
324 | if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) |
|
|
325 | { |
|
|
326 | unsigned int index = keysym - XK_KP_Home; |
|
|
327 | keysym = kp ? keypadtrans[index] : XK_Home + index; |
|
|
328 | } |
|
|
329 | else if (keysym == XK_KP_Insert) |
|
|
330 | keysym = kp ? XK_KP_0 : XK_Insert; |
|
|
331 | # ifndef NO_DELETE_KEY |
|
|
332 | else if (keysym == XK_KP_Delete) |
|
|
333 | keysym = kp ? XK_KP_Decimal : XK_Delete; |
|
|
334 | # endif |
|
|
335 | #endif |
|
|
336 | return keysym; |
|
|
337 | } |
|
|
338 | |
|
|
339 | static inline int |
|
|
340 | map_function_key (KeySym keysym) |
|
|
341 | { |
|
|
342 | int param = 0; |
|
|
343 | |
|
|
344 | if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) |
|
|
345 | { |
|
|
346 | param = 11 + keysym - XK_F1; |
|
|
347 | if (keysym >= XK_F17) |
|
|
348 | param += 4; |
|
|
349 | else if (keysym >= XK_F15) |
|
|
350 | param += 3; |
|
|
351 | else if (keysym >= XK_F11) |
|
|
352 | param += 2; |
|
|
353 | else if (keysym >= XK_F6) |
|
|
354 | param += 1; |
|
|
355 | } |
|
|
356 | else |
|
|
357 | switch (keysym) |
|
|
358 | { |
|
|
359 | case XK_Find: |
|
|
360 | param = 1; |
|
|
361 | break; |
|
|
362 | case XK_Insert: |
|
|
363 | param = 2; |
|
|
364 | break; |
|
|
365 | #ifdef DXK_Remove |
|
|
366 | case DXK_Remove: |
|
|
367 | #endif |
|
|
368 | case XK_Execute: |
|
|
369 | param = 3; |
|
|
370 | break; |
|
|
371 | case XK_Select: |
|
|
372 | param = 4; |
|
|
373 | break; |
|
|
374 | #ifndef UNSHIFTED_SCROLLKEYS |
|
|
375 | case XK_Prior: |
|
|
376 | param = 5; |
|
|
377 | break; |
|
|
378 | case XK_Next: |
|
|
379 | param = 6; |
|
|
380 | break; |
|
|
381 | case XK_Home: |
|
|
382 | param = 7; |
|
|
383 | break; |
|
|
384 | case XK_End: |
|
|
385 | param = 8; |
|
|
386 | break; |
|
|
387 | #endif |
|
|
388 | case XK_Help: |
|
|
389 | param = 28; |
|
|
390 | break; |
|
|
391 | case XK_Menu: |
|
|
392 | param = 29; |
|
|
393 | break; |
|
|
394 | } |
|
|
395 | return param; |
|
|
396 | } |
|
|
397 | |
303 | void |
398 | void |
304 | rxvt_term::key_press (XKeyEvent &ev) |
399 | rxvt_term::key_press (XKeyEvent &ev) |
305 | { |
400 | { |
306 | int ctrl, meta, shft, len; |
401 | int ctrl, meta, shft, len; |
307 | unsigned int newlen; |
|
|
308 | KeySym keysym; |
402 | KeySym keysym; |
309 | int valid_keysym; |
403 | int valid_keysym; |
310 | char kbuf[KBUFSZ]; |
404 | char kbuf[KBUFSZ]; |
311 | |
405 | |
312 | #if ISO_14755 |
406 | #if ISO_14755 |
… | |
… | |
547 | } |
641 | } |
548 | #endif |
642 | #endif |
549 | |
643 | |
550 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
644 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
551 | { |
645 | { |
|
|
646 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
|
|
647 | unsigned int newlen = 1; |
|
|
648 | |
|
|
649 | switch (translate_keypad (keysym, kp)) |
552 | { |
650 | { |
553 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
651 | #ifndef NO_BACKSPACE_KEY |
554 | newlen = 1; |
652 | case XK_BackSpace: |
555 | #ifdef XK_KP_Home |
653 | if (priv_modes & PrivMode_HaveBackSpace) |
556 | static const KeySym keypadtrans[] = { |
654 | { |
557 | XK_KP_7, // XK_KP_Home |
655 | kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) |
558 | XK_KP_4, // XK_KP_Left |
656 | ^ !!ctrl) ? '\b' : '\177'; |
559 | XK_KP_8, // XK_KP_Up |
657 | kbuf[1] = '\0'; |
560 | XK_KP_6, // XK_KP_Right |
|
|
561 | XK_KP_2, // XK_KP_Down |
|
|
562 | #ifndef UNSHIFTED_SCROLLKEYS |
|
|
563 | XK_KP_9, // XK_KP_Prior |
|
|
564 | XK_KP_3, // XK_KP_Next |
|
|
565 | #else |
|
|
566 | XK_Prior, |
|
|
567 | XK_Next, |
|
|
568 | #endif |
|
|
569 | XK_KP_1, // XK_KP_End |
|
|
570 | XK_KP_5, // XK_KP_Begin |
|
|
571 | }; |
658 | } |
|
|
659 | else |
|
|
660 | strcpy (kbuf, rs[Rs_backspace_key]); |
|
|
661 | break; |
|
|
662 | #endif |
|
|
663 | #ifndef NO_DELETE_KEY |
|
|
664 | case XK_Delete: |
|
|
665 | strcpy (kbuf, rs[Rs_delete_key]); |
|
|
666 | break; |
|
|
667 | #endif |
|
|
668 | case XK_Tab: |
|
|
669 | if (shft) |
|
|
670 | strcpy (kbuf, "\033[Z"); |
|
|
671 | else |
|
|
672 | { |
|
|
673 | #ifdef CTRL_TAB_MAKES_META |
|
|
674 | if (ctrl) |
|
|
675 | meta = 1; |
|
|
676 | #endif |
|
|
677 | #ifdef MOD4_TAB_MAKES_META |
|
|
678 | if (ev.state & Mod4Mask) |
|
|
679 | meta = 1; |
|
|
680 | #endif |
|
|
681 | newlen = 0; |
|
|
682 | } |
|
|
683 | break; |
572 | |
684 | |
573 | if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) |
685 | case XK_Up: /* "\033[A" */ |
|
|
686 | case XK_Down: /* "\033[B" */ |
|
|
687 | case XK_Right: /* "\033[C" */ |
|
|
688 | case XK_Left: /* "\033[D" */ |
|
|
689 | strcpy (kbuf, "\033[Z"); |
|
|
690 | kbuf[2] = "DACB"[keysym - XK_Left]; |
|
|
691 | /* do Shift first */ |
|
|
692 | if (shft) |
|
|
693 | kbuf[2] = "dacb"[keysym - XK_Left]; |
|
|
694 | else if (ctrl) |
|
|
695 | { |
|
|
696 | kbuf[1] = 'O'; |
|
|
697 | kbuf[2] = "dacb"[keysym - XK_Left]; |
|
|
698 | } |
|
|
699 | else if (priv_modes & PrivMode_aplCUR) |
|
|
700 | kbuf[1] = 'O'; |
|
|
701 | break; |
|
|
702 | |
|
|
703 | case XK_KP_Enter: |
|
|
704 | /* allow shift to override */ |
|
|
705 | if (kp) |
|
|
706 | { |
|
|
707 | strcpy (kbuf, "\033OM"); |
|
|
708 | break; |
|
|
709 | } |
|
|
710 | |
|
|
711 | /* FALLTHROUGH */ |
|
|
712 | |
|
|
713 | case XK_Return: |
|
|
714 | if (priv_modes & PrivMode_LFNL) |
|
|
715 | { |
|
|
716 | kbuf[0] = '\015'; |
|
|
717 | kbuf[1] = '\012'; |
|
|
718 | kbuf[2] = '\0'; |
|
|
719 | } |
|
|
720 | else |
|
|
721 | { |
|
|
722 | kbuf[0] = '\015'; |
|
|
723 | kbuf[1] = '\0'; |
|
|
724 | } |
|
|
725 | break; |
|
|
726 | |
|
|
727 | case XK_KP_F1: /* "\033OP" */ |
|
|
728 | case XK_KP_F2: /* "\033OQ" */ |
|
|
729 | case XK_KP_F3: /* "\033OR" */ |
|
|
730 | case XK_KP_F4: /* "\033OS" */ |
|
|
731 | strcpy (kbuf, "\033OP"); |
|
|
732 | kbuf[2] += (keysym - XK_KP_F1); |
|
|
733 | break; |
|
|
734 | |
|
|
735 | case XK_KP_Multiply: /* "\033Oj" : "*" */ |
|
|
736 | case XK_KP_Add: /* "\033Ok" : "+" */ |
|
|
737 | case XK_KP_Separator: /* "\033Ol" : "," */ |
|
|
738 | case XK_KP_Subtract: /* "\033Om" : "-" */ |
|
|
739 | case XK_KP_Decimal: /* "\033On" : "." */ |
|
|
740 | case XK_KP_Divide: /* "\033Oo" : "/" */ |
|
|
741 | case XK_KP_0: /* "\033Op" : "0" */ |
|
|
742 | case XK_KP_1: /* "\033Oq" : "1" */ |
|
|
743 | case XK_KP_2: /* "\033Or" : "2" */ |
|
|
744 | case XK_KP_3: /* "\033Os" : "3" */ |
|
|
745 | case XK_KP_4: /* "\033Ot" : "4" */ |
|
|
746 | case XK_KP_5: /* "\033Ou" : "5" */ |
|
|
747 | case XK_KP_6: /* "\033Ov" : "6" */ |
|
|
748 | case XK_KP_7: /* "\033Ow" : "7" */ |
|
|
749 | case XK_KP_8: /* "\033Ox" : "8" */ |
|
|
750 | case XK_KP_9: /* "\033Oy" : "9" */ |
|
|
751 | /* allow shift to override */ |
|
|
752 | if (kp) |
|
|
753 | { |
|
|
754 | strcpy (kbuf, "\033Oj"); |
|
|
755 | kbuf[2] += (keysym - XK_KP_Multiply); |
|
|
756 | } |
|
|
757 | else |
|
|
758 | { |
|
|
759 | kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); |
|
|
760 | kbuf[1] = '\0'; |
|
|
761 | } |
|
|
762 | break; |
|
|
763 | |
|
|
764 | default: |
574 | { |
765 | { |
575 | unsigned int index = keysym - XK_KP_Home; |
766 | int param = map_function_key (keysym); |
576 | keysym = kp ? keypadtrans[index] : XK_Home + index; |
767 | if (param > 0) |
|
|
768 | sprintf (kbuf,"\033[%d~", param); |
|
|
769 | else |
|
|
770 | newlen = 0; |
577 | } |
771 | } |
578 | else if (keysym == XK_KP_Insert) |
|
|
579 | keysym = kp ? XK_KP_0 : XK_Insert; |
|
|
580 | #ifndef NO_DELETE_KEY |
|
|
581 | else if (keysym == XK_KP_Delete) |
|
|
582 | keysym = kp ? XK_KP_Decimal : XK_Delete; |
|
|
583 | #endif |
|
|
584 | #endif |
|
|
585 | switch (keysym) |
|
|
586 | { |
|
|
587 | #ifndef NO_BACKSPACE_KEY |
|
|
588 | case XK_BackSpace: |
|
|
589 | if (priv_modes & PrivMode_HaveBackSpace) |
|
|
590 | { |
|
|
591 | kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) |
|
|
592 | ^ !!ctrl) ? '\b' : '\177'; |
|
|
593 | kbuf[1] = '\0'; |
|
|
594 | } |
|
|
595 | else |
|
|
596 | strcpy (kbuf, rs[Rs_backspace_key]); |
|
|
597 | break; |
772 | break; |
598 | #endif |
|
|
599 | #ifndef NO_DELETE_KEY |
|
|
600 | case XK_Delete: |
|
|
601 | strcpy (kbuf, rs[Rs_delete_key]); |
|
|
602 | break; |
|
|
603 | #endif |
|
|
604 | case XK_Tab: |
|
|
605 | if (shft) |
|
|
606 | strcpy (kbuf, "\033[Z"); |
|
|
607 | else |
|
|
608 | { |
|
|
609 | #ifdef CTRL_TAB_MAKES_META |
|
|
610 | if (ctrl) |
|
|
611 | meta = 1; |
|
|
612 | #endif |
|
|
613 | #ifdef MOD4_TAB_MAKES_META |
|
|
614 | if (ev.state & Mod4Mask) |
|
|
615 | meta = 1; |
|
|
616 | #endif |
|
|
617 | newlen = 0; |
|
|
618 | } |
|
|
619 | break; |
|
|
620 | |
|
|
621 | case XK_Up: /* "\033[A" */ |
|
|
622 | case XK_Down: /* "\033[B" */ |
|
|
623 | case XK_Right: /* "\033[C" */ |
|
|
624 | case XK_Left: /* "\033[D" */ |
|
|
625 | strcpy (kbuf, "\033[Z"); |
|
|
626 | kbuf[2] = "DACB"[keysym - XK_Left]; |
|
|
627 | /* do Shift first */ |
|
|
628 | if (shft) |
|
|
629 | kbuf[2] = "dacb"[keysym - XK_Left]; |
|
|
630 | else if (ctrl) |
|
|
631 | { |
|
|
632 | kbuf[1] = 'O'; |
|
|
633 | kbuf[2] = "dacb"[keysym - XK_Left]; |
|
|
634 | } |
|
|
635 | else if (priv_modes & PrivMode_aplCUR) |
|
|
636 | kbuf[1] = 'O'; |
|
|
637 | break; |
|
|
638 | |
|
|
639 | #ifndef UNSHIFTED_SCROLLKEYS |
|
|
640 | case XK_Prior: |
|
|
641 | strcpy (kbuf, "\033[5~"); |
|
|
642 | break; |
|
|
643 | case XK_Next: |
|
|
644 | strcpy (kbuf, "\033[6~"); |
|
|
645 | break; |
|
|
646 | #endif |
|
|
647 | case XK_KP_Enter: |
|
|
648 | /* allow shift to override */ |
|
|
649 | if (kp) |
|
|
650 | { |
|
|
651 | strcpy (kbuf, "\033OM"); |
|
|
652 | break; |
|
|
653 | } |
|
|
654 | |
|
|
655 | /* FALLTHROUGH */ |
|
|
656 | |
|
|
657 | case XK_Return: |
|
|
658 | if (priv_modes & PrivMode_LFNL) |
|
|
659 | { |
|
|
660 | kbuf[0] = '\015'; |
|
|
661 | kbuf[1] = '\012'; |
|
|
662 | kbuf[2] = '\0'; |
|
|
663 | } |
|
|
664 | else |
|
|
665 | { |
|
|
666 | kbuf[0] = '\015'; |
|
|
667 | kbuf[1] = '\0'; |
|
|
668 | } |
|
|
669 | break; |
|
|
670 | |
|
|
671 | case XK_KP_F1: /* "\033OP" */ |
|
|
672 | case XK_KP_F2: /* "\033OQ" */ |
|
|
673 | case XK_KP_F3: /* "\033OR" */ |
|
|
674 | case XK_KP_F4: /* "\033OS" */ |
|
|
675 | strcpy (kbuf, "\033OP"); |
|
|
676 | kbuf[2] += (keysym - XK_KP_F1); |
|
|
677 | break; |
|
|
678 | |
|
|
679 | case XK_KP_Multiply: /* "\033Oj" : "*" */ |
|
|
680 | case XK_KP_Add: /* "\033Ok" : "+" */ |
|
|
681 | case XK_KP_Separator: /* "\033Ol" : "," */ |
|
|
682 | case XK_KP_Subtract: /* "\033Om" : "-" */ |
|
|
683 | case XK_KP_Decimal: /* "\033On" : "." */ |
|
|
684 | case XK_KP_Divide: /* "\033Oo" : "/" */ |
|
|
685 | case XK_KP_0: /* "\033Op" : "0" */ |
|
|
686 | case XK_KP_1: /* "\033Oq" : "1" */ |
|
|
687 | case XK_KP_2: /* "\033Or" : "2" */ |
|
|
688 | case XK_KP_3: /* "\033Os" : "3" */ |
|
|
689 | case XK_KP_4: /* "\033Ot" : "4" */ |
|
|
690 | case XK_KP_5: /* "\033Ou" : "5" */ |
|
|
691 | case XK_KP_6: /* "\033Ov" : "6" */ |
|
|
692 | case XK_KP_7: /* "\033Ow" : "7" */ |
|
|
693 | case XK_KP_8: /* "\033Ox" : "8" */ |
|
|
694 | case XK_KP_9: /* "\033Oy" : "9" */ |
|
|
695 | /* allow shift to override */ |
|
|
696 | if (kp) |
|
|
697 | { |
|
|
698 | strcpy (kbuf, "\033Oj"); |
|
|
699 | kbuf[2] += (keysym - XK_KP_Multiply); |
|
|
700 | } |
|
|
701 | else |
|
|
702 | { |
|
|
703 | kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); |
|
|
704 | kbuf[1] = '\0'; |
|
|
705 | } |
|
|
706 | break; |
|
|
707 | |
|
|
708 | case XK_Find: |
|
|
709 | strcpy (kbuf, "\033[1~"); |
|
|
710 | break; |
|
|
711 | |
|
|
712 | case XK_Insert: |
|
|
713 | strcpy (kbuf, "\033[2~"); |
|
|
714 | break; |
|
|
715 | #ifdef DXK_Remove /* support for DEC remove like key */ |
|
|
716 | case DXK_Remove: |
|
|
717 | /* FALLTHROUGH */ |
|
|
718 | #endif |
|
|
719 | case XK_Execute: |
|
|
720 | strcpy (kbuf, "\033[3~"); |
|
|
721 | break; |
|
|
722 | case XK_Select: |
|
|
723 | strcpy (kbuf, "\033[4~"); |
|
|
724 | break; |
|
|
725 | case XK_End: |
|
|
726 | strcpy (kbuf, KS_END); |
|
|
727 | break; |
|
|
728 | case XK_Home: |
|
|
729 | strcpy (kbuf, KS_HOME); |
|
|
730 | break; |
|
|
731 | |
|
|
732 | #define FKEY(n, fkey) \ |
|
|
733 | sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) |
|
|
734 | |
|
|
735 | case XK_F1: /* "\033[11~" */ |
|
|
736 | case XK_F2: /* "\033[12~" */ |
|
|
737 | case XK_F3: /* "\033[13~" */ |
|
|
738 | case XK_F4: /* "\033[14~" */ |
|
|
739 | case XK_F5: /* "\033[15~" */ |
|
|
740 | FKEY (11, XK_F1); |
|
|
741 | break; |
|
|
742 | case XK_F6: /* "\033[17~" */ |
|
|
743 | case XK_F7: /* "\033[18~" */ |
|
|
744 | case XK_F8: /* "\033[19~" */ |
|
|
745 | case XK_F9: /* "\033[20~" */ |
|
|
746 | case XK_F10: /* "\033[21~" */ |
|
|
747 | FKEY (17, XK_F6); |
|
|
748 | break; |
|
|
749 | case XK_F11: /* "\033[23~" */ |
|
|
750 | case XK_F12: /* "\033[24~" */ |
|
|
751 | case XK_F13: /* "\033[25~" */ |
|
|
752 | case XK_F14: /* "\033[26~" */ |
|
|
753 | FKEY (23, XK_F11); |
|
|
754 | break; |
|
|
755 | case XK_F15: /* "\033[28~" */ |
|
|
756 | case XK_F16: /* "\033[29~" */ |
|
|
757 | FKEY (28, XK_F15); |
|
|
758 | break; |
|
|
759 | case XK_Help: /* "\033[28~" */ |
|
|
760 | FKEY (28, XK_Help); |
|
|
761 | break; |
|
|
762 | case XK_Menu: /* "\033[29~" */ |
|
|
763 | FKEY (29, XK_Menu); |
|
|
764 | break; |
|
|
765 | case XK_F17: /* "\033[31~" */ |
|
|
766 | case XK_F18: /* "\033[32~" */ |
|
|
767 | case XK_F19: /* "\033[33~" */ |
|
|
768 | case XK_F20: /* "\033[34~" */ |
|
|
769 | case XK_F21: /* "\033[35~" */ |
|
|
770 | case XK_F22: /* "\033[36~" */ |
|
|
771 | case XK_F23: /* "\033[37~" */ |
|
|
772 | case XK_F24: /* "\033[38~" */ |
|
|
773 | case XK_F25: /* "\033[39~" */ |
|
|
774 | case XK_F26: /* "\033[40~" */ |
|
|
775 | case XK_F27: /* "\033[41~" */ |
|
|
776 | case XK_F28: /* "\033[42~" */ |
|
|
777 | case XK_F29: /* "\033[43~" */ |
|
|
778 | case XK_F30: /* "\033[44~" */ |
|
|
779 | case XK_F31: /* "\033[45~" */ |
|
|
780 | case XK_F32: /* "\033[46~" */ |
|
|
781 | case XK_F33: /* "\033[47~" */ |
|
|
782 | case XK_F34: /* "\033[48~" */ |
|
|
783 | case XK_F35: /* "\033[49~" */ |
|
|
784 | FKEY (31, XK_F17); |
|
|
785 | break; |
|
|
786 | #undef FKEY |
|
|
787 | default: |
|
|
788 | newlen = 0; |
|
|
789 | break; |
|
|
790 | } |
|
|
791 | |
|
|
792 | if (newlen) |
|
|
793 | len = strlen (kbuf); |
|
|
794 | } |
773 | } |
|
|
774 | |
|
|
775 | if (newlen) |
|
|
776 | len = strlen (kbuf); |
795 | |
777 | |
796 | /* |
778 | /* |
797 | * Pass meta for all function keys, if 'meta' option set |
779 | * Pass meta for all function keys, if 'meta' option set |
798 | */ |
780 | */ |
799 | #ifdef META8_OPTION |
781 | #ifdef META8_OPTION |
… | |
… | |
1090 | |
1072 | |
1091 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1073 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1092 | void |
1074 | void |
1093 | rxvt_term::cont_scroll_cb (ev::timer &w, int revents) |
1075 | rxvt_term::cont_scroll_cb (ev::timer &w, int revents) |
1094 | { |
1076 | { |
1095 | if ((scrollbar_isUp () || scrollbar_isDn ()) |
1077 | if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) |
1096 | && scr_page (scrollbar_isUp () ? UP : DN, 1)) |
1078 | && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) |
1097 | { |
1079 | { |
1098 | want_refresh = 1; |
1080 | want_refresh = 1; |
1099 | refresh_check (); |
1081 | refresh_check (); |
1100 | } |
1082 | } |
1101 | else |
1083 | else |
… | |
… | |
1553 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1535 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1554 | ; |
1536 | ; |
1555 | |
1537 | |
1556 | if (scrollBar.state && ev.xany.window == scrollBar.win) |
1538 | if (scrollBar.state && ev.xany.window == scrollBar.win) |
1557 | { |
1539 | { |
1558 | scrollBar.setIdle (); |
1540 | scrollBar.state = STATE_IDLE; |
1559 | scrollbar_show (0); |
1541 | scrollbar_show (0); |
1560 | } |
1542 | } |
1561 | } |
1543 | } |
1562 | break; |
1544 | break; |
1563 | |
1545 | |
… | |
… | |
1651 | #ifdef MOUSE_THRESHOLD |
1633 | #ifdef MOUSE_THRESHOLD |
1652 | } |
1634 | } |
1653 | #endif |
1635 | #endif |
1654 | } |
1636 | } |
1655 | } |
1637 | } |
1656 | else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) |
1638 | else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) |
1657 | { |
1639 | { |
1658 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1640 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1659 | MotionNotify, &ev)) |
1641 | MotionNotify, &ev)) |
1660 | ; |
1642 | ; |
1661 | |
1643 | |
… | |
… | |
1947 | /* |
1929 | /* |
1948 | * Scrollbar window processing of button press |
1930 | * Scrollbar window processing of button press |
1949 | */ |
1931 | */ |
1950 | if (scrollBar.state && ev.window == scrollBar.win) |
1932 | if (scrollBar.state && ev.window == scrollBar.win) |
1951 | { |
1933 | { |
1952 | int upordown = 0; |
1934 | page_dirn direction = NO_DIR; |
1953 | |
1935 | |
1954 | if (scrollBar.upButton (ev.y)) |
1936 | if (scrollBar.upButton (ev.y)) |
1955 | upordown = -1; /* up */ |
1937 | direction = UP; /* up */ |
1956 | else if (scrollBar.dnButton (ev.y)) |
1938 | else if (scrollBar.dnButton (ev.y)) |
1957 | upordown = 1; /* down */ |
1939 | direction = DN; /* down */ |
1958 | |
1940 | |
1959 | scrollBar.setIdle (); |
1941 | scrollBar.state = STATE_IDLE; |
1960 | /* |
1942 | /* |
1961 | * Rxvt-style scrollbar: |
1943 | * Rxvt-style scrollbar: |
1962 | * move up if mouse is above slider |
1944 | * move up if mouse is above slider |
1963 | * move dn if mouse is below slider |
1945 | * move dn if mouse is below slider |
1964 | * |
1946 | * |
… | |
… | |
1973 | /* |
1955 | /* |
1974 | * Mouse report disabled scrollbar: |
1956 | * Mouse report disabled scrollbar: |
1975 | * arrow buttons - send up/down |
1957 | * arrow buttons - send up/down |
1976 | * click on scrollbar - send pageup/down |
1958 | * click on scrollbar - send pageup/down |
1977 | */ |
1959 | */ |
1978 | if (upordown < 0) |
1960 | if (direction == UP) |
1979 | tt_printf ("\033[A"); |
1961 | tt_printf ("\033[A"); |
1980 | else if (upordown > 0) |
1962 | else if (direction == DN) |
1981 | tt_printf ("\033[B"); |
1963 | tt_printf ("\033[B"); |
1982 | else |
1964 | else |
1983 | switch (ev.button) |
1965 | switch (ev.button) |
1984 | { |
1966 | { |
1985 | case Button2: |
1967 | case Button2: |
… | |
… | |
1993 | break; |
1975 | break; |
1994 | } |
1976 | } |
1995 | } |
1977 | } |
1996 | else |
1978 | else |
1997 | #endif /* NO_SCROLLBAR_REPORT */ |
1979 | #endif /* NO_SCROLLBAR_REPORT */ |
1998 | |
|
|
1999 | { |
1980 | { |
2000 | if (upordown) |
1981 | if (direction != NO_DIR) |
2001 | { |
1982 | { |
2002 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1983 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
2003 | if (!cont_scroll_ev.is_active ()) |
1984 | if (!cont_scroll_ev.is_active ()) |
2004 | cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
1985 | cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
2005 | #endif |
1986 | #endif |
2006 | if (scr_page (upordown < 0 ? UP : DN, 1)) |
1987 | if (scr_page (direction, 1)) |
2007 | { |
1988 | { |
2008 | if (upordown < 0) |
1989 | if (direction == UP) |
2009 | scrollBar.setUp (); |
1990 | scrollBar.state = STATE_UP; |
2010 | else |
1991 | else |
2011 | scrollBar.setDn (); |
1992 | scrollBar.state = STATE_DOWN; |
2012 | } |
1993 | } |
2013 | } |
1994 | } |
2014 | else |
1995 | else |
2015 | switch (ev.button) |
1996 | switch (ev.button) |
2016 | { |
1997 | { |
… | |
… | |
2031 | if (scrollBar.style == R_SB_XTERM |
2012 | if (scrollBar.style == R_SB_XTERM |
2032 | || scrollbar_above_slider (ev.y) |
2013 | || scrollbar_above_slider (ev.y) |
2033 | || scrollbar_below_slider (ev.y)) |
2014 | || scrollbar_below_slider (ev.y)) |
2034 | scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); |
2015 | scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); |
2035 | |
2016 | |
2036 | scrollBar.setMotion (); |
2017 | scrollBar.state = STATE_MOTION; |
2037 | break; |
2018 | break; |
2038 | |
2019 | |
2039 | case Button1: |
2020 | case Button1: |
2040 | if (scrollBar.align == R_SB_ALIGN_CENTRE) |
2021 | if (scrollBar.align == R_SB_ALIGN_CENTRE) |
2041 | csrO = ev.y - scrollBar.top; |
2022 | csrO = ev.y - scrollBar.top; |
… | |
… | |
2055 | scr_page (DN, nrow - 1); |
2036 | scr_page (DN, nrow - 1); |
2056 | # else |
2037 | # else |
2057 | scr_page (DN, nrow / 4); |
2038 | scr_page (DN, nrow / 4); |
2058 | # endif |
2039 | # endif |
2059 | else |
2040 | else |
2060 | scrollBar.setMotion (); |
2041 | scrollBar.state = STATE_MOTION; |
2061 | } |
2042 | } |
2062 | else |
2043 | else |
2063 | { |
2044 | { |
2064 | scr_page ((ev.button == Button1 ? DN : UP), |
2045 | scr_page ((ev.button == Button1 ? DN : UP), |
2065 | (nrow |
2046 | (nrow |
… | |
… | |
2082 | |
2063 | |
2083 | csrO = 0; /* reset csr Offset */ |
2064 | csrO = 0; /* reset csr Offset */ |
2084 | if (!bypass_keystate) |
2065 | if (!bypass_keystate) |
2085 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
2066 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
2086 | |
2067 | |
2087 | if (scrollbar_isUpDn ()) |
2068 | if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) |
2088 | { |
2069 | { |
2089 | scrollBar.setIdle (); |
2070 | scrollBar.state = STATE_IDLE; |
2090 | scrollbar_show (0); |
2071 | scrollbar_show (0); |
2091 | } |
2072 | } |
2092 | |
2073 | |
2093 | #ifdef SELECTION_SCROLLING |
2074 | #ifdef SELECTION_SCROLLING |
2094 | sel_scroll_ev.stop(); |
2075 | sel_scroll_ev.stop(); |