… | |
… | |
649 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
649 | bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; |
650 | unsigned int newlen = 1; |
650 | unsigned int newlen = 1; |
651 | |
651 | |
652 | if (ev.state & ModNumLockMask) |
652 | if (ev.state & ModNumLockMask) |
653 | kp = false; |
653 | kp = false; |
|
|
654 | |
654 | switch (translate_keypad (keysym, kp)) |
655 | keysym = translate_keypad (keysym, kp); |
|
|
656 | |
|
|
657 | switch (keysym) |
655 | { |
658 | { |
656 | #ifndef NO_BACKSPACE_KEY |
659 | #ifndef NO_BACKSPACE_KEY |
657 | case XK_BackSpace: |
660 | case XK_BackSpace: |
658 | if (priv_modes & PrivMode_HaveBackSpace) |
661 | if (priv_modes & PrivMode_HaveBackSpace) |
659 | { |
662 | { |
… | |
… | |
972 | rxvt_term::flush () |
975 | rxvt_term::flush () |
973 | { |
976 | { |
974 | flush_ev.stop (); |
977 | flush_ev.stop (); |
975 | |
978 | |
976 | #ifdef HAVE_BG_PIXMAP |
979 | #ifdef HAVE_BG_PIXMAP |
977 | if (bgPixmap.check_clearChanged ()) |
980 | if (bgPixmap.flags & bgPixmap_t::hasChanged) |
978 | { |
981 | { |
|
|
982 | bgPixmap.flags &= ~bgPixmap_t::hasChanged; |
979 | // scr_clear (true); This needs to be researched further! |
983 | // scr_clear (true); This needs to be researched further! |
980 | scr_touch (false); |
984 | scr_touch (false); |
981 | } |
985 | } |
982 | #endif |
986 | #endif |
983 | |
987 | |
… | |
… | |
1427 | && ev.xfocus.mode != NotifyGrab) |
1431 | && ev.xfocus.mode != NotifyGrab) |
1428 | focus_out (); |
1432 | focus_out (); |
1429 | break; |
1433 | break; |
1430 | |
1434 | |
1431 | case ConfigureNotify: |
1435 | case ConfigureNotify: |
1432 | /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", |
|
|
1433 | ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, |
|
|
1434 | szHint.width, szHint.height);*/ |
|
|
1435 | if (ev.xconfigure.window == parent[0]) |
1436 | if (ev.xconfigure.window == parent[0]) |
1436 | { |
1437 | { |
1437 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1438 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1438 | ; |
1439 | ; |
|
|
1440 | |
|
|
1441 | #ifdef HAVE_BG_PIXMAP |
|
|
1442 | bool moved = false; |
|
|
1443 | if (bgPixmap.window_position_sensitive ()) |
|
|
1444 | { |
|
|
1445 | int x, y; |
|
|
1446 | if (ev.xconfigure.send_event) |
|
|
1447 | { |
|
|
1448 | x = ev.xconfigure.x; |
|
|
1449 | y = ev.xconfigure.y; |
|
|
1450 | } |
|
|
1451 | else |
|
|
1452 | get_window_origin (x, y); |
|
|
1453 | |
|
|
1454 | if (bgPixmap.set_position (x, y) |
|
|
1455 | || (bgPixmap.flags & bgPixmap_t::isInvalid)) |
|
|
1456 | moved = true; |
|
|
1457 | } |
|
|
1458 | #endif |
1439 | |
1459 | |
1440 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1460 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1441 | { |
1461 | { |
1442 | seen_resize = 1; |
1462 | seen_resize = 1; |
1443 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1463 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1444 | } |
1464 | } |
1445 | else |
1465 | else |
1446 | { |
1466 | { |
1447 | #ifdef HAVE_BG_PIXMAP |
1467 | #ifdef HAVE_BG_PIXMAP |
1448 | if (bgPixmap.window_position_sensitive ()) |
1468 | if (moved) |
1449 | { |
1469 | { |
1450 | if (mapped) |
1470 | if (mapped) |
1451 | update_background (); |
1471 | update_background (); |
1452 | else |
1472 | else |
1453 | bgPixmap.invalidate (); |
1473 | bgPixmap.invalidate (); |
… | |
… | |
1480 | selection_send (ev.xselectionrequest); |
1500 | selection_send (ev.xselectionrequest); |
1481 | break; |
1501 | break; |
1482 | |
1502 | |
1483 | case MapNotify: |
1503 | case MapNotify: |
1484 | #ifdef HAVE_BG_PIXMAP |
1504 | #ifdef HAVE_BG_PIXMAP |
1485 | /* This is needed spcifically to fix the case of no window manager or a |
1505 | /* This is needed specifically to fix the case of no window manager or a |
1486 | * non-reparenting window manager. In those cases we never get first |
1506 | * non-reparenting window manager. In those cases we never get first |
1487 | * ConfigureNotify. Also that speeds startup under normal WM, by taking |
1507 | * ConfigureNotify. Also that speeds startup under normal WM, by taking |
1488 | * care of multiplicity of ConfigureNotify events arriwing while WM does |
1508 | * care of multiplicity of ConfigureNotify events arriving while WM does |
1489 | * reparenting. |
1509 | * reparenting. |
1490 | * We should not render background immidiately, as there could be several |
1510 | * We should not render background immediately, as there could be several |
1491 | * ConfigureNotify's to follow. Lets take care of all of them in one scoop |
1511 | * ConfigureNotify's to follow. Lets take care of all of them in one scoop |
1492 | * by scheduling background redraw as soon as we can, but giving a short |
1512 | * by scheduling background redraw as soon as we can, but giving a short |
1493 | * bit of time for ConfigureNotifies to arrive. |
1513 | * bit of time for ConfigureNotifies to arrive. |
1494 | * We should render background PRIOR to drawing any text, but AFTER all |
1514 | * We should render background PRIOR to drawing any text, but AFTER all |
1495 | * of ConfigureNotifys for the best results. |
1515 | * of ConfigureNotifys for the best results. |
… | |
… | |
1866 | /* save the xbutton state (for ButtonRelease) */ |
1886 | /* save the xbutton state (for ButtonRelease) */ |
1867 | MEvent.state = ev.state; |
1887 | MEvent.state = ev.state; |
1868 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1888 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1869 | if (ev.button == MEvent.button && clickintime) |
1889 | if (ev.button == MEvent.button && clickintime) |
1870 | { |
1890 | { |
1871 | /* same button, within alloted time */ |
1891 | /* same button, within allowed time */ |
1872 | MEvent.clicks++; |
1892 | MEvent.clicks++; |
1873 | |
1893 | |
1874 | if (MEvent.clicks > 1) |
1894 | if (MEvent.clicks > 1) |
1875 | { |
1895 | { |
1876 | /* only report double clicks */ |
1896 | /* only report double clicks */ |
… | |
… | |
2147 | selection_make (ev.time); |
2167 | selection_make (ev.time); |
2148 | break; |
2168 | break; |
2149 | |
2169 | |
2150 | case Button2: |
2170 | case Button2: |
2151 | if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
2171 | if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
2152 | selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); |
2172 | selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); |
2153 | break; |
2173 | break; |
2154 | |
2174 | |
2155 | #ifdef MOUSE_WHEEL |
2175 | #ifdef MOUSE_WHEEL |
2156 | case Button4: |
2176 | case Button4: |
2157 | case Button5: |
2177 | case Button5: |
… | |
… | |
3228 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3248 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3229 | */ |
3249 | */ |
3230 | void |
3250 | void |
3231 | rxvt_term::process_dcs_seq () |
3251 | rxvt_term::process_dcs_seq () |
3232 | { |
3252 | { |
3233 | char *s; |
|
|
3234 | unicode_t eh; |
|
|
3235 | |
|
|
3236 | /* |
3253 | /* |
3237 | * Not handled yet |
3254 | * Not handled yet |
3238 | */ |
3255 | */ |
|
|
3256 | |
|
|
3257 | unicode_t eh; |
3239 | s = get_to_st (eh); |
3258 | char *s = get_to_st (eh); |
3240 | if (s) |
3259 | if (s) |
3241 | free (s); |
3260 | free (s); |
3242 | |
3261 | |
3243 | return; |
3262 | return; |
3244 | } |
3263 | } |
… | |
… | |
3248 | * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' |
3267 | * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' |
3249 | */ |
3268 | */ |
3250 | void |
3269 | void |
3251 | rxvt_term::process_osc_seq () |
3270 | rxvt_term::process_osc_seq () |
3252 | { |
3271 | { |
3253 | unicode_t ch, eh; |
|
|
3254 | int arg; |
3272 | int arg; |
3255 | |
3273 | |
3256 | ch = cmd_getc (); |
3274 | unicode_t ch = cmd_getc (); |
3257 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3275 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3258 | arg = arg * 10 + (ch - '0'); |
3276 | arg = arg * 10 + (ch - '0'); |
3259 | |
3277 | |
3260 | if (ch == ';') |
3278 | if (ch == ';') |
3261 | { |
3279 | { |
|
|
3280 | unicode_t eh; |
3262 | char *s = get_to_st (eh); |
3281 | char *s = get_to_st (eh); |
3263 | |
3282 | |
3264 | if (s) |
3283 | if (s) |
3265 | { |
3284 | { |
3266 | process_xterm_seq (arg, s, eh); |
3285 | process_xterm_seq (arg, s, eh); |
… | |
… | |
3391 | process_color_seq (op, Color_pointer_fg, str, resp); |
3410 | process_color_seq (op, Color_pointer_fg, str, resp); |
3392 | break; |
3411 | break; |
3393 | case XTerm_Color_pointer_bg: |
3412 | case XTerm_Color_pointer_bg: |
3394 | process_color_seq (op, Color_pointer_bg, str, resp); |
3413 | process_color_seq (op, Color_pointer_bg, str, resp); |
3395 | break; |
3414 | break; |
|
|
3415 | #ifdef OPTION_HC |
|
|
3416 | case XTerm_Color_HC: |
|
|
3417 | process_color_seq (op, Color_HC, str, resp); |
|
|
3418 | break; |
|
|
3419 | case XTerm_Color_HTC: |
|
|
3420 | process_color_seq (op, Color_HTC, str, resp); |
|
|
3421 | break; |
|
|
3422 | #endif |
3396 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3423 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3397 | case XTerm_Color_RV: |
|
|
3398 | process_color_seq (op, Color_RV, str, resp); |
|
|
3399 | break; |
|
|
3400 | case Rxvt_Color_BD: |
|
|
3401 | case URxvt_Color_BD: |
3424 | case URxvt_Color_BD: |
3402 | process_color_seq (op, Color_BD, str, resp); |
3425 | process_color_seq (op, Color_BD, str, resp); |
3403 | break; |
3426 | break; |
3404 | case Rxvt_Color_UL: |
|
|
3405 | case URxvt_Color_UL: |
3427 | case URxvt_Color_UL: |
3406 | process_color_seq (op, Color_UL, str, resp); |
3428 | process_color_seq (op, Color_UL, str, resp); |
3407 | break; |
3429 | break; |
3408 | case URxvt_Color_IT: |
3430 | case URxvt_Color_IT: |
3409 | process_color_seq (op, Color_IT, str, resp); |
3431 | process_color_seq (op, Color_IT, str, resp); |
… | |
… | |
3445 | { |
3467 | { |
3446 | int changed = 0; |
3468 | int changed = 0; |
3447 | |
3469 | |
3448 | if (*str != ';') |
3470 | if (*str != ';') |
3449 | { |
3471 | { |
3450 | /* reset to default scaling :*/ |
|
|
3451 | bgPixmap.unset_geometry (); |
|
|
3452 | if (bgPixmap.set_file (str)) /* change pixmap */ |
3472 | if (bgPixmap.set_file (str)) /* change pixmap */ |
|
|
3473 | { |
3453 | changed++; |
3474 | changed++; |
3454 | str = strchr (str, ';'); |
3475 | str = strchr (str, ';'); |
3455 | if (str == NULL) |
3476 | if (str == NULL) |
3456 | bgPixmap.set_defaultGeometry (); |
3477 | bgPixmap.set_defaultGeometry (); |
|
|
3478 | else |
|
|
3479 | bgPixmap.set_geometry (str+1); |
|
|
3480 | } |
3457 | } |
3481 | } |
3458 | |
3482 | else |
3459 | while (str) |
|
|
3460 | { |
3483 | { |
3461 | str++; |
3484 | str++; |
3462 | if (bgPixmap.set_geometry (str)) |
3485 | if (bgPixmap.set_geometry (str, true)) |
3463 | changed++; |
3486 | changed++; |
3464 | str = strchr (str, ';'); |
|
|
3465 | } |
3487 | } |
3466 | |
3488 | |
3467 | if (changed) |
3489 | if (changed) |
|
|
3490 | { |
|
|
3491 | if (bgPixmap.window_position_sensitive ()) |
|
|
3492 | { |
|
|
3493 | int x, y; |
|
|
3494 | get_window_origin (x, y); |
|
|
3495 | bgPixmap.set_position (x, y); |
|
|
3496 | } |
3468 | update_background (); |
3497 | update_background (); |
|
|
3498 | } |
3469 | } |
3499 | } |
3470 | break; |
3500 | break; |
3471 | #endif |
3501 | #endif |
3472 | |
3502 | |
3473 | case XTerm_logfile: |
3503 | case XTerm_logfile: |
… | |
… | |
3576 | { |
3606 | { |
3577 | if (mode == 'r') |
3607 | if (mode == 'r') |
3578 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3608 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3579 | else |
3609 | else |
3580 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
3610 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
|
|
3611 | |
3581 | set_privmode (bit, state); |
3612 | set_privmode (bit, state); |
3582 | } |
3613 | } |
3583 | |
3614 | |
3584 | return state; |
3615 | return state; |
3585 | } |
3616 | } |
… | |
… | |
3604 | { 6, PrivMode_relOrigin }, // DECOM |
3635 | { 6, PrivMode_relOrigin }, // DECOM |
3605 | { 7, PrivMode_Autowrap }, // DECAWM |
3636 | { 7, PrivMode_Autowrap }, // DECAWM |
3606 | // 8, auto-repeat keys // DECARM |
3637 | // 8, auto-repeat keys // DECARM |
3607 | { 9, PrivMode_MouseX10 }, |
3638 | { 9, PrivMode_MouseX10 }, |
3608 | // 18 end FF to printer after print screen |
3639 | // 18 end FF to printer after print screen |
3609 | // 19 Print screen prints full screen/scorll region |
3640 | // 19 Print screen prints full screen/scroll region |
3610 | { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis |
3641 | { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis |
3611 | #ifdef scrollBar_esc |
3642 | #ifdef scrollBar_esc |
3612 | { scrollBar_esc, PrivMode_scrollBar }, |
3643 | { scrollBar_esc, PrivMode_scrollBar }, |
3613 | #endif |
3644 | #endif |
3614 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3645 | { 35, PrivMode_ShiftKeys }, // rxvt extension |