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.394 by ayin, Sat Jan 19 15:00:49 2008 UTC vs.
Revision 1.429 by root, Wed Nov 5 16:21:18 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
… …
1090 1072
1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1092void 1074void
1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1094{ 1076{
1095 if ((scrollbar_isUp () || scrollbar_isDn ()) 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1096 && scr_page (scrollbar_isUp () ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1097 { 1079 {
1098 want_refresh = 1; 1080 want_refresh = 1;
1099 refresh_check (); 1081 refresh_check ();
1100 } 1082 }
1101 else 1083 else
… …
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
… …
1206{ 1191{
1207 make_current (); 1192 make_current ();
1208 1193
1209 if (revents & ev::READ) 1194 if (revents & ev::READ)
1210 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1211 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1212 if (cmd_parse ()) 1197 cmd_parse ();
1213 break;
1214 1198
1215 if (revents & ev::WRITE) 1199 if (revents & ev::WRITE)
1216 pty_write (); 1200 pty_write ();
1217 1201
1218 refresh_check (); 1202 refresh_check ();
… …
1438 && ev.xfocus.mode != NotifyGrab) 1422 && ev.xfocus.mode != NotifyGrab)
1439 focus_out (); 1423 focus_out ();
1440 break; 1424 break;
1441 1425
1442 case ConfigureNotify: 1426 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */ 1429 szHint.width, szHint.height);*/
1446 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1447 { 1431 {
1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1449 ; 1433 ;
1450 1434
… …
1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1554 ; 1538 ;
1555 1539
1556 if (scrollBar.state && ev.xany.window == scrollBar.win) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1557 { 1541 {
1558 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1559 scrollbar_show (0); 1543 scrollBar.show (0);
1560 } 1544 }
1561 } 1545 }
1562 break; 1546 break;
1563 1547
1564 case MotionNotify: 1548 case MotionNotify:
… …
1651#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1652 } 1636 }
1653#endif 1637#endif
1654 } 1638 }
1655 } 1639 }
1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1657 { 1641 {
1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1659 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1660 ; 1644 ;
1661 1645
… …
1663 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1664 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1665 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1666 &unused_mask); 1650 &unused_mask);
1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1668 scrollbar_size ()); 1652 scrollBar.size ());
1669 want_refresh = 1; 1653 want_refresh = 1;
1670 scrollbar_show (1); 1654 scrollBar.show (1);
1671 } 1655 }
1672 break; 1656 break;
1673 } 1657 }
1674 1658
1675#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
… …
1701 1685
1702 refresh_check (); 1686 refresh_check ();
1703} 1687}
1704 1688
1705void 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
1706rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1707{ 1705{
1708 if (!focus) 1706 if (!focus)
1709 { 1707 {
1710 focus = 1; 1708 focus = 1;
1711 want_refresh = 1; 1709 want_refresh = 1;
1712
1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1710
1715#if USE_XIM 1711#if USE_XIM
1716 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1717 { 1713 {
1718 IMSetPosition (); 1714 IMSetPosition ();
… …
1730 scr_recolour (); 1726 scr_recolour ();
1731 } 1727 }
1732#endif 1728#endif
1733#if ENABLE_FRILLS 1729#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell)) 1730 if (option (Opt_urgentOnBell))
1735 { 1731 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 1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1735 }
1744} 1736}
1745 1737
1746void 1738void
1747rxvt_term::focus_out () 1739rxvt_term::focus_out ()
… …
1749 if (focus) 1741 if (focus)
1750 { 1742 {
1751 focus = 0; 1743 focus = 0;
1752 want_refresh = 1; 1744 want_refresh = 1;
1753 1745
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746#if ENABLE_FRILLS
1755 1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1756#if ENABLE_FRILLS || ISO_14755 1750#if ENABLE_FRILLS || ISO_14755
1757 if (iso14755buf) 1751 if (iso14755buf)
1758 { 1752 {
1759 iso14755buf = 0; 1753 iso14755buf = 0;
1760# if ISO_14755 1754# if ISO_14755
… …
1777 { 1771 {
1778 pix_colors = pix_colors_unfocused; 1772 pix_colors = pix_colors_unfocused;
1779 scr_recolour (); 1773 scr_recolour ();
1780 } 1774 }
1781#endif 1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1782 } 1778 }
1783} 1779}
1784 1780
1785void 1781void
1786rxvt_term::update_fade_color (unsigned int idx) 1782rxvt_term::update_fade_color (unsigned int idx)
… …
1947 /* 1943 /*
1948 * Scrollbar window processing of button press 1944 * Scrollbar window processing of button press
1949 */ 1945 */
1950 if (scrollBar.state && ev.window == scrollBar.win) 1946 if (scrollBar.state && ev.window == scrollBar.win)
1951 { 1947 {
1952 scrollBar.setIdle (); 1948 page_dirn direction = NO_DIR;
1949
1950 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */
1954
1955 scrollBar.state = STATE_IDLE;
1953 /* 1956 /*
1954 * Rxvt-style scrollbar: 1957 * Rxvt-style scrollbar:
1955 * move up if mouse is above slider 1958 * move up if mouse is above slider
1956 * move dn if mouse is below slider 1959 * move dn if mouse is below slider
1957 * 1960 *
… …
1966 /* 1969 /*
1967 * Mouse report disabled scrollbar: 1970 * Mouse report disabled scrollbar:
1968 * arrow buttons - send up/down 1971 * arrow buttons - send up/down
1969 * click on scrollbar - send pageup/down 1972 * click on scrollbar - send pageup/down
1970 */ 1973 */
1971 if ((scrollBar.style == R_SB_NEXT 1974 if (direction == UP)
1972 && scrollbarnext_upButton (ev.y))
1973 || (scrollBar.style == R_SB_RXVT
1974 && scrollbarrxvt_upButton (ev.y)))
1975 tt_printf ("\033[A"); 1975 tt_printf ("\033[A");
1976 else if ((scrollBar.style == R_SB_NEXT 1976 else if (direction == DN)
1977 && scrollbarnext_dnButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_dnButton (ev.y)))
1980 tt_printf ("\033[B"); 1977 tt_printf ("\033[B");
1981 else 1978 else
1982 switch (ev.button) 1979 switch (ev.button)
1983 { 1980 {
1984 case Button2: 1981 case Button2:
… …
1992 break; 1989 break;
1993 } 1990 }
1994 } 1991 }
1995 else 1992 else
1996#endif /* NO_SCROLLBAR_REPORT */ 1993#endif /* NO_SCROLLBAR_REPORT */
1997
1998 {
1999 char upordown = 0;
2000
2001 if (scrollBar.style == R_SB_NEXT)
2002 { 1994 {
2003 if (scrollbarnext_upButton (ev.y)) 1995 if (direction != NO_DIR)
2004 upordown = -1; /* up */
2005 else if (scrollbarnext_dnButton (ev.y))
2006 upordown = 1; /* down */
2007 }
2008 else if (scrollBar.style == R_SB_RXVT)
2009 {
2010 if (scrollbarrxvt_upButton (ev.y))
2011 upordown = -1; /* up */
2012 else if (scrollbarrxvt_dnButton (ev.y))
2013 upordown = 1; /* down */
2014 }
2015
2016 if (upordown)
2017 { 1996 {
2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ()) 1998 if (!cont_scroll_ev.is_active ())
2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2021#endif 2000#endif
2022 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (direction, 1))
2023 { 2002 {
2024 if (upordown < 0) 2003 if (direction == UP)
2025 scrollBar.setUp (); 2004 scrollBar.state = STATE_UP;
2026 else 2005 else
2027 scrollBar.setDn (); 2006 scrollBar.state = STATE_DOWN;
2028 } 2007 }
2029 } 2008 }
2030 else 2009 else
2031 switch (ev.button) 2010 switch (ev.button)
2032 { 2011 {
… …
2045 } 2024 }
2046 2025
2047 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
2048 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
2049 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
2050 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2051 2030
2052 scrollBar.setMotion (); 2031 scrollBar.state = STATE_MOTION;
2053 break; 2032 break;
2054 2033
2055 case Button1: 2034 case Button1:
2056 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2057 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
… …
2071 scr_page (DN, nrow - 1); 2050 scr_page (DN, nrow - 1);
2072# else 2051# else
2073 scr_page (DN, nrow / 4); 2052 scr_page (DN, nrow / 4);
2074# endif 2053# endif
2075 else 2054 else
2076 scrollBar.setMotion (); 2055 scrollBar.state = STATE_MOTION;
2077 } 2056 }
2078 else 2057 else
2079 { 2058 {
2080 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
2081 (nrow 2060 (nrow
2082 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
2083 / scrollbar_size ())); 2062 / scrollBar.size ()));
2084 } 2063 }
2085 2064
2086 break; 2065 break;
2087 } 2066 }
2088 } 2067 }
… …
2098 2077
2099 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
2100 if (!bypass_keystate) 2079 if (!bypass_keystate)
2101 reportmode = !! (priv_modes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
2102 2081
2103 if (scrollbar_isUpDn ()) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2104 { 2083 {
2105 scrollBar.setIdle (); 2084 scrollBar.state = STATE_IDLE;
2106 scrollbar_show (0); 2085 scrollBar.show (0);
2107 } 2086 }
2108 2087
2109#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2110 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2111#endif 2090#endif
… …
2194 } 2173 }
2195 else 2174 else
2196# endif 2175# endif
2197 { 2176 {
2198 scr_page (v, i); 2177 scr_page (v, i);
2199 scrollbar_show (1); 2178 scrollBar.show (1);
2200 } 2179 }
2201 } 2180 }
2202 break; 2181 break;
2203#endif 2182#endif
2204 } 2183 }
2205 } 2184 }
2206} 2185}
2207 2186
2208/*}}} */ 2187/*}}} */
2209 2188
2210bool 2189void
2211rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2212{ 2191{
2213 bool flag = false;
2214 wchar_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2216 2194
2217 for (;;) 2195 for (;;)
2218 { 2196 {
2219 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2220 { 2198 {
2221 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2222 ch = next_char (); 2200 ch = next_char ();
2223 2201
2224 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2225 break; 2203 break;
2226 } 2204 }
2227 2205
2228 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))
2229 { 2207 {
2230 if (!seen_input) 2208 if (expect_false (!seen_input))
2231 { 2209 {
2232 seen_input = 1; 2210 seen_input = 1;
2233 // many badly-written programs (e.g. jed) contain a race condition: 2211 // many badly-written programs (e.g. jed) contain a race condition:
2234 // they first read the screensize and then install a SIGWINCH handler. 2212 // they first read the screensize and then install a SIGWINCH handler.
2235 // some window managers resize the window early, and these programs 2213 // some window managers resize the window early, and these programs
… …
2248 wchar_t *str = buf; 2226 wchar_t *str = buf;
2249 wchar_t *eol = str + min (ncol, UBUFSIZ); 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2250 2228
2251 for (;;) 2229 for (;;)
2252 { 2230 {
2253 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)))
2254 break; 2232 break;
2255 2233
2256 *str++ = ch; 2234 *str++ = ch;
2257 2235
2258 if (ch == C0_LF || str >= eol) 2236 if (expect_false (ch == C0_LF || str >= eol))
2259 { 2237 {
2260 if (ch == C0_LF) 2238 if (ch == C0_LF)
2261 nlines++; 2239 nlines++;
2262 2240
2263 refresh_count++; 2241 refresh_count++;
… …
2312 * 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.
2313 * if skipScroll is enabled. 2291 * if skipScroll is enabled.
2314 */ 2292 */
2315 if (refreshnow) 2293 if (refreshnow)
2316 { 2294 {
2317 flag = true;
2318 scr_refresh (); 2295 scr_refresh ();
2319 want_refresh = 1; 2296 want_refresh = 1;
2320 } 2297 }
2321
2322 } 2298 }
2323 else 2299 else
2324 { 2300 {
2325 try 2301 try
2326 { 2302 {
… …
2334 } 2310 }
2335 2311
2336 ch = NOCHAR; 2312 ch = NOCHAR;
2337 } 2313 }
2338 } 2314 }
2339
2340 return flag;
2341} 2315}
2342 2316
2343// read the next character 2317// read the next character
2344wchar_t 2318wchar_t
2345rxvt_term::next_char () NOTHROW 2319rxvt_term::next_char () NOTHROW
2346{ 2320{
2347 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2348 { 2322 {
2349 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2351 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2352 2326
2353 wchar_t wc; 2327 wchar_t wc;
2354 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);
2355 2329
… …
2359 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2360 break; 2334 break;
2361 } 2335 }
2362 2336
2363 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2364 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 }
2365 2342
2366 // assume wchar == unicode 2343 // assume wchar == unicode
2367 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2368 return wc & UNICODE_MASK; 2345 return wc & UNICODE_MASK;
2369 } 2346 }
… …
2413/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2414#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2415FILE * 2392FILE *
2416rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2417{ 2394{
2418 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2419 2396
2420 if (stream == NULL) 2397 if (stream == NULL)
2421 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2422 2399
2423 return stream; 2400 return stream;
… …
2434 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2435 */ 2412 */
2436void 2413void
2437rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2438{ 2415{
2439 int done; 2416 FILE *fd = popen_printer ();
2440 FILE *fd;
2441 2417
2442 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2443 return; 2419 return;
2444 2420
2445 /* 2421 /*
2446 * 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
2447 * is received. 2423 * is received.
2448 */ 2424 */
2449 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2450 { 2426 {
2451 unsigned char buf[8]; 2427 unsigned char buf[8];
2452 unicode_t ch; 2428 unicode_t ch;
2453 unsigned int i, len; 2429 unsigned int i, len;
2454 2430
… …
2599 break; 2575 break;
2600 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2602 break; 2578 break;
2603 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
2604 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
2605 break; 2581 break;
2606 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
2607 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
2608 /* unimplemented */ 2584 /* unimplemented */
2609 break; 2585 break;
… …
2663 scr_forwardindex (); 2639 scr_forwardindex ();
2664 break; 2640 break;
2665#endif 2641#endif
2666 case '=': 2642 case '=':
2667 case '>': 2643 case '>':
2668 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
2669 break; 2645 break;
2670 2646
2671 case C1_40: 2647 case C1_40:
2672 cmd_getc (); 2648 cmd_getc ();
2673 break; 2649 break;
… …
2712 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2713 case C1_SCI: /* ESC Z */ 2689 case C1_SCI: /* ESC Z */
2714 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2715 break; /* steal obsolete ESC [ c */ 2691 break; /* steal obsolete ESC [ c */
2716 2692
2717 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2718 case C1_CSI: /* ESC [ */ 2694 case C1_CSI: /* ESC [ */
2719 process_csi_seq (); 2695 process_csi_seq ();
2720 break; 2696 break;
2721 2697
2722 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2698 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2723 case C1_OSC: /* ESC ] */ 2699 case C1_OSC: /* ESC ] */
2724 process_osc_seq (); 2700 process_osc_seq ();
2725 break; 2701 break;
2726 2702
2727 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2728 case 'c': 2704 case 'c':
2729 mbstate.reset (); 2705 mbstate.reset ();
2730 scr_poweron (); 2706 scr_poweron ();
2731 scrollbar_show (1); 2707 scrollBar.show (1);
2732 break; 2708 break;
2733 2709
2734 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2735 case 'n': 2711 case 'n':
2736 scr_charset_choose (2); 2712 scr_charset_choose (2);
… …
2787 2763
2788 nargs = 0; 2764 nargs = 0;
2789 2765
2790 priv = 0; 2766 priv = 0;
2791 ch = cmd_getc (); 2767 ch = cmd_getc ();
2792 if (ch >= '<' && ch <= '?') 2768 if ((ch >= '<' && ch <= '?') || ch == '!')
2793 { 2769 {
2794 /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' '!' */
2795 priv = ch; 2771 priv = ch;
2796 ch = cmd_getc (); 2772 ch = cmd_getc ();
2797 } 2773 }
2798 2774
2799 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
2848 // versions. 2824 // versions.
2849 // 2825 //
2850 tt_printf ("\033[>%d;95;0c", 'U'); 2826 tt_printf ("\033[>%d;95;0c", 'U');
2851 } 2827 }
2852 break; 2828 break;
2829
2853 case '?': 2830 case '?':
2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2855 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
2856 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);
2857 } 2846 }
2847 break;
2848 }
2849
2858 return; 2850 return;
2859 } 2851 }
2860 2852
2861 switch (ch) 2853 switch (ch)
2862 { 2854 {
… …
3408 break; 3400 break;
3409 case URxvt_Color_IT: 3401 case URxvt_Color_IT:
3410 process_color_seq (op, Color_IT, str, resp); 3402 process_color_seq (op, Color_IT, str, resp);
3411 break; 3403 break;
3412#endif 3404#endif
3405 case URxvt_Color_border:
3406 process_color_seq (op, Color_border, str, resp);
3407 break;
3413#if ENABLE_TRANSPARENCY 3408#if ENABLE_TRANSPARENCY
3414 case URxvt_Color_tint: 3409 case URxvt_Color_tint:
3415 process_color_seq (op, Color_tint, str, resp); 3410 process_color_seq (op, Color_tint, str, resp);
3416 { 3411 {
3417 bool changed = false; 3412 bool changed = false;
… …
3541 break; 3536 break;
3542#endif 3537#endif
3543 3538
3544#if ENABLE_PERL 3539#if ENABLE_PERL
3545 case URxvt_perl: 3540 case URxvt_perl:
3546 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));
3547 ; // no responses yet
3548 break; 3542 break;
3549#endif 3543#endif
3550 } 3544 }
3551} 3545}
3552/*----------------------------------------------------------------------*/ 3546/*----------------------------------------------------------------------*/
… …
3575 { 3569 {
3576 if (mode == 'r') 3570 if (mode == 'r')
3577 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3571 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3578 else 3572 else
3579 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3573 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3580 PrivMode (state, bit); 3574 set_privmode (bit, state);
3581 } 3575 }
3582 3576
3583 return state; 3577 return state;
3584} 3578}
3585 3579
… …
3593 static const struct 3587 static const struct
3594 { 3588 {
3595 const int argval; 3589 const int argval;
3596 const unsigned long bit; 3590 const unsigned long bit;
3597 } argtopriv[] = { 3591 } argtopriv[] = {
3598 { 1, PrivMode_aplCUR }, 3592 { 1, PrivMode_aplCUR }, // DECCKM
3599 { 2, PrivMode_vt52 }, 3593 { 2, PrivMode_vt52 },
3600 { 3, PrivMode_132 }, 3594 { 3, PrivMode_132 }, // DECCOLM
3601 { 4, PrivMode_smoothScroll }, 3595 { 4, PrivMode_smoothScroll }, // DECSCLM
3602 { 5, PrivMode_rVideo }, 3596 { 5, PrivMode_rVideo }, // DECSCNM
3603 { 6, PrivMode_relOrigin }, 3597 { 6, PrivMode_relOrigin }, // DECOM
3604 { 7, PrivMode_Autowrap }, 3598 { 7, PrivMode_Autowrap }, // DECAWM
3605 // 8, bi-directional support mode 3599 // 8, auto-repeat keys // DECARM
3606 { 9, PrivMode_MouseX10 }, 3600 { 9, PrivMode_MouseX10 },
3607 // 18, 19 printing-related 3601 // 18 end FF to printer after print screen
3602 // 19 Print screen prints full screen/scorll region
3608 { 25, PrivMode_VisibleCursor }, 3603 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3609#ifdef scrollBar_esc 3604#ifdef scrollBar_esc
3610 { scrollBar_esc, PrivMode_scrollBar }, 3605 { scrollBar_esc, PrivMode_scrollBar },
3611#endif 3606#endif
3612 { 35, PrivMode_ShiftKeys }, // rxvt extension 3607 { 35, PrivMode_ShiftKeys }, // rxvt extension
3608 // 38, tektronix mode // DECTEK
3613 { 40, PrivMode_132OK }, 3609 { 40, PrivMode_132OK },
3614 // 41 xterm more fixes NYI 3610 // 41 xterm more fixes NYI
3615 // 45 margin bell NYI 3611 // 45 margin bell NYI
3616 // 46 start logging 3612 // 46 start logging
3617 { 47, PrivMode_Screen }, 3613 { 47, PrivMode_Screen },
3618 { 66, PrivMode_aplKP }, 3614 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3619#ifndef NO_BACKSPACE_KEY 3615#ifndef NO_BACKSPACE_KEY
3620 { 67, PrivMode_BackSpace }, 3616 { 67, PrivMode_BackSpace }, // DECBKM
3621#endif 3617#endif
3622 { 1000, PrivMode_MouseX11 }, 3618 { 1000, PrivMode_MouseX11 },
3623 { 1002, PrivMode_MouseBtnEvent }, 3619 { 1002, PrivMode_MouseBtnEvent },
3624 { 1003, PrivMode_MouseAnyEvent }, 3620 { 1003, PrivMode_MouseAnyEvent },
3625 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3621 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3629 // 1037 send DEL for keypad delete NYI 3625 // 1037 send DEL for keypad delete NYI
3630 { 1047, PrivMode_Screen }, 3626 { 1047, PrivMode_Screen },
3631 // 1048 save and restore cursor 3627 // 1048 save and restore cursor
3632 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3628 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3633 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3629 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3630 { 2004, PrivMode_BracketPaste },
3634 }; 3631 };
3635 3632
3636 if (nargs == 0) 3633 if (nargs == 0)
3637 return; 3634 return;
3638 3635
… …
3663 3660
3664 scr_touch (true); 3661 scr_touch (true);
3665 break; 3662 break;
3666#endif 3663#endif
3667 case 1048: /* alternative cursor save */ 3664 case 1048: /* alternative cursor save */
3668 case 1049:
3669 if (option (Opt_secondaryScreen)) 3665 if (option (Opt_secondaryScreen))
3670 if (mode == 0) 3666 if (mode == 0)
3671 scr_cursor (RESTORE); 3667 scr_cursor (RESTORE);
3672 else if (mode == 1) 3668 else if (mode == 1)
3673 scr_cursor (SAVE); 3669 scr_cursor (SAVE);
… …
3682 case 2: /* VT52 mode */ 3678 case 2: /* VT52 mode */
3683 /* oddball mode. should be set regardless of set/reset 3679 /* oddball mode. should be set regardless of set/reset
3684 * parameter. Return from VT52 mode with an ESC < from 3680 * parameter. Return from VT52 mode with an ESC < from
3685 * within VT52 mode 3681 * within VT52 mode
3686 */ 3682 */
3687 PrivMode (1, PrivMode_vt52); 3683 set_privmode (PrivMode_vt52, 1);
3688 break; 3684 break;
3689 case 3: /* 80/132 */ 3685 case 3: /* 80/132 */
3690 if (priv_modes & PrivMode_132OK) 3686 if (priv_modes & PrivMode_132OK)
3691 {
3692 scr_poweron ();
3693 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3687 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3694 }
3695 break; 3688 break;
3696 case 4: /* smooth scrolling */ 3689 case 4: /* smooth scrolling */
3697 set_option (Opt_jumpScroll, !state); 3690 set_option (Opt_jumpScroll, !state);
3698 break; 3691 break;
3699 case 5: /* reverse video */ 3692 case 5: /* reverse video */
… …
3710 if (state) /* orthogonal */ 3703 if (state) /* orthogonal */
3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3704 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3712 break; 3705 break;
3713#ifdef scrollBar_esc 3706#ifdef scrollBar_esc
3714 case scrollBar_esc: 3707 case scrollBar_esc:
3715 if (scrollbar_mapping (state)) 3708 if (scrollBar.map (state))
3716 { 3709 {
3717 resize_all_windows (0, 0, 0); 3710 resize_all_windows (0, 0, 0);
3718 scr_touch (true); 3711 scr_touch (true);
3719 } 3712 }
3720 break; 3713 break;
… …
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3734 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3742 vt_emask_mouse = PointerMotionMask; 3735 vt_emask_mouse = PointerMotionMask;
3743 } 3736 }
3744 else 3737 else
3745 vt_emask_mouse = NoEventMask; 3738 vt_emask_mouse = NoEventMask;
3739
3746 vt_select_input (); 3740 vt_select_input ();
3747 break; 3741 break;
3748 case 1010: /* scroll to bottom on TTY output inhibit */ 3742 case 1010: /* scroll to bottom on TTY output inhibit */
3749 set_option (Opt_scrollTtyOutput, !state); 3743 set_option (Opt_scrollTtyOutput, !state);
3750 break; 3744 break;
3751 case 1011: /* scroll to bottom on key press */ 3745 case 1011: /* scroll to bottom on key press */
3752 set_option (Opt_scrollTtyKeypress, state); 3746 set_option (Opt_scrollTtyKeypress, state);
3753 break; 3747 break;
3754 case 1047: /* secondary screen w/ clearing last */ 3748 case 1047: /* secondary screen w/ clearing last */
3755 if (option (Opt_secondaryScreen)) 3749 if (option (Opt_secondaryScreen))
3756 if (current_screen != PRIMARY) 3750 if (!state)
3757 scr_erase_screen (2); 3751 scr_erase_screen (2);
3752
3758 scr_change_screen (state); 3753 scr_change_screen (state);
3759 break; 3754 break;
3760 case 1049: /* secondary screen w/ clearing first */ 3755 case 1049: /* secondary screen w/ clearing first */
3756 if (option (Opt_secondaryScreen))
3757 if (state)
3758 scr_cursor (SAVE);
3759
3761 scr_change_screen (state); 3760 scr_change_screen (state);
3761
3762 if (option (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
3763 if (current_screen != PRIMARY) 3763 if (state)
3764 scr_erase_screen (2); 3764 scr_erase_screen (2);
3765 else
3766 scr_cursor (RESTORE);
3765 break; 3767 break;
3766 default: 3768 default:
3767 break; 3769 break;
3768 } 3770 }
3769 } 3771 }

Diff Legend

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