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.457 by sf-exg, Fri Oct 22 18:03:10 2010 UTC vs.
Revision 1.503 by sf-exg, Mon Dec 5 13:36:56 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 }
… …
781 } 776 }
782 777
783 if (newlen) 778 if (newlen)
784 len = strlen (kbuf); 779 len = strlen (kbuf);
785 780
781 if (len > 0)
782 {
786 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
787 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
788 */ 797 */
789#ifdef META8_OPTION 798#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
792#endif 801#endif
802 }
793 803
794 } 804 }
795 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
796 { 806 {
797 len = 1; 807 len = 1;
… …
830 if (view_start) 840 if (view_start)
831 { 841 {
832 view_start = 0; 842 view_start = 0;
833 want_refresh = 1; 843 want_refresh = 1;
834 } 844 }
835
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849 845
850 /* escape prefix */ 846 /* escape prefix */
851 if (meta 847 if (meta
852#ifdef META8_OPTION 848#ifdef META8_OPTION
853 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
889 commit_iso14755 (); 885 commit_iso14755 ();
890 886
891 return; 887 return;
892 } 888 }
893 889
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 891 if (i[0] == keysym)
896 { 892 {
897 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 894 commit_iso14755 ();
899 895
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
938#endif 934#endif
939} 935}
940 936
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 937void
975rxvt_term::flush () 938rxvt_term::flush ()
976{ 939{
977 flush_ev.stop (); 940 flush_ev.stop ();
978 941
979#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 943 if (bg_flags & BG_NEEDS_REFRESH)
981 { 944 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 945 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 946 scr_touch (false);
985 } 947 }
986#endif 948#endif
987 949
988 if (want_refresh) 950 if (want_refresh)
… …
1026 } 988 }
1027 989
1028 scr_refresh (); 990 scr_refresh ();
1029 scrollBar.show (1); 991 scrollBar.show (1);
1030#ifdef USE_XIM 992#ifdef USE_XIM
1031 IMSendSpot (); 993 im_send_spot ();
1032#endif 994#endif
1033 } 995 }
1034 996
1035 display->flush (); 997 display->flush ();
1036} 998}
… …
1081 1043
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1045void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1047{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1050 {
1089 want_refresh = 1; 1051 want_refresh = 1;
1090 refresh_check (); 1052 refresh_check ();
1091 } 1053 }
1092 else 1054 else
… …
1153 { 1115 {
1154 } 1116 }
1155} event_handler; 1117} event_handler;
1156#endif 1118#endif
1157 1119
1120/* make sure all the cmd data is at beginning of cmdbuf */
1121void
1122rxvt_term::cmdbuf_reify ()
1123{
1124 if (cmdbuf_ptr == cmdbuf_base)
1125 return;
1126
1127 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1128
1129 memmove (cmdbuf_base, cmdbuf_ptr, used);
1130 cmdbuf_ptr = cmdbuf_base;
1131 cmdbuf_endp = cmdbuf_ptr + used;
1132
1133}
1134
1135#if defined (KEYSYM_RESOURCE)
1136void
1137rxvt_term::cmdbuf_append (const char *str, size_t count)
1138{
1139 cmdbuf_reify ();
1140
1141 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1142
1143 if (count > avail)
1144 return;
1145
1146 memcpy (cmdbuf_endp, str, count);
1147 cmdbuf_endp += count;
1148
1149 cmd_parse ();
1150}
1151#endif
1152
1158bool 1153bool
1159rxvt_term::pty_fill () 1154rxvt_term::pty_fill ()
1160{ 1155{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1156 cmdbuf_reify ();
1162 1157
1163 if (CBUFSIZ == n) 1158 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1159
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1160 if (!avail)
1166 n = 0;
1167 } 1161 {
1168 1162 // 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; 1163 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1164 cmdbuf_endp = cmdbuf_ptr;
1165 avail = CBUFSIZ;
1166 }
1172 1167
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1168 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1169
1175 if (r > 0) 1170 if (r > 0)
1176 { 1171 {
1177 cmdbuf_endp += r; 1172 cmdbuf_endp += r;
1178 return true; 1173 return true;
… …
1252{ 1247{
1253 int button_number, key_state = 0; 1248 int button_number, key_state = 0;
1254 int x, y; 1249 int x, y;
1255 int code = 32; 1250 int code = 32;
1256 1251
1257 x = Pixel2Col (ev.x); 1252 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1253 y = Pixel2Row (ev.y) + 1;
1254
1259 if (ev.type == MotionNotify) 1255 if (ev.type == MotionNotify)
1260 { 1256 {
1261 if (x == mouse_row && y == mouse_col) 1257 if (x == mouse_row && y == mouse_col)
1262 return; 1258 return;
1259
1263 mouse_row = x; 1260 mouse_row = x;
1264 mouse_col = y; 1261 mouse_col = y;
1265 code += 32; 1262 code += 32;
1266 } 1263 }
1267 1264
… …
1270 else 1267 else
1271 { 1268 {
1272 button_number = MEvent.button - Button1; 1269 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1270 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1271 if (button_number >= 3)
1275 button_number += (64 - 3); 1272 button_number += 64 - 3;
1276 } 1273 }
1277 1274
1278 if (priv_modes & PrivMode_MouseX10) 1275 if (priv_modes & PrivMode_MouseX10)
1279 { 1276 {
1280 /* 1277 /*
… …
1312 fputc ('A', stderr); 1309 fputc ('A', stderr);
1313 if (key_state & 32) 1310 if (key_state & 32)
1314 fputc ('2', stderr); 1311 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1313 button_number,
1317 x + 1, 1314 x,
1318 y + 1); 1315 y);
1319#endif 1316#endif
1320 1317
1318#if ENABLE_FRILLS
1319 if (priv_modes & PrivMode_ExtMouseRight)
1320 tt_printf ("\033[%d;%d;%dM",
1321 code + button_number + key_state,
1322 x,
1323 y);
1324 else if (priv_modes & PrivMode_ExtModeMouse)
1325 tt_printf ("\033[M%c%lc%lc",
1326 code + button_number + key_state,
1327 wint_t (32 + x),
1328 wint_t (32 + y));
1329 else
1330#endif
1321 tt_printf ("\033[M%c%c%c", 1331 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1332 code + button_number + key_state,
1323 (32 + x + 1), 1333 32 + x,
1324 (32 + y + 1)); 1334 32 + y);
1325} 1335}
1326 1336
1327/*{{{ process an X event */ 1337/*{{{ process an X event */
1328void 1338void
1329rxvt_term::x_cb (XEvent &ev) 1339rxvt_term::x_cb (XEvent &ev)
… …
1431 && ev.xfocus.mode != NotifyGrab) 1441 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1442 focus_out ();
1433 break; 1443 break;
1434 1444
1435 case ConfigureNotify: 1445 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent)
1437 { 1447 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1449 ;
1450
1451#ifdef HAVE_BG_PIXMAP
1452 bool moved = false;
1453 if (bg_window_position_sensitive ())
1454 {
1455 int x, y;
1456 if (ev.xconfigure.send_event)
1457 {
1458 x = ev.xconfigure.x;
1459 y = ev.xconfigure.y;
1460 }
1461 else
1462 get_window_origin (x, y);
1463
1464 if (bg_set_position (x, y)
1465 || !(bg_flags & BG_IS_VALID))
1466 moved = true;
1467 }
1468#endif
1440 1469
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1471 {
1443 seen_resize = 1; 1472 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1474 }
1446 else 1475 else
1447 { 1476 {
1448#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 {
1451 if (mapped) 1478 if (moved)
1452 update_background (); 1479 update_background ();
1453 else
1454 bgPixmap.invalidate ();
1455 }
1456#endif 1480#endif
1457 } 1481 }
1458 1482
1459 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1460 } 1484 }
1461 break; 1485 break;
1462 1486
1463 case PropertyNotify: 1487 case PropertyNotify:
1464 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1488 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1466 && ev.xproperty.state == PropertyNewValue)
1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1468
1469 break; 1489 break;
1470 1490
1471 case SelectionClear: 1491 case SelectionClear:
1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1492 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1473 break;
1474
1475 case SelectionNotify:
1476 if (selection_wait == Sel_normal)
1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1478 break; 1493 break;
1479 1494
1480 case SelectionRequest: 1495 case SelectionRequest:
1481 selection_send (ev.xselectionrequest); 1496 selection_send (ev.xselectionrequest);
1482 break; 1497 break;
… …
1493 * by scheduling background redraw as soon as we can, but giving a short 1508 * by scheduling background redraw as soon as we can, but giving a short
1494 * bit of time for ConfigureNotifies to arrive. 1509 * bit of time for ConfigureNotifies to arrive.
1495 * We should render background PRIOR to drawing any text, but AFTER all 1510 * We should render background PRIOR to drawing any text, but AFTER all
1496 * of ConfigureNotifys for the best results. 1511 * of ConfigureNotifys for the best results.
1497 */ 1512 */
1498 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1513 if (!(bg_flags & BG_IS_VALID))
1499 update_background_ev.start (0.025); 1514 update_background_ev.start (0.025);
1500#endif 1515#endif
1501 mapped = 1; 1516 mapped = 1;
1502#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1503 text_blink_ev.start (); 1518 text_blink_ev.start ();
… …
1518 if (ev.xany.window == vt) 1533 if (ev.xany.window == vt)
1519 { 1534 {
1520 do 1535 do
1521 { 1536 {
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, false);
1524 } 1539 }
1525 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1541
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1542 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1543
1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 { 1545 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1533 } 1548 }
1534 1549
1535 want_refresh = 1; 1550 want_refresh = 1;
1536 } 1551 }
1537 else 1552 else
… …
1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1544 ; 1559 ;
1545 1560
1546 if (scrollBar.state && ev.xany.window == scrollBar.win) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1547 { 1562 {
1548 scrollBar.state = STATE_IDLE; 1563 scrollBar.state = SB_STATE_IDLE;
1549 scrollBar.show (0); 1564 scrollBar.show (0);
1550 } 1565 }
1551 } 1566 }
1552 break; 1567 break;
1553 1568
… …
1641#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1642 } 1657 }
1643#endif 1658#endif
1644 } 1659 }
1645 } 1660 }
1646 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1647 { 1662 {
1648 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1649 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1650 ; 1665 ;
1651 1666
1652 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1653 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1654 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1655 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1656 &unused_mask); 1671 &unused_mask);
1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1658 scrollBar.size ()); 1673 scrollBar.size ());
1659 want_refresh = 1; 1674 want_refresh = 1;
1660 scrollBar.show (1); 1675 scrollBar.show (1);
1661 } 1676 }
1662 break; 1677 break;
… …
1697rxvt_term::set_urgency (bool enable) 1712rxvt_term::set_urgency (bool enable)
1698{ 1713{
1699 if (enable == urgency_hint) 1714 if (enable == urgency_hint)
1700 return; 1715 return;
1701 1716
1702 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1703 { 1718 {
1704 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1705 XSetWMHints (dpy, parent[0], h); 1720 XSetWMHints (dpy, parent, h);
1706 urgency_hint = enable; 1721 urgency_hint = enable;
1722 XFree (h);
1707 } 1723 }
1708} 1724}
1709#endif 1725#endif
1710 1726
1711void 1727void
… …
1717 want_refresh = 1; 1733 want_refresh = 1;
1718 1734
1719#if USE_XIM 1735#if USE_XIM
1720 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1721 { 1737 {
1722 IMSetPosition (); 1738 im_set_position ();
1723 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1724 } 1740 }
1725#endif 1741#endif
1726#if CURSOR_BLINK 1742#if CURSOR_BLINK
1727 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
… …
1818 * use the property to determine the pixmap. We use it later on. 1834 * use the property to determine the pixmap. We use it later on.
1819 */ 1835 */
1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1836 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1837 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822 { 1838 {
1823 bgPixmap.set_root_pixmap (); 1839 bg_set_root_pixmap ();
1824 update_background (); 1840 update_background ();
1825 } 1841 }
1826 1842
1827 break; 1843 break;
1828 } 1844 }
… …
1958 if (scrollBar.upButton (ev.y)) 1974 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */ 1975 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y)) 1976 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */ 1977 direction = DN; /* down */
1962 1978
1963 scrollBar.state = STATE_IDLE; 1979 scrollBar.state = SB_STATE_IDLE;
1964 /* 1980 /*
1965 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 1982 * move up if mouse is above slider
1967 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1968 * 1984 *
… …
2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2008#endif 2024#endif
2009 if (scr_page (direction, 1)) 2025 if (scr_page (direction, 1))
2010 { 2026 {
2011 if (direction == UP) 2027 if (direction == UP)
2012 scrollBar.state = STATE_UP; 2028 scrollBar.state = SB_STATE_UP;
2013 else 2029 else
2014 scrollBar.state = STATE_DOWN; 2030 scrollBar.state = SB_STATE_DOWN;
2015 } 2031 }
2016 } 2032 }
2017 else 2033 else
2018 switch (ev.button) 2034 switch (ev.button)
2019 { 2035 {
2020 case Button2: 2036 case Button2:
2021 switch (scrollBar.align) 2037 switch (scrollBar.align)
2022 { 2038 {
2023 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2024 csrO = 0; 2040 csrO = 0;
2025 break; 2041 break;
2026 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2027 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2028 break; 2044 break;
2029 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2030 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2031 break; 2047 break;
2032 } 2048 }
2033 2049
2034 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2035 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2038 2054
2039 scrollBar.state = STATE_MOTION; 2055 scrollBar.state = SB_STATE_MOTION;
2040 break; 2056 break;
2041 2057
2042 case Button1: 2058 case Button1:
2043 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2044 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2045 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2046 2062
2047 case Button3: 2063 case Button3:
2048 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2049 { 2065 {
2050 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2052 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2053# else 2069# else
2054 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2055# endif 2071# endif
2056 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2057# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2058 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2059# else 2075# else
2060 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2061# endif 2077# endif
2062 else 2078 else
2063 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2064 } 2080 }
2065 else 2081 else
2066 { 2082 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2084 (nrow
2069 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2070 / scrollBar.size ())); 2086 / scrollBar.size ()));
2071 } 2087 }
2072 2088
2073 break; 2089 break;
2074 } 2090 }
… …
2085 2101
2086 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2087 if (!bypass_keystate) 2103 if (!bypass_keystate)
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2105
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2091 { 2107 {
2092 scrollBar.state = STATE_IDLE; 2108 scrollBar.state = SB_STATE_IDLE;
2093 scrollBar.show (0); 2109 scrollBar.show (0);
2094 } 2110 }
2095 2111
2096#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
… …
2200 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2201 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2202 2218
2203 for (;;) 2219 for (;;)
2204 { 2220 {
2205 if (expect_false (ch == NOCHAR)) 2221 if (ecb_unlikely (ch == NOCHAR))
2206 { 2222 {
2207 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2208 ch = next_char (); 2224 ch = next_char ();
2209 2225
2210 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2211 break; 2227 break;
2212 } 2228 }
2213 2229
2214 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2230 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2215 { 2231 {
2216 if (expect_false (!seen_input)) 2232 if (ecb_unlikely (!seen_input))
2217 { 2233 {
2218 seen_input = 1; 2234 seen_input = 1;
2219 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2220 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2221 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2234 wchar_t *str = buf; 2250 wchar_t *str = buf;
2235 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2236 2252
2237 for (;;) 2253 for (;;)
2238 { 2254 {
2239 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2255 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2240 break; 2256 break;
2241 2257
2242 *str++ = ch; 2258 *str++ = ch;
2243 2259
2244 if (expect_false (ch == C0_LF || str >= eol)) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2245 { 2261 {
2246 if (ch == C0_LF) 2262 if (ch == C0_LF)
2247 nlines++; 2263 nlines++;
2248 2264
2249 refresh_count++; 2265 refresh_count++;
… …
2327rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2328{ 2344{
2329 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2330 { 2346 {
2331 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2332 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2333 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2334 2350
2335 wchar_t wc; 2351 wchar_t wc;
2336 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2352 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2337 2353
… …
2365 : NOCHAR; 2381 : NOCHAR;
2366} 2382}
2367 2383
2368static class out_of_input out_of_input; 2384static class out_of_input out_of_input;
2369 2385
2370/* rxvt_cmd_getc () - Return next input character */
2371/*
2372 * Return the next input character after first passing any keyboard input
2373 * to the command.
2374 */
2375wchar_t 2386wchar_t
2376rxvt_term::cmd_getc () THROW ((class out_of_input)) 2387rxvt_term::cmd_getc () THROW ((class out_of_input))
2377{ 2388{
2378 wchar_t c = next_char (); 2389 wchar_t c = next_char ();
2379 2390
… …
2472 pclose_printer (fd); 2483 pclose_printer (fd);
2473} 2484}
2474#endif /* PRINTPIPE */ 2485#endif /* PRINTPIPE */
2475/*}}} */ 2486/*}}} */
2476 2487
2477/* *INDENT-OFF* */
2478enum { 2488enum {
2479 C1_40 = 0x40, 2489 C1_40 = 0x40,
2480 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2490 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2481 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2491 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2482 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2492 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2483 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2493 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2484}; 2494};
2485/* *INDENT-ON* */
2486 2495
2487/*{{{ process non-printing single characters */ 2496/*{{{ process non-printing single characters */
2488void 2497void
2489rxvt_term::process_nonprinting (unicode_t ch) 2498rxvt_term::process_nonprinting (unicode_t ch)
2490{ 2499{
… …
2583 break; 2592 break;
2584 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586 break; 2595 break;
2587 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2588 set_privmode (PrivMode_vt52, 0); 2597 priv_modes &= ~PrivMode_vt52;
2589 break; 2598 break;
2590 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2591 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2592 /* unimplemented */ 2601 /* unimplemented */
2593 break; 2602 break;
… …
2612 return; 2621 return;
2613 } 2622 }
2614 2623
2615 switch (ch) 2624 switch (ch)
2616 { 2625 {
2617 /* case 1: do_tek_mode (); break; */
2618 case '#': 2626 case '#':
2619 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
2620 scr_E (); 2628 scr_E ();
2621 break; 2629 break;
2622 case '(': 2630 case '(':
… …
2645#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2646 case '9': 2654 case '9':
2647 scr_forwardindex (); 2655 scr_forwardindex ();
2648 break; 2656 break;
2649#endif 2657#endif
2658 // DECPAM/DECPNM
2650 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2651 case '>': 2662 case '>':
2652 set_privmode (PrivMode_aplKP, ch == '='); 2663 priv_modes &= ~PrivMode_aplKP;
2653 break; 2664 break;
2654 2665
2655 case C1_40: 2666 case C1_40:
2656 cmd_getc (); 2667 cmd_getc ();
2657 break; 2668 break;
… …
2661 2672
2662 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2663 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2664 { 2675 {
2665 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2666 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2667 } 2678 }
2668 break; 2679 break;
2669 2680
2670 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2671 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2672 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 */
2673 break; 2686 break;
2674 2687
2675 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2676 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2677 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2681 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2682 scr_index (DN); 2695 scr_index (DN);
2683 break; 2696 break;
2684 2697
2685 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2686 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2687 2700
2688 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2689 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2690 2703
2691 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2692 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2693 process_dcs_seq (); 2706 process_dcs_seq ();
2694 break; 2707 break;
… …
2727 } 2740 }
2728} 2741}
2729/*}}} */ 2742/*}}} */
2730 2743
2731/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2732/* *INDENT-OFF* */
2733enum { 2745enum {
2734 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2735 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,
2736 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 ,
2737 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,
… …
2740 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,
2741 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 ,
2742 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
2743}; 2755};
2744 2756
2745#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2747 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2748#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2749 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750 2762
2751const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2752 { 2764 {
2753 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, */
2754 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, */
2755 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, */
2756 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, [, \, ], ^, _, */
2757 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, */
2758 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, */
2759 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, */
2760 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, {, |, }, ~, */
2761 }; 2773 };
2762/* *INDENT-ON* */
2763 2774
2764void 2775void
2765rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2766{ 2777{
2767 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2845 { 2856 {
2846 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2847 scr_soft_reset (); 2858 scr_soft_reset ();
2848 2859
2849 static const int pm_h[] = { 7, 25 }; 2860 static const int pm_h[] = { 7, 25 };
2850 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 };
2851 2862
2852 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2863 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2853 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2864 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2854 } 2865 }
2855 break; 2866 break;
2856 } 2867 }
2857 2868
2858 return; 2869 return;
… …
2876 } 2887 }
2877 break; 2888 break;
2878#endif 2889#endif
2879 2890
2880 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2881 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2882 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2883 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2884 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2885 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2886 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2887 break; 2898 break;
2888 2899
2889 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2890 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3077 } 3088 }
3078} 3089}
3079/*}}} */ 3090/*}}} */
3080 3091
3081#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3082/* ARGSUSED */
3083void 3093void
3084rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3085{ 3095{
3086 int x, y; 3096 int x, y;
3087 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3096 { 3106 {
3097 /* 3107 /*
3098 * commands 3108 * commands
3099 */ 3109 */
3100 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3101 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3102 break; 3112 break;
3103 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3104 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3105 break; 3115 break;
3106 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3107 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3108 break; 3118 break;
3109 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3110 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3111 break; 3121 break;
3112 case 5: /* raise window */ 3122 case 5: /* raise window */
3113 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3114 break; 3124 break;
3115 case 6: /* lower window */ 3125 case 6: /* lower window */
3116 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3117 break; 3127 break;
3118 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3119 scr_touch (true); 3129 scr_touch (true);
3120 break; 3130 break;
3121 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3132 3142
3133 /* 3143 /*
3134 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3135 */ 3145 */
3136 case 11: /* report window state */ 3146 case 11: /* report window state */
3137 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3138 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3139 break; 3149 break;
3140 case 13: /* report window position */ 3150 case 13: /* report window position */
3141 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3142 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3143 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3144 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3145 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3146 break; 3156 break;
3147 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3148 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3149 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3150 break; 3160 break;
3151 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3152 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3153 break; 3163 break;
… …
3155 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3156 break; 3166 break;
3157 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3158 { 3168 {
3159 char *s; 3169 char *s;
3160 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3161 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 */
3162 XFree (s); 3172 XFree (s);
3163 } 3173 }
3164 break; 3174 break;
3165 case 21: /* report window title */ 3175 case 21: /* report window title */
3166 { 3176 {
3167 char *s; 3177 char *s;
3168 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3169 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 */
3170 XFree (s); 3180 XFree (s);
3171 } 3181 }
3172 break; 3182 break;
3173 } 3183 }
… …
3327 unsigned long bytes_after; 3337 unsigned long bytes_after;
3328 unsigned char *value = 0; 3338 unsigned char *value = 0;
3329 const char *str = ""; 3339 const char *str = "";
3330 3340
3331 if (prop 3341 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3342 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3343 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3344 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3345 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3346 && actual_type != None
3337 && actual_format == 8) 3347 && actual_format == 8)
… …
3349 { 3359 {
3350 *eq = 0; 3360 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3361 set_utf8_property (display->atom (str), eq + 1);
3352 } 3362 }
3353 else 3363 else
3354 XDeleteProperty (dpy, parent[0], 3364 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3365 display->atom (str));
3356 } 3366 }
3357 break; 3367 break;
3358 3368
3359 case XTerm_Color: 3369 case XTerm_Color:
… …
3420 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3421 { 3431 {
3422 bool changed = false; 3432 bool changed = false;
3423 3433
3424 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3428 3436
3429 if (changed) 3437 if (changed)
3430 update_background (); 3438 update_background ();
3431 } 3439 }
3432 3440
… …
3438 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3439 { 3447 {
3440 char str[256]; 3448 char str[256];
3441 3449
3442 sprintf (str, "[%dx%d+%d+%d]", 3450 sprintf (str, "[%dx%d+%d+%d]",
3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3445 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3446 } 3454 }
3447 else 3455 else
3448 { 3456 {
3449 int changed = 0; 3457 bool changed = false;
3450 3458
3451 if (*str != ';') 3459 if (*str != ';')
3452 { 3460 {
3453 /* reset to default scaling :*/
3454 bgPixmap.unset_geometry ();
3455 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3456 changed++; 3462 changed = true;
3457 str = strchr (str, ';');
3458 if (str == NULL)
3459 bgPixmap.set_defaultGeometry ();
3460 } 3463 }
3461 3464 else
3462 while (str)
3463 { 3465 {
3464 str++; 3466 str++;
3465 if (bgPixmap.set_geometry (str)) 3467 if (bg_set_geometry (str, true))
3466 changed++; 3468 changed = true;
3467 str = strchr (str, ';');
3468 } 3469 }
3469 3470
3470 if (changed) 3471 if (changed)
3472 {
3473 if (bg_window_position_sensitive ())
3474 {
3475 int x, y;
3476 get_window_origin (x, y);
3477 bg_set_position (x, y);
3478 }
3471 update_background (); 3479 update_background ();
3480 }
3472 } 3481 }
3473 break; 3482 break;
3474#endif 3483#endif
3475 3484
3476 case XTerm_logfile: 3485 case XTerm_logfile:
… …
3580 if (mode == 'r') 3589 if (mode == 'r')
3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3582 else 3591 else
3583 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3584 3593
3585 set_privmode (bit, state); 3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3586 } 3598 }
3587 3599
3588 return state; 3600 return state;
3589} 3601}
3590 3602
3591/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3592void 3604void
3593rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3605rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3594{ 3606{
3595 unsigned int i, j; 3607 unsigned int i, j;
3596 int state; 3608 int state;
3597 3609
3598 static const struct 3610 static const struct
3599 { 3611 {
3600 const int argval; 3612 const int argval;
3601 const unsigned long bit; 3613 const unsigned long bit;
3602 } argtopriv[] = { 3614 } argtopriv[] = {
3603 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3604 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3605 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3606 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3607 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3608 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3612 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scroll region 3625 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3629#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3620 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI 3634 // 45 margin bell NYI
3623 // 46 start logging 3635 // 46 start logging
3624 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3626#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3640#endif
3629 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent }, 3643 { 1003, PrivMode_MouseAnyEvent },
3644#if ENABLE_FRILLS
3645 { 1005, PrivMode_ExtModeMouse },
3646#endif
3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 { 1011, PrivMode_Keypress }, // rxvt extension 3648 { 1011, PrivMode_Keypress }, // rxvt extension
3649#if ENABLE_FRILLS
3650 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3651#endif
3634 // 1035 enable modifiers for alt, numlock NYI 3652 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI 3653 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI 3654 // 1037 send DEL for keypad delete NYI
3637 { 1047, PrivMode_Screen }, 3655 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor 3656 // 1048 save and restore cursor, implemented in code
3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3657 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3658 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste }, 3659 { 2004, PrivMode_BracketPaste },
3642 }; 3660 };
3643 3661
… …
3653 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3654 { 3672 {
3655 state = -1; 3673 state = -1;
3656 3674
3657 /* basic handling */ 3675 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3660 { 3678 {
3661 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3662 break; 3680 break;
3663 } 3681 }
… …
3689 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3690 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3691 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3692 * within VT52 mode 3710 * within VT52 mode
3693 */ 3711 */
3694 set_privmode (PrivMode_vt52, 1); 3712 priv_modes |= PrivMode_vt52;
3695 break; 3713 break;
3696 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3697 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3699 break; 3717 break;
… …
3714 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3716 break; 3734 break;
3717#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3718 case scrollBar_esc: 3736 case scrollBar_esc:
3719 if (scrollBar.map (state)) 3737 scrollBar.map (state);
3720 {
3721 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3722 scr_touch (true); 3739 scr_touch (true);
3723 }
3724 break; 3740 break;
3725#endif 3741#endif
3726 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3727 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3728 break; 3744 break;
… …
3741 case 1003: 3757 case 1003:
3742 if (state) 3758 if (state)
3743 { 3759 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3760 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3761 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3762 mouse_row = mouse_col = 0;
3746 vt_emask_mouse = PointerMotionMask; 3763 vt_emask_mouse = PointerMotionMask;
3747 } 3764 }
3748 else 3765 else
3749 vt_emask_mouse = NoEventMask; 3766 vt_emask_mouse = NoEventMask;
3750 3767
… …
3935 } 3952 }
3936 } 3953 }
3937} 3954}
3938/*}}} */ 3955/*}}} */
3939 3956
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/* ------------------------------------------------------------------------- */ 3957/* ------------------------------------------------------------------------- */
3960 3958
3961/* 3959/*
3962 * Send printf () formatted output to the command. 3960 * Send printf () formatted output to the command.
3963 * Only use for small amounts of data. 3961 * Only use for small amounts of data.
… …
3976 3974
3977/* ---------------------------------------------------------------------- */ 3975/* ---------------------------------------------------------------------- */
3978/* Write data to the pty as typed by the user, pasted with the mouse, 3976/* 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. 3977 * or generated by us in response to a query ESC sequence.
3980 */ 3978 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3979static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982 3980
3983void 3981void
3984rxvt_term::tt_write (const char *data, unsigned int len) 3982rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 3983{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3984 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3991 3989
3992 if (v_buflen == 0) 3990 if (v_buflen == 0)
3993 { 3991 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 3992 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995 3993
3994 max_it (written, 0);
3995
3996 if ((unsigned int)written == len) 3996 if (written == len)
3997 return; 3997 return;
3998 3998
3999 data += written; 3999 data += written;
4000 len -= written; 4000 len -= written;
4001 } 4001 }
4002 4002
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4004
4005 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4006 v_buflen += len;
4007 4007
4008 pty_ev.set (ev::READ | ev::WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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