| … | |
… | |
| 298 | |
298 | |
| 299 | return -1; |
299 | return -1; |
| 300 | } |
300 | } |
| 301 | #endif |
301 | #endif |
| 302 | |
302 | |
|
|
303 | static inline KeySym |
|
|
304 | translate_keypad (KeySym keysym, bool kp) |
|
|
305 | { |
|
|
306 | #ifdef XK_KP_Home |
|
|
307 | static const KeySym keypadtrans[] = { |
|
|
308 | XK_KP_7, // XK_KP_Home |
|
|
309 | XK_KP_4, // XK_KP_Left |
|
|
310 | XK_KP_8, // XK_KP_Up |
|
|
311 | XK_KP_6, // XK_KP_Right |
|
|
312 | XK_KP_2, // XK_KP_Down |
|
|
313 | # ifndef UNSHIFTED_SCROLLKEYS |
|
|
314 | XK_KP_9, // XK_KP_Prior |
|
|
315 | XK_KP_3, // XK_KP_Next |
|
|
316 | # else |
|
|
317 | XK_Prior, |
|
|
318 | XK_Next, |
|
|
319 | # endif |
|
|
320 | XK_KP_1, // XK_KP_End |
|
|
321 | XK_KP_5, // XK_KP_Begin |
|
|
322 | }; |
|
|
323 | |
|
|
324 | if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) |
|
|
325 | { |
|
|
326 | unsigned int index = keysym - XK_KP_Home; |
|
|
327 | keysym = kp ? keypadtrans[index] : XK_Home + index; |
|
|
328 | } |
|
|
329 | else if (keysym == XK_KP_Insert) |
|
|
330 | keysym = kp ? XK_KP_0 : XK_Insert; |
|
|
331 | # ifndef NO_DELETE_KEY |
|
|
332 | else if (keysym == XK_KP_Delete) |
|
|
333 | keysym = kp ? XK_KP_Decimal : XK_Delete; |
|
|
334 | # endif |
|
|
335 | #endif |
|
|
336 | return keysym; |
|
|
337 | } |
|
|
338 | |
| 303 | void |
339 | void |
| 304 | rxvt_term::key_press (XKeyEvent &ev) |
340 | rxvt_term::key_press (XKeyEvent &ev) |
| 305 | { |
341 | { |
| 306 | int ctrl, meta, shft, len; |
342 | int ctrl, meta, shft, len; |
| 307 | KeySym keysym; |
343 | KeySym keysym; |
| … | |
… | |
| 548 | |
584 | |
| 549 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
585 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
| 550 | { |
586 | { |
| 551 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
587 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
| 552 | unsigned int newlen = 1; |
588 | unsigned int newlen = 1; |
| 553 | #ifdef XK_KP_Home |
|
|
| 554 | static const KeySym keypadtrans[] = { |
|
|
| 555 | XK_KP_7, // XK_KP_Home |
|
|
| 556 | XK_KP_4, // XK_KP_Left |
|
|
| 557 | XK_KP_8, // XK_KP_Up |
|
|
| 558 | XK_KP_6, // XK_KP_Right |
|
|
| 559 | XK_KP_2, // XK_KP_Down |
|
|
| 560 | #ifndef UNSHIFTED_SCROLLKEYS |
|
|
| 561 | XK_KP_9, // XK_KP_Prior |
|
|
| 562 | XK_KP_3, // XK_KP_Next |
|
|
| 563 | #else |
|
|
| 564 | XK_Prior, |
|
|
| 565 | XK_Next, |
|
|
| 566 | #endif |
|
|
| 567 | XK_KP_1, // XK_KP_End |
|
|
| 568 | XK_KP_5, // XK_KP_Begin |
|
|
| 569 | }; |
|
|
| 570 | |
589 | |
| 571 | if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) |
590 | switch (translate_keypad (keysym, kp)) |
| 572 | { |
|
|
| 573 | unsigned int index = keysym - XK_KP_Home; |
|
|
| 574 | keysym = kp ? keypadtrans[index] : XK_Home + index; |
|
|
| 575 | } |
|
|
| 576 | else if (keysym == XK_KP_Insert) |
|
|
| 577 | keysym = kp ? XK_KP_0 : XK_Insert; |
|
|
| 578 | #ifndef NO_DELETE_KEY |
|
|
| 579 | else if (keysym == XK_KP_Delete) |
|
|
| 580 | keysym = kp ? XK_KP_Decimal : XK_Delete; |
|
|
| 581 | #endif |
|
|
| 582 | #endif |
|
|
| 583 | switch (keysym) |
|
|
| 584 | { |
591 | { |
| 585 | #ifndef NO_BACKSPACE_KEY |
592 | #ifndef NO_BACKSPACE_KEY |
| 586 | case XK_BackSpace: |
593 | case XK_BackSpace: |
| 587 | if (priv_modes & PrivMode_HaveBackSpace) |
594 | if (priv_modes & PrivMode_HaveBackSpace) |
| 588 | { |
595 | { |
