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.345 by sasha, Mon Aug 13 22:41:34 2007 UTC vs.
Revision 1.349 by ayin, Sun Aug 26 18:16:52 2007 UTC

94 XK_ISO_Left_Tab, 0x21e6, 94 XK_ISO_Left_Tab, 0x21e6,
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,
100 XK_ISO_Lock, 0x21eb, 99 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,
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 bgPixmap.render ();
1494 scr_touch (true);
1495 }
1496#endif
1497 } 1491 }
1498 1492 else
1493 {
1494#ifdef ENABLE_TRANSPARENCY
1495 if (option (Opt_transparent))
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 bgPixmap.render ();
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)))
1834 */ 1829 */
1835 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1836 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1837 { 1832 {
1838 bgPixmap.set_root_pixmap (); 1833 bgPixmap.set_root_pixmap ();
1839 bgPixmap.render (); 1834 update_background ();
1840 } 1835 }
1841 break; 1836 break;
1842 } 1837 }
1843# endif 1838# endif
1844} 1839}
2800rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
2801{ 2796{
2802 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
2803 unsigned int nargs, p; 2798 unsigned int nargs, p;
2804 int n, ndef; 2799 int n, ndef;
2805 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
2806 2801
2807 memset (arg, 0, sizeof (arg));
2808 nargs = 0; 2802 nargs = 0;
2809 2803
2810 priv = 0; 2804 priv = 0;
2811 ch = cmd_getc (); 2805 ch = cmd_getc ();
2812 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3435 if (ISSET_PIXCOLOR (Color_tint)) 3429 if (ISSET_PIXCOLOR (Color_tint))
3436 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3437 else 3431 else
3438 changed = bgPixmap.unset_tint (); 3432 changed = bgPixmap.unset_tint ();
3439 if (changed) 3433 if (changed)
3440 bgPixmap.render (); 3434 update_background ();
3441 } 3435 }
3442 3436
3443 break; 3437 break;
3444#endif 3438#endif
3445 3439
3474 if (bgPixmap.set_geometry (str)) 3468 if (bgPixmap.set_geometry (str))
3475 changed++; 3469 changed++;
3476 str = strchr (str, ';'); 3470 str = strchr (str, ';');
3477 } 3471 }
3478 if (changed) 3472 if (changed)
3479 { 3473 update_background ();
3480 bgPixmap.render ();
3481 scr_touch (true);
3482 }
3483 } 3474 }
3484 break; 3475 break;
3485#endif 3476#endif
3486 3477
3487 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines