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.404 by root, Sat Feb 2 15:19:55 2008 UTC vs.
Revision 1.421 by root, Wed Oct 15 17:16:47 2008 UTC

… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
303void 398void
304rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
305{ 400{
306 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 402 KeySym keysym;
309 int valid_keysym; 403 int valid_keysym;
310 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
311 405
312#if ISO_14755 406#if ISO_14755
… …
325 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
326 420
327 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
328 { 422 {
329 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
330 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
331 } 425 }
332 426
333 kbuf[0] = 0; 427 kbuf[0] = 0;
334 428
335#ifdef USE_XIM 429#ifdef USE_XIM
… …
547 } 641 }
548#endif 642#endif
549 643
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
552 { 650 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 651#ifndef NO_BACKSPACE_KEY
554 newlen = 1; 652 case XK_BackSpace:
555#ifdef XK_KP_Home 653 if (priv_modes & PrivMode_HaveBackSpace)
556 static const KeySym keypadtrans[] = { 654 {
557 XK_KP_7, // XK_KP_Home 655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
558 XK_KP_4, // XK_KP_Left 656 ^ !!ctrl) ? '\b' : '\177';
559 XK_KP_8, // XK_KP_Up 657 kbuf[1] = '\0';
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 }; 658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
572 684
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
574 { 765 {
575 unsigned int index = keysym - XK_KP_Home; 766 int param = map_function_key (keysym);
576 keysym = kp ? keypadtrans[index] : XK_Home + index; 767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
577 } 771 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
585 switch (keysym)
586 {
587#ifndef NO_BACKSPACE_KEY
588 case XK_BackSpace:
589 if (priv_modes & PrivMode_HaveBackSpace)
590 {
591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
592 ^ !!ctrl) ? '\b' : '\177';
593 kbuf[1] = '\0';
594 }
595 else
596 strcpy (kbuf, rs[Rs_backspace_key]);
597 break; 772 break;
598#endif
599#ifndef NO_DELETE_KEY
600 case XK_Delete:
601 strcpy (kbuf, rs[Rs_delete_key]);
602 break;
603#endif
604 case XK_Tab:
605 if (shft)
606 strcpy (kbuf, "\033[Z");
607 else
608 {
609#ifdef CTRL_TAB_MAKES_META
610 if (ctrl)
611 meta = 1;
612#endif
613#ifdef MOD4_TAB_MAKES_META
614 if (ev.state & Mod4Mask)
615 meta = 1;
616#endif
617 newlen = 0;
618 }
619 break;
620
621 case XK_Up: /* "\033[A" */
622 case XK_Down: /* "\033[B" */
623 case XK_Right: /* "\033[C" */
624 case XK_Left: /* "\033[D" */
625 strcpy (kbuf, "\033[Z");
626 kbuf[2] = "DACB"[keysym - XK_Left];
627 /* do Shift first */
628 if (shft)
629 kbuf[2] = "dacb"[keysym - XK_Left];
630 else if (ctrl)
631 {
632 kbuf[1] = 'O';
633 kbuf[2] = "dacb"[keysym - XK_Left];
634 }
635 else if (priv_modes & PrivMode_aplCUR)
636 kbuf[1] = 'O';
637 break;
638
639#ifndef UNSHIFTED_SCROLLKEYS
640 case XK_Prior:
641 strcpy (kbuf, "\033[5~");
642 break;
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if (kp)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671 case XK_KP_F1: /* "\033OP" */
672 case XK_KP_F2: /* "\033OQ" */
673 case XK_KP_F3: /* "\033OR" */
674 case XK_KP_F4: /* "\033OS" */
675 strcpy (kbuf, "\033OP");
676 kbuf[2] += (keysym - XK_KP_F1);
677 break;
678
679 case XK_KP_Multiply: /* "\033Oj" : "*" */
680 case XK_KP_Add: /* "\033Ok" : "+" */
681 case XK_KP_Separator: /* "\033Ol" : "," */
682 case XK_KP_Subtract: /* "\033Om" : "-" */
683 case XK_KP_Decimal: /* "\033On" : "." */
684 case XK_KP_Divide: /* "\033Oo" : "/" */
685 case XK_KP_0: /* "\033Op" : "0" */
686 case XK_KP_1: /* "\033Oq" : "1" */
687 case XK_KP_2: /* "\033Or" : "2" */
688 case XK_KP_3: /* "\033Os" : "3" */
689 case XK_KP_4: /* "\033Ot" : "4" */
690 case XK_KP_5: /* "\033Ou" : "5" */
691 case XK_KP_6: /* "\033Ov" : "6" */
692 case XK_KP_7: /* "\033Ow" : "7" */
693 case XK_KP_8: /* "\033Ox" : "8" */
694 case XK_KP_9: /* "\033Oy" : "9" */
695 /* allow shift to override */
696 if (kp)
697 {
698 strcpy (kbuf, "\033Oj");
699 kbuf[2] += (keysym - XK_KP_Multiply);
700 }
701 else
702 {
703 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
704 kbuf[1] = '\0';
705 }
706 break;
707
708 case XK_Find:
709 strcpy (kbuf, "\033[1~");
710 break;
711
712 case XK_Insert:
713 strcpy (kbuf, "\033[2~");
714 break;
715#ifdef DXK_Remove /* support for DEC remove like key */
716 case DXK_Remove:
717 /* FALLTHROUGH */
718#endif
719 case XK_Execute:
720 strcpy (kbuf, "\033[3~");
721 break;
722 case XK_Select:
723 strcpy (kbuf, "\033[4~");
724 break;
725 case XK_End:
726 strcpy (kbuf, KS_END);
727 break;
728 case XK_Home:
729 strcpy (kbuf, KS_HOME);
730 break;
731
732#define FKEY(n, fkey) \
733 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
734
735 case XK_F1: /* "\033[11~" */
736 case XK_F2: /* "\033[12~" */
737 case XK_F3: /* "\033[13~" */
738 case XK_F4: /* "\033[14~" */
739 case XK_F5: /* "\033[15~" */
740 FKEY (11, XK_F1);
741 break;
742 case XK_F6: /* "\033[17~" */
743 case XK_F7: /* "\033[18~" */
744 case XK_F8: /* "\033[19~" */
745 case XK_F9: /* "\033[20~" */
746 case XK_F10: /* "\033[21~" */
747 FKEY (17, XK_F6);
748 break;
749 case XK_F11: /* "\033[23~" */
750 case XK_F12: /* "\033[24~" */
751 case XK_F13: /* "\033[25~" */
752 case XK_F14: /* "\033[26~" */
753 FKEY (23, XK_F11);
754 break;
755 case XK_F15: /* "\033[28~" */
756 case XK_F16: /* "\033[29~" */
757 FKEY (28, XK_F15);
758 break;
759 case XK_Help: /* "\033[28~" */
760 FKEY (28, XK_Help);
761 break;
762 case XK_Menu: /* "\033[29~" */
763 FKEY (29, XK_Menu);
764 break;
765 case XK_F17: /* "\033[31~" */
766 case XK_F18: /* "\033[32~" */
767 case XK_F19: /* "\033[33~" */
768 case XK_F20: /* "\033[34~" */
769 case XK_F21: /* "\033[35~" */
770 case XK_F22: /* "\033[36~" */
771 case XK_F23: /* "\033[37~" */
772 case XK_F24: /* "\033[38~" */
773 case XK_F25: /* "\033[39~" */
774 case XK_F26: /* "\033[40~" */
775 case XK_F27: /* "\033[41~" */
776 case XK_F28: /* "\033[42~" */
777 case XK_F29: /* "\033[43~" */
778 case XK_F30: /* "\033[44~" */
779 case XK_F31: /* "\033[45~" */
780 case XK_F32: /* "\033[46~" */
781 case XK_F33: /* "\033[47~" */
782 case XK_F34: /* "\033[48~" */
783 case XK_F35: /* "\033[49~" */
784 FKEY (31, XK_F17);
785 break;
786#undef FKEY
787 default:
788 newlen = 0;
789 break;
790 }
791
792 if (newlen)
793 len = strlen (kbuf);
794 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
795 777
796 /* 778 /*
797 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
798 */ 780 */
799#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1033 } 1015 }
1034 while (row < end_row); 1016 while (row < end_row);
1035 } 1017 }
1036 1018
1037 scr_refresh (); 1019 scr_refresh ();
1038 scrollbar_show (1); 1020 scrollBar.show (1);
1039#ifdef USE_XIM 1021#ifdef USE_XIM
1040 IMSendSpot (); 1022 IMSendSpot ();
1041#endif 1023#endif
1042 } 1024 }
1043 1025
… …
1145 { 1127 {
1146 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is 1130 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1150 1135
1151 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1152 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1153 1138
1154 w.stop (); 1139 w.stop ();
1155 } 1140 }
1156 1141
… …
1554 ; 1539 ;
1555 1540
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1542 {
1558 scrollBar.state = STATE_IDLE; 1543 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1544 scrollBar.show (0);
1560 } 1545 }
1561 } 1546 }
1562 break; 1547 break;
1563 1548
1564 case MotionNotify: 1549 case MotionNotify:
… …
1663 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1651 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1653 scrollBar.size ());
1669 want_refresh = 1; 1654 want_refresh = 1;
1670 scrollbar_show (1); 1655 scrollBar.show (1);
1671 } 1656 }
1672 break; 1657 break;
1673 } 1658 }
1674 1659
1675#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
… …
1701 1686
1702 refresh_check (); 1687 refresh_check ();
1703} 1688}
1704 1689
1705void 1690void
1691rxvt_term::set_urgency (bool enable)
1692{
1693 if (enable == urgency_hint)
1694 return;
1695
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1697 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable;
1701 }
1702}
1703
1704void
1706rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1707{ 1706{
1708 if (!focus) 1707 if (!focus)
1709 { 1708 {
1710 focus = 1; 1709 focus = 1;
1711 want_refresh = 1; 1710 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1711
1715#if USE_XIM 1712#if USE_XIM
1716 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1717 { 1714 {
1718 IMSetPosition (); 1715 IMSetPosition ();
… …
1730 scr_recolour (); 1727 scr_recolour ();
1731 } 1728 }
1732#endif 1729#endif
1733#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1731 if (option (Opt_urgentOnBell))
1735 { 1732 set_urgency (0);
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif 1733#endif
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1736 }
1744} 1737}
1745 1738
1746void 1739void
1747rxvt_term::focus_out () 1740rxvt_term::focus_out ()
… …
1749 if (focus) 1742 if (focus)
1750 { 1743 {
1751 focus = 0; 1744 focus = 0;
1752 want_refresh = 1; 1745 want_refresh = 1;
1753 1746
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1747#if ENABLE_FRILLS
1755 1748 if (option (Opt_urgentOnBell))
1749 set_urgency (0);
1750#endif
1756#if ENABLE_FRILLS || ISO_14755 1751#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1752 if (iso14755buf)
1758 { 1753 {
1759 iso14755buf = 0; 1754 iso14755buf = 0;
1760# if ISO_14755 1755# if ISO_14755
… …
1777 { 1772 {
1778 pix_colors = pix_colors_unfocused; 1773 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1774 scr_recolour ();
1780 } 1775 }
1781#endif 1776#endif
1777
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1779 }
1783} 1780}
1784 1781
1785void 1782void
1786rxvt_term::update_fade_color (unsigned int idx) 1783rxvt_term::update_fade_color (unsigned int idx)
… …
2028 } 2025 }
2029 2026
2030 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2031 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2032 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2033 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2034 2031
2035 scrollBar.state = STATE_MOTION; 2032 scrollBar.state = STATE_MOTION;
2036 break; 2033 break;
2037 2034
2038 case Button1: 2035 case Button1:
… …
2061 else 2058 else
2062 { 2059 {
2063 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2064 (nrow 2061 (nrow
2065 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
2066 / scrollbar_size ())); 2063 / scrollBar.size ()));
2067 } 2064 }
2068 2065
2069 break; 2066 break;
2070 } 2067 }
2071 } 2068 }
… …
2084 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2085 2082
2086 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2087 { 2084 {
2088 scrollBar.state = STATE_IDLE; 2085 scrollBar.state = STATE_IDLE;
2089 scrollbar_show (0); 2086 scrollBar.show (0);
2090 } 2087 }
2091 2088
2092#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2093 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2094#endif 2091#endif
… …
2177 } 2174 }
2178 else 2175 else
2179# endif 2176# endif
2180 { 2177 {
2181 scr_page (v, i); 2178 scr_page (v, i);
2182 scrollbar_show (1); 2179 scrollBar.show (1);
2183 } 2180 }
2184 } 2181 }
2185 break; 2182 break;
2186#endif 2183#endif
2187 } 2184 }
… …
2197 wchar_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2198 char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2199 2196
2200 for (;;) 2197 for (;;)
2201 { 2198 {
2202 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2203 { 2200 {
2204 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2205 ch = next_char (); 2202 ch = next_char ();
2206 2203
2207 if (ch == NOCHAR) 2204 if (ch == NOCHAR)
2208 break; 2205 break;
2209 } 2206 }
2210 2207
2211 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2212 { 2209 {
2213 if (!seen_input) 2210 if (expect_false (!seen_input))
2214 { 2211 {
2215 seen_input = 1; 2212 seen_input = 1;
2216 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2217 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2218 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
… …
2231 wchar_t *str = buf; 2228 wchar_t *str = buf;
2232 wchar_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2233 2230
2234 for (;;) 2231 for (;;)
2235 { 2232 {
2236 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2237 break; 2234 break;
2238 2235
2239 *str++ = ch; 2236 *str++ = ch;
2240 2237
2241 if (ch == C0_LF || str >= eol) 2238 if (expect_false (ch == C0_LF || str >= eol))
2242 { 2239 {
2243 if (ch == C0_LF) 2240 if (ch == C0_LF)
2244 nlines++; 2241 nlines++;
2245 2242
2246 refresh_count++; 2243 refresh_count++;
… …
2328rxvt_term::next_char () NOTHROW 2325rxvt_term::next_char () NOTHROW
2329{ 2326{
2330 while (cmdbuf_ptr < cmdbuf_endp) 2327 while (cmdbuf_ptr < cmdbuf_endp)
2331 { 2328 {
2332 // assume 7-bit to be ascii ALWAYS 2329 // assume 7-bit to be ascii ALWAYS
2333 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2330 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2334 return *cmdbuf_ptr++; 2331 return *cmdbuf_ptr++;
2335 2332
2336 wchar_t wc; 2333 wchar_t wc;
2337 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2338 2335
… …
2342 cmdbuf_ptr = cmdbuf_endp; 2339 cmdbuf_ptr = cmdbuf_endp;
2343 break; 2340 break;
2344 } 2341 }
2345 2342
2346 if (len == (size_t)-1) 2343 if (len == (size_t)-1)
2344 {
2345 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2346 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2347 }
2348 2348
2349 // assume wchar == unicode 2349 // assume wchar == unicode
2350 cmdbuf_ptr += len; 2350 cmdbuf_ptr += len;
2351 return wc & UNICODE_MASK; 2351 return wc & UNICODE_MASK;
2352 } 2352 }
… …
2396/*----------------------------------------------------------------------*/ 2396/*----------------------------------------------------------------------*/
2397#ifdef PRINTPIPE 2397#ifdef PRINTPIPE
2398FILE * 2398FILE *
2399rxvt_term::popen_printer () 2399rxvt_term::popen_printer ()
2400{ 2400{
2401 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2401 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2402 2402
2403 if (stream == NULL) 2403 if (stream == NULL)
2404 rxvt_warn ("can't open printer pipe, not printing.\n"); 2404 rxvt_warn ("can't open printer pipe, not printing.\n");
2405 2405
2406 return stream; 2406 return stream;
… …
2417 * simulate attached vt100 printer 2417 * simulate attached vt100 printer
2418 */ 2418 */
2419void 2419void
2420rxvt_term::process_print_pipe () 2420rxvt_term::process_print_pipe ()
2421{ 2421{
2422 int done; 2422 FILE *fd = popen_printer ();
2423 FILE *fd;
2424 2423
2425 if ((fd = popen_printer ()) == NULL) 2424 if (!fd)
2426 return; 2425 return;
2427 2426
2428 /* 2427 /*
2429 * Send all input to the printer until either ESC[4i or ESC[?4i 2428 * Send all input to the printer until either ESC[4i or ESC[?4i
2430 * is received. 2429 * is received.
2431 */ 2430 */
2432 for (done = 0; !done;) 2431 for (int done = 0; !done; )
2433 { 2432 {
2434 unsigned char buf[8]; 2433 unsigned char buf[8];
2435 unicode_t ch; 2434 unicode_t ch;
2436 unsigned int i, len; 2435 unsigned int i, len;
2437 2436
… …
2582 break; 2581 break;
2583 case 'Z': /* identify the terminal type */ 2582 case 'Z': /* identify the terminal type */
2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2583 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2585 break; 2584 break;
2586 case '<': /* turn off VT52 mode */ 2585 case '<': /* turn off VT52 mode */
2587 PrivMode (0, PrivMode_vt52); 2586 set_privmode (PrivMode_vt52, 0);
2588 break; 2587 break;
2589 case 'F': /* use special graphics character set */ 2588 case 'F': /* use special graphics character set */
2590 case 'G': /* use regular character set */ 2589 case 'G': /* use regular character set */
2591 /* unimplemented */ 2590 /* unimplemented */
2592 break; 2591 break;
… …
2646 scr_forwardindex (); 2645 scr_forwardindex ();
2647 break; 2646 break;
2648#endif 2647#endif
2649 case '=': 2648 case '=':
2650 case '>': 2649 case '>':
2651 PrivMode ((ch == '='), PrivMode_aplKP); 2650 set_privmode (PrivMode_aplKP, ch == '=');
2652 break; 2651 break;
2653 2652
2654 case C1_40: 2653 case C1_40:
2655 cmd_getc (); 2654 cmd_getc ();
2656 break; 2655 break;
… …
2709 2708
2710 /* 8.3.106: RESET TO INITIAL STATE */ 2709 /* 8.3.106: RESET TO INITIAL STATE */
2711 case 'c': 2710 case 'c':
2712 mbstate.reset (); 2711 mbstate.reset ();
2713 scr_poweron (); 2712 scr_poweron ();
2714 scrollbar_show (1); 2713 scrollBar.show (1);
2715 break; 2714 break;
2716 2715
2717 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2716 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2718 case 'n': 2717 case 'n':
2719 scr_charset_choose (2); 2718 scr_charset_choose (2);
… …
3525 break; 3524 break;
3526#endif 3525#endif
3527 3526
3528#if ENABLE_PERL 3527#if ENABLE_PERL
3529 case URxvt_perl: 3528 case URxvt_perl:
3530 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3529 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3531 ; // no responses yet
3532 break; 3530 break;
3533#endif 3531#endif
3534 } 3532 }
3535} 3533}
3536/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
… …
3559 { 3557 {
3560 if (mode == 'r') 3558 if (mode == 'r')
3561 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3559 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3562 else 3560 else
3563 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3561 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3564 PrivMode (state, bit); 3562 set_privmode (bit, state);
3565 } 3563 }
3566 3564
3567 return state; 3565 return state;
3568} 3566}
3569 3567
… …
3667 case 2: /* VT52 mode */ 3665 case 2: /* VT52 mode */
3668 /* oddball mode. should be set regardless of set/reset 3666 /* oddball mode. should be set regardless of set/reset
3669 * parameter. Return from VT52 mode with an ESC < from 3667 * parameter. Return from VT52 mode with an ESC < from
3670 * within VT52 mode 3668 * within VT52 mode
3671 */ 3669 */
3672 PrivMode (1, PrivMode_vt52); 3670 set_privmode (PrivMode_vt52, 1);
3673 break; 3671 break;
3674 case 3: /* 80/132 */ 3672 case 3: /* 80/132 */
3675 if (priv_modes & PrivMode_132OK) 3673 if (priv_modes & PrivMode_132OK)
3676 { 3674 {
3677 scr_poweron (); 3675 scr_poweron ();
… …
3695 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3696 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3697 break; 3695 break;
3698#ifdef scrollBar_esc 3696#ifdef scrollBar_esc
3699 case scrollBar_esc: 3697 case scrollBar_esc:
3700 if (scrollbar_mapping (state)) 3698 if (scrollBar.map (state))
3701 { 3699 {
3702 resize_all_windows (0, 0, 0); 3700 resize_all_windows (0, 0, 0);
3703 scr_touch (true); 3701 scr_touch (true);
3704 } 3702 }
3705 break; 3703 break;

Diff Legend

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