| … | |
… | |
| 867 | #endif |
867 | #endif |
| 868 | /* nil */ ; |
868 | /* nil */ ; |
| 869 | } |
869 | } |
| 870 | } |
870 | } |
| 871 | |
871 | |
| 872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) |
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
| 873 | return; |
873 | return; |
| 874 | |
874 | |
| 875 | if (len <= 0) |
875 | if (len <= 0) |
| 876 | return; /* not mapped */ |
876 | return; /* not mapped */ |
| 877 | |
877 | |
| … | |
… | |
| 1329 | |
1329 | |
| 1330 | break; |
1330 | break; |
| 1331 | |
1331 | |
| 1332 | case KeyRelease: |
1332 | case KeyRelease: |
| 1333 | { |
1333 | { |
| 1334 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1334 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
| 1335 | KeySym ks; |
1335 | KeySym keysym; |
| 1336 | |
1336 | |
| 1337 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1337 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
| 1338 | #endif |
1338 | #endif |
| 1339 | |
1339 | |
| 1340 | #if ENABLE_FRILLS || ISO_14755 |
1340 | #if ENABLE_FRILLS || ISO_14755 |
| 1341 | // ISO 14755 support |
1341 | // ISO 14755 support |
| 1342 | if (iso14755buf) |
1342 | if (iso14755buf) |
| … | |
… | |
| 1347 | # endif |
1347 | # endif |
| 1348 | # if ISO_14755 |
1348 | # if ISO_14755 |
| 1349 | // iso14755 part 5.2 handling: release time |
1349 | // iso14755 part 5.2 handling: release time |
| 1350 | // first: controls |
1350 | // first: controls |
| 1351 | if ((ev.xkey.state & ControlMask) |
1351 | if ((ev.xkey.state & ControlMask) |
| 1352 | && ((ks >= 0x40 && ks <= 0x5f) |
1352 | && ((keysym >= 0x40 && keysym <= 0x5f) |
| 1353 | || (ks >= 0x61 && ks <= 0x7f))) |
1353 | || (keysym >= 0x61 && keysym <= 0x7f))) |
| 1354 | { |
1354 | { |
| 1355 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1355 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
| 1356 | commit_iso14755 (); |
1356 | commit_iso14755 (); |
| 1357 | goto skip_switch; |
1357 | goto skip_switch; |
| 1358 | } |
1358 | } |
| 1359 | |
1359 | |
| 1360 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1360 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
| 1361 | if (i[0] == ks) |
1361 | if (i[0] == keysym) |
| 1362 | { |
1362 | { |
| 1363 | iso14755buf = ISO_14755_51 | i[1]; |
1363 | iso14755buf = ISO_14755_51 | i[1]; |
| 1364 | commit_iso14755 (); |
1364 | commit_iso14755 (); |
| 1365 | goto skip_switch; |
1365 | goto skip_switch; |
| 1366 | } |
1366 | } |
| … | |
… | |
| 1390 | iso14755buf = 0; |
1390 | iso14755buf = 0; |
| 1391 | } |
1391 | } |
| 1392 | #endif |
1392 | #endif |
| 1393 | |
1393 | |
| 1394 | if (ev.xany.window == vt |
1394 | if (ev.xany.window == vt |
| 1395 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) |
1395 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
| 1396 | break; |
1396 | break; |
| 1397 | |
1397 | |
| 1398 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1398 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
| 1399 | if (!(ev.xkey.state & ControlMask)) |
1399 | if (!(ev.xkey.state & ControlMask)) |
| 1400 | slip_wheel_ev.stop (); |
1400 | slip_wheel_ev.stop (); |
| 1401 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1401 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
| 1402 | mouse_slip_wheel_speed = 0; |
1402 | mouse_slip_wheel_speed = 0; |
| 1403 | #endif |
1403 | #endif |
| 1404 | break; |
1404 | break; |
| 1405 | } |
1405 | } |
| 1406 | |
1406 | |
