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.438 by root, Thu Feb 4 21:55:12 2010 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
… …
410#ifdef PAGING_CONTEXT_LINES 505#ifdef PAGING_CONTEXT_LINES
411 lnsppg = nrow - PAGING_CONTEXT_LINES; 506 lnsppg = nrow - PAGING_CONTEXT_LINES;
412#else 507#else
413 lnsppg = nrow * 4 / 5; 508 lnsppg = nrow * 4 / 5;
414#endif 509#endif
510 max_it (lnsppg, 1);
511
415 if (keysym == XK_Prior) 512 if (keysym == XK_Prior)
416 { 513 {
417 scr_page (UP, lnsppg); 514 scr_page (UP, lnsppg);
418 return; 515 return;
419 } 516 }
… …
484 } 581 }
485 } 582 }
486 583
487#if ENABLE_FRILLS || ISO_14755 584#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 585 // ISO 14755 support
489 if (shft && ctrl) 586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 587 {
491 int hv; 588 int hv;
492 589
493 if (iso14755buf & ISO_14755_51 590 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 591 && (keysym == XK_space || keysym == XK_KP_Space
… …
524 scr_overlay_off (); 621 scr_overlay_off ();
525# endif 622# endif
526 iso14755buf = 0; 623 iso14755buf = 0;
527 } 624 }
528 } 625 }
626 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 627 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 628 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 629 if (!(iso14755buf & ISO_14755_STARTED))
532 { 630 {
533 iso14755buf |= ISO_14755_STARTED; 631 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 632# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 633 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
… …
546 } 644 }
547#endif 645#endif
548 646
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 647 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 648 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1; 650 unsigned int newlen = 1;
553#ifdef XK_KP_Home 651
554 static const KeySym keypadtrans[] = { 652 switch (translate_keypad (keysym, kp))
555 XK_KP_7, // XK_KP_Home 653 {
556 XK_KP_4, // XK_KP_Left 654#ifndef NO_BACKSPACE_KEY
557 XK_KP_8, // XK_KP_Up 655 case XK_BackSpace:
558 XK_KP_6, // XK_KP_Right 656 if (priv_modes & PrivMode_HaveBackSpace)
559 XK_KP_2, // XK_KP_Down 657 {
560#ifndef UNSHIFTED_SCROLLKEYS 658 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 XK_KP_9, // XK_KP_Prior 659 ^ !!ctrl) ? '\b' : '\177';
562 XK_KP_3, // XK_KP_Next 660 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 }; 661 }
662 else
663 strcpy (kbuf, rs[Rs_backspace_key]);
664 break;
665#endif
666#ifndef NO_DELETE_KEY
667 case XK_Delete:
668 strcpy (kbuf, rs[Rs_delete_key]);
669 break;
670#endif
671 case XK_Tab:
672 if (shft)
673 strcpy (kbuf, "\033[Z");
674 else
675 {
676#ifdef CTRL_TAB_MAKES_META
677 if (ctrl)
678 meta = 1;
679#endif
680#ifdef MOD4_TAB_MAKES_META
681 if (ev.state & Mod4Mask)
682 meta = 1;
683#endif
684 newlen = 0;
685 }
686 break;
570 687
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 688 case XK_Up: /* "\033[A" */
689 case XK_Down: /* "\033[B" */
690 case XK_Right: /* "\033[C" */
691 case XK_Left: /* "\033[D" */
692 strcpy (kbuf, "\033[Z");
693 kbuf[2] = "DACB"[keysym - XK_Left];
694 /* do Shift first */
695 if (shft)
696 kbuf[2] = "dacb"[keysym - XK_Left];
697 else if (ctrl)
698 {
699 kbuf[1] = 'O';
700 kbuf[2] = "dacb"[keysym - XK_Left];
701 }
702 else if (priv_modes & PrivMode_aplCUR)
703 kbuf[1] = 'O';
704 break;
705
706 case XK_KP_Enter:
707 /* allow shift to override */
708 if (kp)
709 {
710 strcpy (kbuf, "\033OM");
711 break;
712 }
713
714 /* FALLTHROUGH */
715
716 case XK_Return:
717 if (priv_modes & PrivMode_LFNL)
718 {
719 kbuf[0] = '\015';
720 kbuf[1] = '\012';
721 kbuf[2] = '\0';
722 }
723 else
724 {
725 kbuf[0] = '\015';
726 kbuf[1] = '\0';
727 }
728 break;
729
730 case XK_KP_F1: /* "\033OP" */
731 case XK_KP_F2: /* "\033OQ" */
732 case XK_KP_F3: /* "\033OR" */
733 case XK_KP_F4: /* "\033OS" */
734 strcpy (kbuf, "\033OP");
735 kbuf[2] += (keysym - XK_KP_F1);
736 break;
737
738 case XK_KP_Multiply: /* "\033Oj" : "*" */
739 case XK_KP_Add: /* "\033Ok" : "+" */
740 case XK_KP_Separator: /* "\033Ol" : "," */
741 case XK_KP_Subtract: /* "\033Om" : "-" */
742 case XK_KP_Decimal: /* "\033On" : "." */
743 case XK_KP_Divide: /* "\033Oo" : "/" */
744 case XK_KP_0: /* "\033Op" : "0" */
745 case XK_KP_1: /* "\033Oq" : "1" */
746 case XK_KP_2: /* "\033Or" : "2" */
747 case XK_KP_3: /* "\033Os" : "3" */
748 case XK_KP_4: /* "\033Ot" : "4" */
749 case XK_KP_5: /* "\033Ou" : "5" */
750 case XK_KP_6: /* "\033Ov" : "6" */
751 case XK_KP_7: /* "\033Ow" : "7" */
752 case XK_KP_8: /* "\033Ox" : "8" */
753 case XK_KP_9: /* "\033Oy" : "9" */
754 /* allow shift to override */
755 if (kp)
756 {
757 strcpy (kbuf, "\033Oj");
758 kbuf[2] += (keysym - XK_KP_Multiply);
759 }
760 else
761 {
762 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
763 kbuf[1] = '\0';
764 }
765 break;
766
767 default:
572 { 768 {
573 unsigned int index = keysym - XK_KP_Home; 769 int param = map_function_key (keysym);
574 keysym = kp ? keypadtrans[index] : XK_Home + index; 770 if (param > 0)
771 sprintf (kbuf,"\033[%d~", param);
772 else
773 newlen = 0;
575 } 774 }
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; 775 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 } 776 }
789 777
790 if (newlen) 778 if (newlen)
791 len = strlen (kbuf); 779 len = strlen (kbuf);
792 780
793 /* 781 /*
794 * Pass meta for all function keys, if 'meta' option set 782 * Pass meta for all function keys, if 'meta' option set
795 */ 783 */
796#ifdef META8_OPTION 784#ifdef META8_OPTION
… …
1030 } 1018 }
1031 while (row < end_row); 1019 while (row < end_row);
1032 } 1020 }
1033 1021
1034 scr_refresh (); 1022 scr_refresh ();
1035 scrollbar_show (1); 1023 scrollBar.show (1);
1036#ifdef USE_XIM 1024#ifdef USE_XIM
1037 IMSendSpot (); 1025 IMSendSpot ();
1038#endif 1026#endif
1039 } 1027 }
1040 1028
… …
1142 { 1130 {
1143 // this should really be sched_yield(), but the linux guys thought 1131 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than 1132 // 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 1133 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS. 1134 // allowed by the sus... as is returning ENOSYS.
1135 // since the linux guys additionally thought that breaking the only
1136 // known workaroudn against their unusable sched_yield hack is cool,
1137 // we just nanosleep a bit and hope for the best.
1147 1138
1148 struct timespec ts = { 0, 0 }; 1139 struct timespec ts = { 0, 1000 };
1149 nanosleep (&ts, 0); 1140 nanosleep (&ts, 0);
1150 1141
1151 w.stop (); 1142 w.stop ();
1152 } 1143 }
1153 1144
… …
1203{ 1194{
1204 make_current (); 1195 make_current ();
1205 1196
1206 if (revents & ev::READ) 1197 if (revents & ev::READ)
1207 // loop, but don't allow a single term to monopolize us 1198 // loop, but don't allow a single term to monopolize us
1208 while (pty_fill ()) 1199 for (int i = CBUFCNT; i-- && pty_fill (); )
1209 if (cmd_parse ()) 1200 cmd_parse ();
1210 break;
1211 1201
1212 if (revents & ev::WRITE) 1202 if (revents & ev::WRITE)
1213 pty_write (); 1203 pty_write ();
1214 1204
1215 refresh_check (); 1205 refresh_check ();
… …
1474 selection_property (ev.xproperty.window, ev.xproperty.atom); 1464 selection_property (ev.xproperty.window, ev.xproperty.atom);
1475 1465
1476 break; 1466 break;
1477 1467
1478 case SelectionClear: 1468 case SelectionClear:
1479 selection_clear (); 1469 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1480 break; 1470 break;
1481 1471
1482 case SelectionNotify: 1472 case SelectionNotify:
1483 if (selection_wait == Sel_normal) 1473 if (selection_wait == Sel_normal)
1484 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1474 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
… …
1551 ; 1541 ;
1552 1542
1553 if (scrollBar.state && ev.xany.window == scrollBar.win) 1543 if (scrollBar.state && ev.xany.window == scrollBar.win)
1554 { 1544 {
1555 scrollBar.state = STATE_IDLE; 1545 scrollBar.state = STATE_IDLE;
1556 scrollbar_show (0); 1546 scrollBar.show (0);
1557 } 1547 }
1558 } 1548 }
1559 break; 1549 break;
1560 1550
1561 case MotionNotify: 1551 case MotionNotify:
… …
1660 &unused_root, &unused_child, 1650 &unused_root, &unused_child,
1661 &unused_root_x, &unused_root_y, 1651 &unused_root_x, &unused_root_y,
1662 &ev.xbutton.x, &ev.xbutton.y, 1652 &ev.xbutton.x, &ev.xbutton.y,
1663 &unused_mask); 1653 &unused_mask);
1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1654 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1665 scrollbar_size ()); 1655 scrollBar.size ());
1666 want_refresh = 1; 1656 want_refresh = 1;
1667 scrollbar_show (1); 1657 scrollBar.show (1);
1668 } 1658 }
1669 break; 1659 break;
1670 } 1660 }
1671 1661
1672#if defined(CURSOR_BLINK) 1662#if defined(CURSOR_BLINK)
… …
1697#endif 1687#endif
1698 1688
1699 refresh_check (); 1689 refresh_check ();
1700} 1690}
1701 1691
1692#if ENABLE_FRILLS
1693void
1694rxvt_term::set_urgency (bool enable)
1695{
1696 if (enable == urgency_hint)
1697 return;
1698
1699 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1700 {
1701 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1702 XSetWMHints (dpy, parent[0], h);
1703 urgency_hint = enable;
1704 }
1705}
1706#endif
1707
1702void 1708void
1703rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1704{ 1710{
1705 if (!focus) 1711 if (!focus)
1706 { 1712 {
1707 focus = 1; 1713 focus = 1;
1708 want_refresh = 1; 1714 want_refresh = 1;
1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1715
1712#if USE_XIM 1716#if USE_XIM
1713 if (Input_Context != NULL) 1717 if (Input_Context != NULL)
1714 { 1718 {
1715 IMSetPosition (); 1719 IMSetPosition ();
… …
1727 scr_recolour (); 1731 scr_recolour ();
1728 } 1732 }
1729#endif 1733#endif
1730#if ENABLE_FRILLS 1734#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell)) 1735 if (option (Opt_urgentOnBell))
1732 { 1736 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 1737#endif
1738
1739 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1740 } 1740 }
1741} 1741}
1742 1742
1743void 1743void
1744rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1746 if (focus) 1746 if (focus)
1747 { 1747 {
1748 focus = 0; 1748 focus = 0;
1749 want_refresh = 1; 1749 want_refresh = 1;
1750 1750
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1751#if ENABLE_FRILLS
1752 1752 if (option (Opt_urgentOnBell))
1753 set_urgency (0);
1754#endif
1753#if ENABLE_FRILLS || ISO_14755 1755#if ENABLE_FRILLS || ISO_14755
1754 if (iso14755buf) 1756 if (iso14755buf)
1755 { 1757 {
1756 iso14755buf = 0; 1758 iso14755buf = 0;
1757# if ISO_14755 1759# if ISO_14755
… …
1774 { 1776 {
1775 pix_colors = pix_colors_unfocused; 1777 pix_colors = pix_colors_unfocused;
1776 scr_recolour (); 1778 scr_recolour ();
1777 } 1779 }
1778#endif 1780#endif
1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1779 } 1783 }
1780} 1784}
1781 1785
1782void 1786void
1783rxvt_term::update_fade_color (unsigned int idx) 1787rxvt_term::update_fade_color (unsigned int idx)
… …
2025 } 2029 }
2026 2030
2027 if (scrollBar.style == R_SB_XTERM 2031 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2032 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2033 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2034 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2031 2035
2032 scrollBar.state = STATE_MOTION; 2036 scrollBar.state = STATE_MOTION;
2033 break; 2037 break;
2034 2038
2035 case Button1: 2039 case Button1:
… …
2058 else 2062 else
2059 { 2063 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2064 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2065 (nrow
2062 * scrollbar_position (ev.y) 2066 * scrollbar_position (ev.y)
2063 / scrollbar_size ())); 2067 / scrollBar.size ()));
2064 } 2068 }
2065 2069
2066 break; 2070 break;
2067 } 2071 }
2068 } 2072 }
… …
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2085 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2086
2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2087 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2088 {
2085 scrollBar.state = STATE_IDLE; 2089 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2090 scrollBar.show (0);
2087 } 2091 }
2088 2092
2089#ifdef SELECTION_SCROLLING 2093#ifdef SELECTION_SCROLLING
2090 sel_scroll_ev.stop(); 2094 sel_scroll_ev.stop();
2091#endif 2095#endif
… …
2174 } 2178 }
2175 else 2179 else
2176# endif 2180# endif
2177 { 2181 {
2178 scr_page (v, i); 2182 scr_page (v, i);
2179 scrollbar_show (1); 2183 scrollBar.show (1);
2180 } 2184 }
2181 } 2185 }
2182 break; 2186 break;
2183#endif 2187#endif
2184 } 2188 }
2185 } 2189 }
2186} 2190}
2187 2191
2188/*}}} */ 2192/*}}} */
2189 2193
2190bool 2194void
2191rxvt_term::cmd_parse () 2195rxvt_term::cmd_parse ()
2192{ 2196{
2193 bool flag = false;
2194 wchar_t ch = NOCHAR; 2197 wchar_t ch = NOCHAR;
2195 char *seq_begin; // remember start of esc-sequence here 2198 char *seq_begin; // remember start of esc-sequence here
2196 2199
2197 for (;;) 2200 for (;;)
2198 { 2201 {
2199 if (ch == NOCHAR) 2202 if (expect_false (ch == NOCHAR))
2200 { 2203 {
2201 seq_begin = cmdbuf_ptr; 2204 seq_begin = cmdbuf_ptr;
2202 ch = next_char (); 2205 ch = next_char ();
2203 2206
2204 if (ch == NOCHAR) 2207 if (ch == NOCHAR)
2205 break; 2208 break;
2206 } 2209 }
2207 2210
2208 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2211 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2209 { 2212 {
2210 if (!seen_input) 2213 if (expect_false (!seen_input))
2211 { 2214 {
2212 seen_input = 1; 2215 seen_input = 1;
2213 // many badly-written programs (e.g. jed) contain a race condition: 2216 // many badly-written programs (e.g. jed) contain a race condition:
2214 // they first read the screensize and then install a SIGWINCH handler. 2217 // they first read the screensize and then install a SIGWINCH handler.
2215 // some window managers resize the window early, and these programs 2218 // some window managers resize the window early, and these programs
… …
2228 wchar_t *str = buf; 2231 wchar_t *str = buf;
2229 wchar_t *eol = str + min (ncol, UBUFSIZ); 2232 wchar_t *eol = str + min (ncol, UBUFSIZ);
2230 2233
2231 for (;;) 2234 for (;;)
2232 { 2235 {
2233 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2236 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2234 break; 2237 break;
2235 2238
2236 *str++ = ch; 2239 *str++ = ch;
2237 2240
2238 if (ch == C0_LF || str >= eol) 2241 if (expect_false (ch == C0_LF || str >= eol))
2239 { 2242 {
2240 if (ch == C0_LF) 2243 if (ch == C0_LF)
2241 nlines++; 2244 nlines++;
2242 2245
2243 refresh_count++; 2246 refresh_count++;
… …
2292 * What the heck we'll cheat and only refresh less than every page-full. 2295 * What the heck we'll cheat and only refresh less than every page-full.
2293 * if skipScroll is enabled. 2296 * if skipScroll is enabled.
2294 */ 2297 */
2295 if (refreshnow) 2298 if (refreshnow)
2296 { 2299 {
2297 flag = true;
2298 scr_refresh (); 2300 scr_refresh ();
2299 want_refresh = 1; 2301 want_refresh = 1;
2300 } 2302 }
2301
2302 } 2303 }
2303 else 2304 else
2304 { 2305 {
2305 try 2306 try
2306 { 2307 {
… …
2314 } 2315 }
2315 2316
2316 ch = NOCHAR; 2317 ch = NOCHAR;
2317 } 2318 }
2318 } 2319 }
2319
2320 return flag;
2321} 2320}
2322 2321
2323// read the next character 2322// read the next character
2324wchar_t 2323wchar_t
2325rxvt_term::next_char () NOTHROW 2324rxvt_term::next_char () NOTHROW
2326{ 2325{
2327 while (cmdbuf_ptr < cmdbuf_endp) 2326 while (cmdbuf_ptr < cmdbuf_endp)
2328 { 2327 {
2329 // assume 7-bit to be ascii ALWAYS 2328 // assume 7-bit to be ascii ALWAYS
2330 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2329 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2331 return *cmdbuf_ptr++; 2330 return *cmdbuf_ptr++;
2332 2331
2333 wchar_t wc; 2332 wchar_t wc;
2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2333 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2335 2334
… …
2339 cmdbuf_ptr = cmdbuf_endp; 2338 cmdbuf_ptr = cmdbuf_endp;
2340 break; 2339 break;
2341 } 2340 }
2342 2341
2343 if (len == (size_t)-1) 2342 if (len == (size_t)-1)
2343 {
2344 mbstate.reset (); // reset now undefined conversion state
2344 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2345 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2346 }
2345 2347
2346 // assume wchar == unicode 2348 // assume wchar == unicode
2347 cmdbuf_ptr += len; 2349 cmdbuf_ptr += len;
2348 return wc & UNICODE_MASK; 2350 return wc & UNICODE_MASK;
2349 } 2351 }
… …
2393/*----------------------------------------------------------------------*/ 2395/*----------------------------------------------------------------------*/
2394#ifdef PRINTPIPE 2396#ifdef PRINTPIPE
2395FILE * 2397FILE *
2396rxvt_term::popen_printer () 2398rxvt_term::popen_printer ()
2397{ 2399{
2398 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2400 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2399 2401
2400 if (stream == NULL) 2402 if (stream == NULL)
2401 rxvt_warn ("can't open printer pipe, not printing.\n"); 2403 rxvt_warn ("can't open printer pipe, not printing.\n");
2402 2404
2403 return stream; 2405 return stream;
… …
2414 * simulate attached vt100 printer 2416 * simulate attached vt100 printer
2415 */ 2417 */
2416void 2418void
2417rxvt_term::process_print_pipe () 2419rxvt_term::process_print_pipe ()
2418{ 2420{
2419 int done; 2421 FILE *fd = popen_printer ();
2420 FILE *fd;
2421 2422
2422 if ((fd = popen_printer ()) == NULL) 2423 if (!fd)
2423 return; 2424 return;
2424 2425
2425 /* 2426 /*
2426 * Send all input to the printer until either ESC[4i or ESC[?4i 2427 * Send all input to the printer until either ESC[4i or ESC[?4i
2427 * is received. 2428 * is received.
2428 */ 2429 */
2429 for (done = 0; !done;) 2430 for (int done = 0; !done; )
2430 { 2431 {
2431 unsigned char buf[8]; 2432 unsigned char buf[8];
2432 unicode_t ch; 2433 unicode_t ch;
2433 unsigned int i, len; 2434 unsigned int i, len;
2434 2435
… …
2579 break; 2580 break;
2580 case 'Z': /* identify the terminal type */ 2581 case 'Z': /* identify the terminal type */
2581 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2582 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2582 break; 2583 break;
2583 case '<': /* turn off VT52 mode */ 2584 case '<': /* turn off VT52 mode */
2584 PrivMode (0, PrivMode_vt52); 2585 set_privmode (PrivMode_vt52, 0);
2585 break; 2586 break;
2586 case 'F': /* use special graphics character set */ 2587 case 'F': /* use special graphics character set */
2587 case 'G': /* use regular character set */ 2588 case 'G': /* use regular character set */
2588 /* unimplemented */ 2589 /* unimplemented */
2589 break; 2590 break;
… …
2643 scr_forwardindex (); 2644 scr_forwardindex ();
2644 break; 2645 break;
2645#endif 2646#endif
2646 case '=': 2647 case '=':
2647 case '>': 2648 case '>':
2648 PrivMode ((ch == '='), PrivMode_aplKP); 2649 set_privmode (PrivMode_aplKP, ch == '=');
2649 break; 2650 break;
2650 2651
2651 case C1_40: 2652 case C1_40:
2652 cmd_getc (); 2653 cmd_getc ();
2653 break; 2654 break;
… …
2692 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2693 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2693 case C1_SCI: /* ESC Z */ 2694 case C1_SCI: /* ESC Z */
2694 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2695 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2695 break; /* steal obsolete ESC [ c */ 2696 break; /* steal obsolete ESC [ c */
2696 2697
2697 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2698 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2698 case C1_CSI: /* ESC [ */ 2699 case C1_CSI: /* ESC [ */
2699 process_csi_seq (); 2700 process_csi_seq ();
2700 break; 2701 break;
2701 2702
2702 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2703 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2703 case C1_OSC: /* ESC ] */ 2704 case C1_OSC: /* ESC ] */
2704 process_osc_seq (); 2705 process_osc_seq ();
2705 break; 2706 break;
2706 2707
2707 /* 8.3.106: RESET TO INITIAL STATE */ 2708 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2708 case 'c': 2709 case 'c':
2709 mbstate.reset (); 2710 mbstate.reset ();
2710 scr_poweron (); 2711 scr_poweron ();
2711 scrollbar_show (1); 2712 scrollBar.show (1);
2712 break; 2713 break;
2713 2714
2714 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2715 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2715 case 'n': 2716 case 'n':
2716 scr_charset_choose (2); 2717 scr_charset_choose (2);
… …
2767 2768
2768 nargs = 0; 2769 nargs = 0;
2769 2770
2770 priv = 0; 2771 priv = 0;
2771 ch = cmd_getc (); 2772 ch = cmd_getc ();
2772 if (ch >= '<' && ch <= '?') 2773 if ((ch >= '<' && ch <= '?') || ch == '!')
2773 { 2774 {
2774 /* '<' '=' '>' '?' */ 2775 /* '<' '=' '>' '?' '!' */
2775 priv = ch; 2776 priv = ch;
2776 ch = cmd_getc (); 2777 ch = cmd_getc ();
2777 } 2778 }
2778 2779
2779 /* read any numerical arguments */ 2780 /* read any numerical arguments */
… …
2833 2834
2834 case '?': 2835 case '?':
2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2836 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2836 process_terminal_mode (ch, priv, nargs, arg); 2837 process_terminal_mode (ch, priv, nargs, arg);
2837 break; 2838 break;
2839
2840 case '!':
2841 if (ch == CSI_70)
2842 {
2843 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2844 scr_soft_reset ();
2845
2846 static const int pm_h[] = { 7, 25 };
2847 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2848
2849 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2850 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2838 } 2851 }
2852 break;
2853 }
2854
2839 return; 2855 return;
2840 } 2856 }
2841 2857
2842 switch (ch) 2858 switch (ch)
2843 { 2859 {
… …
3272 3288
3273/* 3289/*
3274 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3290 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3275 */ 3291 */
3276void 3292void
3277rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3293rxvt_term::process_xterm_seq (int op, char *str, char resp)
3278{ 3294{
3279 int color; 3295 int color;
3280 char *buf, *name; 3296 char *buf, *name;
3281 bool query = str[0] == '?' && !str[1]; 3297 bool query = str[0] == '?' && !str[1];
3282 int saveop = op; 3298 int saveop = op;
… …
3323 3339
3324 XFree (value); 3340 XFree (value);
3325 } 3341 }
3326 else 3342 else
3327 { 3343 {
3328 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3344 char *eq = strchr (str, '=');
3329 3345
3330 if (eq) 3346 if (eq)
3331 { 3347 {
3332 *eq = 0; 3348 *eq = 0;
3333 set_utf8_property (display->atom (str), eq + 1); 3349 set_utf8_property (display->atom (str), eq + 1);
… …
3389 break; 3405 break;
3390 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3391 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3392 break; 3408 break;
3393#endif 3409#endif
3410 case URxvt_Color_border:
3411 process_color_seq (op, Color_border, str, resp);
3412 break;
3394#if ENABLE_TRANSPARENCY 3413#if ENABLE_TRANSPARENCY
3395 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3396 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3397 { 3416 {
3398 bool changed = false; 3417 bool changed = false;
… …
3413 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3414 if (!strcmp (str, "?")) 3433 if (!strcmp (str, "?"))
3415 { 3434 {
3416 char str[256]; 3435 char str[256];
3417 3436
3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */ 3437 sprintf (str, "[%dx%d+%d+%d]",
3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST); 3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3422 } 3441 }
3423 else 3442 else
… …
3522 break; 3541 break;
3523#endif 3542#endif
3524 3543
3525#if ENABLE_PERL 3544#if ENABLE_PERL
3526 case URxvt_perl: 3545 case URxvt_perl:
3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3546 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3528 ; // no responses yet
3529 break; 3547 break;
3530#endif 3548#endif
3531 } 3549 }
3532} 3550}
3533/*----------------------------------------------------------------------*/ 3551/*----------------------------------------------------------------------*/
… …
3556 { 3574 {
3557 if (mode == 'r') 3575 if (mode == 'r')
3558 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3576 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3559 else 3577 else
3560 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3578 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3561 PrivMode (state, bit); 3579 set_privmode (bit, state);
3562 } 3580 }
3563 3581
3564 return state; 3582 return state;
3565} 3583}
3566 3584
… …
3574 static const struct 3592 static const struct
3575 { 3593 {
3576 const int argval; 3594 const int argval;
3577 const unsigned long bit; 3595 const unsigned long bit;
3578 } argtopriv[] = { 3596 } argtopriv[] = {
3579 { 1, PrivMode_aplCUR }, 3597 { 1, PrivMode_aplCUR }, // DECCKM
3580 { 2, PrivMode_vt52 }, 3598 { 2, PrivMode_vt52 },
3581 { 3, PrivMode_132 }, 3599 { 3, PrivMode_132 }, // DECCOLM
3582 { 4, PrivMode_smoothScroll }, 3600 { 4, PrivMode_smoothScroll }, // DECSCLM
3583 { 5, PrivMode_rVideo }, 3601 { 5, PrivMode_rVideo }, // DECSCNM
3584 { 6, PrivMode_relOrigin }, 3602 { 6, PrivMode_relOrigin }, // DECOM
3585 { 7, PrivMode_Autowrap }, 3603 { 7, PrivMode_Autowrap }, // DECAWM
3586 // 8, bi-directional support mode 3604 // 8, auto-repeat keys // DECARM
3587 { 9, PrivMode_MouseX10 }, 3605 { 9, PrivMode_MouseX10 },
3588 // 18, 19 printing-related 3606 // 18 end FF to printer after print screen
3607 // 19 Print screen prints full screen/scorll region
3589 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3590#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
3591 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
3592#endif 3611#endif
3593 { 35, PrivMode_ShiftKeys }, // rxvt extension 3612 { 35, PrivMode_ShiftKeys }, // rxvt extension
3613 // 38, tektronix mode // DECTEK
3594 { 40, PrivMode_132OK }, 3614 { 40, PrivMode_132OK },
3595 // 41 xterm more fixes NYI 3615 // 41 xterm more fixes NYI
3596 // 45 margin bell NYI 3616 // 45 margin bell NYI
3597 // 46 start logging 3617 // 46 start logging
3598 { 47, PrivMode_Screen }, 3618 { 47, PrivMode_Screen },
3599 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3600#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
3601 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace }, // DECBKM
3602#endif 3622#endif
3603 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
3604 { 1002, PrivMode_MouseBtnEvent }, 3624 { 1002, PrivMode_MouseBtnEvent },
3605 { 1003, PrivMode_MouseAnyEvent }, 3625 { 1003, PrivMode_MouseAnyEvent },
3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
… …
3645 3665
3646 scr_touch (true); 3666 scr_touch (true);
3647 break; 3667 break;
3648#endif 3668#endif
3649 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
3650 case 1049:
3651 if (option (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
3652 if (mode == 0) 3671 if (mode == 0)
3653 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
3654 else if (mode == 1) 3673 else if (mode == 1)
3655 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
… …
3664 case 2: /* VT52 mode */ 3683 case 2: /* VT52 mode */
3665 /* oddball mode. should be set regardless of set/reset 3684 /* oddball mode. should be set regardless of set/reset
3666 * parameter. Return from VT52 mode with an ESC < from 3685 * parameter. Return from VT52 mode with an ESC < from
3667 * within VT52 mode 3686 * within VT52 mode
3668 */ 3687 */
3669 PrivMode (1, PrivMode_vt52); 3688 set_privmode (PrivMode_vt52, 1);
3670 break; 3689 break;
3671 case 3: /* 80/132 */ 3690 case 3: /* 80/132 */
3672 if (priv_modes & PrivMode_132OK) 3691 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight); 3692 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3676 }
3677 break; 3693 break;
3678 case 4: /* smooth scrolling */ 3694 case 4: /* smooth scrolling */
3679 set_option (Opt_jumpScroll, !state); 3695 set_option (Opt_jumpScroll, !state);
3680 break; 3696 break;
3681 case 5: /* reverse video */ 3697 case 5: /* reverse video */
… …
3692 if (state) /* orthogonal */ 3708 if (state) /* orthogonal */
3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3709 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3694 break; 3710 break;
3695#ifdef scrollBar_esc 3711#ifdef scrollBar_esc
3696 case scrollBar_esc: 3712 case scrollBar_esc:
3697 if (scrollbar_mapping (state)) 3713 if (scrollBar.map (state))
3698 { 3714 {
3699 resize_all_windows (0, 0, 0); 3715 resize_all_windows (0, 0, 0);
3700 scr_touch (true); 3716 scr_touch (true);
3701 } 3717 }
3702 break; 3718 break;
… …
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3739 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask; 3740 vt_emask_mouse = PointerMotionMask;
3725 } 3741 }
3726 else 3742 else
3727 vt_emask_mouse = NoEventMask; 3743 vt_emask_mouse = NoEventMask;
3744
3728 vt_select_input (); 3745 vt_select_input ();
3729 break; 3746 break;
3730 case 1010: /* scroll to bottom on TTY output inhibit */ 3747 case 1010: /* scroll to bottom on TTY output inhibit */
3731 set_option (Opt_scrollTtyOutput, !state); 3748 set_option (Opt_scrollTtyOutput, !state);
3732 break; 3749 break;
3733 case 1011: /* scroll to bottom on key press */ 3750 case 1011: /* scroll to bottom on key press */
3734 set_option (Opt_scrollTtyKeypress, state); 3751 set_option (Opt_scrollTtyKeypress, state);
3735 break; 3752 break;
3736 case 1047: /* secondary screen w/ clearing last */ 3753 case 1047: /* secondary screen w/ clearing last */
3737 if (option (Opt_secondaryScreen)) 3754 if (option (Opt_secondaryScreen))
3738 if (current_screen != PRIMARY) 3755 if (!state)
3739 scr_erase_screen (2); 3756 scr_erase_screen (2);
3757
3740 scr_change_screen (state); 3758 scr_change_screen (state);
3741 break; 3759 break;
3742 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
3761 if (option (Opt_secondaryScreen))
3762 if (state)
3763 scr_cursor (SAVE);
3764
3743 scr_change_screen (state); 3765 scr_change_screen (state);
3766
3744 if (option (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
3745 if (current_screen != PRIMARY) 3768 if (state)
3746 scr_erase_screen (2); 3769 scr_erase_screen (2);
3770 else
3771 scr_cursor (RESTORE);
3747 break; 3772 break;
3748 default: 3773 default:
3749 break; 3774 break;
3750 } 3775 }
3751 } 3776 }

Diff Legend

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