* modules/gui/skins/x11/*: fixed transparency problem. XShapeCombineRegion() needs...

diff --git a/modules/gui/skins/x11/x11_bitmap.cpp b/modules/gui/skins/x11/x11_bitmap.cpp
index 31e34c0fd6ac15641ccd22588e87fdae13deeaaa..79d3f554470f4f8a575ca84543777385b0125c36 100644 (file)
--- a/modules/gui/skins/x11/x11_bitmap.cpp
+++ b/modules/gui/skins/x11/x11_bitmap.cpp
@@ -2,7 +2,7 @@
  * x11_bitmap.cpp: X11 implementation of the Bitmap class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: x11_bitmap.cpp,v 1.9 2003/06/01 22:11:24 asmax Exp $
+ * $Id: x11_bitmap.cpp,v 1.10 2003/06/08 12:45:13 gbazin Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -55,7 +55,7 @@ X11Bitmap::X11Bitmap( intf_thread_t *_p_intf, string FileName, int AColor )
     : Bitmap( p_intf, FileName, AColor )
 {
     p_intf = _p_intf;
-    
+
     // Find the display
     display = p_intf->p_sys->display;
     int screen = DefaultScreen( display );
@@ -70,10 +70,10 @@ X11Bitmap::X11Bitmap( intf_thread_t *_p_intf, string FileName, int AColor )
     {
         return;
     }
- 
+
     AlphaColor = (AColor & 0xff) << 16 | (AColor & 0xff00) | 
                  (AColor & 0xff0000) >> 16;
-     
+
     XLOCK;
     imlib_context_set_display( display );
     imlib_context_set_visual( visual );
@@ -85,7 +85,7 @@ X11Bitmap::X11Bitmap( intf_thread_t *_p_intf, string FileName, int AColor )
     imlib_context_set_image( Img );
     Width = imlib_image_get_width();
     Height = imlib_image_get_height();
- 
+
     // Add an alpha layer
     DATA32 *data = imlib_image_get_data();
     DATA32 *ptr = data;

diff --git a/modules/gui/skins/x11/x11_timer.h b/modules/gui/skins/x11/x11_timer.h
index 6a6ae0f561b109d5c9dfc8d5d21fd6cbce990e9e..892f39e35e570b473d4c658b062bd1047d0f0e4a 100644 (file)
--- a/modules/gui/skins/x11/x11_timer.h
+++ b/modules/gui/skins/x11/x11_timer.h
@@ -2,7 +2,7 @@
  * x11_timer.h: helper class to implement timers
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: x11_timer.h,v 1.3 2003/06/08 11:33:14 asmax Exp $
+ * $Id: x11_timer.h,v 1.4 2003/06/08 12:45:13 gbazin Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -26,7 +26,8 @@
 #ifndef VLC_SKIN_X11_TIMER
 #define VLC_SKIN_X11_TIMER
 
-#include <list.h>
+#include <list>
+using namespace std;
 
 typedef struct
 {

diff --git a/modules/gui/skins/x11/x11_window.cpp b/modules/gui/skins/x11/x11_window.cpp
index b5b21586600b316b645872474fe30d2cacceac6f..7fc782b6a571874ff5a93780706da4bd50727d70 100644 (file)
--- a/modules/gui/skins/x11/x11_window.cpp
+++ b/modules/gui/skins/x11/x11_window.cpp
@@ -2,7 +2,7 @@
  * x11_window.cpp: X11 implementation of the Window class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: x11_window.cpp,v 1.14 2003/06/08 11:33:14 asmax Exp $
+ * $Id: x11_window.cpp,v 1.15 2003/06/08 12:45:13 gbazin Exp $
  *
  * Authors: Cyril Deguet     <asmax@videolan.org>
  *
@@ -63,26 +63,23 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
               dragdrop )
 {
     // Set handles
-    Wnd           = wnd;
-
-    display = p_intf->p_sys->display;
-    int screen = DefaultScreen( display );
-
-    Gc = DefaultGC( display, screen );
-
+    Wnd         = wnd;
+    display     = p_intf->p_sys->display;
+    int screen  = DefaultScreen( display );
     Name        = name;
-
     LButtonDown = false;
     RButtonDown = false;
 
+    // Creation of a graphic context that doesn't generate a GraphicsExpose
+    // event when using functions like XCopyArea
+    XGCValues gcVal;
+    gcVal.graphics_exposures = False;
+    XLOCK;
+    Gc = XCreateGC( display, wnd, GCGraphicsExposures, &gcVal );
+    XUNLOCK;
+
     // Removing fading effect
     Transition  = 0;
-/*
-    // Set position parameters
-    CursorPos    = new POINT;
-    WindowPos    = new POINT;
-
-*/
 
     if( DragDrop )
     {
@@ -104,10 +101,11 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
     XSetWindowAttributes attr;
     attr.background_pixel = color.pixel;
     attr.override_redirect = True;
-    ToolTip.window = XCreateWindow( display, root, 0, 0, 1, 1, 1, 0, InputOutput,
-                                    CopyFromParent, CWBackPixel|CWOverrideRedirect, &attr );
-    XGCValues gcVal;
-    ToolTip.font = XLoadFont( display, "-*-helvetica-bold-r-*-*-*-80-*-*-*-*-*-*" );
+    ToolTip.window = XCreateWindow( display, root, 0, 0, 1, 1, 1, 0,
+                                    InputOutput, CopyFromParent,
+                                    CWBackPixel|CWOverrideRedirect, &attr );
+    ToolTip.font = XLoadFont( display,
+                              "-*-helvetica-bold-r-*-*-*-80-*-*-*-*-*-*" );
     gcVal.font = ToolTip.font;
     gcVal.foreground = 0;
     gcVal.background = color.pixel;
@@ -138,7 +136,10 @@ X11Window::~X11Window()
     {
         DestroyWindow( hWnd );
     }*/
+
+    XFreeGC( display, Gc );
     XDestroyWindow( display, ToolTip.window );
+
     /*
     if( DragDrop )
     {
@@ -148,17 +149,62 @@ X11Window::~X11Window()
         // Uninitialize the OLE library
         OleUninitialize();
     }*/
- /*   if( gWnd )
-    {
-        gdk_window_destroy( gWnd );
-    }*/
 }
 //---------------------------------------------------------------------------
 void X11Window::OSShow( bool show )
 {
     if( show )
     {
+        // We do the call to XShapeCombineRegion() here because the window
+        // must be unmapped for this to work.
+        Drawable drawable = (( X11Graphics* )Image )->GetImage();
+
         XLOCK;
+        XImage *image = XGetImage( display, drawable, 0, 0, Width, Height, 
+                                   AllPlanes, ZPixmap );
+        if( image )
+        {
+            // Mask for transparency
+            Region region = XCreateRegion();
+            region = XCreateRegion();
+            for( int line = 0; line < Height; line++ )
+            {
+                int start = 0, end = 0;
+                while( start < Width )
+                {
+                    while( start < Width && XGetPixel( image, start, line )
+                           == 0 )
+                    {
+                        start++;
+                    }
+                    end = start;
+                    while( end < Width && XGetPixel( image, end, line ) != 0)
+                    {
+                        end++;
+                    }
+                    XRectangle rect;
+                    rect.x = start;
+                    rect.y = line;
+                    rect.width = end - start + 1;
+                    rect.height = 1;
+                    Region newRegion = XCreateRegion();
+                    XUnionRectWithRegion( &rect, region, newRegion );
+                    XDestroyRegion( region );
+                    region = newRegion;
+                    start = end + 1;
+                }
+            }
+
+            XShapeCombineRegion( display, Wnd, ShapeBounding, 0, 0, region,
+                                 ShapeSet );
+            XDestroyRegion( region );
+
+        }
+        else
+        {
+            msg_Err( p_intf, "X11Window::OSShow XShapeCombineRegion() failed");
+        }
+
         XMapWindow( display, Wnd );
         XMoveWindow( display, Wnd, Left, Top );
         XUNLOCK;
@@ -262,14 +308,14 @@ bool X11Window::ProcessOSEvent( Event *evt )
                     MouseUp( (int)( (XButtonEvent *)p2 )->x,
                              (int)( (XButtonEvent *)p2 )->y, 2 );
                     break; 
-                    
+
                 case 4:
                     // Scroll up
                     MouseScroll( (int)( (XButtonEvent *)p2 )->x,
                                  (int)( (XButtonEvent *)p2 )->y,
                                  MOUSE_SCROLL_UP);
                     break;
-                    
+ 
                 case 5:
                     // Scroll down
                     MouseScroll( (int)( (XButtonEvent *)p2 )->x,
@@ -306,48 +352,9 @@ void X11Window::SetTransparency( int Value )
 void X11Window::RefreshFromImage( int x, int y, int w, int h )
 {
     Drawable drawable = (( X11Graphics* )Image )->GetImage();
-    
+
     XLOCK;
     XCopyArea( display, drawable, Wnd, Gc, x, y, w, h, x, y );
- 
-    XImage *image = XGetImage( display, drawable, 0, 0, Width, Height, 
-                               AllPlanes, ZPixmap );
-    if( !image )
-    {
-        msg_Err( p_intf, "X11Window::RefreshFromImage failed");
-    }
- 
-    // Mask for transparency
-    Region region = XCreateRegion();
-    for( int line = 0; line < Height; line++ )
-    {
-        int start = 0, end = 0;
-        while( start < Width )
-        {
-            while( start < Width && XGetPixel( image, start, line ) == 0 )
-            {
-                start++;
-            } 
-            end = start;
-            while( end < Width && XGetPixel( image, end, line ) != 0)
-            {
-                end++;
-            }
-            XRectangle rect;
-            rect.x = start;
-            rect.y = line;
-            rect.width = end - start + 1;
-            rect.height = 1;
-            Region newRegion = XCreateRegion();
-            XUnionRectWithRegion( &rect, region, newRegion );
-            XDestroyRegion( region );
-            region = newRegion;
-            start = end + 1;
-        }
-    }
-    XShapeCombineRegion( display, Wnd, ShapeBounding, 0, 0, region, ShapeSet );
-    XDestroyRegion( region );
-
     XSync( display, 0);
     XUNLOCK;
 }