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.309 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.323 by ayin, Mon May 28 18:38:03 2007 UTC

… …
497 { 497 {
498 commit_iso14755 (); 498 commit_iso14755 ();
499 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
500# if ISO_14755 500# if ISO_14755
501 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
502# endif 510# endif
503 return; 511 return;
504 } 512 }
505 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
506 { 514 {
… …
877 return; 885 return;
878 886
879 if (len <= 0) 887 if (len <= 0)
880 return; /* not mapped */ 888 return; /* not mapped */
881 889
882 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 891 if (view_start)
884 { 892 {
885 view_start = 0; 893 view_start = 0;
886 want_refresh = 1; 894 want_refresh = 1;
887 } 895 }
… …
1232 } 1240 }
1233 else 1241 else
1234 { 1242 {
1235 pty_ev.stop (); 1243 pty_ev.stop ();
1236 1244
1237 if (!OPTION (Opt_hold)) 1245 if (!option (Opt_hold))
1238 destroy (); 1246 destroy ();
1239 } 1247 }
1240 1248
1241 return false; 1249 return false;
1242} 1250}
… …
1263 recolour_cursor (); 1271 recolour_cursor ();
1264 1272
1265#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1274 hidden_pointer = 0;
1267 1275
1268 if (OPTION (Opt_pointerBlank)) 1276 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1277 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif 1278#endif
1271} 1279}
1272 1280
1273#ifdef POINTER_BLANK 1281#ifdef POINTER_BLANK
1274void 1282void
1275rxvt_term::pointer_blank () 1283rxvt_term::pointer_blank ()
1276{ 1284{
1277 if (!OPTION (Opt_pointerBlank)) 1285 if (!option (Opt_pointerBlank))
1278 return; 1286 return;
1279 1287
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1288 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1289 XFlush (dpy);
1282 1290
… …
1458 break; 1466 break;
1459 } 1467 }
1460 break; 1468 break;
1461 1469
1462 case FocusIn: 1470 case FocusIn:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1474 focus_in ();
1464 break; 1475 break;
1465 1476
1466 case FocusOut: 1477 case FocusOut:
1478 if (ev.xfocus.detail != NotifyInferior
1479 && ev.xfocus.detail != NotifyPointer
1480 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1481 focus_out ();
1468 break; 1482 break;
1469 1483
1470 case ConfigureNotify: 1484 case ConfigureNotify:
1471 if (ev.xconfigure.window == parent[0]) 1485 if (ev.xconfigure.window == parent[0])
1472 { 1486 {
… …
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1494 }
1481 1495
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 1497
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498#ifdef TRANSPARENT
1485 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1486 check_our_parents (); 1500 check_our_parents ();
1487#endif 1501#endif
1488 } 1502 }
1489 break; 1503 break;
1490 1504
… …
1679 } 1693 }
1680 break; 1694 break;
1681 } 1695 }
1682 1696
1683#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1699 {
1686 if (hidden_cursor) 1700 if (hidden_cursor)
1687 { 1701 {
1688 hidden_cursor = 0; 1702 hidden_cursor = 0;
1689 want_refresh = 1; 1703 want_refresh = 1;
… …
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 } 1707 }
1694#endif 1708#endif
1695 1709
1696#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1712 {
1699 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1716 if (hidden_pointer)
… …
1724 IMSetPosition (); 1738 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1726 } 1740 }
1727#endif 1741#endif
1728#if CURSOR_BLINK 1742#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif 1745#endif
1732#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1734 { 1748 {
1735 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1750 scr_recolour ();
1751 }
1752#endif
1753#if ENABLE_FRILLS
1754 if (option (Opt_urgentOnBell))
1755 {
1756 XWMHints *h;
1757
1758 h = XGetWMHints(dpy, parent[0]);
1759 if (h != NULL)
1760 {
1761 h->flags &= ~XUrgencyHint;
1762 XSetWMHints(dpy, parent[0], h);
1763 }
1737 } 1764 }
1738#endif 1765#endif
1739 } 1766 }
1740} 1767}
1741 1768
… …
1761#if USE_XIM 1788#if USE_XIM
1762 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1764#endif 1791#endif
1765#if CURSOR_BLINK 1792#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1768 hidden_cursor = 0; 1795 hidden_cursor = 0;
1769#endif 1796#endif
1770#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1775 } 1802 }
1776#endif 1803#endif
1777 } 1804 }
1778} 1805}
1779 1806
1780#if TRANSPARENT 1807void
1808rxvt_term::update_fade_color (unsigned int idx)
1809{
1810#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade])
1812 {
1813 rgba c;
1814 pix_colors [Color_fade].get (c);
1815 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1816 }
1817#endif
1818}
1819
1820#if TRANSPARENT || ENABLE_PERL
1781void 1821void
1782rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1823{
1784 make_current (); 1824 make_current ();
1785 1825
1826 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1827 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1828 return;
1829
1830# if TRANSPARENT
1786 switch (ev.type) 1831 switch (ev.type)
1787 { 1832 {
1788 case PropertyNotify: 1833 case PropertyNotify:
1789 /* 1834 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1835 * if user used some Esetroot compatible prog to set the root bg,
… …
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1795 return; 1840 return;
1796 1841
1797 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1798 case ReparentNotify: 1843 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1801 break; 1846 break;
1802 } 1847 }
1848# endif
1803} 1849}
1804#endif 1850#endif
1805 1851
1806void 1852void
1807rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
… …
2135 selection_make (ev.time); 2181 selection_make (ev.time);
2136 break; 2182 break;
2137 2183
2138 case Button2: 2184 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2185 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); 2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2187 break;
2142 2188
2143#ifdef MOUSE_WHEEL 2189#ifdef MOUSE_WHEEL
2144 case Button4: 2190 case Button4:
2145 case Button5: 2191 case Button5:
… …
2149 2195
2150 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2151 2197
2152 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2153 i = 1; 2199 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2201 i = nrow - 1;
2156 else 2202 else
2157 i = 5; 2203 i = 5;
2158 2204
2159# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2430 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2432 2478
2433 pchanged = 0; 2479 pchanged = 0;
2434 2480
2435 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2436 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2437 2483
2438 XGetWindowAttributes (dpy, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2440 2486
… …
2710 if (ch == C0_LF) 2756 if (ch == C0_LF)
2711 nlines++; 2757 nlines++;
2712 2758
2713 refresh_count++; 2759 refresh_count++;
2714 2760
2715 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2716 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2763 {
2718 refreshnow = true; 2764 refreshnow = true;
2719 refresh_count = 0; 2765 refresh_count = 0;
2720 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2760 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2761 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2808 */
2763 if (refreshnow) 2809 if (refreshnow)
2764 { 2810 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++; 2812 refresh_limit++;
2767 else 2813 else
2768 { 2814 {
2769 flag = true; 2815 flag = true;
2816 //TODO: due to popular request, implement "skipscroll" option here
2770 scr_refresh (); 2817 scr_refresh ();
2771 want_refresh = 1; 2818 want_refresh = 1;
2772 } 2819 }
2773 } 2820 }
2774 2821
… …
3435 break; 3482 break;
3436 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3437 scr_report_position (); 3484 scr_report_position ();
3438 break; 3485 break;
3439 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3440 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3441 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3442 break; 3489 break;
3443 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3445 break; 3492 break;
… …
3609 break; 3656 break;
3610 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3611 { 3658 {
3612 char *s; 3659 char *s;
3613 XGetIconName (dpy, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3661 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3615 XFree (s); 3662 XFree (s);
3616 } 3663 }
3617 break; 3664 break;
3618 case 21: /* report window title */ 3665 case 21: /* report window title */
3619 { 3666 {
3620 char *s; 3667 char *s;
3621 XFetchName (dpy, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3669 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3623 XFree (s); 3670 XFree (s);
3624 } 3671 }
3625 break; 3672 break;
3626 } 3673 }
3627} 3674}
… …
3654 seen_esc = true; 3701 seen_esc = true;
3655 continue; 3702 continue;
3656 } 3703 }
3657 else if (ch == C0_BEL || ch == CHAR_ST) 3704 else if (ch == C0_BEL || ch == CHAR_ST)
3658 break; 3705 break;
3706 else if (ch == C0_SYN)
3707 ch = cmd_get8 ();
3659 else if (ch < 0x20) 3708 else if (ch < 0x20)
3660 return NULL; /* other control character - exit */ 3709 return NULL; /* other control character - exit */
3661 3710
3662 seen_esc = false; 3711 seen_esc = false;
3663 3712
3664 if (n >= STRING_MAX - 1) 3713 if (n >= STRING_MAX - 1)
3665 // stop at some sane length 3714 // stop at some sane length
3666 return NULL; 3715 return NULL;
3667 3716
3668 if (ch == C0_SYN)
3669 string[n++] = cmd_get8 ();
3670 else
3671 string[n++] = ch; 3717 string[n++] = ch;
3672 } 3718 }
3673 3719
3674 string[n++] = '\0'; 3720 string[n++] = '\0';
3675 3721
3676 ends_how = (ch == 0x5c ? C0_ESC : ch); 3722 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3755 int saveop = op; 3801 int saveop = op;
3756 3802
3757 dLocal (Display *, dpy); 3803 dLocal (Display *, dpy);
3758 3804
3759 assert (str != NULL); 3805 assert (str != NULL);
3806
3807 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3808 return;
3809
3760 switch (op) 3810 switch (op)
3761 { 3811 {
3762 case XTerm_name: 3812 case XTerm_name:
3763 set_title (str); 3813 set_title (str);
3764 /* FALLTHROUGH */ 3814 /* FALLTHROUGH */
… …
3932 case URxvt_italicFont: 3982 case URxvt_italicFont:
3933 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3934#endif 3984#endif
3935 if (query) 3985 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp); 3989 resp);
3940 else 3990 else
3941 { 3991 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3956 break; 4006 break;
3957 4007
3958#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL
3959 case URxvt_locale: 4009 case URxvt_locale:
3960 if (query) 4010 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4011 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3962 else 4012 else
3963 { 4013 {
3964 set_locale (str); 4014 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 4016 init_xlocale ();
… …
3981 break; 4031 break;
3982#endif 4032#endif
3983 4033
3984#if ENABLE_PERL 4034#if ENABLE_PERL
3985 case URxvt_perl: 4035 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3987 ; // no responses yet 4037 ; // no responses yet
3988 break; 4038 break;
3989#endif 4039#endif
3990 } 4040 }
3991} 4041}
… …
4107 scr_touch (true); 4157 scr_touch (true);
4108 break; 4158 break;
4109#endif 4159#endif
4110 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4111 case 1049: 4161 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 4163 if (mode == 0)
4114 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4115 else if (mode == 1) 4165 else if (mode == 1)
4116 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4117 break; 4167 break;
… …
4182 break; 4232 break;
4183 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4185 break; 4235 break;
4186 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4189 scr_erase_screen (2); 4239 scr_erase_screen (2);
4190 scr_change_screen (state); 4240 scr_change_screen (state);
4191 break; 4241 break;
4192 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4193 scr_change_screen (state); 4243 scr_change_screen (state);
4194 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 4246 scr_erase_screen (2);
4197 break; 4247 break;
4198 default: 4248 default:
4199 break; 4249 break;

Diff Legend

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