Ticket #2466: gtkglarea.patch

xpra/client/gl/gtk3/gtkgl_client_window.py

@@ +1 @@
+# This file is part of Xpra.
+# Copyright (C) 2017 Antoine Martin <antoine@xpra.org>
+# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
+# later version. See the file COPYING for details.
+
+from gi.repository import Gtk, Gdk, GObject               #@UnresolvedImport @UnusedImport
+
+from xpra.os_util import DummyContextManager
+from xpra.client.gl.gtk3.gl_client_window import GLClientWindowBase, log
+from xpra.client.gl.gl_window_backing_base import GLWindowBackingBase
+
+
+def check_support(force_enable=False):
+    return {"safe" : True}
+
+
+class GLDrawingArea(GLWindowBackingBase):
+
+    def init_gl_config(self, window_alpha):
+        pass
+
+    def init_backing(self):
+        da = Gtk.GLArea()
+        #da.connect('configure_event', self.on_configure_event)
+        #da.connect('draw', self.on_draw)                    
+        #double-buffering is enabled by default anyway, so this is redundant:
+        #da.set_double_buffered(True)
+        da.set_size_request(*self.size)
+        da.set_events(da.get_events() | Gdk.EventMask.POINTER_MOTION_MASK | Gdk.EventMask.POINTER_MOTION_HINT_MASK | Gdk.EventMask.EXPOSURE_MASK)
+        da.connect("render", self._render)
+        def realized(*args):
+            log.warn("realize%s", args)
+            with self.gl_context():
+                self.gl_init()
+        da.connect("realize", realized)
+        da.realize()
+        self._backing = da
+
+    def _render(self, area, context):
+        log.warn("_render(%s, %s)", area, context)
+        context.make_current()
+        self.gl_init()
+        super().do_present_fbo()
+        return True
+
+    def is_double_buffered(self):
+        return True
+
+    def do_gl_show(self, rect_count):
+        #with self.gl_context() as c:
+        #    c.swap()
+        if self.is_double_buffered():
+            # Show the backbuffer on screen
+            log("%s.do_gl_show(%s) swapping buffers now", rect_count, self)
+            #self.window_context.swap_buffers()
+        else:
+            #glFlush was enough
+            pass
+
+    def gl_context(self):
+        #import traceback
+        #traceback.print_stack()
+        d = DummyContextManager()
+        d.context = self._backing.get_context()
+        d.context.make_current()
+        return d
+
+
+class GLClientWindow(GLClientWindowBase):
+    __gsignals__ = GLClientWindowBase.__common_gsignals__
+
+    def get_backing_class(self):
+        return GLDrawingArea
+
+    def drawing_area_draw(self, widget, context):
+        pass
+
+    def queue_draw_area(self, x, y, w, h):
+        pass
+
+GObject.type_register(GLClientWindow)

xpra/client/gl/window_backend.py

@@ -14 +14 @@
 def get_gl_client_window_module(force_enable=False):
     log("get_gl_client_window_module()")
     try:
-        from xpra.client.gl.gtk3 import nativegl_client_window
+        from xpra.client.gl.gtk3 import gtkgl_client_window
     except ImportError as e:
         log("cannot import opengl window module", exc_info=True)
         log.warn("Warning: cannot import native OpenGL module")
         log.warn(" %s", e)
         return {}, None
-    opengl_props = nativegl_client_window.check_support(force_enable)
+    opengl_props = gtkgl_client_window.check_support(force_enable)
     log("check_support(%s)=%s", force_enable, opengl_props)
     if opengl_props:
-        return opengl_props, nativegl_client_window
+        return opengl_props, gtkgl_client_window
     return {}, None
 
 def noop(*_args):
@@ -128 +128 @@
             from gi.repository import Gtk, GLib
             def window_close_event(*_args):
                 Gtk.main_quit()
+            def start_draw():
+                GLib.timeout_add(REPAINT_DELAY, draw)
+            window.when_realized("start-draw", start_draw)
             noclient.window_close_event = window_close_event
-            GLib.timeout_add(REPAINT_DELAY, draw)
             Gtk.main()
         else:
             draw()