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.373 by root, Tue Dec 11 15:42:51 2007 UTC vs.
Revision 1.388 by ayin, Mon Dec 31 01:16:47 2007 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
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-2006 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
… …
1041 } 1042 }
1042 1043
1043 display->flush (); 1044 display->flush ();
1044} 1045}
1045 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1046void 1048void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1049rxvt_term::refresh_check ()
1048{ 1050{
1049 make_current (); 1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1053
1051 display->flush (); 1054 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.again ();
1055} 1055}
1056 1056
1057void 1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1059{
… …
1067void 1067void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1069{
1070 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1071 want_refresh = 1;
1072 refresh_check ();
1072} 1073}
1073#endif 1074#endif
1074 1075
1075#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1076void 1077void
… …
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;
1084 refresh_check ();
1083 } 1085 }
1086 else
1087 w.stop ();
1084} 1088}
1085#endif 1089#endif
1086 1090
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void 1092void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{ 1094{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1092 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1097 {
1093 want_refresh = 1; 1098 want_refresh = 1;
1099 refresh_check ();
1100 }
1094 else 1101 else
1095 w.stop (); 1102 w.stop ();
1096} 1103}
1097#endif 1104#endif
1098 1105
… …
1102{ 1109{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1111 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1113 want_refresh = 1;
1114 refresh_check ();
1107 } 1115 }
1108 else 1116 else
1109 w.stop (); 1117 w.stop ();
1110} 1118}
1111#endif 1119#endif
1112 1120
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1122void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1124{
1117 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1126 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1; 1127 want_refresh = 1;
1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1125 } 1132 {
1126 else 1133 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1134 w.stop ();
1135 }
1128} 1136}
1129#endif 1137#endif
1130 1138
1131#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1132static struct event_handler 1140static struct event_handler
… …
1204 if (cmd_parse ()) 1212 if (cmd_parse ())
1205 break; 1213 break;
1206 1214
1207 if (revents & ev::WRITE) 1215 if (revents & ev::WRITE)
1208 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1209} 1219}
1210 1220
1211void 1221void
1212rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1213{ 1223{
… …
1448#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1450 update_background (); 1460 update_background ();
1451#endif 1461#endif
1452 } 1462 }
1463
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1465 }
1455 break; 1466 break;
1456 1467
1457 case PropertyNotify: 1468 case PropertyNotify:
… …
1476 break; 1487 break;
1477 1488
1478 case MapNotify: 1489 case MapNotify:
1479 mapped = 1; 1490 mapped = 1;
1480#ifdef TEXT_BLINK 1491#ifdef TEXT_BLINK
1481 text_blink_ev.again (); 1492 text_blink_ev.start ();
1482#endif 1493#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1495 break;
1485 1496
1486 case UnmapNotify: 1497 case UnmapNotify:
… …
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1519 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1522 }
1523
1512 want_refresh = 1; 1524 want_refresh = 1;
1513 } 1525 }
1514 else 1526 else
1515 { 1527 {
1516 XEvent unused_event; 1528 XEvent unused_event;
… …
1577 int dist; 1589 int dist;
1578 1590
1579 /* don't clobber the current delay if we are 1591 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1592 * already in the middle of scrolling.
1581 */ 1593 */
1582 if (!ev_is_active (&sel_scroll_ev)) 1594 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1595 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1596
1585 /* save the event params so we can highlight 1597 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1598 * the selection in the pending-scroll loop
1587 */ 1599 */
… …
1610 else 1622 else
1611 { 1623 {
1612 /* we are within the text window, so we 1624 /* we are within the text window, so we
1613 * shouldn't be scrolling 1625 * shouldn't be scrolling
1614 */ 1626 */
1615 if (ev_is_active (&sel_scroll_ev))
1616 sel_scroll_ev.stop(); 1627 sel_scroll_ev.stop();
1617 } 1628 }
1618#endif 1629#endif
1619#ifdef MOUSE_THRESHOLD 1630#ifdef MOUSE_THRESHOLD
1620 } 1631 }
1621#endif 1632#endif
… …
1664 1675
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1676 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1677 pointer_blank ();
1667 } 1678 }
1668#endif 1679#endif
1680
1681 refresh_check ();
1669} 1682}
1670 1683
1671void 1684void
1672rxvt_term::focus_in () 1685rxvt_term::focus_in ()
1673{ 1686{
… …
1685 XSetICFocus (Input_Context); 1698 XSetICFocus (Input_Context);
1686 } 1699 }
1687#endif 1700#endif
1688#if CURSOR_BLINK 1701#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1702 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1691#endif 1704#endif
1692#if OFF_FOCUS_FADING 1705#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1706 if (rs[Rs_fade])
1694 { 1707 {
1695 pix_colors = pix_colors_focused; 1708 pix_colors = pix_colors_focused;
… …
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1796 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1797 {
1785 bgPixmap.set_root_pixmap (); 1798 bgPixmap.set_root_pixmap ();
1786 update_background (); 1799 update_background ();
1787 } 1800 }
1801
1788 break; 1802 break;
1789 } 1803 }
1790# endif 1804# endif
1805
1806 refresh_check ();
1791} 1807}
1792#endif 1808#endif
1793 1809
1794void 1810void
1795rxvt_term::button_press (XButtonEvent &ev) 1811rxvt_term::button_press (XButtonEvent &ev)
… …
1973 if (scrollbarrxvt_upButton (ev.y)) 1989 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */ 1990 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y)) 1991 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */ 1992 upordown = 1; /* down */
1977 } 1993 }
1994
1978 if (upordown) 1995 if (upordown)
1979 { 1996 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2000#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (upordown < 0 ? UP : DN, 1))
1984 { 2002 {
1985 if (upordown < 0) 2003 if (upordown < 0)
1986 scrollBar.setUp (); 2004 scrollBar.setUp ();
… …
1990 } 2008 }
1991 else 2009 else
1992 switch (ev.button) 2010 switch (ev.button)
1993 { 2011 {
1994 case Button2: 2012 case Button2:
1995 switch (scrollbar_align) 2013 switch (scrollBar.align)
1996 { 2014 {
1997 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2016 csrO = 0;
1999 break; 2017 break;
2000 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
2012 2030
2013 scrollBar.setMotion (); 2031 scrollBar.setMotion ();
2014 break; 2032 break;
2015 2033
2016 case Button1: 2034 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2020 2038
2021 case Button3: 2039 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
… …
2066 scrollBar.setIdle (); 2084 scrollBar.setIdle ();
2067 scrollbar_show (0); 2085 scrollbar_show (0);
2068 } 2086 }
2069 2087
2070#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2071 if (ev_is_active (&sel_scroll_ev))
2072 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2073#endif 2090#endif
2074 2091
2075 if (ev.window == vt) 2092 if (ev.window == vt)
2076 { 2093 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2149 { 2166 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2170
2171 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2173 }
2156 else 2174 else
2157 { 2175 {
2158# endif 2176# endif
2159 scr_page (v, i); 2177 scr_page (v, i);
… …
3374#if ENABLE_TRANSPARENCY 3392#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint: 3393 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp); 3394 process_color_seq (op, Color_tint, str, resp);
3377 { 3395 {
3378 bool changed = false; 3396 bool changed = false;
3397
3379 if (ISSET_PIXCOLOR (Color_tint)) 3398 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3399 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else 3400 else
3382 changed = bgPixmap.unset_tint (); 3401 changed = bgPixmap.unset_tint ();
3402
3383 if (changed) 3403 if (changed)
3384 update_background (); 3404 update_background ();
3385 } 3405 }
3386 3406
3387 break; 3407 break;
… …
3410 changed++; 3430 changed++;
3411 str = strchr (str, ';'); 3431 str = strchr (str, ';');
3412 if (str == NULL) 3432 if (str == NULL)
3413 bgPixmap.set_defaultGeometry (); 3433 bgPixmap.set_defaultGeometry ();
3414 } 3434 }
3435
3415 while (str) 3436 while (str)
3416 { 3437 {
3417 str++; 3438 str++;
3418 if (bgPixmap.set_geometry (str)) 3439 if (bgPixmap.set_geometry (str))
3419 changed++; 3440 changed++;
3420 str = strchr (str, ';'); 3441 str = strchr (str, ';');
3421 } 3442 }
3443
3422 if (changed) 3444 if (changed)
3423 update_background (); 3445 update_background ();
3424 } 3446 }
3425 break; 3447 break;
3426#endif 3448#endif
3427 3449
3428 case Rxvt_restoreFG: 3450 case Rxvt_restoreFG:

Diff Legend

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