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.305 by root, Thu Feb 2 18:04:45 2006 UTC vs.
Revision 1.322 by ayin, Wed May 2 23:06:32 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303/*{{{ Convert the keypress event into a string */
304void 303void
305rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
306{ 305{
307 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
308 unsigned int newlen; 307 unsigned int newlen;
309 KeySym keysym; 308 KeySym keysym;
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
873 return; 877 return;
874 878
875 if (len <= 0) 879 if (len <= 0)
876 return; /* not mapped */ 880 return; /* not mapped */
877 881
878 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 883 if (view_start)
880 { 884 {
881 view_start = 0; 885 view_start = 0;
882 want_refresh = 1; 886 want_refresh = 1;
883 } 887 }
907 tt_write (&ch, 1); 911 tt_write (&ch, 1);
908 } 912 }
909 913
910 tt_write (kbuf, (unsigned int)len); 914 tt_write (kbuf, (unsigned int)len);
911} 915}
912/*}}} */ 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
913 993
914#if defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
915unsigned int 995unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 997{
1152 } 1232 }
1153 else 1233 else
1154 { 1234 {
1155 pty_ev.stop (); 1235 pty_ev.stop ();
1156 1236
1157 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1158 destroy (); 1238 destroy ();
1159 } 1239 }
1160 1240
1161 return false; 1241 return false;
1162} 1242}
1183 recolour_cursor (); 1263 recolour_cursor ();
1184 1264
1185#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1266 hidden_pointer = 0;
1187 1267
1188 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1270#endif
1191} 1271}
1192 1272
1193#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1194void 1274void
1195rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1196{ 1276{
1197 if (!OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1198 return; 1278 return;
1199 1279
1200 XDefineCursor (dpy, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (dpy); 1281 XFlush (dpy);
1202 1282
1300 unsigned int unused_mask; 1380 unsigned int unused_mask;
1301 1381
1302 switch (ev.type) 1382 switch (ev.type)
1303 { 1383 {
1304 case KeyPress: 1384 case KeyPress:
1305#if ISO_14755 1385 key_press (ev.xkey);
1306 if (!(iso14755buf & ISO_14755_52))
1307#endif
1308 lookup_key (ev.xkey);
1309
1310 break; 1386 break;
1311 1387
1312 case KeyRelease: 1388 case KeyRelease:
1313 { 1389 key_release (ev.xkey);
1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1315 KeySym keysym;
1316
1317 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1318#endif
1319
1320#if ENABLE_FRILLS || ISO_14755
1321 // ISO 14755 support
1322 if (iso14755buf)
1323 if (iso14755buf & ISO_14755_52)
1324 {
1325# if ENABLE_OVERLAY
1326 scr_overlay_off ();
1327# endif
1328# if ISO_14755
1329 // iso14755 part 5.2 handling: release time
1330 // first: controls
1331 if ((ev.xkey.state & ControlMask)
1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1334 {
1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1336 commit_iso14755 ();
1337 goto skip_switch;
1338 }
1339
1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1341 if (i[0] == keysym)
1342 {
1343 iso14755buf = ISO_14755_51 | i[1];
1344 commit_iso14755 ();
1345 goto skip_switch;
1346 }
1347
1348 scr_bell ();
1349# endif
1350 iso14755buf = 0;
1351 break;
1352 }
1353 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1354 {
1355# if ENABLE_OVERLAY
1356 scr_overlay_off ();
1357# endif
1358 if (iso14755buf & ISO_14755_51)
1359 commit_iso14755 ();
1360#if ISO_14755
1361 else if (iso14755buf & ISO_14755_STARTED)
1362 {
1363 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367 }
1368# endif
1369 else
1370 iso14755buf = 0;
1371 }
1372#endif
1373
1374 if (ev.xany.window == vt
1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376 break;
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1390 break;
1385 }
1386 1391
1387 case ButtonPress: 1392 case ButtonPress:
1388 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1389 break; 1394 break;
1390 1395
1453 break; 1458 break;
1454 } 1459 }
1455 break; 1460 break;
1456 1461
1457 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1458 focus_in (); 1466 focus_in ();
1459 break; 1467 break;
1460 1468
1461 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1462 focus_out (); 1473 focus_out ();
1463 break; 1474 break;
1464 1475
1465 case ConfigureNotify: 1476 case ConfigureNotify:
1466 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1467 { 1478 {
1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475 } 1486 }
1476 1487
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478 1489
1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1490#ifdef TRANSPARENT
1480 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1481 check_our_parents (); 1492 check_our_parents ();
1482#endif 1493#endif
1483 } 1494 }
1484 break; 1495 break;
1485 1496
1673 scrollbar_show (1); 1684 scrollbar_show (1);
1674 } 1685 }
1675 break; 1686 break;
1676 } 1687 }
1677 1688
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK) 1689#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1682 { 1691 {
1683 if (hidden_cursor) 1692 if (hidden_cursor)
1684 { 1693 {
1685 hidden_cursor = 0; 1694 hidden_cursor = 0;
1686 want_refresh = 1; 1695 want_refresh = 1;
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1690 } 1699 }
1691#endif 1700#endif
1692 1701
1693#if defined(POINTER_BLANK) 1702#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1704 {
1696 if (ev.type == MotionNotify 1705 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress 1706 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease) 1707 || ev.type == ButtonRelease)
1699 if (hidden_pointer) 1708 if (hidden_pointer)
1711 if (!focus) 1720 if (!focus)
1712 { 1721 {
1713 focus = 1; 1722 focus = 1;
1714 want_refresh = 1; 1723 want_refresh = 1;
1715 1724
1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717 1726
1718#if USE_XIM 1727#if USE_XIM
1719 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1720 { 1729 {
1721 IMSetStatusPosition (); 1730 IMSetPosition ();
1722 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1723 } 1732 }
1724#endif 1733#endif
1725#if CURSOR_BLINK 1734#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1728#endif 1737#endif
1729#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1731 { 1740 {
1732 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1733 scr_recolour (); 1742 scr_recolour ();
1743 }
1744#endif
1745#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell))
1747 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]);
1751 if (h != NULL)
1752 {
1753 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h);
1755 }
1734 } 1756 }
1735#endif 1757#endif
1736 } 1758 }
1737} 1759}
1738 1760
1758#if USE_XIM 1780#if USE_XIM
1759 if (Input_Context != NULL) 1781 if (Input_Context != NULL)
1760 XUnsetICFocus (Input_Context); 1782 XUnsetICFocus (Input_Context);
1761#endif 1783#endif
1762#if CURSOR_BLINK 1784#if CURSOR_BLINK
1763 if (OPTION (Opt_cursorBlink)) 1785 if (option (Opt_cursorBlink))
1764 cursor_blink_ev.stop (); 1786 cursor_blink_ev.stop ();
1765 hidden_cursor = 0; 1787 hidden_cursor = 0;
1766#endif 1788#endif
1767#if OFF_FOCUS_FADING 1789#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1790 if (rs[Rs_fade])
1772 } 1794 }
1773#endif 1795#endif
1774 } 1796 }
1775} 1797}
1776 1798
1777#if TRANSPARENT 1799void
1800rxvt_term::update_fade_color (unsigned int idx)
1801{
1802#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade])
1804 {
1805 rgba c;
1806 pix_colors [Color_fade].get (c);
1807 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1808 }
1809#endif
1810}
1811
1812#if TRANSPARENT || ENABLE_PERL
1778void 1813void
1779rxvt_term::rootwin_cb (XEvent &ev) 1814rxvt_term::rootwin_cb (XEvent &ev)
1780{ 1815{
1781 make_current (); 1816 make_current ();
1782 1817
1818 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1819 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1820 return;
1821
1822# if TRANSPARENT
1783 switch (ev.type) 1823 switch (ev.type)
1784 { 1824 {
1785 case PropertyNotify: 1825 case PropertyNotify:
1786 /* 1826 /*
1787 * if user used some Esetroot compatible prog to set the root bg, 1827 * if user used some Esetroot compatible prog to set the root bg,
1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1831 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1792 return; 1832 return;
1793 1833
1794 /* FALLTHROUGH */ 1834 /* FALLTHROUGH */
1795 case ReparentNotify: 1835 case ReparentNotify:
1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1836 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1797 want_refresh = want_full_refresh = 1; 1837 want_refresh = want_full_refresh = 1;
1798 break; 1838 break;
1799 } 1839 }
1840# endif
1800} 1841}
1801#endif 1842#endif
1802 1843
1803void 1844void
1804rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
2132 selection_make (ev.time); 2173 selection_make (ev.time);
2133 break; 2174 break;
2134 2175
2135 case Button2: 2176 case Button2:
2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2177 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2178 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2138 break; 2179 break;
2139 2180
2140#ifdef MOUSE_WHEEL 2181#ifdef MOUSE_WHEEL
2141 case Button4: 2182 case Button4:
2142 case Button5: 2183 case Button5:
2146 2187
2147 v = ev.button == Button4 ? UP : DN; 2188 v = ev.button == Button4 ? UP : DN;
2148 2189
2149 if (ev.state & ShiftMask) 2190 if (ev.state & ShiftMask)
2150 i = 1; 2191 i = 1;
2151 else if (OPTION (Opt_mouseWheelScrollPage)) 2192 else if (option (Opt_mouseWheelScrollPage))
2152 i = nrow - 1; 2193 i = nrow - 1;
2153 else 2194 else
2154 i = 5; 2195 i = 5;
2155 2196
2156# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
2427 Pixmap rootpixmap = None; 2468 Pixmap rootpixmap = None;
2428 XWindowAttributes wattr, wrootattr; 2469 XWindowAttributes wattr, wrootattr;
2429 2470
2430 pchanged = 0; 2471 pchanged = 0;
2431 2472
2432 if (!OPTION (Opt_transparent)) 2473 if (!option (Opt_transparent))
2433 return pchanged; /* Don't try any more */ 2474 return pchanged; /* Don't try any more */
2434 2475
2435 XGetWindowAttributes (dpy, display->root, &wrootattr); 2476 XGetWindowAttributes (dpy, display->root, &wrootattr);
2436 rootdepth = wrootattr.depth; 2477 rootdepth = wrootattr.depth;
2437 2478
2707 if (ch == C0_LF) 2748 if (ch == C0_LF)
2708 nlines++; 2749 nlines++;
2709 2750
2710 refresh_count++; 2751 refresh_count++;
2711 2752
2712 if (!OPTION (Opt_jumpScroll) 2753 if (!option (Opt_jumpScroll)
2713 || (refresh_count >= refresh_limit * (nrow - 1))) 2754 || (refresh_count >= refresh_limit * (nrow - 1)))
2714 { 2755 {
2715 refreshnow = true; 2756 refreshnow = true;
2716 refresh_count = 0; 2757 refresh_count = 0;
2717 ch = NOCHAR; 2758 ch = NOCHAR;
2757 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
2758 * is incremented here because we must be doing flat-out scrolling. 2799 * is incremented here because we must be doing flat-out scrolling.
2759 */ 2800 */
2760 if (refreshnow) 2801 if (refreshnow)
2761 { 2802 {
2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763 refresh_limit++; 2804 refresh_limit++;
2764 else 2805 else
2765 { 2806 {
2766 flag = true; 2807 flag = true;
2808 //TODO: due to popular request, implement "skipscroll" option here
2767 scr_refresh (); 2809 scr_refresh ();
2768 want_refresh = 1; 2810 want_refresh = 1;
2769 } 2811 }
2770 } 2812 }
2771 2813
3432 break; 3474 break;
3433 case 6: /* CPR requested */ 3475 case 6: /* CPR requested */
3434 scr_report_position (); 3476 scr_report_position ();
3435 break; 3477 break;
3436 case 7: /* unofficial extension */ 3478 case 7: /* unofficial extension */
3437 if (OPTION (Opt_insecure)) 3479 if (option (Opt_insecure))
3438 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3480 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3439 break; 3481 break;
3440 case 8: /* unofficial extension */ 3482 case 8: /* unofficial extension */
3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3483 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3442 break; 3484 break;
3606 break; 3648 break;
3607 case 20: /* report icon label */ 3649 case 20: /* report icon label */
3608 { 3650 {
3609 char *s; 3651 char *s;
3610 XGetIconName (dpy, parent[0], &s); 3652 XGetIconName (dpy, parent[0], &s);
3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3653 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3612 XFree (s); 3654 XFree (s);
3613 } 3655 }
3614 break; 3656 break;
3615 case 21: /* report window title */ 3657 case 21: /* report window title */
3616 { 3658 {
3617 char *s; 3659 char *s;
3618 XFetchName (dpy, parent[0], &s); 3660 XFetchName (dpy, parent[0], &s);
3619 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 */
3620 XFree (s); 3662 XFree (s);
3621 } 3663 }
3622 break; 3664 break;
3623 } 3665 }
3624} 3666}
3651 seen_esc = true; 3693 seen_esc = true;
3652 continue; 3694 continue;
3653 } 3695 }
3654 else if (ch == C0_BEL || ch == CHAR_ST) 3696 else if (ch == C0_BEL || ch == CHAR_ST)
3655 break; 3697 break;
3698 else if (ch == C0_SYN)
3699 ch = cmd_get8 ();
3656 else if (ch < 0x20) 3700 else if (ch < 0x20)
3657 return NULL; /* other control character - exit */ 3701 return NULL; /* other control character - exit */
3658 3702
3659 seen_esc = false; 3703 seen_esc = false;
3660 3704
3661 if (n >= STRING_MAX - 1) 3705 if (n >= STRING_MAX - 1)
3662 // stop at some sane length 3706 // stop at some sane length
3663 return NULL; 3707 return NULL;
3664 3708
3665 if (ch == C0_SYN)
3666 string[n++] = cmd_get8 ();
3667 else
3668 string[n++] = ch; 3709 string[n++] = ch;
3669 } 3710 }
3670 3711
3671 string[n++] = '\0'; 3712 string[n++] = '\0';
3672 3713
3673 ends_how = (ch == 0x5c ? C0_ESC : ch); 3714 ends_how = (ch == 0x5c ? C0_ESC : ch);
3752 int saveop = op; 3793 int saveop = op;
3753 3794
3754 dLocal (Display *, dpy); 3795 dLocal (Display *, dpy);
3755 3796
3756 assert (str != NULL); 3797 assert (str != NULL);
3798
3799 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3800 return;
3801
3757 switch (op) 3802 switch (op)
3758 { 3803 {
3759 case XTerm_name: 3804 case XTerm_name:
3760 set_title (str); 3805 set_title (str);
3761 /* FALLTHROUGH */ 3806 /* FALLTHROUGH */
3929 case URxvt_italicFont: 3974 case URxvt_italicFont:
3930 case URxvt_boldItalicFont: 3975 case URxvt_boldItalicFont:
3931#endif 3976#endif
3932 if (query) 3977 if (query)
3933 tt_printf ("\33]%d;%-.250s%c", saveop, 3978 tt_printf ("\33]%d;%-.250s%c", saveop,
3934 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3979 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3935 ? fontset[op - URxvt_font]->fontdesc : "", 3980 ? fontset[op - URxvt_font]->fontdesc : "",
3936 resp); 3981 resp);
3937 else 3982 else
3938 { 3983 {
3939 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3984 const char *&res = rs[Rs_font + (op - URxvt_font)];
3953 break; 3998 break;
3954 3999
3955#if !ENABLE_MINIMAL 4000#if !ENABLE_MINIMAL
3956 case URxvt_locale: 4001 case URxvt_locale:
3957 if (query) 4002 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 4003 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3959 else 4004 else
3960 { 4005 {
3961 set_locale (str); 4006 set_locale (str);
3962 pty->set_utf8_mode (enc_utf8); 4007 pty->set_utf8_mode (enc_utf8);
3963 init_xlocale (); 4008 init_xlocale ();
3978 break; 4023 break;
3979#endif 4024#endif
3980 4025
3981#if ENABLE_PERL 4026#if ENABLE_PERL
3982 case URxvt_perl: 4027 case URxvt_perl:
3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984 ; // no responses yet 4029 ; // no responses yet
3985 break; 4030 break;
3986#endif 4031#endif
3987 } 4032 }
3988} 4033}
4104 scr_touch (true); 4149 scr_touch (true);
4105 break; 4150 break;
4106#endif 4151#endif
4107 case 1048: /* alternative cursor save */ 4152 case 1048: /* alternative cursor save */
4108 case 1049: 4153 case 1049:
4109 if (OPTION (Opt_secondaryScreen)) 4154 if (option (Opt_secondaryScreen))
4110 if (mode == 0) 4155 if (mode == 0)
4111 scr_cursor (RESTORE); 4156 scr_cursor (RESTORE);
4112 else if (mode == 1) 4157 else if (mode == 1)
4113 scr_cursor (SAVE); 4158 scr_cursor (SAVE);
4114 break; 4159 break;
4179 break; 4224 break;
4180 case 1011: /* scroll to bottom on key press */ 4225 case 1011: /* scroll to bottom on key press */
4181 set_option (Opt_scrollTtyKeypress, state); 4226 set_option (Opt_scrollTtyKeypress, state);
4182 break; 4227 break;
4183 case 1047: /* secondary screen w/ clearing last */ 4228 case 1047: /* secondary screen w/ clearing last */
4184 if (OPTION (Opt_secondaryScreen)) 4229 if (option (Opt_secondaryScreen))
4185 if (current_screen != PRIMARY) 4230 if (current_screen != PRIMARY)
4186 scr_erase_screen (2); 4231 scr_erase_screen (2);
4187 scr_change_screen (state); 4232 scr_change_screen (state);
4188 break; 4233 break;
4189 case 1049: /* secondary screen w/ clearing first */ 4234 case 1049: /* secondary screen w/ clearing first */
4190 scr_change_screen (state); 4235 scr_change_screen (state);
4191 if (OPTION (Opt_secondaryScreen)) 4236 if (option (Opt_secondaryScreen))
4192 if (current_screen != PRIMARY) 4237 if (current_screen != PRIMARY)
4193 scr_erase_screen (2); 4238 scr_erase_screen (2);
4194 break; 4239 break;
4195 default: 4240 default:
4196 break; 4241 break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines