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.349 by ayin, Sun Aug 26 18:16:52 2007 UTC vs.
Revision 1.362 by ayin, Sat Nov 10 16:04:49 2007 UTC

… …
547#endif 547#endif
548 548
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 550 {
551 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 newlen = 1; 553 newlen = 1;
553 switch (keysym) 554 switch (keysym)
554 { 555 {
555#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
556 case XK_BackSpace: 557 case XK_BackSpace:
… …
559 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
560 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
561 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
562 } 563 }
563 else 564 else
564 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
565 break; 566 break;
566#endif 567#endif
567#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
569 case XK_KP_Delete: 570 case XK_KP_Delete:
570 /* allow shift to override */ 571 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
572 { 573 {
573 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
574 break; 575 break;
575 } 576 }
576 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
577# endif 578# endif
578 case XK_Delete: 579 case XK_Delete:
579 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
580 break; 581 break;
581#endif 582#endif
582 case XK_Tab: 583 case XK_Tab:
583 if (shft) 584 if (shft)
584 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
595 newlen = 0; 596 newlen = 0;
596 } 597 }
597 break; 598 break;
598 599
599#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
600 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
601 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
603 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
605 { 606 {
606 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
607 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
608 break; 609 break;
609 } 610 }
… …
632 633
633#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
634# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
635 case XK_KP_Prior: 636 case XK_KP_Prior:
636 /* allow shift to override */ 637 /* allow shift to override */
637 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
638 { 639 {
639 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
640 break; 641 break;
641 } 642 }
642 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
645 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
646 break; 647 break;
647# ifdef XK_KP_Next 648# ifdef XK_KP_Next
648 case XK_KP_Next: 649 case XK_KP_Next:
649 /* allow shift to override */ 650 /* allow shift to override */
650 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
651 { 652 {
652 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
653 break; 654 break;
654 } 655 }
655 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
658 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
659 break; 660 break;
660#endif 661#endif
661 case XK_KP_Enter: 662 case XK_KP_Enter:
662 /* allow shift to override */ 663 /* allow shift to override */
663 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
664 { 665 {
665 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
666 break; 667 break;
667 } 668 }
668 669
… …
711 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
712 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
713 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
714 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
715 /* allow shift to override */ 716 /* allow shift to override */
716 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
717 { 718 {
718 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
719 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
720 } 721 }
721 else 722 else
… …
730 break; 731 break;
731 732
732#ifdef XK_KP_Insert 733#ifdef XK_KP_Insert
733 case XK_KP_Insert: 734 case XK_KP_Insert:
734 /* allow shift to override */ 735 /* allow shift to override */
735 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
736 { 737 {
737 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
738 break; 739 break;
739 } 740 }
740 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
753 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
754 break; 755 break;
755#ifdef XK_KP_End 756#ifdef XK_KP_End
756 case XK_KP_End: 757 case XK_KP_End:
757 /* allow shift to override */ 758 /* allow shift to override */
758 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
759 { 760 {
760 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
761 break; 762 break;
762 } 763 }
763 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
766 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
767 break; 768 break;
768#ifdef XK_KP_Home 769#ifdef XK_KP_Home
769 case XK_KP_Home: 770 case XK_KP_Home:
770 /* allow shift to override */ 771 /* allow shift to override */
771 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
772 { 773 {
773 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
774 break; 775 break;
775 } 776 }
776 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
1034void 1035void
1035rxvt_term::flush () 1036rxvt_term::flush ()
1036{ 1037{
1037 flush_ev.stop (); 1038 flush_ev.stop ();
1038 1039
1039#ifdef ENABLE_TRANSPARENCY 1040#ifdef HAVE_BG_PIXMAP
1040 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
1041 { 1042 {
1042 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
1043 scr_clear ();
1044 scr_touch (false); 1044 scr_touch (false);
1045 } 1045 }
1046#endif 1046#endif
1047 1047
1048 if (want_refresh) 1048 if (want_refresh)
… …
1301void 1301void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1303{
1304 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1305 int x, y; 1305 int x, y;
1306 int code = 32;
1306 1307
1307 x = ev.x; 1308 x = Pixel2Col (ev.x);
1308 y = ev.y; 1309 y = Pixel2Row (ev.y);
1309 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 }
1310 1317
1311 if (MEvent.button == AnyButton) 1318 if (MEvent.button == AnyButton)
1312 button_number = 3; 1319 button_number = 3;
1313 else 1320 else
1314 { 1321 {
… …
1360 x + 1, 1367 x + 1,
1361 y + 1); 1368 y + 1);
1362#endif 1369#endif
1363 1370
1364 tt_printf ("\033[M%c%c%c", 1371 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1372 (code + button_number + key_state),
1366 (32 + x + 1), 1373 (32 + x + 1),
1367 (32 + y + 1)); 1374 (32 + y + 1));
1368} 1375}
1369 1376
1370/*{{{ process an X event */ 1377/*{{{ process an X event */
… …
1474 && ev.xfocus.mode != NotifyGrab) 1481 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1482 focus_out ();
1476 break; 1483 break;
1477 1484
1478 case ConfigureNotify: 1485 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/ 1488 szHint.width, szHint.height); */
1482 if (ev.xconfigure.window == parent[0]) 1489 if (ev.xconfigure.window == parent[0])
1483 { 1490 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1492 ;
1486 1493
… …
1489 seen_resize = 1; 1496 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1497 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1498 }
1492 else 1499 else
1493 { 1500 {
1494#ifdef ENABLE_TRANSPARENCY 1501#ifdef HAVE_BG_PIXMAP
1495 if (option (Opt_transparent)) 1502 if (bgPixmap.window_position_sensitive ())
1496 update_background (); 1503 update_background ();
1497#endif 1504#endif
1498 } 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 } 1507 }
… …
1535 text_blink_ev.stop (); 1542 text_blink_ev.stop ();
1536#endif 1543#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1544 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1545 break;
1539 1546
1540#ifdef ENABLE_TRANSPARENCY
1541 case ReparentNotify:
1542 rootwin_cb (ev);
1543 break;
1544#endif /* ENABLE_TRANSPARENCY */
1545
1546 case GraphicsExpose: 1547 case GraphicsExpose:
1547 case Expose: 1548 case Expose:
1548 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1549 { 1550 {
1550 do 1551 do
1552 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1553 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1554 ev.xexpose.width, ev.xexpose.height, False);
1555 }
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1556 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554 1557
1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1558 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556 1559
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 {
1558 scr_expose (ev.xexpose.x, ev.xexpose.y, 1562 scr_expose (ev.xexpose.x, ev.xexpose.y,
1559 ev.xexpose.width, ev.xexpose.height, False); 1563 ev.xexpose.width, ev.xexpose.height, False);
1560 1564 }
1561 want_refresh = 1; 1565 want_refresh = 1;
1562 } 1566 }
1563 else 1567 else
1564 { 1568 {
1565 XEvent unused_event; 1569 XEvent unused_event;
… …
1580 case MotionNotify: 1584 case MotionNotify:
1581#ifdef POINTER_BLANK 1585#ifdef POINTER_BLANK
1582 if (hidden_pointer) 1586 if (hidden_pointer)
1583 pointer_unblank (); 1587 pointer_unblank ();
1584#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);
1585 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1592 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1586 break; 1593 break;
1587 1594
1588 if (ev.xany.window == vt) 1595 if (ev.xany.window == vt)
1589 { 1596 {
… …
1743 } 1750 }
1744#endif 1751#endif
1745#if ENABLE_FRILLS 1752#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1753 if (option (Opt_urgentOnBell))
1747 { 1754 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]); 1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751 if (h != NULL)
1752 { 1756 {
1753 h->flags &= ~XUrgencyHint; 1757 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h); 1758 XSetWMHints (dpy, parent[0], h);
1755 } 1759 }
1756 } 1760 }
1757#endif 1761#endif
1758 } 1762 }
1759} 1763}
… …
2855 { 2859 {
2856 // 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,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2861 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 // 2862 //
2859 // 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
2860 // 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
2861 // that we do not support xterm mouse reporting (should be 95 when we do). 2865 // versions.
2862 // 2866 //
2863 tt_printf ("\033[>%d;94;0c", 'U'); 2867 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2868 }
2865 break; 2869 break;
2866 case '?': 2870 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2872 process_terminal_mode (ch, priv, nargs, arg);
… …
3435 } 3439 }
3436 3440
3437 break; 3441 break;
3438#endif 3442#endif
3439 3443
3440#if XPM_BACKGROUND 3444#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3445 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3446 if (!strcmp (str, "?"))
3443 { 3447 {
3444 char str[256]; 3448 char str[256];
3445 3449
… …
3633#ifndef NO_BACKSPACE_KEY 3637#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3638 { 67, PrivMode_BackSpace },
3635#endif 3639#endif
3636 { 1000, PrivMode_MouseX11 }, 3640 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3638 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3642 { 1002, PrivMode_MouseBtnEvent },
3639 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3643 { 1003, PrivMode_MouseAnyEvent },
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3645 { 1011, PrivMode_Keypress }, // rxvt extension
3642 // 1035 enable modifiers for alt, numlock NYI 3646 // 1035 enable modifiers for alt, numlock NYI
3643 // 1036 send ESC for meta keys NYI 3647 // 1036 send ESC for meta keys NYI
3644 // 1037 send DEL for keypad delete NYI 3648 // 1037 send DEL for keypad delete NYI
… …
3718 scr_autowrap (state); 3722 scr_autowrap (state);
3719 break; 3723 break;
3720 /* 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 */
3721 case 9: /* X10 mouse reporting */ 3725 case 9: /* X10 mouse reporting */
3722 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
3723 priv_modes &= ~PrivMode_MouseX11; 3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3728 break;
3725#ifdef scrollBar_esc 3729#ifdef scrollBar_esc
3726 case scrollBar_esc: 3730 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3731 if (scrollbar_mapping (state))
3728 { 3732 {
… …
3741 break; 3745 break;
3742 /* case 66: - application key pad */ 3746 /* case 66: - application key pad */
3743 /* case 67: - backspace key */ 3747 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3748 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3749 if (state) /* orthogonal */
3746 priv_modes &= ~PrivMode_MouseX10; 3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3751 break;
3748#if 0 3752#if 0
3749 case 1001: 3753 case 1001:
3750 break; /* X11 mouse highlighting */ 3754 break; /* X11 mouse highlighting */
3751#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;
3752 case 1010: /* scroll to bottom on TTY output inhibit */ 3766 case 1010: /* scroll to bottom on TTY output inhibit */
3753 set_option (Opt_scrollTtyOutput, !state); 3767 set_option (Opt_scrollTtyOutput, !state);
3754 break; 3768 break;
3755 case 1011: /* scroll to bottom on key press */ 3769 case 1011: /* scroll to bottom on key press */
3756 set_option (Opt_scrollTtyKeypress, state); 3770 set_option (Opt_scrollTtyKeypress, state);
… …
4008 4022
4009 if (v_buflen == 0) 4023 if (v_buflen == 0)
4010 { 4024 {
4011 free (v_buffer); 4025 free (v_buffer);
4012 v_buffer = 0; 4026 v_buffer = 0;
4013 v_buflen = 0;
4014 4027
4015 pty_ev.set (EVENT_READ); 4028 pty_ev.set (EVENT_READ);
4016 return; 4029 return;
4017 } 4030 }
4018 4031

Diff Legend

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