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.343 by sasha, Fri Aug 10 22:10:36 2007 UTC vs.
Revision 1.359 by ayin, Mon Oct 15 14:56:06 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)
… …
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;
1307 1306
1308 x = ev.x; 1307 x = Pixel2Col (ev.x);
1309 y = ev.y; 1308 y = Pixel2Row (ev.y);
1310 pixel_position (&x, &y);
1311 1309
1312 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
1313 button_number = 3; 1311 button_number = 3;
1314 else 1312 else
1315 { 1313 {
… …
1475 && ev.xfocus.mode != NotifyGrab) 1473 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1474 focus_out ();
1477 break; 1475 break;
1478 1476
1479 case ConfigureNotify: 1477 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1480 if (ev.xconfigure.window == parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1481 { 1482 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1484 ;
1484 1485
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1487 {
1487 seen_resize = 1; 1488 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1489 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_background ();
1494 scr_touch (true);
1495 }
1496#endif
1497 } 1490 }
1498 1491 else
1492 {
1493#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ())
1495 update_background ();
1496#endif
1497 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 bgPixmap.render_background ();
1504#endif
1505 } 1499 }
1506 break; 1500 break;
1507 1501
1508 case PropertyNotify: 1502 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1540 text_blink_ev.stop (); 1534 text_blink_ev.stop ();
1541#endif 1535#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break; 1537 break;
1544 1538
1545#ifdef ENABLE_TRANSPARENCY
1546 case ReparentNotify:
1547 rootwin_cb (ev);
1548 break;
1549#endif /* ENABLE_TRANSPARENCY */
1550
1551 case GraphicsExpose: 1539 case GraphicsExpose:
1552 case Expose: 1540 case Expose:
1553 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1554 { 1542 {
1555 do 1543 do
1544 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1549
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1551
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1554 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1555 ev.xexpose.width, ev.xexpose.height, False);
1565 1556 }
1566 want_refresh = 1; 1557 want_refresh = 1;
1567 } 1558 }
1568 else 1559 else
1569 { 1560 {
1570 XEvent unused_event; 1561 XEvent unused_event;
… …
1577 if (isScrollbarWindow (ev.xany.window)) 1568 if (isScrollbarWindow (ev.xany.window))
1578 { 1569 {
1579 scrollBar.setIdle (); 1570 scrollBar.setIdle ();
1580 scrollbar_show (0); 1571 scrollbar_show (0);
1581 } 1572 }
1582
1583#ifdef ENABLE_TRANSPARENCY
1584 if (am_transparent && ev.xany.window == parent[0])
1585 XClearWindow (dpy, ev.xany.window);
1586#endif
1587 } 1573 }
1588 break; 1574 break;
1589 1575
1590 case MotionNotify: 1576 case MotionNotify:
1591#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
… …
1753 } 1739 }
1754#endif 1740#endif
1755#if ENABLE_FRILLS 1741#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell)) 1742 if (option (Opt_urgentOnBell))
1757 { 1743 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]); 1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1761 if (h != NULL)
1762 { 1745 {
1763 h->flags &= ~XUrgencyHint; 1746 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h); 1747 XSetWMHints (dpy, parent[0], h);
1765 } 1748 }
1766 } 1749 }
1767#endif 1750#endif
1768 } 1751 }
1769} 1752}
… …
1839 */ 1822 */
1840 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1841 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1842 { 1825 {
1843 bgPixmap.set_root_pixmap (); 1826 bgPixmap.set_root_pixmap ();
1844 bgPixmap.render_background (); 1827 update_background ();
1845 } 1828 }
1846 break; 1829 break;
1847 } 1830 }
1848# endif 1831# endif
1849} 1832}
… …
2805rxvt_term::process_csi_seq () 2788rxvt_term::process_csi_seq ()
2806{ 2789{
2807 unicode_t ch, priv, i; 2790 unicode_t ch, priv, i;
2808 unsigned int nargs, p; 2791 unsigned int nargs, p;
2809 int n, ndef; 2792 int n, ndef;
2810 int arg[ESC_ARGS]; 2793 int arg[ESC_ARGS] = { };
2811 2794
2812 memset (arg, 0, sizeof (arg));
2813 nargs = 0; 2795 nargs = 0;
2814 2796
2815 priv = 0; 2797 priv = 0;
2816 ch = cmd_getc (); 2798 ch = cmd_getc ();
2817 if (ch >= '<' && ch <= '?') 2799 if (ch >= '<' && ch <= '?')
… …
3440 if (ISSET_PIXCOLOR (Color_tint)) 3422 if (ISSET_PIXCOLOR (Color_tint))
3441 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3442 else 3424 else
3443 changed = bgPixmap.unset_tint (); 3425 changed = bgPixmap.unset_tint ();
3444 if (changed) 3426 if (changed)
3445 {
3446 bgPixmap.render_background (); 3427 update_background ();
3447 if (am_transparent)
3448 want_full_refresh = want_refresh = 1;
3449 } 3428 }
3450 }
3451 3429
3452 break; 3430 break;
3453#endif 3431#endif
3454 3432
3455#if XPM_BACKGROUND 3433#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?")) 3435 if (!strcmp (str, "?"))
3458 { 3436 {
3459 char str[256]; 3437 char str[256];
3460 3438
… …
3483 if (bgPixmap.set_geometry (str)) 3461 if (bgPixmap.set_geometry (str))
3484 changed++; 3462 changed++;
3485 str = strchr (str, ';'); 3463 str = strchr (str, ';');
3486 } 3464 }
3487 if (changed) 3465 if (changed)
3488 {
3489 bgPixmap.render_background (); 3466 update_background ();
3490 scr_touch (true);
3491 }
3492 } 3467 }
3493 break; 3468 break;
3494#endif 3469#endif
3495 3470
3496 case Rxvt_restoreFG: 3471 case Rxvt_restoreFG:
… …
3621{ 3596{
3622 unsigned int i, j; 3597 unsigned int i, j;
3623 int state; 3598 int state;
3624 3599
3625 static const struct 3600 static const struct
3626 { 3601 {
3627 const int argval; 3602 const int argval;
3628 const unsigned long bit; 3603 const unsigned long bit;
3629 }
3630
3631 argtopriv[] = { 3604 } argtopriv[] = {
3632 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR },
3633 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
3634 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 },
3635 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll },
3636 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo },
… …
4028 4001
4029 if (v_buflen == 0) 4002 if (v_buflen == 0)
4030 { 4003 {
4031 free (v_buffer); 4004 free (v_buffer);
4032 v_buffer = 0; 4005 v_buffer = 0;
4033 v_buflen = 0;
4034 4006
4035 pty_ev.set (EVENT_READ); 4007 pty_ev.set (EVENT_READ);
4036 return; 4008 return;
4037 } 4009 }
4038 4010

Diff Legend

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