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.438 by root, Thu Feb 4 21:55:12 2010 UTC vs.
Revision 1.483 by sf-exg, Tue Apr 26 16:19:45 2011 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
162 162
163void 163void
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 167 wchar_t *chr, *alloc, ch2, **fname;
169 int len; 168 int len;
170
171 fname = rxvt_utf8towcs (f->name);
172 169
173# if ENABLE_COMBINING 170# if ENABLE_COMBINING
174 if (IS_COMPOSE (ch)) 171 if (IS_COMPOSE (ch))
175 { 172 {
176 len = rxvt_composite.expand (ch, 0); 173 len = rxvt_composite.expand (ch, 0);
… …
197 r & RS_Blink ? " blink" : "", 194 r & RS_Blink ? " blink" : "",
198 r & RS_RVid ? " rvid" : "", 195 r & RS_RVid ? " rvid" : "",
199 r & RS_Uline ? " uline" : "", 196 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 197 r & RS_Careful ? " careful" : "");
201 198
199 int width = 0;
200 fname = rxvt_temp_buf<wchar_t *> (len);
201 for (int i = 0; i < len; i++)
202 {
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name);
202 int width = wcswidth (fname, wcslen (fname)); 205 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 }
203 207
204 max_it (width, 8+5); // for char + hex 208 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 209 max_it (width, strlen (attr));
206 210
207 if (y >= 0) 211 if (y >= 0)
208 { 212 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
210 x = 0; 214 x = 0;
211 } 215 }
212 216
213 scr_overlay_new (x, y, width, len + 2); 217 scr_overlay_new (x, y, width, len * 2 + 1);
214 218
215 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
216 220
217 for (int y = 0; y < len; y++) 221 for (int y = 0; y < len; y++)
218 { 222 {
… …
237// char buf[4+4+3+1]; 241// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf); 243// scr_overlay_set (0, 0, buf);
240// } 244// }
241 scr_overlay_set (0, len , attr); 245 scr_overlay_set (0, len , attr);
246 for (int i = 0; i < len; i++)
247 {
242 scr_overlay_set (0, len + 1, fname); 248 scr_overlay_set (0, len + 1 + i, fname[i]);
243
244 free (fname); 249 free (fname[i]);
250 }
245 251
246# if ENABLE_COMBINING 252# if ENABLE_COMBINING
247 if (alloc) 253 if (alloc)
248 delete [] alloc; 254 delete [] alloc;
249# endif 255# endif
… …
282} 288}
283 289
284static int 290static int
285hex_keyval (XKeyEvent &ev) 291hex_keyval (XKeyEvent &ev)
286{ 292{
287 // check wether this event corresponds to a hex digit 293 // check whether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 294 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 295 for (int index = 0; index < 8; index++)
290 { 296 {
291 KeySym k = XLookupKeysym (&ev, index); 297 KeySym k = XLookupKeysym (&ev, index);
292 298
… …
415 * Always permit `shift' to override the current setting 421 * Always permit `shift' to override the current setting
416 */ 422 */
417 shft = ev.state & ShiftMask; 423 shft = ev.state & ShiftMask;
418 ctrl = ev.state & ControlMask; 424 ctrl = ev.state & ControlMask;
419 meta = ev.state & ModMetaMask; 425 meta = ev.state & ModMetaMask;
420
421 if (numlock_state || (ev.state & ModNumLockMask))
422 {
423 numlock_state = (ev.state & ModNumLockMask);
424 set_privmode (PrivMode_aplKP, !numlock_state);
425 }
426 426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
430 if (Input_Context) 430 if (Input_Context)
… …
647 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
648 { 648 {
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 650 unsigned int newlen = 1;
651 651
652 if (ev.state & ModNumLockMask)
653 kp = false;
654
652 switch (translate_keypad (keysym, kp)) 655 keysym = translate_keypad (keysym, kp);
656
657 switch (keysym)
653 { 658 {
654#ifndef NO_BACKSPACE_KEY 659#ifndef NO_BACKSPACE_KEY
655 case XK_BackSpace: 660 case XK_BackSpace:
656 if (priv_modes & PrivMode_HaveBackSpace) 661 if (priv_modes & PrivMode_HaveBackSpace)
657 { 662 {
… …
884 commit_iso14755 (); 889 commit_iso14755 ();
885 890
886 return; 891 return;
887 } 892 }
888 893
889 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
890 if (i[0] == keysym) 895 if (i[0] == keysym)
891 { 896 {
892 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
893 commit_iso14755 (); 898 commit_iso14755 ();
894 899
… …
931 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
932 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
933#endif 938#endif
934} 939}
935 940
936#if defined (KEYSYM_RESOURCE)
937unsigned int
938rxvt_term::cmd_write (const char *str, unsigned int count)
939{
940 unsigned int n, s;
941
942 n = cmdbuf_ptr - cmdbuf_base;
943 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
944
945 if (n > 0 && s < count)
946 {
947 memmove (cmdbuf_base, cmdbuf_ptr,
948 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
949 cmdbuf_ptr = cmdbuf_base;
950 cmdbuf_endp -= n;
951 s += n;
952 }
953
954 if (count > s)
955 {
956 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
957 count = s;
958 }
959
960 for (; count--;)
961 *cmdbuf_endp++ = *str++;
962
963 cmd_parse ();
964
965 return 0;
966}
967#endif
968
969void 941void
970rxvt_term::flush () 942rxvt_term::flush ()
971{ 943{
972 flush_ev.stop (); 944 flush_ev.stop ();
973 945
974#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_BG_PIXMAP
975 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
976 { 948 {
977// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
978 scr_touch (false); 950 scr_touch (false);
979 } 951 }
980#endif 952#endif
981 953
982 if (want_refresh) 954 if (want_refresh)
… …
1027 } 999 }
1028 1000
1029 display->flush (); 1001 display->flush ();
1030} 1002}
1031 1003
1032/* checks wether a refresh is requested and starts the refresh timer */ 1004/* checks whether a refresh is requested and starts the refresh timer */
1033void 1005void
1034rxvt_term::refresh_check () 1006rxvt_term::refresh_check ()
1035{ 1007{
1036 if (want_refresh && !flush_ev.is_active ()) 1008 if (want_refresh && !flush_ev.is_active ())
1037 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1009 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
… …
1131 // this should really be sched_yield(), but the linux guys thought 1103 // this should really be sched_yield(), but the linux guys thought
1132 // that giving a process calling sched_yield () less cpu time than 1104 // that giving a process calling sched_yield () less cpu time than
1133 // ones with high nice levels is a useful thing to do. It surely is is 1105 // ones with high nice levels is a useful thing to do. It surely is is
1134 // allowed by the sus... as is returning ENOSYS. 1106 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only 1107 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool, 1108 // known workaround against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best. 1109 // we just nanosleep a bit and hope for the best.
1138 1110
1139 struct timespec ts = { 0, 1000 }; 1111 struct timespec ts = { 0, 1000 };
1140 nanosleep (&ts, 0); 1112 nanosleep (&ts, 0);
1141 1113
… …
1147 { 1119 {
1148 } 1120 }
1149} event_handler; 1121} event_handler;
1150#endif 1122#endif
1151 1123
1124/* make sure all the cmd data is at beginning of cmdbuf */
1125void
1126rxvt_term::cmdbuf_reify ()
1127{
1128 if (cmdbuf_ptr == cmdbuf_base)
1129 return;
1130
1131 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1132
1133 memmove (cmdbuf_base, cmdbuf_ptr, used);
1134 cmdbuf_ptr = cmdbuf_base;
1135 cmdbuf_endp = cmdbuf_ptr + used;
1136
1137}
1138
1139#if defined (KEYSYM_RESOURCE)
1140void
1141rxvt_term::cmdbuf_append (const char *str, size_t count)
1142{
1143 cmdbuf_reify ();
1144
1145 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1146
1147 if (count > avail)
1148 return;
1149
1150 memcpy (cmdbuf_endp, str, count);
1151 cmdbuf_endp += count;
1152
1153 cmd_parse ();
1154}
1155#endif
1156
1152bool 1157bool
1153rxvt_term::pty_fill () 1158rxvt_term::pty_fill ()
1154{ 1159{
1155 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1160 cmdbuf_reify ();
1156 1161
1157 if (CBUFSIZ == n) 1162 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1158 { 1163
1159 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1164 if (!avail)
1160 n = 0;
1161 } 1165 {
1162 1166 // normally this indicates a "too long" command sequence - just drop the data we have
1163 memmove (cmdbuf_base, cmdbuf_ptr, n);
1164 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1165 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr;
1169 avail = CBUFSIZ;
1170 }
1166 1171
1167 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1172 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1168 1173
1169 if (r > 0) 1174 if (r > 0)
1170 { 1175 {
1171 cmdbuf_endp += r; 1176 cmdbuf_endp += r;
1172 return true; 1177 return true;
… …
1246{ 1251{
1247 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1248 int x, y; 1253 int x, y;
1249 int code = 32; 1254 int code = 32;
1250 1255
1251 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x) + 1;
1252 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y) + 1;
1258
1253 if (ev.type == MotionNotify) 1259 if (ev.type == MotionNotify)
1254 { 1260 {
1255 if (x == mouse_row && y == mouse_col) 1261 if (x == mouse_row && y == mouse_col)
1256 return; 1262 return;
1263
1257 mouse_row = x; 1264 mouse_row = x;
1258 mouse_col = y; 1265 mouse_col = y;
1259 code += 32; 1266 code += 32;
1260 } 1267 }
1261 1268
… …
1264 else 1271 else
1265 { 1272 {
1266 button_number = MEvent.button - Button1; 1273 button_number = MEvent.button - Button1;
1267 /* add 0x3D for wheel events, like xterm does */ 1274 /* add 0x3D for wheel events, like xterm does */
1268 if (button_number >= 3) 1275 if (button_number >= 3)
1269 button_number += (64 - 3); 1276 button_number += 64 - 3;
1270 } 1277 }
1271 1278
1272 if (priv_modes & PrivMode_MouseX10) 1279 if (priv_modes & PrivMode_MouseX10)
1273 { 1280 {
1274 /* 1281 /*
… …
1306 fputc ('A', stderr); 1313 fputc ('A', stderr);
1307 if (key_state & 32) 1314 if (key_state & 32)
1308 fputc ('2', stderr); 1315 fputc ('2', stderr);
1309 fprintf (stderr, "]: <%d>, %d/%d\n", 1316 fprintf (stderr, "]: <%d>, %d/%d\n",
1310 button_number, 1317 button_number,
1311 x + 1, 1318 x,
1312 y + 1); 1319 y);
1313#endif 1320#endif
1314 1321
1322#if ENABLE_FRILLS
1323 if (priv_modes & PrivMode_ExtMouseRight)
1324 tt_printf ("\033[%d;%d;%dM",
1325 code + button_number + key_state,
1326 x,
1327 y);
1328 else if (priv_modes & PrivMode_ExtModeMouse)
1329 tt_printf ("\033[M%c%lc%lc",
1330 code + button_number + key_state,
1331 wint_t (32 + x),
1332 wint_t (32 + y));
1333 else
1334#endif
1315 tt_printf ("\033[M%c%c%c", 1335 tt_printf ("\033[M%c%c%c",
1316 (code + button_number + key_state), 1336 code + button_number + key_state,
1317 (32 + x + 1), 1337 32 + x,
1318 (32 + y + 1)); 1338 32 + y);
1319} 1339}
1320 1340
1321/*{{{ process an X event */ 1341/*{{{ process an X event */
1322void 1342void
1323rxvt_term::x_cb (XEvent &ev) 1343rxvt_term::x_cb (XEvent &ev)
… …
1425 && ev.xfocus.mode != NotifyGrab) 1445 && ev.xfocus.mode != NotifyGrab)
1426 focus_out (); 1446 focus_out ();
1427 break; 1447 break;
1428 1448
1429 case ConfigureNotify: 1449 case ConfigureNotify:
1430 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1431 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1432 szHint.width, szHint.height);*/
1433 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent)
1434 { 1451 {
1435 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1436 ; 1453 ;
1454
1455#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ())
1458 {
1459 int x, y;
1460 if (ev.xconfigure.send_event)
1461 {
1462 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y;
1464 }
1465 else
1466 get_window_origin (x, y);
1467
1468 if (bg_set_position (x, y)
1469 || !(bg_flags & BG_IS_VALID))
1470 moved = true;
1471 }
1472#endif
1437 1473
1438 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1439 { 1475 {
1440 seen_resize = 1; 1476 seen_resize = 1;
1441 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1442 } 1478 }
1443 else 1479 else
1444 { 1480 {
1445#ifdef HAVE_BG_PIXMAP 1481#ifdef HAVE_BG_PIXMAP
1446 if (bgPixmap.window_position_sensitive ()) 1482 if (moved)
1447 { 1483 {
1448 if (mapped) 1484 if (mapped)
1449 update_background (); 1485 update_background ();
1450 else 1486 else
1451 bgPixmap.invalidate (); 1487 bg_invalidate ();
1452 } 1488 }
1453#endif 1489#endif
1454 } 1490 }
1455 1491
1456 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1457 } 1493 }
1458 break; 1494 break;
1459 1495
1460 case PropertyNotify: 1496 case PropertyNotify:
1461 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1497 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465
1466 break; 1498 break;
1467 1499
1468 case SelectionClear: 1500 case SelectionClear:
1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1501 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1470 break; 1502 break;
1471 1503
1472 case SelectionNotify:
1473 if (selection_wait == Sel_normal)
1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1475 break;
1476
1477 case SelectionRequest: 1504 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1505 selection_send (ev.xselectionrequest);
1479 break; 1506 break;
1480 1507
1481 case MapNotify: 1508 case MapNotify:
1482#ifdef HAVE_BG_PIXMAP 1509#ifdef HAVE_BG_PIXMAP
1483 /* This is needed spcifically to fix the case of no window manager or a 1510 /* This is needed specifically to fix the case of no window manager or a
1484 * non-reparenting window manager. In those cases we never get first 1511 * non-reparenting window manager. In those cases we never get first
1485 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1486 * care of multiplicity of ConfigureNotify events arriwing while WM does 1513 * care of multiplicity of ConfigureNotify events arriving while WM does
1487 * reparenting. 1514 * reparenting.
1488 * We should not render background immidiately, as there could be several 1515 * We should not render background immediately, as there could be several
1489 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1490 * by scheduling background redraw as soon as we can, but giving a short 1517 * by scheduling background redraw as soon as we can, but giving a short
1491 * bit of time for ConfigureNotifies to arrive. 1518 * bit of time for ConfigureNotifies to arrive.
1492 * We should render background PRIOR to drawing any text, but AFTER all 1519 * We should render background PRIOR to drawing any text, but AFTER all
1493 * of ConfigureNotifys for the best results. 1520 * of ConfigureNotifys for the best results.
1494 */ 1521 */
1495 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1522 if (!(bg_flags & BG_IS_VALID))
1496 update_background_ev.start (0.025); 1523 update_background_ev.start (0.025);
1497#endif 1524#endif
1498 mapped = 1; 1525 mapped = 1;
1499#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1500 text_blink_ev.start (); 1527 text_blink_ev.start ();
… …
1515 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1516 { 1543 {
1517 do 1544 do
1518 { 1545 {
1519 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1520 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, false);
1521 } 1548 }
1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1523 1550
1524 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1525 1552
1526 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1527 { 1554 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, false);
1530 } 1557 }
1531 1558
1532 want_refresh = 1; 1559 want_refresh = 1;
1533 } 1560 }
1534 else 1561 else
… …
1694rxvt_term::set_urgency (bool enable) 1721rxvt_term::set_urgency (bool enable)
1695{ 1722{
1696 if (enable == urgency_hint) 1723 if (enable == urgency_hint)
1697 return; 1724 return;
1698 1725
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1726 if (XWMHints *h = XGetWMHints (dpy, parent))
1700 { 1727 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h); 1729 XSetWMHints (dpy, parent, h);
1703 urgency_hint = enable; 1730 urgency_hint = enable;
1704 } 1731 }
1705} 1732}
1706#endif 1733#endif
1707 1734
… …
1815 * use the property to determine the pixmap. We use it later on. 1842 * use the property to determine the pixmap. We use it later on.
1816 */ 1843 */
1817 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819 { 1846 {
1820 bgPixmap.set_root_pixmap (); 1847 bg_set_root_pixmap ();
1821 update_background (); 1848 update_background ();
1822 } 1849 }
1823 1850
1824 break; 1851 break;
1825 } 1852 }
… …
1864 /* save the xbutton state (for ButtonRelease) */ 1891 /* save the xbutton state (for ButtonRelease) */
1865 MEvent.state = ev.state; 1892 MEvent.state = ev.state;
1866#ifdef MOUSE_REPORT_DOUBLECLICK 1893#ifdef MOUSE_REPORT_DOUBLECLICK
1867 if (ev.button == MEvent.button && clickintime) 1894 if (ev.button == MEvent.button && clickintime)
1868 { 1895 {
1869 /* same button, within alloted time */ 1896 /* same button, within allowed time */
1870 MEvent.clicks++; 1897 MEvent.clicks++;
1871 1898
1872 if (MEvent.clicks > 1) 1899 if (MEvent.clicks > 1)
1873 { 1900 {
1874 /* only report double clicks */ 1901 /* only report double clicks */
… …
2145 selection_make (ev.time); 2172 selection_make (ev.time);
2146 break; 2173 break;
2147 2174
2148 case Button2: 2175 case Button2:
2149 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2150 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2151 break; 2178 break;
2152 2179
2153#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2154 case Button4: 2181 case Button4:
2155 case Button5: 2182 case Button5:
… …
2362 : NOCHAR; 2389 : NOCHAR;
2363} 2390}
2364 2391
2365static class out_of_input out_of_input; 2392static class out_of_input out_of_input;
2366 2393
2367/* rxvt_cmd_getc () - Return next input character */
2368/*
2369 * Return the next input character after first passing any keyboard input
2370 * to the command.
2371 */
2372wchar_t 2394wchar_t
2373rxvt_term::cmd_getc () THROW ((class out_of_input)) 2395rxvt_term::cmd_getc () THROW ((class out_of_input))
2374{ 2396{
2375 wchar_t c = next_char (); 2397 wchar_t c = next_char ();
2376 2398
… …
2658 2680
2659 /* 8.3.87: NEXT LINE */ 2681 /* 8.3.87: NEXT LINE */
2660 case C1_NEL: /* ESC E */ 2682 case C1_NEL: /* ESC E */
2661 { 2683 {
2662 wchar_t nlcr[] = { C0_LF, C0_CR }; 2684 wchar_t nlcr[] = { C0_LF, C0_CR };
2663 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1);
2664 } 2686 }
2665 break; 2687 break;
2666 2688
2667 /* kidnapped escape sequence: Should be 8.3.48 */ 2689 /* kidnapped escape sequence: Should be 8.3.48 */
2668 case C1_ESA: /* ESC G */ 2690 case C1_ESA: /* ESC G */
2669 process_graphics (); 2691 // used by original rxvt for rob nations own graphics mode
2692 if (cmd_getc () == 'Q')
2693 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2670 break; 2694 break;
2671 2695
2672 /* 8.3.63: CHARACTER TABULATION SET */ 2696 /* 8.3.63: CHARACTER TABULATION SET */
2673 case C1_HTS: /* ESC H */ 2697 case C1_HTS: /* ESC H */
2674 scr_set_tab (1); 2698 scr_set_tab (1);
… …
2737 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2761 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2738 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2762 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2739 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2763 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2740}; 2764};
2741 2765
2742#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2766#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2743 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2767 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2744 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2768 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2745#define get_byte_array_bit(array, bit) \ 2769#define get_byte_array_bit(array, bit) \
2746 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2770 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2747 2771
2748const unsigned char csi_defaults[] = 2772static const unsigned char csi_defaults[] =
2749 { 2773 {
2750 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2774 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2751 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2775 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2752 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2776 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2753 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2777 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
… …
2842 { 2866 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2867 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset (); 2868 scr_soft_reset ();
2845 2869
2846 static const int pm_h[] = { 7, 25 }; 2870 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2848 2872
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l);
2851 } 2875 }
2852 break; 2876 break;
2853 } 2877 }
2854 2878
2855 return; 2879 return;
… …
3093 { 3117 {
3094 /* 3118 /*
3095 * commands 3119 * commands
3096 */ 3120 */
3097 case 1: /* deiconify window */ 3121 case 1: /* deiconify window */
3098 XMapWindow (dpy, parent[0]); 3122 XMapWindow (dpy, parent);
3099 break; 3123 break;
3100 case 2: /* iconify window */ 3124 case 2: /* iconify window */
3101 XIconifyWindow (dpy, parent[0], display->screen); 3125 XIconifyWindow (dpy, parent, display->screen);
3102 break; 3126 break;
3103 case 3: /* set position (pixels) */ 3127 case 3: /* set position (pixels) */
3104 XMoveWindow (dpy, parent[0], args[1], args[2]); 3128 XMoveWindow (dpy, parent, args[1], args[2]);
3105 break; 3129 break;
3106 case 4: /* set size (pixels) */ 3130 case 4: /* set size (pixels) */
3107 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3131 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3108 break; 3132 break;
3109 case 5: /* raise window */ 3133 case 5: /* raise window */
3110 XRaiseWindow (dpy, parent[0]); 3134 XRaiseWindow (dpy, parent);
3111 break; 3135 break;
3112 case 6: /* lower window */ 3136 case 6: /* lower window */
3113 XLowerWindow (dpy, parent[0]); 3137 XLowerWindow (dpy, parent);
3114 break; 3138 break;
3115 case 7: /* refresh window */ 3139 case 7: /* refresh window */
3116 scr_touch (true); 3140 scr_touch (true);
3117 break; 3141 break;
3118 case 8: /* set size (chars) */ 3142 case 8: /* set size (chars) */
… …
3129 3153
3130 /* 3154 /*
3131 * reports - some output format copied from XTerm 3155 * reports - some output format copied from XTerm
3132 */ 3156 */
3133 case 11: /* report window state */ 3157 case 11: /* report window state */
3134 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3135 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3159 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3136 break; 3160 break;
3137 case 13: /* report window position */ 3161 case 13: /* report window position */
3138 XGetWindowAttributes (dpy, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent, &wattr);
3139 XTranslateCoordinates (dpy, parent[0], wattr.root, 3163 XTranslateCoordinates (dpy, parent, wattr.root,
3140 -wattr.border_width, -wattr.border_width, 3164 -wattr.border_width, -wattr.border_width,
3141 &x, &y, &wdummy); 3165 &x, &y, &wdummy);
3142 tt_printf ("\033[3;%d;%dt", x, y); 3166 tt_printf ("\033[3;%d;%dt", x, y);
3143 break; 3167 break;
3144 case 14: /* report window size (pixels) */ 3168 case 14: /* report window size (pixels) */
3145 XGetWindowAttributes (dpy, parent[0], &wattr); 3169 XGetWindowAttributes (dpy, parent, &wattr);
3146 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3170 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3147 break; 3171 break;
3148 case 18: /* report text area size (chars) */ 3172 case 18: /* report text area size (chars) */
3149 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3173 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3150 break; 3174 break;
… …
3152 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3176 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3153 break; 3177 break;
3154 case 20: /* report icon label */ 3178 case 20: /* report icon label */
3155 { 3179 {
3156 char *s; 3180 char *s;
3157 XGetIconName (dpy, parent[0], &s); 3181 XGetIconName (dpy, parent, &s);
3158 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3159 XFree (s); 3183 XFree (s);
3160 } 3184 }
3161 break; 3185 break;
3162 case 21: /* report window title */ 3186 case 21: /* report window title */
3163 { 3187 {
3164 char *s; 3188 char *s;
3165 XFetchName (dpy, parent[0], &s); 3189 XFetchName (dpy, parent, &s);
3166 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3190 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3167 XFree (s); 3191 XFree (s);
3168 } 3192 }
3169 break; 3193 break;
3170 } 3194 }
… …
3226 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3250 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3227 */ 3251 */
3228void 3252void
3229rxvt_term::process_dcs_seq () 3253rxvt_term::process_dcs_seq ()
3230{ 3254{
3231 char *s;
3232 unicode_t eh;
3233
3234 /* 3255 /*
3235 * Not handled yet 3256 * Not handled yet
3236 */ 3257 */
3258
3259 unicode_t eh;
3237 s = get_to_st (eh); 3260 char *s = get_to_st (eh);
3238 if (s) 3261 if (s)
3239 free (s); 3262 free (s);
3240 3263
3241 return; 3264 return;
3242} 3265}
… …
3246 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3269 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3247 */ 3270 */
3248void 3271void
3249rxvt_term::process_osc_seq () 3272rxvt_term::process_osc_seq ()
3250{ 3273{
3251 unicode_t ch, eh;
3252 int arg; 3274 int arg;
3253 3275
3254 ch = cmd_getc (); 3276 unicode_t ch = cmd_getc ();
3255 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3277 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3256 arg = arg * 10 + (ch - '0'); 3278 arg = arg * 10 + (ch - '0');
3257 3279
3258 if (ch == ';') 3280 if (ch == ';')
3259 { 3281 {
3282 unicode_t eh;
3260 char *s = get_to_st (eh); 3283 char *s = get_to_st (eh);
3261 3284
3262 if (s) 3285 if (s)
3263 { 3286 {
3264 process_xterm_seq (arg, s, eh); 3287 process_xterm_seq (arg, s, eh);
… …
3325 unsigned long bytes_after; 3348 unsigned long bytes_after;
3326 unsigned char *value = 0; 3349 unsigned char *value = 0;
3327 const char *str = ""; 3350 const char *str = "";
3328 3351
3329 if (prop 3352 if (prop
3330 && XGetWindowProperty (dpy, parent[0], 3353 && XGetWindowProperty (dpy, parent,
3331 prop, 0, 1<<16, 0, AnyPropertyType, 3354 prop, 0, 1<<16, 0, AnyPropertyType,
3332 &actual_type, &actual_format, 3355 &actual_type, &actual_format,
3333 &nitems, &bytes_after, &value) == Success 3356 &nitems, &bytes_after, &value) == Success
3334 && actual_type != None 3357 && actual_type != None
3335 && actual_format == 8) 3358 && actual_format == 8)
… …
3347 { 3370 {
3348 *eq = 0; 3371 *eq = 0;
3349 set_utf8_property (display->atom (str), eq + 1); 3372 set_utf8_property (display->atom (str), eq + 1);
3350 } 3373 }
3351 else 3374 else
3352 XDeleteProperty (dpy, parent[0], 3375 XDeleteProperty (dpy, parent,
3353 display->atom (str)); 3376 display->atom (str));
3354 } 3377 }
3355 break; 3378 break;
3356 3379
3357 case XTerm_Color: 3380 case XTerm_Color:
… …
3389 process_color_seq (op, Color_pointer_fg, str, resp); 3412 process_color_seq (op, Color_pointer_fg, str, resp);
3390 break; 3413 break;
3391 case XTerm_Color_pointer_bg: 3414 case XTerm_Color_pointer_bg:
3392 process_color_seq (op, Color_pointer_bg, str, resp); 3415 process_color_seq (op, Color_pointer_bg, str, resp);
3393 break; 3416 break;
3417#ifdef OPTION_HC
3418 case XTerm_Color_HC:
3419 process_color_seq (op, Color_HC, str, resp);
3420 break;
3421 case XTerm_Color_HTC:
3422 process_color_seq (op, Color_HTC, str, resp);
3423 break;
3424#endif
3394#ifndef NO_BOLD_UNDERLINE_REVERSE 3425#ifndef NO_BOLD_UNDERLINE_REVERSE
3395 case XTerm_Color_RV:
3396 process_color_seq (op, Color_RV, str, resp);
3397 break;
3398 case Rxvt_Color_BD:
3399 case URxvt_Color_BD: 3426 case URxvt_Color_BD:
3400 process_color_seq (op, Color_BD, str, resp); 3427 process_color_seq (op, Color_BD, str, resp);
3401 break; 3428 break;
3402 case Rxvt_Color_UL:
3403 case URxvt_Color_UL: 3429 case URxvt_Color_UL:
3404 process_color_seq (op, Color_UL, str, resp); 3430 process_color_seq (op, Color_UL, str, resp);
3405 break; 3431 break;
3406 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3407 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
… …
3415 process_color_seq (op, Color_tint, str, resp); 3441 process_color_seq (op, Color_tint, str, resp);
3416 { 3442 {
3417 bool changed = false; 3443 bool changed = false;
3418 3444
3419 if (ISSET_PIXCOLOR (Color_tint)) 3445 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3446 changed = bg_set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423 3447
3424 if (changed) 3448 if (changed)
3425 update_background (); 3449 update_background ();
3426 } 3450 }
3427 3451
… …
3433 if (!strcmp (str, "?")) 3457 if (!strcmp (str, "?"))
3434 { 3458 {
3435 char str[256]; 3459 char str[256];
3436 3460
3437 sprintf (str, "[%dx%d+%d+%d]", 3461 sprintf (str, "[%dx%d+%d+%d]",
3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3462 min (h_scale, 32767), min (v_scale, 32767),
3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3463 min (h_align, 32767), min (v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST); 3464 process_xterm_seq (XTerm_title, str, CHAR_ST);
3441 } 3465 }
3442 else 3466 else
3443 { 3467 {
3444 int changed = 0; 3468 int changed = 0;
3445 3469
3446 if (*str != ';') 3470 if (*str != ';')
3447 { 3471 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */ 3472 if (bg_set_file (str)) /* change pixmap */
3473 {
3451 changed++; 3474 changed++;
3452 str = strchr (str, ';'); 3475 str = strchr (str, ';');
3453 if (str == NULL) 3476 if (str == NULL)
3454 bgPixmap.set_defaultGeometry (); 3477 bg_set_default_geometry ();
3478 else
3479 bg_set_geometry (str+1);
3480 }
3455 } 3481 }
3456 3482 else
3457 while (str)
3458 { 3483 {
3459 str++; 3484 str++;
3460 if (bgPixmap.set_geometry (str)) 3485 if (bg_set_geometry (str, true))
3461 changed++; 3486 changed++;
3462 str = strchr (str, ';');
3463 } 3487 }
3464 3488
3465 if (changed) 3489 if (changed)
3490 {
3491 if (bg_window_position_sensitive ())
3492 {
3493 int x, y;
3494 get_window_origin (x, y);
3495 bg_set_position (x, y);
3496 }
3466 update_background (); 3497 update_background ();
3498 }
3467 } 3499 }
3468 break; 3500 break;
3469#endif 3501#endif
3470 3502
3471 case XTerm_logfile: 3503 case XTerm_logfile:
… …
3574 { 3606 {
3575 if (mode == 'r') 3607 if (mode == 'r')
3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3577 else 3609 else
3578 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3610 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611
3579 set_privmode (bit, state); 3612 set_privmode (bit, state);
3580 } 3613 }
3581 3614
3582 return state; 3615 return state;
3583} 3616}
… …
3602 { 6, PrivMode_relOrigin }, // DECOM 3635 { 6, PrivMode_relOrigin }, // DECOM
3603 { 7, PrivMode_Autowrap }, // DECAWM 3636 { 7, PrivMode_Autowrap }, // DECAWM
3604 // 8, auto-repeat keys // DECARM 3637 // 8, auto-repeat keys // DECARM
3605 { 9, PrivMode_MouseX10 }, 3638 { 9, PrivMode_MouseX10 },
3606 // 18 end FF to printer after print screen 3639 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region 3640 // 19 Print screen prints full screen/scroll region
3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3642#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3643 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3644#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3645 { 35, PrivMode_ShiftKeys }, // rxvt extension
… …
3621 { 67, PrivMode_BackSpace }, // DECBKM 3654 { 67, PrivMode_BackSpace }, // DECBKM
3622#endif 3655#endif
3623 { 1000, PrivMode_MouseX11 }, 3656 { 1000, PrivMode_MouseX11 },
3624 { 1002, PrivMode_MouseBtnEvent }, 3657 { 1002, PrivMode_MouseBtnEvent },
3625 { 1003, PrivMode_MouseAnyEvent }, 3658 { 1003, PrivMode_MouseAnyEvent },
3659#if ENABLE_FRILLS
3660 { 1005, PrivMode_ExtModeMouse },
3661#endif
3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3662 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3627 { 1011, PrivMode_Keypress }, // rxvt extension 3663 { 1011, PrivMode_Keypress }, // rxvt extension
3664#if ENABLE_FRILLS
3665 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3666#endif
3628 // 1035 enable modifiers for alt, numlock NYI 3667 // 1035 enable modifiers for alt, numlock NYI
3629 // 1036 send ESC for meta keys NYI 3668 // 1036 send ESC for meta keys NYI
3630 // 1037 send DEL for keypad delete NYI 3669 // 1037 send DEL for keypad delete NYI
3631 { 1047, PrivMode_Screen }, 3670 { 1047, PrivMode_Screen },
3632 // 1048 save and restore cursor 3671 // 1048 save and restore cursor, implemented in code
3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3672 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3673 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste }, 3674 { 2004, PrivMode_BracketPaste },
3636 }; 3675 };
3637 3676
… …
3647 for (i = 0; i < nargs; i++) 3686 for (i = 0; i < nargs; i++)
3648 { 3687 {
3649 state = -1; 3688 state = -1;
3650 3689
3651 /* basic handling */ 3690 /* basic handling */
3652 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++)
3653 if (argtopriv[j].argval == arg[i]) 3692 if (argtopriv[j].argval == arg[i])
3654 { 3693 {
3655 state = privcases (mode, argtopriv[j].bit); 3694 state = privcases (mode, argtopriv[j].bit);
3656 break; 3695 break;
3657 } 3696 }
… …
3735 case 1003: 3774 case 1003:
3736 if (state) 3775 if (state)
3737 { 3776 {
3738 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3777 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3778 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3779 mouse_row = mouse_col = 0;
3740 vt_emask_mouse = PointerMotionMask; 3780 vt_emask_mouse = PointerMotionMask;
3741 } 3781 }
3742 else 3782 else
3743 vt_emask_mouse = NoEventMask; 3783 vt_emask_mouse = NoEventMask;
3744 3784
… …
3929 } 3969 }
3930 } 3970 }
3931} 3971}
3932/*}}} */ 3972/*}}} */
3933 3973
3934/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3935void
3936rxvt_term::process_graphics ()
3937{
3938 unicode_t ch, cmd = cmd_getc ();
3939
3940 if (cmd == 'Q')
3941 {
3942 /* query graphics */
3943 tt_printf ("\033G0\012"); /* no graphics */
3944 return;
3945 }
3946 /* swallow other graphics sequences until terminating ':' */
3947 do
3948 ch = cmd_getc ();
3949 while (ch != ':');
3950}
3951/*}}} */
3952
3953/* ------------------------------------------------------------------------- */ 3974/* ------------------------------------------------------------------------- */
3954 3975
3955/* 3976/*
3956 * Send printf () formatted output to the command. 3977 * Send printf () formatted output to the command.
3957 * Only use for small amounts of data. 3978 * Only use for small amounts of data.
… …
3970 3991
3971/* ---------------------------------------------------------------------- */ 3992/* ---------------------------------------------------------------------- */
3972/* Write data to the pty as typed by the user, pasted with the mouse, 3993/* Write data to the pty as typed by the user, pasted with the mouse,
3973 * or generated by us in response to a query ESC sequence. 3994 * or generated by us in response to a query ESC sequence.
3974 */ 3995 */
3975const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3996static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3976 3997
3977void 3998void
3978rxvt_term::tt_write (const char *data, unsigned int len) 3999rxvt_term::tt_write (const char *data, unsigned int len)
3979{ 4000{
3980 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4001 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3985 4006
3986 if (v_buflen == 0) 4007 if (v_buflen == 0)
3987 { 4008 {
3988 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4009 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3989 4010
4011 max_it (written, 0);
4012
3990 if ((unsigned int)written == len) 4013 if (written == len)
3991 return; 4014 return;
3992 4015
3993 data += written; 4016 data += written;
3994 len -= written; 4017 len -= written;
3995 } 4018 }
3996 4019
3997 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4020 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
3998 4021
3999 memcpy (v_buffer + v_buflen, data, len); 4022 memcpy (v_buffer + v_buflen, data, len);
4000 v_buflen += len; 4023 v_buflen += len;
4001 4024
4002 pty_ev.set (ev::READ | ev::WRITE); 4025 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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