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

Diff Legend

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