* skeleton of X11 skins

modules/gui/skins/Modules.am

@@ -91,6 +91,23 @@ SOURCES_skins = \
 	modules/gui/skins/gtk2/gtk2_window.cpp \
 	modules/gui/skins/gtk2/gtk2_window.h \
 	\
+        modules/gui/skins/x11/x11_api.cpp \
+	modules/gui/skins/x11/x11_bitmap.cpp \
+	modules/gui/skins/x11/x11_bitmap.h \
+	modules/gui/skins/x11/x11_dragdrop.cpp \
+	modules/gui/skins/x11/x11_dragdrop.h \
+	modules/gui/skins/x11/x11_event.cpp \
+	modules/gui/skins/x11/x11_event.h \
+	modules/gui/skins/x11/x11_font.cpp \
+	modules/gui/skins/x11/x11_font.h \
+	modules/gui/skins/x11/x11_graphics.cpp \
+	modules/gui/skins/x11/x11_graphics.h \
+	modules/gui/skins/x11/x11_run.cpp \
+	modules/gui/skins/x11/x11_theme.cpp \
+	modules/gui/skins/x11/x11_theme.h \
+	modules/gui/skins/x11/x11_window.cpp \
+	modules/gui/skins/x11/x11_window.h \
+	\
 	modules/gui/wxwindows/fileinfo.cpp \
 	modules/gui/wxwindows/messages.cpp \
 	modules/gui/wxwindows/open.cpp \

modules/gui/skins/controls/text.cpp

@@ -2,7 +2,7 @@
  * text.cpp: Text control
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: text.cpp,v 1.8 2003/04/28 12:25:34 asmax Exp $
+ * $Id: text.cpp,v 1.9 2003/04/28 14:12:32 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -77,7 +77,7 @@
     }
     //-----------------------------------------------------------------------
 
-    #else
+    #elif defined GTK2_SKINS
 
     //-----------------------------------------------------------------------
     // Gtk2 methods
@@ -110,6 +110,20 @@
     }
     //-----------------------------------------------------------------------
 
+    #elif defined X11_SKINS
+
+    //-----------------------------------------------------------------------
+    // X11 methods
+    //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    void ControlText::StartScrolling()
+    {
+    }
+    //-----------------------------------------------------------------------
+    void ControlText::StopScrolling()
+    {
+    }
+    //-----------------------------------------------------------------------
 
     #endif
 //---------------------------------------------------------------------------

modules/gui/skins/os_bitmap.h

@@ -2,7 +2,7 @@
  * os_bitmap.h: Wrapper for the Bitmap class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_bitmap.h,v 1.4 2003/04/28 12:00:13 asmax Exp $
+ * $Id: os_bitmap.h,v 1.5 2003/04/28 14:12:32 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,6 +30,9 @@
 #elif defined GTK2_SKINS
     #include "gtk2/gtk2_bitmap.h"
     #define OSBitmap GTK2Bitmap
+#elif defined X11_SKINS
+    #include "x11/x11_bitmap.h"
+    #define OSBitmap X11Bitmap
 #endif
 
 

modules/gui/skins/os_event.h

@@ -2,7 +2,7 @@
  * os_event.h: Wrapper for the Event class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_event.h,v 1.4 2003/04/28 12:00:13 asmax Exp $
+ * $Id: os_event.h,v 1.5 2003/04/28 14:12:32 asmax Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,5 +30,8 @@
 #elif defined GTK2_SKINS
     #include "gtk2/gtk2_event.h"
     #define OSEvent GTK2Event
+#elif defined X11_SKINS
+    #include "x11/x11_event.h"
+    #define OSEvent X11Event
 #endif
 

modules/gui/skins/os_font.h

@@ -2,7 +2,7 @@
  * os_font.h: Wrapper for the OSFont class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_font.h,v 1.5 2003/04/28 12:00:13 asmax Exp $
+ * $Id: os_font.h,v 1.6 2003/04/28 14:12:32 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -40,4 +40,12 @@
     #define VLC_FONT_ALIGN_CENTER  PANGO_ALIGN_CENTER
     #define VLC_FONT_ALIGN_RIGHT   PANGO_ALIGN_RIGHT
 
