… | |
… | |
547 | #endif |
547 | #endif |
548 | |
548 | |
549 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
549 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
550 | { |
550 | { |
551 | { |
551 | { |
|
|
552 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
552 | newlen = 1; |
553 | newlen = 1; |
553 | switch (keysym) |
554 | switch (keysym) |
554 | { |
555 | { |
555 | #ifndef NO_BACKSPACE_KEY |
556 | #ifndef NO_BACKSPACE_KEY |
556 | case XK_BackSpace: |
557 | case XK_BackSpace: |
… | |
… | |
559 | kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) |
560 | kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) |
560 | ^ !!ctrl) ? '\b' : '\177'; |
561 | ^ !!ctrl) ? '\b' : '\177'; |
561 | kbuf[1] = '\0'; |
562 | kbuf[1] = '\0'; |
562 | } |
563 | } |
563 | else |
564 | else |
564 | strcpy (kbuf, key_backspace); |
565 | strcpy (kbuf, rs[Rs_backspace_key]); |
565 | break; |
566 | break; |
566 | #endif |
567 | #endif |
567 | #ifndef NO_DELETE_KEY |
568 | #ifndef NO_DELETE_KEY |
568 | # ifdef XK_KP_Prior |
569 | # ifdef XK_KP_Delete |
569 | case XK_KP_Delete: |
570 | case XK_KP_Delete: |
570 | /* allow shift to override */ |
571 | /* allow shift to override */ |
571 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
572 | if (kp) |
572 | { |
573 | { |
573 | strcpy (kbuf, "\033On"); |
574 | strcpy (kbuf, "\033On"); |
574 | break; |
575 | break; |
575 | } |
576 | } |
576 | /* FALLTHROUGH */ |
577 | /* FALLTHROUGH */ |
577 | # endif |
578 | # endif |
578 | case XK_Delete: |
579 | case XK_Delete: |
579 | strcpy (kbuf, key_delete); |
580 | strcpy (kbuf, rs[Rs_delete_key]); |
580 | break; |
581 | break; |
581 | #endif |
582 | #endif |
582 | case XK_Tab: |
583 | case XK_Tab: |
583 | if (shft) |
584 | if (shft) |
584 | strcpy (kbuf, "\033[Z"); |
585 | strcpy (kbuf, "\033[Z"); |
… | |
… | |
599 | #ifdef XK_KP_Left |
600 | #ifdef XK_KP_Left |
600 | case XK_KP_Up: /* \033Ox or standard */ |
601 | case XK_KP_Up: /* \033Ox or standard */ |
601 | case XK_KP_Down: /* \033Or or standard */ |
602 | case XK_KP_Down: /* \033Or or standard */ |
602 | case XK_KP_Right: /* \033Ov or standard */ |
603 | case XK_KP_Right: /* \033Ov or standard */ |
603 | case XK_KP_Left: /* \033Ot or standard */ |
604 | case XK_KP_Left: /* \033Ot or standard */ |
604 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
605 | if (kp) |
605 | { |
606 | { |
606 | strcpy (kbuf, "\033OZ"); |
607 | strcpy (kbuf, "\033OZ"); |
607 | kbuf[2] = "txvr"[keysym - XK_KP_Left]; |
608 | kbuf[2] = "txvr"[keysym - XK_KP_Left]; |
608 | break; |
609 | break; |
609 | } |
610 | } |
… | |
… | |
632 | |
633 | |
633 | #ifndef UNSHIFTED_SCROLLKEYS |
634 | #ifndef UNSHIFTED_SCROLLKEYS |
634 | # ifdef XK_KP_Prior |
635 | # ifdef XK_KP_Prior |
635 | case XK_KP_Prior: |
636 | case XK_KP_Prior: |
636 | /* allow shift to override */ |
637 | /* allow shift to override */ |
637 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
638 | if (kp) |
638 | { |
639 | { |
639 | strcpy (kbuf, "\033Oy"); |
640 | strcpy (kbuf, "\033Oy"); |
640 | break; |
641 | break; |
641 | } |
642 | } |
642 | /* FALLTHROUGH */ |
643 | /* FALLTHROUGH */ |
… | |
… | |
645 | strcpy (kbuf, "\033[5~"); |
646 | strcpy (kbuf, "\033[5~"); |
646 | break; |
647 | break; |
647 | # ifdef XK_KP_Next |
648 | # ifdef XK_KP_Next |
648 | case XK_KP_Next: |
649 | case XK_KP_Next: |
649 | /* allow shift to override */ |
650 | /* allow shift to override */ |
650 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
651 | if (kp) |
651 | { |
652 | { |
652 | strcpy (kbuf, "\033Os"); |
653 | strcpy (kbuf, "\033Os"); |
653 | break; |
654 | break; |
654 | } |
655 | } |
655 | /* FALLTHROUGH */ |
656 | /* FALLTHROUGH */ |
… | |
… | |
658 | strcpy (kbuf, "\033[6~"); |
659 | strcpy (kbuf, "\033[6~"); |
659 | break; |
660 | break; |
660 | #endif |
661 | #endif |
661 | case XK_KP_Enter: |
662 | case XK_KP_Enter: |
662 | /* allow shift to override */ |
663 | /* allow shift to override */ |
663 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
664 | if (kp) |
664 | { |
665 | { |
665 | strcpy (kbuf, "\033OM"); |
666 | strcpy (kbuf, "\033OM"); |
666 | break; |
667 | break; |
667 | } |
668 | } |
668 | |
669 | |
… | |
… | |
711 | case XK_KP_6: /* "\033Ov" : "6" */ |
712 | case XK_KP_6: /* "\033Ov" : "6" */ |
712 | case XK_KP_7: /* "\033Ow" : "7" */ |
713 | case XK_KP_7: /* "\033Ow" : "7" */ |
713 | case XK_KP_8: /* "\033Ox" : "8" */ |
714 | case XK_KP_8: /* "\033Ox" : "8" */ |
714 | case XK_KP_9: /* "\033Oy" : "9" */ |
715 | case XK_KP_9: /* "\033Oy" : "9" */ |
715 | /* allow shift to override */ |
716 | /* allow shift to override */ |
716 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
717 | if (kp) |
717 | { |
718 | { |
718 | strcpy (kbuf, "\033Oj"); |
719 | strcpy (kbuf, "\033Oj"); |
719 | kbuf[2] += (keysym - XK_KP_Multiply); |
720 | kbuf[2] += (keysym - XK_KP_Multiply); |
720 | } |
721 | } |
721 | else |
722 | else |
… | |
… | |
730 | break; |
731 | break; |
731 | |
732 | |
732 | #ifdef XK_KP_Insert |
733 | #ifdef XK_KP_Insert |
733 | case XK_KP_Insert: |
734 | case XK_KP_Insert: |
734 | /* allow shift to override */ |
735 | /* allow shift to override */ |
735 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
736 | if (kp) |
736 | { |
737 | { |
737 | strcpy (kbuf, "\033Op"); |
738 | strcpy (kbuf, "\033Op"); |
738 | break; |
739 | break; |
739 | } |
740 | } |
740 | /* FALLTHROUGH */ |
741 | /* FALLTHROUGH */ |
… | |
… | |
753 | strcpy (kbuf, "\033[4~"); |
754 | strcpy (kbuf, "\033[4~"); |
754 | break; |
755 | break; |
755 | #ifdef XK_KP_End |
756 | #ifdef XK_KP_End |
756 | case XK_KP_End: |
757 | case XK_KP_End: |
757 | /* allow shift to override */ |
758 | /* allow shift to override */ |
758 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
759 | if (kp) |
759 | { |
760 | { |
760 | strcpy (kbuf, "\033Oq"); |
761 | strcpy (kbuf, "\033Oq"); |
761 | break; |
762 | break; |
762 | } |
763 | } |
763 | /* FALLTHROUGH */ |
764 | /* FALLTHROUGH */ |
… | |
… | |
766 | strcpy (kbuf, KS_END); |
767 | strcpy (kbuf, KS_END); |
767 | break; |
768 | break; |
768 | #ifdef XK_KP_Home |
769 | #ifdef XK_KP_Home |
769 | case XK_KP_Home: |
770 | case XK_KP_Home: |
770 | /* allow shift to override */ |
771 | /* allow shift to override */ |
771 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
772 | if (kp) |
772 | { |
773 | { |
773 | strcpy (kbuf, "\033Ow"); |
774 | strcpy (kbuf, "\033Ow"); |
774 | break; |
775 | break; |
775 | } |
776 | } |
776 | /* FALLTHROUGH */ |
777 | /* FALLTHROUGH */ |
… | |
… | |
1474 | && ev.xfocus.mode != NotifyGrab) |
1475 | && ev.xfocus.mode != NotifyGrab) |
1475 | focus_out (); |
1476 | focus_out (); |
1476 | break; |
1477 | break; |
1477 | |
1478 | |
1478 | 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);*/ |
1479 | if (ev.xconfigure.window == parent[0]) |
1483 | if (ev.xconfigure.window == parent[0]) |
1480 | { |
1484 | { |
1481 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1485 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1482 | ; |
1486 | ; |
1483 | |
1487 | |
… | |
… | |
1488 | } |
1492 | } |
1489 | else |
1493 | else |
1490 | { |
1494 | { |
1491 | #ifdef ENABLE_TRANSPARENCY |
1495 | #ifdef ENABLE_TRANSPARENCY |
1492 | if (option (Opt_transparent)) |
1496 | if (option (Opt_transparent)) |
1493 | if (bgPixmap.render ()) |
1497 | update_background (); |
1494 | scr_touch (false); |
|
|
1495 | #endif |
1498 | #endif |
1496 | } |
1499 | } |
1497 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1500 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1498 | } |
1501 | } |
1499 | break; |
1502 | break; |
… | |
… | |
1827 | */ |
1830 | */ |
1828 | if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] |
1831 | if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] |
1829 | || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) |
1832 | || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) |
1830 | { |
1833 | { |
1831 | bgPixmap.set_root_pixmap (); |
1834 | bgPixmap.set_root_pixmap (); |
1832 | bgPixmap.render (); |
1835 | update_background (); |
1833 | } |
1836 | } |
1834 | break; |
1837 | break; |
1835 | } |
1838 | } |
1836 | # endif |
1839 | # endif |
1837 | } |
1840 | } |
… | |
… | |
2793 | rxvt_term::process_csi_seq () |
2796 | rxvt_term::process_csi_seq () |
2794 | { |
2797 | { |
2795 | unicode_t ch, priv, i; |
2798 | unicode_t ch, priv, i; |
2796 | unsigned int nargs, p; |
2799 | unsigned int nargs, p; |
2797 | int n, ndef; |
2800 | int n, ndef; |
2798 | int arg[ESC_ARGS]; |
2801 | int arg[ESC_ARGS] = { }; |
2799 | |
2802 | |
2800 | memset (arg, 0, sizeof (arg)); |
|
|
2801 | nargs = 0; |
2803 | nargs = 0; |
2802 | |
2804 | |
2803 | priv = 0; |
2805 | priv = 0; |
2804 | ch = cmd_getc (); |
2806 | ch = cmd_getc (); |
2805 | if (ch >= '<' && ch <= '?') |
2807 | if (ch >= '<' && ch <= '?') |
… | |
… | |
3428 | if (ISSET_PIXCOLOR (Color_tint)) |
3430 | if (ISSET_PIXCOLOR (Color_tint)) |
3429 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3431 | changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); |
3430 | else |
3432 | else |
3431 | changed = bgPixmap.unset_tint (); |
3433 | changed = bgPixmap.unset_tint (); |
3432 | if (changed) |
3434 | if (changed) |
3433 | bgPixmap.render (); |
3435 | update_background (); |
3434 | } |
3436 | } |
3435 | |
3437 | |
3436 | break; |
3438 | break; |
3437 | #endif |
3439 | #endif |
3438 | |
3440 | |
… | |
… | |
3467 | if (bgPixmap.set_geometry (str)) |
3469 | if (bgPixmap.set_geometry (str)) |
3468 | changed++; |
3470 | changed++; |
3469 | str = strchr (str, ';'); |
3471 | str = strchr (str, ';'); |
3470 | } |
3472 | } |
3471 | if (changed) |
3473 | if (changed) |
3472 | { |
3474 | update_background (); |
3473 | bgPixmap.render (); |
|
|
3474 | scr_touch (true); |
|
|
3475 | } |
|
|
3476 | } |
3475 | } |
3477 | break; |
3476 | break; |
3478 | #endif |
3477 | #endif |
3479 | |
3478 | |
3480 | case Rxvt_restoreFG: |
3479 | case Rxvt_restoreFG: |