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.384 by ayin, Tue Dec 18 13:07:55 2007 UTC vs.
Revision 1.404 by root, Sat Feb 2 15:19:55 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.
… …
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
… …
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
1089 1090
1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1091void 1092void
1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1093{ 1094{
1094 if ((scrollbar_isUp () || scrollbar_isDn ()) 1095 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1095 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1096 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1096 { 1097 {
1097 want_refresh = 1; 1098 want_refresh = 1;
1098 refresh_check (); 1099 refresh_check ();
1099 } 1100 }
1100 else 1101 else
… …
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 }
1468
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1470 }
1464 break; 1471 break;
1465 1472
1466 case PropertyNotify: 1473 case PropertyNotify:
… …
1483 case SelectionRequest: 1490 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1485 break; 1492 break;
1486 1493
1487 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
1488 mapped = 1; 1511 mapped = 1;
1489#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1490 text_blink_ev.start (); 1513 text_blink_ev.start ();
1491#endif 1514#endif
1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1529 ; 1552 ;
1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1531 ; 1554 ;
1532 1555
1533 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1534 { 1557 {
1535 scrollBar.setIdle (); 1558 scrollBar.state = STATE_IDLE;
1536 scrollbar_show (0); 1559 scrollbar_show (0);
1537 } 1560 }
1538 } 1561 }
1539 break; 1562 break;
1540 1563
… …
1628#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1629 } 1652 }
1630#endif 1653#endif
1631 } 1654 }
1632 } 1655 }
1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1634 { 1657 {
1635 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1636 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1637 ; 1660 ;
1638 1661
… …
1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 { 1818 {
1796 bgPixmap.set_root_pixmap (); 1819 bgPixmap.set_root_pixmap ();
1797 update_background (); 1820 update_background ();
1798 } 1821 }
1822
1799 break; 1823 break;
1800 } 1824 }
1801# endif 1825# endif
1802 1826
1803 refresh_check (); 1827 refresh_check ();
… …
1921 } 1945 }
1922 1946
1923 /* 1947 /*
1924 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1925 */ 1949 */
1926 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1927 { 1951 {
1928 scrollBar.setIdle (); 1952 page_dirn direction = NO_DIR;
1953
1954 if (scrollBar.upButton (ev.y))
1955 direction = UP; /* up */
1956 else if (scrollBar.dnButton (ev.y))
1957 direction = DN; /* down */
1958
1959 scrollBar.state = STATE_IDLE;
1929 /* 1960 /*
1930 * Rxvt-style scrollbar: 1961 * Rxvt-style scrollbar:
1931 * move up if mouse is above slider 1962 * move up if mouse is above slider
1932 * move dn if mouse is below slider 1963 * move dn if mouse is below slider
1933 * 1964 *
… …
1942 /* 1973 /*
1943 * Mouse report disabled scrollbar: 1974 * Mouse report disabled scrollbar:
1944 * arrow buttons - send up/down 1975 * arrow buttons - send up/down
1945 * click on scrollbar - send pageup/down 1976 * click on scrollbar - send pageup/down
1946 */ 1977 */
1947 if ((scrollBar.style == R_SB_NEXT 1978 if (direction == UP)
1948 && scrollbarnext_upButton (ev.y))
1949 || (scrollBar.style == R_SB_RXVT
1950 && scrollbarrxvt_upButton (ev.y)))
1951 tt_printf ("\033[A"); 1979 tt_printf ("\033[A");
1952 else if ((scrollBar.style == R_SB_NEXT 1980 else if (direction == DN)
1953 && scrollbarnext_dnButton (ev.y))
1954 || (scrollBar.style == R_SB_RXVT
1955 && scrollbarrxvt_dnButton (ev.y)))
1956 tt_printf ("\033[B"); 1981 tt_printf ("\033[B");
1957 else 1982 else
1958 switch (ev.button) 1983 switch (ev.button)
1959 { 1984 {
1960 case Button2: 1985 case Button2:
… …
1968 break; 1993 break;
1969 } 1994 }
1970 } 1995 }
1971 else 1996 else
1972#endif /* NO_SCROLLBAR_REPORT */ 1997#endif /* NO_SCROLLBAR_REPORT */
1973
1974 {
1975 char upordown = 0;
1976
1977 if (scrollBar.style == R_SB_NEXT)
1978 { 1998 {
1979 if (scrollbarnext_upButton (ev.y)) 1999 if (direction != NO_DIR)
1980 upordown = -1; /* up */
1981 else if (scrollbarnext_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 else if (scrollBar.style == R_SB_RXVT)
1985 {
1986 if (scrollbarrxvt_upButton (ev.y))
1987 upordown = -1; /* up */
1988 else if (scrollbarrxvt_dnButton (ev.y))
1989 upordown = 1; /* down */
1990 }
1991
1992 if (upordown)
1993 { 2000 {
1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2001#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ()) 2002 if (!cont_scroll_ev.is_active ())
1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2003 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1997#endif 2004#endif
1998 if (scr_page (upordown < 0 ? UP : DN, 1)) 2005 if (scr_page (direction, 1))
1999 { 2006 {
2000 if (upordown < 0) 2007 if (direction == UP)
2001 scrollBar.setUp (); 2008 scrollBar.state = STATE_UP;
2002 else 2009 else
2003 scrollBar.setDn (); 2010 scrollBar.state = STATE_DOWN;
2004 } 2011 }
2005 } 2012 }
2006 else 2013 else
2007 switch (ev.button) 2014 switch (ev.button)
2008 { 2015 {
2009 case Button2: 2016 case Button2:
2010 switch (scrollbar_align) 2017 switch (scrollBar.align)
2011 { 2018 {
2012 case R_SB_ALIGN_TOP: 2019 case R_SB_ALIGN_TOP:
2013 csrO = 0; 2020 csrO = 0;
2014 break; 2021 break;
2015 case R_SB_ALIGN_CENTRE: 2022 case R_SB_ALIGN_CENTRE:
… …
2023 if (scrollBar.style == R_SB_XTERM 2030 if (scrollBar.style == R_SB_XTERM
2024 || scrollbar_above_slider (ev.y) 2031 || scrollbar_above_slider (ev.y)
2025 || scrollbar_below_slider (ev.y)) 2032 || scrollbar_below_slider (ev.y))
2026 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2033 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2027 2034
2028 scrollBar.setMotion (); 2035 scrollBar.state = STATE_MOTION;
2029 break; 2036 break;
2030 2037
2031 case Button1: 2038 case Button1:
2032 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2039 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2033 csrO = ev.y - scrollBar.top; 2040 csrO = ev.y - scrollBar.top;
2034 /* FALLTHROUGH */ 2041 /* FALLTHROUGH */
2035 2042
2036 case Button3: 2043 case Button3:
2037 if (scrollBar.style != R_SB_XTERM) 2044 if (scrollBar.style != R_SB_XTERM)
… …
2047 scr_page (DN, nrow - 1); 2054 scr_page (DN, nrow - 1);
2048# else 2055# else
2049 scr_page (DN, nrow / 4); 2056 scr_page (DN, nrow / 4);
2050# endif 2057# endif
2051 else 2058 else
2052 scrollBar.setMotion (); 2059 scrollBar.state = STATE_MOTION;
2053 } 2060 }
2054 else 2061 else
2055 { 2062 {
2056 scr_page ((ev.button == Button1 ? DN : UP), 2063 scr_page ((ev.button == Button1 ? DN : UP),
2057 (nrow 2064 (nrow
… …
2074 2081
2075 csrO = 0; /* reset csr Offset */ 2082 csrO = 0; /* reset csr Offset */
2076 if (!bypass_keystate) 2083 if (!bypass_keystate)
2077 reportmode = !! (priv_modes & PrivMode_mouse_report); 2084 reportmode = !! (priv_modes & PrivMode_mouse_report);
2078 2085
2079 if (scrollbar_isUpDn ()) 2086 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2080 { 2087 {
2081 scrollBar.setIdle (); 2088 scrollBar.state = STATE_IDLE;
2082 scrollbar_show (0); 2089 scrollbar_show (0);
2083 } 2090 }
2084 2091
2085#ifdef SELECTION_SCROLLING 2092#ifdef SELECTION_SCROLLING
2086 sel_scroll_ev.stop(); 2093 sel_scroll_ev.stop();
… …
2167 2174
2168 if (!slip_wheel_ev.is_active ()) 2175 if (!slip_wheel_ev.is_active ())
2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2176 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2170 } 2177 }
2171 else 2178 else
2179# endif
2172 { 2180 {
2173# endif
2174 scr_page (v, i); 2181 scr_page (v, i);
2175 scrollbar_show (1); 2182 scrollbar_show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2183 }
2178# endif
2179 } 2184 }
2180 break; 2185 break;
2181#endif 2186#endif
2182 } 2187 }
2183 } 2188 }
… …
2826 // versions. 2831 // versions.
2827 // 2832 //
2828 tt_printf ("\033[>%d;95;0c", 'U'); 2833 tt_printf ("\033[>%d;95;0c", 'U');
2829 } 2834 }
2830 break; 2835 break;
2836
2831 case '?': 2837 case '?':
2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2838 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2833 process_terminal_mode (ch, priv, nargs, arg); 2839 process_terminal_mode (ch, priv, nargs, arg);
2834 break; 2840 break;
2835 } 2841 }
… …
3351 *buf++ = '\0'; 3357 *buf++ = '\0';
3352 3358
3353 process_color_seq (op, color, name, resp); 3359 process_color_seq (op, color, name, resp);
3354 } 3360 }
3355 break; 3361 break;
3362 case Rxvt_restoreFG:
3356 case XTerm_Color00: 3363 case XTerm_Color00:
3357 process_color_seq (op, Color_fg, str, resp); 3364 process_color_seq (op, Color_fg, str, resp);
3358 break; 3365 break;
3366 case Rxvt_restoreBG:
3359 case XTerm_Color01: 3367 case XTerm_Color01:
3360 process_color_seq (op, Color_bg, str, resp); 3368 process_color_seq (op, Color_bg, str, resp);
3361 break; 3369 break;
3362#ifndef NO_CURSORCOLOR 3370#ifndef NO_CURSORCOLOR
3363 case XTerm_Color_cursor: 3371 case XTerm_Color_cursor:
… …
3389#if ENABLE_TRANSPARENCY 3397#if ENABLE_TRANSPARENCY
3390 case URxvt_Color_tint: 3398 case URxvt_Color_tint:
3391 process_color_seq (op, Color_tint, str, resp); 3399 process_color_seq (op, Color_tint, str, resp);
3392 { 3400 {
3393 bool changed = false; 3401 bool changed = false;
3402
3394 if (ISSET_PIXCOLOR (Color_tint)) 3403 if (ISSET_PIXCOLOR (Color_tint))
3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3404 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3396 else 3405 else
3397 changed = bgPixmap.unset_tint (); 3406 changed = bgPixmap.unset_tint ();
3407
3398 if (changed) 3408 if (changed)
3399 update_background (); 3409 update_background ();
3400 } 3410 }
3401 3411
3402 break; 3412 break;
… …
3425 changed++; 3435 changed++;
3426 str = strchr (str, ';'); 3436 str = strchr (str, ';');
3427 if (str == NULL) 3437 if (str == NULL)
3428 bgPixmap.set_defaultGeometry (); 3438 bgPixmap.set_defaultGeometry ();
3429 } 3439 }
3440
3430 while (str) 3441 while (str)
3431 { 3442 {
3432 str++; 3443 str++;
3433 if (bgPixmap.set_geometry (str)) 3444 if (bgPixmap.set_geometry (str))
3434 changed++; 3445 changed++;
3435 str = strchr (str, ';'); 3446 str = strchr (str, ';');
3436 } 3447 }
3448
3437 if (changed) 3449 if (changed)
3438 update_background (); 3450 update_background ();
3439 } 3451 }
3440 break; 3452 break;
3441#endif 3453#endif
3442
3443 case Rxvt_restoreFG:
3444 set_window_color (Color_fg, str);
3445 break;
3446 case Rxvt_restoreBG:
3447 set_window_color (Color_bg, str);
3448 break;
3449 3454
3450 case XTerm_logfile: 3455 case XTerm_logfile:
3451 // TODO, when secure mode? 3456 // TODO, when secure mode?
3452 break; 3457 break;
3453 3458
… …
3608 // 1037 send DEL for keypad delete NYI 3613 // 1037 send DEL for keypad delete NYI
3609 { 1047, PrivMode_Screen }, 3614 { 1047, PrivMode_Screen },
3610 // 1048 save and restore cursor 3615 // 1048 save and restore cursor
3611 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3616 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3612 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3617 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3618 { 2004, PrivMode_BracketPaste },
3613 }; 3619 };
3614 3620
3615 if (nargs == 0) 3621 if (nargs == 0)
3616 return; 3622 return;
3617 3623
… …
3665 */ 3671 */
3666 PrivMode (1, PrivMode_vt52); 3672 PrivMode (1, PrivMode_vt52);
3667 break; 3673 break;
3668 case 3: /* 80/132 */ 3674 case 3: /* 80/132 */
3669 if (priv_modes & PrivMode_132OK) 3675 if (priv_modes & PrivMode_132OK)
3676 {
3677 scr_poweron ();
3670 set_widthheight (((state ? 132 : 80) * fwidth), height); 3678 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3679 }
3671 break; 3680 break;
3672 case 4: /* smooth scrolling */ 3681 case 4: /* smooth scrolling */
3673 set_option (Opt_jumpScroll, !state); 3682 set_option (Opt_jumpScroll, !state);
3674 break; 3683 break;
3675 case 5: /* reverse video */ 3684 case 5: /* reverse video */

Diff Legend

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