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.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.359 by ayin, Mon Oct 15 14:56:06 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,
… …
519# endif 518# endif
520 return; 519 return;
521 } 520 }
522 else 521 else
523 { 522 {
524# if ENABLE_OVERLAY 523# if ISO_14755
525 scr_overlay_off (); 524 scr_overlay_off ();
526# endif 525# endif
527 iso14755buf = 0; 526 iso14755buf = 0;
528 } 527 }
529 } 528 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
533 { 532 {
534 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 534# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 537# endif
539 } 538 }
540#endif 539#endif
… …
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
552 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 newlen = 1;
554 switch (keysym) 554 switch (keysym)
555 { 555 {
556#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 557 case XK_BackSpace:
… …
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
563 } 563 }
564 else 564 else
565 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 566 break;
567#endif 567#endif
568#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
570 case XK_KP_Delete: 570 case XK_KP_Delete:
571 /* allow shift to override */ 571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
573 { 573 {
574 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
575 break; 575 break;
576 } 576 }
577 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
578# endif 578# endif
579 case XK_Delete: 579 case XK_Delete:
580 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 581 break;
582#endif 582#endif
583 case XK_Tab: 583 case XK_Tab:
584 if (shft) 584 if (shft)
585 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
600#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
606 { 606 {
607 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break; 609 break;
610 } 610 }
… …
633 633
634#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
636 case XK_KP_Prior: 636 case XK_KP_Prior:
637 /* allow shift to override */ 637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
639 { 639 {
640 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
641 break; 641 break;
642 } 642 }
643 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
646 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
647 break; 647 break;
648# ifdef XK_KP_Next 648# ifdef XK_KP_Next
649 case XK_KP_Next: 649 case XK_KP_Next:
650 /* allow shift to override */ 650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
652 { 652 {
653 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
654 break; 654 break;
655 } 655 }
656 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
659 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
660 break; 660 break;
661#endif 661#endif
662 case XK_KP_Enter: 662 case XK_KP_Enter:
663 /* allow shift to override */ 663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
665 { 665 {
666 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break; 667 break;
668 } 668 }
669 669
… …
712 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
718 { 718 {
719 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 721 }
722 else 722 else
… …
728 728
729 case XK_Find: 729 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
731 break; 731 break;
732 732
733#ifdef XK_KP_End 733#ifdef XK_KP_Insert
734 case XK_KP_Insert: 734 case XK_KP_Insert:
735 /* allow shift to override */ 735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
737 { 737 {
738 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
739 break; 739 break;
740 } 740 }
741 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
754 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
755 break; 755 break;
756#ifdef XK_KP_End 756#ifdef XK_KP_End
757 case XK_KP_End: 757 case XK_KP_End:
758 /* allow shift to override */ 758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
760 { 760 {
761 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
762 break; 762 break;
763 } 763 }
764 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
767 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
768 break; 768 break;
769#ifdef XK_KP_Home 769#ifdef XK_KP_Home
770 case XK_KP_Home: 770 case XK_KP_Home:
771 /* allow shift to override */ 771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
773 { 773 {
774 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
775 break; 775 break;
776 } 776 }
777 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
934#if ENABLE_FRILLS || ISO_14755 934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 935 // ISO 14755 support
936 if (iso14755buf) 936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 937 if (iso14755buf & ISO_14755_52)
938 { 938 {
939# if ENABLE_OVERLAY 939# if ISO_14755
940 scr_overlay_off (); 940 scr_overlay_off ();
941# endif 941# endif
942# if ISO_14755 942# if ISO_14755
943 // iso14755 part 5.2 handling: release time 943 // iso14755 part 5.2 handling: release time
944 // first: controls 944 // first: controls
… …
967 967
968 return; 968 return;
969 } 969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 971 {
972# if ENABLE_OVERLAY 972# if ISO_14755
973 scr_overlay_off (); 973 scr_overlay_off ();
974# endif 974# endif
975 if (iso14755buf & ISO_14755_51) 975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 976 commit_iso14755 ();
977#if ISO_14755 977#if ISO_14755
… …
1034 1034
1035void 1035void
1036rxvt_term::flush () 1036rxvt_term::flush ()
1037{ 1037{
1038 flush_ev.stop (); 1038 flush_ev.stop ();
1039 1039
1040#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
1042 { 1042 {
1043 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 1044 scr_touch (false);
1046 } 1045 }
1047#endif 1046#endif
1048 1047
1049 if (want_refresh) 1048 if (want_refresh)
… …
1110void 1109void
1111rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1112{ 1111{
1113 make_current (); 1112 make_current ();
1114 1113
1115 refresh_limit = 1;
1116 refresh_count = 0; 1114 refresh_count = 0;
1117 flush (); 1115 flush ();
1118} 1116}
1119 1117
1120#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1304rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1303{
1306 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1307 int x, y; 1305 int x, y;
1308 1306
1309 x = ev.x; 1307 x = Pixel2Col (ev.x);
1310 y = ev.y; 1308 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y);
1312 1309
1313 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
1314 button_number = 3; 1311 button_number = 3;
1315 else 1312 else
1316 { 1313 {
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1432 focus_out ();
1436 } 1433 }
1437#endif 1434#endif
1438 } 1435 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1436 break;
1444 1437
1445 /* 1438 /*
1446 * XXX: this is not the _current_ arrangement 1439 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1440 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1473 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1474 focus_out ();
1482 break; 1475 break;
1483 1476
1484 case ConfigureNotify: 1477 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1485 if (ev.xconfigure.window == parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1486 { 1482 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1484 ;
1489 1485
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1487 {
1492 seen_resize = 1; 1488 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 } 1490 }
1502 1491 else
1492 {
1493#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ())
1495 update_background ();
1496#endif
1497 }
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1499 }
1510 break; 1500 break;
1511 1501
1512 case PropertyNotify: 1502 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1544 text_blink_ev.stop (); 1534 text_blink_ev.stop ();
1545#endif 1535#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1537 break;
1548 1538
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554
1555 case GraphicsExpose: 1539 case GraphicsExpose:
1556 case Expose: 1540 case Expose:
1557 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1558 { 1542 {
1559 do 1543 do
1544 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1549
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1551
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1554 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1555 ev.xexpose.width, ev.xexpose.height, False);
1569 1556 }
1570 want_refresh = 1; 1557 want_refresh = 1;
1571 } 1558 }
1572 else 1559 else
1573 { 1560 {
1574 XEvent unused_event; 1561 XEvent unused_event;
… …
1581 if (isScrollbarWindow (ev.xany.window)) 1568 if (isScrollbarWindow (ev.xany.window))
1582 { 1569 {
1583 scrollBar.setIdle (); 1570 scrollBar.setIdle ();
1584 scrollbar_show (0); 1571 scrollbar_show (0);
1585 } 1572 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1573 }
1592 break; 1574 break;
1593 1575
1594 case MotionNotify: 1576 case MotionNotify:
1595#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
… …
1693 &ev.xbutton.x, &ev.xbutton.y, 1675 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1676 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1678 scrollbar_size ());
1697 want_refresh = 1; 1679 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1680 scrollbar_show (1);
1700 } 1681 }
1701 break; 1682 break;
1702 } 1683 }
1703 1684
… …
1758 } 1739 }
1759#endif 1740#endif
1760#if ENABLE_FRILLS 1741#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1742 if (option (Opt_urgentOnBell))
1762 { 1743 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]); 1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766 if (h != NULL)
1767 { 1745 {
1768 h->flags &= ~XUrgencyHint; 1746 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h); 1747 XSetWMHints (dpy, parent[0], h);
1770 } 1748 }
1771 } 1749 }
1772#endif 1750#endif
1773 } 1751 }
1774} 1752}
… …
1785 1763
1786#if ENABLE_FRILLS || ISO_14755 1764#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1765 if (iso14755buf)
1788 { 1766 {
1789 iso14755buf = 0; 1767 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1768# if ISO_14755
1791 scr_overlay_off (); 1769 scr_overlay_off ();
1792# endif 1770# endif
1793 } 1771 }
1794#endif 1772#endif
1795#if USE_XIM 1773#if USE_XIM
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1801 }
1824#endif 1802#endif
1825} 1803}
1826 1804
1827#if TRANSPARENT || ENABLE_PERL 1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1806void
1829rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1808{
1831 make_current (); 1809 make_current ();
1832 1810
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1813 return;
1836 1814
1837# if TRANSPARENT 1815# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1816 switch (ev.type)
1839 { 1817 {
1840 case PropertyNotify: 1818 case PropertyNotify:
1841 /* 1819 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1820 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1821 * use the property to determine the pixmap. We use it later on.
1844 */ 1822 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1825 {
1848 1826 bgPixmap.set_root_pixmap ();
1849 /* FALLTHROUGH */ 1827 update_background ();
1850 case ReparentNotify: 1828 }
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1829 break;
1854 } 1830 }
1855# endif 1831# endif
1856} 1832}
1857#endif 1833#endif
… …
2291 if (ch == C0_LF) 2267 if (ch == C0_LF)
2292 nlines++; 2268 nlines++;
2293 2269
2294 refresh_count++; 2270 refresh_count++;
2295 2271
2296 if (!option (Opt_jumpScroll) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2273 {
2299 refreshnow = true;
2300 refresh_count = 0; 2274 refresh_count = 0;
2275
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2277 {
2278 refreshnow = true;
2301 ch = NOCHAR; 2279 ch = NOCHAR;
2302 break; 2280 break;
2281 }
2303 } 2282 }
2304 2283
2305 // scr_add_lines only works for nlines <= nrow - 1. 2284 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2285 if (nlines >= nrow - 1)
2307 { 2286 {
… …
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2314 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2315 scr_add_lines (buf, str - buf, nlines);
2337 2316
2338 /* 2317 /*
2339 * If there have been a lot of new lines, then update the screen 2318 * If there have been a lot of new lines, then update the screen
2340 * What the heck I'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2341 * the number of pages between refreshes is refresh_limit, which 2320 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2321 */
2344 if (refreshnow) 2322 if (refreshnow)
2345 { 2323 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true; 2324 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2325 scr_refresh ();
2353 want_refresh = 1; 2326 want_refresh = 1;
2354 }
2355 } 2327 }
2356 2328
2357 } 2329 }
2358 else 2330 else
2359 { 2331 {
… …
2580 process_dcs_seq (); 2552 process_dcs_seq ();
2581 break; 2553 break;
2582 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
2583 process_csi_seq (); 2555 process_csi_seq ();
2584 break; 2556 break;
2585 case 0x9d: /* CSI */ 2557 case 0x9d: /* OSC */
2586 process_osc_seq (); 2558 process_osc_seq ();
2587 break; 2559 break;
2588#endif 2560#endif
2589 } 2561 }
2590} 2562}
… …
2816rxvt_term::process_csi_seq () 2788rxvt_term::process_csi_seq ()
2817{ 2789{
2818 unicode_t ch, priv, i; 2790 unicode_t ch, priv, i;
2819 unsigned int nargs, p; 2791 unsigned int nargs, p;
2820 int n, ndef; 2792 int n, ndef;
2821 int arg[ESC_ARGS]; 2793 int arg[ESC_ARGS] = { };
2822 2794
2823 for (nargs = ESC_ARGS; nargs > 0;) 2795 nargs = 0;
2824 arg[--nargs] = 0;
2825 2796
2826 priv = 0; 2797 priv = 0;
2827 ch = cmd_getc (); 2798 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2799 if (ch >= '<' && ch <= '?')
2829 { /* '<' '=' '>' '?' */ 2800 { /* '<' '=' '>' '?' */
… …
2873 switch (priv) 2844 switch (priv)
2874 { 2845 {
2875 case '>': 2846 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2847 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2848 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2851 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2854 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3441 break; 3412 break;
3442 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3444 break; 3415 break;
3445#endif 3416#endif
3446#if TRANSPARENT && TINTING 3417#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3418 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3419 process_color_seq (op, Color_tint, str, resp);
3420 {
3421 bool changed = false;
3422 if (ISSET_PIXCOLOR (Color_tint))
3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3424 else
3425 changed = bgPixmap.unset_tint ();
3426 if (changed)
3427 update_background ();
3428 }
3449 3429
3450 check_our_parents ();
3451
3452 if (am_transparent)
3453 want_full_refresh = want_refresh = 1;
3454
3455 break; 3430 break;
3456#endif 3431#endif
3457 3432
3433#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3459 { 3435 if (!strcmp (str, "?"))
3460 if (*str != ';')
3461 { 3436 {
3462#if XPM_BACKGROUND 3437 char str[256];
3463 scale_pixmap (""); /* reset to default scaling */ 3438
3464 set_bgPixmap (str); /* change pixmap */ 3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3465 scr_touch (true); 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466#endif 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3443 }
3468 3444 else
3445 {
3469 int changed = 0; 3446 int changed = 0;
3470 3447
3471 while ((str = strchr (str, ';')) != NULL) 3448 if (*str != ';')
3472 { 3449 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */
3453 changed++;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 }
3458 while (str)
3459 {
3473 str++; 3460 str++;
3474#if XPM_BACKGROUND 3461 if (bgPixmap.set_geometry (str))
3475 changed += scale_pixmap (str); 3462 changed++;
3476#endif 3463 str = strchr (str, ';');
3477 } 3464 }
3478
3479 if (changed) 3465 if (changed)
3480 { 3466 update_background ();
3481#ifdef XPM_BACKGROUND
3482 resize_pixmap ();
3483 scr_touch (true);
3484#endif
3485 } 3467 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 }
3491 break; 3468 break;
3469#endif
3492 3470
3493 case Rxvt_restoreFG: 3471 case Rxvt_restoreFG:
3494 set_window_color (Color_fg, str); 3472 set_window_color (Color_fg, str);
3495 break; 3473 break;
3496 case Rxvt_restoreBG: 3474 case Rxvt_restoreBG:
… …
3618{ 3596{
3619 unsigned int i, j; 3597 unsigned int i, j;
3620 int state; 3598 int state;
3621 3599
3622 static const struct 3600 static const struct
3623 { 3601 {
3624 const int argval; 3602 const int argval;
3625 const unsigned long bit; 3603 const unsigned long bit;
3626 }
3627
3628 argtopriv[] = { 3604 } argtopriv[] = {
3629 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR },
3630 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
3631 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 },
3632 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll },
3633 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo },
… …
4025 4001
4026 if (v_buflen == 0) 4002 if (v_buflen == 0)
4027 { 4003 {
4028 free (v_buffer); 4004 free (v_buffer);
4029 v_buffer = 0; 4005 v_buffer = 0;
4030 v_buflen = 0;
4031 4006
4032 pty_ev.set (EVENT_READ); 4007 pty_ev.set (EVENT_READ);
4033 return; 4008 return;
4034 } 4009 }
4035 4010

Diff Legend

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