ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvttoolkit.C
(Generate patch)

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.68 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.70 by sasha, Thu Jul 12 22:33:16 2007 UTC

443 return false; 443 return false;
444 444
445 screen = DefaultScreen (dpy); 445 screen = DefaultScreen (dpy);
446 root = DefaultRootWindow (dpy); 446 root = DefaultRootWindow (dpy);
447 447
448#ifdef HAVE_AFTERIMAGE
449 ::dpy = dpy; /* init global var from libAfter... */
450 asv = create_asvisual_for_id (dpy, screen, DefaultDepth (dpy,screen),
451 XVisualIDFromVisual (DefaultVisual (dpy, screen)), None, NULL);
452#endif
453
454 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 448 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
455 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa); 449 XInternAtoms (dpy, (char **)xa_names, NUM_XA, False, xa);
456 450
457 XrmSetDatabase (dpy, get_resources (false)); 451 XrmSetDatabase (dpy, get_resources (false));
458 452
559 if (xev.type == PropertyNotify 553 if (xev.type == PropertyNotify
560 && xev.xany.window == root 554 && xev.xany.window == root
561 && xev.xproperty.atom == xa[XA_XIM_SERVERS]) 555 && xev.xproperty.atom == xa[XA_XIM_SERVERS])
562 im_change_check (); 556 im_change_check ();
563#endif 557#endif
558 if (xev.type == MappingNotify)
559 XRefreshKeyboardMapping (&xev.xmapping);
560
564 for (int i = xw.size (); i--; ) 561 for (int i = xw.size (); i--; )
565 { 562 {
566 if (!xw[i]) 563 if (!xw[i])
567 xw.erase_unordered (i); 564 xw.erase_unordered (i);
568 else if (xw[i]->window == xev.xany.window) 565 else if (xw[i]->window == xev.xany.window)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines