ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.386 by ayin, Fri Dec 28 11:02:31 2007 UTC vs.
Revision 1.405 by ayin, Thu Feb 14 23:51:46 2008 UTC

… …
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
301 302
302void 303void
303rxvt_term::key_press (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
304{ 305{
305 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 307 KeySym keysym;
308 int valid_keysym; 308 int valid_keysym;
309 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310 310
311#if ISO_14755 311#if ISO_14755
… …
548 548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 unsigned int newlen = 1;
554#ifdef XK_KP_Home 554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = { 555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home 556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left 557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up 558 XK_KP_8, // XK_KP_Up
… …
1078{ 1078{
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 refresh_check (); 1083 refresh_check ();
1084 } 1084 }
1085 else 1085 else
1086 w.stop (); 1086 w.stop ();
1087} 1087}
1088#endif 1088#endif
1089 1089
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1091void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1093{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1094 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1095 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 { 1096 {
1097 want_refresh = 1; 1097 want_refresh = 1;
1098 refresh_check (); 1098 refresh_check ();
1099 } 1099 }
1100 else 1100 else
… …
1437 && ev.xfocus.mode != NotifyGrab) 1437 && ev.xfocus.mode != NotifyGrab)
1438 focus_out (); 1438 focus_out ();
1439 break; 1439 break;
1440 1440
1441 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1442 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */ 1444 szHint.width, szHint.height);*/
1445 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1446 { 1446 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1448 ;
1449 1449
… …
1454 } 1454 }
1455 else 1455 else
1456 { 1456 {
1457#ifdef HAVE_BG_PIXMAP 1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ()) 1458 if (bgPixmap.window_position_sensitive ())
1459 {
1460 if (mapped)
1459 update_background (); 1461 update_background ();
1462 else
1463 bgPixmap.invalidate ();
1464 }
1460#endif 1465#endif
1461 } 1466 }
1462 1467
1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1468 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 } 1469 }
… …
1484 case SelectionRequest: 1489 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1490 selection_send (ev.xselectionrequest);
1486 break; 1491 break;
1487 1492
1488 case MapNotify: 1493 case MapNotify:
1494#ifdef HAVE_BG_PIXMAP
1495 /* This is needed spcifically to fix the case of no window manager or a
1496 * non-reparenting window manager. In those cases we never get first
1497 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1498 * care of multiplicity of ConfigureNotify events arriwing while WM does
1499 * reparenting.
1500 * We should not render background immidiately, as there could be several
1501 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1502 * by scheduling background redraw as soon as we can, but giving a short
1503 * bit of time for ConfigureNotifies to arrive.
1504 * We should render background PRIOR to drawing any text, but AFTER all
1505 * of ConfigureNotifys for the best results.
1506 */
1507 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1508 update_background_ev.start (0.025);
1509#endif
1489 mapped = 1; 1510 mapped = 1;
1490#ifdef TEXT_BLINK 1511#ifdef TEXT_BLINK
1491 text_blink_ev.start (); 1512 text_blink_ev.start ();
1492#endif 1513#endif
1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1514 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1529 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1530 ; 1551 ;
1531 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1532 ; 1553 ;
1533 1554
1534 if (isScrollbarWindow (ev.xany.window)) 1555 if (scrollBar.state && ev.xany.window == scrollBar.win)
1535 { 1556 {
1536 scrollBar.setIdle (); 1557 scrollBar.state = STATE_IDLE;
1537 scrollbar_show (0); 1558 scrollbar_show (0);
1538 } 1559 }
1539 } 1560 }
1540 break; 1561 break;
1541 1562
… …
1629#ifdef MOUSE_THRESHOLD 1650#ifdef MOUSE_THRESHOLD
1630 } 1651 }
1631#endif 1652#endif
1632 } 1653 }
1633 } 1654 }
1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1655 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1635 { 1656 {
1636 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1657 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1637 MotionNotify, &ev)) 1658 MotionNotify, &ev))
1638 ; 1659 ;
1639 1660
… …
1923 } 1944 }
1924 1945
1925 /* 1946 /*
1926 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1927 */ 1948 */
1928 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1929 { 1950 {
1930 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1931 /* 1959 /*
1932 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1933 * move up if mouse is above slider 1961 * move up if mouse is above slider
1934 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1935 * 1963 *
… …
1944 /* 1972 /*
1945 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1946 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1947 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1948 */ 1976 */
1949 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1950 && scrollbarnext_upButton (ev.y))
1951 || (scrollBar.style == R_SB_RXVT
1952 && scrollbarrxvt_upButton (ev.y)))
1953 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1954 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1955 && scrollbarnext_dnButton (ev.y))
1956 || (scrollBar.style == R_SB_RXVT
1957 && scrollbarrxvt_dnButton (ev.y)))
1958 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1959 else 1981 else
1960 switch (ev.button) 1982 switch (ev.button)
1961 { 1983 {
1962 case Button2: 1984 case Button2:
… …
1970 break; 1992 break;
1971 } 1993 }
1972 } 1994 }
1973 else 1995 else
1974#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1975
1976 {
1977 char upordown = 0;
1978
1979 if (scrollBar.style == R_SB_NEXT)
1980 { 1997 {
1981 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
1982 upordown = -1; /* up */
1983 else if (scrollbarnext_dnButton (ev.y))
1984 upordown = 1; /* down */
1985 }
1986 else if (scrollBar.style == R_SB_RXVT)
1987 {
1988 if (scrollbarrxvt_upButton (ev.y))
1989 upordown = -1; /* up */
1990 else if (scrollbarrxvt_dnButton (ev.y))
1991 upordown = 1; /* down */
1992 }
1993
1994 if (upordown)
1995 { 1999 {
1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ()) 2001 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2003#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
2001 { 2005 {
2002 if (upordown < 0) 2006 if (direction == UP)
2003 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
2004 else 2008 else
2005 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
2006 } 2010 }
2007 } 2011 }
2008 else 2012 else
2009 switch (ev.button) 2013 switch (ev.button)
2010 { 2014 {
2011 case Button2: 2015 case Button2:
2012 switch (scrollbar_align) 2016 switch (scrollBar.align)
2013 { 2017 {
2014 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2019 csrO = 0;
2016 break; 2020 break;
2017 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
… …
2025 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2026 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2027 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2028 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2029 2033
2030 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2031 break; 2035 break;
2032 2036
2033 case Button1: 2037 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2037 2041
2038 case Button3: 2042 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
… …
2049 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2050# else 2054# else
2051 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2052# endif 2056# endif
2053 else 2057 else
2054 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2055 } 2059 }
2056 else 2060 else
2057 { 2061 {
2058 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2059 (nrow 2063 (nrow
… …
2076 2080
2077 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2078 if (!bypass_keystate) 2082 if (!bypass_keystate)
2079 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2080 2084
2081 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2082 { 2086 {
2083 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2084 scrollbar_show (0); 2088 scrollbar_show (0);
2085 } 2089 }
2086 2090
2087#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2088 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
… …
2169 2173
2170 if (!slip_wheel_ev.is_active ()) 2174 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172 } 2176 }
2173 else 2177 else
2178# endif
2174 { 2179 {
2175# endif
2176 scr_page (v, i); 2180 scr_page (v, i);
2177 scrollbar_show (1); 2181 scrollbar_show (1);
2178# ifdef MOUSE_SLIP_WHEELING
2179 } 2182 }
2180# endif
2181 } 2183 }
2182 break; 2184 break;
2183#endif 2185#endif
2184 } 2186 }
2185 } 2187 }
… …
2828 // versions. 2830 // versions.
2829 // 2831 //
2830 tt_printf ("\033[>%d;95;0c", 'U'); 2832 tt_printf ("\033[>%d;95;0c", 'U');
2831 } 2833 }
2832 break; 2834 break;
2835
2833 case '?': 2836 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2839 break;
2837 } 2840 }
… …
3353 *buf++ = '\0'; 3356 *buf++ = '\0';
3354 3357
3355 process_color_seq (op, color, name, resp); 3358 process_color_seq (op, color, name, resp);
3356 } 3359 }
3357 break; 3360 break;
3361 case Rxvt_restoreFG:
3358 case XTerm_Color00: 3362 case XTerm_Color00:
3359 process_color_seq (op, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3360 break; 3364 break;
3365 case Rxvt_restoreBG:
3361 case XTerm_Color01: 3366 case XTerm_Color01:
3362 process_color_seq (op, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3363 break; 3368 break;
3364#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3365 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
… …
3443 if (changed) 3448 if (changed)
3444 update_background (); 3449 update_background ();
3445 } 3450 }
3446 break; 3451 break;
3447#endif 3452#endif
3448
3449 case Rxvt_restoreFG:
3450 set_window_color (Color_fg, str);
3451 break;
3452 case Rxvt_restoreBG:
3453 set_window_color (Color_bg, str);
3454 break;
3455 3453
3456 case XTerm_logfile: 3454 case XTerm_logfile:
3457 // TODO, when secure mode? 3455 // TODO, when secure mode?
3458 break; 3456 break;
3459 3457
… …
3614 // 1037 send DEL for keypad delete NYI 3612 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3613 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3614 // 1048 save and restore cursor
3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3615 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3616 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3617 { 2004, PrivMode_BracketPaste },
3619 }; 3618 };
3620 3619
3621 if (nargs == 0) 3620 if (nargs == 0)
3622 return; 3621 return;
3623 3622
… …
3671 */ 3670 */
3672 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
3673 break; 3672 break;
3674 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
3675 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
3676 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
3677 break; 3679 break;
3678 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3681 set_option (Opt_jumpScroll, !state);
3680 break; 3682 break;
3681 case 5: /* reverse video */ 3683 case 5: /* reverse video */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines