GTK gtk
GTK2 gtk2
SKINS skins
+BASIC_SKINS basic-skins
FAMILIAR familiar
WXWINDOWS wxwindows
QT qt
bool 'GTK2 support' CONFIG_GTK2
dep_bool ' Gnome2 support' CONFIG_GNOME2 $CONFIG_GTK2
bool 'Skins module' CONFIG_SKINS
+bool 'Basic skins module (without wxWindows)' CONFIG_BASIC_SKINS
bool 'Familiar GTK+ support' CONFIG_FAMILIAR
bool 'wxWindows support' CONFIG_WXWINDOWS
bool 'Qt interface support' CONFIG_QT
* gtk2_run.cpp:
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: gtk2_run.cpp,v 1.21 2003/04/28 12:00:13 asmax Exp $
+ * $Id: gtk2_run.cpp,v 1.22 2003/04/30 21:16:24 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
#include <gtk/gtk.h>
//--- WWWINDOWS -------------------------------------------------------------
+#ifndef BASIC_SKINS
#include <wx/wx.h>
+#endif
//--- VLC -------------------------------------------------------------------
#include <vlc/intf.h>
#include "../os_theme.h"
#include "../src/skin_common.h"
#include "../src/vlcproc.h"
+#ifndef BASIC_SKINS
#include "../src/wxdialogs.h"
+#endif
// include the icon graphic
#include "share/vlc32x32.xpm"
//---------------------------------------------------------------------------
// Local classes declarations.
//---------------------------------------------------------------------------
+#ifndef BASIC_SKINS
class Instance: public wxApp
{
public:
intf_thread_t *p_intf;
CallBackObjects *callbackobj;
};
+#endif
//---------------------------------------------------------------------------
// Check if vlc is closing
proc->IsClosing();
+#ifndef BASIC_SKINS
gtk_main_do_event( event );
+#endif
}
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// Implementation of Instance class
//---------------------------------------------------------------------------
+#ifndef BASIC_SKINS
Instance::Instance( )
{
}
return TRUE;
}
-
+#endif
//---------------------------------------------------------------------------
CallBackObjects *callbackobj = new CallBackObjects();
callbackobj->Proc = new VlcProc( p_intf );
+#ifndef BASIC_SKINS
wxTheApp = new Instance( p_intf, callbackobj );
-
wxEntry( 1, p_args );
-
+#else
+ gdk_event_handler_set( GTK2Proc, (gpointer)callbackobj, NULL );
+ // Add timer
+ g_timeout_add( 200, (GSourceFunc)RefreshTimer, (gpointer)p_intf );
+#endif
+
delete callbackobj;
}
//---------------------------------------------------------------------------
* window.cpp: Window class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: window.cpp,v 1.21 2003/04/28 12:00:14 asmax Exp $
+ * $Id: window.cpp,v 1.22 2003/04/30 21:16:24 asmax Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
unsigned int i;
// Create Bitmap Buffer
+// Graphics *Buffer = (Graphics *)new OSGraphics( p_intf, w, h, this );
Graphics *Buffer = (Graphics *)new OSGraphics( w, h, this );
// Draw every control
// Change image buffer
if( Image != NULL )
delete (OSGraphics *)Image;
+// Image = (Graphics *)new OSGraphics( p_intf, w, h, this );
Image = (Graphics *)new OSGraphics( w, h, this );
-
Size( w, h );
}
* x11_bitmap.cpp: X11 implementation of the Bitmap class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: x11_bitmap.cpp,v 1.1 2003/04/28 14:32:57 asmax Exp $
+ * $Id: x11_bitmap.cpp,v 1.2 2003/04/30 21:16:24 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Emmanuel Puig <karibu@via.ecp.fr>
{
if( Bmp )
{
-/* GdkDrawable *destImg = ( (X11Graphics *)dest )->GetImage();
- GdkGC *destGC = ( (X11Graphics *)dest )->GetGC();
+ Drawable destImg = ( (X11Graphics *)dest )->GetImage();
+ GC destGC = ( (X11Graphics *)dest )->GetGC();
- gdk_pixbuf_render_to_drawable( Bmp, destImg, destGC, x, y, xRef, yRef,
- w, h, GDK_RGB_DITHER_NORMAL, 0, 0);*/
+ XCopyArea( display, Bmp, destImg, destGC, x, y, w, h, xRef, yRef );
}
}
//---------------------------------------------------------------------------
* x11_graphics.cpp: X11 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: x11_graphics.cpp,v 1.1 2003/04/28 14:32:57 asmax Exp $
+ * $Id: x11_graphics.cpp,v 1.2 2003/04/30 21:16:24 asmax Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Emmanuel Puig <karibu@via.ecp.fr>
//--- X11 -----------------------------------------------------------------
#include <X11/Xlib.h>
+//--- VLC -----------------------------------------------------------------
+#include <vlc/intf.h>
+
//--- SKIN ------------------------------------------------------------------
#include "../src/graphics.h"
#include "../src/window.h"
#include "../os_window.h"
#include "x11_graphics.h"
+#include "../src/skin_common.h"
#include <stdio.h>
#include <math.h>
//---------------------------------------------------------------------------
// X11 GRAPHICS
//---------------------------------------------------------------------------
-X11Graphics::X11Graphics( int w, int h, SkinWindow *from ) : Graphics( w, h )
+X11Graphics::X11Graphics( intf_thread_t *p_intf, int w, int h,
+ SkinWindow *from ) : Graphics( w, h )
{
-/* if( from != NULL )
+ display = p_intf->p_sys->display;
+ int screen = DefaultScreen( display );
+
+ if( from != NULL )
{
- GdkWindow *fromWnd = ( (X11Window *)from )->GetHandle();
- Image = (GdkDrawable*) gdk_pixmap_new( fromWnd, w, h, -1 );
- Gc = gdk_gc_new( ( GdkDrawable* )fromWnd );
+ Window fromWnd = ( (X11Window *)from )->GetHandle();
+
+ XWindowAttributes attr;
+ XGetWindowAttributes( display, fromWnd, &attr);
+
+ Image = XCreatePixmap( display, fromWnd, w, h, attr.depth );
+ Gc = DefaultGC( display, screen );
}
else
{
- // FIXME: 8 -> screen depth
- Image = (GdkDrawable*) gdk_pixmap_new( NULL, w, h, 16 );
- gdk_drawable_set_colormap( Image, gdk_colormap_get_system() );
- Gc = gdk_gc_new( Image );
- }
+ Window root = DefaultRootWindow( display );
+ Image = XCreatePixmap( display, root, w, h,
+ DefaultDepth( display, screen ) );
+ Gc = DefaultGC( display, screen );
+ }
// Set the background color to black
- gdk_draw_rectangle( Image, Gc, TRUE, 0, 0, w, h );*/
+ // gdk_draw_rectangle( Image, Gc, TRUE, 0, 0, w, h );
}
//---------------------------------------------------------------------------
X11Graphics::~X11Graphics()
void X11Graphics::CopyFrom( int dx, int dy, int dw, int dh, Graphics *Src,
int sx, int sy, int Flag )
{
-/* gdk_draw_drawable( Image, Gc, (( X11Graphics* )Src )->GetImage(),
- sx, sy, dx, dy, dw, dh );*/
+ XCopyArea( display, (( X11Graphics* )Src )->GetImage(), Image, Gc,
+ sx, sy, dw, dh, dx, dy );
}
//---------------------------------------------------------------------------
void X11Graphics::DrawRect( int x, int y, int w, int h, int color )
* x11_graphics.h: X11 implementation of the Graphics and Region classes
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: x11_graphics.h,v 1.1 2003/04/28 14:32:57 asmax Exp $
+ * $Id: x11_graphics.h,v 1.2 2003/04/30 21:16:24 asmax Exp $
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
* Olivier Teulière <ipkiss@via.ecp.fr>
class X11Graphics : public Graphics
{
protected:
- /* Drawable *Image;
- GdkGC *Gc;*/
+ Display *display;
+ Drawable Image;
+ GC Gc;
public:
// Constructor
- X11Graphics( int w, int h, SkinWindow *from = NULL );
+ X11Graphics( intf_thread_t *p_intf, int w, int h, SkinWindow *from = NULL );
// Destructor
virtual ~X11Graphics();
// Drawing methods
virtual void ResetClipRegion();
// Specific X11 methods
-/* GdkDrawable *GetImage() { return Image; };
- GdkGC *GetGC() { return Gc; };*/
+ Drawable GetImage() { return Image; };
+ GC GetGC() { return Gc; };
};
//---------------------------------------------------------------------------
class X11Region : public SkinRegion
projects / vlc / commitdiff