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.315 by root, Tue Aug 22 13:07:17 2006 UTC vs.
Revision 1.353 by sasha, Wed Sep 12 19:51:41 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");
… …
1026 1034
1027void 1035void
1028rxvt_term::flush () 1036rxvt_term::flush ()
1029{ 1037{
1030 flush_ev.stop (); 1038 flush_ev.stop ();
1031
1032#ifdef TRANSPARENT
1033 if (want_full_refresh)
1034 {
1035 want_full_refresh = 0;
1036 scr_clear ();
1037 scr_touch (false);
1038 }
1039#endif
1040 1039
1041 if (want_refresh) 1040 if (want_refresh)
1042 { 1041 {
1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1044 { 1043 {
… …
1102void 1101void
1103rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
1104{ 1103{
1105 make_current (); 1104 make_current ();
1106 1105
1107 refresh_limit = 1;
1108 refresh_count = 0; 1106 refresh_count = 0;
1109 flush (); 1107 flush ();
1110} 1108}
1111 1109
1112#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
1178 1176
1179#if LINUX_YIELD_HACK 1177#if LINUX_YIELD_HACK
1180static struct event_handler 1178static struct event_handler
1181{ 1179{
1182 check_watcher yield_ev; 1180 check_watcher yield_ev;
1183 1181
1184 void yield_cb (check_watcher &w) 1182 void yield_cb (check_watcher &w)
1185 { 1183 {
1186 // this should really be sched_yield(), but the linux guys thought 1184 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1185 // 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 1186 // ones with high nice levels is a useful thing to do. It surely is is
… …
1232 } 1230 }
1233 else 1231 else
1234 { 1232 {
1235 pty_ev.stop (); 1233 pty_ev.stop ();
1236 1234
1237 if (!OPTION (Opt_hold)) 1235 if (!option (Opt_hold))
1238 destroy (); 1236 destroy ();
1239 } 1237 }
1240 1238
1241 return false; 1239 return false;
1242} 1240}
1243 1241
1244void 1242void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1263 recolour_cursor (); 1261 recolour_cursor ();
1264 1262
1265#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1264 hidden_pointer = 0;
1267 1265
1268 if (OPTION (Opt_pointerBlank)) 1266 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
1270#endif 1268#endif
1271} 1269}
1272 1270
1273#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1274void 1272void
1275rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
1276{ 1274{
1277 if (!OPTION (Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
1278 return; 1276 return;
1279 1277
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1279 XFlush (dpy);
1282 1280
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1425 focus_out ();
1428 } 1426 }
1429#endif 1427#endif
1430 } 1428 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1429 break;
1436 1430
1437 /* 1431 /*
1438 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1458 break; 1452 break;
1459 } 1453 }
1460 break; 1454 break;
1461 1455
1462 case FocusIn: 1456 case FocusIn:
1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1460 focus_in ();
1464 break; 1461 break;
1465 1462
1466 case FocusOut: 1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1467 focus_out ();
1468 break; 1468 break;
1469 1469
1470 case ConfigureNotify: 1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1471 if (ev.xconfigure.window == parent[0]) 1474 if (ev.xconfigure.window == parent[0])
1472 { 1475 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1477 ;
1475 1478
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1480 {
1478 seen_resize = 1; 1481 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1483 }
1481 1484 else
1485 {
1486#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1489#endif
1490 }
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 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 } 1492 }
1489 break; 1493 break;
1490 1494
1491 case PropertyNotify: 1495 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1522#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1524#endif 1528#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1530 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1531
1534 case GraphicsExpose: 1532 case GraphicsExpose:
1535 case Expose: 1533 case Expose:
1536 if (ev.xany.window == vt) 1534 if (ev.xany.window == vt)
1537 { 1535 {
… …
1560 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1561 { 1559 {
1562 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1563 scrollbar_show (0); 1561 scrollbar_show (0);
1564 } 1562 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1563 }
1571 break; 1564 break;
1572 1565
1573 case MotionNotify: 1566 case MotionNotify:
1574#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1666 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1668 scrollbar_size ());
1676 want_refresh = 1; 1669 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1670 scrollbar_show (1);
1679 } 1671 }
1680 break; 1672 break;
1681 } 1673 }
1682 1674
1683#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1677 {
1686 if (hidden_cursor) 1678 if (hidden_cursor)
1687 { 1679 {
1688 hidden_cursor = 0; 1680 hidden_cursor = 0;
1689 want_refresh = 1; 1681 want_refresh = 1;
… …
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1693 } 1685 }
1694#endif 1686#endif
1695 1687
1696#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1690 {
1699 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1694 if (hidden_pointer)
… …
1724 IMSetPosition (); 1716 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1726 } 1718 }
1727#endif 1719#endif
1728#if CURSOR_BLINK 1720#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1721 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731#endif 1723#endif
1732#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1734 { 1726 {
1735 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1728 scr_recolour ();
1737 } 1729 }
1738#endif 1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif
1739 } 1744 }
1740} 1745}
1741 1746
1742void 1747void
1743rxvt_term::focus_out () 1748rxvt_term::focus_out ()
… …
1751 1756
1752#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1758 if (iso14755buf)
1754 { 1759 {
1755 iso14755buf = 0; 1760 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1761# if ISO_14755
1757 scr_overlay_off (); 1762 scr_overlay_off ();
1758# endif 1763# endif
1759 } 1764 }
1760#endif 1765#endif
1761#if USE_XIM 1766#if USE_XIM
1762 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1764#endif 1769#endif
1765#if CURSOR_BLINK 1770#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1771 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1768 hidden_cursor = 0; 1773 hidden_cursor = 0;
1769#endif 1774#endif
1770#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
… …
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1794 }
1790#endif 1795#endif
1791} 1796}
1792 1797
1793#if TRANSPARENT || ENABLE_PERL 1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1799void
1795rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1801{
1797 make_current (); 1802 make_current ();
1798 1803
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return; 1806 return;
1802 1807
1803# if TRANSPARENT 1808# if ENABLE_TRANSPARENCY
1804 switch (ev.type) 1809 switch (ev.type)
1805 { 1810 {
1806 case PropertyNotify: 1811 case PropertyNotify:
1807 /* 1812 /*
1808 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1809 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1810 */ 1815 */
1811 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1812 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1813 return; 1818 {
1814 1819 bgPixmap.set_root_pixmap ();
1815 /* FALLTHROUGH */ 1820 update_background ();
1816 case ReparentNotify: 1821 }
1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1818 want_refresh = want_full_refresh = 1;
1819 break; 1822 break;
1820 } 1823 }
1821# endif 1824# endif
1822} 1825}
1823#endif 1826#endif
… …
2154 selection_make (ev.time); 2157 selection_make (ev.time);
2155 break; 2158 break;
2156 2159
2157 case Button2: 2160 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2163 break;
2161 2164
2162#ifdef MOUSE_WHEEL 2165#ifdef MOUSE_WHEEL
2163 case Button4: 2166 case Button4:
2164 case Button5: 2167 case Button5:
… …
2168 2171
2169 v = ev.button == Button4 ? UP : DN; 2172 v = ev.button == Button4 ? UP : DN;
2170 2173
2171 if (ev.state & ShiftMask) 2174 if (ev.state & ShiftMask)
2172 i = 1; 2175 i = 1;
2173 else if (OPTION (Opt_mouseWheelScrollPage)) 2176 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2177 i = nrow - 1;
2175 else 2178 else
2176 i = 5; 2179 i = 5;
2177 2180
2178# ifdef MOUSE_SLIP_WHEELING 2181# ifdef MOUSE_SLIP_WHEELING
… …
2199 break; 2202 break;
2200#endif 2203#endif
2201 } 2204 }
2202 } 2205 }
2203} 2206}
2204
2205#ifdef TRANSPARENT
2206#if TINTING
2207/* taken from aterm-0.4.2 */
2208
2209typedef uint32_t RUINT32T;
2210
2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2212{
2213 int sh_r, sh_g, sh_b;
2214 RUINT32T mask_r, mask_g, mask_b;
2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2218 int i;
2219
2220 Visual *visual = term->visual;
2221
2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2223
2224 /* for convenience */
2225 mask_r = visual->red_mask;
2226 mask_g = visual->green_mask;
2227 mask_b = visual->blue_mask;
2228
2229 /* boring lookup table pre-initialization */
2230 switch (srcImage->bits_per_pixel) {
2231 case 15:
2232 if ((mask_r != 0x7c00) ||
2233 (mask_g != 0x03e0) ||
2234 (mask_b != 0x001f))
2235 return;
2236 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2237 lookup_r = lookup;
2238 lookup_g = lookup+32;
2239 lookup_b = lookup+32+32;
2240 sh_r = 10;
2241 sh_g = 5;
2242 sh_b = 0;
2243 break;
2244 case 16:
2245 if ((mask_r != 0xf800) ||
2246 (mask_g != 0x07e0) ||
2247 (mask_b != 0x001f))
2248 return;
2249 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2250 lookup_r = lookup;
2251 lookup_g = lookup+32;
2252 lookup_b = lookup+32+64;
2253 sh_r = 11;
2254 sh_g = 5;
2255 sh_b = 0;
2256 break;
2257 case 24:
2258 if ((mask_r != 0xff0000) ||
2259 (mask_g != 0x00ff00) ||
2260 (mask_b != 0x0000ff))
2261 return;
2262 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2263 lookup_r = lookup;
2264 lookup_g = lookup+256;
2265 lookup_b = lookup+256+256;
2266 sh_r = 16;
2267 sh_g = 8;
2268 sh_b = 0;
2269 break;
2270 case 32:
2271 if ((mask_r != 0xff0000) ||
2272 (mask_g != 0x00ff00) ||
2273 (mask_b != 0x0000ff))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2276 lookup_r = lookup;
2277 lookup_g = lookup+256;
2278 lookup_b = lookup+256+256;
2279 sh_r = 16;
2280 sh_g = 8;
2281 sh_b = 0;
2282 break;
2283 default:
2284 return; /* we do not support this color depth */
2285 }
2286
2287 /* prepare limits for color transformation (each channel is handled separately) */
2288 if (shade < 0) {
2289 shade = -shade;
2290 if (shade < 0) shade = 0;
2291 if (shade > 100) shade = 100;
2292
2293 lower_lim_r = 65535-rm;
2294 lower_lim_g = 65535-gm;
2295 lower_lim_b = 65535-bm;
2296
2297 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2298 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2299 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2300
2301 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2302 } else {
2303 if (shade < 0) shade = 0;
2304 if (shade > 100) shade = 100;
2305
2306 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2307
2308 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2309 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2310 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2311 }
2312
2313 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2314 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2315 {
2316 unsigned int tmp;
2317
2318 tmp = lower_lim_r;
2319 lower_lim_r = lower_lim_b;
2320 lower_lim_b = tmp;
2321
2322 tmp = upper_lim_r;
2323 upper_lim_r = upper_lim_b;
2324 upper_lim_b = tmp;
2325 }
2326
2327 /* fill our lookup tables */
2328 for (i = 0; i <= mask_r>>sh_r; i++)
2329 {
2330 RUINT32T tmp;
2331 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2332 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2333 lookup_r[i] = (tmp/65535)<<sh_r;
2334 }
2335 for (i = 0; i <= mask_g>>sh_g; i++)
2336 {
2337 RUINT32T tmp;
2338 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2339 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2340 lookup_g[i] = (tmp/65535)<<sh_g;
2341 }
2342 for (i = 0; i <= mask_b>>sh_b; i++)
2343 {
2344 RUINT32T tmp;
2345 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2346 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2347 lookup_b[i] = (tmp/65535)<<sh_b;
2348 }
2349
2350 /* apply table to input image (replacing colors by newly calculated ones) */
2351 switch (srcImage->bits_per_pixel)
2352 {
2353 case 15:
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 & 0x7c00)>>10] |
2365 lookup_g[(*p & 0x03e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 16:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0xf800)>>11] |
2384 lookup_g[(*p & 0x07e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 24:
2392 {
2393 unsigned char *p1, *pf, *p, *pl;
2394 p1 = (unsigned char *) srcImage->data;
2395 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width * 3;
2400 for (; p < pl; p += 3)
2401 {
2402 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2403 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2404 p[2] = lookup_r[(p[2] & 0x0000ff)];
2405 }
2406 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 32:
2411 {
2412 RUINT32T *p1, *pf, *p, *pl;
2413 p1 = (RUINT32T *) srcImage->data;
2414 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xff0000)>>16] |
2423 lookup_g[(*p & 0x00ff00)>> 8] |
2424 lookup_b[(*p & 0x0000ff)] |
2425 (*p & ~0xffffff);
2426 }
2427 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 }
2432
2433 free (lookup);
2434}
2435#endif
2436
2437/*
2438 * Check our parents are still who we think they are.
2439 * Do transparency updates if required
2440 */
2441int
2442rxvt_term::check_our_parents ()
2443{
2444 int i, pchanged, aformat, have_pixmap, rootdepth;
2445 unsigned long nitems, bytes_after;
2446 Atom atype;
2447 unsigned char *prop = NULL;
2448 Window root, oldp, *list;
2449 Pixmap rootpixmap = None;
2450 XWindowAttributes wattr, wrootattr;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (dpy, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !ISSET_PIXCOLOR (Color_tint)
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (dpy, False);
2542 allowedxerror = -1;
2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (dpy, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (dpy, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2572
2573 rgba c;
2574 pix_colors_focused [Color_tint].get (c);
2575
2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2583 nx, ny, image->width, image->height);
2584 XFreeGC (dpy, gc);
2585 XDestroyImage (image);
2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2587 XClearWindow (dpy, parent[0]);
2588
2589 if (!am_transparent || !am_pixmap_trans)
2590 pchanged = 1;
2591
2592 am_transparent = am_pixmap_trans = 1;
2593 }
2594 }
2595
2596 if (am_pixmap_trans)
2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2598 else
2599 {
2600 unsigned int n;
2601 /*
2602 * InheritPixmap transparency
2603 */
2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 {
2606 oldp = parent[i];
2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2608 XFree (list);
2609
2610 if (parent[i] == display->root)
2611 {
2612 if (oldp != None)
2613 pchanged = 1;
2614
2615 break;
2616 }
2617
2618 if (oldp != parent[i])
2619 pchanged = 1;
2620 }
2621
2622 n = 0;
2623
2624 if (pchanged)
2625 for (; n < (unsigned int)i; n++)
2626 {
2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2630 {
2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2632 break;
2633 }
2634 }
2635
2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2637 {
2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2640 am_transparent = 0;
2641 /* XXX: also turn off Opt_transparent? */
2642 }
2643 else
2644 {
2645 for (n = 0; n < (unsigned int)i; n++)
2646 {
2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2648 XClearWindow (dpy, parent[n]);
2649 }
2650
2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2652 am_transparent = 1;
2653 }
2654
2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2656 parent[i] = None;
2657 }
2658
2659 if (scrollBar.win)
2660 {
2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2662 scrollBar.setIdle ();
2663 scrollbar_show (0);
2664 }
2665
2666 if (am_transparent)
2667 {
2668 want_refresh = want_full_refresh = 1;
2669 if (am_pixmap_trans)
2670 flush ();
2671 }
2672
2673 return pchanged;
2674}
2675#endif
2676 2207
2677/*}}} */ 2208/*}}} */
2678 2209
2679bool 2210bool
2680rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
… …
2729 if (ch == C0_LF) 2260 if (ch == C0_LF)
2730 nlines++; 2261 nlines++;
2731 2262
2732 refresh_count++; 2263 refresh_count++;
2733 2264
2734 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2736 { 2266 {
2737 refreshnow = true;
2738 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2270 {
2271 refreshnow = true;
2739 ch = NOCHAR; 2272 ch = NOCHAR;
2740 break; 2273 break;
2274 }
2741 } 2275 }
2742 2276
2743 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2744 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2745 { 2279 {
… …
2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2774 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2775 2309
2776 /* 2310 /*
2777 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2778 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2779 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2780 * is incremented here because we must be doing flat-out scrolling.
2781 */ 2314 */
2782 if (refreshnow) 2315 if (refreshnow)
2783 { 2316 {
2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2785 refresh_limit++;
2786 else
2787 {
2788 flag = true; 2317 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2790 scr_refresh (); 2318 scr_refresh ();
2791 want_refresh = 1; 2319 want_refresh = 1;
2792 }
2793 } 2320 }
2794 2321
2795 } 2322 }
2796 else 2323 else
2797 { 2324 {
… …
2946 { 2473 {
2947 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2948 break; /* done = 1 */ 2475 break; /* done = 1 */
2949 } 2476 }
2950 } 2477 }
2951 2478
2952 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2953 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2954 { 2481 {
2955 done = 1; 2482 done = 1;
2956 break; 2483 break;
… …
3018 process_dcs_seq (); 2545 process_dcs_seq ();
3019 break; 2546 break;
3020 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
3021 process_csi_seq (); 2548 process_csi_seq ();
3022 break; 2549 break;
3023 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3024 process_osc_seq (); 2551 process_osc_seq ();
3025 break; 2552 break;
3026#endif 2553#endif
3027 } 2554 }
3028} 2555}
… …
3254rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3255{ 2782{
3256 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3257 unsigned int nargs, p; 2784 unsigned int nargs, p;
3258 int n, ndef; 2785 int n, ndef;
3259 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3260 2787
3261 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3262 arg[--nargs] = 0;
3263 2789
3264 priv = 0; 2790 priv = 0;
3265 ch = cmd_getc (); 2791 ch = cmd_getc ();
3266 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
3267 { /* '<' '=' '>' '?' */ 2793 { /* '<' '=' '>' '?' */
… …
3311 switch (priv) 2837 switch (priv)
3312 { 2838 {
3313 case '>': 2839 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
3315 { 2841 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 // 2844 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3321 // that we do not support xterm mouse reporting (should be 95 when we do). 2847 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3455 break; 2981 break;
3456 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3457 scr_report_position (); 2983 scr_report_position ();
3458 break; 2984 break;
3459 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3460 if (OPTION (Opt_insecure)) 2986 if (option (Opt_insecure))
3461 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3462 break; 2988 break;
3463 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3464 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3465 break; 2991 break;
… …
3629 break; 3155 break;
3630 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3631 { 3157 {
3632 char *s; 3158 char *s;
3633 XGetIconName (dpy, parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3635 XFree (s); 3161 XFree (s);
3636 } 3162 }
3637 break; 3163 break;
3638 case 21: /* report window title */ 3164 case 21: /* report window title */
3639 { 3165 {
3640 char *s; 3166 char *s;
3641 XFetchName (dpy, parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3643 XFree (s); 3169 XFree (s);
3644 } 3170 }
3645 break; 3171 break;
3646 } 3172 }
3647} 3173}
… …
3774 int saveop = op; 3300 int saveop = op;
3775 3301
3776 dLocal (Display *, dpy); 3302 dLocal (Display *, dpy);
3777 3303
3778 assert (str != NULL); 3304 assert (str != NULL);
3779 3305
3780 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3781 return; 3307 return;
3782 3308
3783 switch (op) 3309 switch (op)
3784 { 3310 {
… …
3879 break; 3405 break;
3880 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3881 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3882 break; 3408 break;
3883#endif 3409#endif
3884#if TRANSPARENT && TINTING 3410#if ENABLE_TRANSPARENCY
3885 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3886 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3413 {
3414 bool changed = false;
3415 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3417 else
3418 changed = bgPixmap.unset_tint ();
3419 if (changed)
3420 update_background ();
3421 }
3887 3422
3888 check_our_parents ();
3889
3890 if (am_transparent)
3891 want_full_refresh = want_refresh = 1;
3892
3893 break; 3423 break;
3894#endif 3424#endif
3895 3425
3426#if XPM_BACKGROUND
3896 case Rxvt_Pixmap: 3427 case Rxvt_Pixmap:
3897 { 3428 if (!strcmp (str, "?"))
3898 if (*str != ';')
3899 { 3429 {
3900#if XPM_BACKGROUND 3430 char str[256];
3901 scale_pixmap (""); /* reset to default scaling */ 3431
3902 set_bgPixmap (str); /* change pixmap */ 3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3903 scr_touch (true); 3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3904#endif 3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST);
3905 } 3436 }
3906 3437 else
3438 {
3907 int changed = 0; 3439 int changed = 0;
3908 3440
3909 while ((str = strchr (str, ';')) != NULL) 3441 if (*str != ';')
3910 { 3442 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */
3446 changed++;
3447 str = strchr (str, ';');
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 }
3451 while (str)
3452 {
3911 str++; 3453 str++;
3912#if XPM_BACKGROUND 3454 if (bgPixmap.set_geometry (str))
3913 changed += scale_pixmap (str); 3455 changed++;
3914#endif 3456 str = strchr (str, ';');
3915 } 3457 }
3916
3917 if (changed) 3458 if (changed)
3918 { 3459 update_background ();
3919#ifdef XPM_BACKGROUND
3920 resize_pixmap ();
3921 scr_touch (true);
3922#endif
3923 } 3460 }
3924 }
3925 break; 3461 break;
3462#endif
3926 3463
3927 case Rxvt_restoreFG: 3464 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3465 set_window_color (Color_fg, str);
3929 break; 3466 break;
3930 case Rxvt_restoreBG: 3467 case Rxvt_restoreBG:
… …
3955 case URxvt_italicFont: 3492 case URxvt_italicFont:
3956 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3957#endif 3494#endif
3958 if (query) 3495 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3962 resp); 3499 resp);
3963 else 3500 else
3964 { 3501 {
3965 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3979 break; 3516 break;
3980 3517
3981#if !ENABLE_MINIMAL 3518#if !ENABLE_MINIMAL
3982 case URxvt_locale: 3519 case URxvt_locale:
3983 if (query) 3520 if (query)
3984 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3985 else 3522 else
3986 { 3523 {
3987 set_locale (str); 3524 set_locale (str);
3988 pty->set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3989 init_xlocale (); 3526 init_xlocale ();
… …
4052{ 3589{
4053 unsigned int i, j; 3590 unsigned int i, j;
4054 int state; 3591 int state;
4055 3592
4056 static const struct 3593 static const struct
4057 { 3594 {
4058 const int argval; 3595 const int argval;
4059 const unsigned long bit; 3596 const unsigned long bit;
4060 }
4061
4062 argtopriv[] = { 3597 } argtopriv[] = {
4063 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
4064 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
4065 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
4066 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
4067 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
… …
4130 scr_touch (true); 3665 scr_touch (true);
4131 break; 3666 break;
4132#endif 3667#endif
4133 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
4134 case 1049: 3669 case 1049:
4135 if (OPTION (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
4136 if (mode == 0) 3671 if (mode == 0)
4137 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4138 else if (mode == 1) 3673 else if (mode == 1)
4139 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4140 break; 3675 break;
… …
4205 break; 3740 break;
4206 case 1011: /* scroll to bottom on key press */ 3741 case 1011: /* scroll to bottom on key press */
4207 set_option (Opt_scrollTtyKeypress, state); 3742 set_option (Opt_scrollTtyKeypress, state);
4208 break; 3743 break;
4209 case 1047: /* secondary screen w/ clearing last */ 3744 case 1047: /* secondary screen w/ clearing last */
4210 if (OPTION (Opt_secondaryScreen)) 3745 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3747 scr_erase_screen (2);
4213 scr_change_screen (state); 3748 scr_change_screen (state);
4214 break; 3749 break;
4215 case 1049: /* secondary screen w/ clearing first */ 3750 case 1049: /* secondary screen w/ clearing first */
4216 scr_change_screen (state); 3751 scr_change_screen (state);
4217 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4218 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4219 scr_erase_screen (2); 3754 scr_erase_screen (2);
4220 break; 3755 break;
4221 default: 3756 default:
4222 break; 3757 break;

Diff Legend

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