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.342 by ayin, Fri Aug 3 23:32:14 2007 UTC vs.
Revision 1.357 by sasha, Tue Sep 18 22:01:36 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;
1044 scr_clear (); 1043 scr_clear (true);
1045 scr_touch (false); 1044 scr_touch (false);
1046 } 1045 }
1047#endif 1046#endif
1048 1047
1049 if (want_refresh) 1048 if (want_refresh)
… …
1475 && ev.xfocus.mode != NotifyGrab) 1474 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1475 focus_out ();
1477 break; 1476 break;
1478 1477
1479 case ConfigureNotify: 1478 case ConfigureNotify:
1479 /* 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,
1481 szHint.width, szHint.height); */
1480 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1481 { 1483 {
1482 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1483 ; 1485 ;
1484 1486
1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1486 { 1488 {
1487 seen_resize = 1; 1489 seen_resize = 1;
1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 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 resize_pixmap ();
1494 scr_touch (true);
1495 }
1496#endif
1497 } 1491 }
1498 1492 else
1493 {
1494#ifdef HAVE_BG_PIXMAP
1495 if (bgPixmap.window_position_sensitive ())
1496 update_background ();
1497#endif
1498 }
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500
1501#ifdef ENABLE_TRANSPARENCY
1502 if (option (Opt_transparent))
1503 check_our_parents ();
1504#endif
1505 } 1500 }
1506 break; 1501 break;
1507 1502
1508 case PropertyNotify: 1503 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1540 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1541#endif 1536#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break; 1538 break;
1544 1539
1545#ifdef ENABLE_TRANSPARENCY
1546 case ReparentNotify:
1547 rootwin_cb (ev);
1548 break;
1549#endif /* ENABLE_TRANSPARENCY */
1550
1551 case GraphicsExpose: 1540 case GraphicsExpose:
1552 case Expose: 1541 case Expose:
1553 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1554 { 1543 {
1555 do 1544 do
1545 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1548 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1550
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1552
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1565 1557 }
1566 want_refresh = 1; 1558 want_refresh = 1;
1567 } 1559 }
1568 else 1560 else
1569 { 1561 {
1570 XEvent unused_event; 1562 XEvent unused_event;
… …
1577 if (isScrollbarWindow (ev.xany.window)) 1569 if (isScrollbarWindow (ev.xany.window))
1578 { 1570 {
1579 scrollBar.setIdle (); 1571 scrollBar.setIdle ();
1580 scrollbar_show (0); 1572 scrollbar_show (0);
1581 } 1573 }
1582
1583#ifdef ENABLE_TRANSPARENCY
1584 if (am_transparent && ev.xany.window == parent[0])
1585 XClearWindow (dpy, ev.xany.window);
1586#endif
1587 } 1574 }
1588 break; 1575 break;
1589 1576
1590 case MotionNotify: 1577 case MotionNotify:
1591#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
… …
1753 } 1740 }
1754#endif 1741#endif
1755#if ENABLE_FRILLS 1742#if ENABLE_FRILLS
1756 if (option (Opt_urgentOnBell)) 1743 if (option (Opt_urgentOnBell))
1757 { 1744 {
1758 XWMHints *h;
1759
1760 h = XGetWMHints(dpy, parent[0]); 1745 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1761 if (h != NULL)
1762 { 1746 {
1763 h->flags &= ~XUrgencyHint; 1747 h->flags &= ~XUrgencyHint;
1764 XSetWMHints(dpy, parent[0], h); 1748 XSetWMHints (dpy, parent[0], h);
1765 } 1749 }
1766 } 1750 }
1767#endif 1751#endif
1768 } 1752 }
1769} 1753}
… …
1835 case PropertyNotify: 1819 case PropertyNotify:
1836 /* 1820 /*
1837 * if user used some Esetroot compatible prog to set the root bg, 1821 * if user used some Esetroot compatible prog to set the root bg,
1838 * use the property to determine the pixmap. We use it later on. 1822 * use the property to determine the pixmap. We use it later on.
1839 */ 1823 */
1840 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1841 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1842 return; 1826 {
1843 1827 bgPixmap.set_root_pixmap ();
1844 /* FALLTHROUGH */ 1828 update_background ();
1845 case ReparentNotify: 1829 }
1846 if (option (Opt_transparent))
1847 check_our_parents ();
1848 break; 1830 break;
1849 } 1831 }
1850# endif 1832# endif
1851} 1833}
1852#endif 1834#endif
… …
2807rxvt_term::process_csi_seq () 2789rxvt_term::process_csi_seq ()
2808{ 2790{
2809 unicode_t ch, priv, i; 2791 unicode_t ch, priv, i;
2810 unsigned int nargs, p; 2792 unsigned int nargs, p;
2811 int n, ndef; 2793 int n, ndef;
2812 int arg[ESC_ARGS]; 2794 int arg[ESC_ARGS] = { };
2813 2795
2814 memset (arg, 0, sizeof (arg));
2815 nargs = 0; 2796 nargs = 0;
2816 2797
2817 priv = 0; 2798 priv = 0;
2818 ch = cmd_getc (); 2799 ch = cmd_getc ();
2819 if (ch >= '<' && ch <= '?') 2800 if (ch >= '<' && ch <= '?')
… …
3435 break; 3416 break;
3436#endif 3417#endif
3437#if ENABLE_TRANSPARENCY 3418#if ENABLE_TRANSPARENCY
3438 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3421 {
3422 bool changed = false;
3423 if (ISSET_PIXCOLOR (Color_tint))
3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3425 else
3426 changed = bgPixmap.unset_tint ();
3427 if (changed)
3428 update_background ();
3429 }
3440 3430
3441 check_our_parents ();
3442
3443 if (am_transparent)
3444 want_full_refresh = want_refresh = 1;
3445
3446 break; 3431 break;
3447#endif 3432#endif
3448 3433
3449#if XPM_BACKGROUND 3434#if BG_IMAGE_FROM_FILE
3450 case Rxvt_Pixmap: 3435 case Rxvt_Pixmap:
3451 { 3436 if (!strcmp (str, "?"))
3452 if (*str != ';')
3453 { 3437 {
3454 bgPixmap.handle_geometry (""); /* reset to default scaling */ 3438 char str[256];
3455 set_bgPixmap (str); /* change pixmap */ 3439
3456 scr_touch (true); 3440 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3441 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3442 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3443 process_xterm_seq (XTerm_title, str, CHAR_ST);
3457 } 3444 }
3458 3445 else
3446 {
3459 int changed = 0; 3447 int changed = 0;
3460 3448
3461 while ((str = strchr (str, ';')) != NULL) 3449 if (*str != ';')
3462 { 3450 {
3451 /* reset to default scaling :*/
3452 bgPixmap.unset_geometry ();
3453 if (bgPixmap.set_file (str)) /* change pixmap */
3454 changed++;
3455 str = strchr (str, ';');
3456 if (str == NULL)
3457 bgPixmap.set_defaultGeometry ();
3458 }
3459 while (str)
3460 {
3463 str++; 3461 str++;
3464 changed += bgPixmap.handle_geometry (str); 3462 if (bgPixmap.set_geometry (str))
3463 changed++;
3464 str = strchr (str, ';');
3465 } 3465 }
3466
3467 if (changed) 3466 if (changed)
3468 { 3467 update_background ();
3469 resize_pixmap ();
3470 scr_touch (true);
3471 } 3468 }
3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3473 if (option (Opt_transparent))
3474 check_our_parents ();
3475#endif
3476 }
3477 break; 3469 break;
3478#endif 3470#endif
3479 3471
3480 case Rxvt_restoreFG: 3472 case Rxvt_restoreFG:
3481 set_window_color (Color_fg, str); 3473 set_window_color (Color_fg, str);
… …
3605{ 3597{
3606 unsigned int i, j; 3598 unsigned int i, j;
3607 int state; 3599 int state;
3608 3600
3609 static const struct 3601 static const struct
3610 { 3602 {
3611 const int argval; 3603 const int argval;
3612 const unsigned long bit; 3604 const unsigned long bit;
3613 }
3614
3615 argtopriv[] = { 3605 } argtopriv[] = {
3616 { 1, PrivMode_aplCUR }, 3606 { 1, PrivMode_aplCUR },
3617 { 2, PrivMode_vt52 }, 3607 { 2, PrivMode_vt52 },
3618 { 3, PrivMode_132 }, 3608 { 3, PrivMode_132 },
3619 { 4, PrivMode_smoothScroll }, 3609 { 4, PrivMode_smoothScroll },
3620 { 5, PrivMode_rVideo }, 3610 { 5, PrivMode_rVideo },
… …
4012 4002
4013 if (v_buflen == 0) 4003 if (v_buflen == 0)
4014 { 4004 {
4015 free (v_buffer); 4005 free (v_buffer);
4016 v_buffer = 0; 4006 v_buffer = 0;
4017 v_buflen = 0;
4018 4007
4019 pty_ev.set (EVENT_READ); 4008 pty_ev.set (EVENT_READ);
4020 return; 4009 return;
4021 } 4010 }
4022 4011

Diff Legend

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