… | |
… | |
889 | commit_iso14755 (); |
889 | commit_iso14755 (); |
890 | |
890 | |
891 | return; |
891 | return; |
892 | } |
892 | } |
893 | |
893 | |
894 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
894 | for (unsigned short *i = iso14755_symtab; i[0]; i += 2) |
895 | if (i[0] == keysym) |
895 | if (i[0] == keysym) |
896 | { |
896 | { |
897 | iso14755buf = ISO_14755_51 | i[1]; |
897 | iso14755buf = ISO_14755_51 | i[1]; |
898 | commit_iso14755 (); |
898 | commit_iso14755 (); |
899 | |
899 | |
… | |
… | |
975 | rxvt_term::flush () |
975 | rxvt_term::flush () |
976 | { |
976 | { |
977 | flush_ev.stop (); |
977 | flush_ev.stop (); |
978 | |
978 | |
979 | #ifdef HAVE_BG_PIXMAP |
979 | #ifdef HAVE_BG_PIXMAP |
980 | if (bgPixmap.check_clearChanged ()) |
980 | if (bgPixmap.flags & bgPixmap_t::hasChanged) |
981 | { |
981 | { |
|
|
982 | bgPixmap.flags &= ~bgPixmap_t::hasChanged; |
982 | // scr_clear (true); This needs to be researched further! |
983 | // scr_clear (true); This needs to be researched further! |
983 | scr_touch (false); |
984 | scr_touch (false); |
984 | } |
985 | } |
985 | #endif |
986 | #endif |
986 | |
987 | |
… | |
… | |
1251 | { |
1252 | { |
1252 | int button_number, key_state = 0; |
1253 | int button_number, key_state = 0; |
1253 | int x, y; |
1254 | int x, y; |
1254 | int code = 32; |
1255 | int code = 32; |
1255 | |
1256 | |
1256 | x = Pixel2Col (ev.x); |
1257 | x = Pixel2Col (ev.x) + 1; |
1257 | y = Pixel2Row (ev.y); |
1258 | y = Pixel2Row (ev.y) + 1; |
|
|
1259 | |
1258 | if (ev.type == MotionNotify) |
1260 | if (ev.type == MotionNotify) |
1259 | { |
1261 | { |
1260 | if (x == mouse_row && y == mouse_col) |
1262 | if (x == mouse_row && y == mouse_col) |
1261 | return; |
1263 | return; |
|
|
1264 | |
1262 | mouse_row = x; |
1265 | mouse_row = x; |
1263 | mouse_col = y; |
1266 | mouse_col = y; |
1264 | code += 32; |
1267 | code += 32; |
1265 | } |
1268 | } |
1266 | |
1269 | |
… | |
… | |
1269 | else |
1272 | else |
1270 | { |
1273 | { |
1271 | button_number = MEvent.button - Button1; |
1274 | button_number = MEvent.button - Button1; |
1272 | /* add 0x3D for wheel events, like xterm does */ |
1275 | /* add 0x3D for wheel events, like xterm does */ |
1273 | if (button_number >= 3) |
1276 | if (button_number >= 3) |
1274 | button_number += (64 - 3); |
1277 | button_number += 64 - 3; |
1275 | } |
1278 | } |
1276 | |
1279 | |
1277 | if (priv_modes & PrivMode_MouseX10) |
1280 | if (priv_modes & PrivMode_MouseX10) |
1278 | { |
1281 | { |
1279 | /* |
1282 | /* |
… | |
… | |
1311 | fputc ('A', stderr); |
1314 | fputc ('A', stderr); |
1312 | if (key_state & 32) |
1315 | if (key_state & 32) |
1313 | fputc ('2', stderr); |
1316 | fputc ('2', stderr); |
1314 | fprintf (stderr, "]: <%d>, %d/%d\n", |
1317 | fprintf (stderr, "]: <%d>, %d/%d\n", |
1315 | button_number, |
1318 | button_number, |
1316 | x + 1, |
1319 | x, |
1317 | y + 1); |
1320 | y); |
1318 | #endif |
1321 | #endif |
1319 | |
1322 | |
|
|
1323 | #if ENABLE_FRILLS |
|
|
1324 | if (priv_modes & PrivMode_ExtMouseRight) |
|
|
1325 | tt_printf ("\033[%d;%d;%dM", |
|
|
1326 | code + button_number + key_state, |
|
|
1327 | x, |
|
|
1328 | y); |
|
|
1329 | else if (priv_modes & PrivMode_ExtModeMouse) |
|
|
1330 | tt_printf ("\033[M%c%lc%lc", |
|
|
1331 | code + button_number + key_state, |
|
|
1332 | wint_t (32 + x), |
|
|
1333 | wint_t (32 + y)); |
|
|
1334 | else |
|
|
1335 | #endif |
1320 | tt_printf ("\033[M%c%c%c", |
1336 | tt_printf ("\033[M%c%c%c", |
1321 | (code + button_number + key_state), |
1337 | code + button_number + key_state, |
1322 | (32 + x + 1), |
1338 | 32 + x, |
1323 | (32 + y + 1)); |
1339 | 32 + y); |
1324 | } |
1340 | } |
1325 | |
1341 | |
1326 | /*{{{ process an X event */ |
1342 | /*{{{ process an X event */ |
1327 | void |
1343 | void |
1328 | rxvt_term::x_cb (XEvent &ev) |
1344 | rxvt_term::x_cb (XEvent &ev) |
… | |
… | |
1430 | && ev.xfocus.mode != NotifyGrab) |
1446 | && ev.xfocus.mode != NotifyGrab) |
1431 | focus_out (); |
1447 | focus_out (); |
1432 | break; |
1448 | break; |
1433 | |
1449 | |
1434 | case ConfigureNotify: |
1450 | case ConfigureNotify: |
1435 | /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", |
|
|
1436 | ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, |
|
|
1437 | szHint.width, szHint.height);*/ |
|
|
1438 | if (ev.xconfigure.window == parent[0]) |
1451 | if (ev.xconfigure.window == parent[0]) |
1439 | { |
1452 | { |
1440 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1453 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1441 | ; |
1454 | ; |
|
|
1455 | |
|
|
1456 | #ifdef HAVE_BG_PIXMAP |
|
|
1457 | bool moved = false; |
|
|
1458 | if (bgPixmap.window_position_sensitive ()) |
|
|
1459 | { |
|
|
1460 | int x, y; |
|
|
1461 | if (ev.xconfigure.send_event) |
|
|
1462 | { |
|
|
1463 | x = ev.xconfigure.x; |
|
|
1464 | y = ev.xconfigure.y; |
|
|
1465 | } |
|
|
1466 | else |
|
|
1467 | get_window_origin (x, y); |
|
|
1468 | |
|
|
1469 | if (bgPixmap.set_position (x, y) |
|
|
1470 | || (bgPixmap.flags & bgPixmap_t::isInvalid)) |
|
|
1471 | moved = true; |
|
|
1472 | } |
|
|
1473 | #endif |
1442 | |
1474 | |
1443 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1475 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1444 | { |
1476 | { |
1445 | seen_resize = 1; |
1477 | seen_resize = 1; |
1446 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1478 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1447 | } |
1479 | } |
1448 | else |
1480 | else |
1449 | { |
1481 | { |
1450 | #ifdef HAVE_BG_PIXMAP |
1482 | #ifdef HAVE_BG_PIXMAP |
1451 | if (bgPixmap.window_position_sensitive ()) |
1483 | if (moved) |
1452 | { |
1484 | { |
1453 | if (mapped) |
1485 | if (mapped) |
1454 | update_background (); |
1486 | update_background (); |
1455 | else |
1487 | else |
1456 | bgPixmap.invalidate (); |
1488 | bgPixmap.invalidate (); |
… | |
… | |
1483 | selection_send (ev.xselectionrequest); |
1515 | selection_send (ev.xselectionrequest); |
1484 | break; |
1516 | break; |
1485 | |
1517 | |
1486 | case MapNotify: |
1518 | case MapNotify: |
1487 | #ifdef HAVE_BG_PIXMAP |
1519 | #ifdef HAVE_BG_PIXMAP |
1488 | /* This is needed spcifically to fix the case of no window manager or a |
1520 | /* This is needed specifically to fix the case of no window manager or a |
1489 | * non-reparenting window manager. In those cases we never get first |
1521 | * non-reparenting window manager. In those cases we never get first |
1490 | * ConfigureNotify. Also that speeds startup under normal WM, by taking |
1522 | * ConfigureNotify. Also that speeds startup under normal WM, by taking |
1491 | * care of multiplicity of ConfigureNotify events arriwing while WM does |
1523 | * care of multiplicity of ConfigureNotify events arriving while WM does |
1492 | * reparenting. |
1524 | * reparenting. |
1493 | * We should not render background immidiately, as there could be several |
1525 | * We should not render background immediately, as there could be several |
1494 | * ConfigureNotify's to follow. Lets take care of all of them in one scoop |
1526 | * ConfigureNotify's to follow. Lets take care of all of them in one scoop |
1495 | * by scheduling background redraw as soon as we can, but giving a short |
1527 | * by scheduling background redraw as soon as we can, but giving a short |
1496 | * bit of time for ConfigureNotifies to arrive. |
1528 | * bit of time for ConfigureNotifies to arrive. |
1497 | * We should render background PRIOR to drawing any text, but AFTER all |
1529 | * We should render background PRIOR to drawing any text, but AFTER all |
1498 | * of ConfigureNotifys for the best results. |
1530 | * of ConfigureNotifys for the best results. |
… | |
… | |
1869 | /* save the xbutton state (for ButtonRelease) */ |
1901 | /* save the xbutton state (for ButtonRelease) */ |
1870 | MEvent.state = ev.state; |
1902 | MEvent.state = ev.state; |
1871 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1903 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1872 | if (ev.button == MEvent.button && clickintime) |
1904 | if (ev.button == MEvent.button && clickintime) |
1873 | { |
1905 | { |
1874 | /* same button, within alloted time */ |
1906 | /* same button, within allowed time */ |
1875 | MEvent.clicks++; |
1907 | MEvent.clicks++; |
1876 | |
1908 | |
1877 | if (MEvent.clicks > 1) |
1909 | if (MEvent.clicks > 1) |
1878 | { |
1910 | { |
1879 | /* only report double clicks */ |
1911 | /* only report double clicks */ |
… | |
… | |
2847 | { |
2879 | { |
2848 | /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ |
2880 | /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ |
2849 | scr_soft_reset (); |
2881 | scr_soft_reset (); |
2850 | |
2882 | |
2851 | static const int pm_h[] = { 7, 25 }; |
2883 | static const int pm_h[] = { 7, 25 }; |
2852 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; |
2884 | static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; |
2853 | |
2885 | |
2854 | process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); |
2886 | process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); |
2855 | process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); |
2887 | process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); |
2856 | } |
2888 | } |
2857 | break; |
2889 | break; |
… | |
… | |
3231 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3263 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3232 | */ |
3264 | */ |
3233 | void |
3265 | void |
3234 | rxvt_term::process_dcs_seq () |
3266 | rxvt_term::process_dcs_seq () |
3235 | { |
3267 | { |
3236 | char *s; |
|
|
3237 | unicode_t eh; |
|
|
3238 | |
|
|
3239 | /* |
3268 | /* |
3240 | * Not handled yet |
3269 | * Not handled yet |
3241 | */ |
3270 | */ |
|
|
3271 | |
|
|
3272 | unicode_t eh; |
3242 | s = get_to_st (eh); |
3273 | char *s = get_to_st (eh); |
3243 | if (s) |
3274 | if (s) |
3244 | free (s); |
3275 | free (s); |
3245 | |
3276 | |
3246 | return; |
3277 | return; |
3247 | } |
3278 | } |
… | |
… | |
3251 | * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' |
3282 | * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' |
3252 | */ |
3283 | */ |
3253 | void |
3284 | void |
3254 | rxvt_term::process_osc_seq () |
3285 | rxvt_term::process_osc_seq () |
3255 | { |
3286 | { |
3256 | unicode_t ch, eh; |
|
|
3257 | int arg; |
3287 | int arg; |
3258 | |
3288 | |
3259 | ch = cmd_getc (); |
3289 | unicode_t ch = cmd_getc (); |
3260 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3290 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3261 | arg = arg * 10 + (ch - '0'); |
3291 | arg = arg * 10 + (ch - '0'); |
3262 | |
3292 | |
3263 | if (ch == ';') |
3293 | if (ch == ';') |
3264 | { |
3294 | { |
|
|
3295 | unicode_t eh; |
3265 | char *s = get_to_st (eh); |
3296 | char *s = get_to_st (eh); |
3266 | |
3297 | |
3267 | if (s) |
3298 | if (s) |
3268 | { |
3299 | { |
3269 | process_xterm_seq (arg, s, eh); |
3300 | process_xterm_seq (arg, s, eh); |
… | |
… | |
3398 | break; |
3429 | break; |
3399 | #ifdef OPTION_HC |
3430 | #ifdef OPTION_HC |
3400 | case XTerm_Color_HC: |
3431 | case XTerm_Color_HC: |
3401 | process_color_seq (op, Color_HC, str, resp); |
3432 | process_color_seq (op, Color_HC, str, resp); |
3402 | break; |
3433 | break; |
|
|
3434 | case XTerm_Color_HTC: |
|
|
3435 | process_color_seq (op, Color_HTC, str, resp); |
|
|
3436 | break; |
3403 | #endif |
3437 | #endif |
3404 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3438 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3405 | case Rxvt_Color_BD: |
|
|
3406 | case URxvt_Color_BD: |
3439 | case URxvt_Color_BD: |
3407 | process_color_seq (op, Color_BD, str, resp); |
3440 | process_color_seq (op, Color_BD, str, resp); |
3408 | break; |
3441 | break; |
3409 | case Rxvt_Color_UL: |
|
|
3410 | case URxvt_Color_UL: |
3442 | case URxvt_Color_UL: |
3411 | process_color_seq (op, Color_UL, str, resp); |
3443 | process_color_seq (op, Color_UL, str, resp); |
3412 | break; |
3444 | break; |
3413 | case URxvt_Color_IT: |
3445 | case URxvt_Color_IT: |
3414 | process_color_seq (op, Color_IT, str, resp); |
3446 | process_color_seq (op, Color_IT, str, resp); |
… | |
… | |
3450 | { |
3482 | { |
3451 | int changed = 0; |
3483 | int changed = 0; |
3452 | |
3484 | |
3453 | if (*str != ';') |
3485 | if (*str != ';') |
3454 | { |
3486 | { |
3455 | /* reset to default scaling :*/ |
|
|
3456 | bgPixmap.unset_geometry (); |
|
|
3457 | if (bgPixmap.set_file (str)) /* change pixmap */ |
3487 | if (bgPixmap.set_file (str)) /* change pixmap */ |
|
|
3488 | { |
3458 | changed++; |
3489 | changed++; |
3459 | str = strchr (str, ';'); |
3490 | str = strchr (str, ';'); |
3460 | if (str == NULL) |
3491 | if (str == NULL) |
3461 | bgPixmap.set_defaultGeometry (); |
3492 | bgPixmap.set_defaultGeometry (); |
|
|
3493 | else |
|
|
3494 | bgPixmap.set_geometry (str+1); |
|
|
3495 | } |
3462 | } |
3496 | } |
3463 | |
3497 | else |
3464 | while (str) |
|
|
3465 | { |
3498 | { |
3466 | str++; |
3499 | str++; |
3467 | if (bgPixmap.set_geometry (str)) |
3500 | if (bgPixmap.set_geometry (str, true)) |
3468 | changed++; |
3501 | changed++; |
3469 | str = strchr (str, ';'); |
|
|
3470 | } |
3502 | } |
3471 | |
3503 | |
3472 | if (changed) |
3504 | if (changed) |
|
|
3505 | { |
|
|
3506 | if (bgPixmap.window_position_sensitive ()) |
|
|
3507 | { |
|
|
3508 | int x, y; |
|
|
3509 | get_window_origin (x, y); |
|
|
3510 | bgPixmap.set_position (x, y); |
|
|
3511 | } |
3473 | update_background (); |
3512 | update_background (); |
|
|
3513 | } |
3474 | } |
3514 | } |
3475 | break; |
3515 | break; |
3476 | #endif |
3516 | #endif |
3477 | |
3517 | |
3478 | case XTerm_logfile: |
3518 | case XTerm_logfile: |
… | |
… | |
3581 | { |
3621 | { |
3582 | if (mode == 'r') |
3622 | if (mode == 'r') |
3583 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3623 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3584 | else |
3624 | else |
3585 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
3625 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
|
|
3626 | |
3586 | set_privmode (bit, state); |
3627 | set_privmode (bit, state); |
3587 | } |
3628 | } |
3588 | |
3629 | |
3589 | return state; |
3630 | return state; |
3590 | } |
3631 | } |
… | |
… | |
3609 | { 6, PrivMode_relOrigin }, // DECOM |
3650 | { 6, PrivMode_relOrigin }, // DECOM |
3610 | { 7, PrivMode_Autowrap }, // DECAWM |
3651 | { 7, PrivMode_Autowrap }, // DECAWM |
3611 | // 8, auto-repeat keys // DECARM |
3652 | // 8, auto-repeat keys // DECARM |
3612 | { 9, PrivMode_MouseX10 }, |
3653 | { 9, PrivMode_MouseX10 }, |
3613 | // 18 end FF to printer after print screen |
3654 | // 18 end FF to printer after print screen |
3614 | // 19 Print screen prints full screen/scorll region |
3655 | // 19 Print screen prints full screen/scroll region |
3615 | { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis |
3656 | { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis |
3616 | #ifdef scrollBar_esc |
3657 | #ifdef scrollBar_esc |
3617 | { scrollBar_esc, PrivMode_scrollBar }, |
3658 | { scrollBar_esc, PrivMode_scrollBar }, |
3618 | #endif |
3659 | #endif |
3619 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3660 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
… | |
… | |
3628 | { 67, PrivMode_BackSpace }, // DECBKM |
3669 | { 67, PrivMode_BackSpace }, // DECBKM |
3629 | #endif |
3670 | #endif |
3630 | { 1000, PrivMode_MouseX11 }, |
3671 | { 1000, PrivMode_MouseX11 }, |
3631 | { 1002, PrivMode_MouseBtnEvent }, |
3672 | { 1002, PrivMode_MouseBtnEvent }, |
3632 | { 1003, PrivMode_MouseAnyEvent }, |
3673 | { 1003, PrivMode_MouseAnyEvent }, |
|
|
3674 | #if ENABLE_FRILLS |
|
|
3675 | { 1005, PrivMode_ExtModeMouse }, |
|
|
3676 | #endif |
3633 | { 1010, PrivMode_TtyOutputInh }, // rxvt extension |
3677 | { 1010, PrivMode_TtyOutputInh }, // rxvt extension |
3634 | { 1011, PrivMode_Keypress }, // rxvt extension |
3678 | { 1011, PrivMode_Keypress }, // rxvt extension |
|
|
3679 | #if ENABLE_FRILLS |
|
|
3680 | { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005 |
|
|
3681 | #endif |
3635 | // 1035 enable modifiers for alt, numlock NYI |
3682 | // 1035 enable modifiers for alt, numlock NYI |
3636 | // 1036 send ESC for meta keys NYI |
3683 | // 1036 send ESC for meta keys NYI |
3637 | // 1037 send DEL for keypad delete NYI |
3684 | // 1037 send DEL for keypad delete NYI |
3638 | { 1047, PrivMode_Screen }, |
3685 | { 1047, PrivMode_Screen }, |
3639 | // 1048 save and restore cursor |
3686 | // 1048 save and restore cursor, implemented in code |
3640 | { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ |
3687 | { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ |
3641 | // 1051, 1052, 1060, 1061 keyboard emulation NYI |
3688 | // 1051, 1052, 1060, 1061 keyboard emulation NYI |
3642 | { 2004, PrivMode_BracketPaste }, |
3689 | { 2004, PrivMode_BracketPaste }, |
3643 | }; |
3690 | }; |
3644 | |
3691 | |
… | |
… | |
3742 | case 1003: |
3789 | case 1003: |
3743 | if (state) |
3790 | if (state) |
3744 | { |
3791 | { |
3745 | priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); |
3792 | priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); |
3746 | priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; |
3793 | priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; |
|
|
3794 | mouse_row = mouse_col = 0; |
3747 | vt_emask_mouse = PointerMotionMask; |
3795 | vt_emask_mouse = PointerMotionMask; |
3748 | } |
3796 | } |
3749 | else |
3797 | else |
3750 | vt_emask_mouse = NoEventMask; |
3798 | vt_emask_mouse = NoEventMask; |
3751 | |
3799 | |