[ekiga] x-videooutput: resources for the extended stream

[Eugen Dedu <ededu src gnome org>]

commit d0658eb9d24a03c88ec3552133a792093c676b54
Author: VÃctor Manuel JÃquez Leal <vjaquez igalia com>
Date:   Wed Sep 5 16:03:32 2012 -0500

    x-videooutput: resources for the extended stream
    
    This patch adds the X resources required to display the extended stream in
    case the user selects that view.
    
    The resources are a XWindow and a Display instances.
    
    The patch contains the logic to handle these two new instances: construction,
    destruction, and also reception of the frame from the byte array and the
    display synchronization.
    
    Since there is no a way in the user interface to enable the extended stream
    view, this patch doesn't modify the user experience.
    
    TODO: add this bits to dx-videooutput too. Since I don't have any experience,
    nor access to DirectX, I prefer to avoid its modification.

 .../x-videooutput/videooutput-manager-x.cpp        |   76 +++++++++++++++++---
 .../x-videooutput/videooutput-manager-x.h          |    2 +
 2 files changed, 67 insertions(+), 11 deletions(-)
---
diff --git a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
index 0f51dff..33f2be0 100644
--- a/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
+++ b/lib/engine/components/x-videooutput/videooutput-manager-x.cpp
@@ -49,9 +49,11 @@ GMVideoOutputManager_x::GMVideoOutputManager_x (Ekiga::ServiceCore & _core)
   /* Internal stuff */
   lxWindow = NULL;
   rxWindow = NULL;
+  exWindow = NULL;
 
   rDisplay = XOpenDisplay (NULL);
   lDisplay = XOpenDisplay (NULL);
+  eDisplay = XOpenDisplay (NULL);
 
   pip_window_available = true;
 
@@ -69,23 +71,25 @@ GMVideoOutputManager_x::~GMVideoOutputManager_x ()
   run_thread.Signal();
   thread_ended.Wait();
 
-  if (lDisplay) 
+  if (lDisplay)
     XCloseDisplay (lDisplay);
   if (rDisplay)
     XCloseDisplay (rDisplay);
+  if (eDisplay)
+    XCloseDisplay (eDisplay);
 }
 
 bool
 GMVideoOutputManager_x::frame_display_change_needed ()
 {
-    switch (current_frame.mode) 
+    switch (current_frame.mode)
     {
       case Ekiga::VO_MODE_LOCAL:
-          if (!lxWindow) 
+          if (!lxWindow)
             return true;
           break;
       case Ekiga::VO_MODE_REMOTE:
-          if (!rxWindow) 
+          if (!rxWindow)
             return true;
           break;
       case Ekiga::VO_MODE_FULLSCREEN:
@@ -94,7 +98,10 @@ GMVideoOutputManager_x::frame_display_change_needed ()
           if (!rxWindow || (pip_window_available && (!lxWindow)) )
               return true;
           break;
-     case Ekiga::VO_MODE_REMOTE_EXT: // no need to handle this
+      case Ekiga::VO_MODE_REMOTE_EXT:
+          if (!exWindow)
+            return true;
+          break;
      case Ekiga::VO_MODE_UNSET:
      default:
           break;
@@ -210,9 +217,9 @@ GMVideoOutputManager_x::setup_frame_display ()
   case Ekiga::VO_MODE_PIP_WINDOW:
     Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this, 176, 144));
     break;
-  case Ekiga::VO_MODE_REMOTE_EXT: // no need to handle this
-    PTRACE (1, "GMVideoOutputManager_X\tNo remote extended widget yet");
-    return;
+  case Ekiga::VO_MODE_REMOTE_EXT:
+    Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::size_changed_in_main, this, (unsigned) (current_frame.ext_width * current_frame.zoom / 100), (unsigned) (current_frame.ext_height * current_frame.zoom / 100)));
+    break;
   case Ekiga::VO_MODE_UNSET:
   default:
     PTRACE (1, "GMVideoOutputManager_X\tDisplay variable not set");
@@ -291,6 +298,35 @@ GMVideoOutputManager_x::setup_frame_display ()
     break;
   }
 
