| … | |
… | |
| 579 | } |
579 | } |
| 580 | } |
580 | } |
| 581 | |
581 | |
| 582 | #if ENABLE_FRILLS || ISO_14755 |
582 | #if ENABLE_FRILLS || ISO_14755 |
| 583 | // ISO 14755 support |
583 | // ISO 14755 support |
| 584 | if (shft && ctrl) |
584 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) |
| 585 | { |
585 | { |
| 586 | int hv; |
586 | int hv; |
| 587 | |
587 | |
| 588 | if (iso14755buf & ISO_14755_51 |
588 | if (iso14755buf & ISO_14755_51 |
| 589 | && (keysym == XK_space || keysym == XK_KP_Space |
589 | && (keysym == XK_space || keysym == XK_KP_Space |
| … | |
… | |
| 619 | scr_overlay_off (); |
619 | scr_overlay_off (); |
| 620 | # endif |
620 | # endif |
| 621 | iso14755buf = 0; |
621 | iso14755buf = 0; |
| 622 | } |
622 | } |
| 623 | } |
623 | } |
|
|
624 | else if (option (Opt_iso14755) && |
| 624 | else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) |
625 | ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) |
| 625 | || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) |
626 | || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))) |
| 626 | if (!(iso14755buf & ISO_14755_STARTED)) |
627 | if (!(iso14755buf & ISO_14755_STARTED)) |
| 627 | { |
628 | { |
| 628 | iso14755buf |= ISO_14755_STARTED; |
629 | iso14755buf |= ISO_14755_STARTED; |
| 629 | # if ISO_14755 |
630 | # if ISO_14755 |
| 630 | scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); |
631 | scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); |
| … | |
… | |
| 3336 | |
3337 | |
| 3337 | XFree (value); |
3338 | XFree (value); |
| 3338 | } |
3339 | } |
| 3339 | else |
3340 | else |
| 3340 | { |
3341 | { |
| 3341 | char *eq = strchr (str, '='); // constness lost, but verified to be ok |
3342 | char *eq = strchr (str, '='); |
| 3342 | |
3343 | |
| 3343 | if (eq) |
3344 | if (eq) |
| 3344 | { |
3345 | { |
| 3345 | *eq = 0; |
3346 | *eq = 0; |
| 3346 | set_utf8_property (display->atom (str), eq + 1); |
3347 | set_utf8_property (display->atom (str), eq + 1); |
