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.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.487 by sf-exg, Sat Apr 30 13:11:34 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
… …
257#endif 257#endif
258 258
259void 259void
260rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
261{ 261{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 263
267 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
268 { 265 {
269 char mb[16]; 266 char mb[MB_LEN_MAX];
270 int len; 267 int len;
271 268
272 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
275 else 272 else
276 { 273 {
277 mb[0] = ch[0]; 274 mb[0] = ch;
278 len = 1; 275 len = 1;
279 } 276 }
280 277
281 if (len > 0) 278 if (len > 0)
282 tt_write (mb, len); 279 tt_write (mb, len);
… …
569 selection_request (ev.time); 566 selection_request (ev.time);
570 return; 567 return;
571#if TODO 568#if TODO
572 /* rxvt extras */ 569 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 571 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 573 return;
579#endif 574#endif
580 } 575 }
581 } 576 }
582 } 577 }
… …
889 commit_iso14755 (); 884 commit_iso14755 ();
890 885
891 return; 886 return;
892 } 887 }
893 888
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 889 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 890 if (i[0] == keysym)
896 { 891 {
897 iso14755buf = ISO_14755_51 | i[1]; 892 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 893 commit_iso14755 ();
899 894
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 931 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 932 mouse_slip_wheel_speed = 0;
938#endif 933#endif
939} 934}
940 935
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 936void
975rxvt_term::flush () 937rxvt_term::flush ()
976{ 938{
977 flush_ev.stop (); 939 flush_ev.stop ();
978 940
979#ifdef HAVE_BG_PIXMAP 941#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 942 if (bg_flags & BG_NEEDS_REFRESH)
981 { 943 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 944 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 945 scr_touch (false);
985 } 946 }
986#endif 947#endif
987 948
988 if (want_refresh) 949 if (want_refresh)
… …
1153 { 1114 {
1154 } 1115 }
1155} event_handler; 1116} event_handler;
1156#endif 1117#endif
1157 1118
1119/* make sure all the cmd data is at beginning of cmdbuf */
1120void
1121rxvt_term::cmdbuf_reify ()
1122{
1123 if (cmdbuf_ptr == cmdbuf_base)
1124 return;
1125
1126 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1127
1128 memmove (cmdbuf_base, cmdbuf_ptr, used);
1129 cmdbuf_ptr = cmdbuf_base;
1130 cmdbuf_endp = cmdbuf_ptr + used;
1131
1132}
1133
1134#if defined (KEYSYM_RESOURCE)
1135void
1136rxvt_term::cmdbuf_append (const char *str, size_t count)
1137{
1138 cmdbuf_reify ();
1139
1140 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1141
1142 if (count > avail)
1143 return;
1144
1145 memcpy (cmdbuf_endp, str, count);
1146 cmdbuf_endp += count;
1147
1148 cmd_parse ();
1149}
1150#endif
1151
1158bool 1152bool
1159rxvt_term::pty_fill () 1153rxvt_term::pty_fill ()
1160{ 1154{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1155 cmdbuf_reify ();
1162 1156
1163 if (CBUFSIZ == n) 1157 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1158
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1159 if (!avail)
1166 n = 0;
1167 } 1160 {
1168 1161 // 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; 1162 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1163 cmdbuf_endp = cmdbuf_ptr;
1164 avail = CBUFSIZ;
1165 }
1172 1166
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1167 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1168
1175 if (r > 0) 1169 if (r > 0)
1176 { 1170 {
1177 cmdbuf_endp += r; 1171 cmdbuf_endp += r;
1178 return true; 1172 return true;
… …
1252{ 1246{
1253 int button_number, key_state = 0; 1247 int button_number, key_state = 0;
1254 int x, y; 1248 int x, y;
1255 int code = 32; 1249 int code = 32;
1256 1250
1257 x = Pixel2Col (ev.x); 1251 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1252 y = Pixel2Row (ev.y) + 1;
1253
1259 if (ev.type == MotionNotify) 1254 if (ev.type == MotionNotify)
1260 { 1255 {
1261 if (x == mouse_row && y == mouse_col) 1256 if (x == mouse_row && y == mouse_col)
1262 return; 1257 return;
1258
1263 mouse_row = x; 1259 mouse_row = x;
1264 mouse_col = y; 1260 mouse_col = y;
1265 code += 32; 1261 code += 32;
1266 } 1262 }
1267 1263
… …
1270 else 1266 else
1271 { 1267 {
1272 button_number = MEvent.button - Button1; 1268 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1269 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1270 if (button_number >= 3)
1275 button_number += (64 - 3); 1271 button_number += 64 - 3;
1276 } 1272 }
1277 1273
1278 if (priv_modes & PrivMode_MouseX10) 1274 if (priv_modes & PrivMode_MouseX10)
1279 { 1275 {
1280 /* 1276 /*
… …
1312 fputc ('A', stderr); 1308 fputc ('A', stderr);
1313 if (key_state & 32) 1309 if (key_state & 32)
1314 fputc ('2', stderr); 1310 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1311 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1312 button_number,
1317 x + 1, 1313 x,
1318 y + 1); 1314 y);
1319#endif 1315#endif
1320 1316
1317#if ENABLE_FRILLS
1318 if (priv_modes & PrivMode_ExtMouseRight)
1319 tt_printf ("\033[%d;%d;%dM",
1320 code + button_number + key_state,
1321 x,
1322 y);
1323 else if (priv_modes & PrivMode_ExtModeMouse)
1324 tt_printf ("\033[M%c%lc%lc",
1325 code + button_number + key_state,
1326 wint_t (32 + x),
1327 wint_t (32 + y));
1328 else
1329#endif
1321 tt_printf ("\033[M%c%c%c", 1330 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1331 code + button_number + key_state,
1323 (32 + x + 1), 1332 32 + x,
1324 (32 + y + 1)); 1333 32 + y);
1325} 1334}
1326 1335
1327/*{{{ process an X event */ 1336/*{{{ process an X event */
1328void 1337void
1329rxvt_term::x_cb (XEvent &ev) 1338rxvt_term::x_cb (XEvent &ev)
… …
1431 && ev.xfocus.mode != NotifyGrab) 1440 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1441 focus_out ();
1433 break; 1442 break;
1434 1443
1435 case ConfigureNotify: 1444 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent)
1437 { 1446 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1448 ;
1440 1449
1441#ifdef HAVE_BG_PIXMAP 1450#ifdef HAVE_BG_PIXMAP
1442 bool moved = false; 1451 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ()) 1452 if (bg_window_position_sensitive ())
1444 { 1453 {
1445 int x, y; 1454 int x, y;
1446 if (ev.xconfigure.send_event) 1455 if (ev.xconfigure.send_event)
1447 { 1456 {
1448 x = ev.xconfigure.x; 1457 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y; 1458 y = ev.xconfigure.y;
1450 } 1459 }
1451 else 1460 else
1452 get_window_origin (x, y); 1461 get_window_origin (x, y);
1453 1462
1454 if (bgPixmap.set_position (x, y) 1463 if (bg_set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1464 || !(bg_flags & BG_IS_VALID))
1456 moved = true; 1465 moved = true;
1457 } 1466 }
1458#endif 1467#endif
1459 1468
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1468 if (moved) 1477 if (moved)
1469 { 1478 {
1470 if (mapped) 1479 if (mapped)
1471 update_background (); 1480 update_background ();
1472 else 1481 else
1473 bgPixmap.invalidate (); 1482 bg_invalidate ();
1474 } 1483 }
1475#endif 1484#endif
1476 } 1485 }
1477 1486
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 } 1488 }
1480 break; 1489 break;
1481 1490
1482 case PropertyNotify: 1491 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1492 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break; 1493 break;
1489 1494
1490 case SelectionClear: 1495 case SelectionClear:
1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1496 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492 break;
1493
1494 case SelectionNotify:
1495 if (selection_wait == Sel_normal)
1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497 break; 1497 break;
1498 1498
1499 case SelectionRequest: 1499 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1500 selection_send (ev.xselectionrequest);
1501 break; 1501 break;
… …
1512 * by scheduling background redraw as soon as we can, but giving a short 1512 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive. 1513 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all 1514 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results. 1515 * of ConfigureNotifys for the best results.
1516 */ 1516 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1517 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025); 1518 update_background_ev.start (0.025);
1519#endif 1519#endif
1520 mapped = 1; 1520 mapped = 1;
1521#ifdef TEXT_BLINK 1521#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1522 text_blink_ev.start ();
… …
1537 if (ev.xany.window == vt) 1537 if (ev.xany.window == vt)
1538 { 1538 {
1539 do 1539 do
1540 { 1540 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1543 }
1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545 1545
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547 1547
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 { 1549 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, false);
1552 } 1552 }
1553 1553
1554 want_refresh = 1; 1554 want_refresh = 1;
1555 } 1555 }
1556 else 1556 else
… …
1716rxvt_term::set_urgency (bool enable) 1716rxvt_term::set_urgency (bool enable)
1717{ 1717{
1718 if (enable == urgency_hint) 1718 if (enable == urgency_hint)
1719 return; 1719 return;
1720 1720
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1721 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1722 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h); 1724 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1725 urgency_hint = enable;
1726 } 1726 }
1727} 1727}
1728#endif 1728#endif
1729 1729
… …
1837 * use the property to determine the pixmap. We use it later on. 1837 * use the property to determine the pixmap. We use it later on.
1838 */ 1838 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1841 {
1842 bgPixmap.set_root_pixmap (); 1842 bg_set_root_pixmap ();
1843 update_background (); 1843 update_background ();
1844 } 1844 }
1845 1845
1846 break; 1846 break;
1847 } 1847 }
… …
2384 : NOCHAR; 2384 : NOCHAR;
2385} 2385}
2386 2386
2387static class out_of_input out_of_input; 2387static class out_of_input out_of_input;
2388 2388
2389/* rxvt_cmd_getc () - Return next input character */
2390/*
2391 * Return the next input character after first passing any keyboard input
2392 * to the command.
2393 */
2394wchar_t 2389wchar_t
2395rxvt_term::cmd_getc () THROW ((class out_of_input)) 2390rxvt_term::cmd_getc () THROW ((class out_of_input))
2396{ 2391{
2397 wchar_t c = next_char (); 2392 wchar_t c = next_char ();
2398 2393
… …
2491 pclose_printer (fd); 2486 pclose_printer (fd);
2492} 2487}
2493#endif /* PRINTPIPE */ 2488#endif /* PRINTPIPE */
2494/*}}} */ 2489/*}}} */
2495 2490
2496/* *INDENT-OFF* */
2497enum { 2491enum {
2498 C1_40 = 0x40, 2492 C1_40 = 0x40,
2499 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2493 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2500 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2494 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2501 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2495 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2502 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2496 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2503}; 2497};
2504/* *INDENT-ON* */
2505 2498
2506/*{{{ process non-printing single characters */ 2499/*{{{ process non-printing single characters */
2507void 2500void
2508rxvt_term::process_nonprinting (unicode_t ch) 2501rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2502{
… …
2631 return; 2624 return;
2632 } 2625 }
2633 2626
2634 switch (ch) 2627 switch (ch)
2635 { 2628 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2629 case '#':
2638 if (cmd_getc () == '8') 2630 if (cmd_getc () == '8')
2639 scr_E (); 2631 scr_E ();
2640 break; 2632 break;
2641 case '(': 2633 case '(':
… …
2680 2672
2681 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2683 { 2675 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2686 } 2678 }
2687 break; 2679 break;
2688 2680
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2691 process_graphics (); 2683 // used by original rxvt for rob nations own graphics mode
2684 if (cmd_getc () == 'Q')
2685 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2692 break; 2686 break;
2693 2687
2694 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2695 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2696 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2700 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2701 scr_index (DN); 2695 scr_index (DN);
2702 break; 2696 break;
2703 2697
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2706 2700
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2709 2703
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2706 process_dcs_seq ();
2713 break; 2707 break;
… …
2746 } 2740 }
2747} 2741}
2748/*}}} */ 2742/*}}} */
2749 2743
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2745enum {
2753 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2747 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2748 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2749 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2752 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2753 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2754 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2762}; 2755};
2763 2756
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2762
2770const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2771 { 2764 {
2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2765 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2766 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2767 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2768 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2769 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2770 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2771 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2772 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2773 };
2781/* *INDENT-ON* */
2782 2774
2783void 2775void
2784rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2785{ 2777{
2786 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2864 { 2856 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2858 scr_soft_reset ();
2867 2859
2868 static const int pm_h[] = { 7, 25 }; 2860 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2861 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870 2862
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2863 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2864 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2873 } 2865 }
2874 break; 2866 break;
2875 } 2867 }
2876 2868
2877 return; 2869 return;
… …
3096 } 3088 }
3097} 3089}
3098/*}}} */ 3090/*}}} */
3099 3091
3100#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3093void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3095{
3105 int x, y; 3096 int x, y;
3106 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3115 { 3106 {
3116 /* 3107 /*
3117 * commands 3108 * commands
3118 */ 3109 */
3119 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3121 break; 3112 break;
3122 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3115 break;
3125 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3118 break;
3128 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3121 break;
3131 case 5: /* raise window */ 3122 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3133 break; 3124 break;
3134 case 6: /* lower window */ 3125 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3136 break; 3127 break;
3137 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3138 scr_touch (true); 3129 scr_touch (true);
3139 break; 3130 break;
3140 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3151 3142
3152 /* 3143 /*
3153 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3154 */ 3145 */
3155 case 11: /* report window state */ 3146 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3149 break;
3159 case 13: /* report window position */ 3150 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3156 break;
3166 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3160 break;
3170 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3163 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3166 break;
3176 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3177 { 3168 {
3178 char *s; 3169 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3171 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s); 3172 XFree (s);
3182 } 3173 }
3183 break; 3174 break;
3184 case 21: /* report window title */ 3175 case 21: /* report window title */
3185 { 3176 {
3186 char *s; 3177 char *s;
3187 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3179 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189 XFree (s); 3180 XFree (s);
3190 } 3181 }
3191 break; 3182 break;
3192 } 3183 }
… …
3346 unsigned long bytes_after; 3337 unsigned long bytes_after;
3347 unsigned char *value = 0; 3338 unsigned char *value = 0;
3348 const char *str = ""; 3339 const char *str = "";
3349 3340
3350 if (prop 3341 if (prop
3351 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3352 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3346 && actual_type != None
3356 && actual_format == 8) 3347 && actual_format == 8)
… …
3368 { 3359 {
3369 *eq = 0; 3360 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3371 } 3362 }
3372 else 3363 else
3373 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3374 display->atom (str)); 3365 display->atom (str));
3375 } 3366 }
3376 break; 3367 break;
3377 3368
3378 case XTerm_Color: 3369 case XTerm_Color:
… …
3439 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3440 { 3431 {
3441 bool changed = false; 3432 bool changed = false;
3442 3433
3443 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447 3436
3448 if (changed) 3437 if (changed)
3449 update_background (); 3438 update_background ();
3450 } 3439 }
3451 3440
… …
3457 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3458 { 3447 {
3459 char str[256]; 3448 char str[256];
3460 3449
3461 sprintf (str, "[%dx%d+%d+%d]", 3450 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3454 }
3466 else 3455 else
3467 { 3456 {
3468 int changed = 0; 3457 int changed = 0;
3469 3458
3470 if (*str != ';') 3459 if (*str != ';')
3471 { 3460 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3473 { 3462 {
3474 changed++; 3463 changed++;
3475 str = strchr (str, ';'); 3464 str = strchr (str, ';');
3476 if (str == NULL) 3465 if (str == NULL)
3477 bgPixmap.set_defaultGeometry (); 3466 bg_set_default_geometry ();
3478 else 3467 else
3479 bgPixmap.set_geometry (str+1); 3468 bg_set_geometry (str+1);
3480 } 3469 }
3481 } 3470 }
3482 else 3471 else
3483 { 3472 {
3484 str++; 3473 str++;
3485 if (bgPixmap.set_geometry (str, true)) 3474 if (bg_set_geometry (str, true))
3486 changed++; 3475 changed++;
3487 } 3476 }
3488 3477
3489 if (changed) 3478 if (changed)
3490 { 3479 {
3491 if (bgPixmap.window_position_sensitive ()) 3480 if (bg_window_position_sensitive ())
3492 { 3481 {
3493 int x, y; 3482 int x, y;
3494 get_window_origin (x, y); 3483 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y); 3484 bg_set_position (x, y);
3496 } 3485 }
3497 update_background (); 3486 update_background ();
3498 } 3487 }
3499 } 3488 }
3500 break; 3489 break;
… …
3654 { 67, PrivMode_BackSpace }, // DECBKM 3643 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3644#endif
3656 { 1000, PrivMode_MouseX11 }, 3645 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3646 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3647 { 1003, PrivMode_MouseAnyEvent },
3648#if ENABLE_FRILLS
3649 { 1005, PrivMode_ExtModeMouse },
3650#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 1011, PrivMode_Keypress }, // rxvt extension 3652 { 1011, PrivMode_Keypress }, // rxvt extension
3653#if ENABLE_FRILLS
3654 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3655#endif
3661 // 1035 enable modifiers for alt, numlock NYI 3656 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3657 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3658 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3659 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3660 // 1048 save and restore cursor, implemented in code
3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3661 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3662 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3663 { 2004, PrivMode_BracketPaste },
3669 }; 3664 };
3670 3665
… …
3680 for (i = 0; i < nargs; i++) 3675 for (i = 0; i < nargs; i++)
3681 { 3676 {
3682 state = -1; 3677 state = -1;
3683 3678
3684 /* basic handling */ 3679 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3680 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3681 if (argtopriv[j].argval == arg[i])
3687 { 3682 {
3688 state = privcases (mode, argtopriv[j].bit); 3683 state = privcases (mode, argtopriv[j].bit);
3689 break; 3684 break;
3690 } 3685 }
… …
3768 case 1003: 3763 case 1003:
3769 if (state) 3764 if (state)
3770 { 3765 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3766 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3767 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3768 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask; 3769 vt_emask_mouse = PointerMotionMask;
3774 } 3770 }
3775 else 3771 else
3776 vt_emask_mouse = NoEventMask; 3772 vt_emask_mouse = NoEventMask;
3777 3773
… …
3962 } 3958 }
3963 } 3959 }
3964} 3960}
3965/*}}} */ 3961/*}}} */
3966 3962
3967/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3968void
3969rxvt_term::process_graphics ()
3970{
3971 unicode_t ch, cmd = cmd_getc ();
3972
3973 if (cmd == 'Q')
3974 {
3975 /* query graphics */
3976 tt_printf ("\033G0\012"); /* no graphics */
3977 return;
3978 }
3979 /* swallow other graphics sequences until terminating ':' */
3980 do
3981 ch = cmd_getc ();
3982 while (ch != ':');
3983}
3984/*}}} */
3985
3986/* ------------------------------------------------------------------------- */ 3963/* ------------------------------------------------------------------------- */
3987 3964
3988/* 3965/*
3989 * Send printf () formatted output to the command. 3966 * Send printf () formatted output to the command.
3990 * Only use for small amounts of data. 3967 * Only use for small amounts of data.
… …
4003 3980
4004/* ---------------------------------------------------------------------- */ 3981/* ---------------------------------------------------------------------- */
4005/* Write data to the pty as typed by the user, pasted with the mouse, 3982/* Write data to the pty as typed by the user, pasted with the mouse,
4006 * or generated by us in response to a query ESC sequence. 3983 * or generated by us in response to a query ESC sequence.
4007 */ 3984 */
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3985static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4009 3986
4010void 3987void
4011rxvt_term::tt_write (const char *data, unsigned int len) 3988rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 3989{
4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4018 3995
4019 if (v_buflen == 0) 3996 if (v_buflen == 0)
4020 { 3997 {
4021 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4022 3999
4000 max_it (written, 0);
4001
4023 if ((unsigned int)written == len) 4002 if (written == len)
4024 return; 4003 return;
4025 4004
4026 data += written; 4005 data += written;
4027 len -= written; 4006 len -= written;
4028 } 4007 }
4029 4008
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4009 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4010
4032 memcpy (v_buffer + v_buflen, data, len); 4011 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4012 v_buflen += len;
4034 4013
4035 pty_ev.set (ev::READ | ev::WRITE); 4014 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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