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.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
… …
1486 } 1494 }
1487 1495
1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489 1497
1490#ifdef TRANSPARENT 1498#ifdef TRANSPARENT
1491 if (OPTION (Opt_transparent)) 1499 if (option (Opt_transparent))
1492 check_our_parents (); 1500 check_our_parents ();
1493#endif 1501#endif
1494 } 1502 }
1495 break; 1503 break;
1496 1504
… …
1685 } 1693 }
1686 break; 1694 break;
1687 } 1695 }
1688 1696
1689#if defined(CURSOR_BLINK) 1697#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1698 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 { 1699 {
1692 if (hidden_cursor) 1700 if (hidden_cursor)
1693 { 1701 {
1694 hidden_cursor = 0; 1702 hidden_cursor = 0;
1695 want_refresh = 1; 1703 want_refresh = 1;
… …
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 } 1707 }
1700#endif 1708#endif
1701 1709
1702#if defined(POINTER_BLANK) 1710#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1711 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1712 {
1705 if (ev.type == MotionNotify 1713 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress 1714 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease) 1715 || ev.type == ButtonRelease)
1708 if (hidden_pointer) 1716 if (hidden_pointer)
… …
1730 IMSetPosition (); 1738 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1732 } 1740 }
1733#endif 1741#endif
1734#if CURSOR_BLINK 1742#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1744 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1737#endif 1745#endif
1738#if OFF_FOCUS_FADING 1746#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1747 if (rs[Rs_fade])
1740 { 1748 {
1741 pix_colors = pix_colors_focused; 1749 pix_colors = pix_colors_focused;
1742 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 }
1743 } 1764 }
1744#endif 1765#endif
1745 } 1766 }
1746} 1767}
1747 1768
… …
1767#if USE_XIM 1788#if USE_XIM
1768 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1770#endif 1791#endif
1771#if CURSOR_BLINK 1792#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1793 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1794 cursor_blink_ev.stop ();
1774 hidden_cursor = 0; 1795 hidden_cursor = 0;
1775#endif 1796#endif
1776#if OFF_FOCUS_FADING 1797#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1798 if (rs[Rs_fade])
… …
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1839 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1819 return; 1840 return;
1820 1841
1821 /* FALLTHROUGH */ 1842 /* FALLTHROUGH */
1822 case ReparentNotify: 1843 case ReparentNotify:
1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1844 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1824 want_refresh = want_full_refresh = 1; 1845 want_refresh = want_full_refresh = 1;
1825 break; 1846 break;
1826 } 1847 }
1827# endif 1848# endif
1828} 1849}
… …
2174 2195
2175 v = ev.button == Button4 ? UP : DN; 2196 v = ev.button == Button4 ? UP : DN;
2176 2197
2177 if (ev.state & ShiftMask) 2198 if (ev.state & ShiftMask)
2178 i = 1; 2199 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2200 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2201 i = nrow - 1;
2181 else 2202 else
2182 i = 5; 2203 i = 5;
2183 2204
2184# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
… …
2455 Pixmap rootpixmap = None; 2476 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr; 2477 XWindowAttributes wattr, wrootattr;
2457 2478
2458 pchanged = 0; 2479 pchanged = 0;
2459 2480
2460 if (!OPTION (Opt_transparent)) 2481 if (!option (Opt_transparent))
2461 return pchanged; /* Don't try any more */ 2482 return pchanged; /* Don't try any more */
2462 2483
2463 XGetWindowAttributes (dpy, display->root, &wrootattr); 2484 XGetWindowAttributes (dpy, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth; 2485 rootdepth = wrootattr.depth;
2465 2486
… …
2735 if (ch == C0_LF) 2756 if (ch == C0_LF)
2736 nlines++; 2757 nlines++;
2737 2758
2738 refresh_count++; 2759 refresh_count++;
2739 2760
2740 if (!OPTION (Opt_jumpScroll) 2761 if (!option (Opt_jumpScroll)
2741 || (refresh_count >= refresh_limit * (nrow - 1))) 2762 || (refresh_count >= refresh_limit * (nrow - 1)))
2742 { 2763 {
2743 refreshnow = true; 2764 refreshnow = true;
2744 refresh_count = 0; 2765 refresh_count = 0;
2745 ch = NOCHAR; 2766 ch = NOCHAR;
… …
2785 * the number of pages between refreshes is refresh_limit, which 2806 * the number of pages between refreshes is refresh_limit, which
2786 * is incremented here because we must be doing flat-out scrolling. 2807 * is incremented here because we must be doing flat-out scrolling.
2787 */ 2808 */
2788 if (refreshnow) 2809 if (refreshnow)
2789 { 2810 {
2790 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2811 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2791 refresh_limit++; 2812 refresh_limit++;
2792 else 2813 else
2793 { 2814 {
2794 flag = true; 2815 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here 2816 //TODO: due to popular request, implement "skipscroll" option here
… …
3461 break; 3482 break;
3462 case 6: /* CPR requested */ 3483 case 6: /* CPR requested */
3463 scr_report_position (); 3484 scr_report_position ();
3464 break; 3485 break;
3465 case 7: /* unofficial extension */ 3486 case 7: /* unofficial extension */
3466 if (OPTION (Opt_insecure)) 3487 if (option (Opt_insecure))
3467 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3488 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3468 break; 3489 break;
3469 case 8: /* unofficial extension */ 3490 case 8: /* unofficial extension */
3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3491 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3471 break; 3492 break;
… …
3635 break; 3656 break;
3636 case 20: /* report icon label */ 3657 case 20: /* report icon label */
3637 { 3658 {
3638 char *s; 3659 char *s;
3639 XGetIconName (dpy, parent[0], &s); 3660 XGetIconName (dpy, parent[0], &s);
3640 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 */
3641 XFree (s); 3662 XFree (s);
3642 } 3663 }
3643 break; 3664 break;
3644 case 21: /* report window title */ 3665 case 21: /* report window title */
3645 { 3666 {
3646 char *s; 3667 char *s;
3647 XFetchName (dpy, parent[0], &s); 3668 XFetchName (dpy, parent[0], &s);
3648 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 */
3649 XFree (s); 3670 XFree (s);
3650 } 3671 }
3651 break; 3672 break;
3652 } 3673 }
3653} 3674}
… …
3961 case URxvt_italicFont: 3982 case URxvt_italicFont:
3962 case URxvt_boldItalicFont: 3983 case URxvt_boldItalicFont:
3963#endif 3984#endif
3964 if (query) 3985 if (query)
3965 tt_printf ("\33]%d;%-.250s%c", saveop, 3986 tt_printf ("\33]%d;%-.250s%c", saveop,
3966 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3987 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3967 ? fontset[op - URxvt_font]->fontdesc : "", 3988 ? fontset[op - URxvt_font]->fontdesc : "",
3968 resp); 3989 resp);
3969 else 3990 else
3970 { 3991 {
3971 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3992 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3985 break; 4006 break;
3986 4007
3987#if !ENABLE_MINIMAL 4008#if !ENABLE_MINIMAL
3988 case URxvt_locale: 4009 case URxvt_locale:
3989 if (query) 4010 if (query)
3990 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);
3991 else 4012 else
3992 { 4013 {
3993 set_locale (str); 4014 set_locale (str);
3994 pty->set_utf8_mode (enc_utf8); 4015 pty->set_utf8_mode (enc_utf8);
3995 init_xlocale (); 4016 init_xlocale ();
… …
4136 scr_touch (true); 4157 scr_touch (true);
4137 break; 4158 break;
4138#endif 4159#endif
4139 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4140 case 1049: 4161 case 1049:
4141 if (OPTION (Opt_secondaryScreen)) 4162 if (option (Opt_secondaryScreen))
4142 if (mode == 0) 4163 if (mode == 0)
4143 scr_cursor (RESTORE); 4164 scr_cursor (RESTORE);
4144 else if (mode == 1) 4165 else if (mode == 1)
4145 scr_cursor (SAVE); 4166 scr_cursor (SAVE);
4146 break; 4167 break;
… …
4211 break; 4232 break;
4212 case 1011: /* scroll to bottom on key press */ 4233 case 1011: /* scroll to bottom on key press */
4213 set_option (Opt_scrollTtyKeypress, state); 4234 set_option (Opt_scrollTtyKeypress, state);
4214 break; 4235 break;
4215 case 1047: /* secondary screen w/ clearing last */ 4236 case 1047: /* secondary screen w/ clearing last */
4216 if (OPTION (Opt_secondaryScreen)) 4237 if (option (Opt_secondaryScreen))
4217 if (current_screen != PRIMARY) 4238 if (current_screen != PRIMARY)
4218 scr_erase_screen (2); 4239 scr_erase_screen (2);
4219 scr_change_screen (state); 4240 scr_change_screen (state);
4220 break; 4241 break;
4221 case 1049: /* secondary screen w/ clearing first */ 4242 case 1049: /* secondary screen w/ clearing first */
4222 scr_change_screen (state); 4243 scr_change_screen (state);
4223 if (OPTION (Opt_secondaryScreen)) 4244 if (option (Opt_secondaryScreen))
4224 if (current_screen != PRIMARY) 4245 if (current_screen != PRIMARY)
4225 scr_erase_screen (2); 4246 scr_erase_screen (2);
4226 break; 4247 break;
4227 default: 4248 default:
4228 break; 4249 break;

Diff Legend

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