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.311 by root, Sat Mar 4 20:14:35 2006 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
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1466 focus_in ();
1464 break; 1467 break;
1465 1468
1466 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1473 focus_out ();
1468 break; 1474 break;
1469 1475
1470 case ConfigureNotify: 1476 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1472 { 1478 {
… …
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1486 }
1481 1487
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 1489
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1485 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1486 check_our_parents (); 1492 check_our_parents ();
1487#endif 1493#endif
1488 } 1494 }
1489 break; 1495 break;
1490 1496
… …
1679 } 1685 }
1680 break; 1686 break;
1681 } 1687 }
1682 1688
1683#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1691 {
1686 if (hidden_cursor) 1692 if (hidden_cursor)
1687 { 1693 {
1688 hidden_cursor = 0; 1694 hidden_cursor = 0;
1689 want_refresh = 1; 1695 want_refresh = 1;
… …
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 } 1699 }
1694#endif 1700#endif
1695 1701
1696#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1704 {
1699 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1708 if (hidden_pointer)
… …
1724 IMSetPosition (); 1730 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1726 } 1732 }
1727#endif 1733#endif
1728#if CURSOR_BLINK 1734#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif 1737#endif
1732#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1734 { 1740 {
… …
1761#if USE_XIM 1767#if USE_XIM
1762 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1764#endif 1770#endif
1765#if CURSOR_BLINK 1771#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1768 hidden_cursor = 0; 1774 hidden_cursor = 0;
1769#endif 1775#endif
1770#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
… …
1775 } 1781 }
1776#endif 1782#endif
1777 } 1783 }
1778} 1784}
1779 1785
1780#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1781void 1800void
1782rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1802{
1784 make_current (); 1803 make_current ();
1785 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1786 switch (ev.type) 1810 switch (ev.type)
1787 { 1811 {
1788 case PropertyNotify: 1812 case PropertyNotify:
1789 /* 1813 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1795 return; 1819 return;
1796 1820
1797 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1798 case ReparentNotify: 1822 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1801 break; 1825 break;
1802 } 1826 }
1827# endif
1803} 1828}
1804#endif 1829#endif
1805 1830
1806void 1831void
1807rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
2135 selection_make (ev.time); 2160 selection_make (ev.time);
2136 break; 2161 break;
2137 2162
2138 case Button2: 2163 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2166 break;
2142 2167
2143#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2144 case Button4: 2169 case Button4:
2145 case Button5: 2170 case Button5:
… …
2149 2174
2150 v = ev.button == Button4 ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2151 2176
2152 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
2153 i = 1; 2178 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2179 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2180 i = nrow - 1;
2156 else 2181 else
2157 i = 5; 2182 i = 5;
2158 2183
2159# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
… …
2430 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2432 2457
2433 pchanged = 0; 2458 pchanged = 0;
2434 2459
2435 if (!OPTION (Opt_transparent)) 2460 if (!option (Opt_transparent))
2436 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2437 2462
2438 XGetWindowAttributes (dpy, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2440 2465
… …
2710 if (ch == C0_LF) 2735 if (ch == C0_LF)
2711 nlines++; 2736 nlines++;
2712 2737
2713 refresh_count++; 2738 refresh_count++;
2714 2739
2715 if (!OPTION (Opt_jumpScroll) 2740 if (!option (Opt_jumpScroll)
2716 || (refresh_count >= refresh_limit * (nrow - 1))) 2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2742 {
2718 refreshnow = true; 2743 refreshnow = true;
2719 refresh_count = 0; 2744 refresh_count = 0;
2720 ch = NOCHAR; 2745 ch = NOCHAR;
… …
2760 * the number of pages between refreshes is refresh_limit, which 2785 * the number of pages between refreshes is refresh_limit, which
2761 * is incremented here because we must be doing flat-out scrolling. 2786 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2787 */
2763 if (refreshnow) 2788 if (refreshnow)
2764 { 2789 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++; 2791 refresh_limit++;
2767 else 2792 else
2768 { 2793 {
2769 flag = true; 2794 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here 2795 //TODO: due to popular request, implement "skipscroll" option here
… …
3436 break; 3461 break;
3437 case 6: /* CPR requested */ 3462 case 6: /* CPR requested */
3438 scr_report_position (); 3463 scr_report_position ();
3439 break; 3464 break;
3440 case 7: /* unofficial extension */ 3465 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 3466 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3467 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 3468 break;
3444 case 8: /* unofficial extension */ 3469 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 3471 break;
… …
3610 break; 3635 break;
3611 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3612 { 3637 {
3613 char *s; 3638 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3615 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 */
3616 XFree (s); 3641 XFree (s);
3617 } 3642 }
3618 break; 3643 break;
3619 case 21: /* report window title */ 3644 case 21: /* report window title */
3620 { 3645 {
3621 char *s; 3646 char *s;
3622 XFetchName (dpy, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3623 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 */
3624 XFree (s); 3649 XFree (s);
3625 } 3650 }
3626 break; 3651 break;
3627 } 3652 }
3628} 3653}
… …
3655 seen_esc = true; 3680 seen_esc = true;
3656 continue; 3681 continue;
3657 } 3682 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3687 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3662 3689
3663 seen_esc = false; 3690 seen_esc = false;
3664 3691
3665 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3666 // stop at some sane length 3693 // stop at some sane length
3667 return NULL; 3694 return NULL;
3668 3695
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3696 string[n++] = ch;
3673 } 3697 }
3674 3698
3675 string[n++] = '\0'; 3699 string[n++] = '\0';
3676 3700
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3758 dLocal (Display *, dpy); 3782 dLocal (Display *, dpy);
3759 3783
3760 assert (str != NULL); 3784 assert (str != NULL);
3761 3785
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 ; // no responses yet 3787 return;
3764 3788
3765 switch (op) 3789 switch (op)
3766 { 3790 {
3767 case XTerm_name: 3791 case XTerm_name:
3768 set_title (str); 3792 set_title (str);
… …
3937 case URxvt_italicFont: 3961 case URxvt_italicFont:
3938 case URxvt_boldItalicFont: 3962 case URxvt_boldItalicFont:
3939#endif 3963#endif
3940 if (query) 3964 if (query)
3941 tt_printf ("\33]%d;%-.250s%c", saveop, 3965 tt_printf ("\33]%d;%-.250s%c", saveop,
3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3966 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3943 ? fontset[op - URxvt_font]->fontdesc : "", 3967 ? fontset[op - URxvt_font]->fontdesc : "",
3944 resp); 3968 resp);
3945 else 3969 else
3946 { 3970 {
3947 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3971 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3961 break; 3985 break;
3962 3986
3963#if !ENABLE_MINIMAL 3987#if !ENABLE_MINIMAL
3964 case URxvt_locale: 3988 case URxvt_locale:
3965 if (query) 3989 if (query)
3966 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);
3967 else 3991 else
3968 { 3992 {
3969 set_locale (str); 3993 set_locale (str);
3970 pty->set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3971 init_xlocale (); 3995 init_xlocale ();
… …
4112 scr_touch (true); 4136 scr_touch (true);
4113 break; 4137 break;
4114#endif 4138#endif
4115 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
4116 case 1049: 4140 case 1049:
4117 if (OPTION (Opt_secondaryScreen)) 4141 if (option (Opt_secondaryScreen))
4118 if (mode == 0) 4142 if (mode == 0)
4119 scr_cursor (RESTORE); 4143 scr_cursor (RESTORE);
4120 else if (mode == 1) 4144 else if (mode == 1)
4121 scr_cursor (SAVE); 4145 scr_cursor (SAVE);
4122 break; 4146 break;
… …
4187 break; 4211 break;
4188 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4189 set_option (Opt_scrollTtyKeypress, state); 4213 set_option (Opt_scrollTtyKeypress, state);
4190 break; 4214 break;
4191 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4192 if (OPTION (Opt_secondaryScreen)) 4216 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4194 scr_erase_screen (2); 4218 scr_erase_screen (2);
4195 scr_change_screen (state); 4219 scr_change_screen (state);
4196 break; 4220 break;
4197 case 1049: /* secondary screen w/ clearing first */ 4221 case 1049: /* secondary screen w/ clearing first */
4198 scr_change_screen (state); 4222 scr_change_screen (state);
4199 if (OPTION (Opt_secondaryScreen)) 4223 if (option (Opt_secondaryScreen))
4200 if (current_screen != PRIMARY) 4224 if (current_screen != PRIMARY)
4201 scr_erase_screen (2); 4225 scr_erase_screen (2);
4202 break; 4226 break;
4203 default: 4227 default:
4204 break; 4228 break;

Diff Legend

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