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.336 by root, Sat Jun 30 18:10:41 2007 UTC vs.
Revision 1.339 by ayin, Fri Aug 3 14:03:28 2007 UTC

… …
519# endif 519# endif
520 return; 520 return;
521 } 521 }
522 else 522 else
523 { 523 {
524# if ENABLE_OVERLAY 524# if ISO_14755
525 scr_overlay_off (); 525 scr_overlay_off ();
526# endif 526# endif
527 iso14755buf = 0; 527 iso14755buf = 0;
528 } 528 }
529 } 529 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
533 { 533 {
534 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 535# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 538# endif
539 } 539 }
540#endif 540#endif
… …
728 728
729 case XK_Find: 729 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
731 break; 731 break;
732 732
733#ifdef XK_KP_End 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 ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 { 737 {
738 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
… …
934#if ENABLE_FRILLS || ISO_14755 934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 935 // ISO 14755 support
936 if (iso14755buf) 936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 937 if (iso14755buf & ISO_14755_52)
938 { 938 {
939# if ENABLE_OVERLAY 939# if ISO_14755
940 scr_overlay_off (); 940 scr_overlay_off ();
941# endif 941# endif
942# if ISO_14755 942# if ISO_14755
943 // iso14755 part 5.2 handling: release time 943 // iso14755 part 5.2 handling: release time
944 // first: controls 944 // first: controls
… …
967 967
968 return; 968 return;
969 } 969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 971 {
972# if ENABLE_OVERLAY 972# if ISO_14755
973 scr_overlay_off (); 973 scr_overlay_off ();
974# endif 974# endif
975 if (iso14755buf & ISO_14755_51) 975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 976 commit_iso14755 ();
977#if ISO_14755 977#if ISO_14755
… …
1779 1779
1780#if ENABLE_FRILLS || ISO_14755 1780#if ENABLE_FRILLS || ISO_14755
1781 if (iso14755buf) 1781 if (iso14755buf)
1782 { 1782 {
1783 iso14755buf = 0; 1783 iso14755buf = 0;
1784# if ENABLE_OVERLAY 1784# if ISO_14755
1785 scr_overlay_off (); 1785 scr_overlay_off ();
1786# endif 1786# endif
1787 } 1787 }
1788#endif 1788#endif
1789#if USE_XIM 1789#if USE_XIM
… …
3443 want_full_refresh = want_refresh = 1; 3443 want_full_refresh = want_refresh = 1;
3444 3444
3445 break; 3445 break;
3446#endif 3446#endif
3447 3447
3448#if XPM_BACKGROUND
3448 case Rxvt_Pixmap: 3449 case Rxvt_Pixmap:
3449 { 3450 {
3450 if (*str != ';') 3451 if (*str != ';')
3451 { 3452 {
3452#if XPM_BACKGROUND
3453 scale_pixmap (""); /* reset to default scaling */ 3453 scale_pixmap (""); /* reset to default scaling */
3454 set_bgPixmap (str); /* change pixmap */ 3454 set_bgPixmap (str); /* change pixmap */
3455 scr_touch (true); 3455 scr_touch (true);
3456#endif
3457 } 3456 }
3458 3457
3459 int changed = 0; 3458 int changed = 0;
3460 3459
3461 while ((str = strchr (str, ';')) != NULL) 3460 while ((str = strchr (str, ';')) != NULL)
3462 { 3461 {
3463 str++; 3462 str++;
3464#if XPM_BACKGROUND
3465 changed += scale_pixmap (str); 3463 changed += scale_pixmap (str);
3466#endif
3467 } 3464 }
3468 3465
3469 if (changed) 3466 if (changed)
3470 { 3467 {
3471#ifdef XPM_BACKGROUND
3472 resize_pixmap (); 3468 resize_pixmap ();
3473 scr_touch (true); 3469 scr_touch (true);
3474#endif
3475 } 3470 }
3476#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE) 3471#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3477 if (option (Opt_transparent)) 3472 if (option (Opt_transparent))
3478 check_our_parents (); 3473 check_our_parents ();
3479#endif 3474#endif
3480 } 3475 }
3481 break; 3476 break;
3477#endif
3482 3478
3483 case Rxvt_restoreFG: 3479 case Rxvt_restoreFG:
3484 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3485 break; 3481 break;
3486 case Rxvt_restoreBG: 3482 case Rxvt_restoreBG:

Diff Legend

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