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.320 by root, Mon Apr 30 15:07:09 2007 UTC vs.
Revision 1.321 by root, Tue May 1 21:30:01 2007 UTC

… …
877 return; 877 return;
878 878
879 if (len <= 0) 879 if (len <= 0)
880 return; /* not mapped */ 880 return; /* not mapped */
881 881
882 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 883 if (view_start)
884 { 884 {
885 view_start = 0; 885 view_start = 0;
886 want_refresh = 1; 886 want_refresh = 1;
887 } 887 }
… …
1232 } 1232 }
1233 else 1233 else
1234 { 1234 {
1235 pty_ev.stop (); 1235 pty_ev.stop ();
1236 1236
1237 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1238 destroy (); 1238 destroy ();
1239 } 1239 }
1240 1240
1241 return false; 1241 return false;
1242} 1242}
… …
1263 recolour_cursor (); 1263 recolour_cursor ();
1264 1264
1265#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1266 hidden_pointer = 0;
1267 1267
1268 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif 1270#endif
1271} 1271}
1272 1272
1273#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1274void 1274void
1275rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1276{ 1276{
1277 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1278 return; 1278 return;
1279 1279
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1281 XFlush (dpy);
1282 1282
… …
1486 } 1486 }
1487 1487
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489 1489
1490#ifdef TRANSPARENT 1490#ifdef TRANSPARENT
1491 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1492 check_our_parents (); 1492 check_our_parents ();
1493#endif 1493#endif
1494 } 1494 }
1495 break; 1495 break;
1496 1496
… …
1685 } 1685 }
1686 break; 1686 break;
1687 } 1687 }
1688 1688
1689#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 { 1691 {
1692 if (hidden_cursor) 1692 if (hidden_cursor)
1693 { 1693 {
1694 hidden_cursor = 0; 1694 hidden_cursor = 0;
1695 want_refresh = 1; 1695 want_refresh = 1;
… …
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 } 1699 }
1700#endif 1700#endif
1701 1701
1702#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1704 {
1705 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1730 IMSetPosition (); 1730 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1732 } 1732 }
1733#endif 1733#endif
1734#if CURSOR_BLINK 1734#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif 1737#endif
1738#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1740 { 1740 {
… …
1767#if USE_XIM 1767#if USE_XIM
1768 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1770#endif 1770#endif
1771#if CURSOR_BLINK 1771#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1774 hidden_cursor = 0; 1774 hidden_cursor = 0;
1775#endif 1775#endif
1776#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
… …
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1819 return; 1819 return;
1820 1820
1821 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1822 case ReparentNotify: 1822 case ReparentNotify:
1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1824 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1825 break; 1825 break;
1826 } 1826 }
1827# endif 1827# endif
1828} 1828}
… …
2174 2174
2175 v = ev.button == Button4 ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2176 2176
2177 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
2178 i = 1; 2178 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2179 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2180 i = nrow - 1;
2181 else 2181 else
2182 i = 5; 2182 i = 5;
2183 2183
2184# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
… …
2455 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2457 2457
2458 pchanged = 0; 2458 pchanged = 0;
2459 2459
2460 if (!OPTION (Opt_transparent)) 2460 if (!option (Opt_transparent))
2461 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2462 2462
2463 XGetWindowAttributes (dpy, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2465 2465
… …
2735 if (ch == C0_LF) 2735 if (ch == C0_LF)
2736 nlines++; 2736 nlines++;
2737 2737
2738 refresh_count++; 2738 refresh_count++;
2739 2739
2740 if (!OPTION (Opt_jumpScroll) 2740 if (!option (Opt_jumpScroll)
2741 || (refresh_count >= refresh_limit * (nrow - 1))) 2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2742 { 2742 {
2743 refreshnow = true; 2743 refreshnow = true;
2744 refresh_count = 0; 2744 refresh_count = 0;
2745 ch = NOCHAR; 2745 ch = NOCHAR;
… …
2785 * the number of pages between refreshes is refresh_limit, which 2785 * the number of pages between refreshes is refresh_limit, which
2786 * is incremented here because we must be doing flat-out scrolling. 2786 * is incremented here because we must be doing flat-out scrolling.
2787 */ 2787 */
2788 if (refreshnow) 2788 if (refreshnow)
2789 { 2789 {
2790 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2791 refresh_limit++; 2791 refresh_limit++;
2792 else 2792 else
2793 { 2793 {
2794 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here 2795 //TODO: due to popular request, implement "skipscroll" option here
… …
3461 break; 3461 break;
3462 case 6: /* CPR requested */ 3462 case 6: /* CPR requested */
3463 scr_report_position (); 3463 scr_report_position ();
3464 break; 3464 break;
3465 case 7: /* unofficial extension */ 3465 case 7: /* unofficial extension */
3466 if (OPTION (Opt_insecure)) 3466 if (option (Opt_insecure))
3467 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3467 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3468 break; 3468 break;
3469 case 8: /* unofficial extension */ 3469 case 8: /* unofficial extension */
3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3471 break; 3471 break;
… …
3635 break; 3635 break;
3636 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3637 { 3637 {
3638 char *s; 3638 char *s;
3639 XGetIconName (dpy, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3640 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3641 XFree (s); 3641 XFree (s);
3642 } 3642 }
3643 break; 3643 break;
3644 case 21: /* report window title */ 3644 case 21: /* report window title */
3645 { 3645 {
3646 char *s; 3646 char *s;
3647 XFetchName (dpy, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3648 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3649 XFree (s); 3649 XFree (s);
3650 } 3650 }
3651 break; 3651 break;
3652 } 3652 }
3653} 3653}
… …
3961 case URxvt_italicFont: 3961 case URxvt_italicFont:
3962 case URxvt_boldItalicFont: 3962 case URxvt_boldItalicFont:
3963#endif 3963#endif
3964 if (query) 3964 if (query)
3965 tt_printf ("\33]%d;%-.250s%c", saveop, 3965 tt_printf ("\33]%d;%-.250s%c", saveop,
3966 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3966 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3967 ? fontset[op - URxvt_font]->fontdesc : "", 3967 ? fontset[op - URxvt_font]->fontdesc : "",
3968 resp); 3968 resp);
3969 else 3969 else
3970 { 3970 {
3971 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3971 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3985 break; 3985 break;
3986 3986
3987#if !ENABLE_MINIMAL 3987#if !ENABLE_MINIMAL
3988 case URxvt_locale: 3988 case URxvt_locale:
3989 if (query) 3989 if (query)
3990 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3991 else 3991 else
3992 { 3992 {
3993 set_locale (str); 3993 set_locale (str);
3994 pty->set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3995 init_xlocale (); 3995 init_xlocale ();
… …
4136 scr_touch (true); 4136 scr_touch (true);
4137 break; 4137 break;
4138#endif 4138#endif
4139 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
4140 case 1049: 4140 case 1049:
4141 if (OPTION (Opt_secondaryScreen)) 4141 if (option (Opt_secondaryScreen))
4142 if (mode == 0) 4142 if (mode == 0)
4143 scr_cursor (RESTORE); 4143 scr_cursor (RESTORE);
4144 else if (mode == 1) 4144 else if (mode == 1)
4145 scr_cursor (SAVE); 4145 scr_cursor (SAVE);
4146 break; 4146 break;
… …
4211 break; 4211 break;
4212 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4213 set_option (Opt_scrollTtyKeypress, state); 4213 set_option (Opt_scrollTtyKeypress, state);
4214 break; 4214 break;
4215 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4216 if (OPTION (Opt_secondaryScreen)) 4216 if (option (Opt_secondaryScreen))
4217 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4218 scr_erase_screen (2); 4218 scr_erase_screen (2);
4219 scr_change_screen (state); 4219 scr_change_screen (state);
4220 break; 4220 break;
4221 case 1049: /* secondary screen w/ clearing first */ 4221 case 1049: /* secondary screen w/ clearing first */
4222 scr_change_screen (state); 4222 scr_change_screen (state);
4223 if (OPTION (Opt_secondaryScreen)) 4223 if (option (Opt_secondaryScreen))
4224 if (current_screen != PRIMARY) 4224 if (current_screen != PRIMARY)
4225 scr_erase_screen (2); 4225 scr_erase_screen (2);
4226 break; 4226 break;
4227 default: 4227 default:
4228 break; 4228 break;

Diff Legend

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