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.451 by root, Sun May 23 00:37:19 2010 UTC vs.
Revision 1.510 by sf-exg, Fri May 25 08:27:47 2012 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
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
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.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
981 { 944 {
982// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 946 scr_touch (false);
984 } 947 }
985#endif 948#endif
986 949
987 if (want_refresh) 950 if (want_refresh)
… …
1025 } 988 }
1026 989
1027 scr_refresh (); 990 scr_refresh ();
1028 scrollBar.show (1); 991 scrollBar.show (1);
1029#ifdef USE_XIM 992#ifdef USE_XIM
1030 IMSendSpot (); 993 im_send_spot ();
1031#endif 994#endif
1032 } 995 }
1033 996
1034 display->flush (); 997 display->flush ();
1035} 998}
… …
1052 refresh_count = 0; 1015 refresh_count = 0;
1053 flush (); 1016 flush ();
1054} 1017}
1055 1018
1056#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1057void 1035void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1037{
1060 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1039 want_refresh = 1;
… …
1080 1058
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1060void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1062{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1065 {
1088 want_refresh = 1; 1066 want_refresh = 1;
1089 refresh_check (); 1067 refresh_check ();
1090 } 1068 }
1091 else 1069 else
… …
1152 { 1130 {
1153 } 1131 }
1154} event_handler; 1132} event_handler;
1155#endif 1133#endif
1156 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1157bool 1168bool
1158rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1159{ 1170{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1161 1172
1162 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1174
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1165 n = 0;
1166 } 1176 {
1167 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1171 1182
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1184
1174 if (r > 0) 1185 if (r > 0)
1175 { 1186 {
1176 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1177 return true; 1188 return true;
… …
1251{ 1262{
1252 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1253 int x, y; 1264 int x, y;
1254 int code = 32; 1265 int code = 32;
1255 1266
1256 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1257 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1258 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1259 { 1271 {
1260 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1261 return; 1273 return;
1274
1262 mouse_row = x; 1275 mouse_row = x;
1263 mouse_col = y; 1276 mouse_col = y;
1264 code += 32; 1277 code += 32;
1265 } 1278 }
1266 1279
… …
1269 else 1282 else
1270 { 1283 {
1271 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1272 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1273 if (button_number >= 3) 1286 if (button_number >= 3)
1274 button_number += (64 - 3); 1287 button_number += 64 - 3;
1275 } 1288 }
1276 1289
1277 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1278 { 1291 {
1279 /* 1292 /*
… …
1311 fputc ('A', stderr); 1324 fputc ('A', stderr);
1312 if (key_state & 32) 1325 if (key_state & 32)
1313 fputc ('2', stderr); 1326 fputc ('2', stderr);
1314 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1315 button_number, 1328 button_number,
1316 x + 1, 1329 x,
1317 y + 1); 1330 y);
1318#endif 1331#endif
1319 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1320 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1321 (code + button_number + key_state), 1347 code + button_number + key_state,
1322 (32 + x + 1), 1348 32 + x,
1323 (32 + y + 1)); 1349 32 + y);
1324} 1350}
1325 1351
1326/*{{{ process an X event */ 1352/*{{{ process an X event */
1327void 1353void
1328rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
… …
1430 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1457 focus_out ();
1432 break; 1458 break;
1433 1459
1434 case ConfigureNotify: 1460 case ConfigureNotify:
1435 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1439 { 1462 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1464 ;
1465
1466#ifdef HAVE_BG_PIXMAP
1467 bool moved = false;
1468 if (bg_window_position_sensitive ())
1469 {
1470 int x, y;
1471 if (ev.xconfigure.send_event)
1472 {
1473 x = ev.xconfigure.x;
1474 y = ev.xconfigure.y;
1475 }
1476 else
1477 get_window_origin (x, y);
1478
1479 if (bg_set_position (x, y)
1480 || !(bg_flags & BG_IS_VALID))
1481 moved = true;
1482 }
1483#endif
1442 1484
1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1444 { 1486 {
1445 seen_resize = 1; 1487 seen_resize = 1;
1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1447 } 1489 }
1448 else 1490 else
1449 { 1491 {
1450#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 {
1453 if (mapped) 1493 if (moved)
1454 update_background (); 1494 update_background ();
1455 else
1456 bgPixmap.invalidate ();
1457 }
1458#endif 1495#endif
1459 } 1496 }
1460 1497
1461 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 } 1499 }
1463 break; 1500 break;
1464 1501
1465 case PropertyNotify: 1502 case PropertyNotify:
1466 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1467 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1468 && ev.xproperty.state == PropertyNewValue)
1469 selection_property (ev.xproperty.window, ev.xproperty.atom);
1470
1471 break; 1504 break;
1472 1505
1473 case SelectionClear: 1506 case SelectionClear:
1474 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1475 break; 1508 break;
1476 1509
1477 case SelectionNotify:
1478 if (selection_wait == Sel_normal)
1479 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1480 break;
1481
1482 case SelectionRequest: 1510 case SelectionRequest:
1483 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1484 break; 1512 break;
1485 1513
1486 case MapNotify: 1514 case MapNotify:
1487#ifdef HAVE_BG_PIXMAP 1515#ifdef HAVE_BG_PIXMAP
1488 /* This is needed spcifically to fix the case of no window manager or a 1516 /* This is needed specifically to fix the case of no window manager or a
1489 * non-reparenting window manager. In those cases we never get first 1517 * non-reparenting window manager. In those cases we never get first
1490 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1491 * care of multiplicity of ConfigureNotify events arriwing while WM does 1519 * care of multiplicity of ConfigureNotify events arriving while WM does
1492 * reparenting. 1520 * reparenting.
1493 * We should not render background immidiately, as there could be several 1521 * We should not render background immediately, as there could be several
1494 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1495 * by scheduling background redraw as soon as we can, but giving a short 1523 * by scheduling background redraw as soon as we can, but giving a short
1496 * bit of time for ConfigureNotifies to arrive. 1524 * bit of time for ConfigureNotifies to arrive.
1497 * We should render background PRIOR to drawing any text, but AFTER all 1525 * We should render background PRIOR to drawing any text, but AFTER all
1498 * of ConfigureNotifys for the best results. 1526 * of ConfigureNotifys for the best results.
1499 */ 1527 */
1500 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1528 if (!(bg_flags & BG_IS_VALID))
1501 update_background_ev.start (0.025); 1529 update_background_ev.start (0.025);
1502#endif 1530#endif
1503 mapped = 1; 1531 mapped = 1;
1504#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1505 text_blink_ev.start (); 1533 text_blink_ev.start ();
… …
1520 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1521 { 1549 {
1522 do 1550 do
1523 { 1551 {
1524 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1525 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1526 } 1554 }
1527 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1528 1556
1529 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1530 1558
1531 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1532 { 1560 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1535 } 1563 }
1536 1564
1537 want_refresh = 1; 1565 want_refresh = 1;
1538 } 1566 }
1539 else 1567 else
… …
1545 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1546 ; 1574 ;
1547 1575
1548 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1549 { 1577 {
1550 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1551 scrollBar.show (0); 1579 scrollBar.show (0);
1552 } 1580 }
1553 } 1581 }
1554 break; 1582 break;
1555 1583
… …
1621 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1622 } 1650 }
1623 else 1651 else
1624 { 1652 {
1625 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1626 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1627 } 1655 }
1628 1656
1629 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1630 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1631 + 1; 1659 + 1;
… …
1643#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1644 } 1672 }
1645#endif 1673#endif
1646 } 1674 }
1647 } 1675 }
1648 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1649 { 1677 {
1650 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1651 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1652 ; 1680 ;
1653 1681
1654 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1655 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1656 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1657 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1658 &unused_mask); 1686 &unused_mask);
1659 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1660 scrollBar.size ()); 1688 scrollBar.size ());
1661 want_refresh = 1; 1689 want_refresh = 1;
1662 scrollBar.show (1); 1690 scrollBar.show (1);
1663 } 1691 }
1664 break; 1692 break;
1665 } 1693 }
1666 1694
1667#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1668 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1669 {
1670 if (hidden_cursor)
1671 {
1672 hidden_cursor = 0;
1673 want_refresh = 1;
1674 }
1675
1676 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1677 }
1678#endif 1698#endif
1679 1699
1680#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1681 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1702 {
… …
1699rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1700{ 1720{
1701 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1702 return; 1722 return;
1703 1723
1704 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1705 { 1725 {
1706 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1707 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1708 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1709 } 1730 }
1710} 1731}
1711#endif 1732#endif
1712 1733
1713void 1734void
… …
1719 want_refresh = 1; 1740 want_refresh = 1;
1720 1741
1721#if USE_XIM 1742#if USE_XIM
1722 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1723 { 1744 {
1724 IMSetPosition (); 1745 im_set_position ();
1725 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1726 } 1747 }
1727#endif 1748#endif
1728#if CURSOR_BLINK 1749#if CURSOR_BLINK
1729 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1820 * use the property to determine the pixmap. We use it later on. 1841 * use the property to determine the pixmap. We use it later on.
1821 */ 1842 */
1822 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1823 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1824 { 1845 {
1825 bgPixmap.set_root_pixmap (); 1846 bg_set_root_pixmap ();
1826 update_background (); 1847 update_background ();
1827 } 1848 }
1828 1849
1829 break; 1850 break;
1830 } 1851 }
… …
1869 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1870 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1871#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1872 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1873 { 1894 {
1874 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1875 MEvent.clicks++; 1896 MEvent.clicks++;
1876 1897
1877 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1878 { 1899 {
1879 /* only report double clicks */ 1900 /* only report double clicks */
… …
1960 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1961 direction = UP; /* up */ 1982 direction = UP; /* up */
1962 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1963 direction = DN; /* down */ 1984 direction = DN; /* down */
1964 1985
1965 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1966 /* 1987 /*
1967 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1968 * move up if mouse is above slider 1989 * move up if mouse is above slider
1969 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1970 * 1991 *
… …
2009 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2010#endif 2031#endif
2011 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2012 { 2033 {
2013 if (direction == UP) 2034 if (direction == UP)
2014 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2015 else 2036 else
2016 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2017 } 2038 }
2018 } 2039 }
2019 else 2040 else
2020 switch (ev.button) 2041 switch (ev.button)
2021 { 2042 {
2022 case Button2: 2043 case Button2:
2023 switch (scrollBar.align) 2044 switch (scrollBar.align)
2024 { 2045 {
2025 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2026 csrO = 0; 2047 csrO = 0;
2027 break; 2048 break;
2028 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2029 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2030 break; 2051 break;
2031 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2032 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2033 break; 2054 break;
2034 } 2055 }
2035 2056
2036 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2037 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2038 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2039 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2040 2061
2041 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2042 break; 2063 break;
2043 2064
2044 case Button1: 2065 case Button1:
2045 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2046 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2047 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2048 2069
2049 case Button3: 2070 case Button3:
2050 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2051 { 2072 {
2052 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2053# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2054 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2055# else 2076# else
2056 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2057# endif 2078# endif
2058 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2059# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2060 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2061# else 2082# else
2062 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2063# endif 2084# endif
2064 else 2085 else
2065 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2066 } 2087 }
2067 else 2088 else
2068 { 2089 {
2069 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2070 (nrow 2091 (nrow
2071 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2072 / scrollBar.size ())); 2093 / scrollBar.size ()));
2073 } 2094 }
2074 2095
2075 break; 2096 break;
2076 } 2097 }
… …
2087 2108
2088 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2089 if (!bypass_keystate) 2110 if (!bypass_keystate)
2090 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2091 2112
2092 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2093 { 2114 {
2094 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2095 scrollBar.show (0); 2116 scrollBar.show (0);
2096 } 2117 }
2097 2118
2098#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2099 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2149 case Button3: 2170 case Button3:
2150 selection_make (ev.time); 2171 selection_make (ev.time);
2151 break; 2172 break;
2152 2173
2153 case Button2: 2174 case Button2:
2154 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2155 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2156 break; 2177 break;
2157 2178
2158#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2159 case Button4: 2180 case Button4:
… …
2202 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2203 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2204 2225
2205 for (;;) 2226 for (;;)
2206 { 2227 {
2207 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2208 { 2229 {
2209 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2210 ch = next_char (); 2231 ch = next_char ();
2211 2232
2212 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2213 break; 2234 break;
2214 } 2235 }
2215 2236
2216 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2217 { 2238 {
2218 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2219 { 2240 {
2220 seen_input = 1; 2241 seen_input = 1;
2221 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2222 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2223 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2236 wchar_t *str = buf; 2257 wchar_t *str = buf;
2237 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2238 2259
2239 for (;;) 2260 for (;;)
2240 { 2261 {
2241 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2242 break; 2263 break;
2243 2264
2244 *str++ = ch; 2265 *str++ = ch;
2245 2266
2246 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2247 { 2268 {
2248 if (ch == C0_LF) 2269 if (ch == C0_LF)
2249 nlines++; 2270 nlines++;
2250 2271
2251 refresh_count++; 2272 refresh_count++;
… …
2329rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2330{ 2351{
2331 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2332 { 2353 {
2333 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2334 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2335 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2336 2357
2337 wchar_t wc; 2358 wchar_t wc;
2338 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2339 2360
… …
2367 : NOCHAR; 2388 : NOCHAR;
2368} 2389}
2369 2390
2370static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2371 2392
2372/* rxvt_cmd_getc () - Return next input character */
2373/*
2374 * Return the next input character after first passing any keyboard input
2375 * to the command.
2376 */
2377wchar_t 2393wchar_t
2378rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2379{ 2395{
2380 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2381 2397
… …
2474 pclose_printer (fd); 2490 pclose_printer (fd);
2475} 2491}
2476#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2477/*}}} */ 2493/*}}} */
2478 2494
2479/* *INDENT-OFF* */
2480enum { 2495enum {
2481 C1_40 = 0x40, 2496 C1_40 = 0x40,
2482 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2483 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2484 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2485 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2486}; 2501};
2487/* *INDENT-ON* */
2488 2502
2489/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2490void 2504void
2491rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2492{ 2506{
… …
2585 break; 2599 break;
2586 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2587 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2588 break; 2602 break;
2589 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2590 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2591 break; 2605 break;
2592 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2593 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2594 /* unimplemented */ 2608 /* unimplemented */
2595 break; 2609 break;
… …
2614 return; 2628 return;
2615 } 2629 }
2616 2630
2617 switch (ch) 2631 switch (ch)
2618 { 2632 {
2619 /* case 1: do_tek_mode (); break; */
2620 case '#': 2633 case '#':
2621 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2622 scr_E (); 2635 scr_E ();
2623 break; 2636 break;
2624 case '(': 2637 case '(':
… …
2647#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2648 case '9': 2661 case '9':
2649 scr_forwardindex (); 2662 scr_forwardindex ();
2650 break; 2663 break;
2651#endif 2664#endif
2665 // DECPAM/DECPNM
2652 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2653 case '>': 2669 case '>':
2654 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2655 break; 2671 break;
2656 2672
2657 case C1_40: 2673 case C1_40:
2658 cmd_getc (); 2674 cmd_getc ();
2659 break; 2675 break;
… …
2663 2679
2664 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2665 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2666 { 2682 {
2667 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2668 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2669 } 2685 }
2670 break; 2686 break;
2671 2687
2672 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2673 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2674 process_graphics (); 2690 // used by original rxvt for rob nations own graphics mode
2691 if (cmd_getc () == 'Q')
2692 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2675 break; 2693 break;
2676 2694
2677 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2678 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2679 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2683 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2684 scr_index (DN); 2702 scr_index (DN);
2685 break; 2703 break;
2686 2704
2687 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2688 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2689 2707
2690 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2691 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2692 2710
2693 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2694 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2695 process_dcs_seq (); 2713 process_dcs_seq ();
2696 break; 2714 break;
… …
2729 } 2747 }
2730} 2748}
2731/*}}} */ 2749/*}}} */
2732 2750
2733/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2734/* *INDENT-OFF* */
2735enum { 2752enum {
2736 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2737 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2738 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2739 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2742 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2743 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2744 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2745}; 2762};
2746 2763
2747#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2748 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2749 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2750#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2751 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2752 2769
2753const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2754 { 2771 {
2755 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2756 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2757 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2758 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2759 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2760 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2761 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2762 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2763 }; 2780 };
2764/* *INDENT-ON* */
2765 2781
2766void 2782void
2767rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2768{ 2784{
2769 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
… …
2847 { 2863 {
2848 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2864 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2849 scr_soft_reset (); 2865 scr_soft_reset ();
2850 2866
2851 static const int pm_h[] = { 7, 25 }; 2867 static const int pm_h[] = { 7, 25 };
2852 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2853 2869
2854 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2855 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2856 } 2872 }
2857 break; 2873 break;
2858 } 2874 }
2859 2875
2860 return; 2876 return;
… …
2878 } 2894 }
2879 break; 2895 break;
2880#endif 2896#endif
2881 2897
2882 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2883 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2884 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2885 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2886 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2887 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2888 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2889 break; 2905 break;
2890 2906
2891 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2892 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3079 } 3095 }
3080} 3096}
3081/*}}} */ 3097/*}}} */
3082 3098
3083#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3084/* ARGSUSED */
3085void 3100void
3086rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3087{ 3102{
3088 int x, y; 3103 int x, y;
3089 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3098 { 3113 {
3099 /* 3114 /*
3100 * commands 3115 * commands
3101 */ 3116 */
3102 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3103 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3104 break; 3119 break;
3105 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3106 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3107 break; 3122 break;
3108 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3109 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3110 break; 3125 break;
3111 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3112 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3113 break; 3128 break;
3114 case 5: /* raise window */ 3129 case 5: /* raise window */
3115 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3116 break; 3131 break;
3117 case 6: /* lower window */ 3132 case 6: /* lower window */
3118 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3119 break; 3134 break;
3120 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3121 scr_touch (true); 3136 scr_touch (true);
3122 break; 3137 break;
3123 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3126 break; 3141 break;
3127 3142
3128 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3129 default: 3144 default:
3130 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3131 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3132 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3133 break; 3148 break;
3134 3149
3135 /* 3150 /*
3136 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3137 */ 3152 */
3138 case 11: /* report window state */ 3153 case 11: /* report window state */
3139 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3140 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3141 break; 3156 break;
3142 case 13: /* report window position */ 3157 case 13: /* report window position */
3143 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3144 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3145 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3146 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3147 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3148 break; 3163 break;
3149 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3150 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3151 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3152 break; 3167 break;
3153 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3154 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3155 break; 3170 break;
… …
3157 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3158 break; 3173 break;
3159 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3160 { 3175 {
3161 char *s; 3176 char *s;
3162 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3163 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3164 XFree (s); 3179 XFree (s);
3165 } 3180 }
3166 break; 3181 break;
3167 case 21: /* report window title */ 3182 case 21: /* report window title */
3168 { 3183 {
3169 char *s; 3184 char *s;
3170 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3171 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3172 XFree (s); 3187 XFree (s);
3173 } 3188 }
3174 break; 3189 break;
3175 } 3190 }
… …
3329 unsigned long bytes_after; 3344 unsigned long bytes_after;
3330 unsigned char *value = 0; 3345 unsigned char *value = 0;
3331 const char *str = ""; 3346 const char *str = "";
3332 3347
3333 if (prop 3348 if (prop
3334 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3335 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3336 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3337 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3338 && actual_type != None 3353 && actual_type != None
3339 && actual_format == 8) 3354 && actual_format == 8)
… …
3351 { 3366 {
3352 *eq = 0; 3367 *eq = 0;
3353 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3354 } 3369 }
3355 else 3370 else
3356 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3357 display->atom (str)); 3372 display->atom (str));
3358 } 3373 }
3359 break; 3374 break;
3360 3375
3361 case XTerm_Color: 3376 case XTerm_Color:
… …
3422 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3423 { 3438 {
3424 bool changed = false; 3439 bool changed = false;
3425 3440
3426 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3427 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3442 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3428 else
3429 changed = bgPixmap.unset_tint ();
3430 3443
3431 if (changed) 3444 if (changed)
3432 update_background (); 3445 update_background ();
3433 } 3446 }
3434 3447
… …
3438#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3439 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3440 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3441 { 3454 {
3442 char str[256]; 3455 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale;
3461 v_scale = image_vec[0].v_scale;
3462 h_align = image_vec[0].h_align;
3463 v_align = image_vec[0].v_align;
3464 }
3443 3465
3444 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3445 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 h_scale, v_scale,
3446 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 h_align, v_align);
3447 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3448 } 3470 }
3449 else 3471 else
3450 { 3472 {
3451 int changed = 0; 3473 bool changed = false;
3452 3474
3453 if (*str != ';') 3475 if (*str != ';')
3454 { 3476 {
3455 /* reset to default scaling :*/ 3477 if (image_vec.size () > 0
3456 bgPixmap.unset_geometry (); 3478 && image_vec[0].set_file_geometry (str))
3457 if (bgPixmap.set_file (str)) /* change pixmap */
3458 changed++; 3479 changed = true;
3459 str = strchr (str, ';'); 3480 else
3460 if (str == NULL) 3481 {
3461 bgPixmap.set_defaultGeometry (); 3482 rxvt_image *image = new_image ();
3483 if (!image->set_file_geometry (str))
3484 image_vec.pop_back ();
3485 else
3486 changed = true;
3487 }
3462 } 3488 }
3463 3489 else
3464 while (str)
3465 { 3490 {
3466 str++; 3491 str++;
3467 if (bgPixmap.set_geometry (str)) 3492 if (image_vec.size () > 0
3493 && image_vec[0].set_geometry (str, true))
3468 changed++; 3494 changed = true;
3469 str = strchr (str, ';');
3470 } 3495 }
3471 3496
3472 if (changed) 3497 if (changed)
3498 {
3499 if (bg_window_position_sensitive ())
3500 {
3501 int x, y;
3502 get_window_origin (x, y);
3503 bg_set_position (x, y);
3504 }
3473 update_background (); 3505 update_background ();
3506 }
3474 } 3507 }
3475 break; 3508 break;
3476#endif 3509#endif
3477 3510
3478 case XTerm_logfile: 3511 case XTerm_logfile:
… …
3572{ 3605{
3573 int state; 3606 int state;
3574 3607
3575 if (mode == 's') 3608 if (mode == 's')
3576 { 3609 {
3577 SavedModes |= (priv_modes & bit); 3610 if (priv_modes & bit)
3611 SavedModes |= bit;
3612 else
3613 SavedModes &= ~bit;
3578 return -1; 3614 return -1;
3579 } 3615 }
3580 else 3616 else
3581 { 3617 {
3582 if (mode == 'r') 3618 if (mode == 'r')
3583 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3619 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3584 else 3620 else
3585 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3621 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3586 3622
3587 set_privmode (bit, state); 3623 if (state)
3624 priv_modes |= bit;
3625 else
3626 priv_modes &= ~bit;
3588 } 3627 }
3589 3628
3590 return state; 3629 return state;
3591} 3630}
3592 3631
3593/* we're not using priv _yet_ */ 3632/* we're not using priv _yet_ */
3594void 3633void
3595rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3634rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3596{ 3635{
3597 unsigned int i, j; 3636 unsigned int i, j;
3598 int state; 3637 int state;
3599 3638
3600 static const struct 3639 static const struct
3601 { 3640 {
3602 const int argval; 3641 const int argval;
3603 const unsigned long bit; 3642 const unsigned long bit;
3604 } argtopriv[] = { 3643 } argtopriv[] = {
3605 { 1, PrivMode_aplCUR }, // DECCKM 3644 { 1, PrivMode_aplCUR }, // DECCKM
3606 { 2, PrivMode_vt52 }, 3645 { 2, PrivMode_vt52 }, // DECANM
3607 { 3, PrivMode_132 }, // DECCOLM 3646 { 3, PrivMode_132 }, // DECCOLM
3608 { 4, PrivMode_smoothScroll }, // DECSCLM 3647 { 4, PrivMode_smoothScroll }, // DECSCLM
3609 { 5, PrivMode_rVideo }, // DECSCNM 3648 { 5, PrivMode_rVideo }, // DECSCNM
3610 { 6, PrivMode_relOrigin }, // DECOM 3649 { 6, PrivMode_relOrigin }, // DECOM
3611 { 7, PrivMode_Autowrap }, // DECAWM 3650 { 7, PrivMode_Autowrap }, // DECAWM
3612 // 8, auto-repeat keys // DECARM 3651 // 8, auto-repeat keys // DECARM
3613 { 9, PrivMode_MouseX10 }, 3652 { 9, PrivMode_MouseX10 },
3614 // 18 end FF to printer after print screen 3653 // 18 end FF to printer after print screen
3615 // 19 Print screen prints full screen/scorll region 3654 // 19 Print screen prints full screen/scroll region
3616 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3655 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3617#ifdef scrollBar_esc 3656#ifdef scrollBar_esc
3618 { scrollBar_esc, PrivMode_scrollBar }, 3657 { scrollBar_esc, PrivMode_scrollBar },
3619#endif 3658#endif
3620 { 35, PrivMode_ShiftKeys }, // rxvt extension 3659 { 35, PrivMode_ShiftKeys }, // rxvt extension
3621 // 38, tektronix mode // DECTEK 3660 // 38, tektronix mode // DECTEK
3622 { 40, PrivMode_132OK }, 3661 { 40, PrivMode_132OK },
3623 // 41 xterm more fixes NYI 3662 // 41 xterm more fixes NYI
3624 // 45 margin bell NYI 3663 // 45 margin bell NYI
3625 // 46 start logging 3664 // 46 start logging
3626 { 47, PrivMode_Screen }, 3665 { 47, PrivMode_Screen },
3627 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3666 { 66, PrivMode_aplKP }, // DECNKM
3628#ifndef NO_BACKSPACE_KEY 3667#ifndef NO_BACKSPACE_KEY
3629 { 67, PrivMode_BackSpace }, // DECBKM 3668 { 67, PrivMode_BackSpace }, // DECBKM
3630#endif 3669#endif
3631 { 1000, PrivMode_MouseX11 }, 3670 { 1000, PrivMode_MouseX11 },
3632 { 1002, PrivMode_MouseBtnEvent }, 3671 { 1002, PrivMode_MouseBtnEvent },
3633 { 1003, PrivMode_MouseAnyEvent }, 3672 { 1003, PrivMode_MouseAnyEvent },
3673#if ENABLE_FRILLS
3674 { 1005, PrivMode_ExtModeMouse },
3675#endif
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3676 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3677 { 1011, PrivMode_Keypress }, // rxvt extension
3678#if ENABLE_FRILLS
3679 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3680#endif
3636 // 1035 enable modifiers for alt, numlock NYI 3681 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3682 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3683 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3684 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3685 // 1048 save and restore cursor, implemented in code
3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3686 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3687 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3643 { 2004, PrivMode_BracketPaste }, 3688 { 2004, PrivMode_BracketPaste },
3644 }; 3689 };
3645 3690
… …
3655 for (i = 0; i < nargs; i++) 3700 for (i = 0; i < nargs; i++)
3656 { 3701 {
3657 state = -1; 3702 state = -1;
3658 3703
3659 /* basic handling */ 3704 /* basic handling */
3660 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3705 for (j = 0; j < ecb_array_length (argtopriv); j++)
3661 if (argtopriv[j].argval == arg[i]) 3706 if (argtopriv[j].argval == arg[i])
3662 { 3707 {
3663 state = privcases (mode, argtopriv[j].bit); 3708 state = privcases (mode, argtopriv[j].bit);
3664 break; 3709 break;
3665 } 3710 }
… …
3691 case 2: /* VT52 mode */ 3736 case 2: /* VT52 mode */
3692 /* oddball mode. should be set regardless of set/reset 3737 /* oddball mode. should be set regardless of set/reset
3693 * parameter. Return from VT52 mode with an ESC < from 3738 * parameter. Return from VT52 mode with an ESC < from
3694 * within VT52 mode 3739 * within VT52 mode
3695 */ 3740 */
3696 set_privmode (PrivMode_vt52, 1); 3741 priv_modes |= PrivMode_vt52;
3697 break; 3742 break;
3698 case 3: /* 80/132 */ 3743 case 3: /* 80/132 */
3699 if (priv_modes & PrivMode_132OK) 3744 if (priv_modes & PrivMode_132OK)
3700 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3745 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3701 break; 3746 break;
… …
3716 if (state) /* orthogonal */ 3761 if (state) /* orthogonal */
3717 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3762 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718 break; 3763 break;
3719#ifdef scrollBar_esc 3764#ifdef scrollBar_esc
3720 case scrollBar_esc: 3765 case scrollBar_esc:
3721 if (scrollBar.map (state)) 3766 scrollBar.map (state);
3722 {
3723 resize_all_windows (0, 0, 0); 3767 resize_all_windows (0, 0, 0);
3724 scr_touch (true); 3768 scr_touch (true);
3725 }
3726 break; 3769 break;
3727#endif 3770#endif
3728 case 25: /* visible/invisible cursor */ 3771 case 25: /* visible/invisible cursor */
3729 scr_cursor_visible (state); 3772 scr_cursor_visible (state);
3730 break; 3773 break;
… …
3743 case 1003: 3786 case 1003:
3744 if (state) 3787 if (state)
3745 { 3788 {
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3789 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3747 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3790 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3791 mouse_row = mouse_col = 0;
3748 vt_emask_mouse = PointerMotionMask; 3792 vt_emask_mouse = PointerMotionMask;
3749 } 3793 }
3750 else 3794 else
3751 vt_emask_mouse = NoEventMask; 3795 vt_emask_mouse = NoEventMask;
3752 3796
… …
3937 } 3981 }
3938 } 3982 }
3939} 3983}
3940/*}}} */ 3984/*}}} */
3941 3985
3942/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3943void
3944rxvt_term::process_graphics ()
3945{
3946 unicode_t ch, cmd = cmd_getc ();
3947
3948 if (cmd == 'Q')
3949 {
3950 /* query graphics */
3951 tt_printf ("\033G0\012"); /* no graphics */
3952 return;
3953 }
3954 /* swallow other graphics sequences until terminating ':' */
3955 do
3956 ch = cmd_getc ();
3957 while (ch != ':');
3958}
3959/*}}} */
3960
3961/* ------------------------------------------------------------------------- */ 3986/* ------------------------------------------------------------------------- */
3962 3987
3963/* 3988/*
3964 * Send printf () formatted output to the command. 3989 * Send printf () formatted output to the command.
3965 * Only use for small amounts of data. 3990 * Only use for small amounts of data.
… …
3978 4003
3979/* ---------------------------------------------------------------------- */ 4004/* ---------------------------------------------------------------------- */
3980/* Write data to the pty as typed by the user, pasted with the mouse, 4005/* Write data to the pty as typed by the user, pasted with the mouse,
3981 * or generated by us in response to a query ESC sequence. 4006 * or generated by us in response to a query ESC sequence.
3982 */ 4007 */
3983const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4008static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3984 4009
3985void 4010void
3986rxvt_term::tt_write (const char *data, unsigned int len) 4011rxvt_term::tt_write (const char *data, unsigned int len)
3987{ 4012{
3988 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3993 4018
3994 if (v_buflen == 0) 4019 if (v_buflen == 0)
3995 { 4020 {
3996 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4021 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3997 4022
4023 max_it (written, 0);
4024
3998 if ((unsigned int)written == len) 4025 if (written == len)
3999 return; 4026 return;
4000 4027
4001 data += written; 4028 data += written;
4002 len -= written; 4029 len -= written;
4003 } 4030 }
4004 4031
4005 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4032 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4006 4033
4007 memcpy (v_buffer + v_buflen, data, len); 4034 memcpy (v_buffer + v_buflen, data, len);
4008 v_buflen += len; 4035 v_buflen += len;
4009 4036
4010 pty_ev.set (ev::READ | ev::WRITE); 4037 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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