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.400 by ayin, Mon Jan 28 12:54:47 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.
… …
1078{ 1079{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1081 {
1081 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1082 want_refresh = 1; 1083 want_refresh = 1;
1083 refresh_check (); 1084 refresh_check ();
1084 } 1085 }
1085 else 1086 else
1086 w.stop (); 1087 w.stop ();
1087} 1088}
1088#endif 1089#endif
… …
1437 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1438 focus_out (); 1439 focus_out ();
1439 break; 1440 break;
1440 1441
1441 case ConfigureNotify: 1442 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1443 /*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, 1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */ 1445 szHint.width, szHint.height);*/
1445 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1446 { 1447 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1449 ;
1449 1450
… …
1454 } 1455 }
1455 else 1456 else
1456 { 1457 {
1457#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1459 update_background (); 1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1460#endif 1466#endif
1461 } 1467 }
1462 1468
1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 } 1470 }
… …
1484 case SelectionRequest: 1490 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1486 break; 1492 break;
1487 1493
1488 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1489 mapped = 1; 1511 mapped = 1;
1490#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1491 text_blink_ev.start (); 1513 text_blink_ev.start ();
1492#endif 1514#endif
1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1529 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1530 ; 1552 ;
1531 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1532 ; 1554 ;
1533 1555
1534 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1535 { 1557 {
1536 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1537 scrollbar_show (0); 1559 scrollbar_show (0);
1538 } 1560 }
1539 } 1561 }
… …
1629#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1630 } 1652 }
1631#endif 1653#endif
1632 } 1654 }
1633 } 1655 }
1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1635 { 1657 {
1636 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1637 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1638 ; 1660 ;
1639 1661
… …
1923 } 1945 }
1924 1946
1925 /* 1947 /*
1926 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1927 */ 1949 */
1928 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1929 { 1951 {
1952 int upordown = 0;
1953
1954 if (scrollBar.upButton (ev.y))
1955 upordown = -1; /* up */
1956 else if (scrollBar.dnButton (ev.y))
1957 upordown = 1; /* down */
1958
1930 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1931 /* 1960 /*
1932 * Rxvt-style scrollbar: 1961 * Rxvt-style scrollbar:
1933 * move up if mouse is above slider 1962 * move up if mouse is above slider
1934 * move dn if mouse is below slider 1963 * move dn if mouse is below slider
… …
1944 /* 1973 /*
1945 * Mouse report disabled scrollbar: 1974 * Mouse report disabled scrollbar:
1946 * arrow buttons - send up/down 1975 * arrow buttons - send up/down
1947 * click on scrollbar - send pageup/down 1976 * click on scrollbar - send pageup/down
1948 */ 1977 */
1949 if ((scrollBar.style == R_SB_NEXT 1978 if (upordown < 0)
1950 && scrollbarnext_upButton (ev.y))
1951 || (scrollBar.style == R_SB_RXVT
1952 && scrollbarrxvt_upButton (ev.y)))
1953 tt_printf ("\033[A"); 1979 tt_printf ("\033[A");
1954 else if ((scrollBar.style == R_SB_NEXT 1980 else if (upordown > 0)
1955 && scrollbarnext_dnButton (ev.y))
1956 || (scrollBar.style == R_SB_RXVT
1957 && scrollbarrxvt_dnButton (ev.y)))
1958 tt_printf ("\033[B"); 1981 tt_printf ("\033[B");
1959 else 1982 else
1960 switch (ev.button) 1983 switch (ev.button)
1961 { 1984 {
1962 case Button2: 1985 case Button2:
… …
1972 } 1995 }
1973 else 1996 else
1974#endif /* NO_SCROLLBAR_REPORT */ 1997#endif /* NO_SCROLLBAR_REPORT */
1975 1998
1976 { 1999 {
1977 char upordown = 0;
1978
1979 if (scrollBar.style == R_SB_NEXT)
1980 {
1981 if (scrollbarnext_upButton (ev.y))
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) 2000 if (upordown)
1995 { 2001 {
1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ()) 2003 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
… …
2007 } 2013 }
2008 else 2014 else
2009 switch (ev.button) 2015 switch (ev.button)
2010 { 2016 {
2011 case Button2: 2017 case Button2:
2012 switch (scrollbar_align) 2018 switch (scrollBar.align)
2013 { 2019 {
2014 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2021 csrO = 0;
2016 break; 2022 break;
2017 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
… …
2029 2035
2030 scrollBar.setMotion (); 2036 scrollBar.setMotion ();
2031 break; 2037 break;
2032 2038
2033 case Button1: 2039 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2037 2043
2038 case Button3: 2044 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
… …
2169 2175
2170 if (!slip_wheel_ev.is_active ()) 2176 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172 } 2178 }
2173 else 2179 else
2180# endif
2174 { 2181 {
2175# endif
2176 scr_page (v, i); 2182 scr_page (v, i);
2177 scrollbar_show (1); 2183 scrollbar_show (1);
2178# ifdef MOUSE_SLIP_WHEELING
2179 } 2184 }
2180# endif
2181 } 2185 }
2182 break; 2186 break;
2183#endif 2187#endif
2184 } 2188 }
2185 } 2189 }
… …
2828 // versions. 2832 // versions.
2829 // 2833 //
2830 tt_printf ("\033[>%d;95;0c", 'U'); 2834 tt_printf ("\033[>%d;95;0c", 'U');
2831 } 2835 }
2832 break; 2836 break;
2837
2833 case '?': 2838 case '?':
2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2835 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2836 break; 2841 break;
2837 } 2842 }
… …
3353 *buf++ = '\0'; 3358 *buf++ = '\0';
3354 3359
3355 process_color_seq (op, color, name, resp); 3360 process_color_seq (op, color, name, resp);
3356 } 3361 }
3357 break; 3362 break;
3363 case Rxvt_restoreFG:
3358 case XTerm_Color00: 3364 case XTerm_Color00:
3359 process_color_seq (op, Color_fg, str, resp); 3365 process_color_seq (op, Color_fg, str, resp);
3360 break; 3366 break;
3367 case Rxvt_restoreBG:
3361 case XTerm_Color01: 3368 case XTerm_Color01:
3362 process_color_seq (op, Color_bg, str, resp); 3369 process_color_seq (op, Color_bg, str, resp);
3363 break; 3370 break;
3364#ifndef NO_CURSORCOLOR 3371#ifndef NO_CURSORCOLOR
3365 case XTerm_Color_cursor: 3372 case XTerm_Color_cursor:
… …
3443 if (changed) 3450 if (changed)
3444 update_background (); 3451 update_background ();
3445 } 3452 }
3446 break; 3453 break;
3447#endif 3454#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 3455
3456 case XTerm_logfile: 3456 case XTerm_logfile:
3457 // TODO, when secure mode? 3457 // TODO, when secure mode?
3458 break; 3458 break;
3459 3459
… …
3614 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
3615 { 1047, PrivMode_Screen }, 3615 { 1047, PrivMode_Screen },
3616 // 1048 save and restore cursor 3616 // 1048 save and restore cursor
3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3617 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste },
3619 }; 3620 };
3620 3621
3621 if (nargs == 0) 3622 if (nargs == 0)
3622 return; 3623 return;
3623 3624
… …
3671 */ 3672 */
3672 PrivMode (1, PrivMode_vt52); 3673 PrivMode (1, PrivMode_vt52);
3673 break; 3674 break;
3674 case 3: /* 80/132 */ 3675 case 3: /* 80/132 */
3675 if (priv_modes & PrivMode_132OK) 3676 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3676 set_widthheight (((state ? 132 : 80) * fwidth), height); 3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3680 }
3677 break; 3681 break;
3678 case 4: /* smooth scrolling */ 3682 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3683 set_option (Opt_jumpScroll, !state);
3680 break; 3684 break;
3681 case 5: /* reverse video */ 3685 case 5: /* reverse video */

Diff Legend

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