… | |
… | |
519 | # endif |
519 | # endif |
520 | return; |
520 | return; |
521 | } |
521 | } |
522 | else |
522 | else |
523 | { |
523 | { |
524 | # if ENABLE_OVERLAY |
524 | # if ISO_14755 |
525 | scr_overlay_off (); |
525 | scr_overlay_off (); |
526 | # endif |
526 | # endif |
527 | iso14755buf = 0; |
527 | iso14755buf = 0; |
528 | } |
528 | } |
529 | } |
529 | } |
530 | else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) |
530 | else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) |
531 | || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) |
531 | || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) |
532 | if (!(iso14755buf & ISO_14755_STARTED)) |
532 | if (!(iso14755buf & ISO_14755_STARTED)) |
533 | { |
533 | { |
534 | iso14755buf |= ISO_14755_STARTED; |
534 | iso14755buf |= ISO_14755_STARTED; |
535 | # if ENABLE_OVERLAY |
535 | # if ISO_14755 |
536 | scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); |
536 | scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); |
537 | scr_overlay_set (0, 0, "ISO 14755 mode"); |
537 | scr_overlay_set (0, 0, "ISO 14755 mode"); |
538 | # endif |
538 | # endif |
539 | } |
539 | } |
540 | #endif |
540 | #endif |
… | |
… | |
728 | |
728 | |
729 | case XK_Find: |
729 | case XK_Find: |
730 | strcpy (kbuf, "\033[1~"); |
730 | strcpy (kbuf, "\033[1~"); |
731 | break; |
731 | break; |
732 | |
732 | |
733 | #ifdef XK_KP_End |
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 ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
737 | { |
737 | { |
738 | strcpy (kbuf, "\033Op"); |
738 | strcpy (kbuf, "\033Op"); |
… | |
… | |
934 | #if ENABLE_FRILLS || ISO_14755 |
934 | #if ENABLE_FRILLS || ISO_14755 |
935 | // ISO 14755 support |
935 | // ISO 14755 support |
936 | if (iso14755buf) |
936 | if (iso14755buf) |
937 | if (iso14755buf & ISO_14755_52) |
937 | if (iso14755buf & ISO_14755_52) |
938 | { |
938 | { |
939 | # if ENABLE_OVERLAY |
939 | # if ISO_14755 |
940 | scr_overlay_off (); |
940 | scr_overlay_off (); |
941 | # endif |
941 | # endif |
942 | # if ISO_14755 |
942 | # if ISO_14755 |
943 | // iso14755 part 5.2 handling: release time |
943 | // iso14755 part 5.2 handling: release time |
944 | // first: controls |
944 | // first: controls |
… | |
… | |
967 | |
967 | |
968 | return; |
968 | return; |
969 | } |
969 | } |
970 | else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
970 | else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
971 | { |
971 | { |
972 | # if ENABLE_OVERLAY |
972 | # if ISO_14755 |
973 | scr_overlay_off (); |
973 | scr_overlay_off (); |
974 | # endif |
974 | # endif |
975 | if (iso14755buf & ISO_14755_51) |
975 | if (iso14755buf & ISO_14755_51) |
976 | commit_iso14755 (); |
976 | commit_iso14755 (); |
977 | #if ISO_14755 |
977 | #if ISO_14755 |
… | |
… | |
1433 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
1433 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
1434 | focus_out (); |
1434 | focus_out (); |
1435 | } |
1435 | } |
1436 | #endif |
1436 | #endif |
1437 | } |
1437 | } |
1438 | break; |
|
|
1439 | |
|
|
1440 | case MappingNotify: |
|
|
1441 | XRefreshKeyboardMapping (&ev.xmapping); |
|
|
1442 | break; |
1438 | break; |
1443 | |
1439 | |
1444 | /* |
1440 | /* |
1445 | * XXX: this is not the _current_ arrangement |
1441 | * XXX: this is not the _current_ arrangement |
1446 | * Here's my conclusion: |
1442 | * Here's my conclusion: |
… | |
… | |
1783 | |
1779 | |
1784 | #if ENABLE_FRILLS || ISO_14755 |
1780 | #if ENABLE_FRILLS || ISO_14755 |
1785 | if (iso14755buf) |
1781 | if (iso14755buf) |
1786 | { |
1782 | { |
1787 | iso14755buf = 0; |
1783 | iso14755buf = 0; |
1788 | # if ENABLE_OVERLAY |
1784 | # if ISO_14755 |
1789 | scr_overlay_off (); |
1785 | scr_overlay_off (); |
1790 | # endif |
1786 | # endif |
1791 | } |
1787 | } |
1792 | #endif |
1788 | #endif |
1793 | #if USE_XIM |
1789 | #if USE_XIM |
… | |
… | |
2812 | unicode_t ch, priv, i; |
2808 | unicode_t ch, priv, i; |
2813 | unsigned int nargs, p; |
2809 | unsigned int nargs, p; |
2814 | int n, ndef; |
2810 | int n, ndef; |
2815 | int arg[ESC_ARGS]; |
2811 | int arg[ESC_ARGS]; |
2816 | |
2812 | |
2817 | for (nargs = ESC_ARGS; nargs > 0;) |
2813 | memset (arg, 0, sizeof (arg)); |
2818 | arg[--nargs] = 0; |
2814 | nargs = 0; |
2819 | |
2815 | |
2820 | priv = 0; |
2816 | priv = 0; |
2821 | ch = cmd_getc (); |
2817 | ch = cmd_getc (); |
2822 | if (ch >= '<' && ch <= '?') |
2818 | if (ch >= '<' && ch <= '?') |
2823 | { /* '<' '=' '>' '?' */ |
2819 | { /* '<' '=' '>' '?' */ |