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.352 by ayin, Sun Sep 9 10:35:00 2007 UTC vs.
Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC

… …
1034 1034
1035void 1035void
1036rxvt_term::flush () 1036rxvt_term::flush ()
1037{ 1037{
1038 flush_ev.stop (); 1038 flush_ev.stop ();
1039 1039
1040#ifdef ENABLE_TRANSPARENCY 1040#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
1042 { 1042 {
1043 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 1044 scr_touch (false);
1046 } 1045 }
1047#endif 1046#endif
1048 1047
1049 if (want_refresh) 1048 if (want_refresh)
… …
1303rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1303{
1305 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1306 int x, y; 1305 int x, y;
1307 1306
1308 x = ev.x; 1307 x = Pixel2Col (ev.x);
1309 y = ev.y; 1308 y = Pixel2Row (ev.y);
1310 pixel_position (&x, &y);
1311 1309
1312 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
1313 button_number = 3; 1311 button_number = 3;
1314 else 1312 else
1315 { 1313 {
… …
1475 && ev.xfocus.mode != NotifyGrab) 1473 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1474 focus_out ();
1477 break; 1475 break;
1478 1476
1479 case ConfigureNotify: 1477 case ConfigureNotify:
1480/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1481 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1482 szHint.width, szHint.height);*/ 1480 szHint.width, szHint.height); */
1483 if (ev.xconfigure.window == parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1484 { 1482 {
1485 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1484 ;
1487 1485
… …
1490 seen_resize = 1; 1488 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1490 }
1493 else 1491 else
1494 { 1492 {
1495#ifdef ENABLE_TRANSPARENCY 1493#ifdef HAVE_BG_PIXMAP
1496 if (option (Opt_transparent)) 1494 if (bgPixmap.window_position_sensitive ())
1497 update_background (); 1495 update_background ();
1498#endif 1496#endif
1499 } 1497 }
1500 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1501 } 1499 }
… …
1536 text_blink_ev.stop (); 1534 text_blink_ev.stop ();
1537#endif 1535#endif
1538 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1537 break;
1540 1538
1541#ifdef ENABLE_TRANSPARENCY
1542 case ReparentNotify:
1543 rootwin_cb (ev);
1544 break;
1545#endif /* ENABLE_TRANSPARENCY */
1546
1547 case GraphicsExpose: 1539 case GraphicsExpose:
1548 case Expose: 1540 case Expose:
1549 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1550 { 1542 {
1551 do 1543 do
1544 {
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1555 1549
1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1557 1551
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1554 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1555 ev.xexpose.width, ev.xexpose.height, False);
1561 1556 }
1562 want_refresh = 1; 1557 want_refresh = 1;
1563 } 1558 }
1564 else 1559 else
1565 { 1560 {
1566 XEvent unused_event; 1561 XEvent unused_event;
… …
1744 } 1739 }
1745#endif 1740#endif
1746#if ENABLE_FRILLS 1741#if ENABLE_FRILLS
1747 if (option (Opt_urgentOnBell)) 1742 if (option (Opt_urgentOnBell))
1748 { 1743 {
1749 XWMHints *h;
1750
1751 h = XGetWMHints(dpy, parent[0]); 1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1752 if (h != NULL)
1753 { 1745 {
1754 h->flags &= ~XUrgencyHint; 1746 h->flags &= ~XUrgencyHint;
1755 XSetWMHints(dpy, parent[0], h); 1747 XSetWMHints (dpy, parent[0], h);
1756 } 1748 }
1757 } 1749 }
1758#endif 1750#endif
1759 } 1751 }
1760} 1752}
… …
3436 } 3428 }
3437 3429
3438 break; 3430 break;
3439#endif 3431#endif
3440 3432
3441#if XPM_BACKGROUND 3433#if BG_IMAGE_FROM_FILE
3442 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3443 if (!strcmp (str, "?")) 3435 if (!strcmp (str, "?"))
3444 { 3436 {
3445 char str[256]; 3437 char str[256];
3446 3438
… …
4009 4001
4010 if (v_buflen == 0) 4002 if (v_buflen == 0)
4011 { 4003 {
4012 free (v_buffer); 4004 free (v_buffer);
4013 v_buffer = 0; 4005 v_buffer = 0;
4014 v_buflen = 0;
4015 4006
4016 pty_ev.set (EVENT_READ); 4007 pty_ev.set (EVENT_READ);
4017 return; 4008 return;
4018 } 4009 }
4019 4010

Diff Legend

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