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.319 by ayin, Fri Feb 16 21:46:05 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
… …
1458 break; 1458 break;
1459 } 1459 }
1460 break; 1460 break;
1461 1461
1462 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1464 focus_in (); 1466 focus_in ();
1465 break; 1467 break;
1466 1468
1467 case FocusOut: 1469 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer) 1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1469 focus_out (); 1473 focus_out ();
1470 break; 1474 break;
1471 1475
1472 case ConfigureNotify: 1476 case ConfigureNotify:
1473 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
… …
1482 } 1486 }
1483 1487
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485 1489
1486#ifdef TRANSPARENT 1490#ifdef TRANSPARENT
1487 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1488 check_our_parents (); 1492 check_our_parents ();
1489#endif 1493#endif
1490 } 1494 }
1491 break; 1495 break;
1492 1496
… …
1681 } 1685 }
1682 break; 1686 break;
1683 } 1687 }
1684 1688
1685#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1687 { 1691 {
1688 if (hidden_cursor) 1692 if (hidden_cursor)
1689 { 1693 {
1690 hidden_cursor = 0; 1694 hidden_cursor = 0;
1691 want_refresh = 1; 1695 want_refresh = 1;
… …
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 } 1699 }
1696#endif 1700#endif
1697 1701
1698#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 { 1704 {
1701 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1704 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1726 IMSetPosition (); 1730 IMSetPosition ();
1727 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1728 } 1732 }
1729#endif 1733#endif
1730#if CURSOR_BLINK 1734#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif 1737#endif
1734#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1736 { 1740 {
… …
1763#if USE_XIM 1767#if USE_XIM
1764 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1766#endif 1770#endif
1767#if CURSOR_BLINK 1771#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1770 hidden_cursor = 0; 1774 hidden_cursor = 0;
1771#endif 1775#endif
1772#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
… …
1814 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1815 return; 1819 return;
1816 1820
1817 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1818 case ReparentNotify: 1822 case ReparentNotify:
1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1820 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1821 break; 1825 break;
1822 } 1826 }
1823# endif 1827# endif
1824} 1828}
… …
2170 2174
2171 v = ev.button == Button4 ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2172 2176
2173 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
2174 i = 1; 2178 i = 1;
2175 else if (OPTION (Opt_mouseWheelScrollPage)) 2179 else if (option (Opt_mouseWheelScrollPage))
2176 i = nrow - 1; 2180 i = nrow - 1;
2177 else 2181 else
2178 i = 5; 2182 i = 5;
2179 2183
2180# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
… …
2451 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2452 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2453 2457
2454 pchanged = 0; 2458 pchanged = 0;
2455 2459
2456 if (!OPTION (Opt_transparent)) 2460 if (!option (Opt_transparent))
2457 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2458 2462
2459 XGetWindowAttributes (dpy, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2461 2465
… …
2731 if (ch == C0_LF) 2735 if (ch == C0_LF)
2732 nlines++; 2736 nlines++;
2733 2737
2734 refresh_count++; 2738 refresh_count++;
2735 2739
2736 if (!OPTION (Opt_jumpScroll) 2740 if (!option (Opt_jumpScroll)
2737 || (refresh_count >= refresh_limit * (nrow - 1))) 2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2738 { 2742 {
2739 refreshnow = true; 2743 refreshnow = true;
2740 refresh_count = 0; 2744 refresh_count = 0;
2741 ch = NOCHAR; 2745 ch = NOCHAR;
… …
2781 * the number of pages between refreshes is refresh_limit, which 2785 * the number of pages between refreshes is refresh_limit, which
2782 * is incremented here because we must be doing flat-out scrolling. 2786 * is incremented here because we must be doing flat-out scrolling.
2783 */ 2787 */
2784 if (refreshnow) 2788 if (refreshnow)
2785 { 2789 {
2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2787 refresh_limit++; 2791 refresh_limit++;
2788 else 2792 else
2789 { 2793 {
2790 flag = true; 2794 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here 2795 //TODO: due to popular request, implement "skipscroll" option here
… …
3457 break; 3461 break;
3458 case 6: /* CPR requested */ 3462 case 6: /* CPR requested */
3459 scr_report_position (); 3463 scr_report_position ();
3460 break; 3464 break;
3461 case 7: /* unofficial extension */ 3465 case 7: /* unofficial extension */
3462 if (OPTION (Opt_insecure)) 3466 if (option (Opt_insecure))
3463 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3467 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3464 break; 3468 break;
3465 case 8: /* unofficial extension */ 3469 case 8: /* unofficial extension */
3466 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3467 break; 3471 break;
… …
3631 break; 3635 break;
3632 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3633 { 3637 {
3634 char *s; 3638 char *s;
3635 XGetIconName (dpy, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3636 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 */
3637 XFree (s); 3641 XFree (s);
3638 } 3642 }
3639 break; 3643 break;
3640 case 21: /* report window title */ 3644 case 21: /* report window title */
3641 { 3645 {
3642 char *s; 3646 char *s;
3643 XFetchName (dpy, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3644 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 */
3645 XFree (s); 3649 XFree (s);
3646 } 3650 }
3647 break; 3651 break;
3648 } 3652 }
3649} 3653}
… …
3957 case URxvt_italicFont: 3961 case URxvt_italicFont:
3958 case URxvt_boldItalicFont: 3962 case URxvt_boldItalicFont:
3959#endif 3963#endif
3960 if (query) 3964 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", saveop, 3965 tt_printf ("\33]%d;%-.250s%c", saveop,
3962 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3966 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3963 ? fontset[op - URxvt_font]->fontdesc : "", 3967 ? fontset[op - URxvt_font]->fontdesc : "",
3964 resp); 3968 resp);
3965 else 3969 else
3966 { 3970 {
3967 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3971 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3981 break; 3985 break;
3982 3986
3983#if !ENABLE_MINIMAL 3987#if !ENABLE_MINIMAL
3984 case URxvt_locale: 3988 case URxvt_locale:
3985 if (query) 3989 if (query)
3986 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);
3987 else 3991 else
3988 { 3992 {
3989 set_locale (str); 3993 set_locale (str);
3990 pty->set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3991 init_xlocale (); 3995 init_xlocale ();
… …
4132 scr_touch (true); 4136 scr_touch (true);
4133 break; 4137 break;
4134#endif 4138#endif
4135 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
4136 case 1049: 4140 case 1049:
4137 if (OPTION (Opt_secondaryScreen)) 4141 if (option (Opt_secondaryScreen))
4138 if (mode == 0) 4142 if (mode == 0)
4139 scr_cursor (RESTORE); 4143 scr_cursor (RESTORE);
4140 else if (mode == 1) 4144 else if (mode == 1)
4141 scr_cursor (SAVE); 4145 scr_cursor (SAVE);
4142 break; 4146 break;
… …
4207 break; 4211 break;
4208 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4209 set_option (Opt_scrollTtyKeypress, state); 4213 set_option (Opt_scrollTtyKeypress, state);
4210 break; 4214 break;
4211 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4212 if (OPTION (Opt_secondaryScreen)) 4216 if (option (Opt_secondaryScreen))
4213 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4214 scr_erase_screen (2); 4218 scr_erase_screen (2);
4215 scr_change_screen (state); 4219 scr_change_screen (state);
4216 break; 4220 break;
4217 case 1049: /* secondary screen w/ clearing first */ 4221 case 1049: /* secondary screen w/ clearing first */
4218 scr_change_screen (state); 4222 scr_change_screen (state);
4219 if (OPTION (Opt_secondaryScreen)) 4223 if (option (Opt_secondaryScreen))
4220 if (current_screen != PRIMARY) 4224 if (current_screen != PRIMARY)
4221 scr_erase_screen (2); 4225 scr_erase_screen (2);
4222 break; 4226 break;
4223 default: 4227 default:
4224 break; 4228 break;

Diff Legend

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