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.379 by root, Fri Dec 14 02:29:48 2007 UTC vs.
Revision 1.391 by root, Wed Jan 9 01:14:29 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
… …
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 ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1051 if (want_refresh && !flush_ev.is_active ())
1054 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 ();
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 }
1084 else 1086 else
1085 w.stop (); 1087 w.stop ();
1086} 1088}
1087#endif 1089#endif
1088 1090
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1092void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1094{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1097 {
1095 want_refresh = 1; 1098 want_refresh = 1;
1099 refresh_check ();
1100 }
1096 else 1101 else
1097 w.stop (); 1102 w.stop ();
1098} 1103}
1099#endif 1104#endif
1100 1105
… …
1104{ 1109{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1111 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1113 want_refresh = 1;
1114 refresh_check ();
1109 } 1115 }
1110 else 1116 else
1111 w.stop (); 1117 w.stop ();
1112} 1118}
1113#endif 1119#endif
1114 1120
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1122void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1124{
1119 if (scr_page (mouse_slip_wheel_speed < 0 ? DN : UP, abs (mouse_slip_wheel_speed))) 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1126 {
1120 want_refresh = 1; 1127 want_refresh = 1;
1128 refresh_check ();
1129 }
1121 1130
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0) 1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1123 { 1132 {
1124 mouse_slip_wheel_speed = 0; 1133 mouse_slip_wheel_speed = 0;
1125 w.stop (); 1134 w.stop ();
… …
1203 if (cmd_parse ()) 1212 if (cmd_parse ())
1204 break; 1213 break;
1205 1214
1206 if (revents & ev::WRITE) 1215 if (revents & ev::WRITE)
1207 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1208} 1219}
1209 1220
1210void 1221void
1211rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1212{ 1223{
… …
1447#ifdef HAVE_BG_PIXMAP 1458#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ()) 1459 if (bgPixmap.window_position_sensitive ())
1449 update_background (); 1460 update_background ();
1450#endif 1461#endif
1451 } 1462 }
1463
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1453 } 1465 }
1454 break; 1466 break;
1455 1467
1456 case PropertyNotify: 1468 case PropertyNotify:
… …
1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 { 1519 {
1508 scr_expose (ev.xexpose.x, ev.xexpose.y, 1520 scr_expose (ev.xexpose.x, ev.xexpose.y,
1509 ev.xexpose.width, ev.xexpose.height, False); 1521 ev.xexpose.width, ev.xexpose.height, False);
1510 } 1522 }
1523
1511 want_refresh = 1; 1524 want_refresh = 1;
1512 } 1525 }
1513 else 1526 else
1514 { 1527 {
1515 XEvent unused_event; 1528 XEvent unused_event;
… …
1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1518 ; 1531 ;
1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1520 ; 1533 ;
1521 1534
1522 if (isScrollbarWindow (ev.xany.window)) 1535 if (scrollBar.state && ev.xany.window == scrollBar.win)
1523 { 1536 {
1524 scrollBar.setIdle (); 1537 scrollBar.setIdle ();
1525 scrollbar_show (0); 1538 scrollbar_show (0);
1526 } 1539 }
1527 } 1540 }
… …
1617#ifdef MOUSE_THRESHOLD 1630#ifdef MOUSE_THRESHOLD
1618 } 1631 }
1619#endif 1632#endif
1620 } 1633 }
1621 } 1634 }
1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1635 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1623 { 1636 {
1624 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1625 MotionNotify, &ev)) 1638 MotionNotify, &ev))
1626 ; 1639 ;
1627 1640
… …
1662 1675
1663 if (ev.type == KeyPress && hidden_pointer == 0) 1676 if (ev.type == KeyPress && hidden_pointer == 0)
1664 pointer_blank (); 1677 pointer_blank ();
1665 } 1678 }
1666#endif 1679#endif
1680
1681 refresh_check ();
1667} 1682}
1668 1683
1669void 1684void
1670rxvt_term::focus_in () 1685rxvt_term::focus_in ()
1671{ 1686{
… …
1781 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1796 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1782 { 1797 {
1783 bgPixmap.set_root_pixmap (); 1798 bgPixmap.set_root_pixmap ();
1784 update_background (); 1799 update_background ();
1785 } 1800 }
1801
1786 break; 1802 break;
1787 } 1803 }
1788# endif 1804# endif
1805
1806 refresh_check ();
1789} 1807}
1790#endif 1808#endif
1791 1809
1792void 1810void
1793rxvt_term::button_press (XButtonEvent &ev) 1811rxvt_term::button_press (XButtonEvent &ev)
… …
1906 } 1924 }
1907 1925
1908 /* 1926 /*
1909 * Scrollbar window processing of button press 1927 * Scrollbar window processing of button press
1910 */ 1928 */
1911 if (isScrollbarWindow (ev.window)) 1929 if (scrollBar.state && ev.window == scrollBar.win)
1912 { 1930 {
1913 scrollBar.setIdle (); 1931 scrollBar.setIdle ();
1914 /* 1932 /*
1915 * Rxvt-style scrollbar: 1933 * Rxvt-style scrollbar:
1916 * move up if mouse is above slider 1934 * move up if mouse is above slider
… …
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)
… …
2152 2170
2153 if (!slip_wheel_ev.is_active ()) 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
2175# endif
2157 { 2176 {
2158# endif
2159 scr_page (v, i); 2177 scr_page (v, i);
2160 scrollbar_show (1); 2178 scrollbar_show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2179 }
2163# endif
2164 } 2180 }
2165 break; 2181 break;
2166#endif 2182#endif
2167 } 2183 }
2168 } 2184 }
… …
3374#if ENABLE_TRANSPARENCY 3390#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint: 3391 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp); 3392 process_color_seq (op, Color_tint, str, resp);
3377 { 3393 {
3378 bool changed = false; 3394 bool changed = false;
3395
3379 if (ISSET_PIXCOLOR (Color_tint)) 3396 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3397 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else 3398 else
3382 changed = bgPixmap.unset_tint (); 3399 changed = bgPixmap.unset_tint ();
3400
3383 if (changed) 3401 if (changed)
3384 update_background (); 3402 update_background ();
3385 } 3403 }
3386 3404
3387 break; 3405 break;
… …
3410 changed++; 3428 changed++;
3411 str = strchr (str, ';'); 3429 str = strchr (str, ';');
3412 if (str == NULL) 3430 if (str == NULL)
3413 bgPixmap.set_defaultGeometry (); 3431 bgPixmap.set_defaultGeometry ();
3414 } 3432 }
3433
3415 while (str) 3434 while (str)
3416 { 3435 {
3417 str++; 3436 str++;
3418 if (bgPixmap.set_geometry (str)) 3437 if (bgPixmap.set_geometry (str))
3419 changed++; 3438 changed++;
3420 str = strchr (str, ';'); 3439 str = strchr (str, ';');
3421 } 3440 }
3441
3422 if (changed) 3442 if (changed)
3423 update_background (); 3443 update_background ();
3424 } 3444 }
3425 break; 3445 break;
3426#endif 3446#endif
3427 3447
3428 case Rxvt_restoreFG: 3448 case Rxvt_restoreFG:
… …
3650 */ 3670 */
3651 PrivMode (1, PrivMode_vt52); 3671 PrivMode (1, PrivMode_vt52);
3652 break; 3672 break;
3653 case 3: /* 80/132 */ 3673 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3674 if (priv_modes & PrivMode_132OK)
3675 {
3676 scr_poweron ();
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3677 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3678 }
3656 break; 3679 break;
3657 case 4: /* smooth scrolling */ 3680 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3681 set_option (Opt_jumpScroll, !state);
3659 break; 3682 break;
3660 case 5: /* reverse video */ 3683 case 5: /* reverse video */

Diff Legend

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