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.333 by ayin, Tue Jun 26 09:55:22 2007 UTC vs.
Revision 1.340 by sasha, Fri Aug 3 22:40:10 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
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1434 focus_out ();
1435 } 1435 }
1436#endif 1436#endif
1437 } 1437 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1438 break;
1443 1439
1444 /* 1440 /*
1445 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1488 1484
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1486 {
1491 seen_resize = 1; 1487 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1488 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND 1489#ifdef HAVE_BG_PIXMAP
1490 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1491 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1495 { 1492 {
1496 resize_pixmap (); 1493 resize_pixmap ();
1497 scr_touch (true); 1494 scr_touch (true);
1498 } 1495 }
1499#endif 1496#endif
… …
1783 1780
1784#if ENABLE_FRILLS || ISO_14755 1781#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1782 if (iso14755buf)
1786 { 1783 {
1787 iso14755buf = 0; 1784 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1785# if ISO_14755
1789 scr_overlay_off (); 1786 scr_overlay_off ();
1790# endif 1787# endif
1791 } 1788 }
1792#endif 1789#endif
1793#if USE_XIM 1790#if USE_XIM
… …
2812 unicode_t ch, priv, i; 2809 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2810 unsigned int nargs, p;
2814 int n, ndef; 2811 int n, ndef;
2815 int arg[ESC_ARGS]; 2812 int arg[ESC_ARGS];
2816 2813
2817 for (nargs = ESC_ARGS; nargs > 0;) 2814 memset (arg, 0, sizeof (arg));
2818 arg[--nargs] = 0; 2815 nargs = 0;
2819 2816
2820 priv = 0; 2817 priv = 0;
2821 ch = cmd_getc (); 2818 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2819 if (ch >= '<' && ch <= '?')
2823 { /* '<' '=' '>' '?' */ 2820 { /* '<' '=' '>' '?' */
… …
2867 switch (priv) 2864 switch (priv)
2868 { 2865 {
2869 case '>': 2866 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2867 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2868 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2869 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2870 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2871 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2872 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2873 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2874 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3447 want_full_refresh = want_refresh = 1; 3444 want_full_refresh = want_refresh = 1;
3448 3445
3449 break; 3446 break;
3450#endif 3447#endif
3451 3448
3449#if XPM_BACKGROUND
3452 case Rxvt_Pixmap: 3450 case Rxvt_Pixmap:
3453 { 3451 {
3454 if (*str != ';') 3452 if (*str != ';')
3455 { 3453 {
3456#if XPM_BACKGROUND
3457 scale_pixmap (""); /* reset to default scaling */ 3454 bgPixmap.handle_geometry (""); /* reset to default scaling */
3458 set_bgPixmap (str); /* change pixmap */ 3455 set_bgPixmap (str); /* change pixmap */
3459 scr_touch (true); 3456 scr_touch (true);
3460#endif
3461 } 3457 }
3462 3458
3463 int changed = 0; 3459 int changed = 0;
3464 3460
3465 while ((str = strchr (str, ';')) != NULL) 3461 while ((str = strchr (str, ';')) != NULL)
3466 { 3462 {
3467 str++; 3463 str++;
3468#if XPM_BACKGROUND 3464 changed += bgPixmap.handle_geometry (str);
3469 changed += scale_pixmap (str);
3470#endif
3471 } 3465 }
3472 3466
3473 if (changed) 3467 if (changed)
3474 { 3468 {
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap (); 3469 resize_pixmap ();
3477 scr_touch (true); 3470 scr_touch (true);
3478#endif
3479 } 3471 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE) 3472#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent)) 3473 if (option (Opt_transparent))
3482 check_our_parents (); 3474 check_our_parents ();
3483#endif 3475#endif
3484 } 3476 }
3485 break; 3477 break;
3478#endif
3486 3479
3487 case Rxvt_restoreFG: 3480 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str); 3481 set_window_color (Color_fg, str);
3489 break; 3482 break;
3490 case Rxvt_restoreBG: 3483 case Rxvt_restoreBG:

Diff Legend

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