diff gui/ui/video.c @ 35788:e3dcd5854344

Move video window initialization code to uiVideoInit().

--- a/gui/ui/video.c	Fri Jan 25 14:53:12 2013 +0000
+++ b/gui/ui/video.c	Fri Jan 25 15:12:25 2013 +0000
@@ -22,6 +22,7 @@
 
 #include "libvo/x11_common.h"
 #include "help_mp.h"
+#include "mp_msg.h"
 #include "mp_core.h"
 
 #include "ui.h"
@@ -29,6 +30,8 @@
 #include "gui/app/gui.h"
 #include "gui/interface.h"
 #include "gui/dialog/dialog.h"
+#include "gui/wm/ws.h"
+#include "gui/wm/wsxdnd.h"
 
 int             videoVisible = 0;
 
@@ -109,6 +112,15 @@
 
 void uiVideoInit (void)
 {
+  wsWindowCreate(&guiApp.videoWindow, guiApp.video.x, guiApp.video.y, guiApp.video.width, guiApp.video.height, wsShowFrame | wsHideWindow | wsWaitMap | wsAspect, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, "MPlayer - Video");
+  mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[video] videoWindow ID: 0x%x\n", (int) guiApp.videoWindow.WindowID);
+  wsWindowIcon(wsDisplay, guiApp.videoWindow.WindowID, &guiIcon);
+  if (guiApp.video.Bitmap.Image)
+  {
+    wsImageResize(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height);
+    wsImageRender(&guiApp.videoWindow, guiApp.video.Bitmap.Image);
+  }
+  wsXDNDMakeAwareness(&guiApp.videoWindow);
   guiApp.videoWindow.DrawHandler = uiVideoDraw;
   guiApp.videoWindow.MouseHandler = uiVideoMouse;
   guiApp.videoWindow.KeyHandler = guiApp.mainWindow.KeyHandler;