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.443 by sf-exg, Wed Mar 31 13:14:50 2010 UTC vs.
Revision 1.508 by sf-exg, Fri Apr 13 09:23:58 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)
… …
198 198
199 int width = 0; 199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len); 200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++) 201 for (int i = 0; i < len; i++)
202 { 202 {
203 rxvt_font *f = (*fs)[fs->find_font (chr[i])]; 203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 204 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 206 }
207 207
208 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
… …
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);
… …
421 * Always permit `shift' to override the current setting 418 * Always permit `shift' to override the current setting
422 */ 419 */
423 shft = ev.state & ShiftMask; 420 shft = ev.state & ShiftMask;
424 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
426
427 if (numlock_state || (ev.state & ModNumLockMask))
428 {
429 numlock_state = (ev.state & ModNumLockMask);
430 set_privmode (PrivMode_aplKP, !numlock_state);
431 }
432 423
433 kbuf[0] = 0; 424 kbuf[0] = 0;
434 425
435#ifdef USE_XIM 426#ifdef USE_XIM
436 if (Input_Context) 427 if (Input_Context)
… …
575 selection_request (ev.time); 566 selection_request (ev.time);
576 return; 567 return;
577#if TODO 568#if TODO
578 /* rxvt extras */ 569 /* rxvt extras */
579 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
580 change_font (FONT_UP);
581 return; 571 return;
582 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
583 change_font (FONT_DN);
584 return; 573 return;
585#endif 574#endif
586 } 575 }
587 } 576 }
588 } 577 }
… …
653 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 642 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
654 { 643 {
655 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 644 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
656 unsigned int newlen = 1; 645 unsigned int newlen = 1;
657 646
647 if (ev.state & ModNumLockMask)
648 kp = false;
649
658 switch (translate_keypad (keysym, kp)) 650 keysym = translate_keypad (keysym, kp);
651
652 switch (keysym)
659 { 653 {
660#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
661 case XK_BackSpace: 655 case XK_BackSpace:
662 if (priv_modes & PrivMode_HaveBackSpace) 656 if (priv_modes & PrivMode_HaveBackSpace)
663 { 657 {
… …
782 } 776 }
783 777
784 if (newlen) 778 if (newlen)
785 len = strlen (kbuf); 779 len = strlen (kbuf);
786 780
781 if (len > 0)
782 {
787 /* 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 /*
788 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
789 */ 797 */
790#ifdef META8_OPTION 798#ifdef META8_OPTION
791 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
792 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
793#endif 801#endif
802 }
794 803
795 } 804 }
796 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
797 { 806 {
798 len = 1; 807 len = 1;
… …
831 if (view_start) 840 if (view_start)
832 { 841 {
833 view_start = 0; 842 view_start = 0;
834 want_refresh = 1; 843 want_refresh = 1;
835 } 844 }
836
837 /*
838 * these modifications only affect the static keybuffer
839 * pass Shift/Control indicators for function keys ending with `~'
840 *
841 * eg,
842 * Prior = "ESC[5~"
843 * Shift+Prior = "ESC[5$"
844 * Ctrl+Prior = "ESC[5^"
845 * Ctrl+Shift+Prior = "ESC[5@"
846 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
847 */
848 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
849 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
850 845
851 /* escape prefix */ 846 /* escape prefix */
852 if (meta 847 if (meta
853#ifdef META8_OPTION 848#ifdef META8_OPTION
854 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
890 commit_iso14755 (); 885 commit_iso14755 ();
891 886
892 return; 887 return;
893 } 888 }
894 889
895 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
896 if (i[0] == keysym) 891 if (i[0] == keysym)
897 { 892 {
898 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
899 commit_iso14755 (); 894 commit_iso14755 ();
900 895
… …
937 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
938 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
939#endif 934#endif
940} 935}
941 936
942#if defined (KEYSYM_RESOURCE)
943unsigned int
944rxvt_term::cmd_write (const char *str, unsigned int count)
945{
946 unsigned int n, s;
947
948 n = cmdbuf_ptr - cmdbuf_base;
949 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
950
951 if (n > 0 && s < count)
952 {
953 memmove (cmdbuf_base, cmdbuf_ptr,
954 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
955 cmdbuf_ptr = cmdbuf_base;
956 cmdbuf_endp -= n;
957 s += n;
958 }
959
960 if (count > s)
961 {
962 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
963 count = s;
964 }
965
966 for (; count--;)
967 *cmdbuf_endp++ = *str++;
968
969 cmd_parse ();
970
971 return 0;
972}
973#endif
974
975void 937void
976rxvt_term::flush () 938rxvt_term::flush ()
977{ 939{
978 flush_ev.stop (); 940 flush_ev.stop ();
979 941
980#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
981 if (bgPixmap.check_clearChanged ()) 943 if (bg_flags & BG_NEEDS_REFRESH)
982 { 944 {
983// scr_clear (true); This needs to be researched further! 945 bg_flags &= ~BG_NEEDS_REFRESH;
984 scr_touch (false); 946 scr_touch (false);
985 } 947 }
986#endif 948#endif
987 949
988 if (want_refresh) 950 if (want_refresh)
… …
1026 } 988 }
1027 989
1028 scr_refresh (); 990 scr_refresh ();
1029 scrollBar.show (1); 991 scrollBar.show (1);
1030#ifdef USE_XIM 992#ifdef USE_XIM
1031 IMSendSpot (); 993 im_send_spot ();
1032#endif 994#endif
1033 } 995 }
1034 996
1035 display->flush (); 997 display->flush ();
1036} 998}
… …
1053 refresh_count = 0; 1015 refresh_count = 0;
1054 flush (); 1016 flush ();
1055} 1017}
1056 1018
1057#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
1058void 1035void
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1037{
1061 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1039 want_refresh = 1;
… …
1081 1058
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1060void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1062{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1065 {
1089 want_refresh = 1; 1066 want_refresh = 1;
1090 refresh_check (); 1067 refresh_check ();
1091 } 1068 }
1092 else 1069 else
… …
1153 { 1130 {
1154 } 1131 }
1155} event_handler; 1132} event_handler;
1156#endif 1133#endif
1157 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
1158bool 1168bool
1159rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1160{ 1170{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1162 1172
1163 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1174
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1166 n = 0;
1167 } 1176 {
1168 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1172 1182
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1184
1175 if (r > 0) 1185 if (r > 0)
1176 { 1186 {
1177 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1178 return true; 1188 return true;
… …
1252{ 1262{
1253 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1254 int x, y; 1264 int x, y;
1255 int code = 32; 1265 int code = 32;
1256 1266
1257 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1259 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1260 { 1271 {
1261 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1262 return; 1273 return;
1274
1263 mouse_row = x; 1275 mouse_row = x;
1264 mouse_col = y; 1276 mouse_col = y;
1265 code += 32; 1277 code += 32;
1266 } 1278 }
1267 1279
… …
1270 else 1282 else
1271 { 1283 {
1272 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1286 if (button_number >= 3)
1275 button_number += (64 - 3); 1287 button_number += 64 - 3;
1276 } 1288 }
1277 1289
1278 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1279 { 1291 {
1280 /* 1292 /*
… …
1312 fputc ('A', stderr); 1324 fputc ('A', stderr);
1313 if (key_state & 32) 1325 if (key_state & 32)
1314 fputc ('2', stderr); 1326 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1328 button_number,
1317 x + 1, 1329 x,
1318 y + 1); 1330 y);
1319#endif 1331#endif
1320 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
1321 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1347 code + button_number + key_state,
1323 (32 + x + 1), 1348 32 + x,
1324 (32 + y + 1)); 1349 32 + y);
1325} 1350}
1326 1351
1327/*{{{ process an X event */ 1352/*{{{ process an X event */
1328void 1353void
1329rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
… …
1431 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1457 focus_out ();
1433 break; 1458 break;
1434 1459
1435 case ConfigureNotify: 1460 case ConfigureNotify:
1436 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1437 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1438 szHint.width, szHint.height);*/
1439 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1440 { 1462 {
1441 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1442 ; 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
1443 1484
1444 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1486 {
1446 seen_resize = 1; 1487 seen_resize = 1;
1447 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1489 }
1449 else 1490 else
1450 { 1491 {
1451#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1452 if (bgPixmap.window_position_sensitive ())
1453 {
1454 if (mapped) 1493 if (moved)
1455 update_background (); 1494 update_background ();
1456 else
1457 bgPixmap.invalidate ();
1458 }
1459#endif 1495#endif
1460 } 1496 }
1461 1497
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1463 } 1499 }
1464 break; 1500 break;
1465 1501
1466 case PropertyNotify: 1502 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1469 && ev.xproperty.state == PropertyNewValue)
1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1471
1472 break; 1504 break;
1473 1505
1474 case SelectionClear: 1506 case SelectionClear:
1475 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1476 break; 1508 break;
1477 1509
1478 case SelectionNotify:
1479 if (selection_wait == Sel_normal)
1480 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1481 break;
1482
1483 case SelectionRequest: 1510 case SelectionRequest:
1484 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1485 break; 1512 break;
1486 1513
1487 case MapNotify: 1514 case MapNotify:
1488#ifdef HAVE_BG_PIXMAP 1515#ifdef HAVE_BG_PIXMAP
1489 /* 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
1490 * non-reparenting window manager. In those cases we never get first 1517 * non-reparenting window manager. In those cases we never get first
1491 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1518 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1492 * care of multiplicity of ConfigureNotify events arriwing while WM does 1519 * care of multiplicity of ConfigureNotify events arriving while WM does
1493 * reparenting. 1520 * reparenting.
1494 * We should not render background immidiately, as there could be several 1521 * We should not render background immediately, as there could be several
1495 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1522 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1496 * by scheduling background redraw as soon as we can, but giving a short 1523 * by scheduling background redraw as soon as we can, but giving a short
1497 * bit of time for ConfigureNotifies to arrive. 1524 * bit of time for ConfigureNotifies to arrive.
1498 * 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
1499 * of ConfigureNotifys for the best results. 1526 * of ConfigureNotifys for the best results.
1500 */ 1527 */
1501 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1528 if (!(bg_flags & BG_IS_VALID))
1502 update_background_ev.start (0.025); 1529 update_background_ev.start (0.025);
1503#endif 1530#endif
1504 mapped = 1; 1531 mapped = 1;
1505#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1506 text_blink_ev.start (); 1533 text_blink_ev.start ();
… …
1521 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1522 { 1549 {
1523 do 1550 do
1524 { 1551 {
1525 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1526 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1527 } 1554 }
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1529 1556
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531 1558
1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1533 { 1560 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1536 } 1563 }
1537 1564
1538 want_refresh = 1; 1565 want_refresh = 1;
1539 } 1566 }
1540 else 1567 else
… …
1546 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1574 ;
1548 1575
1549 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1550 { 1577 {
1551 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1552 scrollBar.show (0); 1579 scrollBar.show (0);
1553 } 1580 }
1554 } 1581 }
1555 break; 1582 break;
1556 1583
… …
1622 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1623 } 1650 }
1624 else 1651 else
1625 { 1652 {
1626 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1627 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1628 } 1655 }
1629 1656
1630 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1631 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1632 + 1; 1659 + 1;
… …
1644#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1645 } 1672 }
1646#endif 1673#endif
1647 } 1674 }
1648 } 1675 }
1649 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1650 { 1677 {
1651 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1652 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1653 ; 1680 ;
1654 1681
1655 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1656 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1657 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1658 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1659 &unused_mask); 1686 &unused_mask);
1660 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1661 scrollBar.size ()); 1688 scrollBar.size ());
1662 want_refresh = 1; 1689 want_refresh = 1;
1663 scrollBar.show (1); 1690 scrollBar.show (1);
1664 } 1691 }
1665 break; 1692 break;
1666 } 1693 }
1667 1694
1668#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1669 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1670 {
1671 if (hidden_cursor)
1672 {
1673 hidden_cursor = 0;
1674 want_refresh = 1;
1675 }
1676
1677 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1678 }
1679#endif 1698#endif
1680 1699
1681#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1682 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1683 { 1702 {
… …
1700rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1701{ 1720{
1702 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1703 return; 1722 return;
1704 1723
1705 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1706 { 1725 {
1707 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1708 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1709 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1710 } 1730 }
1711} 1731}
1712#endif 1732#endif
1713 1733
1714void 1734void
… …
1720 want_refresh = 1; 1740 want_refresh = 1;
1721 1741
1722#if USE_XIM 1742#if USE_XIM
1723 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1724 { 1744 {
1725 IMSetPosition (); 1745 im_set_position ();
1726 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1727 } 1747 }
1728#endif 1748#endif
1729#if CURSOR_BLINK 1749#if CURSOR_BLINK
1730 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1821 * 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.
1822 */ 1842 */
1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1825 { 1845 {
1826 bgPixmap.set_root_pixmap (); 1846 bg_set_root_pixmap ();
1827 update_background (); 1847 update_background ();
1828 } 1848 }
1829 1849
1830 break; 1850 break;
1831 } 1851 }
… …
1870 /* save the xbutton state (for ButtonRelease) */ 1890 /* save the xbutton state (for ButtonRelease) */
1871 MEvent.state = ev.state; 1891 MEvent.state = ev.state;
1872#ifdef MOUSE_REPORT_DOUBLECLICK 1892#ifdef MOUSE_REPORT_DOUBLECLICK
1873 if (ev.button == MEvent.button && clickintime) 1893 if (ev.button == MEvent.button && clickintime)
1874 { 1894 {
1875 /* same button, within alloted time */ 1895 /* same button, within allowed time */
1876 MEvent.clicks++; 1896 MEvent.clicks++;
1877 1897
1878 if (MEvent.clicks > 1) 1898 if (MEvent.clicks > 1)
1879 { 1899 {
1880 /* only report double clicks */ 1900 /* only report double clicks */
… …
1961 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1962 direction = UP; /* up */ 1982 direction = UP; /* up */
1963 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1964 direction = DN; /* down */ 1984 direction = DN; /* down */
1965 1985
1966 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1967 /* 1987 /*
1968 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1969 * move up if mouse is above slider 1989 * move up if mouse is above slider
1970 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1971 * 1991 *
… …
2010 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2011#endif 2031#endif
2012 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2013 { 2033 {
2014 if (direction == UP) 2034 if (direction == UP)
2015 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2016 else 2036 else
2017 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2018 } 2038 }
2019 } 2039 }
2020 else 2040 else
2021 switch (ev.button) 2041 switch (ev.button)
2022 { 2042 {
2023 case Button2: 2043 case Button2:
2024 switch (scrollBar.align) 2044 switch (scrollBar.align)
2025 { 2045 {
2026 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2027 csrO = 0; 2047 csrO = 0;
2028 break; 2048 break;
2029 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2030 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2031 break; 2051 break;
2032 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2033 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2034 break; 2054 break;
2035 } 2055 }
2036 2056
2037 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2038 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2039 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2040 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2041 2061
2042 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2043 break; 2063 break;
2044 2064
2045 case Button1: 2065 case Button1:
2046 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2047 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2048 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2049 2069
2050 case Button3: 2070 case Button3:
2051 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2052 { 2072 {
2053 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2054# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2055 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2056# else 2076# else
2057 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2058# endif 2078# endif
2059 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2060# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2061 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2062# else 2082# else
2063 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2064# endif 2084# endif
2065 else 2085 else
2066 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2067 } 2087 }
2068 else 2088 else
2069 { 2089 {
2070 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2071 (nrow 2091 (nrow
2072 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2073 / scrollBar.size ())); 2093 / scrollBar.size ()));
2074 } 2094 }
2075 2095
2076 break; 2096 break;
2077 } 2097 }
… …
2088 2108
2089 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2090 if (!bypass_keystate) 2110 if (!bypass_keystate)
2091 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2092 2112
2093 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2094 { 2114 {
2095 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2096 scrollBar.show (0); 2116 scrollBar.show (0);
2097 } 2117 }
2098 2118
2099#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2100 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2150 case Button3: 2170 case Button3:
2151 selection_make (ev.time); 2171 selection_make (ev.time);
2152 break; 2172 break;
2153 2173
2154 case Button2: 2174 case Button2:
2155 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?
2156 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2157 break; 2177 break;
2158 2178
2159#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2160 case Button4: 2180 case Button4:
2161 case Button5: 2181 case Button5:
… …
2203 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2204 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2205 2225
2206 for (;;) 2226 for (;;)
2207 { 2227 {
2208 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2209 { 2229 {
2210 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2211 ch = next_char (); 2231 ch = next_char ();
2212 2232
2213 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2214 break; 2234 break;
2215 } 2235 }
2216 2236
2217 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))
2218 { 2238 {
2219 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2220 { 2240 {
2221 seen_input = 1; 2241 seen_input = 1;
2222 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2223 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2224 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2237 wchar_t *str = buf; 2257 wchar_t *str = buf;
2238 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2239 2259
2240 for (;;) 2260 for (;;)
2241 { 2261 {
2242 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)))
2243 break; 2263 break;
2244 2264
2245 *str++ = ch; 2265 *str++ = ch;
2246 2266
2247 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2248 { 2268 {
2249 if (ch == C0_LF) 2269 if (ch == C0_LF)
2250 nlines++; 2270 nlines++;
2251 2271
2252 refresh_count++; 2272 refresh_count++;
… …
2330rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2331{ 2351{
2332 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2333 { 2353 {
2334 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2335 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2336 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2337 2357
2338 wchar_t wc; 2358 wchar_t wc;
2339 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);
2340 2360
… …
2368 : NOCHAR; 2388 : NOCHAR;
2369} 2389}
2370 2390
2371static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2372 2392
2373/* rxvt_cmd_getc () - Return next input character */
2374/*
2375 * Return the next input character after first passing any keyboard input
2376 * to the command.
2377 */
2378wchar_t 2393wchar_t
2379rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2380{ 2395{
2381 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2382 2397
… …
2475 pclose_printer (fd); 2490 pclose_printer (fd);
2476} 2491}
2477#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2478/*}}} */ 2493/*}}} */
2479 2494
2480/* *INDENT-OFF* */
2481enum { 2495enum {
2482 C1_40 = 0x40, 2496 C1_40 = 0x40,
2483 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,
2484 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,
2485 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,
2486 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,
2487}; 2501};
2488/* *INDENT-ON* */
2489 2502
2490/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2491void 2504void
2492rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2493{ 2506{
… …
2586 break; 2599 break;
2587 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2588 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2589 break; 2602 break;
2590 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2591 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2592 break; 2605 break;
2593 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2594 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2595 /* unimplemented */ 2608 /* unimplemented */
2596 break; 2609 break;
… …
2615 return; 2628 return;
2616 } 2629 }
2617 2630
2618 switch (ch) 2631 switch (ch)
2619 { 2632 {
2620 /* case 1: do_tek_mode (); break; */
2621 case '#': 2633 case '#':
2622 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2623 scr_E (); 2635 scr_E ();
2624 break; 2636 break;
2625 case '(': 2637 case '(':
… …
2648#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2649 case '9': 2661 case '9':
2650 scr_forwardindex (); 2662 scr_forwardindex ();
2651 break; 2663 break;
2652#endif 2664#endif
2665 // DECPAM/DECPNM
2653 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2654 case '>': 2669 case '>':
2655 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2656 break; 2671 break;
2657 2672
2658 case C1_40: 2673 case C1_40:
2659 cmd_getc (); 2674 cmd_getc ();
2660 break; 2675 break;
… …
2664 2679
2665 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2666 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2667 { 2682 {
2668 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2669 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2670 } 2685 }
2671 break; 2686 break;
2672 2687
2673 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2674 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2675 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 */
2676 break; 2693 break;
2677 2694
2678 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2679 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2680 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2684 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2685 scr_index (DN); 2702 scr_index (DN);
2686 break; 2703 break;
2687 2704
2688 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2689 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2690 2707
2691 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2692 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2693 2710
2694 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2695 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2696 process_dcs_seq (); 2713 process_dcs_seq ();
2697 break; 2714 break;
… …
2730 } 2747 }
2731} 2748}
2732/*}}} */ 2749/*}}} */
2733 2750
2734/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2735/* *INDENT-OFF* */
2736enum { 2752enum {
2737 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2738 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,
2739 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 ,
2740 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,
… …
2743 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,
2744 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 ,
2745 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
2746}; 2762};
2747 2763
2748#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2749 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2750 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2751#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2752 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2753 2769
2754const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2755 { 2771 {
2756 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, */
2757 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, */
2758 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, */
2759 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, [, \, ], ^, _, */
2760 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, */
2761 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, */
2762 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, */
2763 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, {, |, }, ~, */
2764 }; 2780 };
2765/* *INDENT-ON* */
2766 2781
2767void 2782void
2768rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2769{ 2784{
2770 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
… …
2848 { 2863 {
2849 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2864 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2850 scr_soft_reset (); 2865 scr_soft_reset ();
2851 2866
2852 static const int pm_h[] = { 7, 25 }; 2867 static const int pm_h[] = { 7, 25 };
2853 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 };
2854 2869
2855 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);
2856 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);
2857 } 2872 }
2858 break; 2873 break;
2859 } 2874 }
2860 2875
2861 return; 2876 return;
… …
2879 } 2894 }
2880 break; 2895 break;
2881#endif 2896#endif
2882 2897
2883 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2884 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2885 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2886 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2887 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2888 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2889 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2890 break; 2905 break;
2891 2906
2892 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2893 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3080 } 3095 }
3081} 3096}
3082/*}}} */ 3097/*}}} */
3083 3098
3084#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3085/* ARGSUSED */
3086void 3100void
3087rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3088{ 3102{
3089 int x, y; 3103 int x, y;
3090 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3099 { 3113 {
3100 /* 3114 /*
3101 * commands 3115 * commands
3102 */ 3116 */
3103 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3104 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3105 break; 3119 break;
3106 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3107 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3108 break; 3122 break;
3109 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3110 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3111 break; 3125 break;
3112 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3113 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3114 break; 3128 break;
3115 case 5: /* raise window */ 3129 case 5: /* raise window */
3116 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3117 break; 3131 break;
3118 case 6: /* lower window */ 3132 case 6: /* lower window */
3119 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3120 break; 3134 break;
3121 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3122 scr_touch (true); 3136 scr_touch (true);
3123 break; 3137 break;
3124 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3127 break; 3141 break;
3128 3142
3129 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3130 default: 3144 default:
3131 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3132 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3133 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3134 break; 3148 break;
3135 3149
3136 /* 3150 /*
3137 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3138 */ 3152 */
3139 case 11: /* report window state */ 3153 case 11: /* report window state */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3141 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3142 break; 3156 break;
3143 case 13: /* report window position */ 3157 case 13: /* report window position */
3144 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3145 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3146 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3147 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3148 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3149 break; 3163 break;
3150 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3151 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3152 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3153 break; 3167 break;
3154 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3155 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3156 break; 3170 break;
… …
3158 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3159 break; 3173 break;
3160 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3161 { 3175 {
3162 char *s; 3176 char *s;
3163 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3164 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 */
3165 XFree (s); 3179 XFree (s);
3166 } 3180 }
3167 break; 3181 break;
3168 case 21: /* report window title */ 3182 case 21: /* report window title */
3169 { 3183 {
3170 char *s; 3184 char *s;
3171 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3172 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 */
3173 XFree (s); 3187 XFree (s);
3174 } 3188 }
3175 break; 3189 break;
3176 } 3190 }
… …
3232 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3246 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3233 */ 3247 */
3234void 3248void
3235rxvt_term::process_dcs_seq () 3249rxvt_term::process_dcs_seq ()
3236{ 3250{
3237 char *s;
3238 unicode_t eh;
3239
3240 /* 3251 /*
3241 * Not handled yet 3252 * Not handled yet
3242 */ 3253 */
3254
3255 unicode_t eh;
3243 s = get_to_st (eh); 3256 char *s = get_to_st (eh);
3244 if (s) 3257 if (s)
3245 free (s); 3258 free (s);
3246 3259
3247 return; 3260 return;
3248} 3261}
… …
3252 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3265 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3253 */ 3266 */
3254void 3267void
3255rxvt_term::process_osc_seq () 3268rxvt_term::process_osc_seq ()
3256{ 3269{
3257 unicode_t ch, eh;
3258 int arg; 3270 int arg;
3259 3271
3260 ch = cmd_getc (); 3272 unicode_t ch = cmd_getc ();
3261 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3273 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3262 arg = arg * 10 + (ch - '0'); 3274 arg = arg * 10 + (ch - '0');
3263 3275
3264 if (ch == ';') 3276 if (ch == ';')
3265 { 3277 {
3278 unicode_t eh;
3266 char *s = get_to_st (eh); 3279 char *s = get_to_st (eh);
3267 3280
3268 if (s) 3281 if (s)
3269 { 3282 {
3270 process_xterm_seq (arg, s, eh); 3283 process_xterm_seq (arg, s, eh);
… …
3331 unsigned long bytes_after; 3344 unsigned long bytes_after;
3332 unsigned char *value = 0; 3345 unsigned char *value = 0;
3333 const char *str = ""; 3346 const char *str = "";
3334 3347
3335 if (prop 3348 if (prop
3336 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3337 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3338 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3339 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3340 && actual_type != None 3353 && actual_type != None
3341 && actual_format == 8) 3354 && actual_format == 8)
… …
3353 { 3366 {
3354 *eq = 0; 3367 *eq = 0;
3355 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3356 } 3369 }
3357 else 3370 else
3358 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3359 display->atom (str)); 3372 display->atom (str));
3360 } 3373 }
3361 break; 3374 break;
3362 3375
3363 case XTerm_Color: 3376 case XTerm_Color:
… …
3395 process_color_seq (op, Color_pointer_fg, str, resp); 3408 process_color_seq (op, Color_pointer_fg, str, resp);
3396 break; 3409 break;
3397 case XTerm_Color_pointer_bg: 3410 case XTerm_Color_pointer_bg:
3398 process_color_seq (op, Color_pointer_bg, str, resp); 3411 process_color_seq (op, Color_pointer_bg, str, resp);
3399 break; 3412 break;
3413#ifdef OPTION_HC
3414 case XTerm_Color_HC:
3415 process_color_seq (op, Color_HC, str, resp);
3416 break;
3417 case XTerm_Color_HTC:
3418 process_color_seq (op, Color_HTC, str, resp);
3419 break;
3420#endif
3400#ifndef NO_BOLD_UNDERLINE_REVERSE 3421#ifndef NO_BOLD_UNDERLINE_REVERSE
3401 case XTerm_Color_RV:
3402 process_color_seq (op, Color_RV, str, resp);
3403 break;
3404 case Rxvt_Color_BD:
3405 case URxvt_Color_BD: 3422 case URxvt_Color_BD:
3406 process_color_seq (op, Color_BD, str, resp); 3423 process_color_seq (op, Color_BD, str, resp);
3407 break; 3424 break;
3408 case Rxvt_Color_UL:
3409 case URxvt_Color_UL: 3425 case URxvt_Color_UL:
3410 process_color_seq (op, Color_UL, str, resp); 3426 process_color_seq (op, Color_UL, str, resp);
3411 break; 3427 break;
3412 case URxvt_Color_IT: 3428 case URxvt_Color_IT:
3413 process_color_seq (op, Color_IT, str, resp); 3429 process_color_seq (op, Color_IT, str, resp);
… …
3421 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3422 { 3438 {
3423 bool changed = false; 3439 bool changed = false;
3424 3440
3425 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3426 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3442 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3427 else
3428 changed = bgPixmap.unset_tint ();
3429 3443
3430 if (changed) 3444 if (changed)
3431 update_background (); 3445 update_background ();
3432 } 3446 }
3433 3447
… …
3439 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3440 { 3454 {
3441 char str[256]; 3455 char str[256];
3442 3456
3443 sprintf (str, "[%dx%d+%d+%d]", 3457 sprintf (str, "[%dx%d+%d+%d]",
3444 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3458 min (h_scale, 32767), min (v_scale, 32767),
3445 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3459 min (h_align, 32767), min (v_align, 32767));
3446 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3447 } 3461 }
3448 else 3462 else
3449 { 3463 {
3450 int changed = 0; 3464 bool changed = false;
3451 3465
3452 if (*str != ';') 3466 if (*str != ';')
3453 { 3467 {
3454 /* reset to default scaling :*/
3455 bgPixmap.unset_geometry ();
3456 if (bgPixmap.set_file (str)) /* change pixmap */ 3468 if (bg_set_file (str)) /* change pixmap */
3457 changed++; 3469 changed = true;
3458 str = strchr (str, ';');
3459 if (str == NULL)
3460 bgPixmap.set_defaultGeometry ();
3461 } 3470 }
3462 3471 else
3463 while (str)
3464 { 3472 {
3465 str++; 3473 str++;
3466 if (bgPixmap.set_geometry (str)) 3474 if (bg_set_geometry (str, true))
3467 changed++; 3475 changed = true;
3468 str = strchr (str, ';');
3469 } 3476 }
3470 3477
3471 if (changed) 3478 if (changed)
3479 {
3480 if (bg_window_position_sensitive ())
3481 {
3482 int x, y;
3483 get_window_origin (x, y);
3484 bg_set_position (x, y);
3485 }
3472 update_background (); 3486 update_background ();
3487 }
3473 } 3488 }
3474 break; 3489 break;
3475#endif 3490#endif
3476 3491
3477 case XTerm_logfile: 3492 case XTerm_logfile:
… …
3571{ 3586{
3572 int state; 3587 int state;
3573 3588
3574 if (mode == 's') 3589 if (mode == 's')
3575 { 3590 {
3576 SavedModes |= (priv_modes & bit); 3591 if (priv_modes & bit)
3592 SavedModes |= bit;
3593 else
3594 SavedModes &= ~bit;
3577 return -1; 3595 return -1;
3578 } 3596 }
3579 else 3597 else
3580 { 3598 {
3581 if (mode == 'r') 3599 if (mode == 'r')
3582 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3583 else 3601 else
3584 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3602 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3585 set_privmode (bit, state); 3603
3604 if (state)
3605 priv_modes |= bit;
3606 else
3607 priv_modes &= ~bit;
3586 } 3608 }
3587 3609
3588 return state; 3610 return state;
3589} 3611}
3590 3612
3591/* we're not using priv _yet_ */ 3613/* we're not using priv _yet_ */
3592void 3614void
3593rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3615rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3594{ 3616{
3595 unsigned int i, j; 3617 unsigned int i, j;
3596 int state; 3618 int state;
3597 3619
3598 static const struct 3620 static const struct
3599 { 3621 {
3600 const int argval; 3622 const int argval;
3601 const unsigned long bit; 3623 const unsigned long bit;
3602 } argtopriv[] = { 3624 } argtopriv[] = {
3603 { 1, PrivMode_aplCUR }, // DECCKM 3625 { 1, PrivMode_aplCUR }, // DECCKM
3604 { 2, PrivMode_vt52 }, 3626 { 2, PrivMode_vt52 }, // DECANM
3605 { 3, PrivMode_132 }, // DECCOLM 3627 { 3, PrivMode_132 }, // DECCOLM
3606 { 4, PrivMode_smoothScroll }, // DECSCLM 3628 { 4, PrivMode_smoothScroll }, // DECSCLM
3607 { 5, PrivMode_rVideo }, // DECSCNM 3629 { 5, PrivMode_rVideo }, // DECSCNM
3608 { 6, PrivMode_relOrigin }, // DECOM 3630 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3631 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3632 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3633 { 9, PrivMode_MouseX10 },
3612 // 18 end FF to printer after print screen 3634 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scorll region 3635 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3636 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3637#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3638 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3639#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3640 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK 3641 // 38, tektronix mode // DECTEK
3620 { 40, PrivMode_132OK }, 3642 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI 3643 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI 3644 // 45 margin bell NYI
3623 // 46 start logging 3645 // 46 start logging
3624 { 47, PrivMode_Screen }, 3646 { 47, PrivMode_Screen },
3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3647 { 66, PrivMode_aplKP }, // DECNKM
3626#ifndef NO_BACKSPACE_KEY 3648#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, // DECBKM 3649 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3650#endif
3629 { 1000, PrivMode_MouseX11 }, 3651 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent }, 3652 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent }, 3653 { 1003, PrivMode_MouseAnyEvent },
3654#if ENABLE_FRILLS
3655 { 1005, PrivMode_ExtModeMouse },
3656#endif
3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 { 1011, PrivMode_Keypress }, // rxvt extension 3658 { 1011, PrivMode_Keypress }, // rxvt extension
3659#if ENABLE_FRILLS
3660 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3661#endif
3634 // 1035 enable modifiers for alt, numlock NYI 3662 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI 3663 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI 3664 // 1037 send DEL for keypad delete NYI
3637 { 1047, PrivMode_Screen }, 3665 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor 3666 // 1048 save and restore cursor, implemented in code
3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3667 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3668 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste }, 3669 { 2004, PrivMode_BracketPaste },
3642 }; 3670 };
3643 3671
… …
3653 for (i = 0; i < nargs; i++) 3681 for (i = 0; i < nargs; i++)
3654 { 3682 {
3655 state = -1; 3683 state = -1;
3656 3684
3657 /* basic handling */ 3685 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3686 for (j = 0; j < ecb_array_length (argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3687 if (argtopriv[j].argval == arg[i])
3660 { 3688 {
3661 state = privcases (mode, argtopriv[j].bit); 3689 state = privcases (mode, argtopriv[j].bit);
3662 break; 3690 break;
3663 } 3691 }
… …
3689 case 2: /* VT52 mode */ 3717 case 2: /* VT52 mode */
3690 /* oddball mode. should be set regardless of set/reset 3718 /* oddball mode. should be set regardless of set/reset
3691 * parameter. Return from VT52 mode with an ESC < from 3719 * parameter. Return from VT52 mode with an ESC < from
3692 * within VT52 mode 3720 * within VT52 mode
3693 */ 3721 */
3694 set_privmode (PrivMode_vt52, 1); 3722 priv_modes |= PrivMode_vt52;
3695 break; 3723 break;
3696 case 3: /* 80/132 */ 3724 case 3: /* 80/132 */
3697 if (priv_modes & PrivMode_132OK) 3725 if (priv_modes & PrivMode_132OK)
3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3726 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3699 break; 3727 break;
… …
3714 if (state) /* orthogonal */ 3742 if (state) /* orthogonal */
3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3743 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3716 break; 3744 break;
3717#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3718 case scrollBar_esc: 3746 case scrollBar_esc:
3719 if (scrollBar.map (state)) 3747 scrollBar.map (state);
3720 {
3721 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
3722 scr_touch (true); 3749 scr_touch (true);
3723 }
3724 break; 3750 break;
3725#endif 3751#endif
3726 case 25: /* visible/invisible cursor */ 3752 case 25: /* visible/invisible cursor */
3727 scr_cursor_visible (state); 3753 scr_cursor_visible (state);
3728 break; 3754 break;
… …
3741 case 1003: 3767 case 1003:
3742 if (state) 3768 if (state)
3743 { 3769 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3770 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3771 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3772 mouse_row = mouse_col = 0;
3746 vt_emask_mouse = PointerMotionMask; 3773 vt_emask_mouse = PointerMotionMask;
3747 } 3774 }
3748 else 3775 else
3749 vt_emask_mouse = NoEventMask; 3776 vt_emask_mouse = NoEventMask;
3750 3777
… …
3935 } 3962 }
3936 } 3963 }
3937} 3964}
3938/*}}} */ 3965/*}}} */
3939 3966
3940/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3941void
3942rxvt_term::process_graphics ()
3943{
3944 unicode_t ch, cmd = cmd_getc ();
3945
3946 if (cmd == 'Q')
3947 {
3948 /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */
3950 return;
3951 }
3952 /* swallow other graphics sequences until terminating ':' */
3953 do
3954 ch = cmd_getc ();
3955 while (ch != ':');
3956}
3957/*}}} */
3958
3959/* ------------------------------------------------------------------------- */ 3967/* ------------------------------------------------------------------------- */
3960 3968
3961/* 3969/*
3962 * Send printf () formatted output to the command. 3970 * Send printf () formatted output to the command.
3963 * Only use for small amounts of data. 3971 * Only use for small amounts of data.
… …
3976 3984
3977/* ---------------------------------------------------------------------- */ 3985/* ---------------------------------------------------------------------- */
3978/* Write data to the pty as typed by the user, pasted with the mouse, 3986/* Write data to the pty as typed by the user, pasted with the mouse,
3979 * or generated by us in response to a query ESC sequence. 3987 * or generated by us in response to a query ESC sequence.
3980 */ 3988 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3989static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982 3990
3983void 3991void
3984rxvt_term::tt_write (const char *data, unsigned int len) 3992rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 3993{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3994 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3991 3999
3992 if (v_buflen == 0) 4000 if (v_buflen == 0)
3993 { 4001 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4002 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995 4003
4004 max_it (written, 0);
4005
3996 if ((unsigned int)written == len) 4006 if (written == len)
3997 return; 4007 return;
3998 4008
3999 data += written; 4009 data += written;
4000 len -= written; 4010 len -= written;
4001 } 4011 }
4002 4012
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4013 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4014
4005 memcpy (v_buffer + v_buflen, data, len); 4015 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4016 v_buflen += len;
4007 4017
4008 pty_ev.set (ev::READ | ev::WRITE); 4018 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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