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.505 by sf-exg, Thu Jan 19 13:33:43 2012 UTC vs.
Revision 1.509 by sf-exg, Thu May 17 10:18:32 2012 UTC

1016 flush (); 1016 flush ();
1017} 1017}
1018 1018
1019#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void 1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1035void
1021rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1022{ 1037{
1023 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1024 want_refresh = 1; 1039 want_refresh = 1;
1025 refresh_check (); 1040 refresh_check ();
1676 } 1691 }
1677 break; 1692 break;
1678 } 1693 }
1679 1694
1680#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1681 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1682 {
1683 if (hidden_cursor)
1684 {
1685 hidden_cursor = 0;
1686 want_refresh = 1;
1687 }
1688
1689 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1690 }
1691#endif 1698#endif
1692 1699
1693#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1694 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1702 {
3446 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3447 { 3454 {
3448 char str[256]; 3455 char str[256];
3449 3456
3450 sprintf (str, "[%dx%d+%d+%d]", 3457 sprintf (str, "[%dx%d+%d+%d]",
3451 min (h_scale, 32767), min (v_scale, 32767), 3458 min (bg_image.h_scale, 32767), min (bg_image.v_scale, 32767),
3452 min (h_align, 32767), min (v_align, 32767)); 3459 min (bg_image.h_align, 32767), min (bg_image.v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3454 } 3461 }
3455 else 3462 else
3456 { 3463 {
3457 bool changed = false; 3464 bool changed = false;
3458 3465
3459 if (*str != ';') 3466 if (*str != ';')
3460 { 3467 {
3461 if (bg_set_file (str)) /* change pixmap */ 3468 if (bg_image.set_file (str)) /* change pixmap */
3462 changed = true; 3469 changed = true;
3463 } 3470 }
3464 else 3471 else
3465 { 3472 {
3466 str++; 3473 str++;
3467 if (bg_set_geometry (str, true)) 3474 if (bg_image.set_geometry (str, true))
3468 changed = true; 3475 changed = true;
3469 } 3476 }
3470 3477
3471 if (changed) 3478 if (changed)
3472 { 3479 {
3579{ 3586{
3580 int state; 3587 int state;
3581 3588
3582 if (mode == 's') 3589 if (mode == 's')
3583 { 3590 {
3584 SavedModes |= (priv_modes & bit); 3591 if (priv_modes & bit)
3592 SavedModes |= bit;
3593 else
3594 SavedModes &= ~bit;
3585 return -1; 3595 return -1;
3586 } 3596 }
3587 else 3597 else
3588 { 3598 {
3589 if (mode == 'r') 3599 if (mode == 'r')

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines