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.304 by root, Tue Jan 31 22:01:25 2006 UTC vs.
Revision 1.339 by ayin, Fri Aug 3 14:03:28 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303/*{{{ Convert the keypress event into a string */
304void 303void
305rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
306{ 305{
307 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
308 unsigned int newlen; 307 unsigned int newlen;
309 KeySym keysym; 308 KeySym keysym;
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
498# endif 502# endif
499 return; 503 return;
500 } 504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
505# if ISO_14755 517# if ISO_14755
… …
507# endif 519# endif
508 return; 520 return;
509 } 521 }
510 else 522 else
511 { 523 {
512# if ENABLE_OVERLAY 524# if ISO_14755
513 scr_overlay_off (); 525 scr_overlay_off ();
514# endif 526# endif
515 iso14755buf = 0; 527 iso14755buf = 0;
516 } 528 }
517 } 529 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
521 { 533 {
522 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 535# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
911} 923}
912/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
913 1001
914#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
915unsigned int 1003unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 1005{
… …
947void 1035void
948rxvt_term::flush () 1036rxvt_term::flush ()
949{ 1037{
950 flush_ev.stop (); 1038 flush_ev.stop ();
951 1039
952#ifdef TRANSPARENT 1040#ifdef ENABLE_TRANSPARENCY
953 if (want_full_refresh) 1041 if (want_full_refresh)
954 { 1042 {
955 want_full_refresh = 0; 1043 want_full_refresh = 0;
956 scr_clear (); 1044 scr_clear ();
957 scr_touch (false); 1045 scr_touch (false);
… …
1022void 1110void
1023rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1024{ 1112{
1025 make_current (); 1113 make_current ();
1026 1114
1027 refresh_limit = 1;
1028 refresh_count = 0; 1115 refresh_count = 0;
1029 flush (); 1116 flush ();
1030} 1117}
1031 1118
1032#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1098 1185
1099#if LINUX_YIELD_HACK 1186#if LINUX_YIELD_HACK
1100static struct event_handler 1187static struct event_handler
1101{ 1188{
1102 check_watcher yield_ev; 1189 check_watcher yield_ev;
1103 1190
1104 void yield_cb (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1105 { 1192 {
1106 // this should really be sched_yield(), but the linux guys thought 1193 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1194 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is 1195 // ones with high nice levels is a useful thing to do. It surely is is
… …
1152 } 1239 }
1153 else 1240 else
1154 { 1241 {
1155 pty_ev.stop (); 1242 pty_ev.stop ();
1156 1243
1157 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1158 destroy (); 1245 destroy ();
1159 } 1246 }
1160 1247
1161 return false; 1248 return false;
1162} 1249}
1163 1250
1164void 1251void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1177} 1264}
1178 1265
1179void 1266void
1180rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1181{ 1268{
1182 XDefineCursor (xdisp, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1270 recolour_cursor ();
1184 1271
1185#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1273 hidden_pointer = 0;
1187 1274
1188 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1277#endif
1191} 1278}
1192 1279
1193#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1194void 1281void
1195rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1196{ 1283{
1197 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1198 return; 1285 return;
1199 1286
1200 XDefineCursor (xdisp, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (xdisp); 1288 XFlush (dpy);
1202 1289
1203 hidden_pointer = 1; 1290 hidden_pointer = 1;
1204} 1291}
1205 1292
1206void 1293void
… …
1285void 1372void
1286rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1287{ 1374{
1288 make_current (); 1375 make_current ();
1289 1376
1290 dLocal (Display *, xdisp); 1377 dLocal (Display *, dpy);
1291 1378
1292 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1293 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1295 return; 1382 return;
… …
1300 unsigned int unused_mask; 1387 unsigned int unused_mask;
1301 1388
1302 switch (ev.type) 1389 switch (ev.type)
1303 { 1390 {
1304 case KeyPress: 1391 case KeyPress:
1305#if ISO_14755 1392 key_press (ev.xkey);
1306 if (!(iso14755buf & ISO_14755_52))
1307#endif
1308 lookup_key (ev.xkey);
1309
1310 break; 1393 break;
1311 1394
1312 case KeyRelease: 1395 case KeyRelease:
1313 { 1396 key_release (ev.xkey);
1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1315 KeySym keysym;
1316
1317 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1318#endif
1319
1320#if ENABLE_FRILLS || ISO_14755
1321 // ISO 14755 support
1322 if (iso14755buf)
1323 if (iso14755buf & ISO_14755_52)
1324 {
1325# if ENABLE_OVERLAY
1326 scr_overlay_off ();
1327# endif
1328# if ISO_14755
1329 // iso14755 part 5.2 handling: release time
1330 // first: controls
1331 if ((ev.xkey.state & ControlMask)
1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1334 {
1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1336 commit_iso14755 ();
1337 goto skip_switch;
1338 }
1339
1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1341 if (i[0] == keysym)
1342 {
1343 iso14755buf = ISO_14755_51 | i[1];
1344 commit_iso14755 ();
1345 goto skip_switch;
1346 }
1347
1348 scr_bell ();
1349# endif
1350 iso14755buf = 0;
1351 break;
1352 }
1353 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1354 {
1355# if ENABLE_OVERLAY
1356 scr_overlay_off ();
1357# endif
1358 if (iso14755buf & ISO_14755_51)
1359 commit_iso14755 ();
1360#if ISO_14755
1361 else if (iso14755buf & ISO_14755_STARTED)
1362 {
1363 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367 }
1368# endif
1369 else
1370 iso14755buf = 0;
1371 }
1372#endif
1373
1374 if (ev.xany.window == vt
1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376 break;
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1397 break;
1385 }
1386 1398
1387 case ButtonPress: 1399 case ButtonPress:
1388 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1389 break; 1401 break;
1390 1402
… …
1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1406 destroy (); 1418 destroy ();
1407 } 1419 }
1408#if ENABLE_EWMH 1420#if ENABLE_EWMH
1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1410 XSendEvent (xdisp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1411 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1412 &ev); 1424 &ev);
1413#endif 1425#endif
1414 } 1426 }
1415 } 1427 }
… …
1421 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1422 focus_out (); 1434 focus_out ();
1423 } 1435 }
1424#endif 1436#endif
1425 } 1437 }
1426 break;
1427
1428 case MappingNotify:
1429 XRefreshKeyboardMapping (&ev.xmapping);
1430 break; 1438 break;
1431 1439
1432 /* 1440 /*
1433 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1434 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1453 break; 1461 break;
1454 } 1462 }
1455 break; 1463 break;
1456 1464
1457 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1458 focus_in (); 1469 focus_in ();
1459 break; 1470 break;
1460 1471
1461 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1462 focus_out (); 1476 focus_out ();
1463 break; 1477 break;
1464 1478
1465 case ConfigureNotify: 1479 case ConfigureNotify:
1466 if (ev.xconfigure.window == parent[0]) 1480 if (ev.xconfigure.window == parent[0])
1467 { 1481 {
1468 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1469 ; 1483 ;
1470 1484
1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1472 { 1486 {
1473 seen_resize = 1; 1487 seen_resize = 1;
1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1491 {
1492 resize_pixmap ();
1493 scr_touch (true);
1494 }
1495#endif
1475 } 1496 }
1476 1497
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478 1499
1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1500#ifdef ENABLE_TRANSPARENCY
1480 if (OPTION (Opt_transparent)) 1501 if (option (Opt_transparent))
1481 check_our_parents (); 1502 check_our_parents ();
1482#endif 1503#endif
1483 } 1504 }
1484 break; 1505 break;
1485 1506
… …
1518 text_blink_ev.stop (); 1539 text_blink_ev.stop ();
1519#endif 1540#endif
1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 break; 1542 break;
1522 1543
1523#ifdef TRANSPARENT 1544#ifdef ENABLE_TRANSPARENCY
1524 case ReparentNotify: 1545 case ReparentNotify:
1525 rootwin_cb (ev); 1546 rootwin_cb (ev);
1526 break; 1547 break;
1527#endif /* TRANSPARENT */ 1548#endif /* ENABLE_TRANSPARENCY */
1528 1549
1529 case GraphicsExpose: 1550 case GraphicsExpose:
1530 case Expose: 1551 case Expose:
1531 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1532 { 1553 {
1533 do 1554 do
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1536 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1537 1558
1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1559 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1539 1560
1540 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1543 1564
1544 want_refresh = 1; 1565 want_refresh = 1;
1545 } 1566 }
1546 else 1567 else
1547 { 1568 {
1548 XEvent unused_event; 1569 XEvent unused_event;
1549 1570
1550 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1551 ; 1572 ;
1552 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1553 ; 1574 ;
1554 1575
1555 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1556 { 1577 {
1557 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1558 scrollbar_show (0); 1579 scrollbar_show (0);
1559 } 1580 }
1560 1581
1561#ifdef TRANSPARENT 1582#ifdef ENABLE_TRANSPARENCY
1562 if (am_transparent && ev.xany.window == parent[0]) 1583 if (am_transparent && ev.xany.window == parent[0])
1563 XClearWindow (xdisp, ev.xany.window); 1584 XClearWindow (dpy, ev.xany.window);
1564#endif 1585#endif
1565 } 1586 }
1566 break; 1587 break;
1567 1588
1568 case MotionNotify: 1589 case MotionNotify:
… …
1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1599 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1600 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1580 ; // nop 1601 ; // nop
1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1602 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1603 {
1583 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1604 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1584 ; 1605 ;
1585 1606
1586 XQueryPointer (xdisp, vt, 1607 XQueryPointer (dpy, vt,
1587 &unused_root, &unused_child, 1608 &unused_root, &unused_child,
1588 &unused_root_x, &unused_root_y, 1609 &unused_root_x, &unused_root_y,
1589 &ev.xbutton.x, &ev.xbutton.y, 1610 &ev.xbutton.x, &ev.xbutton.y,
1590 &ev.xbutton.state); 1611 &ev.xbutton.state);
1591#ifdef MOUSE_THRESHOLD 1612#ifdef MOUSE_THRESHOLD
… …
1655#endif 1676#endif
1656 } 1677 }
1657 } 1678 }
1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1679 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1659 { 1680 {
1660 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1661 MotionNotify, &ev)) 1682 MotionNotify, &ev))
1662 ; 1683 ;
1663 1684
1664 XQueryPointer (xdisp, scrollBar.win, 1685 XQueryPointer (dpy, scrollBar.win,
1665 &unused_root, &unused_child, 1686 &unused_root, &unused_child,
1666 &unused_root_x, &unused_root_y, 1687 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1688 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1689 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1691 scrollbar_size ());
1671 want_refresh = 1; 1692 want_refresh = 1;
1672 refresh_limit = 0;
1673 scrollbar_show (1); 1693 scrollbar_show (1);
1674 } 1694 }
1675 break; 1695 break;
1676 } 1696 }
1677 1697
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK) 1698#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1699 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1682 { 1700 {
1683 if (hidden_cursor) 1701 if (hidden_cursor)
1684 { 1702 {
1685 hidden_cursor = 0; 1703 hidden_cursor = 0;
1686 want_refresh = 1; 1704 want_refresh = 1;
… …
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1690 } 1708 }
1691#endif 1709#endif
1692 1710
1693#if defined(POINTER_BLANK) 1711#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1713 {
1696 if (ev.type == MotionNotify 1714 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress 1715 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease) 1716 || ev.type == ButtonRelease)
1699 if (hidden_pointer) 1717 if (hidden_pointer)
… …
1711 if (!focus) 1729 if (!focus)
1712 { 1730 {
1713 focus = 1; 1731 focus = 1;
1714 want_refresh = 1; 1732 want_refresh = 1;
1715 1733
1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717 1735
1718#if USE_XIM 1736#if USE_XIM
1719 if (Input_Context != NULL) 1737 if (Input_Context != NULL)
1720 { 1738 {
1721 IMSetStatusPosition (); 1739 IMSetPosition ();
1722 XSetICFocus (Input_Context); 1740 XSetICFocus (Input_Context);
1723 } 1741 }
1724#endif 1742#endif
1725#if CURSOR_BLINK 1743#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink)) 1744 if (option (Opt_cursorBlink))
1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1745 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1728#endif 1746#endif
1729#if OFF_FOCUS_FADING 1747#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade]) 1748 if (rs[Rs_fade])
1731 { 1749 {
1732 pix_colors = pix_colors_focused; 1750 pix_colors = pix_colors_focused;
1733 scr_recolour (); 1751 scr_recolour ();
1734 } 1752 }
1735#endif 1753#endif
1754#if ENABLE_FRILLS
1755 if (option (Opt_urgentOnBell))
1756 {
1757 XWMHints *h;
1758
1759 h = XGetWMHints(dpy, parent[0]);
1760 if (h != NULL)
1761 {
1762 h->flags &= ~XUrgencyHint;
1763 XSetWMHints(dpy, parent[0], h);
1764 }
1765 }
1766#endif
1736 } 1767 }
1737} 1768}
1738 1769
1739void 1770void
1740rxvt_term::focus_out () 1771rxvt_term::focus_out ()
… …
1748 1779
1749#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1750 if (iso14755buf) 1781 if (iso14755buf)
1751 { 1782 {
1752 iso14755buf = 0; 1783 iso14755buf = 0;
1753# if ENABLE_OVERLAY 1784# if ISO_14755
1754 scr_overlay_off (); 1785 scr_overlay_off ();
1755# endif 1786# endif
1756 } 1787 }
1757#endif 1788#endif
1758#if USE_XIM 1789#if USE_XIM
1759 if (Input_Context != NULL) 1790 if (Input_Context != NULL)
1760 XUnsetICFocus (Input_Context); 1791 XUnsetICFocus (Input_Context);
1761#endif 1792#endif
1762#if CURSOR_BLINK 1793#if CURSOR_BLINK
1763 if (OPTION (Opt_cursorBlink)) 1794 if (option (Opt_cursorBlink))
1764 cursor_blink_ev.stop (); 1795 cursor_blink_ev.stop ();
1765 hidden_cursor = 0; 1796 hidden_cursor = 0;
1766#endif 1797#endif
1767#if OFF_FOCUS_FADING 1798#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1799 if (rs[Rs_fade])
… …
1772 } 1803 }
1773#endif 1804#endif
1774 } 1805 }
1775} 1806}
1776 1807
1777#if TRANSPARENT 1808void
1809rxvt_term::update_fade_color (unsigned int idx)
1810{
1811#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade])
1813 {
1814 rgba c;
1815 pix_colors [Color_fade].get (c);
1816 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1817 }
1818#endif
1819}
1820
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL
1778void 1822void
1779rxvt_term::rootwin_cb (XEvent &ev) 1823rxvt_term::rootwin_cb (XEvent &ev)
1780{ 1824{
1781 make_current (); 1825 make_current ();
1782 1826
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1828 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1831# if ENABLE_TRANSPARENCY
1783 switch (ev.type) 1832 switch (ev.type)
1784 { 1833 {
1785 case PropertyNotify: 1834 case PropertyNotify:
1786 /* 1835 /*
1787 * if user used some Esetroot compatible prog to set the root bg, 1836 * if user used some Esetroot compatible prog to set the root bg,
… …
1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1792 return; 1841 return;
1793 1842
1794 /* FALLTHROUGH */ 1843 /* FALLTHROUGH */
1795 case ReparentNotify: 1844 case ReparentNotify:
1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1845 if (option (Opt_transparent))
1797 want_refresh = want_full_refresh = 1; 1846 check_our_parents ();
1798 break; 1847 break;
1799 } 1848 }
1849# endif
1800} 1850}
1801#endif 1851#endif
1802 1852
1803void 1853void
1804rxvt_term::button_press (XButtonEvent &ev) 1854rxvt_term::button_press (XButtonEvent &ev)
… …
2132 selection_make (ev.time); 2182 selection_make (ev.time);
2133 break; 2183 break;
2134 2184
2135 case Button2: 2185 case Button2:
2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2186 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2138 break; 2188 break;
2139 2189
2140#ifdef MOUSE_WHEEL 2190#ifdef MOUSE_WHEEL
2141 case Button4: 2191 case Button4:
2142 case Button5: 2192 case Button5:
… …
2146 2196
2147 v = ev.button == Button4 ? UP : DN; 2197 v = ev.button == Button4 ? UP : DN;
2148 2198
2149 if (ev.state & ShiftMask) 2199 if (ev.state & ShiftMask)
2150 i = 1; 2200 i = 1;
2151 else if (OPTION (Opt_mouseWheelScrollPage)) 2201 else if (option (Opt_mouseWheelScrollPage))
2152 i = nrow - 1; 2202 i = nrow - 1;
2153 else 2203 else
2154 i = 5; 2204 i = 5;
2155 2205
2156# ifdef MOUSE_SLIP_WHEELING 2206# ifdef MOUSE_SLIP_WHEELING
… …
2177 break; 2227 break;
2178#endif 2228#endif
2179 } 2229 }
2180 } 2230 }
2181} 2231}
2182
2183#ifdef TRANSPARENT
2184#if TINTING
2185/* taken from aterm-0.4.2 */
2186
2187typedef uint32_t RUINT32T;
2188
2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2190{
2191 int sh_r, sh_g, sh_b;
2192 RUINT32T mask_r, mask_g, mask_b;
2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2196 int i;
2197
2198 Visual *visual = term->visual;
2199
2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2201
2202 /* for convenience */
2203 mask_r = visual->red_mask;
2204 mask_g = visual->green_mask;
2205 mask_b = visual->blue_mask;
2206
2207 /* boring lookup table pre-initialization */
2208 switch (srcImage->bits_per_pixel) {
2209 case 15:
2210 if ((mask_r != 0x7c00) ||
2211 (mask_g != 0x03e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+32;
2218 sh_r = 10;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 16:
2223 if ((mask_r != 0xf800) ||
2224 (mask_g != 0x07e0) ||
2225 (mask_b != 0x001f))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2228 lookup_r = lookup;
2229 lookup_g = lookup+32;
2230 lookup_b = lookup+32+64;
2231 sh_r = 11;
2232 sh_g = 5;
2233 sh_b = 0;
2234 break;
2235 case 24:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 case 32:
2249 if ((mask_r != 0xff0000) ||
2250 (mask_g != 0x00ff00) ||
2251 (mask_b != 0x0000ff))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2254 lookup_r = lookup;
2255 lookup_g = lookup+256;
2256 lookup_b = lookup+256+256;
2257 sh_r = 16;
2258 sh_g = 8;
2259 sh_b = 0;
2260 break;
2261 default:
2262 return; /* we do not support this color depth */
2263 }
2264
2265 /* prepare limits for color transformation (each channel is handled separately) */
2266 if (shade < 0) {
2267 shade = -shade;
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = 65535-rm;
2272 lower_lim_g = 65535-gm;
2273 lower_lim_b = 65535-bm;
2274
2275 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2276 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2277 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2278
2279 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2280 } else {
2281 if (shade < 0) shade = 0;
2282 if (shade > 100) shade = 100;
2283
2284 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2285
2286 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2287 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2288 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2289 }
2290
2291 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2292 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2293 {
2294 unsigned int tmp;
2295
2296 tmp = lower_lim_r;
2297 lower_lim_r = lower_lim_b;
2298 lower_lim_b = tmp;
2299
2300 tmp = upper_lim_r;
2301 upper_lim_r = upper_lim_b;
2302 upper_lim_b = tmp;
2303 }
2304
2305 /* fill our lookup tables */
2306 for (i = 0; i <= mask_r>>sh_r; i++)
2307 {
2308 RUINT32T tmp;
2309 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2310 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2311 lookup_r[i] = (tmp/65535)<<sh_r;
2312 }
2313 for (i = 0; i <= mask_g>>sh_g; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2317 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2318 lookup_g[i] = (tmp/65535)<<sh_g;
2319 }
2320 for (i = 0; i <= mask_b>>sh_b; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2324 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2325 lookup_b[i] = (tmp/65535)<<sh_b;
2326 }
2327
2328 /* apply table to input image (replacing colors by newly calculated ones) */
2329 switch (srcImage->bits_per_pixel)
2330 {
2331 case 15:
2332 {
2333 unsigned short *p1, *pf, *p, *pl;
2334 p1 = (unsigned short *) srcImage->data;
2335 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2336 while (p1 < pf)
2337 {
2338 p = p1;
2339 pl = p1 + srcImage->width;
2340 for (; p < pl; p++)
2341 {
2342 *p = lookup_r[(*p & 0x7c00)>>10] |
2343 lookup_g[(*p & 0x03e0)>> 5] |
2344 lookup_b[(*p & 0x001f)];
2345 }
2346 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2347 }
2348 break;
2349 }
2350 case 16:
2351 {
2352 unsigned short *p1, *pf, *p, *pl;
2353 p1 = (unsigned short *) srcImage->data;
2354 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2355 while (p1 < pf)
2356 {
2357 p = p1;
2358 pl = p1 + srcImage->width;
2359 for (; p < pl; p++)
2360 {
2361 *p = lookup_r[(*p & 0xf800)>>11] |
2362 lookup_g[(*p & 0x07e0)>> 5] |
2363 lookup_b[(*p & 0x001f)];
2364 }
2365 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2366 }
2367 break;
2368 }
2369 case 24:
2370 {
2371 unsigned char *p1, *pf, *p, *pl;
2372 p1 = (unsigned char *) srcImage->data;
2373 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2374 while (p1 < pf)
2375 {
2376 p = p1;
2377 pl = p1 + srcImage->width * 3;
2378 for (; p < pl; p += 3)
2379 {
2380 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2381 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2382 p[2] = lookup_r[(p[2] & 0x0000ff)];
2383 }
2384 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2385 }
2386 break;
2387 }
2388 case 32:
2389 {
2390 RUINT32T *p1, *pf, *p, *pl;
2391 p1 = (RUINT32T *) srcImage->data;
2392 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2393
2394 while (p1 < pf)
2395 {
2396 p = p1;
2397 pl = p1 + srcImage->width;
2398 for (; p < pl; p++)
2399 {
2400 *p = lookup_r[(*p & 0xff0000)>>16] |
2401 lookup_g[(*p & 0x00ff00)>> 8] |
2402 lookup_b[(*p & 0x0000ff)] |
2403 (*p & ~0xffffff);
2404 }
2405 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 }
2410
2411 free (lookup);
2412}
2413#endif
2414
2415/*
2416 * Check our parents are still who we think they are.
2417 * Do transparency updates if required
2418 */
2419int
2420rxvt_term::check_our_parents ()
2421{
2422 int i, pchanged, aformat, have_pixmap, rootdepth;
2423 unsigned long nitems, bytes_after;
2424 Atom atype;
2425 unsigned char *prop = NULL;
2426 Window root, oldp, *list;
2427 Pixmap rootpixmap = None;
2428 XWindowAttributes wattr, wrootattr;
2429
2430 pchanged = 0;
2431
2432 if (!OPTION (Opt_transparent))
2433 return pchanged; /* Don't try any more */
2434
2435 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2436 rootdepth = wrootattr.depth;
2437
2438 XGetWindowAttributes (xdisp, parent[0], &wattr);
2439
2440 if (rootdepth != wattr.depth)
2441 {
2442 if (am_transparent)
2443 {
2444 pchanged = 1;
2445 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2446 am_transparent = am_pixmap_trans = 0;
2447 }
2448
2449 return pchanged; /* Don't try any more */
2450 }
2451
2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2453 XSync (xdisp, False);
2454
2455 /*
2456 * Make the frame window set by the window manager have
2457 * the root background. Some window managers put multiple nested frame
2458 * windows for each client, so we have to take care about that.
2459 */
2460 i = (xa[XA_XROOTPMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL)
2466 i = (xa[XA_ESETROOT_PMAP_ID]
2467 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success);
2470
2471 if (!i || prop == NULL
2472#if TINTING
2473 || !ISSET_PIXCOLOR (Color_tint)
2474#endif
2475 )
2476 have_pixmap = 0;
2477 else
2478 {
2479 have_pixmap = 1;
2480 rootpixmap = *(Pixmap *)prop;
2481 XFree (prop);
2482 }
2483
2484 if (have_pixmap)
2485 {
2486 /*
2487 * Copy display->root pixmap transparency
2488 */
2489 int sx, sy, nx, ny;
2490 unsigned int nw, nh;
2491 Window cr;
2492 XImage *image;
2493 GC gc;
2494 XGCValues gcvalue;
2495
2496 XTranslateCoordinates (xdisp, parent[0], display->root,
2497 0, 0, &sx, &sy, &cr);
2498 nw = (unsigned int)szHint.width;
2499 nh = (unsigned int)szHint.height;
2500 nx = ny = 0;
2501
2502 if (sx < 0)
2503 {
2504 nw += sx;
2505 nx = -sx;
2506 sx = 0;
2507 }
2508
2509 if (sy < 0)
2510 {
2511 nh += sy;
2512 ny = -sy;
2513 sy = 0;
2514 }
2515
2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2518
2519 XSync (xdisp, False);
2520 allowedxerror = -1;
2521 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2522
2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2524 /* XXX: may need a delay here? */
2525 allowedxerror = 0;
2526
2527 if (image == NULL)
2528 {
2529 if (am_transparent && am_pixmap_trans)
2530 {
2531 pchanged = 1;
2532 if (pixmap != None)
2533 {
2534 XFreePixmap (xdisp, pixmap);
2535 pixmap = None;
2536 }
2537 }
2538
2539 am_pixmap_trans = 0;
2540 }
2541 else
2542 {
2543 if (pixmap != None)
2544 XFreePixmap (xdisp, pixmap);
2545
2546#if TINTING
2547 if (ISSET_PIXCOLOR (Color_tint))
2548 {
2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2550
2551 rgba c;
2552 pix_colors_focused [Color_tint].get (c);
2553
2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2555 }
2556#endif
2557
2558 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2559 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2560 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2561 nx, ny, image->width, image->height);
2562 XFreeGC (xdisp, gc);
2563 XDestroyImage (image);
2564 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2565 XClearWindow (xdisp, parent[0]);
2566
2567 if (!am_transparent || !am_pixmap_trans)
2568 pchanged = 1;
2569
2570 am_transparent = am_pixmap_trans = 1;
2571 }
2572 }
2573
2574 if (am_pixmap_trans)
2575 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2576 else
2577 {
2578 unsigned int n;
2579 /*
2580 * InheritPixmap transparency
2581 */
2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 {
2584 oldp = parent[i];
2585 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 for (; n < (unsigned int)i; n++)
2604 {
2605 XGetWindowAttributes (xdisp, parent[n], &wattr);
2606
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613
2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2615 {
2616 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2617 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2618 am_transparent = 0;
2619 /* XXX: also turn off Opt_transparent? */
2620 }
2621 else
2622 {
2623 for (n = 0; n < (unsigned int)i; n++)
2624 {
2625 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2626 XClearWindow (xdisp, parent[n]);
2627 }
2628
2629 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630 am_transparent = 1;
2631 }
2632
2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2634 parent[i] = None;
2635 }
2636
2637 if (scrollBar.win)
2638 {
2639 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2640 scrollBar.setIdle ();
2641 scrollbar_show (0);
2642 }
2643
2644 if (am_transparent)
2645 {
2646 want_refresh = want_full_refresh = 1;
2647 if (am_pixmap_trans)
2648 flush ();
2649 }
2650
2651 return pchanged;
2652}
2653#endif
2654 2232
2655/*}}} */ 2233/*}}} */
2656 2234
2657bool 2235bool
2658rxvt_term::cmd_parse () 2236rxvt_term::cmd_parse ()
… …
2707 if (ch == C0_LF) 2285 if (ch == C0_LF)
2708 nlines++; 2286 nlines++;
2709 2287
2710 refresh_count++; 2288 refresh_count++;
2711 2289
2712 if (!OPTION (Opt_jumpScroll) 2290 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2713 || (refresh_count >= refresh_limit * (nrow - 1)))
2714 { 2291 {
2715 refreshnow = true;
2716 refresh_count = 0; 2292 refresh_count = 0;
2293
2294 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2295 {
2296 refreshnow = true;
2717 ch = NOCHAR; 2297 ch = NOCHAR;
2718 break; 2298 break;
2299 }
2719 } 2300 }
2720 2301
2721 // scr_add_lines only works for nlines <= nrow - 1. 2302 // scr_add_lines only works for nlines <= nrow - 1.
2722 if (nlines >= nrow - 1) 2303 if (nlines >= nrow - 1)
2723 { 2304 {
… …
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2332 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2752 scr_add_lines (buf, str - buf, nlines); 2333 scr_add_lines (buf, str - buf, nlines);
2753 2334
2754 /* 2335 /*
2755 * If there have been a lot of new lines, then update the screen 2336 * If there have been a lot of new lines, then update the screen
2756 * What the heck I'll cheat and only refresh less than every page-full. 2337 * What the heck we'll cheat and only refresh less than every page-full.
2757 * the number of pages between refreshes is refresh_limit, which 2338 * if skipScroll is enabled.
2758 * is incremented here because we must be doing flat-out scrolling.
2759 */ 2339 */
2760 if (refreshnow) 2340 if (refreshnow)
2761 { 2341 {
2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763 refresh_limit++;
2764 else
2765 {
2766 flag = true; 2342 flag = true;
2767 scr_refresh (); 2343 scr_refresh ();
2768 want_refresh = 1; 2344 want_refresh = 1;
2769 }
2770 } 2345 }
2771 2346
2772 } 2347 }
2773 else 2348 else
2774 { 2349 {
… …
2923 { 2498 {
2924 if ((buf[len++] = cmd_getc ()) == 'i') 2499 if ((buf[len++] = cmd_getc ()) == 'i')
2925 break; /* done = 1 */ 2500 break; /* done = 1 */
2926 } 2501 }
2927 } 2502 }
2928 2503
2929 for (i = 0; i < len; i++) 2504 for (i = 0; i < len; i++)
2930 if (putc (buf[i], fd) == EOF) 2505 if (putc (buf[i], fd) == EOF)
2931 { 2506 {
2932 done = 1; 2507 done = 1;
2933 break; 2508 break;
… …
2995 process_dcs_seq (); 2570 process_dcs_seq ();
2996 break; 2571 break;
2997 case 0x9b: /* CSI */ 2572 case 0x9b: /* CSI */
2998 process_csi_seq (); 2573 process_csi_seq ();
2999 break; 2574 break;
3000 case 0x9d: /* CSI */ 2575 case 0x9d: /* OSC */
3001 process_osc_seq (); 2576 process_osc_seq ();
3002 break; 2577 break;
3003#endif 2578#endif
3004 } 2579 }
3005} 2580}
… …
3233 unicode_t ch, priv, i; 2808 unicode_t ch, priv, i;
3234 unsigned int nargs, p; 2809 unsigned int nargs, p;
3235 int n, ndef; 2810 int n, ndef;
3236 int arg[ESC_ARGS]; 2811 int arg[ESC_ARGS];
3237 2812
3238 for (nargs = ESC_ARGS; nargs > 0;) 2813 memset (arg, 0, sizeof (arg));
3239 arg[--nargs] = 0; 2814 nargs = 0;
3240 2815
3241 priv = 0; 2816 priv = 0;
3242 ch = cmd_getc (); 2817 ch = cmd_getc ();
3243 if (ch >= '<' && ch <= '?') 2818 if (ch >= '<' && ch <= '?')
3244 { /* '<' '=' '>' '?' */ 2819 { /* '<' '=' '>' '?' */
… …
3288 switch (priv) 2863 switch (priv)
3289 { 2864 {
3290 case '>': 2865 case '>':
3291 if (ch == CSI_DA) /* secondary device attributes */ 2866 if (ch == CSI_DA) /* secondary device attributes */
3292 { 2867 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2868 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2869 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 // 2870 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2871 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2872 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3298 // that we do not support xterm mouse reporting (should be 95 when we do). 2873 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3432 break; 3007 break;
3433 case 6: /* CPR requested */ 3008 case 6: /* CPR requested */
3434 scr_report_position (); 3009 scr_report_position ();
3435 break; 3010 break;
3436 case 7: /* unofficial extension */ 3011 case 7: /* unofficial extension */
3437 if (OPTION (Opt_insecure)) 3012 if (option (Opt_insecure))
3438 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3013 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3439 break; 3014 break;
3440 case 8: /* unofficial extension */ 3015 case 8: /* unofficial extension */
3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3016 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3442 break; 3017 break;
… …
3535{ 3110{
3536 int x, y; 3111 int x, y;
3537 XWindowAttributes wattr; 3112 XWindowAttributes wattr;
3538 Window wdummy; 3113 Window wdummy;
3539 3114
3540 dLocal (Display *, xdisp); 3115 dLocal (Display *, dpy);
3541 3116
3542 if (nargs == 0) 3117 if (nargs == 0)
3543 return; 3118 return;
3544 3119
3545 switch (args[0]) 3120 switch (args[0])
3546 { 3121 {
3547 /* 3122 /*
3548 * commands 3123 * commands
3549 */ 3124 */
3550 case 1: /* deiconify window */ 3125 case 1: /* deiconify window */
3551 XMapWindow (xdisp, parent[0]); 3126 XMapWindow (dpy, parent[0]);
3552 break; 3127 break;
3553 case 2: /* iconify window */ 3128 case 2: /* iconify window */
3554 XIconifyWindow (xdisp, parent[0], display->screen); 3129 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3130 break;
3556 case 3: /* set position (pixels) */ 3131 case 3: /* set position (pixels) */
3557 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3132 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3133 break;
3559 case 4: /* set size (pixels) */ 3134 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3135 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3136 break;
3562 case 5: /* raise window */ 3137 case 5: /* raise window */
3563 XRaiseWindow (xdisp, parent[0]); 3138 XRaiseWindow (dpy, parent[0]);
3564 break; 3139 break;
3565 case 6: /* lower window */ 3140 case 6: /* lower window */
3566 XLowerWindow (xdisp, parent[0]); 3141 XLowerWindow (dpy, parent[0]);
3567 break; 3142 break;
3568 case 7: /* refresh window */ 3143 case 7: /* refresh window */
3569 scr_touch (true); 3144 scr_touch (true);
3570 break; 3145 break;
3571 case 8: /* set size (chars) */ 3146 case 8: /* set size (chars) */
… …
3582 3157
3583 /* 3158 /*
3584 * reports - some output format copied from XTerm 3159 * reports - some output format copied from XTerm
3585 */ 3160 */
3586 case 11: /* report window state */ 3161 case 11: /* report window state */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3163 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3589 break; 3164 break;
3590 case 13: /* report window position */ 3165 case 13: /* report window position */
3591 XGetWindowAttributes (xdisp, parent[0], &wattr); 3166 XGetWindowAttributes (dpy, parent[0], &wattr);
3592 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3167 XTranslateCoordinates (dpy, parent[0], wattr.root,
3593 -wattr.border_width, -wattr.border_width, 3168 -wattr.border_width, -wattr.border_width,
3594 &x, &y, &wdummy); 3169 &x, &y, &wdummy);
3595 tt_printf ("\033[3;%d;%dt", x, y); 3170 tt_printf ("\033[3;%d;%dt", x, y);
3596 break; 3171 break;
3597 case 14: /* report window size (pixels) */ 3172 case 14: /* report window size (pixels) */
3598 XGetWindowAttributes (xdisp, parent[0], &wattr); 3173 XGetWindowAttributes (dpy, parent[0], &wattr);
3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3174 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3600 break; 3175 break;
3601 case 18: /* report text area size (chars) */ 3176 case 18: /* report text area size (chars) */
3602 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3177 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3603 break; 3178 break;
… …
3605 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3180 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3606 break; 3181 break;
3607 case 20: /* report icon label */ 3182 case 20: /* report icon label */
3608 { 3183 {
3609 char *s; 3184 char *s;
3610 XGetIconName (xdisp, parent[0], &s); 3185 XGetIconName (dpy, parent[0], &s);
3611 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 */
3612 XFree (s); 3187 XFree (s);
3613 } 3188 }
3614 break; 3189 break;
3615 case 21: /* report window title */ 3190 case 21: /* report window title */
3616 { 3191 {
3617 char *s; 3192 char *s;
3618 XFetchName (xdisp, parent[0], &s); 3193 XFetchName (dpy, parent[0], &s);
3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3194 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3195 XFree (s);
3621 } 3196 }
3622 break; 3197 break;
3623 } 3198 }
3624} 3199}
… …
3651 seen_esc = true; 3226 seen_esc = true;
3652 continue; 3227 continue;
3653 } 3228 }
3654 else if (ch == C0_BEL || ch == CHAR_ST) 3229 else if (ch == C0_BEL || ch == CHAR_ST)
3655 break; 3230 break;
3231 else if (ch == C0_SYN)
3232 ch = cmd_get8 ();
3656 else if (ch < 0x20) 3233 else if (ch < 0x20)
3657 return NULL; /* other control character - exit */ 3234 return NULL; /* other control character - exit */
3658 3235
3659 seen_esc = false; 3236 seen_esc = false;
3660 3237
3661 if (n >= STRING_MAX - 1) 3238 if (n >= STRING_MAX - 1)
3662 // stop at some sane length 3239 // stop at some sane length
3663 return NULL; 3240 return NULL;
3664 3241
3665 if (ch == C0_SYN)
3666 string[n++] = cmd_get8 ();
3667 else
3668 string[n++] = ch; 3242 string[n++] = ch;
3669 } 3243 }
3670 3244
3671 string[n++] = '\0'; 3245 string[n++] = '\0';
3672 3246
3673 ends_how = (ch == 0x5c ? C0_ESC : ch); 3247 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3749 int color; 3323 int color;
3750 char *buf, *name; 3324 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3325 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3326 int saveop = op;
3753 3327
3754 dLocal (Display *, xdisp); 3328 dLocal (Display *, dpy);
3755 3329
3756 assert (str != NULL); 3330 assert (str != NULL);
3331
3332 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3333 return;
3334
3757 switch (op) 3335 switch (op)
3758 { 3336 {
3759 case XTerm_name: 3337 case XTerm_name:
3760 set_title (str); 3338 set_title (str);
3761 /* FALLTHROUGH */ 3339 /* FALLTHROUGH */
… …
3775 unsigned long bytes_after; 3353 unsigned long bytes_after;
3776 unsigned char *value = 0; 3354 unsigned char *value = 0;
3777 const char *str = ""; 3355 const char *str = "";
3778 3356
3779 if (prop 3357 if (prop
3780 && XGetWindowProperty (xdisp, parent[0], 3358 && XGetWindowProperty (dpy, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType, 3359 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format, 3360 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success 3361 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None 3362 && actual_type != None
3785 && actual_format == 8) 3363 && actual_format == 8)
… …
3797 { 3375 {
3798 *eq = 0; 3376 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1); 3377 set_utf8_property (display->atom (str), eq + 1);
3800 } 3378 }
3801 else 3379 else
3802 XDeleteProperty (xdisp, parent[0], 3380 XDeleteProperty (dpy, parent[0],
3803 display->atom (str)); 3381 display->atom (str));
3804 } 3382 }
3805 break; 3383 break;
3806 3384
3807 case XTerm_Color: 3385 case XTerm_Color:
… …
3853 break; 3431 break;
3854 case URxvt_Color_IT: 3432 case URxvt_Color_IT:
3855 process_color_seq (op, Color_IT, str, resp); 3433 process_color_seq (op, Color_IT, str, resp);
3856 break; 3434 break;
3857#endif 3435#endif
3858#if TRANSPARENT && TINTING 3436#if ENABLE_TRANSPARENCY && TINTING
3859 case URxvt_Color_tint: 3437 case URxvt_Color_tint:
3860 process_color_seq (op, Color_tint, str, resp); 3438 process_color_seq (op, Color_tint, str, resp);
3861 3439
3862 check_our_parents (); 3440 check_our_parents ();
3863 3441
… …
3865 want_full_refresh = want_refresh = 1; 3443 want_full_refresh = want_refresh = 1;
3866 3444
3867 break; 3445 break;
3868#endif 3446#endif
3869 3447
3448#if XPM_BACKGROUND
3870 case Rxvt_Pixmap: 3449 case Rxvt_Pixmap:
3871 { 3450 {
3872 if (*str != ';') 3451 if (*str != ';')
3873 { 3452 {
3874#if XPM_BACKGROUND
3875 scale_pixmap (""); /* reset to default scaling */ 3453 scale_pixmap (""); /* reset to default scaling */
3876 set_bgPixmap (str); /* change pixmap */ 3454 set_bgPixmap (str); /* change pixmap */
3877 scr_touch (true); 3455 scr_touch (true);
3878#endif
3879 } 3456 }
3880 3457
3881 int changed = 0; 3458 int changed = 0;
3882 3459
3883 while ((str = strchr (str, ';')) != NULL) 3460 while ((str = strchr (str, ';')) != NULL)
3884 { 3461 {
3885 str++; 3462 str++;
3886#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3463 changed += scale_pixmap (str);
3888#endif
3889 } 3464 }
3890 3465
3891 if (changed) 3466 if (changed)
3892 { 3467 {
3893#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3468 resize_pixmap ();
3895 scr_touch (true); 3469 scr_touch (true);
3896#endif
3897 } 3470 }
3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3472 if (option (Opt_transparent))
3473 check_our_parents ();
3474#endif
3898 } 3475 }
3899 break; 3476 break;
3477#endif
3900 3478
3901 case Rxvt_restoreFG: 3479 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3903 break; 3481 break;
3904 case Rxvt_restoreBG: 3482 case Rxvt_restoreBG:
… …
3929 case URxvt_italicFont: 3507 case URxvt_italicFont:
3930 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3931#endif 3509#endif
3932 if (query) 3510 if (query)
3933 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3934 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3935 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3936 resp); 3514 resp);
3937 else 3515 else
3938 { 3516 {
3939 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 break; 3531 break;
3954 3532
3955#if !ENABLE_MINIMAL 3533#if !ENABLE_MINIMAL
3956 case URxvt_locale: 3534 case URxvt_locale:
3957 if (query) 3535 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3959 else 3537 else
3960 { 3538 {
3961 set_locale (str); 3539 set_locale (str);
3962 pty->set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
3963 init_xlocale (); 3541 init_xlocale ();
… …
3978 break; 3556 break;
3979#endif 3557#endif
3980 3558
3981#if ENABLE_PERL 3559#if ENABLE_PERL
3982 case URxvt_perl: 3560 case URxvt_perl:
3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984 ; // no responses yet 3562 ; // no responses yet
3985 break; 3563 break;
3986#endif 3564#endif
3987 } 3565 }
3988} 3566}
… …
4104 scr_touch (true); 3682 scr_touch (true);
4105 break; 3683 break;
4106#endif 3684#endif
4107 case 1048: /* alternative cursor save */ 3685 case 1048: /* alternative cursor save */
4108 case 1049: 3686 case 1049:
4109 if (OPTION (Opt_secondaryScreen)) 3687 if (option (Opt_secondaryScreen))
4110 if (mode == 0) 3688 if (mode == 0)
4111 scr_cursor (RESTORE); 3689 scr_cursor (RESTORE);
4112 else if (mode == 1) 3690 else if (mode == 1)
4113 scr_cursor (SAVE); 3691 scr_cursor (SAVE);
4114 break; 3692 break;
… …
4179 break; 3757 break;
4180 case 1011: /* scroll to bottom on key press */ 3758 case 1011: /* scroll to bottom on key press */
4181 set_option (Opt_scrollTtyKeypress, state); 3759 set_option (Opt_scrollTtyKeypress, state);
4182 break; 3760 break;
4183 case 1047: /* secondary screen w/ clearing last */ 3761 case 1047: /* secondary screen w/ clearing last */
4184 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4185 if (current_screen != PRIMARY) 3763 if (current_screen != PRIMARY)
4186 scr_erase_screen (2); 3764 scr_erase_screen (2);
4187 scr_change_screen (state); 3765 scr_change_screen (state);
4188 break; 3766 break;
4189 case 1049: /* secondary screen w/ clearing first */ 3767 case 1049: /* secondary screen w/ clearing first */
4190 scr_change_screen (state); 3768 scr_change_screen (state);
4191 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4192 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4193 scr_erase_screen (2); 3771 scr_erase_screen (2);
4194 break; 3772 break;
4195 default: 3773 default:
4196 break; 3774 break;

Diff Legend

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