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.346 by root, Wed Aug 15 06:48:16 2007 UTC vs.
Revision 1.350 by ayin, Sat Sep 8 20:48:31 2007 UTC

563 else 563 else
564 strcpy (kbuf, key_backspace); 564 strcpy (kbuf, key_backspace);
565 break; 565 break;
566#endif 566#endif
567#ifndef NO_DELETE_KEY 567#ifndef NO_DELETE_KEY
568# ifdef XK_KP_Prior 568# ifdef XK_KP_Delete
569 case XK_KP_Delete: 569 case XK_KP_Delete:
570 /* allow shift to override */ 570 /* allow shift to override */
571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
572 { 572 {
573 strcpy (kbuf, "\033On"); 573 strcpy (kbuf, "\033On");
1474 && ev.xfocus.mode != NotifyGrab) 1474 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1475 focus_out ();
1476 break; 1476 break;
1477 1477
1478 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);*/
1479 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1480 { 1483 {
1481 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1482 ; 1485 ;
1483 1486
1484 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1485 { 1488 {
1486 seen_resize = 1; 1489 seen_resize = 1;
1487 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1488#ifdef XPM_BACKGROUND
1489 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1490 if (!option (Opt_transparent) && bgPixmap.window_size_sensitive ())
1491 {
1492 bgPixmap.render ();
1493 scr_touch (true);
1494 }
1495#endif
1496 } 1491 }
1497 1492 else
1493 {
1494#ifdef ENABLE_TRANSPARENCY
1495 if (option (Opt_transparent))
1496 update_background ();
1497#endif
1498 }
1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1499
1500#ifdef ENABLE_TRANSPARENCY
1501 if (option (Opt_transparent))
1502 bgPixmap.render ();
1503#endif
1504 } 1500 }
1505 break; 1501 break;
1506 1502
1507 case PropertyNotify: 1503 case PropertyNotify:
1508 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)))
1833 */ 1829 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1832 {
1837 bgPixmap.set_root_pixmap (); 1833 bgPixmap.set_root_pixmap ();
1838 bgPixmap.render (); 1834 update_background ();
1839 } 1835 }
1840 break; 1836 break;
1841 } 1837 }
1842# endif 1838# endif
1843} 1839}
2799rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
2800{ 2796{
2801 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
2802 unsigned int nargs, p; 2798 unsigned int nargs, p;
2803 int n, ndef; 2799 int n, ndef;
2804 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
2805 2801
2806 memset (arg, 0, sizeof (arg));
2807 nargs = 0; 2802 nargs = 0;
2808 2803
2809 priv = 0; 2804 priv = 0;
2810 ch = cmd_getc (); 2805 ch = cmd_getc ();
2811 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3434 if (ISSET_PIXCOLOR (Color_tint)) 3429 if (ISSET_PIXCOLOR (Color_tint))
3435 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3436 else 3431 else
3437 changed = bgPixmap.unset_tint (); 3432 changed = bgPixmap.unset_tint ();
3438 if (changed) 3433 if (changed)
3439 bgPixmap.render (); 3434 update_background ();
3440 } 3435 }
3441 3436
3442 break; 3437 break;
3443#endif 3438#endif
3444 3439
3473 if (bgPixmap.set_geometry (str)) 3468 if (bgPixmap.set_geometry (str))
3474 changed++; 3469 changed++;
3475 str = strchr (str, ';'); 3470 str = strchr (str, ';');
3476 } 3471 }
3477 if (changed) 3472 if (changed)
3478 { 3473 update_background ();
3479 bgPixmap.render ();
3480 scr_touch (true);
3481 }
3482 } 3474 }
3483 break; 3475 break;
3484#endif 3476#endif
3485 3477
3486 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines