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.344 by root, Fri Aug 10 23:52:12 2007 UTC vs.
Revision 1.350 by ayin, Sat Sep 8 20:48:31 2007 UTC

… …
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, 99 XK_ISO_Lock, 0x21eb,
100 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,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
564 else 563 else
565 strcpy (kbuf, key_backspace); 564 strcpy (kbuf, key_backspace);
566 break; 565 break;
567#endif 566#endif
568#ifndef NO_DELETE_KEY 567#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior 568# ifdef XK_KP_Delete
570 case XK_KP_Delete: 569 case XK_KP_Delete:
571 /* allow shift to override */ 570 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 571 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 { 572 {
574 strcpy (kbuf, "\033On"); 573 strcpy (kbuf, "\033On");
… …
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_background ();
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_background ();
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)))
… …
1577 if (isScrollbarWindow (ev.xany.window)) 1572 if (isScrollbarWindow (ev.xany.window))
1578 { 1573 {
1579 scrollBar.setIdle (); 1574 scrollBar.setIdle ();
1580 scrollbar_show (0); 1575 scrollbar_show (0);
1581 } 1576 }
1582
1583#ifdef ENABLE_TRANSPARENCY
1584 if (am_transparent && ev.xany.window == parent[0])
1585 XClearWindow (dpy, ev.xany.window);
1586#endif
1587 } 1577 }
1588 break; 1578 break;
1589 1579
1590 case MotionNotify: 1580 case MotionNotify:
1591#ifdef POINTER_BLANK 1581#ifdef POINTER_BLANK
… …
1839 */ 1829 */
1840 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1830 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1841 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1831 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1842 { 1832 {
1843 bgPixmap.set_root_pixmap (); 1833 bgPixmap.set_root_pixmap ();
1844 bgPixmap.render_background (); 1834 update_background ();
1845 } 1835 }
1846 break; 1836 break;
1847 } 1837 }
1848# endif 1838# endif
1849} 1839}
… …
2805rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
2806{ 2796{
2807 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
2808 unsigned int nargs, p; 2798 unsigned int nargs, p;
2809 int n, ndef; 2799 int n, ndef;
2810 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
2811 2801
2812 memset (arg, 0, sizeof (arg));
2813 nargs = 0; 2802 nargs = 0;
2814 2803
2815 priv = 0; 2804 priv = 0;
2816 ch = cmd_getc (); 2805 ch = cmd_getc ();
2817 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
… …
3440 if (ISSET_PIXCOLOR (Color_tint)) 3429 if (ISSET_PIXCOLOR (Color_tint))
3441 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3442 else 3431 else
3443 changed = bgPixmap.unset_tint (); 3432 changed = bgPixmap.unset_tint ();
3444 if (changed) 3433 if (changed)
3445 {
3446 bgPixmap.render_background (); 3434 update_background ();
3447 if (am_transparent)
3448 want_full_refresh = want_refresh = 1;
3449 }
3450 } 3435 }
3451 3436
3452 break; 3437 break;
3453#endif 3438#endif
3454 3439
… …
3483 if (bgPixmap.set_geometry (str)) 3468 if (bgPixmap.set_geometry (str))
3484 changed++; 3469 changed++;
3485 str = strchr (str, ';'); 3470 str = strchr (str, ';');
3486 } 3471 }
3487 if (changed) 3472 if (changed)
3488 {
3489 bgPixmap.render_background (); 3473 update_background ();
3490 scr_touch (true);
3491 }
3492 } 3474 }
3493 break; 3475 break;
3494#endif 3476#endif
3495 3477
3496 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:

Diff Legend

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