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.389 by ayin, Mon Dec 31 13:50:56 2007 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 2008 UTC

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

Diff Legend

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