+  // VO_MODE_REMOTE ----------------------------------------------------------------
+  case Ekiga::VO_MODE_REMOTE_EXT: {
+    PTRACE(4, "GMVideoOutputManager_X\tOpening VO_MODE_REMOTE_EXT display with image of "
+           << current_frame.ext_width << "x" << current_frame.ext_height);
+
+    struct WinitContinuation cont = {
+      eDisplay,
+      local_display_info.window,
+      local_display_info.gc,
+      local_display_info.x,
+      local_display_info.y,
+      (int) (current_frame.ext_width * current_frame.zoom / 100),
+      (int) (current_frame.ext_height * current_frame.zoom / 100),
+      (int) current_frame.ext_width,
+      (int) current_frame.ext_height,
+    };
+
+    exWindow = create_window (local_display_info, cont, cont);
+
+    last_frame.embedded_x = local_display_info.x;
+    last_frame.embedded_y = local_display_info.y;
+
+    last_frame.mode = Ekiga::VO_MODE_REMOTE_EXT;
+    last_frame.ext_width = current_frame.ext_width;
+    last_frame.ext_height = current_frame.ext_height;
+    last_frame.zoom = current_frame.zoom;
+    break;
+  }
+
   // PIP_VIDEO ------------------------------------------------------------------
   case Ekiga::VO_MODE_FULLSCREEN:
   case Ekiga::VO_MODE_PIP:
@@ -366,7 +402,6 @@ GMVideoOutputManager_x::setup_frame_display ()
     break;
   }
 
-  case Ekiga::VO_MODE_REMOTE_EXT: // no need to handle this
   case Ekiga::VO_MODE_UNSET:
   default:
     return;
@@ -379,6 +414,8 @@ GMVideoOutputManager_x::setup_frame_display ()
       lxWindow->ToggleOntop ();
     if (rxWindow)
       rxWindow->ToggleOntop ();
+    if (exWindow)
+      exWindow->ToggleOntop ();
   }
 
   last_frame.both_streams_active = current_frame.both_streams_active;
@@ -396,9 +433,11 @@ GMVideoOutputManager_x::close_frame_display ()
 {
   Ekiga::Runtime::run_in_main (boost::bind (&GMVideoOutputManager_x::device_closed_in_main, this));
 
-  if (rxWindow) 
+  if (rxWindow)
     rxWindow->RegisterSlave (NULL);
-  if (lxWindow) 
+  if (exWindow)
+    exWindow->RegisterSlave (NULL);
+  if (lxWindow)
     lxWindow->RegisterMaster (NULL);
 
   if (lxWindow) {
@@ -410,6 +449,11 @@ GMVideoOutputManager_x::close_frame_display ()
     delete rxWindow;
     rxWindow = NULL;
   }
+
+  if (exWindow) {
+    delete exWindow;
+    exWindow = NULL;
+  }
 }
 
 void
@@ -423,11 +467,17 @@ GMVideoOutputManager_x::display_frame (const char *frame,
   if (lxWindow)
     lxWindow->ProcessEvents();
 
+  if (exWindow)
+    exWindow->ProcessEvents();
+
   if  ((current_frame.mode == Ekiga::VO_MODE_LOCAL) && (lxWindow))
     lxWindow->PutFrame ((uint8_t *) frame, width, height);
 
   if  ((current_frame.mode == Ekiga::VO_MODE_REMOTE) && (rxWindow))
     rxWindow->PutFrame ((uint8_t *) frame, width, height);
+
+  if  ((current_frame.mode == Ekiga::VO_MODE_REMOTE_EXT) && (exWindow))
+    exWindow->PutFrame ((uint8_t *) frame, width, height);
 }
 
 void
@@ -468,6 +518,10 @@ GMVideoOutputManager_x::sync (UpdateRequired sync_required)
   if (lxWindow && (sync_required.local || none_required)) {
     lxWindow->Sync();
   }
+
+  if (exWindow && (sync_required.extended || none_required)) {
+    exWindow->Sync();
+  }
 }
 
 void
diff --git a/lib/engine/components/x-videooutput/videooutput-manager-x.h b/lib/engine/components/x-videooutput/videooutput-manager-x.h
index 3b7eadc..239932f 100644
--- a/lib/engine/components/x-videooutput/videooutput-manager-x.h
+++ b/lib/engine/components/x-videooutput/videooutput-manager-x.h
@@ -80,9 +80,11 @@ protected:
 
   XWindow *lxWindow;
   XWindow *rxWindow;
+  XWindow *exWindow;
 
   Display *lDisplay;
   Display *rDisplay;
+  Display *eDisplay;
 
   bool pip_window_available;