+#elif defined X11_SKINS
+    #include "x11/x11_font.h"
+    #define OSFont X11Font
+
+    #define VLC_FONT_ALIGN_LEFT    0
+    #define VLC_FONT_ALIGN_CENTER  1
+    #define VLC_FONT_ALIGN_RIGHT   2
+
 #endif

modules/gui/skins/os_graphics.h

@@ -2,7 +2,7 @@
  * os_graphics.h: Wrapper for the Graphics and Region classes
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_graphics.h,v 1.5 2003/04/28 12:00:13 asmax Exp $
+ * $Id: os_graphics.h,v 1.6 2003/04/28 14:12:32 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -36,5 +36,11 @@
     #define SRC_AND    2
     #define OSGraphics GTK2Graphics
     #define OSRegion   GTK2Region
+#elif defined X11_SKINS
+    #include "x11/x11_graphics.h"
+    #define SRC_COPY   1
+    #define SRC_AND    2
+    #define OSGraphics X11Graphics
+    #define OSRegion   X11Region
 #endif
 

modules/gui/skins/os_theme.h

@@ -2,7 +2,7 @@
  * os_theme.h: Wrapper for the OSTheme class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_theme.h,v 1.4 2003/04/28 12:00:13 asmax Exp $
+ * $Id: os_theme.h,v 1.5 2003/04/28 14:12:32 asmax Exp $
  *
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -30,4 +30,7 @@
 #elif defined GTK2_SKINS
     #include "gtk2/gtk2_theme.h"
     #define OSTheme GTK2Theme
+#elif defined X11_SKINS
+    #include "x11/x11_theme.h"
+    #define OSTheme X11Theme
 #endif

modules/gui/skins/os_window.h

@@ -2,7 +2,7 @@
  * os_window.h: Wrapper for the OSWindow class
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: os_window.h,v 1.4 2003/04/28 12:00:13 asmax Exp $
+ * $Id: os_window.h,v 1.5 2003/04/28 14:12:32 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -32,4 +32,8 @@
     #include "gtk2/gtk2_dragdrop.h"
     #include "gtk2/gtk2_window.h"
     #define OSWindow GTK2Window
+#elif defined X11_SKINS
+    #include "x11/x11_dragdrop.h"
+    #include "x11/x11_window.h"
+    #define OSWindow X11Window
 #endif

modules/gui/skins/src/skin_common.h

@@ -2,7 +2,7 @@
  * skin_common.h: Private Skin interface description
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_common.h,v 1.5 2003/04/23 10:29:52 asmax Exp $
+ * $Id: skin_common.h,v 1.6 2003/04/28 14:12:33 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -39,6 +39,10 @@ class SoutDialog;
 class PrefsDialog;
 class FileInfo;
 
+#ifdef X11_SKINS
+#include <X11/Xlib.h>
+#endif
+
 //---------------------------------------------------------------------------
 // intf_sys_t: description and status of skin interface
 //---------------------------------------------------------------------------
@@ -78,6 +82,10 @@ struct intf_sys_t
     vlc_mutex_t init_lock;
     vlc_cond_t  init_cond;
 
+#ifdef X11_SKINS
+    Display *display;
+#endif
+
 };
 
 #endif

modules/gui/skins/src/skin_main.cpp

@@ -2,7 +2,7 @@
  * skin-main.cpp: skins plugin for VLC
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: skin_main.cpp,v 1.20 2003/04/28 12:00:14 asmax Exp $
+ * $Id: skin_main.cpp,v 1.21 2003/04/28 14:12:33 asmax Exp $
  *
  * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
  *          Emmanuel Puig    <karibu@via.ecp.fr>
@@ -43,6 +43,9 @@
 #include "skin_common.h"
 #include "wxdialogs.h"
 
+#ifdef X11_SKINS
+#include <X11/Xlib.h>
+#endif
 
 //---------------------------------------------------------------------------
 // Interface thread
@@ -112,6 +115,9 @@ static int Open ( vlc_object_t *p_this )
     char **pp_args  = p_args;
 
     gdk_init( &i_args, &pp_args );
+#elif defined X11_SKINS
+    // Initialize X11
+    p_intf->p_sys->display = XOpenDisplay( NULL );
 #endif
 
     // Initialize conditions and mutexes