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.381 by root, Fri Dec 14 05:25:23 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.
… …
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
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
… …
1047void 1048void
1048rxvt_term::refresh_check () 1049rxvt_term::refresh_check ()
1049{ 1050{
1050 if (want_refresh && !flush_ev.is_active ()) 1051 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1053
1054 display->flush ();
1052} 1055}
1053 1056
1054void 1057void
1055rxvt_term::flush_cb (ev::timer &w, int revents) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1056{ 1059{
… …
1076{ 1079{
1077 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1078 { 1081 {
1079 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1080 want_refresh = 1; 1083 want_refresh = 1;
1081 refresh_check (); 1084 refresh_check ();
1082 } 1085 }
1083 else 1086 else
1084 w.stop (); 1087 w.stop ();
1085} 1088}
1086#endif 1089#endif
… …
1209 if (cmd_parse ()) 1212 if (cmd_parse ())
1210 break; 1213 break;
1211 1214
1212 if (revents & ev::WRITE) 1215 if (revents & ev::WRITE)
1213 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1214} 1219}
1215 1220
1216void 1221void
1217rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1218{ 1223{
… …
1433 && ev.xfocus.mode != NotifyGrab) 1438 && ev.xfocus.mode != NotifyGrab)
1434 focus_out (); 1439 focus_out ();
1435 break; 1440 break;
1436 1441
1437 case ConfigureNotify: 1442 case ConfigureNotify:
1438 /* 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",
1439 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,
1440 szHint.width, szHint.height); */ 1445 szHint.width, szHint.height);*/
1441 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1442 { 1447 {
1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1444 ; 1449 ;
1445 1450
… …
1450 } 1455 }
1451 else 1456 else
1452 { 1457 {
1453#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1455 update_background (); 1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1456#endif 1466#endif
1457 } 1467 }
1468
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1470 }
1460 break; 1471 break;
1461 1472
1462 case PropertyNotify: 1473 case PropertyNotify:
… …
1479 case SelectionRequest: 1490 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1481 break; 1492 break;
1482 1493
1483 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
1484 mapped = 1; 1511 mapped = 1;
1485#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1486 text_blink_ev.start (); 1513 text_blink_ev.start ();
1487#endif 1514#endif
1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1525 ; 1552 ;
1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1527 ; 1554 ;
1528 1555
1529 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1530 { 1557 {
1531 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1532 scrollbar_show (0); 1559 scrollbar_show (0);
1533 } 1560 }
1534 } 1561 }
… …
1624#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1625 } 1652 }
1626#endif 1653#endif
1627 } 1654 }
1628 } 1655 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1630 { 1657 {
1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1633 ; 1660 ;
1634 1661
… …
1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 { 1818 {
1792 bgPixmap.set_root_pixmap (); 1819 bgPixmap.set_root_pixmap ();
1793 update_background (); 1820 update_background ();
1794 } 1821 }
1822
1795 break; 1823 break;
1796 } 1824 }
1797# endif 1825# endif
1798 1826
1799 refresh_check (); 1827 refresh_check ();
… …
1917 } 1945 }
1918 1946
1919 /* 1947 /*
1920 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1921 */ 1949 */
1922 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1923 { 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
1924 scrollBar.setIdle (); 1959 scrollBar.setIdle ();
1925 /* 1960 /*
1926 * Rxvt-style scrollbar: 1961 * Rxvt-style scrollbar:
1927 * move up if mouse is above slider 1962 * move up if mouse is above slider
1928 * move dn if mouse is below slider 1963 * move dn if mouse is below slider
… …
1938 /* 1973 /*
1939 * Mouse report disabled scrollbar: 1974 * Mouse report disabled scrollbar:
1940 * arrow buttons - send up/down 1975 * arrow buttons - send up/down
1941 * click on scrollbar - send pageup/down 1976 * click on scrollbar - send pageup/down
1942 */ 1977 */
1943 if ((scrollBar.style == R_SB_NEXT 1978 if (upordown < 0)
1944 && scrollbarnext_upButton (ev.y))
1945 || (scrollBar.style == R_SB_RXVT
1946 && scrollbarrxvt_upButton (ev.y)))
1947 tt_printf ("\033[A"); 1979 tt_printf ("\033[A");
1948 else if ((scrollBar.style == R_SB_NEXT 1980 else if (upordown > 0)
1949 && scrollbarnext_dnButton (ev.y))
1950 || (scrollBar.style == R_SB_RXVT
1951 && scrollbarrxvt_dnButton (ev.y)))
1952 tt_printf ("\033[B"); 1981 tt_printf ("\033[B");
1953 else 1982 else
1954 switch (ev.button) 1983 switch (ev.button)
1955 { 1984 {
1956 case Button2: 1985 case Button2:
… …
1966 } 1995 }
1967 else 1996 else
1968#endif /* NO_SCROLLBAR_REPORT */ 1997#endif /* NO_SCROLLBAR_REPORT */
1969 1998
1970 { 1999 {
1971 char upordown = 0;
1972
1973 if (scrollBar.style == R_SB_NEXT)
1974 {
1975 if (scrollbarnext_upButton (ev.y))
1976 upordown = -1; /* up */
1977 else if (scrollbarnext_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 else if (scrollBar.style == R_SB_RXVT)
1981 {
1982 if (scrollbarrxvt_upButton (ev.y))
1983 upordown = -1; /* up */
1984 else if (scrollbarrxvt_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987
1988 if (upordown) 2000 if (upordown)
1989 { 2001 {
1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2002#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ()) 2003 if (!cont_scroll_ev.is_active ())
1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2004 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
… …
2001 } 2013 }
2002 else 2014 else
2003 switch (ev.button) 2015 switch (ev.button)
2004 { 2016 {
2005 case Button2: 2017 case Button2:
2006 switch (scrollbar_align) 2018 switch (scrollBar.align)
2007 { 2019 {
2008 case R_SB_ALIGN_TOP: 2020 case R_SB_ALIGN_TOP:
2009 csrO = 0; 2021 csrO = 0;
2010 break; 2022 break;
2011 case R_SB_ALIGN_CENTRE: 2023 case R_SB_ALIGN_CENTRE:
… …
2023 2035
2024 scrollBar.setMotion (); 2036 scrollBar.setMotion ();
2025 break; 2037 break;
2026 2038
2027 case Button1: 2039 case Button1:
2028 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2040 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2029 csrO = ev.y - scrollBar.top; 2041 csrO = ev.y - scrollBar.top;
2030 /* FALLTHROUGH */ 2042 /* FALLTHROUGH */
2031 2043
2032 case Button3: 2044 case Button3:
2033 if (scrollBar.style != R_SB_XTERM) 2045 if (scrollBar.style != R_SB_XTERM)
… …
2163 2175
2164 if (!slip_wheel_ev.is_active ()) 2176 if (!slip_wheel_ev.is_active ())
2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2177 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2166 } 2178 }
2167 else 2179 else
2180# endif
2168 { 2181 {
2169# endif
2170 scr_page (v, i); 2182 scr_page (v, i);
2171 scrollbar_show (1); 2183 scrollbar_show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2184 }
2174# endif
2175 } 2185 }
2176 break; 2186 break;
2177#endif 2187#endif
2178 } 2188 }
2179 } 2189 }
… …
2309 2319
2310 ch = NOCHAR; 2320 ch = NOCHAR;
2311 } 2321 }
2312 } 2322 }
2313 2323
2314 refresh_check ();
2315
2316 return flag; 2324 return flag;
2317} 2325}
2318 2326
2319// read the next character 2327// read the next character
2320wchar_t 2328wchar_t
… …
2824 // versions. 2832 // versions.
2825 // 2833 //
2826 tt_printf ("\033[>%d;95;0c", 'U'); 2834 tt_printf ("\033[>%d;95;0c", 'U');
2827 } 2835 }
2828 break; 2836 break;
2837
2829 case '?': 2838 case '?':
2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2839 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2831 process_terminal_mode (ch, priv, nargs, arg); 2840 process_terminal_mode (ch, priv, nargs, arg);
2832 break; 2841 break;
2833 } 2842 }
… …
3349 *buf++ = '\0'; 3358 *buf++ = '\0';
3350 3359
3351 process_color_seq (op, color, name, resp); 3360 process_color_seq (op, color, name, resp);
3352 } 3361 }
3353 break; 3362 break;
3363 case Rxvt_restoreFG:
3354 case XTerm_Color00: 3364 case XTerm_Color00:
3355 process_color_seq (op, Color_fg, str, resp); 3365 process_color_seq (op, Color_fg, str, resp);
3356 break; 3366 break;
3367 case Rxvt_restoreBG:
3357 case XTerm_Color01: 3368 case XTerm_Color01:
3358 process_color_seq (op, Color_bg, str, resp); 3369 process_color_seq (op, Color_bg, str, resp);
3359 break; 3370 break;
3360#ifndef NO_CURSORCOLOR 3371#ifndef NO_CURSORCOLOR
3361 case XTerm_Color_cursor: 3372 case XTerm_Color_cursor:
… …
3387#if ENABLE_TRANSPARENCY 3398#if ENABLE_TRANSPARENCY
3388 case URxvt_Color_tint: 3399 case URxvt_Color_tint:
3389 process_color_seq (op, Color_tint, str, resp); 3400 process_color_seq (op, Color_tint, str, resp);
3390 { 3401 {
3391 bool changed = false; 3402 bool changed = false;
3403
3392 if (ISSET_PIXCOLOR (Color_tint)) 3404 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3405 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3394 else 3406 else
3395 changed = bgPixmap.unset_tint (); 3407 changed = bgPixmap.unset_tint ();
3408
3396 if (changed) 3409 if (changed)
3397 update_background (); 3410 update_background ();
3398 } 3411 }
3399 3412
3400 break; 3413 break;
… …
3423 changed++; 3436 changed++;
3424 str = strchr (str, ';'); 3437 str = strchr (str, ';');
3425 if (str == NULL) 3438 if (str == NULL)
3426 bgPixmap.set_defaultGeometry (); 3439 bgPixmap.set_defaultGeometry ();
3427 } 3440 }
3441
3428 while (str) 3442 while (str)
3429 { 3443 {
3430 str++; 3444 str++;
3431 if (bgPixmap.set_geometry (str)) 3445 if (bgPixmap.set_geometry (str))
3432 changed++; 3446 changed++;
3433 str = strchr (str, ';'); 3447 str = strchr (str, ';');
3434 } 3448 }
3449
3435 if (changed) 3450 if (changed)
3436 update_background (); 3451 update_background ();
3437 } 3452 }
3438 break; 3453 break;
3439#endif 3454#endif
3440
3441 case Rxvt_restoreFG:
3442 set_window_color (Color_fg, str);
3443 break;
3444 case Rxvt_restoreBG:
3445 set_window_color (Color_bg, str);
3446 break;
3447 3455
3448 case XTerm_logfile: 3456 case XTerm_logfile:
3449 // TODO, when secure mode? 3457 // TODO, when secure mode?
3450 break; 3458 break;
3451 3459
… …
3606 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
3607 { 1047, PrivMode_Screen }, 3615 { 1047, PrivMode_Screen },
3608 // 1048 save and restore cursor 3616 // 1048 save and restore cursor
3609 { 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 */
3610 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3618 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3619 { 2004, PrivMode_BracketPaste },
3611 }; 3620 };
3612 3621
3613 if (nargs == 0) 3622 if (nargs == 0)
3614 return; 3623 return;
3615 3624
… …
3663 */ 3672 */
3664 PrivMode (1, PrivMode_vt52); 3673 PrivMode (1, PrivMode_vt52);
3665 break; 3674 break;
3666 case 3: /* 80/132 */ 3675 case 3: /* 80/132 */
3667 if (priv_modes & PrivMode_132OK) 3676 if (priv_modes & PrivMode_132OK)
3677 {
3678 scr_poweron ();
3668 set_widthheight (((state ? 132 : 80) * fwidth), height); 3679 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3680 }
3669 break; 3681 break;
3670 case 4: /* smooth scrolling */ 3682 case 4: /* smooth scrolling */
3671 set_option (Opt_jumpScroll, !state); 3683 set_option (Opt_jumpScroll, !state);
3672 break; 3684 break;
3673 case 5: /* reverse video */ 3685 case 5: /* reverse video */

Diff Legend

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