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.406 by ayin, Thu Feb 14 23:53:05 2008 UTC vs.
Revision 1.427 by root, Wed Nov 5 15:44:04 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 {
… …
297 } 297 }
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
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}
302 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;
… …
324 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
325 420
326 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
327 { 422 {
328 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
330 } 425 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
… …
546 } 641 }
547#endif 642#endif
548 643
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 645 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1; 647 unsigned int newlen = 1;
553#ifdef XK_KP_Home 648
554 static const KeySym keypadtrans[] = { 649 switch (translate_keypad (keysym, kp))
555 XK_KP_7, // XK_KP_Home 650 {
556 XK_KP_4, // XK_KP_Left 651#ifndef NO_BACKSPACE_KEY
557 XK_KP_8, // XK_KP_Up 652 case XK_BackSpace:
558 XK_KP_6, // XK_KP_Right 653 if (priv_modes & PrivMode_HaveBackSpace)
559 XK_KP_2, // XK_KP_Down 654 {
560#ifndef UNSHIFTED_SCROLLKEYS 655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 XK_KP_9, // XK_KP_Prior 656 ^ !!ctrl) ? '\b' : '\177';
562 XK_KP_3, // XK_KP_Next 657 kbuf[1] = '\0';
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 }; 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;
570 684
571 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:
572 { 765 {
573 unsigned int index = keysym - XK_KP_Home; 766 int param = map_function_key (keysym);
574 keysym = kp ? keypadtrans[index] : XK_Home + index; 767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
575 } 771 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
583 switch (keysym)
584 {
585#ifndef NO_BACKSPACE_KEY
586 case XK_BackSpace:
587 if (priv_modes & PrivMode_HaveBackSpace)
588 {
589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
590 ^ !!ctrl) ? '\b' : '\177';
591 kbuf[1] = '\0';
592 }
593 else
594 strcpy (kbuf, rs[Rs_backspace_key]);
595 break; 772 break;
596#endif
597#ifndef NO_DELETE_KEY
598 case XK_Delete:
599 strcpy (kbuf, rs[Rs_delete_key]);
600 break;
601#endif
602 case XK_Tab:
603 if (shft)
604 strcpy (kbuf, "\033[Z");
605 else
606 {
607#ifdef CTRL_TAB_MAKES_META
608 if (ctrl)
609 meta = 1;
610#endif
611#ifdef MOD4_TAB_MAKES_META
612 if (ev.state & Mod4Mask)
613 meta = 1;
614#endif
615 newlen = 0;
616 }
617 break;
618
619 case XK_Up: /* "\033[A" */
620 case XK_Down: /* "\033[B" */
621 case XK_Right: /* "\033[C" */
622 case XK_Left: /* "\033[D" */
623 strcpy (kbuf, "\033[Z");
624 kbuf[2] = "DACB"[keysym - XK_Left];
625 /* do Shift first */
626 if (shft)
627 kbuf[2] = "dacb"[keysym - XK_Left];
628 else if (ctrl)
629 {
630 kbuf[1] = 'O';
631 kbuf[2] = "dacb"[keysym - XK_Left];
632 }
633 else if (priv_modes & PrivMode_aplCUR)
634 kbuf[1] = 'O';
635 break;
636
637#ifndef UNSHIFTED_SCROLLKEYS
638 case XK_Prior:
639 strcpy (kbuf, "\033[5~");
640 break;
641 case XK_Next:
642 strcpy (kbuf, "\033[6~");
643 break;
644#endif
645 case XK_KP_Enter:
646 /* allow shift to override */
647 if (kp)
648 {
649 strcpy (kbuf, "\033OM");
650 break;
651 }
652
653 /* FALLTHROUGH */
654
655 case XK_Return:
656 if (priv_modes & PrivMode_LFNL)
657 {
658 kbuf[0] = '\015';
659 kbuf[1] = '\012';
660 kbuf[2] = '\0';
661 }
662 else
663 {
664 kbuf[0] = '\015';
665 kbuf[1] = '\0';
666 }
667 break;
668
669 case XK_KP_F1: /* "\033OP" */
670 case XK_KP_F2: /* "\033OQ" */
671 case XK_KP_F3: /* "\033OR" */
672 case XK_KP_F4: /* "\033OS" */
673 strcpy (kbuf, "\033OP");
674 kbuf[2] += (keysym - XK_KP_F1);
675 break;
676
677 case XK_KP_Multiply: /* "\033Oj" : "*" */
678 case XK_KP_Add: /* "\033Ok" : "+" */
679 case XK_KP_Separator: /* "\033Ol" : "," */
680 case XK_KP_Subtract: /* "\033Om" : "-" */
681 case XK_KP_Decimal: /* "\033On" : "." */
682 case XK_KP_Divide: /* "\033Oo" : "/" */
683 case XK_KP_0: /* "\033Op" : "0" */
684 case XK_KP_1: /* "\033Oq" : "1" */
685 case XK_KP_2: /* "\033Or" : "2" */
686 case XK_KP_3: /* "\033Os" : "3" */
687 case XK_KP_4: /* "\033Ot" : "4" */
688 case XK_KP_5: /* "\033Ou" : "5" */
689 case XK_KP_6: /* "\033Ov" : "6" */
690 case XK_KP_7: /* "\033Ow" : "7" */
691 case XK_KP_8: /* "\033Ox" : "8" */
692 case XK_KP_9: /* "\033Oy" : "9" */
693 /* allow shift to override */
694 if (kp)
695 {
696 strcpy (kbuf, "\033Oj");
697 kbuf[2] += (keysym - XK_KP_Multiply);
698 }
699 else
700 {
701 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
702 kbuf[1] = '\0';
703 }
704 break;
705
706 case XK_Find:
707 strcpy (kbuf, "\033[1~");
708 break;
709
710 case XK_Insert:
711 strcpy (kbuf, "\033[2~");
712 break;
713#ifdef DXK_Remove /* support for DEC remove like key */
714 case DXK_Remove:
715 /* FALLTHROUGH */
716#endif
717 case XK_Execute:
718 strcpy (kbuf, "\033[3~");
719 break;
720 case XK_Select:
721 strcpy (kbuf, "\033[4~");
722 break;
723 case XK_End:
724 strcpy (kbuf, KS_END);
725 break;
726 case XK_Home:
727 strcpy (kbuf, KS_HOME);
728 break;
729
730#define FKEY(n, fkey) \
731 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
732
733 case XK_F1: /* "\033[11~" */
734 case XK_F2: /* "\033[12~" */
735 case XK_F3: /* "\033[13~" */
736 case XK_F4: /* "\033[14~" */
737 case XK_F5: /* "\033[15~" */
738 FKEY (11, XK_F1);
739 break;
740 case XK_F6: /* "\033[17~" */
741 case XK_F7: /* "\033[18~" */
742 case XK_F8: /* "\033[19~" */
743 case XK_F9: /* "\033[20~" */
744 case XK_F10: /* "\033[21~" */
745 FKEY (17, XK_F6);
746 break;
747 case XK_F11: /* "\033[23~" */
748 case XK_F12: /* "\033[24~" */
749 case XK_F13: /* "\033[25~" */
750 case XK_F14: /* "\033[26~" */
751 FKEY (23, XK_F11);
752 break;
753 case XK_F15: /* "\033[28~" */
754 case XK_F16: /* "\033[29~" */
755 FKEY (28, XK_F15);
756 break;
757 case XK_Help: /* "\033[28~" */
758 FKEY (28, XK_Help);
759 break;
760 case XK_Menu: /* "\033[29~" */
761 FKEY (29, XK_Menu);
762 break;
763 case XK_F17: /* "\033[31~" */
764 case XK_F18: /* "\033[32~" */
765 case XK_F19: /* "\033[33~" */
766 case XK_F20: /* "\033[34~" */
767 case XK_F21: /* "\033[35~" */
768 case XK_F22: /* "\033[36~" */
769 case XK_F23: /* "\033[37~" */
770 case XK_F24: /* "\033[38~" */
771 case XK_F25: /* "\033[39~" */
772 case XK_F26: /* "\033[40~" */
773 case XK_F27: /* "\033[41~" */
774 case XK_F28: /* "\033[42~" */
775 case XK_F29: /* "\033[43~" */
776 case XK_F30: /* "\033[44~" */
777 case XK_F31: /* "\033[45~" */
778 case XK_F32: /* "\033[46~" */
779 case XK_F33: /* "\033[47~" */
780 case XK_F34: /* "\033[48~" */
781 case XK_F35: /* "\033[49~" */
782 FKEY (31, XK_F17);
783 break;
784#undef FKEY
785 default:
786 newlen = 0;
787 break;
788 } 773 }
789 774
790 if (newlen) 775 if (newlen)
791 len = strlen (kbuf); 776 len = strlen (kbuf);
792 777
793 /* 778 /*
794 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
795 */ 780 */
796#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1030 } 1015 }
1031 while (row < end_row); 1016 while (row < end_row);
1032 } 1017 }
1033 1018
1034 scr_refresh (); 1019 scr_refresh ();
1035 scrollbar_show (1); 1020 scrollBar.show (1);
1036#ifdef USE_XIM 1021#ifdef USE_XIM
1037 IMSendSpot (); 1022 IMSendSpot ();
1038#endif 1023#endif
1039 } 1024 }
1040 1025
… …
1142 { 1127 {
1143 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1145 // 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
1146 // 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.
1147 1135
1148 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1150 1138
1151 w.stop (); 1139 w.stop ();
1152 } 1140 }
1153 1141
… …
1203{ 1191{
1204 make_current (); 1192 make_current ();
1205 1193
1206 if (revents & ev::READ) 1194 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1197 cmd_parse ();
1210 break;
1211 1198
1212 if (revents & ev::WRITE) 1199 if (revents & ev::WRITE)
1213 pty_write (); 1200 pty_write ();
1214 1201
1215 refresh_check (); 1202 refresh_check ();
… …
1551 ; 1538 ;
1552 1539
1553 if (scrollBar.state && ev.xany.window == scrollBar.win) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1554 { 1541 {
1555 scrollBar.state = STATE_IDLE; 1542 scrollBar.state = STATE_IDLE;
1556 scrollbar_show (0); 1543 scrollBar.show (0);
1557 } 1544 }
1558 } 1545 }
1559 break; 1546 break;
1560 1547
1561 case MotionNotify: 1548 case MotionNotify:
… …
1660 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1661 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1662 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1663 &unused_mask); 1650 &unused_mask);
1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1665 scrollbar_size ()); 1652 scrollBar.size ());
1666 want_refresh = 1; 1653 want_refresh = 1;
1667 scrollbar_show (1); 1654 scrollBar.show (1);
1668 } 1655 }
1669 break; 1656 break;
1670 } 1657 }
1671 1658
1672#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
… …
1698 1685
1699 refresh_check (); 1686 refresh_check ();
1700} 1687}
1701 1688
1702void 1689void
1690rxvt_term::set_urgency (bool enable)
1691{
1692 if (enable == urgency_hint)
1693 return;
1694
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1696 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable;
1700 }
1701}
1702
1703void
1703rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1704{ 1705{
1705 if (!focus) 1706 if (!focus)
1706 { 1707 {
1707 focus = 1; 1708 focus = 1;
1708 want_refresh = 1; 1709 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1710
1712#if USE_XIM 1711#if USE_XIM
1713 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1714 { 1713 {
1715 IMSetPosition (); 1714 IMSetPosition ();
… …
1727 scr_recolour (); 1726 scr_recolour ();
1728 } 1727 }
1729#endif 1728#endif
1730#if ENABLE_FRILLS 1729#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell)) 1730 if (option (Opt_urgentOnBell))
1732 { 1731 set_urgency (0);
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif 1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1740 } 1735 }
1741} 1736}
1742 1737
1743void 1738void
1744rxvt_term::focus_out () 1739rxvt_term::focus_out ()
… …
1746 if (focus) 1741 if (focus)
1747 { 1742 {
1748 focus = 0; 1743 focus = 0;
1749 want_refresh = 1; 1744 want_refresh = 1;
1750 1745
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746#if ENABLE_FRILLS
1752 1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1753#if ENABLE_FRILLS || ISO_14755 1750#if ENABLE_FRILLS || ISO_14755
1754 if (iso14755buf) 1751 if (iso14755buf)
1755 { 1752 {
1756 iso14755buf = 0; 1753 iso14755buf = 0;
1757# if ISO_14755 1754# if ISO_14755
… …
1774 { 1771 {
1775 pix_colors = pix_colors_unfocused; 1772 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1773 scr_recolour ();
1777 } 1774 }
1778#endif 1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1778 }
1780} 1779}
1781 1780
1782void 1781void
1783rxvt_term::update_fade_color (unsigned int idx) 1782rxvt_term::update_fade_color (unsigned int idx)
… …
2025 } 2024 }
2026 2025
2027 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2031 2030
2032 scrollBar.state = STATE_MOTION; 2031 scrollBar.state = STATE_MOTION;
2033 break; 2032 break;
2034 2033
2035 case Button1: 2034 case Button1:
… …
2058 else 2057 else
2059 { 2058 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2060 (nrow
2062 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
2063 / scrollbar_size ())); 2062 / scrollBar.size ()));
2064 } 2063 }
2065 2064
2066 break; 2065 break;
2067 } 2066 }
2068 } 2067 }
… …
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2081
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2083 {
2085 scrollBar.state = STATE_IDLE; 2084 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2085 scrollBar.show (0);
2087 } 2086 }
2088 2087
2089#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2091#endif 2090#endif
… …
2174 } 2173 }
2175 else 2174 else
2176# endif 2175# endif
2177 { 2176 {
2178 scr_page (v, i); 2177 scr_page (v, i);
2179 scrollbar_show (1); 2178 scrollBar.show (1);
2180 } 2179 }
2181 } 2180 }
2182 break; 2181 break;
2183#endif 2182#endif
2184 } 2183 }
2185 } 2184 }
2186} 2185}
2187 2186
2188/*}}} */ 2187/*}}} */
2189 2188
2190bool 2189void
2191rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2192{ 2191{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2196 2194
2197 for (;;) 2195 for (;;)
2198 { 2196 {
2199 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2200 { 2198 {
2201 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2200 ch = next_char ();
2203 2201
2204 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2205 break; 2203 break;
2206 } 2204 }
2207 2205
2208 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2207 {
2210 if (!seen_input) 2208 if (expect_false (!seen_input))
2211 { 2209 {
2212 seen_input = 1; 2210 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2211 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2212 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2213 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2226 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2228
2231 for (;;) 2229 for (;;)
2232 { 2230 {
2233 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2232 break;
2235 2233
2236 *str++ = ch; 2234 *str++ = ch;
2237 2235
2238 if (ch == C0_LF || str >= eol) 2236 if (expect_false (ch == C0_LF || str >= eol))
2239 { 2237 {
2240 if (ch == C0_LF) 2238 if (ch == C0_LF)
2241 nlines++; 2239 nlines++;
2242 2240
2243 refresh_count++; 2241 refresh_count++;
… …
2292 * What the heck we'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2291 * if skipScroll is enabled.
2294 */ 2292 */
2295 if (refreshnow) 2293 if (refreshnow)
2296 { 2294 {
2297 flag = true;
2298 scr_refresh (); 2295 scr_refresh ();
2299 want_refresh = 1; 2296 want_refresh = 1;
2300 } 2297 }
2301
2302 } 2298 }
2303 else 2299 else
2304 { 2300 {
2305 try 2301 try
2306 { 2302 {
… …
2314 } 2310 }
2315 2311
2316 ch = NOCHAR; 2312 ch = NOCHAR;
2317 } 2313 }
2318 } 2314 }
2319
2320 return flag;
2321} 2315}
2322 2316
2323// read the next character 2317// read the next character
2324wchar_t 2318wchar_t
2325rxvt_term::next_char () NOTHROW 2319rxvt_term::next_char () NOTHROW
2326{ 2320{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2322 {
2329 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2332 2326
2333 wchar_t wc; 2327 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2329
… …
2339 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2334 break;
2341 } 2335 }
2342 2336
2343 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2344 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 }
2345 2342
2346 // assume wchar == unicode 2343 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2345 return wc & UNICODE_MASK;
2349 } 2346 }
… …
2393/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2395FILE * 2392FILE *
2396rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2397{ 2394{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2396
2400 if (stream == NULL) 2397 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2399
2403 return stream; 2400 return stream;
… …
2414 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2415 */ 2412 */
2416void 2413void
2417rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2418{ 2415{
2419 int done; 2416 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2417
2422 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2423 return; 2419 return;
2424 2420
2425 /* 2421 /*
2426 * Send all input to the printer until either ESC[4i or ESC[?4i 2422 * Send all input to the printer until either ESC[4i or ESC[?4i
2427 * is received. 2423 * is received.
2428 */ 2424 */
2429 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2430 { 2426 {
2431 unsigned char buf[8]; 2427 unsigned char buf[8];
2432 unicode_t ch; 2428 unicode_t ch;
2433 unsigned int i, len; 2429 unsigned int i, len;
2434 2430
… …
2579 break; 2575 break;
2580 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2578 break;
2583 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
2585 break; 2581 break;
2586 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
2588 /* unimplemented */ 2584 /* unimplemented */
2589 break; 2585 break;
… …
2643 scr_forwardindex (); 2639 scr_forwardindex ();
2644 break; 2640 break;
2645#endif 2641#endif
2646 case '=': 2642 case '=':
2647 case '>': 2643 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2645 break;
2650 2646
2651 case C1_40: 2647 case C1_40:
2652 cmd_getc (); 2648 cmd_getc ();
2653 break; 2649 break;
… …
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2689 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2691 break; /* steal obsolete ESC [ c */
2696 2692
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2694 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2695 process_csi_seq ();
2700 break; 2696 break;
2701 2697
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2698 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2699 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2700 process_osc_seq ();
2705 break; 2701 break;
2706 2702
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2704 case 'c':
2709 mbstate.reset (); 2705 mbstate.reset ();
2710 scr_poweron (); 2706 scr_poweron ();
2711 scrollbar_show (1); 2707 scrollBar.show (1);
2712 break; 2708 break;
2713 2709
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2711 case 'n':
2716 scr_charset_choose (2); 2712 scr_charset_choose (2);
… …
2767 2763
2768 nargs = 0; 2764 nargs = 0;
2769 2765
2770 priv = 0; 2766 priv = 0;
2771 ch = cmd_getc (); 2767 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2768 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2769 {
2774 /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2771 priv = ch;
2776 ch = cmd_getc (); 2772 ch = cmd_getc ();
2777 } 2773 }
2778 2774
2779 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
2833 2829
2834 case '?': 2830 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2833 break;
2834
2835 case '!':
2836 if (ch == CSI_70)
2837 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset ();
2840
2841 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2843
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2838 } 2846 }
2847 break;
2848 }
2849
2839 return; 2850 return;
2840 } 2851 }
2841 2852
2842 switch (ch) 2853 switch (ch)
2843 { 2854 {
… …
3389 break; 3400 break;
3390 case URxvt_Color_IT: 3401 case URxvt_Color_IT:
3391 process_color_seq (op, Color_IT, str, resp); 3402 process_color_seq (op, Color_IT, str, resp);
3392 break; 3403 break;
3393#endif 3404#endif
3405 case URxvt_Color_border:
3406 process_color_seq (op, Color_border, str, resp);
3407 break;
3394#if ENABLE_TRANSPARENCY 3408#if ENABLE_TRANSPARENCY
3395 case URxvt_Color_tint: 3409 case URxvt_Color_tint:
3396 process_color_seq (op, Color_tint, str, resp); 3410 process_color_seq (op, Color_tint, str, resp);
3397 { 3411 {
3398 bool changed = false; 3412 bool changed = false;
… …
3522 break; 3536 break;
3523#endif 3537#endif
3524 3538
3525#if ENABLE_PERL 3539#if ENABLE_PERL
3526 case URxvt_perl: 3540 case URxvt_perl:
3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3541 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3528 ; // no responses yet
3529 break; 3542 break;
3530#endif 3543#endif
3531 } 3544 }
3532} 3545}
3533/*----------------------------------------------------------------------*/ 3546/*----------------------------------------------------------------------*/
… …
3556 { 3569 {
3557 if (mode == 'r') 3570 if (mode == 'r')
3558 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3571 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559 else 3572 else
3560 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3573 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561 PrivMode (state, bit); 3574 set_privmode (bit, state);
3562 } 3575 }
3563 3576
3564 return state; 3577 return state;
3565} 3578}
3566 3579
… …
3574 static const struct 3587 static const struct
3575 { 3588 {
3576 const int argval; 3589 const int argval;
3577 const unsigned long bit; 3590 const unsigned long bit;
3578 } argtopriv[] = { 3591 } argtopriv[] = {
3579 { 1, PrivMode_aplCUR }, 3592 { 1, PrivMode_aplCUR }, // DECCKM
3580 { 2, PrivMode_vt52 }, 3593 { 2, PrivMode_vt52 },
3581 { 3, PrivMode_132 }, 3594 { 3, PrivMode_132 }, // DECCOLM
3582 { 4, PrivMode_smoothScroll }, 3595 { 4, PrivMode_smoothScroll }, // DECSCLM
3583 { 5, PrivMode_rVideo }, 3596 { 5, PrivMode_rVideo }, // DECSCNM
3584 { 6, PrivMode_relOrigin }, 3597 { 6, PrivMode_relOrigin }, // DECOM
3585 { 7, PrivMode_Autowrap }, 3598 { 7, PrivMode_Autowrap }, // DECAWM
3586 // 8, bi-directional support mode 3599 // 8, auto-repeat keys // DECARM
3587 { 9, PrivMode_MouseX10 }, 3600 { 9, PrivMode_MouseX10 },
3588 // 18, 19 printing-related 3601 // 18 end FF to printer after print screen
3602 // 19 Print screen prints full screen/scorll region
3589 { 25, PrivMode_VisibleCursor }, 3603 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3590#ifdef scrollBar_esc 3604#ifdef scrollBar_esc
3591 { scrollBar_esc, PrivMode_scrollBar }, 3605 { scrollBar_esc, PrivMode_scrollBar },
3592#endif 3606#endif
3593 { 35, PrivMode_ShiftKeys }, // rxvt extension 3607 { 35, PrivMode_ShiftKeys }, // rxvt extension
3608 // 38, tektronix mode // DECTEK
3594 { 40, PrivMode_132OK }, 3609 { 40, PrivMode_132OK },
3595 // 41 xterm more fixes NYI 3610 // 41 xterm more fixes NYI
3596 // 45 margin bell NYI 3611 // 45 margin bell NYI
3597 // 46 start logging 3612 // 46 start logging
3598 { 47, PrivMode_Screen }, 3613 { 47, PrivMode_Screen },
3599 { 66, PrivMode_aplKP }, 3614 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3600#ifndef NO_BACKSPACE_KEY 3615#ifndef NO_BACKSPACE_KEY
3601 { 67, PrivMode_BackSpace }, 3616 { 67, PrivMode_BackSpace }, // DECBKM
3602#endif 3617#endif
3603 { 1000, PrivMode_MouseX11 }, 3618 { 1000, PrivMode_MouseX11 },
3604 { 1002, PrivMode_MouseBtnEvent }, 3619 { 1002, PrivMode_MouseBtnEvent },
3605 { 1003, PrivMode_MouseAnyEvent }, 3620 { 1003, PrivMode_MouseAnyEvent },
3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3621 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3664 case 2: /* VT52 mode */ 3679 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3680 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3681 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3682 * within VT52 mode
3668 */ 3683 */
3669 PrivMode (1, PrivMode_vt52); 3684 set_privmode (PrivMode_vt52, 1);
3670 break; 3685 break;
3671 case 3: /* 80/132 */ 3686 case 3: /* 80/132 */
3672 if (priv_modes & PrivMode_132OK) 3687 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3688 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3676 }
3677 break; 3689 break;
3678 case 4: /* smooth scrolling */ 3690 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3691 set_option (Opt_jumpScroll, !state);
3680 break; 3692 break;
3681 case 5: /* reverse video */ 3693 case 5: /* reverse video */
… …
3692 if (state) /* orthogonal */ 3704 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3705 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3706 break;
3695#ifdef scrollBar_esc 3707#ifdef scrollBar_esc
3696 case scrollBar_esc: 3708 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3709 if (scrollBar.map (state))
3698 { 3710 {
3699 resize_all_windows (0, 0, 0); 3711 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3712 scr_touch (true);
3701 } 3713 }
3702 break; 3714 break;
… …
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3735 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask; 3736 vt_emask_mouse = PointerMotionMask;
3725 } 3737 }
3726 else 3738 else
3727 vt_emask_mouse = NoEventMask; 3739 vt_emask_mouse = NoEventMask;
3740
3728 vt_select_input (); 3741 vt_select_input ();
3729 break; 3742 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3743 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3744 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3745 break;
… …
3735 break; 3748 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3749 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3750 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3751 if (current_screen != PRIMARY)
3739 scr_erase_screen (2); 3752 scr_erase_screen (2);
3753
3740 scr_change_screen (state); 3754 scr_change_screen (state);
3741 break; 3755 break;
3742 case 1049: /* secondary screen w/ clearing first */ 3756 case 1049: /* secondary screen w/ clearing first */
3743 scr_change_screen (state); 3757 scr_change_screen (state);
3744 if (option (Opt_secondaryScreen)) 3758 if (option (Opt_secondaryScreen))

Diff Legend

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