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.345 by sasha, Mon Aug 13 22:41:34 2007 UTC vs.
Revision 1.360 by ayin, Wed Oct 24 10:39:57 2007 UTC

95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
552 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 newlen = 1;
554 switch (keysym) 554 switch (keysym)
555 { 555 {
556#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 557 case XK_BackSpace:
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
563 } 563 }
564 else 564 else
565 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 566 break;
567#endif 567#endif
568#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
570 case XK_KP_Delete: 570 case XK_KP_Delete:
571 /* allow shift to override */ 571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
573 { 573 {
574 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
575 break; 575 break;
576 } 576 }
577 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
578# endif 578# endif
579 case XK_Delete: 579 case XK_Delete:
580 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 581 break;
582#endif 582#endif
583 case XK_Tab: 583 case XK_Tab:
584 if (shft) 584 if (shft)
585 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
600#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
606 { 606 {
607 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break; 609 break;
610 } 610 }
633 633
634#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
636 case XK_KP_Prior: 636 case XK_KP_Prior:
637 /* allow shift to override */ 637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
639 { 639 {
640 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
641 break; 641 break;
642 } 642 }
643 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
646 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
647 break; 647 break;
648# ifdef XK_KP_Next 648# ifdef XK_KP_Next
649 case XK_KP_Next: 649 case XK_KP_Next:
650 /* allow shift to override */ 650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
652 { 652 {
653 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
654 break; 654 break;
655 } 655 }
656 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
659 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
660 break; 660 break;
661#endif 661#endif
662 case XK_KP_Enter: 662 case XK_KP_Enter:
663 /* allow shift to override */ 663 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
665 { 665 {
666 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
667 break; 667 break;
668 } 668 }
669 669
712 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 716 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
718 { 718 {
719 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 721 }
722 else 722 else
731 break; 731 break;
732 732
733#ifdef XK_KP_Insert 733#ifdef XK_KP_Insert
734 case XK_KP_Insert: 734 case XK_KP_Insert:
735 /* allow shift to override */ 735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
737 { 737 {
738 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
739 break; 739 break;
740 } 740 }
741 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
754 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
755 break; 755 break;
756#ifdef XK_KP_End 756#ifdef XK_KP_End
757 case XK_KP_End: 757 case XK_KP_End:
758 /* allow shift to override */ 758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
760 { 760 {
761 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
762 break; 762 break;
763 } 763 }
764 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
767 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
768 break; 768 break;
769#ifdef XK_KP_Home 769#ifdef XK_KP_Home
770 case XK_KP_Home: 770 case XK_KP_Home:
771 /* allow shift to override */ 771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
773 { 773 {
774 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
775 break; 775 break;
776 } 776 }
777 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
1034 1034
1035void 1035void
1036rxvt_term::flush () 1036rxvt_term::flush ()
1037{ 1037{
1038 flush_ev.stop (); 1038 flush_ev.stop ();
1039 1039
1040#ifdef ENABLE_TRANSPARENCY 1040#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
1042 { 1042 {
1043 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 1044 scr_touch (false);
1046 } 1045 }
1047#endif 1046#endif
1048 1047
1049 if (want_refresh) 1048 if (want_refresh)
1302void 1301void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1303{
1305 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1306 int x, y; 1305 int x, y;
1306 int code = 32;
1307 1307
1308 x = ev.x; 1308 x = Pixel2Col (ev.x);
1309 y = ev.y; 1309 y = Pixel2Row (ev.y);
1310 pixel_position (&x, &y); 1310 if (ev.type == MotionNotify) {
1311 if (x == mouse_row && y == mouse_col)
1312 return;
1313 mouse_row = x;
1314 mouse_col = y;
1315 code += 32;
1316 }
1311 1317
1312 if (MEvent.button == AnyButton) 1318 if (MEvent.button == AnyButton)
1313 button_number = 3; 1319 button_number = 3;
1314 else 1320 else
1315 { 1321 {
1361 x + 1, 1367 x + 1,
1362 y + 1); 1368 y + 1);
1363#endif 1369#endif
1364 1370
1365 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1372 (code + button_number + key_state),
1367 (32 + x + 1), 1373 (32 + x + 1),
1368 (32 + y + 1)); 1374 (32 + y + 1));
1369} 1375}
1370 1376
1371/*{{{ process an X event */ 1377/*{{{ process an X event */
1475 && ev.xfocus.mode != NotifyGrab) 1481 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1482 focus_out ();
1477 break; 1483 break;
1478 1484
1479 case ConfigureNotify: 1485 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */
1480 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent[0])
1481 { 1490 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1492 ;
1484 1493
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1494 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1495 {
1487 seen_resize = 1; 1496 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1489#ifdef XPM_BACKGROUND
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1492 {
1493 bgPixmap.render ();
1494 scr_touch (true);
1495 }
1496#endif
1497 } 1498 }
1498 1499 else
1500 {
1501#ifdef HAVE_BG_PIXMAP
1502 if (bgPixmap.window_position_sensitive ())
1503 update_background ();
1504#endif
1505 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 bgPixmap.render ();
1504#endif
1505 } 1507 }
1506 break; 1508 break;
1507 1509
1508 case PropertyNotify: 1510 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1511 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1540 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1541#endif 1543#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break; 1545 break;
1544 1546
1545#ifdef ENABLE_TRANSPARENCY
1546 case ReparentNotify:
1547 rootwin_cb (ev);
1548 break;
1549#endif /* ENABLE_TRANSPARENCY */
1550
1551 case GraphicsExpose: 1547 case GraphicsExpose:
1552 case Expose: 1548 case Expose:
1553 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1554 { 1550 {
1555 do 1551 do
1552 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1555 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1557
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1559
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1565 1564 }
1566 want_refresh = 1; 1565 want_refresh = 1;
1567 } 1566 }
1568 else 1567 else
1569 { 1568 {
1570 XEvent unused_event; 1569 XEvent unused_event;
1585 case MotionNotify: 1584 case MotionNotify:
1586#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1587 if (hidden_pointer) 1586 if (hidden_pointer)
1588 pointer_unblank (); 1587 pointer_unblank ();
1589#endif 1588#endif
1589 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1590 || priv_modes & PrivMode_MouseAnyEvent)
1591 mouse_report (ev.xbutton);
1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1591 break; 1593 break;
1592 1594
1593 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1594 { 1596 {
1748 } 1750 }
1749#endif 1751#endif
1750#if ENABLE_FRILLS 1752#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell)) 1753 if (option (Opt_urgentOnBell))
1752 { 1754 {
1753 XWMHints *h;
1754
1755 h = XGetWMHints(dpy, parent[0]); 1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 if (h != NULL)
1757 { 1756 {
1758 h->flags &= ~XUrgencyHint; 1757 h->flags &= ~XUrgencyHint;
1759 XSetWMHints(dpy, parent[0], h); 1758 XSetWMHints (dpy, parent[0], h);
1760 } 1759 }
1761 } 1760 }
1762#endif 1761#endif
1763 } 1762 }
1764} 1763}
1834 */ 1833 */
1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 { 1836 {
1838 bgPixmap.set_root_pixmap (); 1837 bgPixmap.set_root_pixmap ();
1839 bgPixmap.render (); 1838 update_background ();
1840 } 1839 }
1841 break; 1840 break;
1842 } 1841 }
1843# endif 1842# endif
1844} 1843}
2800rxvt_term::process_csi_seq () 2799rxvt_term::process_csi_seq ()
2801{ 2800{
2802 unicode_t ch, priv, i; 2801 unicode_t ch, priv, i;
2803 unsigned int nargs, p; 2802 unsigned int nargs, p;
2804 int n, ndef; 2803 int n, ndef;
2805 int arg[ESC_ARGS]; 2804 int arg[ESC_ARGS] = { };
2806 2805
2807 memset (arg, 0, sizeof (arg));
2808 nargs = 0; 2806 nargs = 0;
2809 2807
2810 priv = 0; 2808 priv = 0;
2811 ch = cmd_getc (); 2809 ch = cmd_getc ();
2812 if (ch >= '<' && ch <= '?') 2810 if (ch >= '<' && ch <= '?')
2861 { 2859 {
2862 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2860 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2863 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2864 // 2862 //
2865 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2863 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2866 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2864 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2867 // that we do not support xterm mouse reporting (should be 95 when we do). 2865 // versions.
2868 // 2866 //
2869 tt_printf ("\033[>%d;94;0c", 'U'); 2867 tt_printf ("\033[>%d;95;0c", 'U');
2870 } 2868 }
2871 break; 2869 break;
2872 case '?': 2870 case '?':
2873 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2874 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
3435 if (ISSET_PIXCOLOR (Color_tint)) 3433 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3437 else 3435 else
3438 changed = bgPixmap.unset_tint (); 3436 changed = bgPixmap.unset_tint ();
3439 if (changed) 3437 if (changed)
3440 bgPixmap.render (); 3438 update_background ();
3441 } 3439 }
3442 3440
3443 break; 3441 break;
3444#endif 3442#endif
3445 3443
3446#if XPM_BACKGROUND 3444#if BG_IMAGE_FROM_FILE
3447 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3448 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3449 { 3447 {
3450 char str[256]; 3448 char str[256];
3451 3449
3474 if (bgPixmap.set_geometry (str)) 3472 if (bgPixmap.set_geometry (str))
3475 changed++; 3473 changed++;
3476 str = strchr (str, ';'); 3474 str = strchr (str, ';');
3477 } 3475 }
3478 if (changed) 3476 if (changed)
3479 { 3477 update_background ();
3480 bgPixmap.render ();
3481 scr_touch (true);
3482 }
3483 } 3478 }
3484 break; 3479 break;
3485#endif 3480#endif
3486 3481
3487 case Rxvt_restoreFG: 3482 case Rxvt_restoreFG:
3642#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3643 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
3644#endif 3639#endif
3645 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3646 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3647 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
3648 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
3649 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3650 { 1011, PrivMode_Keypress }, // rxvt extension 3645 { 1011, PrivMode_Keypress }, // rxvt extension
3651 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
3652 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
3653 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
3727 scr_autowrap (state); 3722 scr_autowrap (state);
3728 break; 3723 break;
3729 /* case 8: - auto repeat, can't do on a per window basis */ 3724 /* case 8: - auto repeat, can't do on a per window basis */
3730 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
3731 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
3732 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3733 break; 3728 break;
3734#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
3735 case scrollBar_esc: 3730 case scrollBar_esc:
3736 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
3737 { 3732 {
3750 break; 3745 break;
3751 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
3752 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
3753 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
3754 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
3755 priv_modes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3756 break; 3751 break;
3757#if 0 3752#if 0
3758 case 1001: 3753 case 1001:
3759 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
3760#endif 3755#endif
3756 case 1002:
3757 case 1003:
3758 if (state) {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 vt_emask_mouse = PointerMotionMask;
3762 } else
3763 vt_emask_mouse = NoEventMask;
3764 vt_select_input ();
3765 break;
3761 case 1010: /* scroll to bottom on TTY output inhibit */ 3766 case 1010: /* scroll to bottom on TTY output inhibit */
3762 set_option (Opt_scrollTtyOutput, !state); 3767 set_option (Opt_scrollTtyOutput, !state);
3763 break; 3768 break;
3764 case 1011: /* scroll to bottom on key press */ 3769 case 1011: /* scroll to bottom on key press */
3765 set_option (Opt_scrollTtyKeypress, state); 3770 set_option (Opt_scrollTtyKeypress, state);
4017 4022
4018 if (v_buflen == 0) 4023 if (v_buflen == 0)
4019 { 4024 {
4020 free (v_buffer); 4025 free (v_buffer);
4021 v_buffer = 0; 4026 v_buffer = 0;
4022 v_buflen = 0;
4023 4027
4024 pty_ev.set (EVENT_READ); 4028 pty_ev.set (EVENT_READ);
4025 return; 4029 return;
4026 } 4030 }
4027 4031

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines