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.442 by sf-exg, Wed Mar 31 09:37:20 2010 UTC vs.
Revision 1.485 by sf-exg, Fri Apr 29 13:08:24 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
198 198
199 int width = 0; 199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len); 200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++) 201 for (int i = 0; i < len; i++)
202 { 202 {
203 rxvt_font *f = (*fs)[fs->find_font (chr[i])]; 203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 204 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 206 }
207 207
208 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
… …
421 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
422 */ 422 */
423 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
424 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
426
427 if (numlock_state || (ev.state & ModNumLockMask))
428 {
429 numlock_state = (ev.state & ModNumLockMask);
430 set_privmode (PrivMode_aplKP, !numlock_state);
431 }
432 426
433 kbuf[0] = 0; 427 kbuf[0] = 0;
434 428
435#ifdef USE_XIM 429#ifdef USE_XIM
436 if (Input_Context) 430 if (Input_Context)
… …
575 selection_request (ev.time); 569 selection_request (ev.time);
576 return; 570 return;
577#if TODO 571#if TODO
578 /* rxvt extras */ 572 /* rxvt extras */
579 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 573 case XK_KP_Add: /* Shift+KP_Add = bigger font */
580 change_font (FONT_UP);
581 return; 574 return;
582 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 575 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
583 change_font (FONT_DN);
584 return; 576 return;
585#endif 577#endif
586 } 578 }
587 } 579 }
588 } 580 }
… …
653 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
654 { 646 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1; 648 unsigned int newlen = 1;
657 649
650 if (ev.state & ModNumLockMask)
651 kp = false;
652
658 switch (translate_keypad (keysym, kp)) 653 keysym = translate_keypad (keysym, kp);
654
655 switch (keysym)
659 { 656 {
660#ifndef NO_BACKSPACE_KEY 657#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace: 658 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace) 659 if (priv_modes & PrivMode_HaveBackSpace)
663 { 660 {
… …
890 commit_iso14755 (); 887 commit_iso14755 ();
891 888
892 return; 889 return;
893 } 890 }
894 891
895 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 892 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
896 if (i[0] == keysym) 893 if (i[0] == keysym)
897 { 894 {
898 iso14755buf = ISO_14755_51 | i[1]; 895 iso14755buf = ISO_14755_51 | i[1];
899 commit_iso14755 (); 896 commit_iso14755 ();
900 897
… …
937 else if (keysym == XK_Control_L || keysym == XK_Control_R) 934 else if (keysym == XK_Control_L || keysym == XK_Control_R)
938 mouse_slip_wheel_speed = 0; 935 mouse_slip_wheel_speed = 0;
939#endif 936#endif
940} 937}
941 938
942#if defined (KEYSYM_RESOURCE)
943unsigned int
944rxvt_term::cmd_write (const char *str, unsigned int count)
945{
946 unsigned int n, s;
947
948 n = cmdbuf_ptr - cmdbuf_base;
949 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
950
951 if (n > 0 && s < count)
952 {
953 memmove (cmdbuf_base, cmdbuf_ptr,
954 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
955 cmdbuf_ptr = cmdbuf_base;
956 cmdbuf_endp -= n;
957 s += n;
958 }
959
960 if (count > s)
961 {
962 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
963 count = s;
964 }
965
966 for (; count--;)
967 *cmdbuf_endp++ = *str++;
968
969 cmd_parse ();
970
971 return 0;
972}
973#endif
974
975void 939void
976rxvt_term::flush () 940rxvt_term::flush ()
977{ 941{
978 flush_ev.stop (); 942 flush_ev.stop ();
979 943
980#ifdef HAVE_BG_PIXMAP 944#ifdef HAVE_BG_PIXMAP
981 if (bgPixmap.check_clearChanged ()) 945 if (bg_flags & BG_NEEDS_REFRESH)
982 { 946 {
983// scr_clear (true); This needs to be researched further! 947 bg_flags &= ~BG_NEEDS_REFRESH;
984 scr_touch (false); 948 scr_touch (false);
985 } 949 }
986#endif 950#endif
987 951
988 if (want_refresh) 952 if (want_refresh)
… …
1033 } 997 }
1034 998
1035 display->flush (); 999 display->flush ();
1036} 1000}
1037 1001
1038/* checks wether a refresh is requested and starts the refresh timer */ 1002/* checks whether a refresh is requested and starts the refresh timer */
1039void 1003void
1040rxvt_term::refresh_check () 1004rxvt_term::refresh_check ()
1041{ 1005{
1042 if (want_refresh && !flush_ev.is_active ()) 1006 if (want_refresh && !flush_ev.is_active ())
1043 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1007 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1153 { 1117 {
1154 } 1118 }
1155} event_handler; 1119} event_handler;
1156#endif 1120#endif
1157 1121
1122/* make sure all the cmd data is at beginning of cmdbuf */
1123void
1124rxvt_term::cmdbuf_reify ()
1125{
1126 if (cmdbuf_ptr == cmdbuf_base)
1127 return;
1128
1129 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1130
1131 memmove (cmdbuf_base, cmdbuf_ptr, used);
1132 cmdbuf_ptr = cmdbuf_base;
1133 cmdbuf_endp = cmdbuf_ptr + used;
1134
1135}
1136
1137#if defined (KEYSYM_RESOURCE)
1138void
1139rxvt_term::cmdbuf_append (const char *str, size_t count)
1140{
1141 cmdbuf_reify ();
1142
1143 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1144
1145 if (count > avail)
1146 return;
1147
1148 memcpy (cmdbuf_endp, str, count);
1149 cmdbuf_endp += count;
1150
1151 cmd_parse ();
1152}
1153#endif
1154
1158bool 1155bool
1159rxvt_term::pty_fill () 1156rxvt_term::pty_fill ()
1160{ 1157{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1158 cmdbuf_reify ();
1162 1159
1163 if (CBUFSIZ == n) 1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1161
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1162 if (!avail)
1166 n = 0;
1167 } 1163 {
1168 1164 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1165 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1166 cmdbuf_endp = cmdbuf_ptr;
1167 avail = CBUFSIZ;
1168 }
1172 1169
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1171
1175 if (r > 0) 1172 if (r > 0)
1176 { 1173 {
1177 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1178 return true; 1175 return true;
… …
1252{ 1249{
1253 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1254 int x, y; 1251 int x, y;
1255 int code = 32; 1252 int code = 32;
1256 1253
1257 x = Pixel2Col (ev.x); 1254 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1255 y = Pixel2Row (ev.y) + 1;
1256
1259 if (ev.type == MotionNotify) 1257 if (ev.type == MotionNotify)
1260 { 1258 {
1261 if (x == mouse_row && y == mouse_col) 1259 if (x == mouse_row && y == mouse_col)
1262 return; 1260 return;
1261
1263 mouse_row = x; 1262 mouse_row = x;
1264 mouse_col = y; 1263 mouse_col = y;
1265 code += 32; 1264 code += 32;
1266 } 1265 }
1267 1266
… …
1270 else 1269 else
1271 { 1270 {
1272 button_number = MEvent.button - Button1; 1271 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1272 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1273 if (button_number >= 3)
1275 button_number += (64 - 3); 1274 button_number += 64 - 3;
1276 } 1275 }
1277 1276
1278 if (priv_modes & PrivMode_MouseX10) 1277 if (priv_modes & PrivMode_MouseX10)
1279 { 1278 {
1280 /* 1279 /*
… …
1312 fputc ('A', stderr); 1311 fputc ('A', stderr);
1313 if (key_state & 32) 1312 if (key_state & 32)
1314 fputc ('2', stderr); 1313 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1314 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1315 button_number,
1317 x + 1, 1316 x,
1318 y + 1); 1317 y);
1319#endif 1318#endif
1320 1319
1320#if ENABLE_FRILLS
1321 if (priv_modes & PrivMode_ExtMouseRight)
1322 tt_printf ("\033[%d;%d;%dM",
1323 code + button_number + key_state,
1324 x,
1325 y);
1326 else if (priv_modes & PrivMode_ExtModeMouse)
1327 tt_printf ("\033[M%c%lc%lc",
1328 code + button_number + key_state,
1329 wint_t (32 + x),
1330 wint_t (32 + y));
1331 else
1332#endif
1321 tt_printf ("\033[M%c%c%c", 1333 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1334 code + button_number + key_state,
1323 (32 + x + 1), 1335 32 + x,
1324 (32 + y + 1)); 1336 32 + y);
1325} 1337}
1326 1338
1327/*{{{ process an X event */ 1339/*{{{ process an X event */
1328void 1340void
1329rxvt_term::x_cb (XEvent &ev) 1341rxvt_term::x_cb (XEvent &ev)
… …
1431 && ev.xfocus.mode != NotifyGrab) 1443 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1444 focus_out ();
1433 break; 1445 break;
1434 1446
1435 case ConfigureNotify: 1447 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1439 if (ev.xconfigure.window == parent[0]) 1448 if (ev.xconfigure.window == parent)
1440 { 1449 {
1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1442 ; 1451 ;
1452
1453#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ())
1456 {
1457 int x, y;
1458 if (ev.xconfigure.send_event)
1459 {
1460 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y;
1462 }
1463 else
1464 get_window_origin (x, y);
1465
1466 if (bg_set_position (x, y)
1467 || !(bg_flags & BG_IS_VALID))
1468 moved = true;
1469 }
1470#endif
1443 1471
1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1473 {
1446 seen_resize = 1; 1474 seen_resize = 1;
1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1476 }
1449 else 1477 else
1450 { 1478 {
1451#ifdef HAVE_BG_PIXMAP 1479#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ()) 1480 if (moved)
1453 { 1481 {
1454 if (mapped) 1482 if (mapped)
1455 update_background (); 1483 update_background ();
1456 else 1484 else
1457 bgPixmap.invalidate (); 1485 bg_invalidate ();
1458 } 1486 }
1459#endif 1487#endif
1460 } 1488 }
1461 1489
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1491 }
1464 break; 1492 break;
1465 1493
1466 case PropertyNotify: 1494 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1495 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break; 1496 break;
1473 1497
1474 case SelectionClear: 1498 case SelectionClear:
1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1499 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476 break; 1500 break;
1477 1501
1478 case SelectionNotify:
1479 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 break;
1482
1483 case SelectionRequest: 1502 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1485 break; 1504 break;
1486 1505
1487 case MapNotify: 1506 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP 1507#ifdef HAVE_BG_PIXMAP
1489 /* This is needed spcifically to fix the case of no window manager or a 1508 /* This is needed specifically to fix the case of no window manager or a
1490 * non-reparenting window manager. In those cases we never get first 1509 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does 1511 * care of multiplicity of ConfigureNotify events arriving while WM does
1493 * reparenting. 1512 * reparenting.
1494 * We should not render background immidiately, as there could be several 1513 * We should not render background immediately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short 1515 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive. 1516 * bit of time for ConfigureNotifies to arrive.
1498 * We should render background PRIOR to drawing any text, but AFTER all 1517 * We should render background PRIOR to drawing any text, but AFTER all
1499 * of ConfigureNotifys for the best results. 1518 * of ConfigureNotifys for the best results.
1500 */ 1519 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1520 if (!(bg_flags & BG_IS_VALID))
1502 update_background_ev.start (0.025); 1521 update_background_ev.start (0.025);
1503#endif 1522#endif
1504 mapped = 1; 1523 mapped = 1;
1505#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1506 text_blink_ev.start (); 1525 text_blink_ev.start ();
… …
1521 if (ev.xany.window == vt) 1540 if (ev.xany.window == vt)
1522 { 1541 {
1523 do 1542 do
1524 { 1543 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1546 }
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1529 1548
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531 1550
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 { 1552 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, false);
1536 } 1555 }
1537 1556
1538 want_refresh = 1; 1557 want_refresh = 1;
1539 } 1558 }
1540 else 1559 else
… …
1700rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1701{ 1720{
1702 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1703 return; 1722 return;
1704 1723
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1706 { 1725 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1709 urgency_hint = enable; 1728 urgency_hint = enable;
1710 } 1729 }
1711} 1730}
1712#endif 1731#endif
1713 1732
… …
1821 * use the property to determine the pixmap. We use it later on. 1840 * use the property to determine the pixmap. We use it later on.
1822 */ 1841 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1844 {
1826 bgPixmap.set_root_pixmap (); 1845 bg_set_root_pixmap ();
1827 update_background (); 1846 update_background ();
1828 } 1847 }
1829 1848
1830 break; 1849 break;
1831 } 1850 }
… …
1870 /* save the xbutton state (for ButtonRelease) */ 1889 /* save the xbutton state (for ButtonRelease) */
1871 MEvent.state = ev.state; 1890 MEvent.state = ev.state;
1872#ifdef MOUSE_REPORT_DOUBLECLICK 1891#ifdef MOUSE_REPORT_DOUBLECLICK
1873 if (ev.button == MEvent.button && clickintime) 1892 if (ev.button == MEvent.button && clickintime)
1874 { 1893 {
1875 /* same button, within alloted time */ 1894 /* same button, within allowed time */
1876 MEvent.clicks++; 1895 MEvent.clicks++;
1877 1896
1878 if (MEvent.clicks > 1) 1897 if (MEvent.clicks > 1)
1879 { 1898 {
1880 /* only report double clicks */ 1899 /* only report double clicks */
… …
2151 selection_make (ev.time); 2170 selection_make (ev.time);
2152 break; 2171 break;
2153 2172
2154 case Button2: 2173 case Button2:
2155 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2174 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2157 break; 2176 break;
2158 2177
2159#ifdef MOUSE_WHEEL 2178#ifdef MOUSE_WHEEL
2160 case Button4: 2179 case Button4:
2161 case Button5: 2180 case Button5:
… …
2368 : NOCHAR; 2387 : NOCHAR;
2369} 2388}
2370 2389
2371static class out_of_input out_of_input; 2390static class out_of_input out_of_input;
2372 2391
2373/* rxvt_cmd_getc () - Return next input character */
2374/*
2375 * Return the next input character after first passing any keyboard input
2376 * to the command.
2377 */
2378wchar_t 2392wchar_t
2379rxvt_term::cmd_getc () THROW ((class out_of_input)) 2393rxvt_term::cmd_getc () THROW ((class out_of_input))
2380{ 2394{
2381 wchar_t c = next_char (); 2395 wchar_t c = next_char ();
2382 2396
… …
2475 pclose_printer (fd); 2489 pclose_printer (fd);
2476} 2490}
2477#endif /* PRINTPIPE */ 2491#endif /* PRINTPIPE */
2478/*}}} */ 2492/*}}} */
2479 2493
2480/* *INDENT-OFF* */
2481enum { 2494enum {
2482 C1_40 = 0x40, 2495 C1_40 = 0x40,
2483 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2496 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2484 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2497 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2485 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2498 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2486 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2499 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2487}; 2500};
2488/* *INDENT-ON* */
2489 2501
2490/*{{{ process non-printing single characters */ 2502/*{{{ process non-printing single characters */
2491void 2503void
2492rxvt_term::process_nonprinting (unicode_t ch) 2504rxvt_term::process_nonprinting (unicode_t ch)
2493{ 2505{
… …
2664 2676
2665 /* 8.3.87: NEXT LINE */ 2677 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2678 case C1_NEL: /* ESC E */
2667 { 2679 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2680 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2681 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2670 } 2682 }
2671 break; 2683 break;
2672 2684
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2685 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2686 case C1_ESA: /* ESC G */
2675 process_graphics (); 2687 // used by original rxvt for rob nations own graphics mode
2688 if (cmd_getc () == 'Q')
2689 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2676 break; 2690 break;
2677 2691
2678 /* 8.3.63: CHARACTER TABULATION SET */ 2692 /* 8.3.63: CHARACTER TABULATION SET */
2679 case C1_HTS: /* ESC H */ 2693 case C1_HTS: /* ESC H */
2680 scr_set_tab (1); 2694 scr_set_tab (1);
… …
2730 } 2744 }
2731} 2745}
2732/*}}} */ 2746/*}}} */
2733 2747
2734/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2748/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2735/* *INDENT-OFF* */
2736enum { 2749enum {
2737 CSI_ICH = 0x40, 2750 CSI_ICH = 0x40,
2738 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2751 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2739 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2752 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2740 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2753 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2743 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2756 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2744 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2757 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2745 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2758 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2746}; 2759};
2747 2760
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2761#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2762 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2763 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2764#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2765 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2766
2754const unsigned char csi_defaults[] = 2767static const unsigned char csi_defaults[] =
2755 { 2768 {
2756 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2769 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2757 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2770 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2758 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2771 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2759 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2772 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2760 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2773 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2761 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2774 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2762 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2775 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2763 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2776 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2764 }; 2777 };
2765/* *INDENT-ON* */
2766 2778
2767void 2779void
2768rxvt_term::process_csi_seq () 2780rxvt_term::process_csi_seq ()
2769{ 2781{
2770 unicode_t ch, priv, i; 2782 unicode_t ch, priv, i;
… …
2848 { 2860 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2861 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset (); 2862 scr_soft_reset ();
2851 2863
2852 static const int pm_h[] = { 7, 25 }; 2864 static const int pm_h[] = { 7, 25 };
2853 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2865 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2854 2866
2855 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2867 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2856 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2868 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2857 } 2869 }
2858 break; 2870 break;
2859 } 2871 }
2860 2872
2861 return; 2873 return;
… …
3080 } 3092 }
3081} 3093}
3082/*}}} */ 3094/*}}} */
3083 3095
3084#if !ENABLE_MINIMAL 3096#if !ENABLE_MINIMAL
3085/* ARGSUSED */
3086void 3097void
3087rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3088{ 3099{
3089 int x, y; 3100 int x, y;
3090 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
… …
3099 { 3110 {
3100 /* 3111 /*
3101 * commands 3112 * commands
3102 */ 3113 */
3103 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3104 XMapWindow (dpy, parent[0]); 3115 XMapWindow (dpy, parent);
3105 break; 3116 break;
3106 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3107 XIconifyWindow (dpy, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent, display->screen);
3108 break; 3119 break;
3109 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3110 XMoveWindow (dpy, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent, args[1], args[2]);
3111 break; 3122 break;
3112 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3113 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3114 break; 3125 break;
3115 case 5: /* raise window */ 3126 case 5: /* raise window */
3116 XRaiseWindow (dpy, parent[0]); 3127 XRaiseWindow (dpy, parent);
3117 break; 3128 break;
3118 case 6: /* lower window */ 3129 case 6: /* lower window */
3119 XLowerWindow (dpy, parent[0]); 3130 XLowerWindow (dpy, parent);
3120 break; 3131 break;
3121 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3122 scr_touch (true); 3133 scr_touch (true);
3123 break; 3134 break;
3124 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3135 3146
3136 /* 3147 /*
3137 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3138 */ 3149 */
3139 case 11: /* report window state */ 3150 case 11: /* report window state */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3141 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3142 break; 3153 break;
3143 case 13: /* report window position */ 3154 case 13: /* report window position */
3144 XGetWindowAttributes (dpy, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent, &wattr);
3145 XTranslateCoordinates (dpy, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent, wattr.root,
3146 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3147 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3148 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3149 break; 3160 break;
3150 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3151 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3152 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3153 break; 3164 break;
3154 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3155 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3156 break; 3167 break;
… …
3158 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3159 break; 3170 break;
3160 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3161 { 3172 {
3162 char *s; 3173 char *s;
3163 XGetIconName (dpy, parent[0], &s); 3174 XGetIconName (dpy, parent, &s);
3164 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3165 XFree (s); 3176 XFree (s);
3166 } 3177 }
3167 break; 3178 break;
3168 case 21: /* report window title */ 3179 case 21: /* report window title */
3169 { 3180 {
3170 char *s; 3181 char *s;
3171 XFetchName (dpy, parent[0], &s); 3182 XFetchName (dpy, parent, &s);
3172 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3173 XFree (s); 3184 XFree (s);
3174 } 3185 }
3175 break; 3186 break;
3176 } 3187 }
… …
3232 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3243 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3233 */ 3244 */
3234void 3245void
3235rxvt_term::process_dcs_seq () 3246rxvt_term::process_dcs_seq ()
3236{ 3247{
3237 char *s;
3238 unicode_t eh;
3239
3240 /* 3248 /*
3241 * Not handled yet 3249 * Not handled yet
3242 */ 3250 */
3251
3252 unicode_t eh;
3243 s = get_to_st (eh); 3253 char *s = get_to_st (eh);
3244 if (s) 3254 if (s)
3245 free (s); 3255 free (s);
3246 3256
3247 return; 3257 return;
3248} 3258}
… …
3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3262 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3253 */ 3263 */
3254void 3264void
3255rxvt_term::process_osc_seq () 3265rxvt_term::process_osc_seq ()
3256{ 3266{
3257 unicode_t ch, eh;
3258 int arg; 3267 int arg;
3259 3268
3260 ch = cmd_getc (); 3269 unicode_t ch = cmd_getc ();
3261 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3270 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3262 arg = arg * 10 + (ch - '0'); 3271 arg = arg * 10 + (ch - '0');
3263 3272
3264 if (ch == ';') 3273 if (ch == ';')
3265 { 3274 {
3275 unicode_t eh;
3266 char *s = get_to_st (eh); 3276 char *s = get_to_st (eh);
3267 3277
3268 if (s) 3278 if (s)
3269 { 3279 {
3270 process_xterm_seq (arg, s, eh); 3280 process_xterm_seq (arg, s, eh);
… …
3331 unsigned long bytes_after; 3341 unsigned long bytes_after;
3332 unsigned char *value = 0; 3342 unsigned char *value = 0;
3333 const char *str = ""; 3343 const char *str = "";
3334 3344
3335 if (prop 3345 if (prop
3336 && XGetWindowProperty (dpy, parent[0], 3346 && XGetWindowProperty (dpy, parent,
3337 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3338 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3339 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3340 && actual_type != None 3350 && actual_type != None
3341 && actual_format == 8) 3351 && actual_format == 8)
… …
3353 { 3363 {
3354 *eq = 0; 3364 *eq = 0;
3355 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3356 } 3366 }
3357 else 3367 else
3358 XDeleteProperty (dpy, parent[0], 3368 XDeleteProperty (dpy, parent,
3359 display->atom (str)); 3369 display->atom (str));
3360 } 3370 }
3361 break; 3371 break;
3362 3372
3363 case XTerm_Color: 3373 case XTerm_Color:
… …
3395 process_color_seq (op, Color_pointer_fg, str, resp); 3405 process_color_seq (op, Color_pointer_fg, str, resp);
3396 break; 3406 break;
3397 case XTerm_Color_pointer_bg: 3407 case XTerm_Color_pointer_bg:
3398 process_color_seq (op, Color_pointer_bg, str, resp); 3408 process_color_seq (op, Color_pointer_bg, str, resp);
3399 break; 3409 break;
3410#ifdef OPTION_HC
3411 case XTerm_Color_HC:
3412 process_color_seq (op, Color_HC, str, resp);
3413 break;
3414 case XTerm_Color_HTC:
3415 process_color_seq (op, Color_HTC, str, resp);
3416 break;
3417#endif
3400#ifndef NO_BOLD_UNDERLINE_REVERSE 3418#ifndef NO_BOLD_UNDERLINE_REVERSE
3401 case XTerm_Color_RV:
3402 process_color_seq (op, Color_RV, str, resp);
3403 break;
3404 case Rxvt_Color_BD:
3405 case URxvt_Color_BD: 3419 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp); 3420 process_color_seq (op, Color_BD, str, resp);
3407 break; 3421 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL: 3422 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp); 3423 process_color_seq (op, Color_UL, str, resp);
3411 break; 3424 break;
3412 case URxvt_Color_IT: 3425 case URxvt_Color_IT:
3413 process_color_seq (op, Color_IT, str, resp); 3426 process_color_seq (op, Color_IT, str, resp);
… …
3421 process_color_seq (op, Color_tint, str, resp); 3434 process_color_seq (op, Color_tint, str, resp);
3422 { 3435 {
3423 bool changed = false; 3436 bool changed = false;
3424 3437
3425 if (ISSET_PIXCOLOR (Color_tint)) 3438 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3439 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429 3440
3430 if (changed) 3441 if (changed)
3431 update_background (); 3442 update_background ();
3432 } 3443 }
3433 3444
… …
3439 if (!strcmp (str, "?")) 3450 if (!strcmp (str, "?"))
3440 { 3451 {
3441 char str[256]; 3452 char str[256];
3442 3453
3443 sprintf (str, "[%dx%d+%d+%d]", 3454 sprintf (str, "[%dx%d+%d+%d]",
3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3455 min (h_scale, 32767), min (v_scale, 32767),
3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3456 min (h_align, 32767), min (v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST); 3457 process_xterm_seq (XTerm_title, str, CHAR_ST);
3447 } 3458 }
3448 else 3459 else
3449 { 3460 {
3450 int changed = 0; 3461 int changed = 0;
3451 3462
3452 if (*str != ';') 3463 if (*str != ';')
3453 { 3464 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */ 3465 if (bg_set_file (str)) /* change pixmap */
3466 {
3457 changed++; 3467 changed++;
3458 str = strchr (str, ';'); 3468 str = strchr (str, ';');
3459 if (str == NULL) 3469 if (str == NULL)
3460 bgPixmap.set_defaultGeometry (); 3470 bg_set_default_geometry ();
3471 else
3472 bg_set_geometry (str+1);
3473 }
3461 } 3474 }
3462 3475 else
3463 while (str)
3464 { 3476 {
3465 str++; 3477 str++;
3466 if (bgPixmap.set_geometry (str)) 3478 if (bg_set_geometry (str, true))
3467 changed++; 3479 changed++;
3468 str = strchr (str, ';');
3469 } 3480 }
3470 3481
3471 if (changed) 3482 if (changed)
3483 {
3484 if (bg_window_position_sensitive ())
3485 {
3486 int x, y;
3487 get_window_origin (x, y);
3488 bg_set_position (x, y);
3489 }
3472 update_background (); 3490 update_background ();
3491 }
3473 } 3492 }
3474 break; 3493 break;
3475#endif 3494#endif
3476 3495
3477 case XTerm_logfile: 3496 case XTerm_logfile:
… …
3580 { 3599 {
3581 if (mode == 'r') 3600 if (mode == 'r')
3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3601 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3583 else 3602 else
3584 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3603 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3604
3585 set_privmode (bit, state); 3605 set_privmode (bit, state);
3586 } 3606 }
3587 3607
3588 return state; 3608 return state;
3589} 3609}
… …
3608 { 6, PrivMode_relOrigin }, // DECOM 3628 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3629 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3630 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3631 { 9, PrivMode_MouseX10 },
3612 // 18 end FF to printer after print screen 3632 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region 3633 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3634 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3635#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3636 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3637#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3638 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3627 { 67, PrivMode_BackSpace }, // DECBKM 3647 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3648#endif
3629 { 1000, PrivMode_MouseX11 }, 3649 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent }, 3650 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent }, 3651 { 1003, PrivMode_MouseAnyEvent },
3652#if ENABLE_FRILLS
3653 { 1005, PrivMode_ExtModeMouse },
3654#endif
3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3655 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 { 1011, PrivMode_Keypress }, // rxvt extension 3656 { 1011, PrivMode_Keypress }, // rxvt extension
3657#if ENABLE_FRILLS
3658 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3659#endif
3634 // 1035 enable modifiers for alt, numlock NYI 3660 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI 3661 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI 3662 // 1037 send DEL for keypad delete NYI
3637 { 1047, PrivMode_Screen }, 3663 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor 3664 // 1048 save and restore cursor, implemented in code
3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3665 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3666 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste }, 3667 { 2004, PrivMode_BracketPaste },
3642 }; 3668 };
3643 3669
… …
3653 for (i = 0; i < nargs; i++) 3679 for (i = 0; i < nargs; i++)
3654 { 3680 {
3655 state = -1; 3681 state = -1;
3656 3682
3657 /* basic handling */ 3683 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3684 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3685 if (argtopriv[j].argval == arg[i])
3660 { 3686 {
3661 state = privcases (mode, argtopriv[j].bit); 3687 state = privcases (mode, argtopriv[j].bit);
3662 break; 3688 break;
3663 } 3689 }
… …
3741 case 1003: 3767 case 1003:
3742 if (state) 3768 if (state)
3743 { 3769 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3746 vt_emask_mouse = PointerMotionMask; 3773 vt_emask_mouse = PointerMotionMask;
3747 } 3774 }
3748 else 3775 else
3749 vt_emask_mouse = NoEventMask; 3776 vt_emask_mouse = NoEventMask;
3750 3777
… …
3935 } 3962 }
3936 } 3963 }
3937} 3964}
3938/*}}} */ 3965/*}}} */
3939 3966
3940/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3941void
3942rxvt_term::process_graphics ()
3943{
3944 unicode_t ch, cmd = cmd_getc ();
3945
3946 if (cmd == 'Q')
3947 {
3948 /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */
3950 return;
3951 }
3952 /* swallow other graphics sequences until terminating ':' */
3953 do
3954 ch = cmd_getc ();
3955 while (ch != ':');
3956}
3957/*}}} */
3958
3959/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3960 3968
3961/* 3969/*
3962 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
3963 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
3976 3984
3977/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3978/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
3979 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3980 */ 3988 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982 3990
3983void 3991void
3984rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 3993{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3991 3999
3992 if (v_buflen == 0) 4000 if (v_buflen == 0)
3993 { 4001 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995 4003
4004 max_it (written, 0);
4005
3996 if ((unsigned int)written == len) 4006 if (written == len)
3997 return; 4007 return;
3998 4008
3999 data += written; 4009 data += written;
4000 len -= written; 4010 len -= written;
4001 } 4011 }
4002 4012
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4014
4005 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4016 v_buflen += len;
4007 4017
4008 pty_ev.set (ev::READ | ev::WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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