… | |
… | |
25 | * - extensive modifications |
25 | * - extensive modifications |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
27 | * Copyright (c) 2001 Marius Gedminas |
27 | * Copyright (c) 2001 Marius Gedminas |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
30 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
30 | * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> |
31 | * |
31 | * |
32 | * This program is free software; you can redistribute it and/or modify |
32 | * This program is free software; you can redistribute it and/or modify |
33 | * it under the terms of the GNU General Public License as published by |
33 | * it under the terms of the GNU General Public License as published by |
34 | * the Free Software Foundation; either version 2 of the License, or |
34 | * the Free Software Foundation; either version 2 of the License, or |
35 | * (at your option) any later version. |
35 | * (at your option) any later version. |
… | |
… | |
1048 | { |
1048 | { |
1049 | make_current (); |
1049 | make_current (); |
1050 | |
1050 | |
1051 | display->flush (); |
1051 | display->flush (); |
1052 | |
1052 | |
1053 | if (want_refresh && !flush_ev.active) |
1053 | if (want_refresh && !flush_ev.is_active ()) |
1054 | flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally |
1054 | flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally |
1055 | } |
1055 | } |
1056 | |
1056 | |
1057 | void |
1057 | void |
1058 | rxvt_term::flush_cb (ev::timer &w, int revents) |
1058 | rxvt_term::flush_cb (ev::timer &w, int revents) |
… | |
… | |
1079 | if (scr_refresh_rend (RS_Blink, RS_Blink)) |
1079 | if (scr_refresh_rend (RS_Blink, RS_Blink)) |
1080 | { |
1080 | { |
1081 | hidden_text = !hidden_text; |
1081 | hidden_text = !hidden_text; |
1082 | want_refresh = 1; |
1082 | want_refresh = 1; |
1083 | } |
1083 | } |
|
|
1084 | else |
|
|
1085 | w.stop (); |
1084 | } |
1086 | } |
1085 | #endif |
1087 | #endif |
1086 | |
1088 | |
1087 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1089 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1088 | void |
1090 | void |
… | |
… | |
1476 | break; |
1478 | break; |
1477 | |
1479 | |
1478 | case MapNotify: |
1480 | case MapNotify: |
1479 | mapped = 1; |
1481 | mapped = 1; |
1480 | #ifdef TEXT_BLINK |
1482 | #ifdef TEXT_BLINK |
1481 | text_blink_ev.start (TEXT_BLINK_INTERVAL); |
1483 | text_blink_ev.start (); |
1482 | #endif |
1484 | #endif |
1483 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1485 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1484 | break; |
1486 | break; |
1485 | |
1487 | |
1486 | case UnmapNotify: |
1488 | case UnmapNotify: |
… | |
… | |
1577 | int dist; |
1579 | int dist; |
1578 | |
1580 | |
1579 | /* don't clobber the current delay if we are |
1581 | /* don't clobber the current delay if we are |
1580 | * already in the middle of scrolling. |
1582 | * already in the middle of scrolling. |
1581 | */ |
1583 | */ |
1582 | if (!sel_scroll_ev.active) |
1584 | if (!sel_scroll_ev.is_active ()) |
1583 | sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
1585 | sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
1584 | |
1586 | |
1585 | /* save the event params so we can highlight |
1587 | /* save the event params so we can highlight |
1586 | * the selection in the pending-scroll loop |
1588 | * the selection in the pending-scroll loop |
1587 | */ |
1589 | */ |
… | |
… | |
1610 | else |
1612 | else |
1611 | { |
1613 | { |
1612 | /* we are within the text window, so we |
1614 | /* we are within the text window, so we |
1613 | * shouldn't be scrolling |
1615 | * shouldn't be scrolling |
1614 | */ |
1616 | */ |
1615 | if (sel_scroll_ev.active) |
|
|
1616 | sel_scroll_ev.stop(); |
1617 | sel_scroll_ev.stop(); |
1617 | } |
1618 | } |
1618 | #endif |
1619 | #endif |
1619 | #ifdef MOUSE_THRESHOLD |
1620 | #ifdef MOUSE_THRESHOLD |
1620 | } |
1621 | } |
1621 | #endif |
1622 | #endif |
… | |
… | |
1685 | XSetICFocus (Input_Context); |
1686 | XSetICFocus (Input_Context); |
1686 | } |
1687 | } |
1687 | #endif |
1688 | #endif |
1688 | #if CURSOR_BLINK |
1689 | #if CURSOR_BLINK |
1689 | if (option (Opt_cursorBlink)) |
1690 | if (option (Opt_cursorBlink)) |
1690 | cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); |
1691 | cursor_blink_ev.again (); |
1691 | #endif |
1692 | #endif |
1692 | #if OFF_FOCUS_FADING |
1693 | #if OFF_FOCUS_FADING |
1693 | if (rs[Rs_fade]) |
1694 | if (rs[Rs_fade]) |
1694 | { |
1695 | { |
1695 | pix_colors = pix_colors_focused; |
1696 | pix_colors = pix_colors_focused; |
… | |
… | |
1957 | } |
1958 | } |
1958 | else |
1959 | else |
1959 | #endif /* NO_SCROLLBAR_REPORT */ |
1960 | #endif /* NO_SCROLLBAR_REPORT */ |
1960 | |
1961 | |
1961 | { |
1962 | { |
1962 | char upordown = 0; |
1963 | char upordown = 0; |
1963 | |
1964 | |
1964 | if (scrollBar.style == R_SB_NEXT) |
1965 | if (scrollBar.style == R_SB_NEXT) |
1965 | { |
1966 | { |
1966 | if (scrollbarnext_upButton (ev.y)) |
1967 | if (scrollbarnext_upButton (ev.y)) |
1967 | upordown = -1; /* up */ |
1968 | upordown = -1; /* up */ |
… | |
… | |
1973 | if (scrollbarrxvt_upButton (ev.y)) |
1974 | if (scrollbarrxvt_upButton (ev.y)) |
1974 | upordown = -1; /* up */ |
1975 | upordown = -1; /* up */ |
1975 | else if (scrollbarrxvt_dnButton (ev.y)) |
1976 | else if (scrollbarrxvt_dnButton (ev.y)) |
1976 | upordown = 1; /* down */ |
1977 | upordown = 1; /* down */ |
1977 | } |
1978 | } |
|
|
1979 | |
1978 | if (upordown) |
1980 | if (upordown) |
1979 | { |
1981 | { |
1980 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1982 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
1983 | if (!cont_scroll_ev.is_active ()) |
1981 | cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
1984 | cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
1982 | #endif |
1985 | #endif |
1983 | if (scr_page (upordown < 0 ? UP : DN, 1)) |
1986 | if (scr_page (upordown < 0 ? UP : DN, 1)) |
1984 | { |
1987 | { |
1985 | if (upordown < 0) |
1988 | if (upordown < 0) |
1986 | scrollBar.setUp (); |
1989 | scrollBar.setUp (); |
… | |
… | |
2066 | scrollBar.setIdle (); |
2069 | scrollBar.setIdle (); |
2067 | scrollbar_show (0); |
2070 | scrollbar_show (0); |
2068 | } |
2071 | } |
2069 | |
2072 | |
2070 | #ifdef SELECTION_SCROLLING |
2073 | #ifdef SELECTION_SCROLLING |
2071 | if (sel_scroll_ev.active) |
|
|
2072 | sel_scroll_ev.stop(); |
2074 | sel_scroll_ev.stop(); |
2073 | #endif |
2075 | #endif |
2074 | |
2076 | |
2075 | if (ev.window == vt) |
2077 | if (ev.window == vt) |
2076 | { |
2078 | { |
2077 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
2079 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
… | |
… | |
2149 | { |
2151 | { |
2150 | mouse_slip_wheel_speed += v ? -1 : 1; |
2152 | mouse_slip_wheel_speed += v ? -1 : 1; |
2151 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2153 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2152 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2154 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2153 | |
2155 | |
|
|
2156 | if (!slip_wheel_ev.is_active ()) |
2154 | slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
2157 | slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); |
2155 | } |
2158 | } |
2156 | else |
2159 | else |
2157 | { |
2160 | { |
2158 | # endif |
2161 | # endif |
2159 | scr_page (v, i); |
2162 | scr_page (v, i); |
… | |
… | |
3582 | { 66, PrivMode_aplKP }, |
3585 | { 66, PrivMode_aplKP }, |
3583 | #ifndef NO_BACKSPACE_KEY |
3586 | #ifndef NO_BACKSPACE_KEY |
3584 | { 67, PrivMode_BackSpace }, |
3587 | { 67, PrivMode_BackSpace }, |
3585 | #endif |
3588 | #endif |
3586 | { 1000, PrivMode_MouseX11 }, |
3589 | { 1000, PrivMode_MouseX11 }, |
3587 | // 1001 Use Hilite Mouse Tracking. NYI, TODO |
|
|
3588 | { 1002, PrivMode_MouseBtnEvent }, |
3590 | { 1002, PrivMode_MouseBtnEvent }, |
3589 | { 1003, PrivMode_MouseAnyEvent }, |
3591 | { 1003, PrivMode_MouseAnyEvent }, |
3590 | { 1010, PrivMode_TtyOutputInh }, // rxvt extension |
3592 | { 1010, PrivMode_TtyOutputInh }, // rxvt extension |
3591 | { 1011, PrivMode_Keypress }, // rxvt extension |
3593 | { 1011, PrivMode_Keypress }, // rxvt extension |
3592 | // 1035 enable modifiers for alt, numlock NYI |
3594 | // 1035 enable modifiers for alt, numlock NYI |
… | |
… | |
3693 | /* case 67: - backspace key */ |
3695 | /* case 67: - backspace key */ |
3694 | case 1000: /* X11 mouse reporting */ |
3696 | case 1000: /* X11 mouse reporting */ |
3695 | if (state) /* orthogonal */ |
3697 | if (state) /* orthogonal */ |
3696 | priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); |
3698 | priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); |
3697 | break; |
3699 | break; |
3698 | #if 0 |
|
|
3699 | case 1001: |
|
|
3700 | break; /* X11 mouse highlighting */ |
|
|
3701 | #endif |
|
|
3702 | case 1002: |
3700 | case 1002: |
3703 | case 1003: |
3701 | case 1003: |
3704 | if (state) |
3702 | if (state) |
3705 | { |
3703 | { |
3706 | priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); |
3704 | priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); |