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.445 by sf-exg, Fri Apr 2 13:52:30 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 }
… …
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 645 unsigned int newlen = 1;
651 646
652 if (ev.state & ModNumLockMask) 647 if (ev.state & ModNumLockMask)
653 kp = false; 648 kp = false;
649
654 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
655 { 653 {
656#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace: 655 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
659 { 657 {
… …
778 } 776 }
779 777
780 if (newlen) 778 if (newlen)
781 len = strlen (kbuf); 779 len = strlen (kbuf);
782 780
781 if (len > 0)
782 {
783 /* 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 /*
784 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
785 */ 797 */
786#ifdef META8_OPTION 798#ifdef META8_OPTION
787 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
788 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
789#endif 801#endif
802 }
790 803
791 } 804 }
792 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
793 { 806 {
794 len = 1; 807 len = 1;
… …
827 if (view_start) 840 if (view_start)
828 { 841 {
829 view_start = 0; 842 view_start = 0;
830 want_refresh = 1; 843 want_refresh = 1;
831 } 844 }
832
833 /*
834 * these modifications only affect the static keybuffer
835 * pass Shift/Control indicators for function keys ending with `~'
836 *
837 * eg,
838 * Prior = "ESC[5~"
839 * Shift+Prior = "ESC[5$"
840 * Ctrl+Prior = "ESC[5^"
841 * Ctrl+Shift+Prior = "ESC[5@"
842 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
843 */
844 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
845 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
846 845
847 /* escape prefix */ 846 /* escape prefix */
848 if (meta 847 if (meta
849#ifdef META8_OPTION 848#ifdef META8_OPTION
850 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
886 commit_iso14755 (); 885 commit_iso14755 ();
887 886
888 return; 887 return;
889 } 888 }
890 889
891 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
892 if (i[0] == keysym) 891 if (i[0] == keysym)
893 { 892 {
894 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
895 commit_iso14755 (); 894 commit_iso14755 ();
896 895
… …
933 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
934 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
935#endif 934#endif
936} 935}
937 936
938#if defined (KEYSYM_RESOURCE)
939unsigned int
940rxvt_term::cmd_write (const char *str, unsigned int count)
941{
942 unsigned int n, s;
943
944 n = cmdbuf_ptr - cmdbuf_base;
945 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
946
947 if (n > 0 && s < count)
948 {
949 memmove (cmdbuf_base, cmdbuf_ptr,
950 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
951 cmdbuf_ptr = cmdbuf_base;
952 cmdbuf_endp -= n;
953 s += n;
954 }
955
956 if (count > s)
957 {
958 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
959 count = s;
960 }
961
962 for (; count--;)
963 *cmdbuf_endp++ = *str++;
964
965 cmd_parse ();
966
967 return 0;
968}
969#endif
970
971void 937void
972rxvt_term::flush () 938rxvt_term::flush ()
973{ 939{
974 flush_ev.stop (); 940 flush_ev.stop ();
975 941
976#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
977 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
978 { 944 {
979// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
980 scr_touch (false); 946 scr_touch (false);
981 } 947 }
982#endif 948#endif
983 949
984 if (want_refresh) 950 if (want_refresh)
… …
1022 } 988 }
1023 989
1024 scr_refresh (); 990 scr_refresh ();
1025 scrollBar.show (1); 991 scrollBar.show (1);
1026#ifdef USE_XIM 992#ifdef USE_XIM
1027 IMSendSpot (); 993 im_send_spot ();
1028#endif 994#endif
1029 } 995 }
1030 996
1031 display->flush (); 997 display->flush ();
1032} 998}
… …
1077 1043
1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1044#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1079void 1045void
1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1046rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1081{ 1047{
1082 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1048 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1083 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1049 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1084 { 1050 {
1085 want_refresh = 1; 1051 want_refresh = 1;
1086 refresh_check (); 1052 refresh_check ();
1087 } 1053 }
1088 else 1054 else
… …
1149 { 1115 {
1150 } 1116 }
1151} event_handler; 1117} event_handler;
1152#endif 1118#endif
1153 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
1154bool 1153bool
1155rxvt_term::pty_fill () 1154rxvt_term::pty_fill ()
1156{ 1155{
1157 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1156 cmdbuf_reify ();
1158 1157
1159 if (CBUFSIZ == n) 1158 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1160 { 1159
1161 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1160 if (!avail)
1162 n = 0;
1163 } 1161 {
1164 1162 // normally this indicates a "too long" command sequence - just drop the data we have
1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1166 cmdbuf_ptr = cmdbuf_base; 1163 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1164 cmdbuf_endp = cmdbuf_ptr;
1165 avail = CBUFSIZ;
1166 }
1168 1167
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1168 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1169
1171 if (r > 0) 1170 if (r > 0)
1172 { 1171 {
1173 cmdbuf_endp += r; 1172 cmdbuf_endp += r;
1174 return true; 1173 return true;
… …
1248{ 1247{
1249 int button_number, key_state = 0; 1248 int button_number, key_state = 0;
1250 int x, y; 1249 int x, y;
1251 int code = 32; 1250 int code = 32;
1252 1251
1253 x = Pixel2Col (ev.x); 1252 x = Pixel2Col (ev.x) + 1;
1254 y = Pixel2Row (ev.y); 1253 y = Pixel2Row (ev.y) + 1;
1254
1255 if (ev.type == MotionNotify) 1255 if (ev.type == MotionNotify)
1256 { 1256 {
1257 if (x == mouse_row && y == mouse_col) 1257 if (x == mouse_row && y == mouse_col)
1258 return; 1258 return;
1259
1259 mouse_row = x; 1260 mouse_row = x;
1260 mouse_col = y; 1261 mouse_col = y;
1261 code += 32; 1262 code += 32;
1262 } 1263 }
1263 1264
… …
1266 else 1267 else
1267 { 1268 {
1268 button_number = MEvent.button - Button1; 1269 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1270 /* add 0x3D for wheel events, like xterm does */
1270 if (button_number >= 3) 1271 if (button_number >= 3)
1271 button_number += (64 - 3); 1272 button_number += 64 - 3;
1272 } 1273 }
1273 1274
1274 if (priv_modes & PrivMode_MouseX10) 1275 if (priv_modes & PrivMode_MouseX10)
1275 { 1276 {
1276 /* 1277 /*
… …
1308 fputc ('A', stderr); 1309 fputc ('A', stderr);
1309 if (key_state & 32) 1310 if (key_state & 32)
1310 fputc ('2', stderr); 1311 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1312 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1313 button_number,
1313 x + 1, 1314 x,
1314 y + 1); 1315 y);
1315#endif 1316#endif
1316 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
1317 tt_printf ("\033[M%c%c%c", 1331 tt_printf ("\033[M%c%c%c",
1318 (code + button_number + key_state), 1332 code + button_number + key_state,
1319 (32 + x + 1), 1333 32 + x,
1320 (32 + y + 1)); 1334 32 + y);
1321} 1335}
1322 1336
1323/*{{{ process an X event */ 1337/*{{{ process an X event */
1324void 1338void
1325rxvt_term::x_cb (XEvent &ev) 1339rxvt_term::x_cb (XEvent &ev)
… …
1427 && ev.xfocus.mode != NotifyGrab) 1441 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1442 focus_out ();
1429 break; 1443 break;
1430 1444
1431 case ConfigureNotify: 1445 case ConfigureNotify:
1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height);*/
1435 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent)
1436 { 1447 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 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
1439 1469
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1471 {
1442 seen_resize = 1; 1472 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1474 }
1445 else 1475 else
1446 { 1476 {
1447#ifdef HAVE_BG_PIXMAP 1477#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped) 1478 if (moved)
1451 update_background (); 1479 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1455#endif 1480#endif
1456 } 1481 }
1457 1482
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1484 }
1460 break; 1485 break;
1461 1486
1462 case PropertyNotify: 1487 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1488 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1489 break;
1469 1490
1470 case SelectionClear: 1491 case SelectionClear:
1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1492 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1493 break;
1473 1494
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break;
1478
1479 case SelectionRequest: 1495 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1496 selection_send (ev.xselectionrequest);
1481 break; 1497 break;
1482 1498
1483 case MapNotify: 1499 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP 1500#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a 1501 /* This is needed specifically to fix the case of no window manager or a
1486 * non-reparenting window manager. In those cases we never get first 1502 * non-reparenting window manager. In those cases we never get first
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1503 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does 1504 * care of multiplicity of ConfigureNotify events arriving while WM does
1489 * reparenting. 1505 * reparenting.
1490 * We should not render background immidiately, as there could be several 1506 * We should not render background immediately, as there could be several
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1507 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1492 * 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
1493 * bit of time for ConfigureNotifies to arrive. 1509 * bit of time for ConfigureNotifies to arrive.
1494 * 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
1495 * of ConfigureNotifys for the best results. 1511 * of ConfigureNotifys for the best results.
1496 */ 1512 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1513 if (!(bg_flags & BG_IS_VALID))
1498 update_background_ev.start (0.025); 1514 update_background_ev.start (0.025);
1499#endif 1515#endif
1500 mapped = 1; 1516 mapped = 1;
1501#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1518 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1533 if (ev.xany.window == vt)
1518 { 1534 {
1519 do 1535 do
1520 { 1536 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1539 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1541
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1542 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1543
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1545 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1548 }
1533 1549
1534 want_refresh = 1; 1550 want_refresh = 1;
1535 } 1551 }
1536 else 1552 else
… …
1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1558 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1543 ; 1559 ;
1544 1560
1545 if (scrollBar.state && ev.xany.window == scrollBar.win) 1561 if (scrollBar.state && ev.xany.window == scrollBar.win)
1546 { 1562 {
1547 scrollBar.state = STATE_IDLE; 1563 scrollBar.state = SB_STATE_IDLE;
1548 scrollBar.show (0); 1564 scrollBar.show (0);
1549 } 1565 }
1550 } 1566 }
1551 break; 1567 break;
1552 1568
… …
1640#ifdef MOUSE_THRESHOLD 1656#ifdef MOUSE_THRESHOLD
1641 } 1657 }
1642#endif 1658#endif
1643 } 1659 }
1644 } 1660 }
1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1661 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1662 {
1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1663 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1664 MotionNotify, &ev))
1649 ; 1665 ;
1650 1666
1651 XQueryPointer (dpy, scrollBar.win, 1667 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1668 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1669 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1670 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1671 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1672 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1657 scrollBar.size ()); 1673 scrollBar.size ());
1658 want_refresh = 1; 1674 want_refresh = 1;
1659 scrollBar.show (1); 1675 scrollBar.show (1);
1660 } 1676 }
1661 break; 1677 break;
… …
1696rxvt_term::set_urgency (bool enable) 1712rxvt_term::set_urgency (bool enable)
1697{ 1713{
1698 if (enable == urgency_hint) 1714 if (enable == urgency_hint)
1699 return; 1715 return;
1700 1716
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1717 if (XWMHints *h = XGetWMHints (dpy, parent))
1702 { 1718 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1719 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h); 1720 XSetWMHints (dpy, parent, h);
1705 urgency_hint = enable; 1721 urgency_hint = enable;
1722 XFree (h);
1706 } 1723 }
1707} 1724}
1708#endif 1725#endif
1709 1726
1710void 1727void
… …
1716 want_refresh = 1; 1733 want_refresh = 1;
1717 1734
1718#if USE_XIM 1735#if USE_XIM
1719 if (Input_Context != NULL) 1736 if (Input_Context != NULL)
1720 { 1737 {
1721 IMSetPosition (); 1738 im_set_position ();
1722 XSetICFocus (Input_Context); 1739 XSetICFocus (Input_Context);
1723 } 1740 }
1724#endif 1741#endif
1725#if CURSOR_BLINK 1742#if CURSOR_BLINK
1726 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
… …
1817 * 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.
1818 */ 1835 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1836 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1837 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1838 {
1822 bgPixmap.set_root_pixmap (); 1839 bg_set_root_pixmap ();
1823 update_background (); 1840 update_background ();
1824 } 1841 }
1825 1842
1826 break; 1843 break;
1827 } 1844 }
… …
1866 /* save the xbutton state (for ButtonRelease) */ 1883 /* save the xbutton state (for ButtonRelease) */
1867 MEvent.state = ev.state; 1884 MEvent.state = ev.state;
1868#ifdef MOUSE_REPORT_DOUBLECLICK 1885#ifdef MOUSE_REPORT_DOUBLECLICK
1869 if (ev.button == MEvent.button && clickintime) 1886 if (ev.button == MEvent.button && clickintime)
1870 { 1887 {
1871 /* same button, within alloted time */ 1888 /* same button, within allowed time */
1872 MEvent.clicks++; 1889 MEvent.clicks++;
1873 1890
1874 if (MEvent.clicks > 1) 1891 if (MEvent.clicks > 1)
1875 { 1892 {
1876 /* only report double clicks */ 1893 /* only report double clicks */
… …
1957 if (scrollBar.upButton (ev.y)) 1974 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */ 1975 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y)) 1976 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */ 1977 direction = DN; /* down */
1961 1978
1962 scrollBar.state = STATE_IDLE; 1979 scrollBar.state = SB_STATE_IDLE;
1963 /* 1980 /*
1964 * Rxvt-style scrollbar: 1981 * Rxvt-style scrollbar:
1965 * move up if mouse is above slider 1982 * move up if mouse is above slider
1966 * move dn if mouse is below slider 1983 * move dn if mouse is below slider
1967 * 1984 *
… …
2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2023 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 2024#endif
2008 if (scr_page (direction, 1)) 2025 if (scr_page (direction, 1))
2009 { 2026 {
2010 if (direction == UP) 2027 if (direction == UP)
2011 scrollBar.state = STATE_UP; 2028 scrollBar.state = SB_STATE_UP;
2012 else 2029 else
2013 scrollBar.state = STATE_DOWN; 2030 scrollBar.state = SB_STATE_DOWN;
2014 } 2031 }
2015 } 2032 }
2016 else 2033 else
2017 switch (ev.button) 2034 switch (ev.button)
2018 { 2035 {
2019 case Button2: 2036 case Button2:
2020 switch (scrollBar.align) 2037 switch (scrollBar.align)
2021 { 2038 {
2022 case R_SB_ALIGN_TOP: 2039 case SB_ALIGN_TOP:
2023 csrO = 0; 2040 csrO = 0;
2024 break; 2041 break;
2025 case R_SB_ALIGN_CENTRE: 2042 case SB_ALIGN_CENTRE:
2026 csrO = (scrollBar.bot - scrollBar.top) / 2; 2043 csrO = (scrollBar.bot - scrollBar.top) / 2;
2027 break; 2044 break;
2028 case R_SB_ALIGN_BOTTOM: 2045 case SB_ALIGN_BOTTOM:
2029 csrO = scrollBar.bot - scrollBar.top; 2046 csrO = scrollBar.bot - scrollBar.top;
2030 break; 2047 break;
2031 } 2048 }
2032 2049
2033 if (scrollBar.style == R_SB_XTERM 2050 if (scrollBar.style == SB_STYLE_XTERM
2034 || scrollbar_above_slider (ev.y) 2051 || scrollBar.above_slider (ev.y)
2035 || scrollbar_below_slider (ev.y)) 2052 || scrollBar.below_slider (ev.y))
2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2053 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2037 2054
2038 scrollBar.state = STATE_MOTION; 2055 scrollBar.state = SB_STATE_MOTION;
2039 break; 2056 break;
2040 2057
2041 case Button1: 2058 case Button1:
2042 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2059 if (scrollBar.align == SB_ALIGN_CENTRE)
2043 csrO = ev.y - scrollBar.top; 2060 csrO = ev.y - scrollBar.top;
2044 /* FALLTHROUGH */ 2061 /* FALLTHROUGH */
2045 2062
2046 case Button3: 2063 case Button3:
2047 if (scrollBar.style != R_SB_XTERM) 2064 if (scrollBar.style != SB_STYLE_XTERM)
2048 { 2065 {
2049 if (scrollbar_above_slider (ev.y)) 2066 if (scrollBar.above_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2067# ifdef RXVT_SCROLL_FULL
2051 scr_page (UP, nrow - 1); 2068 scr_page (UP, nrow - 1);
2052# else 2069# else
2053 scr_page (UP, nrow / 4); 2070 scr_page (UP, nrow / 4);
2054# endif 2071# endif
2055 else if (scrollbar_below_slider (ev.y)) 2072 else if (scrollBar.below_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2073# ifdef RXVT_SCROLL_FULL
2057 scr_page (DN, nrow - 1); 2074 scr_page (DN, nrow - 1);
2058# else 2075# else
2059 scr_page (DN, nrow / 4); 2076 scr_page (DN, nrow / 4);
2060# endif 2077# endif
2061 else 2078 else
2062 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2063 } 2080 }
2064 else 2081 else
2065 { 2082 {
2066 scr_page ((ev.button == Button1 ? DN : UP), 2083 scr_page ((ev.button == Button1 ? DN : UP),
2067 (nrow 2084 (nrow
2068 * scrollbar_position (ev.y) 2085 * scrollBar.position (ev.y)
2069 / scrollBar.size ())); 2086 / scrollBar.size ()));
2070 } 2087 }
2071 2088
2072 break; 2089 break;
2073 } 2090 }
… …
2084 2101
2085 csrO = 0; /* reset csr Offset */ 2102 csrO = 0; /* reset csr Offset */
2086 if (!bypass_keystate) 2103 if (!bypass_keystate)
2087 reportmode = !! (priv_modes & PrivMode_mouse_report); 2104 reportmode = !! (priv_modes & PrivMode_mouse_report);
2088 2105
2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2106 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2090 { 2107 {
2091 scrollBar.state = STATE_IDLE; 2108 scrollBar.state = SB_STATE_IDLE;
2092 scrollBar.show (0); 2109 scrollBar.show (0);
2093 } 2110 }
2094 2111
2095#ifdef SELECTION_SCROLLING 2112#ifdef SELECTION_SCROLLING
2096 sel_scroll_ev.stop(); 2113 sel_scroll_ev.stop();
… …
2147 selection_make (ev.time); 2164 selection_make (ev.time);
2148 break; 2165 break;
2149 2166
2150 case Button2: 2167 case Button2:
2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2153 break; 2170 break;
2154 2171
2155#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2156 case Button4: 2173 case Button4:
2157 case Button5: 2174 case Button5:
… …
2199 wchar_t ch = NOCHAR; 2216 wchar_t ch = NOCHAR;
2200 char *seq_begin; // remember start of esc-sequence here 2217 char *seq_begin; // remember start of esc-sequence here
2201 2218
2202 for (;;) 2219 for (;;)
2203 { 2220 {
2204 if (expect_false (ch == NOCHAR)) 2221 if (ecb_unlikely (ch == NOCHAR))
2205 { 2222 {
2206 seq_begin = cmdbuf_ptr; 2223 seq_begin = cmdbuf_ptr;
2207 ch = next_char (); 2224 ch = next_char ();
2208 2225
2209 if (ch == NOCHAR) 2226 if (ch == NOCHAR)
2210 break; 2227 break;
2211 } 2228 }
2212 2229
2213 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))
2214 { 2231 {
2215 if (expect_false (!seen_input)) 2232 if (ecb_unlikely (!seen_input))
2216 { 2233 {
2217 seen_input = 1; 2234 seen_input = 1;
2218 // many badly-written programs (e.g. jed) contain a race condition: 2235 // many badly-written programs (e.g. jed) contain a race condition:
2219 // they first read the screensize and then install a SIGWINCH handler. 2236 // they first read the screensize and then install a SIGWINCH handler.
2220 // some window managers resize the window early, and these programs 2237 // some window managers resize the window early, and these programs
… …
2233 wchar_t *str = buf; 2250 wchar_t *str = buf;
2234 wchar_t *eol = str + min (ncol, UBUFSIZ); 2251 wchar_t *eol = str + min (ncol, UBUFSIZ);
2235 2252
2236 for (;;) 2253 for (;;)
2237 { 2254 {
2238 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)))
2239 break; 2256 break;
2240 2257
2241 *str++ = ch; 2258 *str++ = ch;
2242 2259
2243 if (expect_false (ch == C0_LF || str >= eol)) 2260 if (ecb_unlikely (ch == C0_LF || str >= eol))
2244 { 2261 {
2245 if (ch == C0_LF) 2262 if (ch == C0_LF)
2246 nlines++; 2263 nlines++;
2247 2264
2248 refresh_count++; 2265 refresh_count++;
… …
2326rxvt_term::next_char () NOTHROW 2343rxvt_term::next_char () NOTHROW
2327{ 2344{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2345 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2346 {
2330 // assume 7-bit to be ascii ALWAYS 2347 // assume 7-bit to be ascii ALWAYS
2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2348 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2332 return *cmdbuf_ptr++; 2349 return *cmdbuf_ptr++;
2333 2350
2334 wchar_t wc; 2351 wchar_t wc;
2335 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);
2336 2353
… …
2364 : NOCHAR; 2381 : NOCHAR;
2365} 2382}
2366 2383
2367static class out_of_input out_of_input; 2384static class out_of_input out_of_input;
2368 2385
2369/* rxvt_cmd_getc () - Return next input character */
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t 2386wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2387rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2388{
2377 wchar_t c = next_char (); 2389 wchar_t c = next_char ();
2378 2390
… …
2471 pclose_printer (fd); 2483 pclose_printer (fd);
2472} 2484}
2473#endif /* PRINTPIPE */ 2485#endif /* PRINTPIPE */
2474/*}}} */ 2486/*}}} */
2475 2487
2476/* *INDENT-OFF* */
2477enum { 2488enum {
2478 C1_40 = 0x40, 2489 C1_40 = 0x40,
2479 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,
2480 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,
2481 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,
2482 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,
2483}; 2494};
2484/* *INDENT-ON* */
2485 2495
2486/*{{{ process non-printing single characters */ 2496/*{{{ process non-printing single characters */
2487void 2497void
2488rxvt_term::process_nonprinting (unicode_t ch) 2498rxvt_term::process_nonprinting (unicode_t ch)
2489{ 2499{
… …
2582 break; 2592 break;
2583 case 'Z': /* identify the terminal type */ 2593 case 'Z': /* identify the terminal type */
2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2594 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2585 break; 2595 break;
2586 case '<': /* turn off VT52 mode */ 2596 case '<': /* turn off VT52 mode */
2587 set_privmode (PrivMode_vt52, 0); 2597 priv_modes &= ~PrivMode_vt52;
2588 break; 2598 break;
2589 case 'F': /* use special graphics character set */ 2599 case 'F': /* use special graphics character set */
2590 case 'G': /* use regular character set */ 2600 case 'G': /* use regular character set */
2591 /* unimplemented */ 2601 /* unimplemented */
2592 break; 2602 break;
… …
2611 return; 2621 return;
2612 } 2622 }
2613 2623
2614 switch (ch) 2624 switch (ch)
2615 { 2625 {
2616 /* case 1: do_tek_mode (); break; */
2617 case '#': 2626 case '#':
2618 if (cmd_getc () == '8') 2627 if (cmd_getc () == '8')
2619 scr_E (); 2628 scr_E ();
2620 break; 2629 break;
2621 case '(': 2630 case '(':
… …
2644#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2645 case '9': 2654 case '9':
2646 scr_forwardindex (); 2655 scr_forwardindex ();
2647 break; 2656 break;
2648#endif 2657#endif
2658 // DECPAM/DECPNM
2649 case '=': 2659 case '=':
2660 priv_modes |= PrivMode_aplKP;
2661 break;
2650 case '>': 2662 case '>':
2651 set_privmode (PrivMode_aplKP, ch == '='); 2663 priv_modes &= ~PrivMode_aplKP;
2652 break; 2664 break;
2653 2665
2654 case C1_40: 2666 case C1_40:
2655 cmd_getc (); 2667 cmd_getc ();
2656 break; 2668 break;
… …
2660 2672
2661 /* 8.3.87: NEXT LINE */ 2673 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2674 case C1_NEL: /* ESC E */
2663 { 2675 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2676 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2677 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2666 } 2678 }
2667 break; 2679 break;
2668 2680
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2681 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2682 case C1_ESA: /* ESC G */
2671 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 */
2672 break; 2686 break;
2673 2687
2674 /* 8.3.63: CHARACTER TABULATION SET */ 2688 /* 8.3.63: CHARACTER TABULATION SET */
2675 case C1_HTS: /* ESC H */ 2689 case C1_HTS: /* ESC H */
2676 scr_set_tab (1); 2690 scr_set_tab (1);
… …
2680 case C1_RI: /* ESC M */ 2694 case C1_RI: /* ESC M */
2681 scr_index (DN); 2695 scr_index (DN);
2682 break; 2696 break;
2683 2697
2684 /* 8.3.142: SINGLE-SHIFT TWO */ 2698 /* 8.3.142: SINGLE-SHIFT TWO */
2685 /*case C1_SS2: scr_single_shift (2); break; */ 2699 /* case C1_SS2: break; */
2686 2700
2687 /* 8.3.143: SINGLE-SHIFT THREE */ 2701 /* 8.3.143: SINGLE-SHIFT THREE */
2688 /*case C1_SS3: scr_single_shift (3); break; */ 2702 /* case C1_SS3: break; */
2689 2703
2690 /* 8.3.27: DEVICE CONTROL STRING */ 2704 /* 8.3.27: DEVICE CONTROL STRING */
2691 case C1_DCS: /* ESC P */ 2705 case C1_DCS: /* ESC P */
2692 process_dcs_seq (); 2706 process_dcs_seq ();
2693 break; 2707 break;
… …
2726 } 2740 }
2727} 2741}
2728/*}}} */ 2742/*}}} */
2729 2743
2730/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2744/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2731/* *INDENT-OFF* */
2732enum { 2745enum {
2733 CSI_ICH = 0x40, 2746 CSI_ICH = 0x40,
2734 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,
2735 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 ,
2736 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,
… …
2739 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,
2740 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 ,
2741 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
2742}; 2755};
2743 2756
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2757#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2758 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2759 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2760#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2761 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2762
2750const unsigned char csi_defaults[] = 2763static const unsigned char csi_defaults[] =
2751 { 2764 {
2752 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, */
2753 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, */
2754 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, */
2755 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, [, \, ], ^, _, */
2756 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, */
2757 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, */
2758 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, */
2759 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, {, |, }, ~, */
2760 }; 2773 };
2761/* *INDENT-ON* */
2762 2774
2763void 2775void
2764rxvt_term::process_csi_seq () 2776rxvt_term::process_csi_seq ()
2765{ 2777{
2766 unicode_t ch, priv, i; 2778 unicode_t ch, priv, i;
… …
2844 { 2856 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2857 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2858 scr_soft_reset ();
2847 2859
2848 static const int pm_h[] = { 7, 25 }; 2860 static const int pm_h[] = { 7, 25 };
2849 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 };
2850 2862
2851 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);
2852 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);
2853 } 2865 }
2854 break; 2866 break;
2855 } 2867 }
2856 2868
2857 return; 2869 return;
… …
2875 } 2887 }
2876 break; 2888 break;
2877#endif 2889#endif
2878 2890
2879 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2891 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2880 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2892 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2881 arg[0] = -arg[0]; 2893 arg[0] = -arg[0];
2882 /* FALLTHROUGH */ 2894 /* FALLTHROUGH */
2883 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2895 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2884 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2896 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2885 scr_gotorc (arg[0], 0, RELATIVE); 2897 scr_gotorc (arg[0], 0, RELATIVE);
2886 break; 2898 break;
2887 2899
2888 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2900 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2889 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2901 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3076 } 3088 }
3077} 3089}
3078/*}}} */ 3090/*}}} */
3079 3091
3080#if !ENABLE_MINIMAL 3092#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3093void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3094rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3095{
3085 int x, y; 3096 int x, y;
3086 XWindowAttributes wattr; 3097 XWindowAttributes wattr;
… …
3095 { 3106 {
3096 /* 3107 /*
3097 * commands 3108 * commands
3098 */ 3109 */
3099 case 1: /* deiconify window */ 3110 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3111 XMapWindow (dpy, parent);
3101 break; 3112 break;
3102 case 2: /* iconify window */ 3113 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3114 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3115 break;
3105 case 3: /* set position (pixels) */ 3116 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3117 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3118 break;
3108 case 4: /* set size (pixels) */ 3119 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3120 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3121 break;
3111 case 5: /* raise window */ 3122 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3123 XRaiseWindow (dpy, parent);
3113 break; 3124 break;
3114 case 6: /* lower window */ 3125 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3126 XLowerWindow (dpy, parent);
3116 break; 3127 break;
3117 case 7: /* refresh window */ 3128 case 7: /* refresh window */
3118 scr_touch (true); 3129 scr_touch (true);
3119 break; 3130 break;
3120 case 8: /* set size (chars) */ 3131 case 8: /* set size (chars) */
… …
3131 3142
3132 /* 3143 /*
3133 * reports - some output format copied from XTerm 3144 * reports - some output format copied from XTerm
3134 */ 3145 */
3135 case 11: /* report window state */ 3146 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3148 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3149 break;
3139 case 13: /* report window position */ 3150 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3152 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3153 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3154 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3155 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3156 break;
3146 case 14: /* report window size (pixels) */ 3157 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3159 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3160 break;
3150 case 18: /* report text area size (chars) */ 3161 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3163 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3166 break;
3156 case 20: /* report icon label */ 3167 case 20: /* report icon label */
3157 { 3168 {
3158 char *s; 3169 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3170 XGetIconName (dpy, parent, &s);
3160 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 */
3161 XFree (s); 3172 XFree (s);
3162 } 3173 }
3163 break; 3174 break;
3164 case 21: /* report window title */ 3175 case 21: /* report window title */
3165 { 3176 {
3166 char *s; 3177 char *s;
3167 XFetchName (dpy, parent[0], &s); 3178 XFetchName (dpy, parent, &s);
3168 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 */
3169 XFree (s); 3180 XFree (s);
3170 } 3181 }
3171 break; 3182 break;
3172 } 3183 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3239 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3240 */
3230void 3241void
3231rxvt_term::process_dcs_seq () 3242rxvt_term::process_dcs_seq ()
3232{ 3243{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3244 /*
3237 * Not handled yet 3245 * Not handled yet
3238 */ 3246 */
3247
3248 unicode_t eh;
3239 s = get_to_st (eh); 3249 char *s = get_to_st (eh);
3240 if (s) 3250 if (s)
3241 free (s); 3251 free (s);
3242 3252
3243 return; 3253 return;
3244} 3254}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3258 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3259 */
3250void 3260void
3251rxvt_term::process_osc_seq () 3261rxvt_term::process_osc_seq ()
3252{ 3262{
3253 unicode_t ch, eh;
3254 int arg; 3263 int arg;
3255 3264
3256 ch = cmd_getc (); 3265 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3266 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3267 arg = arg * 10 + (ch - '0');
3259 3268
3260 if (ch == ';') 3269 if (ch == ';')
3261 { 3270 {
3271 unicode_t eh;
3262 char *s = get_to_st (eh); 3272 char *s = get_to_st (eh);
3263 3273
3264 if (s) 3274 if (s)
3265 { 3275 {
3266 process_xterm_seq (arg, s, eh); 3276 process_xterm_seq (arg, s, eh);
… …
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:
… …
3391 process_color_seq (op, Color_pointer_fg, str, resp); 3401 process_color_seq (op, Color_pointer_fg, str, resp);
3392 break; 3402 break;
3393 case XTerm_Color_pointer_bg: 3403 case XTerm_Color_pointer_bg:
3394 process_color_seq (op, Color_pointer_bg, str, resp); 3404 process_color_seq (op, Color_pointer_bg, str, resp);
3395 break; 3405 break;
3406#ifdef OPTION_HC
3407 case XTerm_Color_HC:
3408 process_color_seq (op, Color_HC, str, resp);
3409 break;
3410 case XTerm_Color_HTC:
3411 process_color_seq (op, Color_HTC, str, resp);
3412 break;
3413#endif
3396#ifndef NO_BOLD_UNDERLINE_REVERSE 3414#ifndef NO_BOLD_UNDERLINE_REVERSE
3397 case XTerm_Color_RV:
3398 process_color_seq (op, Color_RV, str, resp);
3399 break;
3400 case Rxvt_Color_BD:
3401 case URxvt_Color_BD: 3415 case URxvt_Color_BD:
3402 process_color_seq (op, Color_BD, str, resp); 3416 process_color_seq (op, Color_BD, str, resp);
3403 break; 3417 break;
3404 case Rxvt_Color_UL:
3405 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3406 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3407 break; 3420 break;
3408 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3409 process_color_seq (op, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
… …
3417 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3418 { 3431 {
3419 bool changed = false; 3432 bool changed = false;
3420 3433
3421 if (ISSET_PIXCOLOR (Color_tint)) 3434 if (ISSET_PIXCOLOR (Color_tint))
3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3435 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3423 else
3424 changed = bgPixmap.unset_tint ();
3425 3436
3426 if (changed) 3437 if (changed)
3427 update_background (); 3438 update_background ();
3428 } 3439 }
3429 3440
… …
3435 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3436 { 3447 {
3437 char str[256]; 3448 char str[256];
3438 3449
3439 sprintf (str, "[%dx%d+%d+%d]", 3450 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3451 min (h_scale, 32767), min (v_scale, 32767),
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3452 min (h_align, 32767), min (v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3454 }
3444 else 3455 else
3445 { 3456 {
3446 int changed = 0; 3457 bool changed = false;
3447 3458
3448 if (*str != ';') 3459 if (*str != ';')
3449 { 3460 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3461 if (bg_set_file (str)) /* change pixmap */
3453 changed++; 3462 changed = true;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 } 3463 }
3458 3464 else
3459 while (str)
3460 { 3465 {
3461 str++; 3466 str++;
3462 if (bgPixmap.set_geometry (str)) 3467 if (bg_set_geometry (str, true))
3463 changed++; 3468 changed = true;
3464 str = strchr (str, ';');
3465 } 3469 }
3466 3470
3467 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 }
3468 update_background (); 3479 update_background ();
3480 }
3469 } 3481 }
3470 break; 3482 break;
3471#endif 3483#endif
3472 3484
3473 case XTerm_logfile: 3485 case XTerm_logfile:
… …
3576 { 3588 {
3577 if (mode == 'r') 3589 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3590 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3591 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3592 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581 set_privmode (bit, state); 3593
3594 if (state)
3595 priv_modes |= bit;
3596 else
3597 priv_modes &= ~bit;
3582 } 3598 }
3583 3599
3584 return state; 3600 return state;
3585} 3601}
3586 3602
3587/* we're not using priv _yet_ */ 3603/* we're not using priv _yet_ */
3588void 3604void
3589rxvt_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)
3590{ 3606{
3591 unsigned int i, j; 3607 unsigned int i, j;
3592 int state; 3608 int state;
3593 3609
3594 static const struct 3610 static const struct
3595 { 3611 {
3596 const int argval; 3612 const int argval;
3597 const unsigned long bit; 3613 const unsigned long bit;
3598 } argtopriv[] = { 3614 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, // DECCKM 3615 { 1, PrivMode_aplCUR }, // DECCKM
3600 { 2, PrivMode_vt52 }, 3616 { 2, PrivMode_vt52 }, // DECANM
3601 { 3, PrivMode_132 }, // DECCOLM 3617 { 3, PrivMode_132 }, // DECCOLM
3602 { 4, PrivMode_smoothScroll }, // DECSCLM 3618 { 4, PrivMode_smoothScroll }, // DECSCLM
3603 { 5, PrivMode_rVideo }, // DECSCNM 3619 { 5, PrivMode_rVideo }, // DECSCNM
3604 { 6, PrivMode_relOrigin }, // DECOM 3620 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, // DECAWM 3621 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, auto-repeat keys // DECARM 3622 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3623 { 9, PrivMode_MouseX10 },
3608 // 18 end FF to printer after print screen 3624 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region 3625 // 19 Print screen prints full screen/scroll region
3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3626 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3627#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3628 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3629#endif
3614 { 35, PrivMode_ShiftKeys }, // rxvt extension 3630 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK 3631 // 38, tektronix mode // DECTEK
3616 { 40, PrivMode_132OK }, 3632 { 40, PrivMode_132OK },
3617 // 41 xterm more fixes NYI 3633 // 41 xterm more fixes NYI
3618 // 45 margin bell NYI 3634 // 45 margin bell NYI
3619 // 46 start logging 3635 // 46 start logging
3620 { 47, PrivMode_Screen }, 3636 { 47, PrivMode_Screen },
3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3637 { 66, PrivMode_aplKP }, // DECNKM
3622#ifndef NO_BACKSPACE_KEY 3638#ifndef NO_BACKSPACE_KEY
3623 { 67, PrivMode_BackSpace }, // DECBKM 3639 { 67, PrivMode_BackSpace }, // DECBKM
3624#endif 3640#endif
3625 { 1000, PrivMode_MouseX11 }, 3641 { 1000, PrivMode_MouseX11 },
3626 { 1002, PrivMode_MouseBtnEvent }, 3642 { 1002, PrivMode_MouseBtnEvent },
3627 { 1003, PrivMode_MouseAnyEvent }, 3643 { 1003, PrivMode_MouseAnyEvent },
3644#if ENABLE_FRILLS
3645 { 1005, PrivMode_ExtModeMouse },
3646#endif
3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3647 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3629 { 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
3630 // 1035 enable modifiers for alt, numlock NYI 3652 // 1035 enable modifiers for alt, numlock NYI
3631 // 1036 send ESC for meta keys NYI 3653 // 1036 send ESC for meta keys NYI
3632 // 1037 send DEL for keypad delete NYI 3654 // 1037 send DEL for keypad delete NYI
3633 { 1047, PrivMode_Screen }, 3655 { 1047, PrivMode_Screen },
3634 // 1048 save and restore cursor 3656 // 1048 save and restore cursor, implemented in code
3635 { 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 */
3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3658 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste }, 3659 { 2004, PrivMode_BracketPaste },
3638 }; 3660 };
3639 3661
… …
3649 for (i = 0; i < nargs; i++) 3671 for (i = 0; i < nargs; i++)
3650 { 3672 {
3651 state = -1; 3673 state = -1;
3652 3674
3653 /* basic handling */ 3675 /* basic handling */
3654 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3676 for (j = 0; j < ecb_array_length (argtopriv); j++)
3655 if (argtopriv[j].argval == arg[i]) 3677 if (argtopriv[j].argval == arg[i])
3656 { 3678 {
3657 state = privcases (mode, argtopriv[j].bit); 3679 state = privcases (mode, argtopriv[j].bit);
3658 break; 3680 break;
3659 } 3681 }
… …
3685 case 2: /* VT52 mode */ 3707 case 2: /* VT52 mode */
3686 /* oddball mode. should be set regardless of set/reset 3708 /* oddball mode. should be set regardless of set/reset
3687 * parameter. Return from VT52 mode with an ESC < from 3709 * parameter. Return from VT52 mode with an ESC < from
3688 * within VT52 mode 3710 * within VT52 mode
3689 */ 3711 */
3690 set_privmode (PrivMode_vt52, 1); 3712 priv_modes |= PrivMode_vt52;
3691 break; 3713 break;
3692 case 3: /* 80/132 */ 3714 case 3: /* 80/132 */
3693 if (priv_modes & PrivMode_132OK) 3715 if (priv_modes & PrivMode_132OK)
3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3716 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3695 break; 3717 break;
… …
3710 if (state) /* orthogonal */ 3732 if (state) /* orthogonal */
3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3733 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3712 break; 3734 break;
3713#ifdef scrollBar_esc 3735#ifdef scrollBar_esc
3714 case scrollBar_esc: 3736 case scrollBar_esc:
3715 if (scrollBar.map (state)) 3737 scrollBar.map (state);
3716 {
3717 resize_all_windows (0, 0, 0); 3738 resize_all_windows (0, 0, 0);
3718 scr_touch (true); 3739 scr_touch (true);
3719 }
3720 break; 3740 break;
3721#endif 3741#endif
3722 case 25: /* visible/invisible cursor */ 3742 case 25: /* visible/invisible cursor */
3723 scr_cursor_visible (state); 3743 scr_cursor_visible (state);
3724 break; 3744 break;
… …
3737 case 1003: 3757 case 1003:
3738 if (state) 3758 if (state)
3739 { 3759 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3760 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 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;
3742 vt_emask_mouse = PointerMotionMask; 3763 vt_emask_mouse = PointerMotionMask;
3743 } 3764 }
3744 else 3765 else
3745 vt_emask_mouse = NoEventMask; 3766 vt_emask_mouse = NoEventMask;
3746 3767
… …
3931 } 3952 }
3932 } 3953 }
3933} 3954}
3934/*}}} */ 3955/*}}} */
3935 3956
3936/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3937void
3938rxvt_term::process_graphics ()
3939{
3940 unicode_t ch, cmd = cmd_getc ();
3941
3942 if (cmd == 'Q')
3943 {
3944 /* query graphics */
3945 tt_printf ("\033G0\012"); /* no graphics */
3946 return;
3947 }
3948 /* swallow other graphics sequences until terminating ':' */
3949 do
3950 ch = cmd_getc ();
3951 while (ch != ':');
3952}
3953/*}}} */
3954
3955/* ------------------------------------------------------------------------- */ 3957/* ------------------------------------------------------------------------- */
3956 3958
3957/* 3959/*
3958 * Send printf () formatted output to the command. 3960 * Send printf () formatted output to the command.
3959 * Only use for small amounts of data. 3961 * Only use for small amounts of data.
… …
3972 3974
3973/* ---------------------------------------------------------------------- */ 3975/* ---------------------------------------------------------------------- */
3974/* 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,
3975 * or generated by us in response to a query ESC sequence. 3977 * or generated by us in response to a query ESC sequence.
3976 */ 3978 */
3977const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3979static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3978 3980
3979void 3981void
3980rxvt_term::tt_write (const char *data, unsigned int len) 3982rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 3983{
3982 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)))
… …
3987 3989
3988 if (v_buflen == 0) 3990 if (v_buflen == 0)
3989 { 3991 {
3990 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));
3991 3993
3994 max_it (written, 0);
3995
3992 if ((unsigned int)written == len) 3996 if (written == len)
3993 return; 3997 return;
3994 3998
3995 data += written; 3999 data += written;
3996 len -= written; 4000 len -= written;
3997 } 4001 }
3998 4002
3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4000 4004
4001 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4002 v_buflen += len; 4006 v_buflen += len;
4003 4007
4004 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