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.389 by ayin, Mon Dec 31 13:50:56 2007 UTC vs.
Revision 1.431 by root, Tue Feb 24 11:51:51 2009 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
1079{ 1061{
1080 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1081 { 1063 {
1082 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1083 want_refresh = 1; 1065 want_refresh = 1;
1084 refresh_check (); 1066 refresh_check ();
1085 } 1067 }
1086 else 1068 else
1087 w.stop (); 1069 w.stop ();
1088} 1070}
1089#endif 1071#endif
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
1455 } 1439 }
1456 else 1440 else
1457 { 1441 {
1458#ifdef HAVE_BG_PIXMAP 1442#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ()) 1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1460 update_background (); 1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1461#endif 1450#endif
1462 } 1451 }
1463 1452
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 } 1454 }
1485 case SelectionRequest: 1474 case SelectionRequest:
1486 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1487 break; 1476 break;
1488 1477
1489 case MapNotify: 1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1490 mapped = 1; 1495 mapped = 1;
1491#ifdef TEXT_BLINK 1496#ifdef TEXT_BLINK
1492 text_blink_ev.start (); 1497 text_blink_ev.start ();
1493#endif 1498#endif
1494 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1532 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1533 ; 1538 ;
1534 1539
1535 if (scrollBar.state && ev.xany.window == scrollBar.win) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1536 { 1541 {
1537 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1538 scrollbar_show (0); 1543 scrollBar.show (0);
1539 } 1544 }
1540 } 1545 }
1541 break; 1546 break;
1542 1547
1543 case MotionNotify: 1548 case MotionNotify:
1630#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1631 } 1636 }
1632#endif 1637#endif
1633 } 1638 }
1634 } 1639 }
1635 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1636 { 1641 {
1637 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1638 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1639 ; 1644 ;
1640 1645
1642 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1643 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1644 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1645 &unused_mask); 1650 &unused_mask);
1646 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1647 scrollbar_size ()); 1652 scrollBar.size ());
1648 want_refresh = 1; 1653 want_refresh = 1;
1649 scrollbar_show (1); 1654 scrollBar.show (1);
1650 } 1655 }
1651 break; 1656 break;
1652 } 1657 }
1653 1658
1654#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
1679#endif 1684#endif
1680 1685
1681 refresh_check (); 1686 refresh_check ();
1682} 1687}
1683 1688
1689#if ENABLE_FRILLS
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#endif
1704
1684void 1705void
1685rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1686{ 1707{
1687 if (!focus) 1708 if (!focus)
1688 { 1709 {
1689 focus = 1; 1710 focus = 1;
1690 want_refresh = 1; 1711 want_refresh = 1;
1691
1692 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1693 1712
1694#if USE_XIM 1713#if USE_XIM
1695 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1696 { 1715 {
1697 IMSetPosition (); 1716 IMSetPosition ();
1709 scr_recolour (); 1728 scr_recolour ();
1710 } 1729 }
1711#endif 1730#endif
1712#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1713 if (option (Opt_urgentOnBell)) 1732 if (option (Opt_urgentOnBell))
1714 { 1733 set_urgency (0);
1715 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1716 {
1717 h->flags &= ~XUrgencyHint;
1718 XSetWMHints (dpy, parent[0], h);
1719 }
1720 }
1721#endif 1734#endif
1735
1736 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1722 } 1737 }
1723} 1738}
1724 1739
1725void 1740void
1726rxvt_term::focus_out () 1741rxvt_term::focus_out ()
1728 if (focus) 1743 if (focus)
1729 { 1744 {
1730 focus = 0; 1745 focus = 0;
1731 want_refresh = 1; 1746 want_refresh = 1;
1732 1747
1733 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1748#if ENABLE_FRILLS
1734 1749 if (option (Opt_urgentOnBell))
1750 set_urgency (0);
1751#endif
1735#if ENABLE_FRILLS || ISO_14755 1752#if ENABLE_FRILLS || ISO_14755
1736 if (iso14755buf) 1753 if (iso14755buf)
1737 { 1754 {
1738 iso14755buf = 0; 1755 iso14755buf = 0;
1739# if ISO_14755 1756# if ISO_14755
1756 { 1773 {
1757 pix_colors = pix_colors_unfocused; 1774 pix_colors = pix_colors_unfocused;
1758 scr_recolour (); 1775 scr_recolour ();
1759 } 1776 }
1760#endif 1777#endif
1778
1779 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761 } 1780 }
1762} 1781}
1763 1782
1764void 1783void
1765rxvt_term::update_fade_color (unsigned int idx) 1784rxvt_term::update_fade_color (unsigned int idx)
1926 /* 1945 /*
1927 * Scrollbar window processing of button press 1946 * Scrollbar window processing of button press
1928 */ 1947 */
1929 if (scrollBar.state && ev.window == scrollBar.win) 1948 if (scrollBar.state && ev.window == scrollBar.win)
1930 { 1949 {
1931 scrollBar.setIdle (); 1950 page_dirn direction = NO_DIR;
1951
1952 if (scrollBar.upButton (ev.y))
1953 direction = UP; /* up */
1954 else if (scrollBar.dnButton (ev.y))
1955 direction = DN; /* down */
1956
1957 scrollBar.state = STATE_IDLE;
1932 /* 1958 /*
1933 * Rxvt-style scrollbar: 1959 * Rxvt-style scrollbar:
1934 * move up if mouse is above slider 1960 * move up if mouse is above slider
1935 * move dn if mouse is below slider 1961 * move dn if mouse is below slider
1936 * 1962 *
1945 /* 1971 /*
1946 * Mouse report disabled scrollbar: 1972 * Mouse report disabled scrollbar:
1947 * arrow buttons - send up/down 1973 * arrow buttons - send up/down
1948 * click on scrollbar - send pageup/down 1974 * click on scrollbar - send pageup/down
1949 */ 1975 */
1950 if ((scrollBar.style == R_SB_NEXT 1976 if (direction == UP)
1951 && scrollbarnext_upButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_upButton (ev.y)))
1954 tt_printf ("\033[A"); 1977 tt_printf ("\033[A");
1955 else if ((scrollBar.style == R_SB_NEXT 1978 else if (direction == DN)
1956 && scrollbarnext_dnButton (ev.y))
1957 || (scrollBar.style == R_SB_RXVT
1958 && scrollbarrxvt_dnButton (ev.y)))
1959 tt_printf ("\033[B"); 1979 tt_printf ("\033[B");
1960 else 1980 else
1961 switch (ev.button) 1981 switch (ev.button)
1962 { 1982 {
1963 case Button2: 1983 case Button2:
1971 break; 1991 break;
1972 } 1992 }
1973 } 1993 }
1974 else 1994 else
1975#endif /* NO_SCROLLBAR_REPORT */ 1995#endif /* NO_SCROLLBAR_REPORT */
1976
1977 {
1978 char upordown = 0;
1979
1980 if (scrollBar.style == R_SB_NEXT)
1981 { 1996 {
1982 if (scrollbarnext_upButton (ev.y)) 1997 if (direction != NO_DIR)
1983 upordown = -1; /* up */
1984 else if (scrollbarnext_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 else if (scrollBar.style == R_SB_RXVT)
1988 {
1989 if (scrollbarrxvt_upButton (ev.y))
1990 upordown = -1; /* up */
1991 else if (scrollbarrxvt_dnButton (ev.y))
1992 upordown = 1; /* down */
1993 }
1994
1995 if (upordown)
1996 { 1998 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ()) 2000 if (!cont_scroll_ev.is_active ())
1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2001 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2000#endif 2002#endif
2001 if (scr_page (upordown < 0 ? UP : DN, 1)) 2003 if (scr_page (direction, 1))
2002 { 2004 {
2003 if (upordown < 0) 2005 if (direction == UP)
2004 scrollBar.setUp (); 2006 scrollBar.state = STATE_UP;
2005 else 2007 else
2006 scrollBar.setDn (); 2008 scrollBar.state = STATE_DOWN;
2007 } 2009 }
2008 } 2010 }
2009 else 2011 else
2010 switch (ev.button) 2012 switch (ev.button)
2011 { 2013 {
2024 } 2026 }
2025 2027
2026 if (scrollBar.style == R_SB_XTERM 2028 if (scrollBar.style == R_SB_XTERM
2027 || scrollbar_above_slider (ev.y) 2029 || scrollbar_above_slider (ev.y)
2028 || scrollbar_below_slider (ev.y)) 2030 || scrollbar_below_slider (ev.y))
2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2031 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2030 2032
2031 scrollBar.setMotion (); 2033 scrollBar.state = STATE_MOTION;
2032 break; 2034 break;
2033 2035
2034 case Button1: 2036 case Button1:
2035 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2037 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2036 csrO = ev.y - scrollBar.top; 2038 csrO = ev.y - scrollBar.top;
2050 scr_page (DN, nrow - 1); 2052 scr_page (DN, nrow - 1);
2051# else 2053# else
2052 scr_page (DN, nrow / 4); 2054 scr_page (DN, nrow / 4);
2053# endif 2055# endif
2054 else 2056 else
2055 scrollBar.setMotion (); 2057 scrollBar.state = STATE_MOTION;
2056 } 2058 }
2057 else 2059 else
2058 { 2060 {
2059 scr_page ((ev.button == Button1 ? DN : UP), 2061 scr_page ((ev.button == Button1 ? DN : UP),
2060 (nrow 2062 (nrow
2061 * scrollbar_position (ev.y) 2063 * scrollbar_position (ev.y)
2062 / scrollbar_size ())); 2064 / scrollBar.size ()));
2063 } 2065 }
2064 2066
2065 break; 2067 break;
2066 } 2068 }
2067 } 2069 }
2077 2079
2078 csrO = 0; /* reset csr Offset */ 2080 csrO = 0; /* reset csr Offset */
2079 if (!bypass_keystate) 2081 if (!bypass_keystate)
2080 reportmode = !! (priv_modes & PrivMode_mouse_report); 2082 reportmode = !! (priv_modes & PrivMode_mouse_report);
2081 2083
2082 if (scrollbar_isUpDn ()) 2084 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2083 { 2085 {
2084 scrollBar.setIdle (); 2086 scrollBar.state = STATE_IDLE;
2085 scrollbar_show (0); 2087 scrollBar.show (0);
2086 } 2088 }
2087 2089
2088#ifdef SELECTION_SCROLLING 2090#ifdef SELECTION_SCROLLING
2089 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
2090#endif 2092#endif
2170 2172
2171 if (!slip_wheel_ev.is_active ()) 2173 if (!slip_wheel_ev.is_active ())
2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2174 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2173 } 2175 }
2174 else 2176 else
2177# endif
2175 { 2178 {
2176# endif
2177 scr_page (v, i); 2179 scr_page (v, i);
2178 scrollbar_show (1); 2180 scrollBar.show (1);
2179# ifdef MOUSE_SLIP_WHEELING
2180 } 2181 }
2181# endif
2182 } 2182 }
2183 break; 2183 break;
2184#endif 2184#endif
2185 } 2185 }
2186 } 2186 }
2187} 2187}
2188 2188
2189/*}}} */ 2189/*}}} */
2190 2190
2191bool 2191void
2192rxvt_term::cmd_parse () 2192rxvt_term::cmd_parse ()
2193{ 2193{
2194 bool flag = false;
2195 wchar_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2196 char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2197 2196
2198 for (;;) 2197 for (;;)
2199 { 2198 {
2200 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2201 { 2200 {
2202 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2203 ch = next_char (); 2202 ch = next_char ();
2204 2203
2205 if (ch == NOCHAR) 2204 if (ch == NOCHAR)
2206 break; 2205 break;
2207 } 2206 }
2208 2207
2209 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))
2210 { 2209 {
2211 if (!seen_input) 2210 if (expect_false (!seen_input))
2212 { 2211 {
2213 seen_input = 1; 2212 seen_input = 1;
2214 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2215 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2216 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
2229 wchar_t *str = buf; 2228 wchar_t *str = buf;
2230 wchar_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2231 2230
2232 for (;;) 2231 for (;;)
2233 { 2232 {
2234 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)))
2235 break; 2234 break;
2236 2235
2237 *str++ = ch; 2236 *str++ = ch;
2238 2237
2239 if (ch == C0_LF || str >= eol) 2238 if (expect_false (ch == C0_LF || str >= eol))
2240 { 2239 {
2241 if (ch == C0_LF) 2240 if (ch == C0_LF)
2242 nlines++; 2241 nlines++;
2243 2242
2244 refresh_count++; 2243 refresh_count++;
2293 * What the heck we'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2294 * if skipScroll is enabled. 2293 * if skipScroll is enabled.
2295 */ 2294 */
2296 if (refreshnow) 2295 if (refreshnow)
2297 { 2296 {
2298 flag = true;
2299 scr_refresh (); 2297 scr_refresh ();
2300 want_refresh = 1; 2298 want_refresh = 1;
2301 } 2299 }
2302
2303 } 2300 }
2304 else 2301 else
2305 { 2302 {
2306 try 2303 try
2307 { 2304 {
2315 } 2312 }
2316 2313
2317 ch = NOCHAR; 2314 ch = NOCHAR;
2318 } 2315 }
2319 } 2316 }
2320
2321 return flag;
2322} 2317}
2323 2318
2324// read the next character 2319// read the next character
2325wchar_t 2320wchar_t
2326rxvt_term::next_char () NOTHROW 2321rxvt_term::next_char () NOTHROW
2327{ 2322{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2323 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2324 {
2330 // assume 7-bit to be ascii ALWAYS 2325 // assume 7-bit to be ascii ALWAYS
2331 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2326 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2332 return *cmdbuf_ptr++; 2327 return *cmdbuf_ptr++;
2333 2328
2334 wchar_t wc; 2329 wchar_t wc;
2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2330 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2336 2331
2340 cmdbuf_ptr = cmdbuf_endp; 2335 cmdbuf_ptr = cmdbuf_endp;
2341 break; 2336 break;
2342 } 2337 }
2343 2338
2344 if (len == (size_t)-1) 2339 if (len == (size_t)-1)
2340 {
2341 mbstate.reset (); // reset now undefined conversion state
2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2342 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2343 }
2346 2344
2347 // assume wchar == unicode 2345 // assume wchar == unicode
2348 cmdbuf_ptr += len; 2346 cmdbuf_ptr += len;
2349 return wc & UNICODE_MASK; 2347 return wc & UNICODE_MASK;
2350 } 2348 }
2394/*----------------------------------------------------------------------*/ 2392/*----------------------------------------------------------------------*/
2395#ifdef PRINTPIPE 2393#ifdef PRINTPIPE
2396FILE * 2394FILE *
2397rxvt_term::popen_printer () 2395rxvt_term::popen_printer ()
2398{ 2396{
2399 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2397 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2400 2398
2401 if (stream == NULL) 2399 if (stream == NULL)
2402 rxvt_warn ("can't open printer pipe, not printing.\n"); 2400 rxvt_warn ("can't open printer pipe, not printing.\n");
2403 2401
2404 return stream; 2402 return stream;
2415 * simulate attached vt100 printer 2413 * simulate attached vt100 printer
2416 */ 2414 */
2417void 2415void
2418rxvt_term::process_print_pipe () 2416rxvt_term::process_print_pipe ()
2419{ 2417{
2420 int done; 2418 FILE *fd = popen_printer ();
2421 FILE *fd;
2422 2419
2423 if ((fd = popen_printer ()) == NULL) 2420 if (!fd)
2424 return; 2421 return;
2425 2422
2426 /* 2423 /*
2427 * Send all input to the printer until either ESC[4i or ESC[?4i 2424 * Send all input to the printer until either ESC[4i or ESC[?4i
2428 * is received. 2425 * is received.
2429 */ 2426 */
2430 for (done = 0; !done;) 2427 for (int done = 0; !done; )
2431 { 2428 {
2432 unsigned char buf[8]; 2429 unsigned char buf[8];
2433 unicode_t ch; 2430 unicode_t ch;
2434 unsigned int i, len; 2431 unsigned int i, len;
2435 2432
2580 break; 2577 break;
2581 case 'Z': /* identify the terminal type */ 2578 case 'Z': /* identify the terminal type */
2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2579 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2583 break; 2580 break;
2584 case '<': /* turn off VT52 mode */ 2581 case '<': /* turn off VT52 mode */
2585 PrivMode (0, PrivMode_vt52); 2582 set_privmode (PrivMode_vt52, 0);
2586 break; 2583 break;
2587 case 'F': /* use special graphics character set */ 2584 case 'F': /* use special graphics character set */
2588 case 'G': /* use regular character set */ 2585 case 'G': /* use regular character set */
2589 /* unimplemented */ 2586 /* unimplemented */
2590 break; 2587 break;
2644 scr_forwardindex (); 2641 scr_forwardindex ();
2645 break; 2642 break;
2646#endif 2643#endif
2647 case '=': 2644 case '=':
2648 case '>': 2645 case '>':
2649 PrivMode ((ch == '='), PrivMode_aplKP); 2646 set_privmode (PrivMode_aplKP, ch == '=');
2650 break; 2647 break;
2651 2648
2652 case C1_40: 2649 case C1_40:
2653 cmd_getc (); 2650 cmd_getc ();
2654 break; 2651 break;
2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2690 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2694 case C1_SCI: /* ESC Z */ 2691 case C1_SCI: /* ESC Z */
2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2692 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2696 break; /* steal obsolete ESC [ c */ 2693 break; /* steal obsolete ESC [ c */
2697 2694
2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2695 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2699 case C1_CSI: /* ESC [ */ 2696 case C1_CSI: /* ESC [ */
2700 process_csi_seq (); 2697 process_csi_seq ();
2701 break; 2698 break;
2702 2699
2703 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2700 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2704 case C1_OSC: /* ESC ] */ 2701 case C1_OSC: /* ESC ] */
2705 process_osc_seq (); 2702 process_osc_seq ();
2706 break; 2703 break;
2707 2704
2708 /* 8.3.106: RESET TO INITIAL STATE */ 2705 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2709 case 'c': 2706 case 'c':
2710 mbstate.reset (); 2707 mbstate.reset ();
2711 scr_poweron (); 2708 scr_poweron ();
2712 scrollbar_show (1); 2709 scrollBar.show (1);
2713 break; 2710 break;
2714 2711
2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2712 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2716 case 'n': 2713 case 'n':
2717 scr_charset_choose (2); 2714 scr_charset_choose (2);
2768 2765
2769 nargs = 0; 2766 nargs = 0;
2770 2767
2771 priv = 0; 2768 priv = 0;
2772 ch = cmd_getc (); 2769 ch = cmd_getc ();
2773 if (ch >= '<' && ch <= '?') 2770 if ((ch >= '<' && ch <= '?') || ch == '!')
2774 { 2771 {
2775 /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' '!' */
2776 priv = ch; 2773 priv = ch;
2777 ch = cmd_getc (); 2774 ch = cmd_getc ();
2778 } 2775 }
2779 2776
2780 /* read any numerical arguments */ 2777 /* read any numerical arguments */
2829 // versions. 2826 // versions.
2830 // 2827 //
2831 tt_printf ("\033[>%d;95;0c", 'U'); 2828 tt_printf ("\033[>%d;95;0c", 'U');
2832 } 2829 }
2833 break; 2830 break;
2831
2834 case '?': 2832 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2833 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2834 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2835 break;
2836
2837 case '!':
2838 if (ch == CSI_70)
2839 {
2840 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2841 scr_soft_reset ();
2842
2843 static const int pm_h[] = { 7, 25 };
2844 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2845
2846 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2847 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2838 } 2848 }
2849 break;
2850 }
2851
2839 return; 2852 return;
2840 } 2853 }
2841 2854
2842 switch (ch) 2855 switch (ch)
2843 { 2856 {
3354 *buf++ = '\0'; 3367 *buf++ = '\0';
3355 3368
3356 process_color_seq (op, color, name, resp); 3369 process_color_seq (op, color, name, resp);
3357 } 3370 }
3358 break; 3371 break;
3372 case Rxvt_restoreFG:
3359 case XTerm_Color00: 3373 case XTerm_Color00:
3360 process_color_seq (op, Color_fg, str, resp); 3374 process_color_seq (op, Color_fg, str, resp);
3361 break; 3375 break;
3376 case Rxvt_restoreBG:
3362 case XTerm_Color01: 3377 case XTerm_Color01:
3363 process_color_seq (op, Color_bg, str, resp); 3378 process_color_seq (op, Color_bg, str, resp);
3364 break; 3379 break;
3365#ifndef NO_CURSORCOLOR 3380#ifndef NO_CURSORCOLOR
3366 case XTerm_Color_cursor: 3381 case XTerm_Color_cursor:
3387 break; 3402 break;
3388 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3389 process_color_seq (op, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3390 break; 3405 break;
3391#endif 3406#endif
3407 case URxvt_Color_border:
3408 process_color_seq (op, Color_border, str, resp);
3409 break;
3392#if ENABLE_TRANSPARENCY 3410#if ENABLE_TRANSPARENCY
3393 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3394 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3395 { 3413 {
3396 bool changed = false; 3414 bool changed = false;
3445 update_background (); 3463 update_background ();
3446 } 3464 }
3447 break; 3465 break;
3448#endif 3466#endif
3449 3467
3450 case Rxvt_restoreFG:
3451 set_window_color (Color_fg, str);
3452 break;
3453 case Rxvt_restoreBG:
3454 set_window_color (Color_bg, str);
3455 break;
3456
3457 case XTerm_logfile: 3468 case XTerm_logfile:
3458 // TODO, when secure mode? 3469 // TODO, when secure mode?
3459 break; 3470 break;
3460 3471
3461#if 0 3472#if 0
3527 break; 3538 break;
3528#endif 3539#endif
3529 3540
3530#if ENABLE_PERL 3541#if ENABLE_PERL
3531 case URxvt_perl: 3542 case URxvt_perl:
3532 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3543 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3533 ; // no responses yet
3534 break; 3544 break;
3535#endif 3545#endif
3536 } 3546 }
3537} 3547}
3538/*----------------------------------------------------------------------*/ 3548/*----------------------------------------------------------------------*/
3561 { 3571 {
3562 if (mode == 'r') 3572 if (mode == 'r')
3563 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3573 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3564 else 3574 else
3565 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3575 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3566 PrivMode (state, bit); 3576 set_privmode (bit, state);
3567 } 3577 }
3568 3578
3569 return state; 3579 return state;
3570} 3580}
3571 3581
3579 static const struct 3589 static const struct
3580 { 3590 {
3581 const int argval; 3591 const int argval;
3582 const unsigned long bit; 3592 const unsigned long bit;
3583 } argtopriv[] = { 3593 } argtopriv[] = {
3584 { 1, PrivMode_aplCUR }, 3594 { 1, PrivMode_aplCUR }, // DECCKM
3585 { 2, PrivMode_vt52 }, 3595 { 2, PrivMode_vt52 },
3586 { 3, PrivMode_132 }, 3596 { 3, PrivMode_132 }, // DECCOLM
3587 { 4, PrivMode_smoothScroll }, 3597 { 4, PrivMode_smoothScroll }, // DECSCLM
3588 { 5, PrivMode_rVideo }, 3598 { 5, PrivMode_rVideo }, // DECSCNM
3589 { 6, PrivMode_relOrigin }, 3599 { 6, PrivMode_relOrigin }, // DECOM
3590 { 7, PrivMode_Autowrap }, 3600 { 7, PrivMode_Autowrap }, // DECAWM
3591 // 8, bi-directional support mode 3601 // 8, auto-repeat keys // DECARM
3592 { 9, PrivMode_MouseX10 }, 3602 { 9, PrivMode_MouseX10 },
3593 // 18, 19 printing-related 3603 // 18 end FF to printer after print screen
3604 // 19 Print screen prints full screen/scorll region
3594 { 25, PrivMode_VisibleCursor }, 3605 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3595#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
3596 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
3597#endif 3608#endif
3598 { 35, PrivMode_ShiftKeys }, // rxvt extension 3609 { 35, PrivMode_ShiftKeys }, // rxvt extension
3610 // 38, tektronix mode // DECTEK
3599 { 40, PrivMode_132OK }, 3611 { 40, PrivMode_132OK },
3600 // 41 xterm more fixes NYI 3612 // 41 xterm more fixes NYI
3601 // 45 margin bell NYI 3613 // 45 margin bell NYI
3602 // 46 start logging 3614 // 46 start logging
3603 { 47, PrivMode_Screen }, 3615 { 47, PrivMode_Screen },
3604 { 66, PrivMode_aplKP }, 3616 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3605#ifndef NO_BACKSPACE_KEY 3617#ifndef NO_BACKSPACE_KEY
3606 { 67, PrivMode_BackSpace }, 3618 { 67, PrivMode_BackSpace }, // DECBKM
3607#endif 3619#endif
3608 { 1000, PrivMode_MouseX11 }, 3620 { 1000, PrivMode_MouseX11 },
3609 { 1002, PrivMode_MouseBtnEvent }, 3621 { 1002, PrivMode_MouseBtnEvent },
3610 { 1003, PrivMode_MouseAnyEvent }, 3622 { 1003, PrivMode_MouseAnyEvent },
3611 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3623 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3615 // 1037 send DEL for keypad delete NYI 3627 // 1037 send DEL for keypad delete NYI
3616 { 1047, PrivMode_Screen }, 3628 { 1047, PrivMode_Screen },
3617 // 1048 save and restore cursor 3629 // 1048 save and restore cursor
3618 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3630 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3619 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3631 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3632 { 2004, PrivMode_BracketPaste },
3620 }; 3633 };
3621 3634
3622 if (nargs == 0) 3635 if (nargs == 0)
3623 return; 3636 return;
3624 3637
3649 3662
3650 scr_touch (true); 3663 scr_touch (true);
3651 break; 3664 break;
3652#endif 3665#endif
3653 case 1048: /* alternative cursor save */ 3666 case 1048: /* alternative cursor save */
3654 case 1049:
3655 if (option (Opt_secondaryScreen)) 3667 if (option (Opt_secondaryScreen))
3656 if (mode == 0) 3668 if (mode == 0)
3657 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
3658 else if (mode == 1) 3670 else if (mode == 1)
3659 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
3668 case 2: /* VT52 mode */ 3680 case 2: /* VT52 mode */
3669 /* oddball mode. should be set regardless of set/reset 3681 /* oddball mode. should be set regardless of set/reset
3670 * parameter. Return from VT52 mode with an ESC < from 3682 * parameter. Return from VT52 mode with an ESC < from
3671 * within VT52 mode 3683 * within VT52 mode
3672 */ 3684 */
3673 PrivMode (1, PrivMode_vt52); 3685 set_privmode (PrivMode_vt52, 1);
3674 break; 3686 break;
3675 case 3: /* 80/132 */ 3687 case 3: /* 80/132 */
3676 if (priv_modes & PrivMode_132OK) 3688 if (priv_modes & PrivMode_132OK)
3677 set_widthheight (((state ? 132 : 80) * fwidth), height); 3689 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3678 break; 3690 break;
3679 case 4: /* smooth scrolling */ 3691 case 4: /* smooth scrolling */
3680 set_option (Opt_jumpScroll, !state); 3692 set_option (Opt_jumpScroll, !state);
3681 break; 3693 break;
3682 case 5: /* reverse video */ 3694 case 5: /* reverse video */
3693 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3706 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3707 break;
3696#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
3697 case scrollBar_esc: 3709 case scrollBar_esc:
3698 if (scrollbar_mapping (state)) 3710 if (scrollBar.map (state))
3699 { 3711 {
3700 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
3701 scr_touch (true); 3713 scr_touch (true);
3702 } 3714 }
3703 break; 3715 break;
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3736 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725 vt_emask_mouse = PointerMotionMask; 3737 vt_emask_mouse = PointerMotionMask;
3726 } 3738 }
3727 else 3739 else
3728 vt_emask_mouse = NoEventMask; 3740 vt_emask_mouse = NoEventMask;
3741
3729 vt_select_input (); 3742 vt_select_input ();
3730 break; 3743 break;
3731 case 1010: /* scroll to bottom on TTY output inhibit */ 3744 case 1010: /* scroll to bottom on TTY output inhibit */
3732 set_option (Opt_scrollTtyOutput, !state); 3745 set_option (Opt_scrollTtyOutput, !state);
3733 break; 3746 break;
3734 case 1011: /* scroll to bottom on key press */ 3747 case 1011: /* scroll to bottom on key press */
3735 set_option (Opt_scrollTtyKeypress, state); 3748 set_option (Opt_scrollTtyKeypress, state);
3736 break; 3749 break;
3737 case 1047: /* secondary screen w/ clearing last */ 3750 case 1047: /* secondary screen w/ clearing last */
3738 if (option (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
3739 if (current_screen != PRIMARY) 3752 if (!state)
3740 scr_erase_screen (2); 3753 scr_erase_screen (2);
3754
3741 scr_change_screen (state); 3755 scr_change_screen (state);
3742 break; 3756 break;
3743 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
3758 if (option (Opt_secondaryScreen))
3759 if (state)
3760 scr_cursor (SAVE);
3761
3744 scr_change_screen (state); 3762 scr_change_screen (state);
3763
3745 if (option (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
3746 if (current_screen != PRIMARY) 3765 if (state)
3747 scr_erase_screen (2); 3766 scr_erase_screen (2);
3767 else
3768 scr_cursor (RESTORE);
3748 break; 3769 break;
3749 default: 3770 default:
3750 break; 3771 break;
3751 } 3772 }
3752 } 3773 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines