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.351 by ayin, Sun Sep 9 10:14:40 2007 UTC vs.
Revision 1.359 by ayin, Mon Oct 15 14:56:06 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:
… …
566#endif 567#endif
567#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Delete 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 */
… …
599#ifdef XK_KP_Left 600#ifdef XK_KP_Left
600 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
601 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
602 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
603 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
604 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
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 */
… …
1033 1034
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)
… …
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 1306
1307 x = ev.x; 1307 x = Pixel2Col (ev.x);
1308 y = ev.y; 1308 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y);
1310 1309
1311 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
1312 button_number = 3; 1311 button_number = 3;
1313 else 1312 else
1314 { 1313 {
… …
1474 && ev.xfocus.mode != NotifyGrab) 1473 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1474 focus_out ();
1476 break; 1475 break;
1477 1476
1478 case ConfigureNotify: 1477 case ConfigureNotify:
1479/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1478 /* 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, 1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height);*/ 1480 szHint.width, szHint.height); */
1482 if (ev.xconfigure.window == parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1483 { 1482 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1484 ;
1486 1485
… …
1489 seen_resize = 1; 1488 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1490 }
1492 else 1491 else
1493 { 1492 {
1494#ifdef ENABLE_TRANSPARENCY 1493#ifdef HAVE_BG_PIXMAP
1495 if (option (Opt_transparent)) 1494 if (bgPixmap.window_position_sensitive ())
1496 update_background (); 1495 update_background ();
1497#endif 1496#endif
1498 } 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 } 1499 }
… …
1535 text_blink_ev.stop (); 1534 text_blink_ev.stop ();
1536#endif 1535#endif
1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1537 break;
1539 1538
1540#ifdef ENABLE_TRANSPARENCY
1541 case ReparentNotify:
1542 rootwin_cb (ev);
1543 break;
1544#endif /* ENABLE_TRANSPARENCY */
1545
1546 case GraphicsExpose: 1539 case GraphicsExpose:
1547 case Expose: 1540 case Expose:
1548 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1549 { 1542 {
1550 do 1543 do
1544 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1554 1549
1555 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1556 1551
1557 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 {
1558 scr_expose (ev.xexpose.x, ev.xexpose.y, 1554 scr_expose (ev.xexpose.x, ev.xexpose.y,
1559 ev.xexpose.width, ev.xexpose.height, False); 1555 ev.xexpose.width, ev.xexpose.height, False);
1560 1556 }
1561 want_refresh = 1; 1557 want_refresh = 1;
1562 } 1558 }
1563 else 1559 else
1564 { 1560 {
1565 XEvent unused_event; 1561 XEvent unused_event;
… …
1743 } 1739 }
1744#endif 1740#endif
1745#if ENABLE_FRILLS 1741#if ENABLE_FRILLS
1746 if (option (Opt_urgentOnBell)) 1742 if (option (Opt_urgentOnBell))
1747 { 1743 {
1748 XWMHints *h;
1749
1750 h = XGetWMHints(dpy, parent[0]); 1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1751 if (h != NULL)
1752 { 1745 {
1753 h->flags &= ~XUrgencyHint; 1746 h->flags &= ~XUrgencyHint;
1754 XSetWMHints(dpy, parent[0], h); 1747 XSetWMHints (dpy, parent[0], h);
1755 } 1748 }
1756 } 1749 }
1757#endif 1750#endif
1758 } 1751 }
1759} 1752}
… …
3435 } 3428 }
3436 3429
3437 break; 3430 break;
3438#endif 3431#endif
3439 3432
3440#if XPM_BACKGROUND 3433#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3435 if (!strcmp (str, "?"))
3443 { 3436 {
3444 char str[256]; 3437 char str[256];
3445 3438
… …
4008 4001
4009 if (v_buflen == 0) 4002 if (v_buflen == 0)
4010 { 4003 {
4011 free (v_buffer); 4004 free (v_buffer);
4012 v_buffer = 0; 4005 v_buffer = 0;
4013 v_buflen = 0;
4014 4006
4015 pty_ev.set (EVENT_READ); 4007 pty_ev.set (EVENT_READ);
4016 return; 4008 return;
4017 } 4009 }
4018 4010

Diff Legend

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