Fixes to the Kivy OSR example:

cztomczak · cztomczak · commit 6431b0be3c24 · 2013-09-18T19:06:20.000+02:00
- the _keyboard property not set exception when release_keyboard() is called
- fixed the bug that caused js bindings to be removed after a call to Navigate()
- fixed the lost focus after the call to Navigate()
diff --git a/cefpython/cef3/linux/binaries_64bit/kivy_.py b/cefpython/cef3/linux/binaries_64bit/kivy_.py
@@ -69,7 +69,7 @@ class CefBrowser(Widget):
     
     '''Represent a browser widget for kivy, which can be used like a normal widget.
     '''
-    def __init__(self, start_url='http://www.google.com', **kwargs):
+    def __init__(self, start_url='http://www.google.com/', **kwargs):
         super(CefBrowser, self).__init__(**kwargs)
         
         self.start_url = start_url
@@ -88,7 +88,7 @@ def size_changed(self, *kwargs):
         '''
         if self.starting:
             if self.height != 100:
-                self.start_cef(self.start_url)
+                self.start_cef()
                 self.starting = False
         else:
             self.texture = Texture.create(
@@ -116,7 +116,7 @@ def _update_rect(self, *kwargs):
         self.rect.texture = self.texture
    
             
-    def start_cef(self, start_url='http://google.com'):
+    def start_cef(self):
         '''Starts CEF. 
         '''
         # create texture & add it to canvas
@@ -163,22 +163,14 @@ def start_cef(self, start_url='http://google.com'):
         # Do not use "about:blank" as navigateUrl - this will cause
         # the GoBack() and GoForward() methods to not work.
         self.browser = cefpython.CreateBrowserSync(windowInfo, browserSettings, 
-                navigateUrl=start_url)
+                navigateUrl=self.start_url)
         
         #set focus
         self.browser.SendFocusEvent(True)
         
-        #Create RenderHandler (in ClientHandler)
-        CH = ClientHandler(self)
-        self.browser.SetClientHandler(CH)
-
-        jsBindings = cefpython.JavascriptBindings(
-            bindToFrames=True, bindToPopups=True)
-        jsBindings.SetFunction("__kivy__request_keyboard", 
-                self.request_keyboard)
-        jsBindings.SetFunction("__kivy__release_keyboard",
-                self.release_keyboard)
-        self.browser.SetJavascriptBindings(jsBindings)
+        self._client_handler = ClientHandler(self)
+        self.browser.SetClientHandler(self._client_handler)
+        self.set_js_bindings()
         
         #Call WasResized() => force cef to call GetViewRect() and OnPaint afterwards
         self.browser.WasResized() 
@@ -189,6 +181,38 @@ def start_cef(self, start_url='http://google.com'):
         if self.keyboard_mode == "global":
             self.request_keyboard()
 
+        # Clock.schedule_once(self.change_url, 5)
+    
+    
+    _client_handler = None
+    _js_bindings = None
+
+    def set_js_bindings(self):
+        # When browser.Navigate() is called, some bug appears in CEF
+        # that makes CefRenderProcessHandler::OnBrowserDestroyed()
+        # is being called. This destroys the javascript bindings in
+        # the Render process. We have to make the js bindings again,
+        # after the call to Navigate() when OnLoadingStateChange()
+        # is called with isLoading=False. Problem reported here:
+        # http://www.magpcss.org/ceforum/viewtopic.php?f=6&t=11009
+
+        if not self._js_bindings:
+            self._js_bindings = cefpython.JavascriptBindings(
+                bindToFrames=True, bindToPopups=True)
+            self._js_bindings.SetFunction("__kivy__request_keyboard", 
+                    self.request_keyboard)
+            self._js_bindings.SetFunction("__kivy__release_keyboard",
+                    self.release_keyboard)
+
+        self.browser.SetJavascriptBindings(self._js_bindings)
+    
+
+    def change_url(self, *kwargs):
+        self.browser.Navigate("http://www.google.com/")
+        self._client_handler._reset_js_bindings = True
+
+
+    _keyboard = None
 
     def request_keyboard(self):
         print("request_keyboard()")
@@ -202,6 +226,10 @@ def request_keyboard(self):
         self.is_ctrl2 = False
         self.is_alt1 = False
         self.is_alt2 = False
+        # Browser lost its focus after the LoadURL() and the 
+        # OnBrowserDestroyed() callback bug. This will only work
+        # when keyboard mode is local.
+        self.browser.SendFocusEvent(True)
 
 
     def release_keyboard(self):
@@ -468,6 +496,8 @@ def on_touch_up(self, touch, *kwargs):
 
 class ClientHandler:
 
+    _reset_js_bindings = False
+
     def __init__(self, browserWidget):
         self.browserWidget = browserWidget
 
@@ -509,16 +539,29 @@ def OnLoadStart(self, browser, frame):
                         __kivy__keyboard_requested = false;
                     }
                 }
-                setInterval(__kivy__keyboard_interval, 13);
+                setInterval(__kivy__keyboard_interval, 100);
             """
             frame.ExecuteJavascript(jsCode, 
                     "kivy_.py > ClientHandler > OnLoadStart")
 
+
+    def OnLoadEnd(self, browser, frame, httpStatusCode):
+        # Browser lost its focus after the LoadURL() and the 
+        # OnBrowserDestroyed() callback bug. When keyboard mode
+        # is local the fix is in the request_keyboard() method.
+        # Call it from OnLoadEnd only when keyboard mode is global.
+        browserWidget = browser.GetUserData("browserWidget")
+        if browserWidget and browserWidget.keyboard_mode == "global":
+            browser.SendFocusEvent(True)
+
     
     def OnLoadingStateChange(self, browser, isLoading, canGoBack,
             canGoForward):
         print("OnLoadingStateChange(): isLoading = %s" % isLoading)
         browserWidget = browser.GetUserData("browserWidget")
+        if self._reset_js_bindings and not isLoading:
+            if browserWidget:
+                browserWidget.set_js_bindings()
         if isLoading and browserWidget \
                 and browserWidget.keyboard_mode == "local":
             # Release keyboard when navigating to a new page.
diff --git a/cefpython/cef3/subprocess/cefpython_app.cpp b/cefpython/cef3/subprocess/cefpython_app.cpp
@@ -354,6 +354,10 @@ void CefPythonApp::DoJavascriptBindingsForBrowser(
             && jsBindings->GetType("bindToFrames") == VTYPE_BOOL
             && jsBindings->GetBool("bindToFrames")) {
         browser->GetFrameIdentifiers(frameIds);
+        // CEF BUG: frameIds contain just one frame with frameId=0
+        if (frameIds.size() == 1 && frameIds[0] == 0) {
+            frameIds.push_back(browser->GetMainFrame()->GetIdentifier());
+        }
     } else {
         frameIds.push_back(browser->GetMainFrame()->GetIdentifier());
     }
