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.378 by root, Fri Dec 14 02:27:54 2007 UTC vs.
Revision 1.385 by root, Mon Dec 24 06:51:37 2007 UTC

… …
198 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
200 200
201 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
202 202
203 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
205 205
206 if (y >= 0) 206 if (y >= 0)
207 { 207 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
1041 } 1041 }
1042 1042
1043 display->flush (); 1043 display->flush ();
1044} 1044}
1045 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1046void 1047void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1048rxvt_term::refresh_check ()
1048{ 1049{
1049 make_current ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1050 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1055} 1054}
1056 1055
1057void 1056void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1058{
… …
1067void 1066void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1068{
1070 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1070 want_refresh = 1;
1071 refresh_check ();
1072} 1072}
1073#endif 1073#endif
1074 1074
1075#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1076void 1076void
… …
1078{ 1078{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1080 {
1081 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1082 want_refresh = 1; 1082 want_refresh = 1;
1083 refresh_check ();
1083 } 1084 }
1084 else 1085 else
1085 w.stop (); 1086 w.stop ();
1086} 1087}
1087#endif 1088#endif
1088 1089
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1091void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1093{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1096 {
1095 want_refresh = 1; 1097 want_refresh = 1;
1098 refresh_check ();
1099 }
1096 else 1100 else
1097 w.stop (); 1101 w.stop ();
1098} 1102}
1099#endif 1103#endif
1100 1104
… …
1104{ 1108{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1110 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1112 want_refresh = 1;
1113 refresh_check ();
1109 } 1114 }
1110 else 1115 else
1111 w.stop (); 1116 w.stop ();
1112} 1117}
1113#endif 1118#endif
1114 1119
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1121void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1123{
1119 if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 : scr_page (UP, mouse_slip_wheel_speed)) 1125 {
1121 want_refresh = 1; 1126 want_refresh = 1;
1127 refresh_check ();
1128 }
1122 1129
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0) 1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1124 { 1131 {
1125 mouse_slip_wheel_speed = 0; 1132 mouse_slip_wheel_speed = 0;
1126 w.stop (); 1133 w.stop ();
… …
1204 if (cmd_parse ()) 1211 if (cmd_parse ())
1205 break; 1212 break;
1206 1213
1207 if (revents & ev::WRITE) 1214 if (revents & ev::WRITE)
1208 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1209} 1218}
1210 1219
1211void 1220void
1212rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1213{ 1222{
… …
1448#ifdef HAVE_BG_PIXMAP 1457#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1458 if (bgPixmap.window_position_sensitive ())
1450 update_background (); 1459 update_background ();
1451#endif 1460#endif
1452 } 1461 }
1462
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1464 }
1455 break; 1465 break;
1456 1466
1457 case PropertyNotify: 1467 case PropertyNotify:
… …
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1518 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1521 }
1522
1512 want_refresh = 1; 1523 want_refresh = 1;
1513 } 1524 }
1514 else 1525 else
1515 { 1526 {
1516 XEvent unused_event; 1527 XEvent unused_event;
… …
1663 1674
1664 if (ev.type == KeyPress && hidden_pointer == 0) 1675 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank (); 1676 pointer_blank ();
1666 } 1677 }
1667#endif 1678#endif
1679
1680 refresh_check ();
1668} 1681}
1669 1682
1670void 1683void
1671rxvt_term::focus_in () 1684rxvt_term::focus_in ()
1672{ 1685{
… …
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 { 1796 {
1784 bgPixmap.set_root_pixmap (); 1797 bgPixmap.set_root_pixmap ();
1785 update_background (); 1798 update_background ();
1786 } 1799 }
1800
1787 break; 1801 break;
1788 } 1802 }
1789# endif 1803# endif
1804
1805 refresh_check ();
1790} 1806}
1791#endif 1807#endif
1792 1808
1793void 1809void
1794rxvt_term::button_press (XButtonEvent &ev) 1810rxvt_term::button_press (XButtonEvent &ev)
… …
3375#if ENABLE_TRANSPARENCY 3391#if ENABLE_TRANSPARENCY
3376 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3377 process_color_seq (op, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3378 { 3394 {
3379 bool changed = false; 3395 bool changed = false;
3396
3380 if (ISSET_PIXCOLOR (Color_tint)) 3397 if (ISSET_PIXCOLOR (Color_tint))
3381 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3398 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3382 else 3399 else
3383 changed = bgPixmap.unset_tint (); 3400 changed = bgPixmap.unset_tint ();
3401
3384 if (changed) 3402 if (changed)
3385 update_background (); 3403 update_background ();
3386 } 3404 }
3387 3405
3388 break; 3406 break;
… …
3411 changed++; 3429 changed++;
3412 str = strchr (str, ';'); 3430 str = strchr (str, ';');
3413 if (str == NULL) 3431 if (str == NULL)
3414 bgPixmap.set_defaultGeometry (); 3432 bgPixmap.set_defaultGeometry ();
3415 } 3433 }
3434
3416 while (str) 3435 while (str)
3417 { 3436 {
3418 str++; 3437 str++;
3419 if (bgPixmap.set_geometry (str)) 3438 if (bgPixmap.set_geometry (str))
3420 changed++; 3439 changed++;
3421 str = strchr (str, ';'); 3440 str = strchr (str, ';');
3422 } 3441 }
3442
3423 if (changed) 3443 if (changed)
3424 update_background (); 3444 update_background ();
3425 } 3445 }
3426 break; 3446 break;
3427#endif 3447#endif
3428 3448
3429 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:

Diff Legend

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