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.311 by root, Sat Mar 4 20:14:35 2006 UTC vs.
Revision 1.361 by ayin, Wed Oct 31 09:55:23 2007 UTC

… …
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
500# if ISO_14755 499# if ISO_14755
501 iso14755_51 (0); 500 iso14755_51 (0);
502# endif 501# endif
503 return; 502 return;
504 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
505 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
506 { 513 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
509# if ISO_14755 516# if ISO_14755
… …
511# endif 518# endif
512 return; 519 return;
513 } 520 }
514 else 521 else
515 { 522 {
516# if ENABLE_OVERLAY 523# if ISO_14755
517 scr_overlay_off (); 524 scr_overlay_off ();
518# endif 525# endif
519 iso14755buf = 0; 526 iso14755buf = 0;
520 } 527 }
521 } 528 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
525 { 532 {
526 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 534# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 537# endif
531 } 538 }
532#endif 539#endif
533 540
534#ifdef PRINTPIPE 541#ifdef PRINTPIPE
535 if (keysym == XK_Print) 542 if (keysym == XK_Print)
536 { 543 {
537 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
538 return; 545 return;
… …
540#endif 547#endif
541 548
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 550 {
544 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 newlen = 1; 553 newlen = 1;
546 switch (keysym) 554 switch (keysym)
547 { 555 {
548#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 557 case XK_BackSpace:
… …
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
555 } 563 }
556 else 564 else
557 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 566 break;
559#endif 567#endif
560#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
562 case XK_KP_Delete: 570 case XK_KP_Delete:
563 /* allow shift to override */ 571 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
565 { 573 {
566 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
567 break; 575 break;
568 } 576 }
569 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
570# endif 578# endif
571 case XK_Delete: 579 case XK_Delete:
572 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 581 break;
574#endif 582#endif
575 case XK_Tab: 583 case XK_Tab:
576 if (shft) 584 if (shft)
577 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
592#ifdef XK_KP_Left 600#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
598 { 606 {
599 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break; 609 break;
602 } 610 }
… …
625 633
626#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
628 case XK_KP_Prior: 636 case XK_KP_Prior:
629 /* allow shift to override */ 637 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
631 { 639 {
632 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
633 break; 641 break;
634 } 642 }
635 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
638 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
639 break; 647 break;
640# ifdef XK_KP_Next 648# ifdef XK_KP_Next
641 case XK_KP_Next: 649 case XK_KP_Next:
642 /* allow shift to override */ 650 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
644 { 652 {
645 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
646 break; 654 break;
647 } 655 }
648 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
651 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
652 break; 660 break;
653#endif 661#endif
654 case XK_KP_Enter: 662 case XK_KP_Enter:
655 /* allow shift to override */ 663 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
657 { 665 {
658 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
659 break; 667 break;
660 } 668 }
661 669
… …
704 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 716 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
710 { 718 {
711 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 721 }
714 else 722 else
… …
720 728
721 case XK_Find: 729 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
723 break; 731 break;
724 732
725#ifdef XK_KP_End 733#ifdef XK_KP_Insert
726 case XK_KP_Insert: 734 case XK_KP_Insert:
727 /* allow shift to override */ 735 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
729 { 737 {
730 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
731 break; 739 break;
732 } 740 }
733 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
746 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
747 break; 755 break;
748#ifdef XK_KP_End 756#ifdef XK_KP_End
749 case XK_KP_End: 757 case XK_KP_End:
750 /* allow shift to override */ 758 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
752 { 760 {
753 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
754 break; 762 break;
755 } 763 }
756 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
759 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
760 break; 768 break;
761#ifdef XK_KP_Home 769#ifdef XK_KP_Home
762 case XK_KP_Home: 770 case XK_KP_Home:
763 /* allow shift to override */ 771 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
765 { 773 {
766 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
767 break; 775 break;
768 } 776 }
769 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
877 return; 885 return;
878 886
879 if (len <= 0) 887 if (len <= 0)
880 return; /* not mapped */ 888 return; /* not mapped */
881 889
882 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 891 if (view_start)
884 { 892 {
885 view_start = 0; 893 view_start = 0;
886 want_refresh = 1; 894 want_refresh = 1;
887 } 895 }
… …
926#if ENABLE_FRILLS || ISO_14755 934#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 935 // ISO 14755 support
928 if (iso14755buf) 936 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 937 if (iso14755buf & ISO_14755_52)
930 { 938 {
931# if ENABLE_OVERLAY 939# if ISO_14755
932 scr_overlay_off (); 940 scr_overlay_off ();
933# endif 941# endif
934# if ISO_14755 942# if ISO_14755
935 // iso14755 part 5.2 handling: release time 943 // iso14755 part 5.2 handling: release time
936 // first: controls 944 // first: controls
… …
959 967
960 return; 968 return;
961 } 969 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 971 {
964# if ENABLE_OVERLAY 972# if ISO_14755
965 scr_overlay_off (); 973 scr_overlay_off ();
966# endif 974# endif
967 if (iso14755buf & ISO_14755_51) 975 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 976 commit_iso14755 ();
969#if ISO_14755 977#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 979 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 981
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 1035void
1028rxvt_term::flush () 1036rxvt_term::flush ()
1029{ 1037{
1030 flush_ev.stop (); 1038 flush_ev.stop ();
1031 1039
1032#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
1034 { 1042 {
1035 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 1044 scr_touch (false);
1038 } 1045 }
1039#endif 1046#endif
1040 1047
1041 if (want_refresh) 1048 if (want_refresh)
… …
1102void 1109void
1103rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1104{ 1111{
1105 make_current (); 1112 make_current ();
1106 1113
1107 refresh_limit = 1;
1108 refresh_count = 0; 1114 refresh_count = 0;
1109 flush (); 1115 flush ();
1110} 1116}
1111 1117
1112#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1178 1184
1179#if LINUX_YIELD_HACK 1185#if LINUX_YIELD_HACK
1180static struct event_handler 1186static struct event_handler
1181{ 1187{
1182 check_watcher yield_ev; 1188 check_watcher yield_ev;
1183 1189
1184 void yield_cb (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1185 { 1191 {
1186 // this should really be sched_yield(), but the linux guys thought 1192 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1193 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1194 // ones with high nice levels is a useful thing to do. It surely is is
… …
1232 } 1238 }
1233 else 1239 else
1234 { 1240 {
1235 pty_ev.stop (); 1241 pty_ev.stop ();
1236 1242
1237 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1238 destroy (); 1244 destroy ();
1239 } 1245 }
1240 1246
1241 return false; 1247 return false;
1242} 1248}
1243 1249
1244void 1250void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1263 recolour_cursor (); 1269 recolour_cursor ();
1264 1270
1265#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1272 hidden_pointer = 0;
1267 1273
1268 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif 1276#endif
1271} 1277}
1272 1278
1273#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1274void 1280void
1275rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1276{ 1282{
1277 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1278 return; 1284 return;
1279 1285
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1287 XFlush (dpy);
1282 1288
… …
1295void 1301void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1303{
1298 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1299 int x, y; 1305 int x, y;
1306 int code = 32;
1300 1307
1301 x = ev.x; 1308 x = Pixel2Col (ev.x);
1302 y = ev.y; 1309 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1310 if (ev.type == MotionNotify) {
1311 if (x == mouse_row && y == mouse_col)
1312 return;
1313 mouse_row = x;
1314 mouse_col = y;
1315 code += 32;
1316 }
1304 1317
1305 if (MEvent.button == AnyButton) 1318 if (MEvent.button == AnyButton)
1306 button_number = 3; 1319 button_number = 3;
1307 else 1320 else
1308 { 1321 {
… …
1354 x + 1, 1367 x + 1,
1355 y + 1); 1368 y + 1);
1356#endif 1369#endif
1357 1370
1358 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1372 (code + button_number + key_state),
1360 (32 + x + 1), 1373 (32 + x + 1),
1361 (32 + y + 1)); 1374 (32 + y + 1));
1362} 1375}
1363 1376
1364/*{{{ process an X event */ 1377/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1439 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1440 focus_out ();
1428 } 1441 }
1429#endif 1442#endif
1430 } 1443 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1444 break;
1436 1445
1437 /* 1446 /*
1438 * XXX: this is not the _current_ arrangement 1447 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1448 * Here's my conclusion:
… …
1458 break; 1467 break;
1459 } 1468 }
1460 break; 1469 break;
1461 1470
1462 case FocusIn: 1471 case FocusIn:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1475 focus_in ();
1464 break; 1476 break;
1465 1477
1466 case FocusOut: 1478 case FocusOut:
1479 if (ev.xfocus.detail != NotifyInferior
1480 && ev.xfocus.detail != NotifyPointer
1481 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1482 focus_out ();
1468 break; 1483 break;
1469 1484
1470 case ConfigureNotify: 1485 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */
1471 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent[0])
1472 { 1490 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1492 ;
1475 1493
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1495 {
1478 seen_resize = 1; 1496 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1498 }
1481 1499 else
1500 {
1501#ifdef HAVE_BG_PIXMAP
1502 if (bgPixmap.window_position_sensitive ())
1503 update_background ();
1504#endif
1505 }
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1507 }
1489 break; 1508 break;
1490 1509
1491 case PropertyNotify: 1510 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1511 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1523 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1524#endif 1543#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1545 break;
1527 1546
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533
1534 case GraphicsExpose: 1547 case GraphicsExpose:
1535 case Expose: 1548 case Expose:
1536 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1537 { 1550 {
1538 do 1551 do
1552 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1555 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1557
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1559
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1548 1564 }
1549 want_refresh = 1; 1565 want_refresh = 1;
1550 } 1566 }
1551 else 1567 else
1552 { 1568 {
1553 XEvent unused_event; 1569 XEvent unused_event;
… …
1560 if (isScrollbarWindow (ev.xany.window)) 1576 if (isScrollbarWindow (ev.xany.window))
1561 { 1577 {
1562 scrollBar.setIdle (); 1578 scrollBar.setIdle ();
1563 scrollbar_show (0); 1579 scrollbar_show (0);
1564 } 1580 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1581 }
1571 break; 1582 break;
1572 1583
1573 case MotionNotify: 1584 case MotionNotify:
1574#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1586 if (hidden_pointer)
1576 pointer_unblank (); 1587 pointer_unblank ();
1577#endif 1588#endif
1589 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1590 || priv_modes & PrivMode_MouseAnyEvent)
1591 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1593 break;
1580 1594
1581 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1582 { 1596 {
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1686 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1687 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1689 scrollbar_size ());
1676 want_refresh = 1; 1690 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1691 scrollbar_show (1);
1679 } 1692 }
1680 break; 1693 break;
1681 } 1694 }
1682 1695
1683#if defined(CURSOR_BLINK) 1696#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1697 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1698 {
1686 if (hidden_cursor) 1699 if (hidden_cursor)
1687 { 1700 {
1688 hidden_cursor = 0; 1701 hidden_cursor = 0;
1689 want_refresh = 1; 1702 want_refresh = 1;
… …
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 } 1706 }
1694#endif 1707#endif
1695 1708
1696#if defined(POINTER_BLANK) 1709#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1711 {
1699 if (ev.type == MotionNotify 1712 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1713 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1714 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1715 if (hidden_pointer)
… …
1724 IMSetPosition (); 1737 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1738 XSetICFocus (Input_Context);
1726 } 1739 }
1727#endif 1740#endif
1728#if CURSOR_BLINK 1741#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1742 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif 1744#endif
1732#if OFF_FOCUS_FADING 1745#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1746 if (rs[Rs_fade])
1734 { 1747 {
1735 pix_colors = pix_colors_focused; 1748 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1749 scr_recolour ();
1737 } 1750 }
1738#endif 1751#endif
1752#if ENABLE_FRILLS
1753 if (option (Opt_urgentOnBell))
1754 {
1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints (dpy, parent[0], h);
1759 }
1760 }
1761#endif
1739 } 1762 }
1740} 1763}
1741 1764
1742void 1765void
1743rxvt_term::focus_out () 1766rxvt_term::focus_out ()
… …
1751 1774
1752#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1776 if (iso14755buf)
1754 { 1777 {
1755 iso14755buf = 0; 1778 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1779# if ISO_14755
1757 scr_overlay_off (); 1780 scr_overlay_off ();
1758# endif 1781# endif
1759 } 1782 }
1760#endif 1783#endif
1761#if USE_XIM 1784#if USE_XIM
1762 if (Input_Context != NULL) 1785 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1786 XUnsetICFocus (Input_Context);
1764#endif 1787#endif
1765#if CURSOR_BLINK 1788#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1789 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1790 cursor_blink_ev.stop ();
1768 hidden_cursor = 0; 1791 hidden_cursor = 0;
1769#endif 1792#endif
1770#if OFF_FOCUS_FADING 1793#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1794 if (rs[Rs_fade])
… …
1775 } 1798 }
1776#endif 1799#endif
1777 } 1800 }
1778} 1801}
1779 1802
1780#if TRANSPARENT 1803void
1804rxvt_term::update_fade_color (unsigned int idx)
1805{
1806#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade])
1808 {
1809 rgba c;
1810 pix_colors [Color_fade].get (c);
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 }
1813#endif
1814}
1815
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781void 1817void
1782rxvt_term::rootwin_cb (XEvent &ev) 1818rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1819{
1784 make_current (); 1820 make_current ();
1785 1821
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return;
1825
1826# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1827 switch (ev.type)
1787 { 1828 {
1788 case PropertyNotify: 1829 case PropertyNotify:
1789 /* 1830 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1831 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1832 * use the property to determine the pixmap. We use it later on.
1792 */ 1833 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1836 {
1796 1837 bgPixmap.set_root_pixmap ();
1797 /* FALLTHROUGH */ 1838 update_background ();
1798 case ReparentNotify: 1839 }
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1840 break;
1802 } 1841 }
1842# endif
1803} 1843}
1804#endif 1844#endif
1805 1845
1806void 1846void
1807rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
… …
2135 selection_make (ev.time); 2175 selection_make (ev.time);
2136 break; 2176 break;
2137 2177
2138 case Button2: 2178 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2179 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2180 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2181 break;
2142 2182
2143#ifdef MOUSE_WHEEL 2183#ifdef MOUSE_WHEEL
2144 case Button4: 2184 case Button4:
2145 case Button5: 2185 case Button5:
… …
2149 2189
2150 v = ev.button == Button4 ? UP : DN; 2190 v = ev.button == Button4 ? UP : DN;
2151 2191
2152 if (ev.state & ShiftMask) 2192 if (ev.state & ShiftMask)
2153 i = 1; 2193 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2194 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2195 i = nrow - 1;
2156 else 2196 else
2157 i = 5; 2197 i = 5;
2158 2198
2159# ifdef MOUSE_SLIP_WHEELING 2199# ifdef MOUSE_SLIP_WHEELING
… …
2180 break; 2220 break;
2181#endif 2221#endif
2182 } 2222 }
2183 } 2223 }
2184} 2224}
2185
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657 2225
2658/*}}} */ 2226/*}}} */
2659 2227
2660bool 2228bool
2661rxvt_term::cmd_parse () 2229rxvt_term::cmd_parse ()
… …
2710 if (ch == C0_LF) 2278 if (ch == C0_LF)
2711 nlines++; 2279 nlines++;
2712 2280
2713 refresh_count++; 2281 refresh_count++;
2714 2282
2715 if (!OPTION (Opt_jumpScroll) 2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2284 {
2718 refreshnow = true;
2719 refresh_count = 0; 2285 refresh_count = 0;
2286
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2288 {
2289 refreshnow = true;
2720 ch = NOCHAR; 2290 ch = NOCHAR;
2721 break; 2291 break;
2292 }
2722 } 2293 }
2723 2294
2724 // scr_add_lines only works for nlines <= nrow - 1. 2295 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2296 if (nlines >= nrow - 1)
2726 { 2297 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2325 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2326 scr_add_lines (buf, str - buf, nlines);
2756 2327
2757 /* 2328 /*
2758 * If there have been a lot of new lines, then update the screen 2329 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2330 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2331 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2332 */
2763 if (refreshnow) 2333 if (refreshnow)
2764 { 2334 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true; 2335 flag = true;
2770 //TODO: due to popular request, implement "skipscroll" option here
2771 scr_refresh (); 2336 scr_refresh ();
2772 want_refresh = 1; 2337 want_refresh = 1;
2773 }
2774 } 2338 }
2775 2339
2776 } 2340 }
2777 else 2341 else
2778 { 2342 {
… …
2927 { 2491 {
2928 if ((buf[len++] = cmd_getc ()) == 'i') 2492 if ((buf[len++] = cmd_getc ()) == 'i')
2929 break; /* done = 1 */ 2493 break; /* done = 1 */
2930 } 2494 }
2931 } 2495 }
2932 2496
2933 for (i = 0; i < len; i++) 2497 for (i = 0; i < len; i++)
2934 if (putc (buf[i], fd) == EOF) 2498 if (putc (buf[i], fd) == EOF)
2935 { 2499 {
2936 done = 1; 2500 done = 1;
2937 break; 2501 break;
… …
2999 process_dcs_seq (); 2563 process_dcs_seq ();
3000 break; 2564 break;
3001 case 0x9b: /* CSI */ 2565 case 0x9b: /* CSI */
3002 process_csi_seq (); 2566 process_csi_seq ();
3003 break; 2567 break;
3004 case 0x9d: /* CSI */ 2568 case 0x9d: /* OSC */
3005 process_osc_seq (); 2569 process_osc_seq ();
3006 break; 2570 break;
3007#endif 2571#endif
3008 } 2572 }
3009} 2573}
… …
3235rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
3236{ 2800{
3237 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
3238 unsigned int nargs, p; 2802 unsigned int nargs, p;
3239 int n, ndef; 2803 int n, ndef;
3240 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
3241 2805
3242 for (nargs = ESC_ARGS; nargs > 0;) 2806 nargs = 0;
3243 arg[--nargs] = 0;
3244 2807
3245 priv = 0; 2808 priv = 0;
3246 ch = cmd_getc (); 2809 ch = cmd_getc ();
3247 if (ch >= '<' && ch <= '?') 2810 if (ch >= '<' && ch <= '?')
3248 { /* '<' '=' '>' '?' */ 2811 { /* '<' '=' '>' '?' */
… …
3292 switch (priv) 2855 switch (priv)
3293 { 2856 {
3294 case '>': 2857 case '>':
3295 if (ch == CSI_DA) /* secondary device attributes */ 2858 if (ch == CSI_DA) /* secondary device attributes */
3296 { 2859 {
3297 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3298 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3299 // 2862 //
3300 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3301 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3302 // that we do not support xterm mouse reporting (should be 95 when we do). 2865 // versions.
3303 // 2866 //
3304 tt_printf ("\033[>%d;94;0c", 'U'); 2867 tt_printf ("\033[>%d;95;0c", 'U');
3305 } 2868 }
3306 break; 2869 break;
3307 case '?': 2870 case '?':
3308 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3309 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
… …
3436 break; 2999 break;
3437 case 6: /* CPR requested */ 3000 case 6: /* CPR requested */
3438 scr_report_position (); 3001 scr_report_position ();
3439 break; 3002 break;
3440 case 7: /* unofficial extension */ 3003 case 7: /* unofficial extension */
3441 if (OPTION (Opt_insecure)) 3004 if (option (Opt_insecure))
3442 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3005 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3443 break; 3006 break;
3444 case 8: /* unofficial extension */ 3007 case 8: /* unofficial extension */
3445 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3008 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3446 break; 3009 break;
… …
3610 break; 3173 break;
3611 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3612 { 3175 {
3613 char *s; 3176 char *s;
3614 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent[0], &s);
3615 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3616 XFree (s); 3179 XFree (s);
3617 } 3180 }
3618 break; 3181 break;
3619 case 21: /* report window title */ 3182 case 21: /* report window title */
3620 { 3183 {
3621 char *s; 3184 char *s;
3622 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent[0], &s);
3623 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 */
3624 XFree (s); 3187 XFree (s);
3625 } 3188 }
3626 break; 3189 break;
3627 } 3190 }
3628} 3191}
… …
3655 seen_esc = true; 3218 seen_esc = true;
3656 continue; 3219 continue;
3657 } 3220 }
3658 else if (ch == C0_BEL || ch == CHAR_ST) 3221 else if (ch == C0_BEL || ch == CHAR_ST)
3659 break; 3222 break;
3223 else if (ch == C0_SYN)
3224 ch = cmd_get8 ();
3660 else if (ch < 0x20) 3225 else if (ch < 0x20)
3661 return NULL; /* other control character - exit */ 3226 return NULL; /* other control character - exit */
3662 3227
3663 seen_esc = false; 3228 seen_esc = false;
3664 3229
3665 if (n >= STRING_MAX - 1) 3230 if (n >= STRING_MAX - 1)
3666 // stop at some sane length 3231 // stop at some sane length
3667 return NULL; 3232 return NULL;
3668 3233
3669 if (ch == C0_SYN)
3670 string[n++] = cmd_get8 ();
3671 else
3672 string[n++] = ch; 3234 string[n++] = ch;
3673 } 3235 }
3674 3236
3675 string[n++] = '\0'; 3237 string[n++] = '\0';
3676 3238
3677 ends_how = (ch == 0x5c ? C0_ESC : ch); 3239 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3756 int saveop = op; 3318 int saveop = op;
3757 3319
3758 dLocal (Display *, dpy); 3320 dLocal (Display *, dpy);
3759 3321
3760 assert (str != NULL); 3322 assert (str != NULL);
3761 3323
3762 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3324 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3763 ; // no responses yet 3325 return;
3764 3326
3765 switch (op) 3327 switch (op)
3766 { 3328 {
3767 case XTerm_name: 3329 case XTerm_name:
3768 set_title (str); 3330 set_title (str);
… …
3861 break; 3423 break;
3862 case URxvt_Color_IT: 3424 case URxvt_Color_IT:
3863 process_color_seq (op, Color_IT, str, resp); 3425 process_color_seq (op, Color_IT, str, resp);
3864 break; 3426 break;
3865#endif 3427#endif
3866#if TRANSPARENT && TINTING 3428#if ENABLE_TRANSPARENCY
3867 case URxvt_Color_tint: 3429 case URxvt_Color_tint:
3868 process_color_seq (op, Color_tint, str, resp); 3430 process_color_seq (op, Color_tint, str, resp);
3431 {
3432 bool changed = false;
3433 if (ISSET_PIXCOLOR (Color_tint))
3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3435 else
3436 changed = bgPixmap.unset_tint ();
3437 if (changed)
3438 update_background ();
3439 }
3869 3440
3870 check_our_parents ();
3871
3872 if (am_transparent)
3873 want_full_refresh = want_refresh = 1;
3874
3875 break; 3441 break;
3876#endif 3442#endif
3877 3443
3444#if BG_IMAGE_FROM_FILE
3878 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3879 { 3446 if (!strcmp (str, "?"))
3880 if (*str != ';')
3881 { 3447 {
3882#if XPM_BACKGROUND 3448 char str[256];
3883 scale_pixmap (""); /* reset to default scaling */ 3449
3884 set_bgPixmap (str); /* change pixmap */ 3450 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3885 scr_touch (true); 3451 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3886#endif 3452 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3453 process_xterm_seq (XTerm_title, str, CHAR_ST);
3887 } 3454 }
3888 3455 else
3456 {
3889 int changed = 0; 3457 int changed = 0;
3890 3458
3891 while ((str = strchr (str, ';')) != NULL) 3459 if (*str != ';')
3892 { 3460 {
3461 /* reset to default scaling :*/
3462 bgPixmap.unset_geometry ();
3463 if (bgPixmap.set_file (str)) /* change pixmap */
3464 changed++;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bgPixmap.set_defaultGeometry ();
3468 }
3469 while (str)
3470 {
3893 str++; 3471 str++;
3894#if XPM_BACKGROUND 3472 if (bgPixmap.set_geometry (str))
3895 changed += scale_pixmap (str); 3473 changed++;
3896#endif 3474 str = strchr (str, ';');
3897 } 3475 }
3898
3899 if (changed) 3476 if (changed)
3900 { 3477 update_background ();
3901#ifdef XPM_BACKGROUND
3902 resize_pixmap ();
3903 scr_touch (true);
3904#endif
3905 } 3478 }
3906 }
3907 break; 3479 break;
3480#endif
3908 3481
3909 case Rxvt_restoreFG: 3482 case Rxvt_restoreFG:
3910 set_window_color (Color_fg, str); 3483 set_window_color (Color_fg, str);
3911 break; 3484 break;
3912 case Rxvt_restoreBG: 3485 case Rxvt_restoreBG:
… …
3937 case URxvt_italicFont: 3510 case URxvt_italicFont:
3938 case URxvt_boldItalicFont: 3511 case URxvt_boldItalicFont:
3939#endif 3512#endif
3940 if (query) 3513 if (query)
3941 tt_printf ("\33]%d;%-.250s%c", saveop, 3514 tt_printf ("\33]%d;%-.250s%c", saveop,
3942 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3515 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3943 ? fontset[op - URxvt_font]->fontdesc : "", 3516 ? fontset[op - URxvt_font]->fontdesc : "",
3944 resp); 3517 resp);
3945 else 3518 else
3946 { 3519 {
3947 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3520 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3961 break; 3534 break;
3962 3535
3963#if !ENABLE_MINIMAL 3536#if !ENABLE_MINIMAL
3964 case URxvt_locale: 3537 case URxvt_locale:
3965 if (query) 3538 if (query)
3966 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3539 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3967 else 3540 else
3968 { 3541 {
3969 set_locale (str); 3542 set_locale (str);
3970 pty->set_utf8_mode (enc_utf8); 3543 pty->set_utf8_mode (enc_utf8);
3971 init_xlocale (); 3544 init_xlocale ();
… …
4034{ 3607{
4035 unsigned int i, j; 3608 unsigned int i, j;
4036 int state; 3609 int state;
4037 3610
4038 static const struct 3611 static const struct
4039 { 3612 {
4040 const int argval; 3613 const int argval;
4041 const unsigned long bit; 3614 const unsigned long bit;
4042 }
4043
4044 argtopriv[] = { 3615 } argtopriv[] = {
4045 { 1, PrivMode_aplCUR }, 3616 { 1, PrivMode_aplCUR },
4046 { 2, PrivMode_vt52 }, 3617 { 2, PrivMode_vt52 },
4047 { 3, PrivMode_132 }, 3618 { 3, PrivMode_132 },
4048 { 4, PrivMode_smoothScroll }, 3619 { 4, PrivMode_smoothScroll },
4049 { 5, PrivMode_rVideo }, 3620 { 5, PrivMode_rVideo },
… …
4066#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
4067 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
4068#endif 3639#endif
4069 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
4070 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4071 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
4072 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
4073 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4074 { 1011, PrivMode_Keypress }, // rxvt extension 3645 { 1011, PrivMode_Keypress }, // rxvt extension
4075 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
4076 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
4077 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
… …
4112 scr_touch (true); 3683 scr_touch (true);
4113 break; 3684 break;
4114#endif 3685#endif
4115 case 1048: /* alternative cursor save */ 3686 case 1048: /* alternative cursor save */
4116 case 1049: 3687 case 1049:
4117 if (OPTION (Opt_secondaryScreen)) 3688 if (option (Opt_secondaryScreen))
4118 if (mode == 0) 3689 if (mode == 0)
4119 scr_cursor (RESTORE); 3690 scr_cursor (RESTORE);
4120 else if (mode == 1) 3691 else if (mode == 1)
4121 scr_cursor (SAVE); 3692 scr_cursor (SAVE);
4122 break; 3693 break;
… …
4151 scr_autowrap (state); 3722 scr_autowrap (state);
4152 break; 3723 break;
4153 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
4154 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
4155 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
4156 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4157 break; 3728 break;
4158#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
4159 case scrollBar_esc: 3730 case scrollBar_esc:
4160 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
4161 { 3732 {
… …
4174 break; 3745 break;
4175 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
4176 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
4177 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
4178 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
4179 priv_modes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4180 break; 3751 break;
4181#if 0 3752#if 0
4182 case 1001: 3753 case 1001:
4183 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
4184#endif 3755#endif
3756 case 1002:
3757 case 1003:
3758 if (state) {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 vt_emask_mouse = PointerMotionMask;
3762 } else
3763 vt_emask_mouse = NoEventMask;
3764 vt_select_input ();
3765 break;
4185 case 1010: /* scroll to bottom on TTY output inhibit */ 3766 case 1010: /* scroll to bottom on TTY output inhibit */
4186 set_option (Opt_scrollTtyOutput, !state); 3767 set_option (Opt_scrollTtyOutput, !state);
4187 break; 3768 break;
4188 case 1011: /* scroll to bottom on key press */ 3769 case 1011: /* scroll to bottom on key press */
4189 set_option (Opt_scrollTtyKeypress, state); 3770 set_option (Opt_scrollTtyKeypress, state);
4190 break; 3771 break;
4191 case 1047: /* secondary screen w/ clearing last */ 3772 case 1047: /* secondary screen w/ clearing last */
4192 if (OPTION (Opt_secondaryScreen)) 3773 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3774 if (current_screen != PRIMARY)
4194 scr_erase_screen (2); 3775 scr_erase_screen (2);
4195 scr_change_screen (state); 3776 scr_change_screen (state);
4196 break; 3777 break;
4197 case 1049: /* secondary screen w/ clearing first */ 3778 case 1049: /* secondary screen w/ clearing first */
4198 scr_change_screen (state); 3779 scr_change_screen (state);
4199 if (OPTION (Opt_secondaryScreen)) 3780 if (option (Opt_secondaryScreen))
4200 if (current_screen != PRIMARY) 3781 if (current_screen != PRIMARY)
4201 scr_erase_screen (2); 3782 scr_erase_screen (2);
4202 break; 3783 break;
4203 default: 3784 default:
4204 break; 3785 break;
… …
4441 4022
4442 if (v_buflen == 0) 4023 if (v_buflen == 0)
4443 { 4024 {
4444 free (v_buffer); 4025 free (v_buffer);
4445 v_buffer = 0; 4026 v_buffer = 0;
4446 v_buflen = 0;
4447 4027
4448 pty_ev.set (EVENT_READ); 4028 pty_ev.set (EVENT_READ);
4449 return; 4029 return;
4450 } 4030 }
4451 4031

Diff Legend

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