… | |
… | |
95 | XK_Shift_L, 0x21e7, |
95 | XK_Shift_L, 0x21e7, |
96 | XK_Shift_R, 0x21e7, |
96 | XK_Shift_R, 0x21e7, |
97 | |
97 | |
98 | XK_Shift_Lock, 0x21eb, |
98 | XK_Shift_Lock, 0x21eb, |
99 | XK_ISO_Lock, 0x21eb, |
99 | XK_ISO_Lock, 0x21eb, |
100 | XK_ISO_Lock, 0x21eb, |
|
|
101 | XK_Caps_Lock, 0x21ec, |
100 | XK_Caps_Lock, 0x21ec, |
102 | XK_Num_Lock, 0x21ed, |
101 | XK_Num_Lock, 0x21ed, |
103 | XK_ISO_Level3_Shift, 0x21ee, |
102 | XK_ISO_Level3_Shift, 0x21ee, |
104 | XK_ISO_Level3_Lock, 0x21ef, |
103 | XK_ISO_Level3_Lock, 0x21ef, |
105 | XK_ISO_Group_Lock, 0x21f0, |
104 | XK_ISO_Group_Lock, 0x21f0, |
… | |
… | |
548 | #endif |
547 | #endif |
549 | |
548 | |
550 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
549 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
551 | { |
550 | { |
552 | { |
551 | { |
|
|
552 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
553 | newlen = 1; |
553 | newlen = 1; |
554 | switch (keysym) |
554 | switch (keysym) |
555 | { |
555 | { |
556 | #ifndef NO_BACKSPACE_KEY |
556 | #ifndef NO_BACKSPACE_KEY |
557 | case XK_BackSpace: |
557 | case XK_BackSpace: |
… | |
… | |
560 | kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) |
560 | kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) |
561 | ^ !!ctrl) ? '\b' : '\177'; |
561 | ^ !!ctrl) ? '\b' : '\177'; |
562 | kbuf[1] = '\0'; |
562 | kbuf[1] = '\0'; |
563 | } |
563 | } |
564 | else |
564 | else |
565 | strcpy (kbuf, key_backspace); |
565 | strcpy (kbuf, rs[Rs_backspace_key]); |
566 | break; |
566 | break; |
567 | #endif |
567 | #endif |
568 | #ifndef NO_DELETE_KEY |
568 | #ifndef NO_DELETE_KEY |
569 | # ifdef XK_KP_Prior |
569 | # ifdef XK_KP_Delete |
570 | case XK_KP_Delete: |
570 | case XK_KP_Delete: |
571 | /* allow shift to override */ |
571 | /* allow shift to override */ |
572 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
572 | if (kp) |
573 | { |
573 | { |
574 | strcpy (kbuf, "\033On"); |
574 | strcpy (kbuf, "\033On"); |
575 | break; |
575 | break; |
576 | } |
576 | } |
577 | /* FALLTHROUGH */ |
577 | /* FALLTHROUGH */ |
578 | # endif |
578 | # endif |
579 | case XK_Delete: |
579 | case XK_Delete: |
580 | strcpy (kbuf, key_delete); |
580 | strcpy (kbuf, rs[Rs_delete_key]); |
581 | break; |
581 | break; |
582 | #endif |
582 | #endif |
583 | case XK_Tab: |
583 | case XK_Tab: |
584 | if (shft) |
584 | if (shft) |
585 | strcpy (kbuf, "\033[Z"); |
585 | strcpy (kbuf, "\033[Z"); |
… | |
… | |
600 | #ifdef XK_KP_Left |
600 | #ifdef XK_KP_Left |
601 | case XK_KP_Up: /* \033Ox or standard */ |
601 | case XK_KP_Up: /* \033Ox or standard */ |
602 | case XK_KP_Down: /* \033Or or standard */ |
602 | case XK_KP_Down: /* \033Or or standard */ |
603 | case XK_KP_Right: /* \033Ov or standard */ |
603 | case XK_KP_Right: /* \033Ov or standard */ |
604 | case XK_KP_Left: /* \033Ot or standard */ |
604 | case XK_KP_Left: /* \033Ot or standard */ |
605 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
605 | if (kp) |
606 | { |
606 | { |
607 | strcpy (kbuf, "\033OZ"); |
607 | strcpy (kbuf, "\033OZ"); |
608 | kbuf[2] = "txvr"[keysym - XK_KP_Left]; |
608 | kbuf[2] = "txvr"[keysym - XK_KP_Left]; |
609 | break; |
609 | break; |
610 | } |
610 | } |
… | |
… | |
633 | |
633 | |
634 | #ifndef UNSHIFTED_SCROLLKEYS |
634 | #ifndef UNSHIFTED_SCROLLKEYS |
635 | # ifdef XK_KP_Prior |
635 | # ifdef XK_KP_Prior |
636 | case XK_KP_Prior: |
636 | case XK_KP_Prior: |
637 | /* allow shift to override */ |
637 | /* allow shift to override */ |
638 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
638 | if (kp) |
639 | { |
639 | { |
640 | strcpy (kbuf, "\033Oy"); |
640 | strcpy (kbuf, "\033Oy"); |
641 | break; |
641 | break; |
642 | } |
642 | } |
643 | /* FALLTHROUGH */ |
643 | /* FALLTHROUGH */ |
… | |
… | |
646 | strcpy (kbuf, "\033[5~"); |
646 | strcpy (kbuf, "\033[5~"); |
647 | break; |
647 | break; |
648 | # ifdef XK_KP_Next |
648 | # ifdef XK_KP_Next |
649 | case XK_KP_Next: |
649 | case XK_KP_Next: |
650 | /* allow shift to override */ |
650 | /* allow shift to override */ |
651 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
651 | if (kp) |
652 | { |
652 | { |
653 | strcpy (kbuf, "\033Os"); |
653 | strcpy (kbuf, "\033Os"); |
654 | break; |
654 | break; |
655 | } |
655 | } |
656 | /* FALLTHROUGH */ |
656 | /* FALLTHROUGH */ |
… | |
… | |
659 | strcpy (kbuf, "\033[6~"); |
659 | strcpy (kbuf, "\033[6~"); |
660 | break; |
660 | break; |
661 | #endif |
661 | #endif |
662 | case XK_KP_Enter: |
662 | case XK_KP_Enter: |
663 | /* allow shift to override */ |
663 | /* allow shift to override */ |
664 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
664 | if (kp) |
665 | { |
665 | { |
666 | strcpy (kbuf, "\033OM"); |
666 | strcpy (kbuf, "\033OM"); |
667 | break; |
667 | break; |
668 | } |
668 | } |
669 | |
669 | |
… | |
… | |
712 | case XK_KP_6: /* "\033Ov" : "6" */ |
712 | case XK_KP_6: /* "\033Ov" : "6" */ |
713 | case XK_KP_7: /* "\033Ow" : "7" */ |
713 | case XK_KP_7: /* "\033Ow" : "7" */ |
714 | case XK_KP_8: /* "\033Ox" : "8" */ |
714 | case XK_KP_8: /* "\033Ox" : "8" */ |
715 | case XK_KP_9: /* "\033Oy" : "9" */ |
715 | case XK_KP_9: /* "\033Oy" : "9" */ |
716 | /* allow shift to override */ |
716 | /* allow shift to override */ |
717 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
717 | if (kp) |
718 | { |
718 | { |
719 | strcpy (kbuf, "\033Oj"); |
719 | strcpy (kbuf, "\033Oj"); |
720 | kbuf[2] += (keysym - XK_KP_Multiply); |
720 | kbuf[2] += (keysym - XK_KP_Multiply); |
721 | } |
721 | } |
722 | else |
722 | else |
… | |
… | |
731 | break; |
731 | break; |
732 | |
732 | |
733 | #ifdef XK_KP_Insert |
733 | #ifdef XK_KP_Insert |
734 | case XK_KP_Insert: |
734 | case XK_KP_Insert: |
735 | /* allow shift to override */ |
735 | /* allow shift to override */ |
736 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
736 | if (kp) |
737 | { |
737 | { |
738 | strcpy (kbuf, "\033Op"); |
738 | strcpy (kbuf, "\033Op"); |
739 | break; |
739 | break; |
740 | } |
740 | } |
741 | /* FALLTHROUGH */ |
741 | /* FALLTHROUGH */ |
… | |
… | |
754 | strcpy (kbuf, "\033[4~"); |
754 | strcpy (kbuf, "\033[4~"); |
755 | break; |
755 | break; |
756 | #ifdef XK_KP_End |
756 | #ifdef XK_KP_End |
757 | case XK_KP_End: |
757 | case XK_KP_End: |
758 | /* allow shift to override */ |
758 | /* allow shift to override */ |
759 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
759 | if (kp) |
760 | { |
760 | { |
761 | strcpy (kbuf, "\033Oq"); |
761 | strcpy (kbuf, "\033Oq"); |
762 | break; |
762 | break; |
763 | } |
763 | } |
764 | /* FALLTHROUGH */ |
764 | /* FALLTHROUGH */ |
… | |
… | |
767 | strcpy (kbuf, KS_END); |
767 | strcpy (kbuf, KS_END); |
768 | break; |
768 | break; |
769 | #ifdef XK_KP_Home |
769 | #ifdef XK_KP_Home |
770 | case XK_KP_Home: |
770 | case XK_KP_Home: |
771 | /* allow shift to override */ |
771 | /* allow shift to override */ |
772 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
772 | if (kp) |
773 | { |
773 | { |
774 | strcpy (kbuf, "\033Ow"); |
774 | strcpy (kbuf, "\033Ow"); |
775 | break; |
775 | break; |
776 | } |
776 | } |
777 | /* FALLTHROUGH */ |
777 | /* FALLTHROUGH */ |
… | |
… | |
1475 | && ev.xfocus.mode != NotifyGrab) |
1475 | && ev.xfocus.mode != NotifyGrab) |
1476 | focus_out (); |
1476 | focus_out (); |
1477 | break; |
1477 | break; |
1478 | |
1478 | |
1479 | case ConfigureNotify: |
1479 | case ConfigureNotify: |
|
|
1480 | /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", |
|
|
1481 | ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, |
|
|
1482 | szHint.width, szHint.height);*/ |
1480 | if (ev.xconfigure.window == parent[0]) |
1483 | if (ev.xconfigure.window == parent[0]) |
1481 | { |
1484 | { |
1482 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1485 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1483 | ; |
1486 | ; |
1484 | |
1487 | |
1485 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1488 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1486 | { |
1489 | { |
1487 | seen_resize = 1; |
1490 | seen_resize = 1; |
1488 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1491 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1489 | #ifdef XPM_BACKGROUND |
|
|
1490 | /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */ |
|
|
1491 | if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ()) |
|
|
1492 | { |
|
|
1493 | bgPixmap.render (); |
|
|
1494 | scr_touch (true); |
|
|
1495 | } |
|
|
1496 | #endif |
|
|
1497 | } |
1492 | } |
1498 | |
1493 | else |
|
|
1494 | { |
|
|
1495 | #ifdef ENABLE_TRANSPARENCY |
|
|
1496 | if (option (Opt_transparent)) |
|
|
1497 | update_background (); |
|
|
1498 | #endif |
|
|
1499 | } |
1499 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1500 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1500 | |
|
|
1501 | #ifdef ENABLE_TRANSPARENCY |
|
|
1502 | if (option (Opt_transparent)) |
|
|
1503 | bgPixmap.render (); |
|
|
1504 | #endif |
|
|
1505 | } |
1501 | } |
1506 | break; |
1502 | break; |
1507 | |
1503 | |
1508 | case PropertyNotify: |
1504 | case PropertyNotify: |
1509 | if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1505 | if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) |
… | |
… | |
1834 | */ |
1830 | */ |
1835 | if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] |
1831 | if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] |
1836 | || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) |
1832 | || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) |
1837 | { |
1833 | { |
1838 | bgPixmap.set_root_pixmap (); |
1834 | bgPixmap.set_root_pixmap (); |
1839 | bgPixmap.render (); |
1835 | update_background (); |
1840 | } |
1836 | } |
1841 | break; |
1837 | break; |
1842 | } |
1838 | } |
1843 | # endif |
1839 | # endif |
1844 | } |
1840 | } |
… | |
… | |
2800 | rxvt_term::process_csi_seq () |
2796 | rxvt_term::process_csi_seq () |
2801 | { |
2797 | { |
2802 | unicode_t ch, priv, i; |
2798 | unicode_t ch, priv, i; |
2803 | unsigned int nargs, p; |
2799 | unsigned int nargs, p; |
2804 | int n, ndef; |
2800 | int n, ndef; |
2805 | int arg[ESC_ARGS]; |
2801 | int arg[ESC_ARGS] = { }; |
2806 | |
2802 | |
2807 | memset (arg, 0, sizeof (arg)); |
|
|
2808 | nargs = 0; |
2803 | nargs = 0; |
2809 | |
2804 | |
2810 | priv = 0; |
2805 | priv = 0; |
2811 | ch = cmd_getc (); |
2806 | ch = cmd_getc (); |
2812 | if (ch >= '<' && ch <= '?') |
2807 | if (ch >= '<' && ch <= '?') |
… | |
… | |
3435 | if (ISSET_PIXCOLOR (Color_tint)) |
3430 | if (ISSET_PIXCOLOR (Color_tint)) |
3436 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3431 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3437 | else |
3432 | else |
3438 | changed = bgPixmap.unset_tint (); |
3433 | changed = bgPixmap.unset_tint (); |
3439 | if (changed) |
3434 | if (changed) |
3440 | bgPixmap.render (); |
3435 | update_background (); |
3441 | } |
3436 | } |
3442 | |
3437 | |
3443 | break; |
3438 | break; |
3444 | #endif |
3439 | #endif |
3445 | |
3440 | |
… | |
… | |
3474 | if (bgPixmap.set_geometry (str)) |
3469 | if (bgPixmap.set_geometry (str)) |
3475 | changed++; |
3470 | changed++; |
3476 | str = strchr (str, ';'); |
3471 | str = strchr (str, ';'); |
3477 | } |
3472 | } |
3478 | if (changed) |
3473 | if (changed) |
3479 | { |
3474 | update_background (); |
3480 | bgPixmap.render (); |
|
|
3481 | scr_touch (true); |
|
|
3482 | } |
|
|
3483 | } |
3475 | } |
3484 | break; |
3476 | break; |
3485 | #endif |
3477 | #endif |
3486 | |
3478 | |
3487 | case Rxvt_restoreFG: |
3479 | case Rxvt_restoreFG: |