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.268 by root, Tue Jan 17 05:47:42 2006 UTC vs.
Revision 1.284 by root, Wed Jan 25 02:42:06 2006 UTC

… …
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 299rxvt_term::lookup_key (XKeyEvent &ev)
303{ 300{
304 int ctrl, meta, shft, len; 301 int ctrl, meta, shft, len;
305 unsigned int newlen; 302 unsigned int newlen;
306 KeySym keysym; 303 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 304 int valid_keysym;
311 char kbuf[KBUFSZ]; 305 char kbuf[KBUFSZ];
312 306
313 /* 307 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
464 { 458 {
465 switch (keysym) 459 switch (keysym)
466 { 460 {
467 /* normal XTerm key bindings */ 461 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 462 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 463 selection_request (ev.time);
470 return; 464 return;
471#if TODO 465#if TODO
472 /* rxvt extras */ 466 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 467 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 468 change_font (FONT_UP);
… …
905 { 899 {
906 const char ch = C0_ESC; 900 const char ch = C0_ESC;
907 tt_write (&ch, 1); 901 tt_write (&ch, 1);
908 } 902 }
909 903
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 904 tt_write (kbuf, (unsigned int)len);
921} 905}
922/*}}} */ 906/*}}} */
923 907
924#if defined (KEYSYM_RESOURCE) 908#if defined (KEYSYM_RESOURCE)
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1028rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1029{
1046 hidden_cursor = !hidden_cursor; 1030 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1031 want_refresh = 1;
1048 1032
1049 w.start (w.at + BLINK_INTERVAL); 1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1034}
1051#endif 1035#endif
1052 1036
1053#ifdef TEXT_BLINK 1037#ifdef TEXT_BLINK
1054void 1038void
… …
1137 1121
1138 memmove (cmdbuf_base, cmdbuf_ptr, n); 1122 memmove (cmdbuf_base, cmdbuf_ptr, n);
1139 cmdbuf_ptr = cmdbuf_base; 1123 cmdbuf_ptr = cmdbuf_base;
1140 cmdbuf_endp = cmdbuf_ptr + n; 1124 cmdbuf_endp = cmdbuf_ptr + n;
1141 1125
1142 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1126 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1143 1127
1144 if (r > 0) 1128 if (r > 0)
1145 { 1129 {
1146 cmdbuf_endp += r; 1130 cmdbuf_endp += r;
1147 return true; 1131 return true;
… …
1281 tt_printf ("\033[M%c%c%c", 1265 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1266 (32 + button_number + key_state),
1283 (32 + x + 1), 1267 (32 + x + 1),
1284 (32 + y + 1)); 1268 (32 + y + 1));
1285} 1269}
1286
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296 1270
1297/*{{{ process an X event */ 1271/*{{{ process an X event */
1298void 1272void
1299rxvt_term::x_cb (XEvent &ev) 1273rxvt_term::x_cb (XEvent &ev)
1300{ 1274{
… …
1405 button_release (ev.xbutton); 1379 button_release (ev.xbutton);
1406 break; 1380 break;
1407 1381
1408 case ClientMessage: 1382 case ClientMessage:
1409 if (ev.xclient.format == 32 1383 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1384 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1385 {
1386 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1387 {
1388 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1389 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1390 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1391 {
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1393 destroy ();
1394 }
1414#if ENABLE_EWMH 1395#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1397 XSendEvent (disp, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1398 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1399 &ev);
1400#endif
1401 }
1402 }
1403#if ENABLE_XEMBED
1404 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1405 {
1406 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1407 focus_in ();
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out ();
1410 }
1419#endif 1411#endif
1420 } 1412 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break; 1413 break;
1457 1414
1458 case MappingNotify: 1415 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping); 1416 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1417 break;
… …
1502 { 1459 {
1503 seen_resize = 1; 1460 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1462 }
1506 1463
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1508 if (OPTION (Opt_transparent)) 1467 if (OPTION (Opt_transparent))
1509 check_our_parents (); 1468 check_our_parents ();
1510#endif 1469#endif
1511 } 1470 }
1512 break; 1471 break;
1513 1472
1514 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1517 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1518 1478
1519 break; 1479 break;
1520 1480
1521 case SelectionClear: 1481 case SelectionClear:
1522 selection_clear (); 1482 selection_clear ();
… …
1711 { 1671 {
1712 hidden_cursor = 0; 1672 hidden_cursor = 0;
1713 want_refresh = 1; 1673 want_refresh = 1;
1714 } 1674 }
1715 1675
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717 } 1677 }
1718#endif 1678#endif
1719 1679
1720#if defined(POINTER_BLANK) 1680#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1749 XSetICFocus (Input_Context); 1709 XSetICFocus (Input_Context);
1750 } 1710 }
1751#endif 1711#endif
1752#if CURSOR_BLINK 1712#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1713 if (OPTION (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1755#endif 1715#endif
1756#if OFF_FOCUS_FADING 1716#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1717 if (rs[Rs_fade])
1758 { 1718 {
1759 pix_colors = pix_colors_focused; 1719 pix_colors = pix_colors_focused;
… …
1840 /* 1800 /*
1841 * VT window processing of button press 1801 * VT window processing of button press
1842 */ 1802 */
1843 if (ev.window == vt) 1803 if (ev.window == vt)
1844 { 1804 {
1805 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1845#if ISO_14755 1808#if ISO_14755
1846 // 5.4 1809 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 { 1811 {
1849 iso14755_54 (ev.x, ev.y); 1812 iso14755_54 (ev.x, ev.y);
… …
1891 else 1854 else
1892 { 1855 {
1893 if (ev.button != MEvent.button) 1856 if (ev.button != MEvent.button)
1894 MEvent.clicks = 0; 1857 MEvent.clicks = 0;
1895 1858
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897 switch (ev.button) 1859 switch (ev.button)
1898 { 1860 {
1899 case Button1: 1861 case Button1:
1900 /* allow meta + click to select rectangular areas */ 1862 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */ 1863 /* should be done in screen.C */
1902#if ENABLE_FRILLS 1864#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask); 1865 selection.rect = !!(ev.state & ModMetaMask);
1904#else 1866#else
1905 selection.rect = false; 1867 selection.rect = false;
1906#endif 1868#endif
1907 1869
1908 /* allow shift+left click to extend selection */ 1870 /* allow shift+left click to extend selection */
1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1871 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910 { 1872 {
1911 if (MEvent.button == Button1 && clickintime) 1873 if (MEvent.button == Button1 && clickintime)
1912 selection_rotate (ev.x, ev.y); 1874 selection_rotate (ev.x, ev.y);
1913 else 1875 else
1914 selection_extend (ev.x, ev.y, 1); 1876 selection_extend (ev.x, ev.y, 1);
1915 } 1877 }
1916 else 1878 else
1917 { 1879 {
1918 if (MEvent.button == Button1 && clickintime) 1880 if (MEvent.button == Button1 && clickintime)
1919 MEvent.clicks++; 1881 MEvent.clicks++;
1920 else 1882 else
1921 MEvent.clicks = 1; 1883 MEvent.clicks = 1;
1922 1884
1923 selection_click (MEvent.clicks, ev.x, ev.y); 1885 selection_click (MEvent.clicks, ev.x, ev.y);
1924 } 1886 }
1925 1887
1926 MEvent.button = Button1; 1888 MEvent.button = Button1;
1927 break; 1889 break;
1928 1890
1929 case Button3: 1891 case Button3:
1930 if (MEvent.button == Button3 && clickintime) 1892 if (MEvent.button == Button3 && clickintime)
1931 selection_rotate (ev.x, ev.y); 1893 selection_rotate (ev.x, ev.y);
1932 else 1894 else
1933 selection_extend (ev.x, ev.y, 1); 1895 selection_extend (ev.x, ev.y, 1);
1934 1896
1935 MEvent.button = Button3; 1897 MEvent.button = Button3;
1936 break; 1898 break;
1937 } 1899 }
1938 } 1900 }
1939 1901
1940 MEvent.time = ev.time; 1902 MEvent.time = ev.time;
1941 return; 1903 return;
1942 } 1904 }
1943 1905
… …
2106 sel_scroll_ev.stop(); 2068 sel_scroll_ev.stop();
2107#endif 2069#endif
2108 2070
2109 if (ev.window == vt) 2071 if (ev.window == vt)
2110 { 2072 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2074 return;
2075
2111#if ISO_14755 2076#if ISO_14755
2112 // 5.4 2077 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2078 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return; 2079 return;
2115#endif 2080#endif
2081
2116 if (reportmode) 2082 if (reportmode)
2117 { 2083 {
2118 /* mouse report from vt window */ 2084 /* mouse report from vt window */
2119 /* don't report release of wheel "buttons" */ 2085 /* don't report release of wheel "buttons" */
2120 if (ev.button >= 4) 2086 if (ev.button >= 4)
… …
2144 if (priv_modes & PrivMode_mouse_report 2110 if (priv_modes & PrivMode_mouse_report
2145 && bypass_keystate 2111 && bypass_keystate
2146 && ev.button == Button1 && MEvent.clicks <= 1) 2112 && ev.button == Button1 && MEvent.clicks <= 1)
2147 selection_extend (ev.x, ev.y, 0); 2113 selection_extend (ev.x, ev.y, 0);
2148 2114
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2152 switch (ev.button) 2115 switch (ev.button)
2153 { 2116 {
2154 case Button1: 2117 case Button1:
2155 case Button3: 2118 case Button3:
2156 selection_make (ev.time); 2119 selection_make (ev.time);
2157 break; 2120 break;
2121
2158 case Button2: 2122 case Button2:
2159 selection_request (ev.time, ev.x, ev.y); 2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2160 break; 2125 break;
2126
2161#ifdef MOUSE_WHEEL 2127#ifdef MOUSE_WHEEL
2162 case Button4: 2128 case Button4:
2163 case Button5: 2129 case Button5:
2164 { 2130 {
2165 int i; 2131 int i;
… …
2643 am_transparent = 0; 2609 am_transparent = 0;
2644 /* XXX: also turn off Opt_transparent? */ 2610 /* XXX: also turn off Opt_transparent? */
2645 } 2611 }
2646 else 2612 else
2647 { 2613 {
2648#if WAIT_FOR_WM
2649 /* wait (an arbitrary period) for the WM to do its thing
2650 * needed for fvwm2.2.2 (and before?) */
2651 sleep (1);
2652#endif
2653 for (n = 0; n < (unsigned int)i; n++) 2614 for (n = 0; n < (unsigned int)i; n++)
2654 { 2615 {
2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2616 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2656 XClearWindow (disp, parent[n]); 2617 XClearWindow (disp, parent[n]);
2657 } 2618 }
… …
2820 return flag; 2781 return flag;
2821} 2782}
2822 2783
2823// read the next character 2784// read the next character
2824wchar_t 2785wchar_t
2825rxvt_term::next_char () 2786rxvt_term::next_char () NOTHROW
2826{ 2787{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2788 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2789 {
2829 // assume 7-bit to be ascii ALWAYS 2790 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2791 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2851 return NOCHAR; 2812 return NOCHAR;
2852} 2813}
2853 2814
2854// read the next octet 2815// read the next octet
2855uint32_t 2816uint32_t
2856rxvt_term::next_octet () 2817rxvt_term::next_octet () NOTHROW
2857{ 2818{
2858 return cmdbuf_ptr < cmdbuf_endp 2819 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2820 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2821 : NOCHAR;
2861} 2822}
2823
2824static class out_of_input out_of_input;
2862 2825
2863/* rxvt_cmd_getc () - Return next input character */ 2826/* rxvt_cmd_getc () - Return next input character */
2864/* 2827/*
2865 * Return the next input character after first passing any keyboard input 2828 * Return the next input character after first passing any keyboard input
2866 * to the command. 2829 * to the command.
2867 */ 2830 */
2868wchar_t 2831wchar_t
2869rxvt_term::cmd_getc () 2832rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2833{
2871 wchar_t c = next_char (); 2834 wchar_t c = next_char ();
2872 2835
2873 if (c == NOCHAR) 2836 if (c == NOCHAR)
2874 throw out_of_input; 2837 throw out_of_input;
2875 2838
2876 return c; 2839 return c;
2877} 2840}
2878 2841
2879uint32_t 2842uint32_t
2880rxvt_term::cmd_get8 () 2843rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2844{
2882 uint32_t c = next_octet (); 2845 uint32_t c = next_octet ();
2883 2846
2884 if (c == NOCHAR) 2847 if (c == NOCHAR)
2885 throw out_of_input; 2848 throw out_of_input;
… …
3306 ndef = get_byte_array_bit (csi_defaults, i); 3269 ndef = get_byte_array_bit (csi_defaults, i);
3307 for (p = 0; p < nargs; p++) 3270 for (p = 0; p < nargs; p++)
3308 if (arg[p] == -1) 3271 if (arg[p] == -1)
3309 arg[p] = ndef; 3272 arg[p] = ndef;
3310 3273
3311#ifdef DEBUG_CMD
3312 fprintf (stderr, "CSI ");
3313 for (p = 0; p < nargs; p++)
3314 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315 fprintf (stderr, "%c\n", ch);
3316#endif
3317
3318 /* 3274 /*
3319 * private mode handling 3275 * private mode handling
3320 */ 3276 */
3321 if (priv) 3277 if (priv)
3322 { 3278 {
3323 switch (priv) 3279 switch (priv)
3324 { 3280 {
3325 case '>': 3281 case '>':
3326 if (ch == CSI_DA) /* secondary device attributes */ 3282 if (ch == CSI_DA) /* secondary device attributes */
3283 {
3284 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3285 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3286 //
3287 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3288 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3289 // that we do not support xterm mouse reporting (should be 95 when we do).
3290 //
3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3291 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3292 }
3328 break; 3293 break;
3329 case '?': 3294 case '?':
3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3295 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3331 process_terminal_mode (ch, priv, nargs, arg); 3296 process_terminal_mode (ch, priv, nargs, arg);
3332 break; 3297 break;
… …
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3729 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3730 */
3766void 3731void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3732rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3733{
3769 int changed = 0;
3770 int color; 3734 int color;
3771 char *buf, *name; 3735 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3736 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3737 int saveop = op;
3774 dDisp; 3738 dDisp;
… …
3890 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3891 break; 3855 break;
3892#endif 3856#endif
3893 3857
3894 case Rxvt_Pixmap: 3858 case Rxvt_Pixmap:
3859 {
3895 if (*str != ';') 3860 if (*str != ';')
3896 { 3861 {
3897#if XPM_BACKGROUND 3862#if XPM_BACKGROUND
3898 scale_pixmap (""); /* reset to default scaling */ 3863 scale_pixmap (""); /* reset to default scaling */
3899 set_bgPixmap (str); /* change pixmap */ 3864 set_bgPixmap (str); /* change pixmap */
3900 scr_touch (true); 3865 scr_touch (true);
3901#endif 3866#endif
3902 } 3867 }
3903 3868
3869 int changed = 0;
3870
3904 while ((str = strchr (str, ';')) != NULL) 3871 while ((str = strchr (str, ';')) != NULL)
3905 { 3872 {
3906 str++; 3873 str++;
3907#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3908 changed += scale_pixmap (str); 3875 changed += scale_pixmap (str);
3909#endif 3876#endif
3910 } 3877 }
3911 3878
3912 if (changed) 3879 if (changed)
3913 { 3880 {
3914#ifdef XPM_BACKGROUND 3881#ifdef XPM_BACKGROUND
3915 resize_pixmap (); 3882 resize_pixmap ();
3916 scr_touch (true); 3883 scr_touch (true);
3917#endif 3884#endif
3918 } 3885 }
3886 }
3919 break; 3887 break;
3920 3888
3921 case Rxvt_restoreFG: 3889 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3890 set_window_color (Color_fg, str);
3923 break; 3891 break;
… …
3969 if (query) 3937 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3971 else 3939 else
3972 { 3940 {
3973 set_locale (str); 3941 set_locale (str);
3974 pty.set_utf8_mode (enc_utf8); 3942 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale (); 3943 init_xlocale ();
3976 } 3944 }
3977 break; 3945 break;
3978 3946
3979 case URxvt_view_up: 3947 case URxvt_view_up:
… …
4032 return state; 4000 return state;
4033} 4001}
4034 4002
4035/* we're not using priv _yet_ */ 4003/* we're not using priv _yet_ */
4036void 4004void
4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4005rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038{ 4006{
4039 unsigned int i, j; 4007 unsigned int i, j;
4040 int state; 4008 int state;
4041 4009
4042 static const struct 4010 static const struct
… …
4411rxvt_term::tt_write (const char *data, unsigned int len) 4379rxvt_term::tt_write (const char *data, unsigned int len)
4412{ 4380{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4381 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return; 4382 return;
4415 4383
4416 if (pty.pty < 0) 4384 if (pty->pty < 0)
4417 return; 4385 return;
4418 4386
4419 if (v_buflen == 0) 4387 if (v_buflen == 0)
4420 { 4388 {
4421 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4389 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4422 4390
4423 if ((unsigned int)written == len) 4391 if ((unsigned int)written == len)
4424 return; 4392 return;
4425 4393
4426 data += written; 4394 data += written;
… …
4435 pty_ev.set (EVENT_READ | EVENT_WRITE); 4403 pty_ev.set (EVENT_READ | EVENT_WRITE);
4436} 4404}
4437 4405
4438void rxvt_term::pty_write () 4406void rxvt_term::pty_write ()
4439{ 4407{
4440 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4441 4409
4442 if (written > 0) 4410 if (written > 0)
4443 { 4411 {
4444 v_buflen -= written; 4412 v_buflen -= written;
4445 4413

Diff Legend

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