Off-screen rendering test

Date: Sat, 18 Aug 2018 15:37:47 +0200 Subject: [PATCH 055/177] Enhance unit tests reliability of js bindings (#59) --- unittests/_common.py | 16 +++++++++++++++- unittests/main_test.py | 23 +++++++++++++++++++---- unittests/osr_test.py | 22 ++++++++++++++++++---- 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/unittests/_common.py b/unittests/_common.py index 2c2e52a9..5011bda4 100644 --- a/unittests/_common.py +++ b/unittests/_common.py @@ -13,6 +13,7 @@ MESSAGE_LOOP_RANGE = 100 # each iteration is 0.01 sec g_subtests_ran = 0 +g_js_code_completed = False def subtest_message(message): @@ -50,7 +51,21 @@ def do_message_loop_work(work_loops): time.sleep(0.01) +def js_code_completed(): + """Sometimes window.onload can execute before javascript bindings + are ready if the document loads very fast. When setting javascript + bindings it can take some time, because these bindings are sent + via IPC messaging to the Renderer process.""" + global g_js_code_completed + assert not g_js_code_completed + g_js_code_completed = True + subtest_message("js_code_completed() ok") + + def check_auto_asserts(test_case, objects): + # Check if js code completed + test_case.assertTrue(g_js_code_completed) + # Automatic check of asserts in handlers and in external for obj in objects: test_for_True = False # Test whether asserts are working correctly @@ -170,4 +185,3 @@ def Visit(self, value): self.load_handler.FrameSourceVisitor_True = True self.test_case.assertIn("747ef3e6011b6a61e6b3c6e54bdd2dee", value) - diff --git a/unittests/main_test.py b/unittests/main_test.py index 717daf6d..58fec488 100644 --- a/unittests/main_test.py +++ b/unittests/main_test.py @@ -31,9 +31,17 @@ msg = msg.replace("error", "error"); document.getElementById("console").innerHTML += msg+"
"; } - window.onload = function(){ - print("window.onload() ok"); - + function onload_helper() { + if (!window.hasOwnProperty("cefpython_version")) { + // Sometimes page could finish loading before javascript + // bindings are available. Javascript bindings are sent + // from the browser process to the renderer process via + // IPC messaging and it can take some time (5-10ms). If + // the page loads very fast window.onload could execute + // before bindings are available. + setTimeout(onload_helper, 10); + return; + } version = cefpython_version print("CEF Python: "+version.version+""); print("Chrome: "+version.chrome_version+""); @@ -78,7 +86,12 @@ py_callback("String sent from Javascript"); print("py_callback() ok"); }); - }; + js_code_completed(); + } + window.onload = function() { + print("window.onload() ok"); + onload_helper(); + } @@ -133,6 +146,7 @@ def test_main(self): external = External(self) bindings = cef.JavascriptBindings( bindToFrames=False, bindToPopups=False) + bindings.SetFunction("js_code_completed", js_code_completed) bindings.SetFunction("test_function", external.test_function) bindings.SetProperty("test_property1", external.test_property1) bindings.SetProperty("test_property2", external.test_property2) @@ -181,6 +195,7 @@ def test_main(self): # and calling shutdown. do_message_loop_work(25) + # Asserts before shutdown # noinspection PyTypeChecker check_auto_asserts(self, [] + client_handlers + [global_handler, diff --git a/unittests/osr_test.py b/unittests/osr_test.py index e1689329..4c26cb8f 100644 --- a/unittests/osr_test.py +++ b/unittests/osr_test.py @@ -31,13 +31,26 @@ msg = msg.replace("error", "error"); document.getElementById("console").innerHTML += msg+"
"; } - window.onload = function(){ - print("window.onload() ok"); - + function onload_helper() { + if (!window.hasOwnProperty("cefpython_version")) { + // Sometimes page could finish loading before javascript + // bindings are available. Javascript bindings are sent + // from the browser process to the renderer process via + // IPC messaging and it can take some time (5-10ms). If + // the page loads very fast window.onload could execute + // before bindings are available. + setTimeout(onload_helper, 10); + return; + } version = cefpython_version print("CEF Python: "+version.version+""); print("Chrome: "+version.chrome_version+""); print("CEF: "+version.cef_version+""); + js_code_completed(); + } + window.onload = function() { + print("window.onload() ok"); + onload_helper(); } @@ -95,6 +108,7 @@ def test_osr(self): # Javascript bindings bindings = cef.JavascriptBindings( bindToFrames=False, bindToPopups=False) + bindings.SetFunction("js_code_completed", js_code_completed) bindings.SetProperty("cefpython_version", cef.GetVersion()) browser.SetJavascriptBindings(bindings) subtest_message("browser.SetJavascriptBindings() ok") @@ -126,7 +140,7 @@ def test_osr(self): # and calling shutdown. do_message_loop_work(25) - # Automatic check of asserts in handlers + # Asserts before shutdown # noinspection PyTypeChecker check_auto_asserts(self, [] + client_handlers + [global_handler, From 073f9d2abcb48091f7bd2288f20825bec44ad44f Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sat, 18 Aug 2018 15:46:36 +0200 Subject: [PATCH 056/177] Fix run_examples.py on Mac with PyQt5 --- tools/run_examples.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/run_examples.py b/tools/run_examples.py index d78a1a47..87fe1296 100644 --- a/tools/run_examples.py +++ b/tools/run_examples.py @@ -188,8 +188,12 @@ def check_installed_packages(): } for package in packages: try: - importlib.import_module(package) - packages[package] = True + if package == "PyQt5": + # Strange issue on Mac, PyQt5 is an empty built-in module + from PyQt5 import QtGui + else: + importlib.import_module(package) + packages[package] = True except ImportError: packages[package] = False packages["gi"] = check_gi_installed() From 1671a40361b283c6b6036614b0615b2898d9872a Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sat, 18 Aug 2018 19:11:10 +0200 Subject: [PATCH 057/177] Add RenderHandler.OnTextSelectionChanged and Browser.Invalidate (#403). Add tests for OnTextSelectionChanged. Add on_load_end() helper func in unit tests. --- api/Browser.md | 17 +++++++++++++++ api/RenderHandler.md | 19 +++++++++++++++++ src/browser.pyx | 7 ++++++- src/cef_v59..v66_changes.txt | 5 +++-- src/client_handler/render_handler.cpp | 8 +++++++ src/client_handler/render_handler.h | 4 ++++ src/extern/cef/cef_browser.pxd | 3 ++- src/extern/cef/cef_types.pxd | 4 ++++ src/handlers/render_handler.pyx | 19 +++++++++++++++++ unittests/_common.py | 12 +++++++++++ unittests/osr_test.py | 30 ++++++++++++++++++++++++++- 11 files changed, 123 insertions(+), 5 deletions(-) diff --git a/api/Browser.md b/api/Browser.md index cf2ab61d..beda31e5 100644 --- a/api/Browser.md +++ b/api/Browser.md @@ -591,6 +591,23 @@ machinery. Returns true if a document has been loaded in the browser. +### Invalidate + +| | | +| --- | --- | +| element_type | PaintElementType | +| __Return__ | void | + +Description from upstream CEF: +> Invalidate the view. The browser will call CefRenderHandler::OnPaint +> asynchronously. This method is only used when window rendering is +> disabled. + +`PaintElementType` enum values defined in cefpython module: +* PET_VIEW +* PET_POPUP + + ### IsFullscreen | | | diff --git a/api/RenderHandler.md b/api/RenderHandler.md index bb25ac01..3b0d0f0d 100644 --- a/api/RenderHandler.md +++ b/api/RenderHandler.md @@ -177,6 +177,25 @@ Called when the browser's cursor has changed. If |type| is CT_CUSTOM then Called when the scroll offset has changed. +### OnTextSelectionChanged + +| Parameter | Type | +| --- | --- | +| browser | [Browser](Browser.md) | +| selected_text | str | +| selected_range | list[x, y] | +| __Return__ | void | + +Description from upstream CEF: +> Called when text selection has changed for the specified |browser|. +> |selected_text| is the currently selected text and |selected_range| is +> the character range. + +NOTE: this callback seems to be called only when selecting text +with a mouse. When selecting text programmatically using javascript +code it doesn't get called. + + ### StartDragging | Parameter | Type | diff --git a/src/browser.pyx b/src/browser.pyx index 5f26e7d7..335654d6 100644 --- a/src/browser.pyx +++ b/src/browser.pyx @@ -247,7 +247,8 @@ cdef class PyBrowser: "GetScreenRect", "OnPopupShow", "OnPopupSize", "OnPaint", "OnCursorChange", "OnScrollOffsetChanged", - "StartDragging", "UpdateDragCursor"] + "StartDragging", "UpdateDragCursor", + "OnTextSelectionChanged"] # JavascriptDialogHandler self.allowedClientCallbacks += ["OnJavascriptDialog", "OnBeforeUnloadJavascriptDialog", @@ -476,6 +477,10 @@ cdef class PyBrowser: cpdef py_bool HasDocument(self): return self.GetCefBrowser().get().HasDocument() + cpdef py_void Invalidate(self, + cef_types.cef_paint_element_type_t element_type): + return self.GetCefBrowserHost().get().Invalidate(element_type) + cpdef py_bool IsFullscreen(self): return bool(self.isFullscreen) diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt index 7a6fc5fb..2bb23ccf 100644 --- a/src/cef_v59..v66_changes.txt +++ b/src/cef_v59..v66_changes.txt @@ -71,6 +71,8 @@ NEW FEATURES ------------ + unittests/osr_test.py - new test for off-screen rendering mode ++ cefpython.SetGlobalClientHandler ++ Browser.Invalidate internal/cef_types.h + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose, @@ -85,10 +87,9 @@ internal/cef_types.h cef_accessibility_handler.h + CefAccessibilityHandler + CefRenderHandler::GetAccessibilityHandler -+ cefpython.SetGlobalClientHandler cef_render_handler.h -- OnTextSelectionChanged ++ OnTextSelectionChanged cef_browser.h + SetAccessibilityState diff --git a/src/client_handler/render_handler.cpp b/src/client_handler/render_handler.cpp index f6b4d5be..cf45d15e 100644 --- a/src/client_handler/render_handler.cpp +++ b/src/client_handler/render_handler.cpp @@ -106,3 +106,11 @@ void RenderHandler::UpdateDragCursor(CefRefPtr browser, REQUIRE_UI_THREAD(); RenderHandler_UpdateDragCursor(browser, operation); } + +void RenderHandler::OnTextSelectionChanged(CefRefPtr browser, + const CefString& selected_text, + const CefRange& selected_range) { + REQUIRE_UI_THREAD(); + RenderHandler_OnTextSelectionChanged(browser, selected_text, + selected_range); +} diff --git a/src/client_handler/render_handler.h b/src/client_handler/render_handler.h index b9eb59fa..75eee86c 100644 --- a/src/client_handler/render_handler.h +++ b/src/client_handler/render_handler.h @@ -64,6 +64,10 @@ class RenderHandler : public CefRenderHandler, void UpdateDragCursor(CefRefPtr browser, cef_drag_operations_mask_t operation) override; + void OnTextSelectionChanged(CefRefPtr browser, + const CefString& selected_text, + const CefRange& selected_range) override; + private: IMPLEMENT_REFCOUNTING(RenderHandler); }; diff --git a/src/extern/cef/cef_browser.pxd b/src/extern/cef/cef_browser.pxd index 6c5e599a..31a4a29d 100644 --- a/src/extern/cef/cef_browser.pxd +++ b/src/extern/cef/cef_browser.pxd @@ -11,7 +11,7 @@ from libcpp cimport bool as cpp_bool from libcpp.vector cimport vector as cpp_vector from cef_frame cimport CefFrame cimport cef_types -from cef_types cimport int64, cef_state_t +from cef_types cimport int64, cef_state_t, PaintElementType from cef_types cimport CefBrowserSettings, CefPoint from cef_drag_data cimport CefDragData from cef_types cimport CefMouseEvent @@ -87,6 +87,7 @@ cdef extern from "include/cef_browser.h": void AddWordToDictionary(const CefString& word) void SetAccessibilityState(cef_state_t accessibility_state) + void Invalidate(cef_types.cef_paint_element_type_t type) cdef cppclass CefBrowser: diff --git a/src/extern/cef/cef_types.pxd b/src/extern/cef/cef_types.pxd index 70263780..6bd21ba4 100644 --- a/src/extern/cef/cef_types.pxd +++ b/src/extern/cef/cef_types.pxd @@ -377,3 +377,7 @@ cdef extern from "include/internal/cef_types.h": ctypedef enum cef_focus_source_t: FOCUS_SOURCE_NAVIGATION, FOCUS_SOURCE_SYSTEM, + + cdef cppclass CefRange: + int from_val "from" + int to_val "to" diff --git a/src/handlers/render_handler.pyx b/src/handlers/render_handler.pyx index 1594d6bd..a8ad4912 100644 --- a/src/handlers/render_handler.pyx +++ b/src/handlers/render_handler.pyx @@ -4,8 +4,10 @@ include "../cefpython.pyx" include "../browser.pyx" +include "../string_utils.pyx" cimport cef_types +from cef_types cimport CefRange # cef_paint_element_type_t, PaintElementType PET_VIEW = cef_types.PET_VIEW @@ -288,3 +290,20 @@ cdef public void RenderHandler_UpdateDragCursor( (exc_type, exc_value, exc_trace) = sys.exc_info() sys.excepthook(exc_type, exc_value, exc_trace) +cdef public void RenderHandler_OnTextSelectionChanged( + CefRefPtr[CefBrowser] cef_browser, + const CefString& selected_text, + const CefRange& selected_range + ) except * with gil: + cdef PyBrowser browser + try: + browser = GetPyBrowser(cef_browser, "OnTextSelectionChanged") + callback = browser.GetClientCallback("OnTextSelectionChanged") + if callback: + callback(browser=browser, + selected_text=CefToPyString(selected_text), + selected_range=[selected_range.from_val, + selected_range.to_val]) + except: + (exc_type, exc_value, exc_trace) = sys.exc_info() + sys.excepthook(exc_type, exc_value, exc_trace) diff --git a/unittests/_common.py b/unittests/_common.py index 5011bda4..59052583 100644 --- a/unittests/_common.py +++ b/unittests/_common.py @@ -14,6 +14,7 @@ g_subtests_ran = 0 g_js_code_completed = False +g_on_load_end_callbacks = [] def subtest_message(message): @@ -51,6 +52,11 @@ def do_message_loop_work(work_loops): time.sleep(0.01) +def on_load_end(callback, *args): + global g_on_load_end_callbacks + g_on_load_end_callbacks.append([callback, args]) + + def js_code_completed(): """Sometimes window.onload can execute before javascript bindings are ready if the document loads very fast. When setting javascript @@ -154,6 +160,12 @@ def OnLoadEnd(self, browser, frame, http_code, **_): frame.GetSource(self.frame_source_visitor) browser.ExecuteJavascript("print('LoadHandler.OnLoadEnd() ok')") + subtest_message("Executing callbacks registered with on_load_end()") + global g_on_load_end_callbacks + for callback_data in g_on_load_end_callbacks: + callback_data[0](*callback_data[1]) + del g_on_load_end_callbacks + def OnLoadingStateChange(self, browser, is_loading, can_go_back, can_go_forward, **_): if is_loading: diff --git a/unittests/osr_test.py b/unittests/osr_test.py index 4c26cb8f..323f2de6 100644 --- a/unittests/osr_test.py +++ b/unittests/osr_test.py @@ -58,6 +58,7 @@

Off-screen rendering test

Test selection.

""" @@ -128,6 +129,9 @@ def test_osr(self): browser.SendFocusEvent(True) browser.WasResized() + # Test selection + on_load_end(select_h1_text, browser) + # Message loop run_message_loop() @@ -188,6 +192,17 @@ def _OnAccessibilityLocationChange(self, **_): self._OnAccessibilityLocationChange_True = True +def select_h1_text(browser): + browser.SendMouseClickEvent(0, 0, cef.MOUSEBUTTON_LEFT, + mouseUp=False, clickCount=1) + browser.SendMouseMoveEvent(400, 20, mouseLeave=False, + modifiers=cef.EVENTFLAG_LEFT_MOUSE_BUTTON) + browser.SendMouseClickEvent(400, 20, cef.MOUSEBUTTON_LEFT, + mouseUp=True, clickCount=1) + browser.Invalidate(cef.PET_VIEW) + subtest_message("select_h1_text() ok") + + class RenderHandler(object): def __init__(self, test_case): self.test_case = test_case @@ -198,6 +213,7 @@ def __init__(self, test_case): self.GetViewRect_True = False self.OnPaint_True = False + self.OnTextSelectionChanged_True = False def GetViewRect(self, rect_out, **_): """Called to retrieve the view rectangle which is relative @@ -208,7 +224,7 @@ def GetViewRect(self, rect_out, **_): rect_out.extend([0, 0, 800, 600]) return True - def OnPaint(self, element_type, paint_buffer, **_): + def OnPaint(self, browser, element_type, paint_buffer, **_): """Called when an element should be painted.""" if element_type == cef.PET_VIEW: self.test_case.assertEqual(paint_buffer.width, 800) @@ -219,6 +235,18 @@ def OnPaint(self, element_type, paint_buffer, **_): else: raise Exception("Unsupported element_type in OnPaint") + def OnTextSelectionChanged(self, selected_text, selected_range, **_): + if not self.OnTextSelectionChanged_True: + self.OnTextSelectionChanged_True = True + # First call + self.test_case.assertEqual(selected_text, "") + self.test_case.assertEqual(selected_range, [0, 0]) + else: + # Second call. + #

tag should be selected. + self.test_case.assertEqual(selected_text, + "Off-screen rendering test") + if name == "main": _test_runner.main(os.path.basename(file)) From f8a460f4afdc0887aaf866da2b024f86646fbf56 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sat, 18 Aug 2018 20:23:29 +0200 Subject: [PATCH 058/177] Add DisplayHandler.OnAutoResize and Browser.SetAutoResizeEnabled (#403) --- README.md | 114 +++++++++++++------------ api/API-index.md | 4 + api/Browser.md | 17 ++++ api/DisplayHandler.md | 17 ++++ api/RenderHandler.md | 1 + src/browser.pyx | 13 ++- src/cef_v59..v66_changes.txt | 4 +- src/client_handler/display_handler.cpp | 6 ++ src/client_handler/display_handler.h | 3 + src/extern/cef/cef_browser.pxd | 7 +- src/handlers/display_handler.pyx | 19 +++++ unittests/_common.py | 9 ++ unittests/main_test.py | 26 +++++- 13 files changed, 179 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index 3b9f1a21..dafbf9ff 100644 --- a/README.md +++ b/README.md @@ -256,61 +256,61 @@ Additional information for v31.2 release: ### API categories -#### Modules - - * [cefpython](api/cefpython.md#cefpython) module - - -#### Settings - - * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary - * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary - * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary - - -#### Classes and objects - - * [Browser](api/Browser.md#browser-object) object - * [Callback](api/Callback.md#callback-object) object - * [Cookie](api/Cookie.md#cookie-class) class - * [CookieManager](api/CookieManager.md#cookiemanager-class) class - * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win) - * [DragData](api/DragData.md#dragdata-object) object - * [Frame](api/Frame.md#frame-object) object - * [Image](api/Image.md#image-object) object - * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class - * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object - * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object - * [Request](api/Request.md#request-class) class - * [Response](api/Response.md#response-object) object - * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object - * [WebRequest](api/WebRequest.md#webrequest-class) class - * [WindowInfo](api/WindowInfo.md#windowinfo-class) class - * [WindowUtils](api/WindowUtils.md#windowutils-class) class - - -#### Client handlers (interfaces) - - * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface) - * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface) - * [DownloadHandler](api/DownloadHandler.md#downloadhandler) - * [FocusHandler](api/FocusHandler.md#focushandler-interface) - * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface) - * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface) - * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface) - * [LoadHandler](api/LoadHandler.md#loadhandler-interface) - * [RenderHandler](api/RenderHandler.md#renderhandler-interface) - * [RequestHandler](api/RequestHandler.md#requesthandler-interface) - * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface) - * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface) - - -#### Other interfaces - - * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface - * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface - * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface - +#### Modules + + * [cefpython](api/cefpython.md#cefpython) module + + +#### Settings + + * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary + * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary + * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary + + +#### Classes and objects + + * [Browser](api/Browser.md#browser-object) object + * [Callback](api/Callback.md#callback-object) object + * [Cookie](api/Cookie.md#cookie-class) class + * [CookieManager](api/CookieManager.md#cookiemanager-class) class + * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win) + * [DragData](api/DragData.md#dragdata-object) object + * [Frame](api/Frame.md#frame-object) object + * [Image](api/Image.md#image-object) object + * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class + * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object + * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object + * [Request](api/Request.md#request-class) class + * [Response](api/Response.md#response-object) object + * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object + * [WebRequest](api/WebRequest.md#webrequest-class) class + * [WindowInfo](api/WindowInfo.md#windowinfo-class) class + * [WindowUtils](api/WindowUtils.md#windowutils-class) class + + +#### Client handlers (interfaces) + + * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface) + * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface) + * [DownloadHandler](api/DownloadHandler.md#downloadhandler) + * [FocusHandler](api/FocusHandler.md#focushandler-interface) + * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface) + * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface) + * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface) + * [LoadHandler](api/LoadHandler.md#loadhandler-interface) + * [RenderHandler](api/RenderHandler.md#renderhandler-interface) + * [RequestHandler](api/RequestHandler.md#requesthandler-interface) + * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface) + * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface) + + +#### Other interfaces + + * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface + * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface + * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface + ### API index @@ -391,6 +391,7 @@ Additional information for v31.2 release: * [HandleKeyEventAfterTextInputClient](api/Browser.md#handlekeyeventaftertextinputclient) * [HandleKeyEventBeforeTextInputClient](api/Browser.md#handlekeyeventbeforetextinputclient) * [HasDocument](api/Browser.md#hasdocument) + * [Invalidate](api/Browser.md#invalidate) * [IsFullscreen](api/Browser.md#isfullscreen) * [IsLoading](api/Browser.md#isloading) * [IsMouseCursorChangeDisabled](api/Browser.md#ismousecursorchangedisabled) @@ -405,6 +406,7 @@ Additional information for v31.2 release: * [Reload](api/Browser.md#reload) * [ReloadIgnoreCache](api/Browser.md#reloadignorecache) * [ReplaceMisspelling](api/Browser.md#replacemisspelling) + * [SetAutoResizeEnabled](api/Browser.md#setautoresizeenabled) * [SetBounds](api/Browser.md#setbounds) * [SendKeyEvent](api/Browser.md#sendkeyevent) * [SendMouseClickEvent](api/Browser.md#sendmouseclickevent) @@ -519,6 +521,7 @@ Additional information for v31.2 release: * [Visit](api/CookieVisitor.md#visit) * [DisplayHandler (interface)](api/DisplayHandler.md#displayhandler-interface) * [OnAddressChange](api/DisplayHandler.md#onaddresschange) + * [OnAutoResize](api/DisplayHandler.md#onautoresize) * [OnTitleChange](api/DisplayHandler.md#ontitlechange) * [OnTooltip](api/DisplayHandler.md#ontooltip) * [OnStatusMessage](api/DisplayHandler.md#onstatusmessage) @@ -670,6 +673,7 @@ Additional information for v31.2 release: * [OnPaint](api/RenderHandler.md#onpaint) * [OnCursorChange](api/RenderHandler.md#oncursorchange) * [OnScrollOffsetChanged](api/RenderHandler.md#onscrolloffsetchanged) + * [OnTextSelectionChanged](api/RenderHandler.md#ontextselectionchanged) * [StartDragging](api/RenderHandler.md#startdragging) * [UpdateDragCursor](api/RenderHandler.md#updatedragcursor) * [Request (class)](api/Request.md#request-class) diff --git a/api/API-index.md b/api/API-index.md index fb8c5efe..9c5374da 100644 --- a/api/API-index.md +++ b/api/API-index.md @@ -79,6 +79,7 @@ * [HandleKeyEventAfterTextInputClient](Browser.md#handlekeyeventaftertextinputclient) * [HandleKeyEventBeforeTextInputClient](Browser.md#handlekeyeventbeforetextinputclient) * [HasDocument](Browser.md#hasdocument) + * [Invalidate](Browser.md#invalidate) * [IsFullscreen](Browser.md#isfullscreen) * [IsLoading](Browser.md#isloading) * [IsMouseCursorChangeDisabled](Browser.md#ismousecursorchangedisabled) @@ -93,6 +94,7 @@ * [Reload](Browser.md#reload) * [ReloadIgnoreCache](Browser.md#reloadignorecache) * [ReplaceMisspelling](Browser.md#replacemisspelling) + * [SetAutoResizeEnabled](Browser.md#setautoresizeenabled) * [SetBounds](Browser.md#setbounds) * [SendKeyEvent](Browser.md#sendkeyevent) * [SendMouseClickEvent](Browser.md#sendmouseclickevent) @@ -207,6 +209,7 @@ * [Visit](CookieVisitor.md#visit) * [DisplayHandler (interface)](DisplayHandler.md#displayhandler-interface) * [OnAddressChange](DisplayHandler.md#onaddresschange) + * [OnAutoResize](DisplayHandler.md#onautoresize) * [OnTitleChange](DisplayHandler.md#ontitlechange) * [OnTooltip](DisplayHandler.md#ontooltip) * [OnStatusMessage](DisplayHandler.md#onstatusmessage) @@ -358,6 +361,7 @@ * [OnPaint](RenderHandler.md#onpaint) * [OnCursorChange](RenderHandler.md#oncursorchange) * [OnScrollOffsetChanged](RenderHandler.md#onscrolloffsetchanged) + * [OnTextSelectionChanged](RenderHandler.md#ontextselectionchanged) * [StartDragging](RenderHandler.md#startdragging) * [UpdateDragCursor](RenderHandler.md#updatedragcursor) * [Request (class)](Request.md#request-class) diff --git a/api/Browser.md b/api/Browser.md index beda31e5..977d9005 100644 --- a/api/Browser.md +++ b/api/Browser.md @@ -55,6 +55,7 @@ Table of contents: * [HandleKeyEventAfterTextInputClient](#handlekeyeventaftertextinputclient) * [HandleKeyEventBeforeTextInputClient](#handlekeyeventbeforetextinputclient) * [HasDocument](#hasdocument) + * [Invalidate](#invalidate) * [IsFullscreen](#isfullscreen) * [IsLoading](#isloading) * [IsMouseCursorChangeDisabled](#ismousecursorchangedisabled) @@ -69,6 +70,7 @@ Table of contents: * [Reload](#reload) * [ReloadIgnoreCache](#reloadignorecache) * [ReplaceMisspelling](#replacemisspelling) + * [SetAutoResizeEnabled](#setautoresizeenabled) * [SetBounds](#setbounds) * [SendKeyEvent](#sendkeyevent) * [SendMouseClickEvent](#sendmouseclickevent) @@ -753,6 +755,21 @@ If a misspelled word is currently selected in an editable node calling this method will replace it with the specified |word|. +### SetAutoResizeEnabled + +| Parameter | Type | +| --- | --- | +| enabled | bool | +| min_size | list[width, height] | +| max_size | list[width, heifght] | +| Return | void | + +Description from upstream CEF: +> Enable notifications of auto resize via CefDisplayHandler::OnAutoResize. +> Notifications are disabled by default. |min_size| and |max_size| define the +> range of allowed sizes. + + ### SetBounds | Parameter | Type | diff --git a/api/DisplayHandler.md b/api/DisplayHandler.md index 4e45efaf..43f6342f 100644 --- a/api/DisplayHandler.md +++ b/api/DisplayHandler.md @@ -11,6 +11,7 @@ For an example of how to implement handler see [cefpython](cefpython.md).CreateB Table of contents: * [Callbacks](#callbacks) * [OnAddressChange](#onaddresschange) + * [OnAutoResize](#onautoresize) * [OnTitleChange](#ontitlechange) * [OnTooltip](#ontooltip) * [OnStatusMessage](#onstatusmessage) @@ -32,6 +33,22 @@ Table of contents: Called when a frame's address has changed. + +### OnAutoResize + +| Parameter | Type | +| --- | --- | +| browser | [Browser](Browser.md) | +| new_size | list[width, height] | +| Return | bool | + +Description from upstream CEF: +> Called when auto-resize is enabled via CefBrowserHost::SetAutoResizeEnabled +> and the contents have auto-resized. |new_size| will be the desired size in +> view coordinates. Return true if the resize was handled or false for +> default handling. + + ### OnTitleChange | Parameter | Type | diff --git a/api/RenderHandler.md b/api/RenderHandler.md index 3b0d0f0d..a33a2154 100644 --- a/api/RenderHandler.md +++ b/api/RenderHandler.md @@ -22,6 +22,7 @@ Table of contents: * [OnPaint](#onpaint) * [OnCursorChange](#oncursorchange) * [OnScrollOffsetChanged](#onscrolloffsetchanged) + * [OnTextSelectionChanged](#ontextselectionchanged) * [StartDragging](#startdragging) * [UpdateDragCursor](#updatedragcursor) diff --git a/src/browser.pyx b/src/browser.pyx index 335654d6..44ec439d 100644 --- a/src/browser.pyx +++ b/src/browser.pyx @@ -218,7 +218,7 @@ cdef class PyBrowser: # DisplayHandler self.allowedClientCallbacks += [ "OnAddressChange", "OnTitleChange", "OnTooltip", - "OnStatusMessage", "OnConsoleMessage"] + "OnStatusMessage", "OnConsoleMessage", "OnAutoResize"] # KeyboardHandler self.allowedClientCallbacks += ["OnPreKeyEvent", "OnKeyEvent"] # RequestHandler @@ -513,6 +513,17 @@ cdef class PyBrowser: PyToCefString(word, cef_word) self.GetCefBrowserHost().get().ReplaceMisspelling(cef_word) + cpdef py_void SetAutoResizeEnabled(self, + py_bool enabled, + list min_size, + list max_size): + self.GetCefBrowserHost().get().SetAutoResizeEnabled( + bool(enabled), + CefSize(min_size[0], min_size[1]), + CefSize(max_size[0], max_size[1]) + ) + + cpdef py_void SetBounds(self, int x, int y, int width, int height): IF UNAME_SYSNAME == "Linux": x11.SetX11WindowBounds(self.GetCefBrowser(), x, y, width, height) diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt index 2bb23ccf..27260280 100644 --- a/src/cef_v59..v66_changes.txt +++ b/src/cef_v59..v66_changes.txt @@ -93,7 +93,7 @@ cef_render_handler.h cef_browser.h + SetAccessibilityState -- SetAutoResizeEnabled ++ SetAutoResizeEnabled - GetExtension - IsBackgroundHost @@ -101,7 +101,7 @@ cef_cookie.h - GetBlockingManager cef_display_handler.h -- OnAutoResize ++ OnAutoResize - OnLoadingProgressChange cef_drag_data.h diff --git a/src/client_handler/display_handler.cpp b/src/client_handler/display_handler.cpp index 8e770510..f5ad596e 100644 --- a/src/client_handler/display_handler.cpp +++ b/src/client_handler/display_handler.cpp @@ -48,3 +48,9 @@ bool DisplayHandler::OnConsoleMessage(CefRefPtr browser, return DisplayHandler_OnConsoleMessage(browser, level, message, source, line); } + +bool DisplayHandler::OnAutoResize(CefRefPtr browser, + const CefSize& new_size) { + REQUIRE_UI_THREAD(); + return DisplayHandler_OnAutoResize(browser, new_size); +} diff --git a/src/client_handler/display_handler.h b/src/client_handler/display_handler.h index f6f4c865..f058c475 100644 --- a/src/client_handler/display_handler.h +++ b/src/client_handler/display_handler.h @@ -33,6 +33,9 @@ class DisplayHandler : public CefDisplayHandler const CefString& source, int line) override; + bool OnAutoResize(CefRefPtr browser, + const CefSize& new_size) override; + private: IMPLEMENT_REFCOUNTING(DisplayHandler); }; diff --git a/src/extern/cef/cef_browser.pxd b/src/extern/cef/cef_browser.pxd index 31a4a29d..042d0194 100644 --- a/src/extern/cef/cef_browser.pxd +++ b/src/extern/cef/cef_browser.pxd @@ -11,7 +11,7 @@ from libcpp cimport bool as cpp_bool from libcpp.vector cimport vector as cpp_vector from cef_frame cimport CefFrame cimport cef_types -from cef_types cimport int64, cef_state_t, PaintElementType +from cef_types cimport int64, cef_state_t, CefSize from cef_types cimport CefBrowserSettings, CefPoint from cef_drag_data cimport CefDragData from cef_types cimport CefMouseEvent @@ -87,7 +87,10 @@ cdef extern from "include/cef_browser.h": void AddWordToDictionary(const CefString& word) void SetAccessibilityState(cef_state_t accessibility_state) - void Invalidate(cef_types.cef_paint_element_type_t type) + void Invalidate(cef_types.cef_paint_element_type_t element_type) + void SetAutoResizeEnabled(cpp_bool enabled, + const CefSize& min_size, + const CefSize& max_size) cdef cppclass CefBrowser: diff --git a/src/handlers/display_handler.pyx b/src/handlers/display_handler.pyx index 3ad7a7f6..c60e49bc 100644 --- a/src/handlers/display_handler.pyx +++ b/src/handlers/display_handler.pyx @@ -25,6 +25,25 @@ cdef public void DisplayHandler_OnAddressChange( (exc_type, exc_value, exc_trace) = sys.exc_info() sys.excepthook(exc_type, exc_value, exc_trace) + +cdef public cpp_bool DisplayHandler_OnAutoResize( + CefRefPtr[CefBrowser] cef_browser, + const CefSize& new_size + ) except * with gil: + cdef PyBrowser browser + cdef object callback + try: + browser = GetPyBrowser(cef_browser, "OnAutoResize") + callback = browser.GetClientCallback("OnAutoResize") + if callback: + return bool(callback(browser=browser, new_size=[new_size.width, + new_size.height])) + return False + except: + (exc_type, exc_value, exc_trace) = sys.exc_info() + sys.excepthook(exc_type, exc_value, exc_trace) + + cdef public void DisplayHandler_OnTitleChange( CefRefPtr[CefBrowser] cefBrowser, const CefString& cefTitle diff --git a/unittests/_common.py b/unittests/_common.py index 59052583..b71c92f4 100644 --- a/unittests/_common.py +++ b/unittests/_common.py @@ -6,9 +6,18 @@ import base64 import os +import platform import sys import time +# Platforms +SYSTEM = platform.system().upper() +if SYSTEM == "DARWIN": + SYSTEM = "MAC" +WINDOWS = SYSTEM if SYSTEM == "WINDOWS" else False +LINUX = SYSTEM if SYSTEM == "LINUX" else False +MAC = SYSTEM if SYSTEM == "MAC" else False + # To show the window for an extended period of time increase this number. MESSAGE_LOOP_RANGE = 100 # each iteration is 0.01 sec diff --git a/unittests/main_test.py b/unittests/main_test.py index 58fec488..bfa1514c 100644 --- a/unittests/main_test.py +++ b/unittests/main_test.py @@ -14,6 +14,7 @@ import os import sys + g_datauri_data = """ @@ -134,10 +135,13 @@ def test_main(self): # Create browser browser = cef.CreateBrowserSync(url=g_datauri) self.assertIsNotNone(browser, "Browser object") + browser.SetFocus(True) subtest_message("cef.CreateBrowserSync() ok") # Client handlers - client_handlers = [LoadHandler(self, g_datauri), DisplayHandler(self)] + client_handlers = [LoadHandler(self, g_datauri), + DisplayHandler(self), + DisplayHandler2(self)] for handler in client_handlers: browser.SetClientHandler(handler) subtest_message("browser.SetClientHandler() ok") @@ -161,6 +165,12 @@ def test_main(self): browser.SetJavascriptBindings(bindings) subtest_message("browser.SetJavascriptBindings() ok") + # Set auto resize. Call it after js bindings were set. + browser.SetAutoResizeEnabled(enabled=True, + min_size=[800, 600], + max_size=[800, 600]) + subtest_message("browser.SetAutoResizeEnabled() ok") + # Test Request.SetPostData(list) # noinspection PyArgumentList req = cef.Request.CreateRequest() @@ -210,6 +220,20 @@ def test_main(self): sys.stdout.flush() +class DisplayHandler2(object): + def init(self, test_case): + self.test_case = test_case + # Asserts for True/False will be checked just before shutdown. + # Test whether asserts are working correctly. + self.test_for_True = True + self.OnAutoResize_True = False + + def OnAutoResize(self, new_size, _): + assert not self.OnAutoResize_True + self.OnAutoResize_True = True + self.test_case.assertEqual(new_size, [800, 600]) + + class External(object): """Javascript 'window.external' object.""" From c559f44f70238ac695fbcb380991399cb8b561c4 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sat, 18 Aug 2018 20:39:42 +0200 Subject: [PATCH 059/177] Fix AutoResize unit tests on Linux --- unittests/main_test.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/unittests/main_test.py b/unittests/main_test.py index bfa1514c..91f27cc8 100644 --- a/unittests/main_test.py +++ b/unittests/main_test.py @@ -23,6 +23,8 @@ body,html { font-family: Arial; font-size: 11pt; + width: 800px; + heiht: 600px; } + + +
Javascript Bindings
+
+ + +""" + + +def main(): + cef.Initialize() + browser = cef.CreateBrowserSync(url=cef.GetDataUrl(g_htmlcode), + window_title="OnBeforeClose") + browser.SetClientHandler(LifespanHandler()) + bindings = cef.JavascriptBindings() + bindings.SetFunction("py_function", py_function) + bindings.SetFunction("py_callback", py_callback) + browser.SetJavascriptBindings(bindings) + cef.MessageLoop() + del browser + cef.Shutdown() + + +def py_function(value, js_callback): + print("Value sent from Javascript: "+value) + js_callback.Call("I am a Python string #2", py_callback) + + +def py_callback(value): + print("Value sent from Javascript: "+value) + + +class LifespanHandler(object): + def OnLoadEnd(self, browser, _): + browser.ExecuteFunction("js_function", "I am a Python string #1") + + +if name == 'main': + main() diff --git a/examples/snippets/mouse_clicks.py b/examples/snippets/mouse_clicks.py index fcdd5280..e8ace36a 100644 --- a/examples/snippets/mouse_clicks.py +++ b/examples/snippets/mouse_clicks.py @@ -43,7 +43,7 @@ class LifespanHandler(object): def OnLoadEnd(self, browser, _): # Execute function with a delay of 1 second after page # has completed loading. - print("Page completed loading") + print("Page loading is complete") cef.PostDelayedTask(cef.TID_UI, 1000, click_after_1_second, browser) diff --git a/examples/snippets/network_cookies.py b/examples/snippets/network_cookies.py index 55a71ec0..c3631cff 100644 --- a/examples/snippets/network_cookies.py +++ b/examples/snippets/network_cookies.py @@ -30,7 +30,7 @@ def CanGetCookies(self, frame, request, _): print("-- CanGetCookies #"+str(self.getcount)) print("url="+request.GetUrl()[0:80]) print("") - # Return True to allow reading cookies and False to block + # Return True to allow reading cookies or False to block return True def CanSetCookie(self, frame, request, cookie, _): @@ -43,7 +43,7 @@ def CanSetCookie(self, frame, request, cookie, _): print("Name="+cookie.GetName()) print("Value="+cookie.GetValue()) print("") - # Return True to allow setting cookie and False to block + # Return True to allow setting cookie or False to block return True diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt index fdf96cb2..f78800d3 100644 --- a/src/cef_v59..v66_changes.txt +++ b/src/cef_v59..v66_changes.txt @@ -82,6 +82,8 @@ NEW FEATURES + onbeforeclose.py + network_cookies.py + mouse_clicks.py + + javascript_bindings.py ++ cef.GetDataUrl internal/cef_types.h + cef_log_severity_t: new key LOGSEVERITY_DEBUG (no need to expose, diff --git a/src/cefpython.pyx b/src/cefpython.pyx index 5a526bcd..1631636f 100644 --- a/src/cefpython.pyx +++ b/src/cefpython.pyx @@ -134,6 +134,8 @@ import datetime import random # noinspection PyUnresolvedReferences import struct +# noinspection PyUnresolvedReferences +import base64 # Must use compile-time condition instead of checking sys.version_info.major # otherwise results in "ImportError: cannot import name urlencode" strange @@ -1023,3 +1025,9 @@ cpdef dict GetVersion(): cpdef LoadCrlSetsFile(py_string path): CefLoadCRLSetsFile(PyToCefStringValue(path)) + +cpdef GetDataUrl(data, mediatype="html"): + html = data.encode("utf-8", "replace") + b64 = base64.b64encode(html).decode("utf-8", "replace") + ret = "data:text/html;base64,{data}".format(data=b64) + return ret diff --git a/unittests/_common.py b/unittests/_common.py index a0dc1fd3..684a27b1 100644 --- a/unittests/_common.py +++ b/unittests/_common.py @@ -41,13 +41,6 @@ def show_test_summary(pyfile): + os.path.basename(pyfile)) -def html_to_data_uri(html): - html = html.encode("utf-8", "replace") - b64 = base64.b64encode(html).decode("utf-8", "replace") - ret = "data:text/html;base64,{data}".format(data=b64) - return ret - - def run_message_loop(): # Run message loop for some time. # noinspection PyTypeChecker diff --git a/unittests/main_test.py b/unittests/main_test.py index 25405ce0..b0c2200c 100644 --- a/unittests/main_test.py +++ b/unittests/main_test.py @@ -112,7 +112,7 @@ """ -g_datauri = html_to_data_uri(g_datauri_data) +g_datauri = cef.GetDataUrl(g_datauri_data) class MainTest_IsolatedTest(unittest.TestCase): diff --git a/unittests/osr_test.py b/unittests/osr_test.py index a5a3753b..0e4191be 100644 --- a/unittests/osr_test.py +++ b/unittests/osr_test.py @@ -62,7 +62,7 @@ """ -g_datauri = html_to_data_uri(g_datauri_data) +g_datauri = cef.GetDataUrl(g_datauri_data) class OsrTest_IsolatedTest(unittest.TestCase): From 6bb2d4ed7c3d498f999d6ac0c042336da1c11b18 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 20 Aug 2018 12:13:43 +0200 Subject: [PATCH 078/177] Add javascript_erors.py and ondomready.py snippets (#403) --- docs/Tutorial.md | 3 +- examples/README-examples.md | 41 +++++++++------- examples/snippets/javascript_bindings.py | 3 +- examples/snippets/javascript_errors.py | 61 ++++++++++++++++++++++++ examples/snippets/ondomready.py | 50 +++++++++++++++++++ src/cef_v59..v66_changes.txt | 2 + 6 files changed, 140 insertions(+), 20 deletions(-) create mode 100644 examples/snippets/javascript_errors.py create mode 100644 examples/snippets/ondomready.py diff --git a/docs/Tutorial.md b/docs/Tutorial.md index c6c0fcf7..ea32cb42 100644 --- a/docs/Tutorial.md +++ b/docs/Tutorial.md @@ -9,7 +9,8 @@ basics. This tutorial will discuss the three featured examples: [hello_world.py](../examples/hello_world.py), [tutorial.py](../examples/tutorial.py) and [screenshot.py](../examples/screenshot.py). There are many -more examples that you can find in the [README-examples.md](../examples/README-examples.md) +more examples that you can find in the +[README-examples.md](../examples/README-examples.md) file, but these examples are out of scope for this tutorial. diff --git a/examples/README-examples.md b/examples/README-examples.md index 0f0ef9a4..4ef36045 100644 --- a/examples/README-examples.md +++ b/examples/README-examples.md @@ -4,8 +4,8 @@ Table of contents: * [Hello World!](#hello-world) * [Supported examples](#supported-examples) * [Featured](#featured) - * [GUI frameworks](#gui-frameworks) * [Snippets](#snippets) + * [GUI frameworks](#gui-frameworks) * [Build executable with PyInstaller](#build-executable-with-pyinstaller) * [Unit tests](#unit-tests) * [Other examples](#other-examples) @@ -42,8 +42,31 @@ workarounds. discussed in great details in Tutorial in the [Off-screen rendering](../docs/Tutorial.md#off-screen-rendering) section. + +### Snippets + +See small code snippets that show various CEF features in the +[examples/snippets/](snippets/) directory: + +- [javascript_bindings.py](snippets/javascript_bindings.py) - Communicate + between Python and Javascript asynchronously using + inter-process messaging with the use of Javascript Bindings. +- [javascript_errors.py](snippets/javascript_errors.py) - Two ways for + intercepting Javascript errors. +- [mouse_clicks.py](snippets/mouse_clicks.py) - Perform mouse clicks + and mouse movements programmatically. +- [network_cookies.py](snippets/network_cookies.py) - Implement + interfaces to block or allow cookies over network requests. +- [onbeforeclose.py](snippets/onbeforeclose.py) - Implement interface + to execute custom code before browser window closes. +- [ondomready.py](snippets/ondomready.py) - Execute custom Python code + on a web page as soon as DOM is ready. + + ### GUI frameworks +Examples of embedding CEF browser using various GUI frameworks: + - [gtk2.py](gtk2.py): example for [PyGTK](http://www.pygtk.org/) library (GTK 2) - [gtk3.py](gtk3.py): example for [PyGObject / PyGI](https://wiki.gnome.org/Projects/PyGObject) @@ -64,22 +87,6 @@ workarounds. toolkit. This example implements High DPI support on Windows. -### Snippets - -See small code snippets that test various features in the -[examples/snippets/](snippets/) directory: - -- [javascript_bindings.py](snippets/javascript_bindings.py) - Communicate - between Python and Javascript asynchronously using - inter-process messaging with the use of Javascript Bindings. -- [mouse_clicks.py](snippets/mouse_clicks.py) - Perform mouse clicks - and mouse movements programmatically. -- [network_cookies.py](snippets/network_cookies.py) - Implement - interfaces to block or allow cookies over network requests. -- [onbeforeclose.py](snippets/onbeforeclose.py) - Implement interface - to execute custom code before browser window closes. - - ### Build executable with PyInstaller - [PyInstaller example](pyinstaller/README-pyinstaller.md): diff --git a/examples/snippets/javascript_bindings.py b/examples/snippets/javascript_bindings.py index 7c7dccc5..63135463 100644 --- a/examples/snippets/javascript_bindings.py +++ b/examples/snippets/javascript_bindings.py @@ -17,7 +17,6 @@ + + +
Javascript Errors
+
+ + +""" + + +def main(): + cef.Initialize() + browser = cef.CreateBrowserSync(url=cef.GetDataUrl(g_htmlcode), + window_title="Javascript Errors") + browser.SetClientHandler(DisplayHandler()) + cef.MessageLoop() + cef.Shutdown() + + +class DisplayHandler(object): + def OnConsoleMessage(self, browser, message, line, _): + if "error" in message.lower() or "uncaught" in message.lower(): + logmsg = "[Py:OnConsoleMessage] {message} (line {line})" \ + .format(message=message, line=line) + print(logmsg) + browser.ExecuteFunction("print", logmsg) + + +if name == 'main': + main() diff --git a/examples/snippets/ondomready.py b/examples/snippets/ondomready.py new file mode 100644 index 00000000..caeacc02 --- /dev/null +++ b/examples/snippets/ondomready.py @@ -0,0 +1,50 @@ +""" +Execute custom Python code on a web page as soon as DOM is ready. +Implements a custom "_OnDomReady" event in the LifespanHandler object. +""" + +from cefpython3 import cefpython as cef + + +def main(): + cef.Initialize() + browser = cef.CreateBrowserSync(url="https://www.google.com/", + window_title="_OnDomReady event") + lifespan_handler = LifespanHandler(browser) + browser.SetClientHandler(lifespan_handler) + bindings = cef.JavascriptBindings() + bindings.SetFunction("LifespanHandler_OnDomReady", + lifespan_handler["_OnDomReady"]) + browser.SetJavascriptBindings(bindings) + cef.MessageLoop() + del lifespan_handler + del browser + cef.Shutdown() + + +class LifespanHandler(object): + def init(self, browser): + self.browser = browser + + def getitem(self, key): + return getattr(self, key) + + def OnLoadStart(self, browser, _): + browser.ExecuteJavascript(""" + if (document.readyState === "complete") { + LifespanHandler_OnDomReady(); + } else { + document.addEventListener("DOMContentLoaded", function() { + LifespanHandler_OnDomReady(); + }); + } + """) + + def _OnDomReady(self): + print("DOM is ready!") + self.browser.ExecuteFunction("alert", + "Message from Python: DOM is ready!") + + +if name == 'main': + main() diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt index f78800d3..1024bdaf 100644 --- a/src/cef_v59..v66_changes.txt +++ b/src/cef_v59..v66_changes.txt @@ -83,6 +83,8 @@ NEW FEATURES + network_cookies.py + mouse_clicks.py + javascript_bindings.py + + javascript_errors.py + + ondomready.py + cef.GetDataUrl internal/cef_types.h From 7448372a26632092876e026a4a9f7711839bb83e Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 20 Aug 2018 12:46:43 +0200 Subject: [PATCH 079/177] Add onpagecomplete.py snippet (#403) and others. Add tools/run_snippets.py. --- examples/README-examples.md | 2 ++ examples/snippets/ondomready.py | 18 +++++----- examples/snippets/onpagecomplete.py | 35 ++++++++++++++++++ src/cef_v59..v66_changes.txt | 1 + tools/common.py | 1 + tools/run_examples.py | 3 +- tools/run_snippets.py | 55 +++++++++++++++++++++++++++++ 7 files changed, 105 insertions(+), 10 deletions(-) create mode 100644 examples/snippets/onpagecomplete.py create mode 100644 tools/run_snippets.py diff --git a/examples/README-examples.md b/examples/README-examples.md index 4ef36045..b877607a 100644 --- a/examples/README-examples.md +++ b/examples/README-examples.md @@ -61,6 +61,8 @@ See small code snippets that show various CEF features in the to execute custom code before browser window closes. - [ondomready.py](snippets/ondomready.py) - Execute custom Python code on a web page as soon as DOM is ready. +- [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom + Python code on a web page when page loading is complete. ### GUI frameworks diff --git a/examples/snippets/ondomready.py b/examples/snippets/ondomready.py index caeacc02..8775129c 100644 --- a/examples/snippets/ondomready.py +++ b/examples/snippets/ondomready.py @@ -1,6 +1,6 @@ """ Execute custom Python code on a web page as soon as DOM is ready. -Implements a custom "_OnDomReady" event in the LifespanHandler object. +Implements a custom "_OnDomReady" event in the LoadHandler object. """ from cefpython3 import cefpython as cef @@ -10,19 +10,19 @@ def main(): cef.Initialize() browser = cef.CreateBrowserSync(url="https://www.google.com/", window_title="_OnDomReady event") - lifespan_handler = LifespanHandler(browser) - browser.SetClientHandler(lifespan_handler) + load_handler = LoadHandler(browser) + browser.SetClientHandler(load_handler) bindings = cef.JavascriptBindings() - bindings.SetFunction("LifespanHandler_OnDomReady", - lifespan_handler["_OnDomReady"]) + bindings.SetFunction("LoadHandler_OnDomReady", + load_handler["_OnDomReady"]) browser.SetJavascriptBindings(bindings) cef.MessageLoop() - del lifespan_handler + del load_handler del browser cef.Shutdown() -class LifespanHandler(object): +class LoadHandler(object): def init(self, browser): self.browser = browser @@ -32,10 +32,10 @@ def getitem(self, key): def OnLoadStart(self, browser, _): browser.ExecuteJavascript(""" if (document.readyState === "complete") { - LifespanHandler_OnDomReady(); + LoadHandler_OnDomReady(); } else { document.addEventListener("DOMContentLoaded", function() { - LifespanHandler_OnDomReady(); + LoadHandler_OnDomReady(); }); } """) diff --git a/examples/snippets/onpagecomplete.py b/examples/snippets/onpagecomplete.py new file mode 100644 index 00000000..e118e8e7 --- /dev/null +++ b/examples/snippets/onpagecomplete.py @@ -0,0 +1,35 @@ +""" +Execute custom Python code on a web page when page loading is complete. +Implements a custom "_OnPageComplete" event in the LoadHandler object. +""" + +from cefpython3 import cefpython as cef + + +def main(): + cef.Initialize() + browser = cef.CreateBrowserSync(url="https://www.google.com/", + window_title="_OnPageComplete event") + browser.SetClientHandler(LoadHandler()) + cef.MessageLoop() + del browser + cef.Shutdown() + + +class LoadHandler(object): + def OnLoadingStateChange(self, browser, is_loading, _): + """For detecting if page loading has ended it is recommended + to use OnLoadingStateChange which is most reliable. The OnLoadEnd + callback also available in LoadHandler can sometimes fail in + some cases e.g. when image loading hangs.""" + if not is_loading: + self._OnPageComplete(browser) + + def _OnPageComplete(self, browser): + print("Page loading is complete!") + browser.ExecuteFunction("alert", "Message from Python: Page loading" + " is complete!") + + +if name == 'main': + main() diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt index 1024bdaf..9060ad14 100644 --- a/src/cef_v59..v66_changes.txt +++ b/src/cef_v59..v66_changes.txt @@ -85,6 +85,7 @@ NEW FEATURES + javascript_bindings.py + javascript_errors.py + ondomready.py + + onpagecomplete + cef.GetDataUrl internal/cef_types.h diff --git a/tools/common.py b/tools/common.py index 06ab942e..ec92b0fe 100644 --- a/tools/common.py +++ b/tools/common.py @@ -158,6 +158,7 @@ # -- end build directories EXAMPLES_DIR = os.path.join(ROOT_DIR, "examples") +SNIPPETS_DIR = os.path.join(EXAMPLES_DIR, "snippets") SRC_DIR = os.path.join(ROOT_DIR, "src") # Subdirectories in src/ diff --git a/tools/run_examples.py b/tools/run_examples.py index 87fe1296..bf70f045 100644 --- a/tools/run_examples.py +++ b/tools/run_examples.py @@ -3,7 +3,8 @@ # Project website: https://github.com/cztomczak/cefpython """ -Run all examples that can be run on current configuration. +Run all examples that can be run on current configuration +and display a summary at the end. Note on GTK 2 / GTK 3 on Windows: Installing both PyGTK and PyGI on Windows will cause errors. diff --git a/tools/run_snippets.py b/tools/run_snippets.py new file mode 100644 index 00000000..193d9558 --- /dev/null +++ b/tools/run_snippets.py @@ -0,0 +1,55 @@ +# Copyright (c) 2018 CEF Python, see the Authors file. +# All rights reserved. Licensed under BSD 3-clause license. +# Project website: https://github.com/cztomczak/cefpython + +""" +Run all snippets from the examples/snippets/ directory +and display a summary at the end. +""" + +from common import * + +import glob +import os +import subprocess +import sys + + +def main(): + # Iterate over all snippets + snippets_iter = glob.glob(os.path.join(SNIPPETS_DIR, ".py")) + succeeded = [] + failed = [] + for snippet in snippets_iter: + print("[run_snippets.py] Running '{snippet}'..." + .format(snippet=os.path.basename(snippet))) + retcode = subprocess.call([sys.executable, snippet]) + if retcode == 0: + succeeded.append(os.path.basename(snippet)) + else: + print("[run_snippets.py] ERROR while running snippet: {snippet}" + .format(snippet=snippet)) + failed.append(os.path.basename(snippet)) + + # Print summary + summary = "" + for snippet in succeeded: + summary += " OK {snippet}{nl}"\ + .format(snippet=snippet, nl=os.linesep) + for snippet in failed: + summary += " ERROR {snippet}{nl}"\ + .format(snippet=snippet, nl=os.linesep) + summary = summary[:-(len(os.linesep))] + print("[run_snippets.py] SUMMARY:") + print(summary.format()) + if len(failed): + print("[run_snippets.py] ERRORS ({failed}) while running snippets" + .format(failed=len(failed))) + sys.exit(1) + else: + print("[run_snippets.py] OK ({succeeded})" + .format(succeeded=len(succeeded))) + + +if name == "main": + main() From 9f3ba137d3d243711ee40e21b1b958907bf63abb Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 20 Aug 2018 13:18:43 +0200 Subject: [PATCH 080/177] Update cefpython.md --- api/cefpython.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/cefpython.md b/api/cefpython.md index a876bd69..29720c48 100644 --- a/api/cefpython.md +++ b/api/cefpython.md @@ -66,7 +66,8 @@ any third party GUI framework for creation of top-level window. After the call to CreateBrowserSync() the page is not yet loaded, if you want your next lines of code to do some stuff on the -webpage you will have to implement LoadHandler.[OnLoadingStateChange]((LoadHandler.md#onloadingstatechange)) +webpage you will have to implement +LoadHandler.[OnLoadingStateChange](LoadHandler.md#onloadingstatechange) callback. From ef6febb7d3ca751ce86eed0061b11538f2379e64 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 20 Aug 2018 14:30:14 +0200 Subject: [PATCH 081/177] Fix build_distrib.py tool on Windows (#403) --- tools/build_distrib.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/build_distrib.py b/tools/build_distrib.py index 65bfd5ee..fc8c9db3 100644 --- a/tools/build_distrib.py +++ b/tools/build_distrib.py @@ -593,15 +593,18 @@ def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons): for python in all_pythons: if python["version2"] in ((3, 5), (3, 6), (3, 7)): checked_any = True - if not os.path.exists(os.path.join(setup_dir, "msvcp140.dll")): + if not os.path.exists(os.path.join(setup_dir, "cefpython3", + "msvcp140.dll")): raise Exception("C++ ext dependency missing: msvcp140.dll") elif python["version2"] == (3, 4): checked_any = True - if not os.path.exists(os.path.join(setup_dir, "msvcp100.dll")): + if not os.path.exists(os.path.join(setup_dir, "cefpython3", + "msvcp100.dll")): raise Exception("C++ ext dependency missing: msvcp100.dll") elif python["version2"] == (2, 7): - if not os.path.exists(os.path.join(setup_dir, "msvcp90.dll")): - raise Exception("C++ ext dependency missing: msvcp100.dll") + if not os.path.exists(os.path.join(setup_dir, "cefpython3", + "msvcp90.dll")): + raise Exception("C++ ext dependency missing: msvcp90.dll") checked_any = True assert checked_any From 209fe5ad81b89529c3e3e0282ae0917da1815103 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 20 Aug 2018 19:51:17 +0200 Subject: [PATCH 082/177] CEF Python v66.0 release --- README.md | 136 ++++++++++++++-------------- api/AccessibilityHandler.md | 8 +- docs/Tutorial.md | 2 +- examples/README-examples.md | 2 +- examples/pywin32.py | 2 +- src/cef_v59..v66_changes.txt | 5 +- tools/installer/cefpython3.setup.py | 2 +- 7 files changed, 81 insertions(+), 76 deletions(-) diff --git a/README.md b/README.md index 9ecad822..1e6697e8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Table of contents: [Introduction](#introduction) * [Sponsors](#sponsors) -* [Funding for the v66 release](#funding-for-the-v66-release) + * [Thanks to Lampix for the v66 release](#thanks-to-lampix-for-the-v66-release) * [Install](#install) * [Tutorial](#tutorial) * [Examples](#examples) @@ -92,15 +92,15 @@ See the [Support development](#support-development) section for a list of all the individuals and companies supporting CEF Python. -## Funding for the v66 release +### Thanks to Lampix for the v66 release -I am happy to announce that Lampix is sponsoring the v66 release of cefpython. +Many Thanks to Lampix for sponsoring the [v66 release](../../releases) of CEF Python. Lampix is the first hardware and software solution that turns any surface into a smart, augmented reality or interactive surface. Please visit its -website here: https://lampix.com/ . See the [v66 milestone](../../milestone/13) -to see progress on the new release. +website here: https://lampix.com/ . + +[![lampix360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png)](https://lampix.com/) -[![lampix600](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix600.png)](https://lampix.com/) ## Install @@ -110,9 +110,10 @@ also download packages for offline installation available on the [GitHub Releases](../../releases) pages. Command to install with pip: ``` -pip install cefpython3==57.0 +pip install cefpython3==66.0 ``` + ## Tutorial See the [Tutorial.md](docs/Tutorial.md) file. @@ -170,6 +171,7 @@ so your company logo and a website link will be visible to many Python developer The statistics are from Mar 9, 2018. Complete statistics are available in this topic on the Forum: [[ANN] Call for sponsors](https://groups.google.com/d/topic/cefpython/CjkZF2P4rMk/discussion). + ### Thanks * [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66 @@ -254,66 +256,66 @@ Additional information for v31.2 release: - [Tutorial](docs/Tutorial.md) -### API categories - -#### Modules - - * [cefpython](api/cefpython.md#cefpython) module - - -#### Settings - - * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary - * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary - * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary - - -#### Classes and objects - - * [Browser](api/Browser.md#browser-object) object - * [Callback](api/Callback.md#callback-object) object - * [Cookie](api/Cookie.md#cookie-class) class - * [CookieManager](api/CookieManager.md#cookiemanager-class) class - * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win) - * [DragData](api/DragData.md#dragdata-object) object - * [Frame](api/Frame.md#frame-object) object - * [Image](api/Image.md#image-object) object - * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class - * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object - * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object - * [Request](api/Request.md#request-class) class - * [Response](api/Response.md#response-object) object - * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object - * [WebRequest](api/WebRequest.md#webrequest-class) class - * [WindowInfo](api/WindowInfo.md#windowinfo-class) class - * [WindowUtils](api/WindowUtils.md#windowutils-class) class - - -#### Client handlers (interfaces) - - * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface) - * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface) - * [DownloadHandler](api/DownloadHandler.md#downloadhandler) - * [FocusHandler](api/FocusHandler.md#focushandler-interface) - * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface) - * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface) - * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface) - * [LoadHandler](api/LoadHandler.md#loadhandler-interface) - * [RenderHandler](api/RenderHandler.md#renderhandler-interface) - * [RequestHandler](api/RequestHandler.md#requesthandler-interface) - * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface) - * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface) - - -#### Other interfaces - - * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface - * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface - * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface - - -### API index - +### API categories + +#### Modules + + * [cefpython](api/cefpython.md#cefpython) module + + +#### Settings + + * [ApplicationSettings](api/ApplicationSettings.md#application-settings) dictionary + * [BrowserSettings](api/BrowserSettings.md#browser-settings) dictionary + * [CommandLineSwitches](api/CommandLineSwitches.md#command-line-switches) dictionary + + +#### Classes and objects + + * [Browser](api/Browser.md#browser-object) object + * [Callback](api/Callback.md#callback-object) object + * [Cookie](api/Cookie.md#cookie-class) class + * [CookieManager](api/CookieManager.md#cookiemanager-class) class + * [DpiAware](api/DpiAware.md#dpiaware-class) class (Win) + * [DragData](api/DragData.md#dragdata-object) object + * [Frame](api/Frame.md#frame-object) object + * [Image](api/Image.md#image-object) object + * [JavascriptBindings](api/JavascriptBindings.md#javascriptbindings-class) class + * [JavascriptCallback](api/JavascriptCallback.md#javascriptcallback-object) object + * [PaintBuffer](api/PaintBuffer.md#paintbuffer-object) object + * [Request](api/Request.md#request-class) class + * [Response](api/Response.md#response-object) object + * [WebPluginInfo](api/WebPluginInfo.md#webplugininfo-object) object + * [WebRequest](api/WebRequest.md#webrequest-class) class + * [WindowInfo](api/WindowInfo.md#windowinfo-class) class + * [WindowUtils](api/WindowUtils.md#windowutils-class) class + + +#### Client handlers (interfaces) + + * [AccessibilityHandler](api/AccessibilityHandler.md#accessibilityhandler-interface) + * [DisplayHandler](api/DisplayHandler.md#displayhandler-interface) + * [DownloadHandler](api/DownloadHandler.md#downloadhandler) + * [FocusHandler](api/FocusHandler.md#focushandler-interface) + * [JavascriptDialogHandler](api/JavascriptDialogHandler.md#javascriptdialoghandler-interface) + * [KeyboardHandler](api/KeyboardHandler.md#keyboardhandler-interface) + * [LifespanHandler](api/LifespanHandler.md#lifespanhandler-interface) + * [LoadHandler](api/LoadHandler.md#loadhandler-interface) + * [RenderHandler](api/RenderHandler.md#renderhandler-interface) + * [RequestHandler](api/RequestHandler.md#requesthandler-interface) + * [ResourceHandler](api/ResourceHandler.md#resourcehandler-interface) + * [V8ContextHandler](api/V8ContextHandler.md#v8contexthandler-interface) + + +#### Other interfaces + + * [CookieVisitor](api/CookieVisitor.md#cookievisitor-interface) interface + * [StringVisitor](api/StringVisitor.md#stringvisitor-interface) interface + * [WebRequestClient](api/WebRequestClient.md#webrequestclient-interface) interface + + +### API index + * [AccessibilityHandler (interface)](api/AccessibilityHandler.md#accessibilityhandler-interface) * [_OnAccessibilityTreeChange](api/AccessibilityHandler.md#_onaccessibilitytreechange) * [_OnAccessibilityLocationChange](api/AccessibilityHandler.md#_onaccessibilitylocationchange) diff --git a/api/AccessibilityHandler.md b/api/AccessibilityHandler.md index faea2605..3433e003 100644 --- a/api/AccessibilityHandler.md +++ b/api/AccessibilityHandler.md @@ -11,12 +11,12 @@ accessibility events have been registered. The methods of this class will be called on the UI thread. Callbacks in this interface are not associated with any specific browser, -thus you must call cefpython.[SetGlobalClientHandler] or -SetGlobalClientCallback() to use them. The callbacks names were prefixed +thus you must call +`cefpython`.[SetGlobalClientHandler](cefpython.md#setglobalclienthandler) +or [SetGlobalClientCallback](cefpython.md#setglobalclientcallback) +to use them. The callbacks names were prefixed with "`_`" to distinguish this special behavior. -For an example of how to implement handler see [cefpython](cefpython.md).CreateBrowser(). For a list of all handler interfaces see [API > Client handlers](API#Client_handlers). - Table of contents: * [Callbacks](#callbacks) diff --git a/docs/Tutorial.md b/docs/Tutorial.md index ea32cb42..d67b6204 100644 --- a/docs/Tutorial.md +++ b/docs/Tutorial.md @@ -40,7 +40,7 @@ Run the commands below to install the cefpython3 package, clone the repository and run the Hello World example: ```commandline -pip install cefpython3==57.0 +pip install cefpython3==66.0 git clone https://github.com/cztomczak/cefpython.git cd cefpython/examples/ python hello_world.py diff --git a/examples/README-examples.md b/examples/README-examples.md index b877607a..de756013 100644 --- a/examples/README-examples.md +++ b/examples/README-examples.md @@ -17,7 +17,7 @@ Instructions to install the cefpython3 package, clone the repository and run the hello_world.py example: ``` -pip install cefpython3==57.0 +pip install cefpython3==66.0 git clone https://github.com/cztomczak/cefpython.git cd cefpython/examples/ python hello_world.py diff --git a/examples/pywin32.py b/examples/pywin32.py index d18aa54e..bf8d2b9b 100644 --- a/examples/pywin32.py +++ b/examples/pywin32.py @@ -108,7 +108,7 @@ def check_versions(): pywin32_version = fp.read().strip() print("[pywin32.py] pywin32 {ver}".format(ver=pywin32_version)) - assert cef.version >= "57.0", "CEF Python v57.0 required to run this" + assert cef.version >= "57.0", "CEF Python v57.0+ required to run this" def create_browser(window_info, settings, url): diff --git a/src/cef_v59..v66_changes.txt b/src/cef_v59..v66_changes.txt index 9060ad14..fab7e5e7 100644 --- a/src/cef_v59..v66_changes.txt +++ b/src/cef_v59..v66_changes.txt @@ -165,4 +165,7 @@ cef_v8.h - CreateArrayBuffer (does not own the buffer) - IsArrayBuffer - GetArrayBufferReleaseCallback - - NeuterArrayBuffer \ No newline at end of file + - NeuterArrayBuffer + +cef_urlrequest.h +- ResponseWasCached \ No newline at end of file diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py index c8e52699..6814cbb7 100644 --- a/tools/installer/cefpython3.setup.py +++ b/tools/installer/cefpython3.setup.py @@ -129,7 +129,7 @@ def main(): "https://github.com/cztomczak/cefpython", license="BSD 3-clause", author="Czarek Tomczak", - author_email="czarek.tomczak2@@gmail.com", + author_email="czarek.tomczak@gmail.com", url="https://github.com/cztomczak/cefpython", download_url="https://github.com/cztomczak/cefpython/releases", platforms=["{{SYSCONFIG_PLATFORM}}"], From 2de75b7f884fe12266b701e1ed7cd531346754d3 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Tue, 21 Aug 2018 11:30:08 +0200 Subject: [PATCH 083/177] Update screenshot.py. Note on viewport size limits in Chromium. --- examples/screenshot.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/examples/screenshot.py b/examples/screenshot.py index c27e72d0..7392ed5b 100644 --- a/examples/screenshot.py +++ b/examples/screenshot.py @@ -24,6 +24,15 @@ Tested configurations: - CEF Python v57.0+ - Pillow 2.3.0 / 4.1.0 + +NOTE: There are limits in Chromium on viewport size. For some + websites with huge viewport size it won't work. In such + case it is required to reduce viewport size to an usual + size of a window and perform scrolling programmatically + using javascript while making a screenshot for each of + the scrolled region. Then at the end combine all the + screenshots into one. To force a paint event in OSR + mode call cef.Invalidate(). """ from cefpython3 import cefpython as cef From 774820848b37da3b01e0f2436354057b1c1faaad Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Wed, 22 Aug 2018 09:29:20 +0200 Subject: [PATCH 084/177] Update Tutorial.md ExceptHook update --- docs/Tutorial.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/Tutorial.md b/docs/Tutorial.md index d67b6204..b4533e34 100644 --- a/docs/Tutorial.md +++ b/docs/Tutorial.md @@ -69,10 +69,10 @@ Google website. Let's analyze the code from that example: 1. `from cefpython3 import cefpython as cef` - Import the cefpython module and make a short "cef" alias 2. `sys.excepthook = cef.ExceptHook` - Overwrite Python's default - exception handler so that all CEF sub-processes are terminated - when Python exception occurs. To understand this better read the - "Architecture" and "Handling Python exceptions" sections - further down in this Tutorial. + exception handler so that all CEF sub-processes are reliably + terminated when Python exception occurs. To understand this + better read the "Architecture" and "Handling Python exceptions" + sections further down in this Tutorial. 3. `cef.Initialize()` - Initialize CEF. This function must be called somewhere in the beginning of your code. It must be called before any application window is created. It must be called only once @@ -140,9 +140,9 @@ special handling. When Python exception occurs then main process is terminated. For CEF this means that the Browser process is terminated, however there may still be running CEF sub-processes like Renderer process, GPU process, etc. To terminate these -sub-processes cef.[Shutdown](../api/cefpython.md#shutdown) +sub-processes cleanly cef.[Shutdown](../api/cefpython.md#shutdown) must be called and if running CEF message loop then it must be -stopped first. In all CEF Python examples you can find such +stopped first. In most of CEF Python examples you can find such a line that overwrites the default exception handler in Python: ```python @@ -160,7 +160,8 @@ The cef.ExceptHook helper function does the following: which exits the process with status 1, without calling cleanup handlers, flushing stdio buffers, etc. -See CEF Python's ExceptHook source code in src/[helpers.pyx](../src/helpers.pyx). +If you would like to modify `ExceptHook` behavior, see its source code +in src/[helpers.pyx](../src/helpers.pyx) file. ## Settings From c160430867ab55a9dcee5e4855852da6f95d9a1a Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 22 Aug 2018 11:26:24 +0200 Subject: [PATCH 085/177] Auto cleanup in the examples/ directory, so that build scripts do not include trash directories. See Issue #432. --- tools/common.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tools/common.py b/tools/common.py index ec92b0fe..4bee285f 100644 --- a/tools/common.py +++ b/tools/common.py @@ -175,6 +175,25 @@ UNITTESTS_DIR = os.path.abspath(os.path.join(ROOT_DIR, "unittests")) # ---------------------------------------------------------------------------- + +# Auto cleanup in the examples/ directory, so that build scripts +# do not include trash directories. See Issue #432. + +shutil.rmtree(os.path.join(EXAMPLES_DIR, "blob_storage"), + ignore_errors=True) +shutil.rmtree(os.path.join(EXAMPLES_DIR, "webrtc_event_logs"), + ignore_errors=True) +shutil.rmtree(os.path.join(EXAMPLES_DIR, "webcache"), + ignore_errors=True) + +shutil.rmtree(os.path.join(SNIPPETS_DIR, "blob_storage"), + ignore_errors=True) +shutil.rmtree(os.path.join(SNIPPETS_DIR, "webrtc_event_logs"), + ignore_errors=True) +shutil.rmtree(os.path.join(SNIPPETS_DIR, "webcache"), + ignore_errors=True) + + # cefpython API header file and a fixed copy of it CEFPYTHON_API_HFILE = os.path.join(BUILD_CEFPYTHON, "cefpython_py{pyver}.h" From 3364c8fbcf4b48b0e41446939d23ebe1892d0f63 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 22 Aug 2018 11:37:40 +0200 Subject: [PATCH 086/177] Add window_size.py snippet --- examples/snippets/window_size.py | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 examples/snippets/window_size.py diff --git a/examples/snippets/window_size.py b/examples/snippets/window_size.py new file mode 100644 index 00000000..6ae1ba54 --- /dev/null +++ b/examples/snippets/window_size.py @@ -0,0 +1,34 @@ +""" +Set initial size of window to 900px / 640px without using +any third party GUI framework. On Linux/Mac you can set +window size by calling WindowInfo.SetAsChild. On Windows +you can accomplish this by calling Windows native functions +using the ctypes module. +""" + +from cefpython3 import cefpython as cef +import platform + + +def main(): + cef.Initialize() + window_info = cef.WindowInfo() + window_info.SetAsChild(0, [0, 0, 900, 640]) + browser = cef.CreateBrowserSync(url="https://www.google.com/", + window_info=window_info, + window_title="Window size") + if platform.system() == "Windows": + pass + cef.MessageLoop() + del browser + cef.Shutdown() + + +class LifespanHandler(object): + def OnBeforeClose(self, browser): + print("Browser ID: {}".format(browser.GetIdentifier())) + print("Browser will close and app will exit") + + +if name == 'main': + main() From f6e7de20300bd33bc1dc2807f480c8efd5b9b689 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 22 Aug 2018 11:54:44 +0200 Subject: [PATCH 087/177] Update window_size.py snippet. Works on Windows now. --- examples/README-examples.md | 2 ++ examples/snippets/window_size.py | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/examples/README-examples.md b/examples/README-examples.md index de756013..c87eee07 100644 --- a/examples/README-examples.md +++ b/examples/README-examples.md @@ -63,6 +63,8 @@ See small code snippets that show various CEF features in the on a web page as soon as DOM is ready. - [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom Python code on a web page when page loading is complete. +- [window_size.py](snippets/window_size.py) - Set initial window size + without using any third party GUI framework. ### GUI frameworks diff --git a/examples/snippets/window_size.py b/examples/snippets/window_size.py index 6ae1ba54..48e99160 100644 --- a/examples/snippets/window_size.py +++ b/examples/snippets/window_size.py @@ -1,5 +1,5 @@ """ -Set initial size of window to 900px / 640px without using +Set initial window size to 900/600 pixels without using any third party GUI framework. On Linux/Mac you can set window size by calling WindowInfo.SetAsChild. On Windows you can accomplish this by calling Windows native functions @@ -7,18 +7,27 @@ """ from cefpython3 import cefpython as cef +import ctypes import platform def main(): cef.Initialize() window_info = cef.WindowInfo() - window_info.SetAsChild(0, [0, 0, 900, 640]) + parent_handle = 0 + # All rect coordinates are applied including X and Y parameters + window_info.SetAsChild(parent_handle, [0, 0, 900, 640]) browser = cef.CreateBrowserSync(url="https://www.google.com/", window_info=window_info, window_title="Window size") if platform.system() == "Windows": - pass + window_handle = browser.GetOuterWindowHandle() + # X and Y parameters are ignored by setting the SWP_NOMOVE flag + SWP_NOMOVE = 0x0002 + insert_after_handle = 0 + # noinspection PyUnresolvedReferences + ctypes.windll.user32.SetWindowPos(window_handle, insert_after_handle, + 0, 0, 900, 640, SWP_NOMOVE) cef.MessageLoop() del browser cef.Shutdown() From 39ca247b0c143b25326f9d1a4b173a22006a916e Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 22 Aug 2018 11:59:49 +0200 Subject: [PATCH 088/177] Update window_size.py snippet --- examples/README-examples.md | 2 +- examples/snippets/window_size.py | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/examples/README-examples.md b/examples/README-examples.md index c87eee07..c8943656 100644 --- a/examples/README-examples.md +++ b/examples/README-examples.md @@ -64,7 +64,7 @@ See small code snippets that show various CEF features in the - [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom Python code on a web page when page loading is complete. - [window_size.py](snippets/window_size.py) - Set initial window size - without using any third party GUI framework. + without use of any third party GUI framework. ### GUI frameworks diff --git a/examples/snippets/window_size.py b/examples/snippets/window_size.py index 48e99160..5a7b04d0 100644 --- a/examples/snippets/window_size.py +++ b/examples/snippets/window_size.py @@ -1,5 +1,5 @@ """ -Set initial window size to 900/600 pixels without using +Set initial window size to 900/640px without use of any third party GUI framework. On Linux/Mac you can set window size by calling WindowInfo.SetAsChild. On Windows you can accomplish this by calling Windows native functions @@ -15,16 +15,17 @@ def main(): cef.Initialize() window_info = cef.WindowInfo() parent_handle = 0 - # All rect coordinates are applied including X and Y parameters + # This call has effect only on Mac and Linux. + # All rect coordinates are applied including X and Y parameters. window_info.SetAsChild(parent_handle, [0, 0, 900, 640]) browser = cef.CreateBrowserSync(url="https://www.google.com/", window_info=window_info, window_title="Window size") if platform.system() == "Windows": window_handle = browser.GetOuterWindowHandle() + insert_after_handle = 0 # X and Y parameters are ignored by setting the SWP_NOMOVE flag SWP_NOMOVE = 0x0002 - insert_after_handle = 0 # noinspection PyUnresolvedReferences ctypes.windll.user32.SetWindowPos(window_handle, insert_after_handle, 0, 0, 900, 640, SWP_NOMOVE) @@ -33,11 +34,5 @@ def main(): cef.Shutdown() -class LifespanHandler(object): - def OnBeforeClose(self, browser): - print("Browser ID: {}".format(browser.GetIdentifier())) - print("Browser will close and app will exit") - - if name == 'main': main() From d61fd8b1114c440c298bf7a224f6f17bc19fc510 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 22 Aug 2018 18:05:18 +0200 Subject: [PATCH 089/177] Add "setcookie.py" snippet --- examples/snippets/setcookie.py | 36 ++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 examples/snippets/setcookie.py diff --git a/examples/snippets/setcookie.py b/examples/snippets/setcookie.py new file mode 100644 index 00000000..04a99508 --- /dev/null +++ b/examples/snippets/setcookie.py @@ -0,0 +1,36 @@ +""" +Shows how to set a cookie. +""" + +from cefpython3 import cefpython as cef +import datetime + + +def main(): + cef.Initialize() + cef.CreateBrowserSync( + url="http://www.html-kit.com/tools/cookietester/", + window_title="Set a cookie") + manager = cef.CookieManager.GetGlobalManager() + cookie = cef.Cookie() + cookie.Set({ + "name": "my_cookie", + "value": "my_value", + # Make sure domain is a valid value otherwise it crashes + # app (Issue #459) + "domain": "www.html-kit.com", + "path": "/", + "secure": False, + "httpOnly": False, + "creation": datetime.datetime(2018, 8, 22), + "lastAccess": datetime.datetime(2018, 8, 22), + "hasExpires": True, + "expires": datetime.datetime(2028, 12, 31, 23, 59, 59), + }) + manager.SetCookie("http://www.html-kit.com/", cookie) + cef.MessageLoop() + cef.Shutdown() + + +if name == 'main': + main() From a1ddc14ca1650f84d85535eced76d36cbe806ab0 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 22 Aug 2018 18:08:08 +0200 Subject: [PATCH 090/177] Update README-examples.md --- examples/README-examples.md | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/README-examples.md b/examples/README-examples.md index c8943656..ed104c39 100644 --- a/examples/README-examples.md +++ b/examples/README-examples.md @@ -63,6 +63,7 @@ See small code snippets that show various CEF features in the on a web page as soon as DOM is ready. - [onpagecomplete.py](snippets/onpagecomplete.py) - Execute custom Python code on a web page when page loading is complete. +- [setcookie.py](snippets/setcookie.py) - Shows how to set a cookie - [window_size.py](snippets/window_size.py) - Set initial window size without use of any third party GUI framework. From fa8737b3863f49a000656799559b66f69d4b2fae Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Thu, 23 Aug 2018 10:57:55 +0200 Subject: [PATCH 091/177] Update Knowledge-Base.md --- docs/Knowledge-Base.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/Knowledge-Base.md b/docs/Knowledge-Base.md index 91d5a516..fddb6a7d 100644 --- a/docs/Knowledge-Base.md +++ b/docs/Knowledge-Base.md @@ -34,15 +34,14 @@ To be notified on new commits subscribe to this [RSS/Atom feed](../../../commits CEF Python depends on CEF and API breaks are inevitable when updating to latest CEF. The [Migration Guide](Migration-guide.md) document -lists most notable breaking changes for each release. Other changes -that do not backwards compatibility can be seen on [GitHub Releases](../../../releases) -pages. +lists most notable breaking changes for each release. Full chanelogs +can be found on [GitHub Releases](../../../releases) pages. -Due to unavoidable changes in API it is recommended for your setup -scripts that use for example PIP to install the cefpython3 package, +Due to unavoidable changes in upstream API it is recommended for your setup +scripts, that for example use PIP to install the cefpython3 package, to hardcode the cefpython version string. If for example using PIP's -requirements.txt file then list the cefpython3 package in the -following format if using cefpython v57.0: `cefpython3 == 57.0`. +`requirements.txt` file then include the cefpython3 package in the +following format if using e.g. cefpython v57.0: `cefpython3 == 57.0`. ## Differences between Python 2 and Python 3 From 1ebc485ec499f15423802980936af5ac832b53cd Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 27 Aug 2018 20:05:36 +0200 Subject: [PATCH 092/177] Update README and Migration Guide dos - v49.0 release (#460, #462) --- README.md | 60 ++++++++- docs/Migration-guide.md | 291 ++++++++++++++++++++++++++-------------- 2 files changed, 241 insertions(+), 110 deletions(-) diff --git a/README.md b/README.md index 1e6697e8..2c4e38ab 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ Table of contents: * [Introduction](#introduction) * [Sponsors](#sponsors) * [Thanks to Lampix for the v66 release](#thanks-to-lampix-for-the-v66-release) + * [Thanks to Fivestars for the v49 release (WinXP/Vista)](#thanks-to-fivestars-for-the-v49-release-winxpvista) * [Install](#install) * [Tutorial](#tutorial) * [Examples](#examples) @@ -11,6 +12,10 @@ Table of contents: * [Support development](#support-development) * [Thanks](#thanks) * [Releases](#releases) + * [Next release](#next-release) + * [Latest release](#latest-release) + * [v49 release (WinXP/Vista)](#v49-release-winxpvista) + * [v31 release (old systems)](#v31-release-old-systems) * [Other READMEs](#other-readmes) * [Quick links](#quick-links) @@ -43,6 +48,14 @@ or other kind of internet bots. + + + - -

+
+ + +
+ www.fivestars.com +
+
@@ -59,6 +72,8 @@ or other kind of internet bots. www.blueplanet.com

@@ -67,8 +82,6 @@ or other kind of internet bots. www.clearchat.com

@@ -94,7 +107,7 @@ all the individuals and companies supporting CEF Python. ### Thanks to Lampix for the v66 release -Many Thanks to Lampix for sponsoring the [v66 release](../../releases) of CEF Python. +Many Thanks to Lampix for sponsoring the [v66 release](../../releases/tag/v66.0) of CEF Python. Lampix is the first hardware and software solution that turns any surface into a smart, augmented reality or interactive surface. Please visit its website here: https://lampix.com/ . @@ -102,6 +115,17 @@ website here: https://lampix.com/ . [![lampix360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png)](https://lampix.com/) +### Thanks to Fivestars for the v49 release (WinXP/Vista) + +Thanks to Fivestars Loyalty, Inc. for sponsoring the +[v49 release](../../releases/tag/v49.0) for legacy systems such +as Windows XP and Vista. Please visit its website: +https://www.fivestars.com/ . + +[![fivestars360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars360.png)](https://www.fivestars.com/) + + + ## Install You can install [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3) @@ -201,7 +225,7 @@ Information on planned new and current releases, supported platforms, python versions, architectures and requirements. If you want to support old operating systems then choose the v31 release. -Next release +### Next release - To see planned new features or bugs to be fixed in the next release, see the @@ -212,7 +236,7 @@ support old operating systems then choose the v31 release. [next release 2](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22next+release+2%22) label in the tracker -Latest release +### Latest release OS | Py2 | Py3 | 32bit | 64bit | Requirements --- | --- | --- | --- | --- | --- @@ -224,7 +248,31 @@ These platforms are not supported yet: - ARM - see [Issue #267](../../issues/267) - Android - see [Issue #307](../../issues/307) -v31 release + +### v49 release (WinXP/Vista) + +OS | Py2 | Py3 | 32bit | 64bit | Requirements +--- | --- | --- | --- | --- | --- +Windows | 2.7 | 3.4 | Yes | Yes | Windows XP+ + +- Install with command: `pip --no-cache-dir install cefpython3==49.0`. + - Please note that if you were previously installing cefpython3 + package it is required to use the `--no-cache-dir` flag, + otherwise pip will end up with error message + `No matching distribution found for cefpython3==49.0`. + This happens because 49.0 release occured after 57.0 and 66.0 + releases. +- Downloads are available on GitHub Releases tagged + [v49.0](../../releases/tag/v49.0). +- See [Migration guide](docs/Migration-guide.md) document for changes + in this release +- Documentation is available in the [docs/](../../tree/cefpython49-winxp/docs) + directory in the `cefpython49-winxp` branch +- API reference is available in the [api/](../../tree/cefpython49-winxp/api) + directory in the `cefpython49-winxp` branch + + +### v31 release (old systems) OS | Py2 | Py3 | 32bit | 64bit | Requirements --- | --- | --- | --- | --- | --- diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md index 3063ada1..7567f0a8 100644 --- a/docs/Migration-guide.md +++ b/docs/Migration-guide.md @@ -15,25 +15,29 @@ in your application. Table of contents: -* [v50+ Distribution packages](#v50-distribution-packages) +* [v49+ Distribution packages](#v49-distribution-packages) +* [v49+ cefbuilds.com is deprected, use Spotify Automated CEF Builds](#v49-cefbuildscom-is-deprected-use-spotify-automated-cef-builds) +* [v49+ Build instructions and build tools](#v49-build-instructions-and-build-tools) +* [v49: GPU acceleration should be disabled on Windows XP](#v49-gpu-acceleration-should-be-disabled-on-windows-xp) +* [v49 (Win) Handlers' callbacks and other interfaces](#v49-win-handlers-callbacks-and-other-interfaces) +* [v49+ High DPI support on Windows](#v49-high-dpi-support-on-windows) +* [v49 (Win) Do not call the 'WindowUtils.OnSize' function](#v49-win-do-not-call-the-windowutilsonsize-function) +* [v49+ Notify CEF on move or resize events](#v49-notify-cef-on-move-or-resize-events) +* [v49+ Flash support](#v49-flash-support) +* [v49+ Off-screen-rendering: new option "windowless_rendering_enabled"](#v49-off-screen-rendering-new-option-windowless_rendering_enabled) +* [v49+ BrowserSettings options removed](#v49-browsersettings-options-removed) +* [v49+ cef.Request.Flags changed](#v49-cefrequestflags-changed) +* [v49+ Request.GetHeaderMap and SetHeaderMap change](#v49-requestgetheadermap-and-setheadermap-change) +* [v49+ (Win) HTTPS cache problems on pages with certificate errors](#v49-win-https-cache-problems-on-pages-with-certificate-errors) * [v50+ Importing the cefpython3 package on Linux](#v50-importing-the-cefpython3-package-on-linux) * [v50+ Install X11 error handlers on Linux](#v50-install-x11-error-handlers-on-linux) * [v50+ Set window bounds on Linux](#v50-set-window-bounds-on-linux) -* [v50+ Notify CEF on move or resize events](#v50-notify-cef-on-move-or-resize-events) * [v50+ Keyboard focus issues on Linux](#v50-keyboard-focus-issues-on-linux) * [v50+ Windows XP and Vista are no more supported](#v50-windows-xp-and-vista-are-no-more-supported) * [v50+ Mac 32-bit is no more supported](#v50-mac-32-bit-is-no-more-supported) -* [v50+ cefbuilds.com is deprected, use Spotify Automated CEF Builds](#v50-cefbuildscom-is-deprected-use-spotify-automated-cef-builds) -* [v50+ Build instructions and build tools](#v50-build-instructions-and-build-tools) -* [v51+ Off-screen-rendering: new option "windowless_rendering_enabled"](#v51-off-screen-rendering-new-option-windowless_rendering_enabled) * [v51+ Remove LifespanHandler.RunModal](#v51-remove-lifespanhandlerrunmodal) -* [v51+ BrowserSettings options removed](#v51-browsersettings-options-removed) -* [v51+ cef.Request.Flags changed](#v51-cefrequestflags-changed) -* [v51+ Request.GetHeaderMap and SetHeaderMap change](#v51-requestgetheadermap-and-setheadermap-change) -* [v54+ GTK 3 example doesn't work anymore on Linux](#v54-gtk-3-example-doesnt-work-anymore-on-linux) * [v54+ libcef.so library is stripped from symbols on Linux](#v54-libcefso-library-is-stripped-from-symbols-on-linux) -* [v55+ HTTPS cache problems on pages with certificate errors](#v55-https-cache-problems-on-pages-with-certificate-errors) -* [v55.3+ Handlers' callbacks and other interfaces are now called using keyword args](#v553-handlers-callbacks-and-other-interfaces-are-now-called-using-keyword-args) +* [v55.3+ Handlers' callbacks and other interfaces](#v553-handlers-callbacks-and-other-interfaces) * [v56+ MacOS 10.9+ required to run](#v56-macos-109-required-to-run) * [v57.1+ High DPI support on Windows](#v571-high-dpi-support-on-windows) * [v66+ Linux patch that fixed HTTPS cache problems on pages with certificate errors was disabled](#v66-linux-patch-that-fixed-https-cache-problems-on-pages-with-certificate-errors-was-disabled) @@ -46,10 +50,10 @@ Table of contents: * [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed) * [v66+ RequestHandler.GetCookieManager not getting called in some cases](#v66-requesthandlergetcookiemanager-not-getting-called-in-some-cases) * [v66+ Changes to Mac apps that integrate into existing message loop (Qt, wxPython)](#v66-changes-to-mac-apps-that-integrate-into-existing-message-loop-qt-wxpython) +* [v67+ Do not call the 'WindowUtils.OnSize' function](#v67-do-not-call-the-windowutilsonsize-function) - -## v50+ Distribution packages +## v49+ Distribution packages In latest CEF Python there is only one distribution package available: a wheel package. Wheel packages are distributed on @@ -77,120 +81,133 @@ in an automated manner, it might be reconsidered in the future to provide debian packages again. -## v50+ Importing the cefpython3 package on Linux +## v49+ cefbuilds.com is deprected, use Spotify Automated CEF Builds -In the past on Linux it was required for the cefpython3 package -to be imported before any other packages due to tcmalloc global -hook being loaded. This is not required anymore, tcmalloc is -disabled by default. +The cefbuilds.com site with CEF prebuilt binaries is now deprecated. +From now on download prebuilt CEF binaries from the Spotify Automated +CEF Builds: +http://opensource.spotify.com/cefbuilds/index.html -## v50+ Install X11 error handlers on Linux -It is required to install X11 error handlers on Linux, otherwise -you will see 'BadWindow' errors happening - sometimes randomly - -which will cause application to terminate. Since v56+ x11 error -handlers are installed automatically by default during the call -to cef.Initialize(). However sometimes that is not enough like -for example in the wxpython.py example which requires the x11 -error handlers to be installed manually after wx was initialized, -and that is because wx initialization had reset x11 error handlers -that were installed earlier during cef initialization (Issue [#334](../../../issues/334)). +## v49+ Build instructions and build tools -You can install X11 error handlers by calling: -``` -WindowUtils = cef.WindowUtils() -WindowUtils.InstallX11ErrorHandlers() -``` +There were many changes in regards to building CEF and CEF Python. +There are now new tools in the tools/ root directory that fully +automate building CEF and CEF Python. CEF Python now provides +upstream CEF prebuilt binaries and libraries on GitHub Releases +tagged eg. "v49-upstream". With these binaries you can build +CEF Python from sources in less than 10 minutes. See the new +[Build instructions](Build-instructions.md) document. -API ref: WindowUtils.[InstallX11ErrorHandlers()](../api/WindowUtils.md#installx11errorhandlers-linux) +## v49: GPU acceleration should be disabled on Windows XP -## v50+ Set window bounds on Linux +On XP you should disable GPU acceleration by setting the `--disable-gpu` +and `--disable-gpu-compositing` switches. These switches can +be passed programmatically to `cef.Initialize`, see +[api/Command Line Switches](../api/CommandLineSwitches.md). -It is now required to set window bounds during window "resize", -"move" and "configure" events on Linux. You can do so by calling: -``` -browser.SetBounds(x, y, width, height) -``` +## v49 (Win) Handlers' callbacks and other interfaces -API ref: Browser.[SetBounds()](../api/Browser.md#setbounds) +In v49.0 release for Windows all handlers' +callbacks and other interfaces such as +CookieVisitor, StringVisitor and WebRequestClient, are now called +using keyword arguments (Issue [#291](../../../issues/291)). +This will cause many of existing code to break. This is how you +should declare callbacks using the new style: + +``` +def OnLoadStart(self, browser, _): + pass +def OnLoadStart(self, kwargs): + browser = kwargs["browser"] +``` -## v50+ Notify CEF on move or resize events +In the first declaration you see that only one argument is +declared, the browser, the others unused will be in the "_" +variable (the name of the variable is so that PyCharm doesn't +warn about unused variable). -It is required to notify the browser on move or resize events -so that popup widgets (e.g. \) are displayed in the correct -location and dismissed when the window moves. Also so that -drag & drop areas are updated accordingly. +Even if you specify and use all arguments, always add the +unused kwargs (`_`) at the end: ``` -browser.NotifyMoveOrResizeStarted() +def OnLoadStart(self, browser, frame, _): + pass ``` -API ref: Browser.[NotifyMoveOrResizeStarted()](../api/Browser.md#notifymoveorresizestarted) - +This will be handy in the future, in a case when upstream CEF +adds a new argument to the API, your code won't break. When +an argument is removed in upstream CEF API, if it's possible +CEF Python will try to keep backward compatibility by +emulating behavior of the old argument. -## v50+ Keyboard focus issues on Linux +In case of OnLoadStart, when you've used "browser" and "frame" +names for the arguments, your code won't break. However in +many other callbacks, where you've used argument names that +differed from how they were named in API docs, your code will +break. Also argument names were changed from camelCase +to underscores. For example the OnLoadEnd callback has renamed +the `httpStatusCode` argument to `http_code`. So in this case +your code will definitely break, unless you've also used +"http_code" for argument name. -There several keyboard focus issues on Linux since CEF library -replaced GTK library with X11 library. Most of these issues are -fixed in examples by calling SetFocus in LoadHandler.OnLoadStart -during initial app loading and/or by calling SetFocus in -FocusHandler.OnGotFocus. This keyboard focus issues need to be -fixed in usptream CEF. For more details see Issue [#284](../../../issues/284). +## v49+ High DPI support on Windows -## v50+ Windows XP and Vista are no more supported +It is recommended to embed a DPI awareness manifest in both the main +process and the subprocesses (the subprocess.exe executable) instead +of calling `DpiAware`.[SetProcessDpiAware](../api/DpiAware.md#setprocessdpiaware) +which sets DPI awareness only for the main process. -CEF Python v31.2 was the last version to support Windows XP. -This is due to Chromium/CEF dropping XP support, last version -that supported XP was CEF v49. +The `ApplicationSettings`.[auto_zooming](../api/ApplicationSettings.md#auto_zooming) +option has a default value of an empty string now. Previously the +default was "system_dpi". When enabling High DPI support you should +set it to "system_dpi" explicitilly. +Note that `DpiAware`.[CalculateWindowSize](../api/DpiAware.md#calculatewindowsize) +does not handle all DPI settings (e.g. 132% on Windows 10). +In newer CEF Python there is available `DpiAware`[Scale](../api/DpiAware.md#scale) +which is more reliable and can handle all DPI resolutions. You can copy see +its implementation in `src/dpi_aware_win.pyx`. -## v50+ Mac 32-bit is no more supported -CEF Python v31.2 was the last version to support Mac 32-bit. -This is due to CEF/Chromium dropping 32-bit support, last version -that supported 32-bit was CEF v38. +## v49 (Win) Do not call the 'WindowUtils.OnSize' function +This function can sometimes cause app hanging during window resize. +Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize) +function. See [Issue #464](../../../issues/464) for more details. -## v50+ cefbuilds.com is deprected, use Spotify Automated CEF Builds -The cefbuilds.com site with CEF prebuilt binaries is now deprecated. -From now on download prebuilt CEF binaries from the Spotify Automated -CEF Builds: +## v49+ Notify CEF on move or resize events -http://opensource.spotify.com/cefbuilds/index.html +It is required to notify the browser on move or resize events +so that popup widgets (e.g. \) are displayed in the correct +location and dismissed when the window moves. Also so that +drag & drop areas are updated accordingly. Call +Browser.[NotifyMoveOrResizeStarted()](../api/Browser.md#notifymoveorresizestarted) +during a move or resize event in your app window. -## v50+ Build instructions and build tools +## v49+ Flash support -There were many changes in regards to building CEF and CEF Python. -There are now new tools in the tools/ root directory that fully -automate building CEF and CEF Python. CEF Python now provides -upstream CEF prebuilt binaries and libraries on GitHub Releases -tagged eg. "v56-upstream". With these binaries you can build -CEF Python from sources in less than 10 minutes. See the new -[Build instructions](Build-instructions.md) document. +See [Issue #235](../../../issues/235) ("Flash support in CEF v49+") +for instructions on how to enable Flash. -## v51+ Off-screen-rendering: new option "windowless_rendering_enabled" +## v49+ Off-screen-rendering: new option "windowless_rendering_enabled" When using off-screen-rendering you must set the ApplicationSettings "windowless_rendering_enabled" option to True. This applies to -examples such as: Kivy, Panda3D and screenshot example. +examples such as: Kivy, Panda3D, PySDL2 and screenshot example. API ref: ApplicationSettings.[windowless_rendering_enabled](../api/ApplicationSettings.md#windowless_rendering_enabled) -## v51+ Remove LifespanHandler.RunModal - -LifespanHandler.RunModal callback is no more available. - - -## v51+ BrowserSettings options removed +## v49+ BrowserSettings options removed The following options were removed from BrowserSettings: - user_style_sheet_location @@ -199,7 +216,7 @@ The following options were removed from BrowserSettings: - author_and_user_styles_disabled -## v51+ cef.Request.Flags changed +## v49+ cef.Request.Flags changed The following flags were removed from cef.Request.Flags: - AllowCookies @@ -209,7 +226,7 @@ The following flags were removed from cef.Request.Flags: API ref: Request.[GetFlags](../api/Request.md#getflags) -## v51+ Request.GetHeaderMap and SetHeaderMap change +## v49+ Request.GetHeaderMap and SetHeaderMap change GetHeaderMap() will not include the Referer value if any and SetHeaderMap() will ignore the Referer value. @@ -217,35 +234,93 @@ and SetHeaderMap() will ignore the Referer value. API ref: Request.[GetHeaderMap](../api/Request.md#getheadermap) -## v54+ GTK 3 example doesn't work anymore on Linux +## v49+ (Win) HTTPS cache problems on pages with certificate errors -Update: GTK 3 example is back working in v57+. +The fix for HTTPS cache problems on pages with certificate errors +(and that includes self-signed certificates) is no more applied +on Windows. -Currently GTK 3 example is broken on Linux. You can either -downgrade to an old cefpython v53 (available on GitHub release -page) or use GTK 2 example. For more details on the problem see -Issue [#261](../../../issues/261). +See Issue [#125](../../../issues/125) for more details. -## v54+ libcef.so library is stripped from symbols on Linux +## v50+ Importing the cefpython3 package on Linux -Symbols useful for debugging are no more available in libcef.so -shipped with distribution packages on Linux. This is explained -in details in Issue [#262](../../../issues/262). +In the past on Linux it was required for the cefpython3 package +to be imported before any other packages due to tcmalloc global +hook being loaded. This is not required anymore, tcmalloc is +disabled by default. -## v55+ HTTPS cache problems on pages with certificate errors +## v50+ Install X11 error handlers on Linux -The fix for HTTPS cache problems on pages with certificate errors -is no more applied on Windows. +It is required to install X11 error handlers on Linux, otherwise +you will see 'BadWindow' errors happening - sometimes randomly - +which will cause application to terminate. Since v56+ x11 error +handlers are installed automatically by default during the call +to cef.Initialize(). However sometimes that is not enough like +for example in the wxpython.py example which requires the x11 +error handlers to be installed manually after wx was initialized, +and that is because wx initialization had reset x11 error handlers +that were installed earlier during cef initialization (Issue [#334](../../../issues/334)). -Soon this will fix also won't be applied on Linux anymore when -cefpython starts using CEF prebuilt binaries from Spotify. +You can install X11 error handlers by calling: +``` +WindowUtils = cef.WindowUtils() +WindowUtils.InstallX11ErrorHandlers() +``` -See Issue [#125](../../../issues/125) for more details. +API ref: WindowUtils.[InstallX11ErrorHandlers()](../api/WindowUtils.md#installx11errorhandlers-linux) + + +## v50+ Set window bounds on Linux + +It is now required to set window bounds during window "resize", +"move" and "configure" events on Linux. You can do so by calling: + +``` +browser.SetBounds(x, y, width, height) +``` + +API ref: Browser.[SetBounds()](../api/Browser.md#setbounds) + + +## v50+ Keyboard focus issues on Linux + +There several keyboard focus issues on Linux since CEF library +replaced GTK library with X11 library. Most of these issues are +fixed in examples by calling SetFocus in LoadHandler.OnLoadStart +during initial app loading and/or by calling SetFocus in +FocusHandler.OnGotFocus. This keyboard focus issues need to be +fixed in usptream CEF. For more details see Issue [#284](../../../issues/284). -## v55.3+ Handlers' callbacks and other interfaces are now called using keyword args +## v50+ Windows XP and Vista are no more supported + +CEF Python v49.0 was the last version to support Windows XP. +This is due to Chromium/CEF dropping XP support, last version +that supported XP was CEF v49. + + +## v50+ Mac 32-bit is no more supported + +CEF Python v31.2 was the last version to support Mac 32-bit. +This is due to CEF/Chromium dropping 32-bit support, last version +that supported 32-bit was CEF v38. + + +## v51+ Remove LifespanHandler.RunModal + +LifespanHandler.RunModal callback is no more available. + + +## v54+ libcef.so library is stripped from symbols on Linux + +Symbols useful for debugging are no more available in libcef.so +shipped with distribution packages on Linux. This is explained +in details in Issue [#262](../../../issues/262). + + +## v55.3+ Handlers' callbacks and other interfaces Since v55.3 all handlers' callbacks and other interfaces such as CookieVisitor, StringVisitor and WebRequestClient, are now called @@ -407,3 +482,11 @@ with message loop freezing. Only basic testing was performed. It was not tested of how this change affects performance. See Issue [#442](../../../issues/442) for more details on the issues. + + +## v67+ Do not call the 'WindowUtils.OnSize' function + +This function can sometimes cause app hanging during window resize. +Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize) +function. See [Issue #464](../../../issues/464) for more details. + From 6cf7455179e7dd79f8a8e9c7fbbbe686c3682258 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 27 Aug 2018 20:07:56 +0200 Subject: [PATCH 093/177] Update README - style changes --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2c4e38ab..497d810f 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ Table of contents: * [Introduction](#introduction) * [Sponsors](#sponsors) - * [Thanks to Lampix for the v66 release](#thanks-to-lampix-for-the-v66-release) - * [Thanks to Fivestars for the v49 release (WinXP/Vista)](#thanks-to-fivestars-for-the-v49-release-winxpvista) * [Install](#install) * [Tutorial](#tutorial) * [Examples](#examples) @@ -105,7 +103,7 @@ See the [Support development](#support-development) section for a list of all the individuals and companies supporting CEF Python. -### Thanks to Lampix for the v66 release +Thanks to Lampix for the v66 release Many Thanks to Lampix for sponsoring the [v66 release](../../releases/tag/v66.0) of CEF Python. Lampix is the first hardware and software solution that turns any surface @@ -115,7 +113,7 @@ website here: https://lampix.com/ . [![lampix360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png)](https://lampix.com/) -### Thanks to Fivestars for the v49 release (WinXP/Vista) +Thanks to Fivestars for the v49 release (WinXP/Vista) Thanks to Fivestars Loyalty, Inc. for sponsoring the [v49 release](../../releases/tag/v49.0) for legacy systems such From 263024423e22dfdcf720259d5c47aa2f48e949b5 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 27 Aug 2018 20:10:59 +0200 Subject: [PATCH 094/177] Update README, style changes again --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 497d810f..b6cc9eb4 100644 --- a/README.md +++ b/README.md @@ -110,8 +110,6 @@ Lampix is the first hardware and software solution that turns any surface into a smart, augmented reality or interactive surface. Please visit its website here: https://lampix.com/ . -[![lampix360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/lampix360.png)](https://lampix.com/) - Thanks to Fivestars for the v49 release (WinXP/Vista) @@ -120,9 +118,6 @@ Thanks to Fivestars Loyalty, Inc. for sponsoring the as Windows XP and Vista. Please visit its website: https://www.fivestars.com/ . -[![fivestars360](https://raw.githubusercontent.com/wiki/cztomczak/cefpython/images/fivestars360.png)](https://www.fivestars.com/) - - ## Install From 3e6f421a2bdba024522092c91e9e2031a8dded10 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 27 Aug 2018 20:17:30 +0200 Subject: [PATCH 095/177] Disable GPU acceleration and add perf. enhancing switches in OSR (#463) --- examples/screenshot.py | 28 +++++++++++++++++++++++----- unittests/osr_test.py | 22 +++++++++++++++++++--- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/examples/screenshot.py b/examples/screenshot.py index 7392ed5b..d6dc661c 100644 --- a/examples/screenshot.py +++ b/examples/screenshot.py @@ -43,7 +43,7 @@ try: from PIL import Image, PILLOW_VERSION -except: +except ImportError: print("[screenshot.py] Error: PIL module not available. To install" " type: pip install Pillow") sys.exit(1) @@ -64,9 +64,26 @@ def main(): os.remove(SCREENSHOT_PATH) command_line_arguments() # Off-screen-rendering requires setting "windowless_rendering_enabled" - # option, so that RenderHandler callbacks are called. - cef.Initialize(settings={"windowless_rendering_enabled": True}) - create_browser() + # option. + settings = { + "windowless_rendering_enabled": True, + } + switches = { + # GPU acceleration is not supported in OSR mode, so must disable + # it using these Chromium switches (Issue #240 and #463) + "disable-gpu": "", + "disable-gpu-compositing": "", + # Tweaking OSR performance by setting the same Chromium flags + # as in upstream cefclient (Issue #240). + "enable-begin-frame-scheduling": "", + "disable-surfaces": "", # This is required for PDF ext to work + } + browser_settings = { + # Tweaking OSR performance (Issue #240) + "windowless_frame_rate": 30, # Default frame rate in CEF is 30 + } + cef.Initialize(settings=settings, switches=switches) + create_browser(browser_settings) cef.MessageLoop() cef.Shutdown() print("[screenshot.py] Opening screenshot with default application") @@ -108,7 +125,7 @@ def command_line_arguments(): sys.exit(1) -def create_browser(): +def create_browser(settings): # Create browser in off-screen-rendering mode (windowless mode) # by calling SetAsOffscreen method. In such mode parent window # handle can be NULL (0). @@ -120,6 +137,7 @@ def create_browser(): print("[screenshot.py] Loading url: {url}" .format(url=URL)) browser = cef.CreateBrowserSync(window_info=window_info, + settings=settings, url=URL) browser.SetClientHandler(LoadHandler()) browser.SetClientHandler(RenderHandler()) diff --git a/unittests/osr_test.py b/unittests/osr_test.py index 0e4191be..672e98fe 100644 --- a/unittests/osr_test.py +++ b/unittests/osr_test.py @@ -23,7 +23,7 @@ font-size: 11pt; } - + + + +""" + + +class RequestHandler: + def GetResourceHandler(self, browser, frame, request): + print(request.GetPostData()) + return None + +def main(): + sys.excepthook = cef.ExceptHook + cef.Initialize() + browser = cef.CreateBrowserSync(url=cef.GetDataUrl(html)) + browser.SetClientHandler(RequestHandler()) + cef.MessageLoop() + del browser + cef.Shutdown() + + +if name == 'main': + main() diff --git a/unittests/main_test.py b/unittests/main_test.py index b0c2200c..f3602c21 100644 --- a/unittests/main_test.py +++ b/unittests/main_test.py @@ -235,7 +235,7 @@ def test_main(self): req_file = os.path.dirname(os.path.abspath(file)) req_file = os.path.join(req_file, "main_test.py") if sys.version_info.major > 2: - req_file = req_file.encode() + req_file = req_file.encode("utf-8") req_data = [b"--key=value", b"@"+req_file] req.SetMethod("POST") req.SetPostData(req_data) From b7f25aa7eecf59569dbb0bd7513ff84cee669c00 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sun, 12 Jan 2020 11:00:47 +0100 Subject: [PATCH 132/177] Fix tkinter focus issues on Windows (#535). --- examples/tkinter_.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/examples/tkinter_.py b/examples/tkinter_.py index 58dc402e..f1e2c818 100644 --- a/examples/tkinter_.py +++ b/examples/tkinter_.py @@ -13,6 +13,8 @@ # Known issue on Linux: When typing url, mouse must be over url # entry widget otherwise keyboard focus is lost (Issue #255 # and Issue #284). +# Other focus issues discussed in Issue #535. + from cefpython3 import cefpython as cef import ctypes @@ -153,6 +155,7 @@ def init(self, master, navigation_bar=None): self.bind("", self.on_focus_in) self.bind("", self.on_focus_out) self.bind("", self.on_configure) + """For focus problems see Issue #255 and Issue #535. """ self.focus_set() def embed_browser(self): @@ -216,8 +219,6 @@ def on_focus_in(self, _): def on_focus_out(self, _): logger.debug("BrowserFrame.on_focus_out") - if self.browser: - self.browser.SetFocus(False) def on_root_close(self): if self.browser: @@ -242,6 +243,7 @@ def OnLoadStart(self, browser, _): class FocusHandler(object): + """For focus problems see Issue #255 and Issue #535. """ def init(self, browser_frame): self.browser_frame = browser_frame @@ -253,13 +255,10 @@ def OnTakeFocus(self, next_component, _): def OnSetFocus(self, source, _): logger.debug("FocusHandler.OnSetFocus, source={source}" .format(source=source)) - return False + return True def OnGotFocus(self, _): - """Fix CEF focus issues (#255). Call browser frame's focus_set - to get rid of type cursor in url entry widget.""" logger.debug("FocusHandler.OnGotFocus") - self.browser_frame.focus_set() class NavigationBar(tk.Frame): @@ -340,7 +339,7 @@ def on_load_url(self, _): self.master.get_browser().LoadUrl(self.url_entry.get()) def on_button1(self, _): - """Fix CEF focus issues (#255). See also FocusHandler.OnGotFocus.""" + """For focus problems see Issue #255 and Issue #535. """ logger.debug("NavigationBar.on_button1") self.master.master.focus_force() From 076b6a661246c5855233730c766ab1dfa58264a9 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sun, 12 Jan 2020 11:12:15 +0100 Subject: [PATCH 133/177] Fix tkinter focus problems on Linux (#535). --- examples/tkinter_.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/examples/tkinter_.py b/examples/tkinter_.py index f1e2c818..c823f3dc 100644 --- a/examples/tkinter_.py +++ b/examples/tkinter_.py @@ -219,6 +219,9 @@ def on_focus_in(self, _): def on_focus_out(self, _): logger.debug("BrowserFrame.on_focus_out") + """For focus problems see Issue #255 and Issue #535. """ + if LINUX and self.browser: + self.browser.SetFocus(False) def on_root_close(self): if self.browser: @@ -255,10 +258,15 @@ def OnTakeFocus(self, next_component, _): def OnSetFocus(self, source, _): logger.debug("FocusHandler.OnSetFocus, source={source}" .format(source=source)) - return True + if LINUX: + return False + else: + return True def OnGotFocus(self, **_): logger.debug("FocusHandler.OnGotFocus") + if LINUX: + self.browser_frame.focus_set() class NavigationBar(tk.Frame): From bddb859d52a6c4bc65d7a3400d1fed71d40e3d7c Mon Sep 17 00:00:00 2001 From: GiovanniL <13402461+GiovaLomba@users.noreply.github.com> Date: Sun, 12 Jan 2020 17:08:27 +0100 Subject: [PATCH 134/177] Fixed typo (#556) Original: The actual key code genenerated by the platform New: The actual key code generated by the platform --- api/KeyboardHandler.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/KeyboardHandler.md b/api/KeyboardHandler.md index f8082805..4735a88a 100644 --- a/api/KeyboardHandler.md +++ b/api/KeyboardHandler.md @@ -38,7 +38,7 @@ KeyEvent is a dictionary with the following keys: | type | KeyEventType | The type of keyboard event | | modifiers | KeyEventFlags | Bit flags describing any pressed modifier keys | | windows_key_code | int | The Windows key code for the key event. This value is used by the DOM specification. Sometimes it comes directly from the event (i.e. on Windows) and sometimes it's determined using a mapping function. See "chromium/KeyboardCodes.h" for a list of values. | -| native_key_code | int | The actual key code genenerated by the platform | +| native_key_code | int | The actual key code generated by the platform | | is_system_key | bool | Indicates whether the event is considered a "system key" event. For Windows see [WM_SYSKEYDOWN](http://msdn.microsoft.com/en-us/library/ms646286.aspx). This value will always be false on non-Windows platforms. | | character | wchar_t or unsigned short | The character generated by the keystroke | | unmodified_character | wchar_t or unsigned short | Same as 'character' but unmodified by any concurrently-held modifiers (except shift). This is useful for working out shortcut keys. | From d9587bc6e8198de84aaedf9dbbbc42b569384730 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Mon, 13 Jan 2020 11:36:30 +0100 Subject: [PATCH 135/177] Issue 554 (#557) * Do not link against libpython on Linux (#554). * Part 2. Do not link against libpython library on Linux (#554). --- tools/build.py | 2 +- tools/cython_setup.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/tools/build.py b/tools/build.py index 66d1244e..5e578b94 100644 --- a/tools/build.py +++ b/tools/build.py @@ -238,7 +238,7 @@ def check_directories(): prebuilt_name = get_cef_binaries_libraries_basename(OS_POSTFIX2) print("[build.py] ERROR: Couldn't find CEF prebuilt binaries and" " libraries: 'build/{prebuilt_dir}/'. Download it" - " from GitHub released tagged eg. 'v50-upstream` or download" + " from GitHub released tagged eg. 'vXX-upstream` or download" " CEF binaries from Spotify Automated Builds and then run" "`automate.py --prebuilt-cef`." .format(prebuilt_dir=prebuilt_name)) diff --git a/tools/cython_setup.py b/tools/cython_setup.py index e033cf84..4f0cafc6 100644 --- a/tools/cython_setup.py +++ b/tools/cython_setup.py @@ -25,6 +25,7 @@ import sys import platform import Cython +import copy import os # Must monkey patch Cython's ModuleNode to inject custom C++ code @@ -65,6 +66,27 @@ def generate_extern_c_macro_definition(self, code): generate_extern_c_macro_definition) +# Issue #554: Shared libraries in manylinux1 wheel should not +# be linked against libpythonX.Y.so.1.0. +if LINUX: + get_libraries_old = (build_ext.get_libraries) + def get_libraries_new(self, ext): + libraries = get_libraries_old(self, ext) + libpython = ('python' + str(sys.version_info.major) + '.' + + str(sys.version_info.minor)) + for lib in copy.copy(libraries): + # Library name for Python versions before 3.8 may have + # an 'm' at the end. + if lib.startswith(libpython): + print("[cython_setup.py] Do not link against -l%s (Issue #554)" + % lib) + libraries.remove(lib) + return libraries + build_ext.get_libraries = ( + get_libraries_new + ) + + # Command line args FAST_FLAG = False ENABLE_PROFILING = False From fb2d94ca42c8ca54fe383a0ea55c9d3904fd5298 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Tue, 14 Jan 2020 16:02:46 +0100 Subject: [PATCH 136/177] Fix CefListValue "int index" params (#461). --- src/extern/cef/cef_values.pxd | 34 +++++++++++++++++----------------- src/process_message_utils.pyx | 8 ++++---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/extern/cef/cef_values.pxd b/src/extern/cef/cef_values.pxd index ee0bf506..3210432b 100644 --- a/src/extern/cef/cef_values.pxd +++ b/src/extern/cef/cef_values.pxd @@ -72,20 +72,20 @@ cdef extern from "include/cef_values.h": cpp_bool SetSize(size_t size) size_t GetSize() cpp_bool Clear() - cpp_bool Remove(int index) - cef_value_type_t GetType(int index) - cpp_bool GetBool(int index) - int GetInt(int index) - double GetDouble(int index) - CefString GetString(int index) - CefRefPtr[CefBinaryValue] GetBinary(int index) - CefRefPtr[CefDictionaryValue] GetDictionary(int index) - CefRefPtr[CefListValue] GetList(int index) - cpp_bool SetNull(int index) - cpp_bool SetBool(int index, cpp_bool value) - cpp_bool SetInt(int index, int value) - cpp_bool SetDouble(int index, double value) - cpp_bool SetString(int index, const CefString& value) - cpp_bool SetBinary(int index, CefRefPtr[CefBinaryValue] value) - cpp_bool SetDictionary(int index, CefRefPtr[CefDictionaryValue] value) - cpp_bool SetList(int index, CefRefPtr[CefListValue] value) + cpp_bool Remove(size_t index) + cef_value_type_t GetType(size_t index) + cpp_bool GetBool(size_t index) + int GetInt(size_t index) + double GetDouble(size_t index) + CefString GetString(size_t index) + CefRefPtr[CefBinaryValue] GetBinary(size_t index) + CefRefPtr[CefDictionaryValue] GetDictionary(size_t index) + CefRefPtr[CefListValue] GetList(size_t index) + cpp_bool SetNull(size_t index) + cpp_bool SetBool(size_t index, cpp_bool value) + cpp_bool SetInt(size_t index, int value) + cpp_bool SetDouble(size_t index, double value) + cpp_bool SetString(size_t index, const CefString& value) + cpp_bool SetBinary(size_t index, CefRefPtr[CefBinaryValue] value) + cpp_bool SetDictionary(size_t index, CefRefPtr[CefDictionaryValue] value) + cpp_bool SetList(size_t index, CefRefPtr[CefListValue] value) diff --git a/src/process_message_utils.pyx b/src/process_message_utils.pyx index 464c8f6b..8ced3f6c 100644 --- a/src/process_message_utils.pyx +++ b/src/process_message_utils.pyx @@ -92,8 +92,8 @@ cdef list CefListValueToPyList( if nestingLevel > 8: raise Exception("CefListValueToPyList(): max nesting level (8)" " exceeded") - cdef int index - cdef int size = int(cefListValue.get().GetSize()) + cdef size_t index + cdef size_t size = cefListValue.get().GetSize() cdef cef_types.cef_value_type_t valueType cdef list ret = [] cdef CefRefPtr[CefBinaryValue] binaryValue @@ -230,7 +230,7 @@ cdef CefRefPtr[CefListValue] PyListToCefListValue( cdef type valueType cdef CefRefPtr[CefListValue] ret = CefListValue_Create() cdef CefRefPtr[CefBinaryValue] binaryValue - cdef int index + cdef size_t index for index_size_t, value in enumerate(pyList): index = int(index_size_t) valueType = type(value) @@ -289,7 +289,7 @@ cdef void PyListToExistingCefListValue( " exceeded") cdef type valueType cdef CefRefPtr[CefListValue] newCefListValue - cdef int index + cdef size_t index for index_size_t, value in enumerate(pyList): index = int(index_size_t) valueType = type(value) From 2c3681f633cd86024e0a4031a4efcea54570fb53 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 15 Jan 2020 14:32:49 +0100 Subject: [PATCH 137/177] Fix crash when setting a cookie with invalid domain (#459). --- src/cookie.pyx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/cookie.pyx b/src/cookie.pyx index ce078c10..6d90144b 100644 --- a/src/cookie.pyx +++ b/src/cookie.pyx @@ -119,6 +119,19 @@ cdef class Cookie: return CefToPyString(cefString) cpdef py_void SetDomain(self, py_string domain): + pattern = re.compile(r"^(?:[a-z0-9](?:[a-z0-9-_]{0,61}[a-z0-9])?\.)" + r"+[a-z0-9][a-z0-9-_]{0,61}[a-z]$") + if PY_MAJOR_VERSION == 2: + assert isinstance(domain, bytes), "domain type is not bytes" + domain = domain.decode(g_applicationSettings["string_encoding"], + errors=BYTES_DECODE_ERRORS) + try: + if not pattern.match(domain.encode("idna").decode("ascii")): + raise Exception("Cookie.SetDomain() failed, invalid domain: {0}" + .format(domain)) + except UnicodeError: + raise Exception("Cookie.SetDomain() failed, invalid domain: {0}" + .format(domain)) cdef CefString cefString cefString.Attach(&self.cefCookie.domain, False) PyToCefString(domain, cefString) From a5d97f03e1762f79ac0d69ab446ade33b597ff5d Mon Sep 17 00:00:00 2001 From: cztomczak Date: Thu, 16 Jan 2020 11:56:45 +0100 Subject: [PATCH 138/177] Add GIL section to Contributing-code.md document (#102). --- docs/Contributing-code.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docs/Contributing-code.md b/docs/Contributing-code.md index bbcefc26..fb56e115 100644 --- a/docs/Contributing-code.md +++ b/docs/Contributing-code.md @@ -12,6 +12,7 @@ Table of contents: * [API docs](#api-docs) * [Unit tests](#unit-tests) * [Platforms](#platforms) +* [GIL](#gil) * [Authors](#authors) * [Updating CEF version](#updating-cef-version) @@ -123,6 +124,24 @@ In most cases new code should run fine on all platforms, but in some cases it might be required to test on all platforms before PR is merged. +## GIL + +In the pxd file, functions should be defined as "nogil" to avoid +deadlocks when calling CEF functions. In the pyx file the call must +use the "with nogil" statement. + +From [Cython's documentation](http://docs.cython.org/src/userguide/external_C_code.html#acquiring-and-releasing-the-gil): + +> Note that acquiring the GIL is a blocking thread-synchronising operation, +> and therefore potentially costly. It might not be worth releasing the GIL +> for minor calculations. Usually, I/O operations and substantial computations +> in parallel code will benefit from it. + +Revision [ec1ce78](https://github.com/cztomczak/cefpython/commit/ec1ce788373bb9e0fd2cedd71e900c3877e9185a) removes the GIL lock from the +following calls: Initialize(), Shutdown(), CreateBrowserSync(), +SetOsModalLoop(), QuitMessageLoop(), CefExecuteProcess(). There still +might be some more functions from which the GIL lock should be removed. + ## Authors In your pull request modify also the [Authors](../Authors) file From 11017dc68358b6adb4a3d822f53fa658ff4fa4f5 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Thu, 16 Jan 2020 12:31:08 +0100 Subject: [PATCH 139/177] Update LifespanHandler.md document. Info on OnBeforePopup and scripting between popup and parent window. (#171) --- api/LifespanHandler.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/api/LifespanHandler.md b/api/LifespanHandler.md index 2b929512..1794d62d 100644 --- a/api/LifespanHandler.md +++ b/api/LifespanHandler.md @@ -107,10 +107,6 @@ Description from upstream CEF: > browser is destroyed before the popup browser creation completes (indicated > by a call to OnAfterCreated for the popup browser). -Note that if you return True and create the popup window yourself, then -the popup window and parent window will not be able to script each other. -There will be no "window.opener" property available in the popup window. - `WindowOpenDisposition` constants in the cefpython module: * WOD_UNKNOWN, * WOD_CURRENT_TAB, @@ -122,3 +118,11 @@ There will be no "window.opener" property available in the popup window. * WOD_SAVE_TO_DISK, * WOD_OFF_THE_RECORD, * WOD_IGNORE_ACTION + +Note that if you return True and create the popup window yourself, then +the popup window and parent window will not be able to script each other. +There will be no "window.opener" property available in the popup window. +To avoid this issue create a hidden window when your application starts. +Parent the new popup browser to the hidden window in OnBeforePopup. After +the browser exists (OnAfterCreated) create the desired target window +and re-parent the browser to that target window. From 42924f5ee00ea4a5b97a099b0afb2ed9b877a71a Mon Sep 17 00:00:00 2001 From: cztomczak Date: Thu, 16 Jan 2020 15:52:10 +0100 Subject: [PATCH 140/177] Update README links for the old v31.2 release. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 24370549..0d0344ba 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,6 @@ See the [README-examples.md](examples/README-examples.md) and in the issue. See [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc) sorted by reactions. -- Wiki pages are deprecated and for v31 only ## Releases @@ -196,10 +195,11 @@ Mac | 2.7 | No | Yes | Yes | MacOS 10.7+ Additional information for v31.2 release: - On Windows/Mac you can install with command: `pip install cefpython3==31.2` -- Downloads are available on [wiki pages](../../wiki#downloads) - and on GitHub Releases tagged [v31.2](../../releases/tag/v31.2). -- Documentation is on [wiki pages](../../wiki) +- Downloads are available on the GitHub Releases page tagged + [v31.2](../../releases/tag/v31.2). - API reference is available in revision [169a1b2](../../tree/169a1b20d3cd09879070d41aab28cfa195d2a7d5/docs/api) +- Other documentation can be downloaded by cloning the + [cefpython.wiki.git](git@github.com:cztomczak/cefpython.wiki.git) repository. ## Support development From e9116faa2094de85ccebd403aee09c61e2c8b8f9 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Thu, 16 Jan 2020 15:54:30 +0100 Subject: [PATCH 141/177] Update README with cefpython.wiki git clone command. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0d0344ba..9cef2431 100644 --- a/README.md +++ b/README.md @@ -199,7 +199,7 @@ Additional information for v31.2 release: [v31.2](../../releases/tag/v31.2). - API reference is available in revision [169a1b2](../../tree/169a1b20d3cd09879070d41aab28cfa195d2a7d5/docs/api) - Other documentation can be downloaded by cloning the - [cefpython.wiki.git](git@github.com:cztomczak/cefpython.wiki.git) repository. + cefpython.wiki repository: `git clone git@github.com:cztomczak/cefpython.wiki.git` ## Support development From b03b78b64d0162eb186d05fb22452f934cd31152 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Fri, 17 Jan 2020 17:19:08 +0100 Subject: [PATCH 142/177] Fix V8ContextHandler.OnContextCreated and OnContextReleased (#484). These callbacks were never called previously. Rename --no-run-examples flag to --unittests in build scripts. --- api/V8ContextHandler.md | 4 +++- src/browser.pyx | 3 +++ tools/build.py | 23 +++++++++++++---------- tools/build_distrib.py | 23 ++++++++++++----------- unittests/_common.py | 5 +++-- unittests/main_test.py | 33 ++++++++++++++++++++++++++++++++- 6 files changed, 66 insertions(+), 25 deletions(-) diff --git a/api/V8ContextHandler.md b/api/V8ContextHandler.md index 9c6f6fbc..b88a8641 100644 --- a/api/V8ContextHandler.md +++ b/api/V8ContextHandler.md @@ -3,7 +3,9 @@ # V8ContextHandler (interface) -Implement this interface to handle javascript exceptions globally. +Implement this interface to handle render process callbacks. +Through inter-process messaging you are notified about these events +in the browser process. Table of contents: diff --git a/src/browser.pyx b/src/browser.pyx index d378ca22..8dfb7aed 100644 --- a/src/browser.pyx +++ b/src/browser.pyx @@ -267,6 +267,9 @@ cdef class PyBrowser: "OnScrollOffsetChanged", "StartDragging", "UpdateDragCursor", "OnTextSelectionChanged"] + # V8ContextHandler + self.allowedClientCallbacks += ["OnContextCreated", + "OnContextReleased"] # JavascriptDialogHandler self.allowedClientCallbacks += ["OnJavascriptDialog", "OnBeforeUnloadJavascriptDialog", diff --git a/tools/build.py b/tools/build.py index 5e578b94..522a9b08 100644 --- a/tools/build.py +++ b/tools/build.py @@ -18,12 +18,15 @@ from sources or use ready binaries from Spotify Automated Builds. Usage: - build.py VERSION [--rebuild-cpp] [--fast] [--clean] [--kivy] - [--hello-world] + build.py VERSION [--rebuild-cpp] [--unittests] [--fast] [--clean] [--kivy] + [--hello-world] [--enable-profiling] + [--enable-line-tracing] Options: VERSION Version number eg. 50.0 - --no-run-examples Do not run examples after build, only unit tests + --unittests Run only unit tests. Do not run examples while + building cefpython modules. Examples require + interaction such as closing window before proceeding. --fast Fast mode --clean Clean C++ projects build files on Linux/Mac --kivy Run only Kivy example @@ -79,7 +82,7 @@ # Command line args variables SYS_ARGV_ORIGINAL = None VERSION = "" -NO_RUN_EXAMPLES = False +UNITTESTS = False DEBUG_FLAG = False FAST_FLAG = False CLEAN_FLAG = False @@ -125,7 +128,7 @@ def main(): def command_line_args(): global DEBUG_FLAG, FAST_FLAG, CLEAN_FLAG, KIVY_FLAG, HELLO_WORLD_FLAG, \ - REBUILD_CPP, VERSION, NO_RUN_EXAMPLES + REBUILD_CPP, VERSION, UNITTESTS VERSION = get_version_from_command_line_args(file) # Other scripts called by this script expect that version number @@ -140,10 +143,10 @@ def command_line_args(): global SYS_ARGV_ORIGINAL SYS_ARGV_ORIGINAL = copy.copy(sys.argv) - if "--no-run-examples" in sys.argv: - NO_RUN_EXAMPLES = True - print("[build.py] Running examples disabled (--no-run-examples)") - sys.argv.remove("--no-run-examples") + if "--unittests" in sys.argv: + UNITTESTS = True + print("[build.py] Running examples disabled (--unittests)") + sys.argv.remove("--unittests") if "--debug" in sys.argv: DEBUG_FLAG = True @@ -913,7 +916,7 @@ def install_and_run(): sys.exit(1) # Run examples - if not NO_RUN_EXAMPLES: + if not UNITTESTS: print("[build.py] Run examples") os.chdir(EXAMPLES_DIR) flags = "" diff --git a/tools/build_distrib.py b/tools/build_distrib.py index 8ff5a6b8..e0a5bde1 100644 --- a/tools/build_distrib.py +++ b/tools/build_distrib.py @@ -7,13 +7,14 @@ python versions. Usage: - build_distrib.py VERSION [--no-run-examples] [--no-rebuild] + build_distrib.py VERSION [--unittests] [--no-rebuild] [--no-automate] + [--allow-partial] Options: VERSION Version number eg. 50.0 - --no-run-examples Do not run examples while building cefpython modules. - Examples require interaction, closing window before - proceeding. Only unit tests will be run in such case. + --unittests Run only unit tests. Do not run examples while building + cefpython modules. Examples require interaction such as + closing window before proceeding. --no-rebuild Do not rebuild cefpython modules. For internal use so that changes to packaging can be quickly tested. --no-automate Do not run automate.py --prebuilt-cef. This flag @@ -73,7 +74,7 @@ # Command line args VERSION = "" -NO_RUN_EXAMPLES = False +UNITTESTS = False NO_REBUILD = False NO_AUTOMATE = False ALLOW_PARTIAL = False @@ -152,15 +153,15 @@ def main(): def command_line_args(): - global VERSION, NO_RUN_EXAMPLES, NO_REBUILD, NO_AUTOMATE, ALLOW_PARTIAL + global VERSION, UNITTESTS, NO_REBUILD, NO_AUTOMATE, ALLOW_PARTIAL version = get_version_from_command_line_args(file) if not version or "--help" in sys.argv: print(doc) sys.exit(1) VERSION = version - if "--no-run-examples" in sys.argv: - NO_RUN_EXAMPLES = True - sys.argv.remove("--no-run-examples") + if "--unittests" in sys.argv: + UNITTESTS = True + sys.argv.remove("--unittests") if "--no-rebuild" in sys.argv: NO_REBUILD = True sys.argv.remove("--no-rebuild") @@ -488,8 +489,8 @@ def build_cefpython_modules(pythons, arch): print("[build_distrib.py] Build cefpython module for {python_name}" .format(python_name=python["name"])) flags = "" - if NO_RUN_EXAMPLES: - flags += " --no-run-examples" + if UNITTESTS: + flags += " --unittests" # On Linux/Mac Makefiles are used and must pass --clean flag command = ("\"{python}\" {build_py} {version} --clean {flags}" .format(python=python["executable"], diff --git a/unittests/_common.py b/unittests/_common.py index 684a27b1..fcd89917 100644 --- a/unittests/_common.py +++ b/unittests/_common.py @@ -82,7 +82,7 @@ def check_auto_asserts(test_case, objects): test_for_True = False # Test whether asserts are working correctly for key, value in obj.dict.items(): if key == "test_for_True": - test_for_True = True + test_for_True = value continue if "_True" in key: test_case.assertTrue(value, "Check assert: " + @@ -96,7 +96,8 @@ def check_auto_asserts(test_case, objects): subtest_message(obj.class.name + "." + key.replace("_False", "") + " ok") - test_case.assertTrue(test_for_True) + if "test_for_True" in obj.dict.keys(): + test_case.assertTrue(test_for_True) class DisplayHandler(object): diff --git a/unittests/main_test.py b/unittests/main_test.py index f3602c21..99397da8 100644 --- a/unittests/main_test.py +++ b/unittests/main_test.py @@ -197,9 +197,11 @@ def test_main(self): # Client handlers display_handler2 = DisplayHandler2(self) + v8context_handler = V8ContextHandler(self) client_handlers = [LoadHandler(self, g_datauri), DisplayHandler(self), - display_handler2] + display_handler2, + v8context_handler] for handler in client_handlers: browser.SetClientHandler(handler) subtest_message("browser.SetClientHandler() ok") @@ -336,6 +338,35 @@ def OnLoadingProgressChange(self, progress, **_): self.OnLoadingProgressChange_Progress = progress +class V8ContextHandler(object): + def init(self, test_case): + self.test_case = test_case + self.OnContextCreatedFirstCall_True = False + self.OnContextCreatedSecondCall_True = False + self.OnContextReleased_True = False + + def OnContextCreated(self, browser, frame): + """CEF creates one context when creating browser and this one is + released immediately. Then when it loads url another context is + created.""" + if not self.OnContextCreatedFirstCall_True: + self.OnContextCreatedFirstCall_True = True + else: + self.test_case.assertFalse(self.OnContextCreatedSecondCall_True) + self.OnContextCreatedSecondCall_True = True + self.test_case.assertEqual(browser.GetIdentifier(), MAIN_BROWSER_ID) + self.test_case.assertEqual(frame.GetIdentifier(), 2) + + def OnContextReleased(self, browser, frame): + """This gets called only for the initial empty context, see comment + in OnContextCreated. This should never get called for the main frame + of the main browser, because it happens during app exit and there + isn't enough time for the IPC messages to go through.""" + self.test_case.assertFalse(self.OnContextReleased_True) + self.OnContextReleased_True = True + self.test_case.assertEqual(browser.GetIdentifier(), MAIN_BROWSER_ID) + self.test_case.assertEqual(frame.GetIdentifier(), 2) + class External(object): """Javascript 'window.external' object.""" From 6cc7f9c8058475ab9aadc04ff614b9904ce063b9 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 20 Jan 2020 14:35:29 +0100 Subject: [PATCH 143/177] Fix issues with urls containing special characters (#384). BC BREAK! Updated Migration-Guide.md document and other documentation. --- api/Browser.md | 9 +++++++- api/Frame.md | 9 +++++++- api/cefpython.md | 9 +++++++- docs/Migration-guide.md | 14 +++++++++++-- src/cefpython.pyx | 6 ------ src/frame.pyx | 1 - src/utils.pyx | 46 ----------------------------------------- 7 files changed, 36 insertions(+), 58 deletions(-) diff --git a/api/Browser.md b/api/Browser.md index 66272c0a..b34b90e2 100644 --- a/api/Browser.md +++ b/api/Browser.md @@ -376,7 +376,7 @@ Returns the focused [Frame](Frame.md) for the browser window. | name | string | | Return | Frame | -Returns the [Frame](Frame.md) with the specified name, or NULL if not found. +Returns the [Frame](Frame.md) with the specified name, or NULL if not found. ### GetFrameByIdentifier @@ -697,6 +697,13 @@ Returns true if window rendering is disabled. Load url in the main frame. +If the url is a local path it needs to start with the `file://` prefix. +If the url contains special characters it may need proper handling. +Starting with v66.1+ it is required for the app code to encode the url +properly. You can use the `pathlib.PurePath.as_uri` in Python 3 +or `urllib.pathname2url` in Python 2 (`urllib.request.pathname2url` +in Python 3) depending on your case. + ### Navigate diff --git a/api/Frame.md b/api/Frame.md index 87dbc89c..05712912 100644 --- a/api/Frame.md +++ b/api/Frame.md @@ -228,9 +228,16 @@ Take also a look at a [custom resource handler](ResourceHandler.md). Load the contents of |value| with the specified dummy |url|. |url| should have a standard scheme (for example, http scheme) or behaviors like -link clicks and web security restrictions may not behave as expected. +link clicks and web security restrictions may not behave as expected. LoadString() can be called only after the Renderer process has been created. +If the url is a local path it needs to start with the `file://` prefix. +If the url contains special characters it may need proper handling. +Starting with v66.1+ it is required for the app code to encode the url +properly. You can use the `pathlib.PurePath.as_uri` in Python 3 +or `urllib.pathname2url` in Python 2 (`urllib.request.pathname2url` +in Python 3) depending on your case. + ### LoadUrl diff --git a/api/cefpython.md b/api/cefpython.md index 29720c48..ae7d255c 100644 --- a/api/cefpython.md +++ b/api/cefpython.md @@ -59,6 +59,13 @@ All parameters are optional. This function can only be called on the UI thread. +If the url is a local path it needs to start with the `file://` prefix. +If the url contains special characters it may need proper handling. +Starting with v66.1+ it is required for the app code to encode the url +properly. You can use the `pathlib.PurePath.as_uri` in Python 3 +or `urllib.pathname2url` in Python 2 (`urllib.request.pathname2url` +in Python 3) depending on your case. + The "window_title" parameter will be used only when parent window provided in window_info was set to 0. This is for use with hello_world.py and tutorial.py examples which don't use @@ -240,7 +247,7 @@ Description from upstream CEF: | Return | void | Run the CEF message loop. Use this function instead of an application- -provided message loop to get the best balance between performance and +provided message loop to get the best balance between performance and CPU usage. This function should only be called on the main application thread (UI thread) and only if cefpython.Initialize() is called with a [ApplicationSettings](ApplicationSettings.md).multi_threaded_message_loop diff --git a/docs/Migration-guide.md b/docs/Migration-guide.md index 2359562c..5ad3d438 100644 --- a/docs/Migration-guide.md +++ b/docs/Migration-guide.md @@ -50,6 +50,7 @@ Table of contents: * [v66+ cef.Request.Flags changed](#v66-cefrequestflags-changed) * [v66+ RequestHandler.GetCookieManager not getting called in some cases](#v66-requesthandlergetcookiemanager-not-getting-called-in-some-cases) * [v66+ Changes to Mac apps that integrate into existing message loop (Qt, wxPython)](#v66-changes-to-mac-apps-that-integrate-into-existing-message-loop-qt-wxpython) +* [v66.1+ Navigation urls passed to CreateBrowserSync or LoadUrl methods need to be encoded by app code](#v661-navigation-urls-passed-to-createbrowsersync-or-loadurl-methods-need-to-be-encoded-by-app-code) * [v67+ Do not call the 'WindowUtils.OnSize' function](#v67-do-not-call-the-windowutilsonsize-function) @@ -487,6 +488,16 @@ tested of how this change affects performance. See Issue [#442](../../../issues/442) for more details on the issues. +## v66.1+ Navigation urls passed to CreateBrowserSync or LoadUrl methods need to be encoded by app code + +[Issue #384](../../../issues/384) fixes problems with browser failing to load +urls containing certain characters by not encoding the url anymore. From now +on it is required for the app code to encode the url properly. You can use +the `pathlib.PurePath.as_uri` in Python 3 or `urllib.pathname2url` in +Python 2 (`urllib.request.pathname2url` in Python 3) depending on your case. + +The `cef.GetNavigateUrl` function was removed from the cefpython3 module. + ## v67+ Do not call the 'WindowUtils.OnSize' function @@ -494,5 +505,4 @@ This function can sometimes cause app hanging during window resize. Call instead the new `WindowUtils`.[UpdateBrowserSize](../api/WindowUtils.md#updatebrowsersize) function. Except when you use the `pywin32.py` example, in such case `WindowUtils.OnSize` must be called. -See [Issue #464](../../../issues/464) for more details. - +See [Issue #464](../../../issues/464) for more details. \ No newline at end of file diff --git a/src/cefpython.pyx b/src/cefpython.pyx index aff190a0..c3b1e1a1 100644 --- a/src/cefpython.pyx +++ b/src/cefpython.pyx @@ -144,8 +144,6 @@ IF PY_MAJOR_VERSION == 2: # noinspection PyUnresolvedReferences import urlparse # noinspection PyUnresolvedReferences - from urllib import pathname2url as urllib_pathname2url - # noinspection PyUnresolvedReferences from urllib import urlencode as urllib_urlencode from urllib import quote as urlparse_quote ELSE: @@ -153,8 +151,6 @@ ELSE: from urllib import parse as urlparse from urllib.parse import quote as urlparse_quote # noinspection PyUnresolvedReferences - from urllib.request import pathname2url as urllib_pathname2url - # noinspection PyUnresolvedReferences from urllib.parse import urlencode as urllib_urlencode # noinspection PyUnresolvedReferences @@ -739,8 +735,6 @@ def CreateBrowserSync(windowInfo=None, cdef CefWindowInfo cefWindowInfo SetCefWindowInfo(cefWindowInfo, windowInfo) - navigateUrl = GetNavigateUrl(navigateUrl) - Debug("navigateUrl: %s" % navigateUrl) cdef CefString cefNavigateUrl PyToCefString(navigateUrl, cefNavigateUrl) diff --git a/src/frame.pyx b/src/frame.pyx index ec3ef8bc..812e4b3c 100644 --- a/src/frame.pyx +++ b/src/frame.pyx @@ -211,7 +211,6 @@ cdef class PyFrame: self.GetCefFrame().get().LoadString(cefValue, cefUrl) cpdef py_void LoadUrl(self, py_string url): - url = GetNavigateUrl(url) cdef CefString cefUrl PyToCefString(url, cefUrl) self.GetCefFrame().get().LoadURL(cefUrl) diff --git a/src/utils.pyx b/src/utils.pyx index 0e499554..3d1acd89 100644 --- a/src/utils.pyx +++ b/src/utils.pyx @@ -72,52 +72,6 @@ cpdef str GetSystemError(): ELSE: return "" -cpdef str GetNavigateUrl(py_string url): - # Encode local file paths so that CEF can load them correctly: - # | some.html, some/some.html, D:\, /var, file:// - if re.search(r"^file:", url, re.I) or \ - re.search(r"^[a-zA-Z]:", url) or \ - not re.search(r"^[\w-]+:", url): - - # Function pathname2url will complain if url starts with "file://". - # CEF may also change local urls to "file:///C:/" - three slashes. - is_file_protocol = False - file_prefix = "" - file_prefixes = ["file:///", "file://"] - for file_prefix in file_prefixes: - if url.startswith(file_prefix): - is_file_protocol = True - # Remove the file:// prefix - url = url[len(file_prefix):] - break - - # Need to encode chinese characters in local file paths, - # otherwise CEF will try to encode them by itself. But it - # will fail in doing so. CEF will return the following string: - # >> %EF%BF%97%EF%BF%80%EF%BF%83%EF%BF%A6 - # But it should be: - # >> %E6%A1%8C%E9%9D%A2 - url = urllib_pathname2url(url) - - if is_file_protocol: - url = "%s%s" % (file_prefix, url) - - # If it is C:\ then colon was encoded. Decode it back. - url = re.sub(r"^([a-zA-Z])%3A", r"\1:", url) - - # Allow hash when loading urls. The pathname2url function - # replaced hashes with "%23" (Issue #114). - url = url.replace("%23", "#") - - # Allow more special characters when loading urls. The pathname2url - # function encoded them and need to decode them back here - # Characters: ? & = (Issue #273). - url = url.replace("%3F", "?") - url = url.replace("%26", "&") - url = url.replace("%3D", "=") - - return str(url) - cpdef py_bool IsFunctionOrMethod(object valueType): if (valueType == types.FunctionType or valueType == types.MethodType From d97ba3d19e36c754792f004c4d0a01b2baad9a09 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Tue, 21 Jan 2020 12:37:50 +0100 Subject: [PATCH 144/177] Update Sponsors in README. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9cef2431..b2c06aad 100644 --- a/README.md +++ b/README.md @@ -246,10 +246,10 @@ priority.

- - + +
- www.clearchat.com + www.highside.io

@@ -278,7 +278,7 @@ priority. the v49 release for legacy systems (WinXP/Vista) * [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66 release for all platforms -* [2017] Many thanks to [ClearChat Inc.](https://clearchat.com/) for sponsoring +* [2017] Many thanks to [HighSide Inc.](https://highside.io/) for sponsoring the v55/v56 releases for all platforms * [2016-2018] Thanks to JetBrains for providing an Open Source license for [PyCharm](https://www.jetbrains.com/pycharm/) From 99fb58a6badf905afde66903d5c87e39a5f32b38 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Tue, 21 Jan 2020 12:57:22 +0100 Subject: [PATCH 145/177] Restructure Sponsors section in README. --- README.md | 120 +++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/README.md b/README.md index b2c06aad..747381bf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ Table of contents: * [Introduction](#introduction) -* [Sponsors](#sponsors) +* [Latest releases sponsored by](#latest-releases-sponsored-by) + * [Thanks to all sponsors](#thanks-to-all-sponsors) * [Install](#install) * [Tutorial](#tutorial) * [Examples](#examples) @@ -13,7 +14,6 @@ Table of contents: * [v49 release (WinXP/Vista)](#v49-release-winxpvista) * [v31 release (old systems)](#v31-release-old-systems) * [Support development](#support-development) - * [Thanks to sponsors](#thanks-to-sponsors) * [Thanks to all](#thanks-to-all) * [Seeking new sponsors](#seeking-new-sponsors) * [Other READMEs](#other-readmes) @@ -49,7 +49,7 @@ frameworks such as PyQt, wxPython, PyGTK, PyGObject, Tkinter, Kivy, Panda3D, PyGame, PyOpenGL, PyWin32, PySide and PySDL2. -## Sponsors +## Latest releases sponsored by
@@ -82,6 +82,63 @@ businesses with cutting edge marketing technology. Please visit their website:
+### Thanks to all sponsors + + + + + + + + + + + + +
+
+ + +
+ www.fivestars.com +
+ +
+ + +
+ www.lampix.com +
+ +
+ + +
+ www.blueplanet.com +
+
+
+ + +
+ www.highside.io +
+
+
+ + +
+ www.rentouch.ch +
+ +
+ + +
+ www.jetbrains.com +
+
+ ## Install @@ -214,63 +271,6 @@ priority.

-### Thanks to sponsors - - - - - - - - - - - - -
-
- - -
- www.fivestars.com -
- -
- - -
- www.lampix.com -
- -
- - -
- www.blueplanet.com -
-
-
- - -
- www.highside.io -
-
-
- - -
- www.rentouch.ch -
- -
- - -
- www.jetbrains.com -
-
- ### Thanks to all From a314559af3270f2a0e48d085e23dc8cc76af7966 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 22 Jan 2020 11:54:44 +0100 Subject: [PATCH 146/177] Fix focus issues in qt.py example (#404). --- examples/qt.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/qt.py b/examples/qt.py index a272b80d..9b3e96b9 100644 --- a/examples/qt.py +++ b/examples/qt.py @@ -337,7 +337,11 @@ def init(self, cef_widget): self.cef_widget = cef_widget def OnSetFocus(self, _): - pass + print("[qt.py] FocusHandler.OnSetFocus") + if LINUX: + return False + else: + return True def OnGotFocus(self, browser, _): # Temporary fix no. 1 for focus issues on Linux (Issue #284) From 181588ce611ef4675b4948b71f9ed933a9519a98 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 22 Jan 2020 12:21:14 +0100 Subject: [PATCH 147/177] Fix QLineEdit focus issues in qt.py example on Windows (#404). Revert previous commit. --- examples/qt.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/qt.py b/examples/qt.py index 9b3e96b9..efb1b381 100644 --- a/examples/qt.py +++ b/examples/qt.py @@ -212,6 +212,8 @@ def init(self, parent=None): def focusInEvent(self, event): # This event seems to never get called on Linux, as CEF is # stealing all focus due to Issue #284. + if cef.GetAppSetting("debug"): + print("[qt.py] CefWidget.focusInEvent") if self.browser: if WINDOWS: WindowUtils.OnSetFocus(self.getHandle(), 0, 0, 0) @@ -220,6 +222,8 @@ def focusInEvent(self, event): def focusOutEvent(self, event): # This event seems to never get called on Linux, as CEF is # stealing all focus due to Issue #284. + if cef.GetAppSetting("debug"): + print("[qt.py] CefWidget.focusOutEvent") if self.browser: self.browser.SetFocus(False) @@ -336,18 +340,20 @@ class FocusHandler(object): def init(self, cef_widget): self.cef_widget = cef_widget + def OnTakeFocus(self, _): + if cef.GetAppSetting("debug"): + print("[qt.py] FocusHandler.OnTakeFocus") + def OnSetFocus(self, _): - print("[qt.py] FocusHandler.OnSetFocus") - if LINUX: - return False - else: - return True + if cef.GetAppSetting("debug"): + print("[qt.py] FocusHandler.OnSetFocus") def OnGotFocus(self, browser, **_): + if cef.GetAppSetting("debug"): + print("[qt.py] FocusHandler.OnGotFocus") + self.cef_widget.setFocus() # Temporary fix no. 1 for focus issues on Linux (Issue #284) if LINUX: - print("[qt.py] FocusHandler.OnGotFocus:" - " keyboard focus fix no. 1 (Issue #284)") browser.SetFocus(True) From 30439b659bf1974420c3ec7954f76f2fc93902e2 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Thu, 23 Jan 2020 16:32:52 +0100 Subject: [PATCH 148/177] Update utils.pyx. --- src/utils.pyx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils.pyx b/src/utils.pyx index 3d1acd89..7d855361 100644 --- a/src/utils.pyx +++ b/src/utils.pyx @@ -76,6 +76,7 @@ cpdef py_bool IsFunctionOrMethod(object valueType): if (valueType == types.FunctionType or valueType == types.MethodType or valueType == types.BuiltinFunctionType - or valueType == types.BuiltinMethodType): + or valueType == types.BuiltinMethodType + or valueType.name == "cython_function_or_method"): return True return False From 042579dc0d7e0010dca4d23f0ccbbbaf2e72700e Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sat, 25 Jan 2020 14:32:29 +0100 Subject: [PATCH 149/177] Allow for automatic conversion of string like objects to CEF strings. For example a QString passed to LoadUrl() method was causing error and now it's handled fine. --- src/string_utils.pyx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/string_utils.pyx b/src/string_utils.pyx index c5980b94..7b1c9a06 100644 --- a/src/string_utils.pyx +++ b/src/string_utils.pyx @@ -103,11 +103,17 @@ cdef void PyToCefString( CefString& cefString ) except : if PY_MAJOR_VERSION < 3: + # Handle objects that may be converted to string e.g. QString + if not isinstance(pyString, str) and not isinstance(pyString, unicode): + pyString = str(pyString) if type(pyString) == unicode: pyString = (pyString.encode( g_applicationSettings["string_encoding"], errors=UNICODE_ENCODE_ERRORS)) else: + # Handle objects that may be converted to string e.g. QString + if not isinstance(pyString, str) and not isinstance(pyString, bytes): + pyString = str(pyString) # The unicode type is not defined in Python 3. if type(pyString) == str: pyString = (pyString.encode( From 28afa80a2f23fa2e6160926d0352b861466bf5a8 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sat, 25 Jan 2020 14:33:42 +0100 Subject: [PATCH 150/177] Pass proper parent window handle for DevTools window (#381). This still doesn't fix keyboard issues in wxpython.py example. --- src/browser.pyx | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/browser.pyx b/src/browser.pyx index 8dfb7aed..c8cba03a 100644 --- a/src/browser.pyx +++ b/src/browser.pyx @@ -576,15 +576,8 @@ cdef class PyBrowser: cpdef py_void ShowDevTools(self): cdef CefWindowInfo window_info IF UNAME_SYSNAME == "Windows": - # On Windows with empty window_info structure the devtools - # window doesn't appear. - window_info.SetAsPopup( - # TODO: - # According to docs this returns NULL for non-popup - # windows, so looks like we shouldn't use that and - # either pass NULL or GetWindowHandle(). - self.GetOpenerWindowHandle(), - PyToCefStringValue("DevTools")) + window_info.SetAsPopup(self.GetWindowHandle(), + PyToCefStringValue("DevTools")) cdef CefBrowserSettings settings cdef CefPoint inspect_element_at self.GetCefBrowserHost().get().ShowDevTools( From 0da13937e50f389cba25533959c2b760403fb80f Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Mon, 20 Jul 2020 19:19:03 +0200 Subject: [PATCH 151/177] Fix Mac issues in Tkinter example (#309, #441) Still some issues on startup, see: https://github.com/cztomczak/cefpython/issues/583 --- examples/tkinter_.py | 73 +++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/examples/tkinter_.py b/examples/tkinter_.py index c823f3dc..327f171f 100644 --- a/examples/tkinter_.py +++ b/examples/tkinter_.py @@ -44,7 +44,7 @@ def main(): - logger.setLevel(_logging.INFO) + logger.setLevel(_logging.DEBUG) stream_handler = _logging.StreamHandler() formatter = _logging.Formatter("[%(filename)s] %(message)s") stream_handler.setFormatter(formatter) @@ -55,19 +55,23 @@ def main(): logger.info("Tk {ver}".format(ver=tk.Tcl().eval('info patchlevel'))) assert cef.version >= "55.3", "CEF Python v55.3+ required to run this" sys.excepthook = cef.ExceptHook # To shutdown all CEF processes on error + # Tk must be initialized before CEF otherwise fatal error (Issue #306) root = tk.Tk() app = MainFrame(root) - # Tk must be initialized before CEF otherwise fatal error (Issue #306) - cef.Initialize() + settings = {} + if MAC: + settings["external_message_pump"] = True + cef.Initialize(settings=settings) app.mainloop() + logger.debug("Main loop exited") cef.Shutdown() - class MainFrame(tk.Frame): def init(self, root): self.browser_frame = None self.navigation_bar = None + self.root = root # Root root.geometry("900x640") @@ -124,7 +128,9 @@ def on_focus_out(self, _): def on_close(self): if self.browser_frame: self.browser_frame.on_root_close() - self.master.destroy() + self.browser_frame = None + else: + self.master.destroy() def get_browser(self): if self.browser_frame: @@ -147,11 +153,12 @@ def setup_icon(self): class BrowserFrame(tk.Frame): - def init(self, master, navigation_bar=None): + def init(self, mainframe, navigation_bar=None): self.navigation_bar = navigation_bar self.closing = False self.browser = None - tk.Frame.init(self, master) + tk.Frame.init(self, mainframe) + self.mainframe = mainframe self.bind("", self.on_focus_in) self.bind("", self.on_focus_out) self.bind("", self.on_configure) @@ -165,27 +172,42 @@ def embed_browser(self): self.browser = cef.CreateBrowserSync(window_info, url="https://www.google.com/") assert self.browser + self.browser.SetClientHandler(LifespanHandler(self)) self.browser.SetClientHandler(LoadHandler(self)) self.browser.SetClientHandler(FocusHandler(self)) self.message_loop_work() def get_window_handle(self): - if self.winfo_id() > 0: - return self.winfo_id() - elif MAC: - # On Mac window id is an invalid negative value (Issue #308). - # This is kind of a dirty hack to get window handle using - # PyObjC package. If you change structure of windows then you + if MAC: + # Do not use self.winfo_id() on Mac, because of these issues: + # 1. Window id sometimes has an invalid negative value (Issue #308). + # 2. Even with valid window id it crashes during the call to NSView.setAutoresizingMask: + # https://github.com/cztomczak/cefpython/issues/309#issuecomment-661094466 + # + # To fix it using PyObjC package to obtain window handle. If you change structure of windows then you # need to do modifications here as well. + # + # There is still one issue with this solution. Sometimes there is more than one window, for example when application + # didn't close cleanly last time Python displays an NSAlert window asking whether to Reopen that window. In such + # case app will crash and you will see in console: + # > Fatal Python error: PyEval_RestoreThread: NULL tstate + # > zsh: abort python tkinter_.py + # Error messages related to this: https://github.com/cztomczak/cefpython/issues/441 + # + # There is yet another issue that might be related as well: + # https://github.com/cztomczak/cefpython/issues/583 + # noinspection PyUnresolvedReferences from AppKit import NSApp # noinspection PyUnresolvedReferences import objc - # Sometimes there is more than one window, when application - # didn't close cleanly last time Python displays an NSAlert - # window asking whether to Reopen that window. + logger.info("winfo_id={}".format(self.winfo_id())) # noinspection PyUnresolvedReferences - return objc.pyobjc_id(NSApp.windows()[-1].contentView()) + content_view = objc.pyobjc_id(NSApp.windows()[-1].contentView()) + logger.info("content_view={}".format(content_view)) + return content_view + elif self.winfo_id() > 0: + return self.winfo_id() else: raise Exception("Couldn't obtain window handle") @@ -224,10 +246,15 @@ def on_focus_out(self, _): self.browser.SetFocus(False) def on_root_close(self): + logger.info("BrowserFrame.on_root_close") if self.browser: + logger.debug("CloseBrowser") self.browser.CloseBrowser(True) self.clear_browser_references() - self.destroy() + else: + logger.debug("tk.Frame.destroy") + self.destroy() + def clear_browser_references(self): # Clear browser references that you keep anywhere in your @@ -235,6 +262,16 @@ def clear_browser_references(self): self.browser = None +class LifespanHandler(object): + + def init(self, tkFrame): + self.tkFrame = tkFrame + + def OnBeforeClose(self, browser, _): + logger.debug("LifespanHandler.OnBeforeClose") + self.tkFrame.quit() + + class LoadHandler(object): def init(self, browser_frame): From 3cc7606101f2b1b8191b4db3648c264349ca4628 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Wed, 19 Aug 2020 11:14:04 +0200 Subject: [PATCH 152/177] Add keyboard handler snippet. --- examples/snippets/keyboard_handler.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 examples/snippets/keyboard_handler.py diff --git a/examples/snippets/keyboard_handler.py b/examples/snippets/keyboard_handler.py new file mode 100644 index 00000000..9b8e40c8 --- /dev/null +++ b/examples/snippets/keyboard_handler.py @@ -0,0 +1,19 @@ +from cefpython3 import cefpython as cef + + +def main(): + cef.Initialize() + browser = cef.CreateBrowserSync(url="https://www.google.com/", + window_title="Keyboard Handler") + browser.SetClientHandler(KeyboardHandler()) + cef.MessageLoop() + del browser + cef.Shutdown() + + +class KeyboardHandler(object): + def OnKeyEvent(self, browser, event, event_handle, _): + print("OnKeyEvent: "+str(event)) + +if name == 'main': + main() From 2fcf395f4e67e83e5c1dc06b3bfd6818d4e42602 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Fri, 9 Oct 2020 13:53:46 +0200 Subject: [PATCH 153/177] Update README.md Fix links. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 747381bf..546cd001 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Table of contents: ## Introduction CEF Python is an open source project founded by -[Czarek Tomczak](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view) +[Czarek Tomczak](https://www.linkedin.com/in/czarektomczak/) in 2012 to provide Python bindings for the [Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef) (CEF). The Chromium project focuses mainly on Google Chrome application @@ -317,7 +317,7 @@ notable are: If your company would like to sponsor CEF Python development efforts then please contact -[Czarek](https://drive.google.com/file/d/17xmoT5Z_zTHkVclqPzrs2aAV64Uiu7fh/view). +[Czarek](https://www.linkedin.com/in/czarektomczak/). Long term sponsorships are welcome and Czarek is open to ideas about the project. He would love to spend more time on developing this project, but he can't afford doing so in his free time. Currently there is no company From 019033d2919a4fab84cb832ec5b76aad12e39c40 Mon Sep 17 00:00:00 2001 From: Xianguang Zhou Date: Sun, 14 Feb 2021 22:44:22 +0800 Subject: [PATCH 154/177] Fix the bug of loading shared libraries. (#561) Prepend the package directory path to the "LD_LIBRARY_PATH" environment variable. * Fix the bug of getting "LD_LIBRARY_PATH" environment variable. * Fix loading shared libraries on Linux. Co-authored-by: Czarek Tomczak --- tools/installer/cefpython3.init.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/installer/cefpython3.init.py b/tools/installer/cefpython3.init.py index fc00000d..ef784f2c 100644 --- a/tools/installer/cefpython3.init.py +++ b/tools/installer/cefpython3.init.py @@ -26,9 +26,13 @@ package_dir = os.path.dirname(os.path.abspath(file)) -# This loads the libcef.so library for the subprocess executable. -# On Mac it works without setting library paths. -os.environ["LD_LIBRARY_PATH"] = package_dir +# This loads the libcef.so library for the subprocess executable on Linux. +# TODO: Use -Wl,-rpath=\$$ORIGIN in Makefile. +ld_library_path = os.environ.get("LD_LIBRARY_PATH") +if ld_library_path and ld_library_path.strip(): + os.environ["LD_LIBRARY_PATH"] = package_dir + os.pathsep + ld_library_path +else: + os.environ["LD_LIBRARY_PATH"] = package_dir # This env variable will be returned by cefpython.GetModuleDirectory(). os.environ["CEFPYTHON3_PATH"] = package_dir From 96f3b5ec1ef951a1959d378a5d4d87bf247b2c36 Mon Sep 17 00:00:00 2001 From: Martin Cejp Date: Sun, 14 Feb 2021 16:20:20 +0100 Subject: [PATCH 155/177] Fix pango library wrong include path (hb.h: No such file or directory) (#589) * Fix Fedora 32 build error (hb.h: No such file or directory) * Update client_handler/Makefile * Update client_handler/Makefile * Update cpp_utils/Makefile * Update subprocess/Makefile * Update subprocess/Makefile-libcefpythonapp * Update tools/cython_setup.py Co-authored-by: Czarek Tomczak --- src/client_handler/Makefile | 1 + src/cpp_utils/Makefile | 2 +- src/subprocess/Makefile | 1 + src/subprocess/Makefile-libcefpythonapp | 1 + tools/cython_setup.py | 2 ++ 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/client_handler/Makefile b/src/client_handler/Makefile index d217660e..25e645ff 100644 --- a/src/client_handler/Makefile +++ b/src/client_handler/Makefile @@ -37,6 +37,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/include/glib-2.0 \ -I/usr/include/cairo \ -I/usr/include/pango-1.0 \ + -I/usr/include/harfbuzz \ -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ diff --git a/src/cpp_utils/Makefile b/src/cpp_utils/Makefile index 338fd960..e6a6a2fe 100644 --- a/src/cpp_utils/Makefile +++ b/src/cpp_utils/Makefile @@ -7,7 +7,7 @@ OUT = libcpp_utils.a INC = -I./../ -I/usr/include/gtk-2.0 \ -I/usr/include/glib-2.0 -I/usr/lib/i386-linux-gnu/gtk-2.0/include \ -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/include/cairo \ - -I/usr/include/pango-1.0 -I/usr/include/gdk-pixbuf-2.0 \ + -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ -I/usr/lib64/glib-2.0/include -I/usr/lib64/gtk-2.0/include \ diff --git a/src/subprocess/Makefile b/src/subprocess/Makefile index f52b72df..adc34fca 100644 --- a/src/subprocess/Makefile +++ b/src/subprocess/Makefile @@ -11,6 +11,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/include/glib-2.0 \ -I/usr/include/cairo \ -I/usr/include/pango-1.0 \ + -I/usr/include/harfbuzz \ -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ diff --git a/src/subprocess/Makefile-libcefpythonapp b/src/subprocess/Makefile-libcefpythonapp index 23fbde39..e8a6b852 100644 --- a/src/subprocess/Makefile-libcefpythonapp +++ b/src/subprocess/Makefile-libcefpythonapp @@ -36,6 +36,7 @@ INC = -I./../ -I./../common/ -I$(PYTHON_INCLUDE) \ -I/usr/include/glib-2.0 \ -I/usr/include/cairo \ -I/usr/include/pango-1.0 \ + -I/usr/include/harfbuzz \ -I/usr/include/gdk-pixbuf-2.0 \ -I/usr/include/atk-1.0 \ -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include \ diff --git a/tools/cython_setup.py b/tools/cython_setup.py index 4f0cafc6..52482cba 100644 --- a/tools/cython_setup.py +++ b/tools/cython_setup.py @@ -318,6 +318,7 @@ def get_include_dirs(): '/usr/include/gtk-unix-print-2.0', '/usr/include/cairo', '/usr/include/pango-1.0', + '/usr/include/harfbuzz', '/usr/include/gdk-pixbuf-2.0', '/usr/include/atk-1.0', # Fedora @@ -337,6 +338,7 @@ def get_include_dirs(): '/usr/include/gtk-unix-print-2.0', '/usr/include/cairo', '/usr/include/pango-1.0', + '/usr/include/harfbuzz', '/usr/include/gdk-pixbuf-2.0', '/usr/include/atk-1.0', # Ubuntu From 054ff3ca52106099d078f37b3f8986e5252c7733 Mon Sep 17 00:00:00 2001 From: Bryan Koroleski <44987192+bryan-koroleski-fivestars@users.noreply.github.com> Date: Sun, 14 Feb 2021 10:09:52 -0600 Subject: [PATCH 156/177] Update int range detection for Python 3 (#603) * Update int range detection for Python 3 Python 3 unified ints and longs into a single int type. The long type is still available in Cython as an alias to int. * Update javascript_bindings.pyx * Update process_message_utils.pyx Co-authored-by: Czarek Tomczak --- Authors | 1 + src/javascript_bindings.pyx | 2 ++ src/process_message_utils.pyx | 33 +++++++++------------------------ tools/cython_setup.py | 3 +++ 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/Authors b/Authors index b4c55d20..b44b24e6 100644 --- a/Authors +++ b/Authors @@ -19,3 +19,4 @@ Contributors: Dónal McMullan nobodyguy Elliot Woods + Bryan Koroleski diff --git a/src/javascript_bindings.pyx b/src/javascript_bindings.pyx index 9043639e..31620a6d 100644 --- a/src/javascript_bindings.pyx +++ b/src/javascript_bindings.pyx @@ -140,6 +140,8 @@ cdef class JavascriptBindings: return True elif valueType == int: return True + elif valueType == long: + return True elif valueType == type(None): return True elif IsFunctionOrMethod(valueType): diff --git a/src/process_message_utils.pyx b/src/process_message_utils.pyx index 8ced3f6c..e2d55dab 100644 --- a/src/process_message_utils.pyx +++ b/src/process_message_utils.pyx @@ -238,14 +238,9 @@ cdef CefRefPtr[CefListValue] PyListToCefListValue( ret.get().SetNull(index) elif valueType == bool: ret.get().SetBool(index, bool(value)) - elif valueType == int: - ret.get().SetInt(index, int(value)) - elif valueType == long: - # Int32 range is -2147483648..2147483647, we've increased the - # minimum size by one as Cython was throwing a warning: - # "unary minus operator applied to unsigned type, result still - # unsigned". - if -2147483647 <= value <= 2147483647: + elif valueType == int or valueType == long: # In Py3 int and long types are the same type. + # Int32 range is -2147483648..2147483647 + if INT_MIN <= value <= INT_MAX: ret.get().SetInt(index, int(value)) else: # Long values become strings. @@ -297,14 +292,9 @@ cdef void PyListToExistingCefListValue( cefListValue.get().SetNull(index) elif valueType == bool: cefListValue.get().SetBool(index, bool(value)) - elif valueType == int: - cefListValue.get().SetInt(index, int(value)) - elif valueType == long: - # Int32 range is -2147483648..2147483647, we've increased the - # minimum size by one as Cython was throwing a warning: - # "unary minus operator applied to unsigned type, result still - # unsigned". - if -2147483647 <= value <= 2147483647: + elif valueType == int or valueType == long: # In Py3 int and long types are the same type. + # Int32 range is -2147483648..2147483647 + if INT_MIN <= value <= INT_MAX: cefListValue.get().SetInt(index, int(value)) else: # Long values become strings. @@ -357,14 +347,9 @@ cdef CefRefPtr[CefDictionaryValue] PyDictToCefDictionaryValue( ret.get().SetNull(cefKey) elif valueType == bool: ret.get().SetBool(cefKey, bool(value)) - elif valueType == int: - ret.get().SetInt(cefKey, int(value)) - elif valueType == long: - # Int32 range is -2147483648..2147483647, we've increased the - # minimum size by one as Cython was throwing a warning: - # "unary minus operator applied to unsigned type, result still - # unsigned". - if -2147483647 <= value <= 2147483647: + elif valueType == int or valueType == long: # In Py3 int and long types are the same type. + # Int32 range is -2147483648..2147483647 + if INT_MIN <= value <= INT_MAX: ret.get().SetInt(cefKey, int(value)) else: # Long values become strings. diff --git a/tools/cython_setup.py b/tools/cython_setup.py index 52482cba..5b3049db 100644 --- a/tools/cython_setup.py +++ b/tools/cython_setup.py @@ -470,6 +470,9 @@ def compile_time_constants(): # A way around Python 3.2 bug: UNAME_SYSNAME is not set contents += 'DEF UNAME_SYSNAME = "%s"\n' % platform.uname()[0] contents += 'DEF PY_MAJOR_VERSION = %s\n' % sys.version_info.major + contents += 'cdef extern from "limits.h":\n' + contents += ' cdef int INT_MIN\n' + contents += ' cdef int INT_MAX\n' fo.write(contents.encode("utf-8")) From 686d528b3eebbe5b84a770f5d266aea8dd185721 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sun, 14 Feb 2021 17:21:13 +0100 Subject: [PATCH 157/177] Fix pyinstaller hook for pyinstaller >= 4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to Brénainn Woodsend (https://github.com/bwoodsend) for the fix. See also https://github.com/cztomczak/cefpython/pull/600 . --- examples/pyinstaller/hook-cefpython3.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/examples/pyinstaller/hook-cefpython3.py b/examples/pyinstaller/hook-cefpython3.py index 7522b7be..9160f67f 100644 --- a/examples/pyinstaller/hook-cefpython3.py +++ b/examples/pyinstaller/hook-cefpython3.py @@ -14,8 +14,13 @@ import sys import PyInstaller from PyInstaller.utils.hooks import is_module_satisfies, get_package_paths -from PyInstaller.compat import is_win, is_darwin, is_linux, is_py2 +from PyInstaller.compat import is_win, is_darwin, is_linux from PyInstaller import log as logging +try: + # PyInstaller >= 4.0 doesn't support Python 2.7 + from PyInstaller.compat import is_py2 +except ImportError: + is_py2 = None # Constants CEFPYTHON_MIN_VERSION = "57.0" From 8e36e82a21a95574fbc2cc329be4f2d5e82f6d00 Mon Sep 17 00:00:00 2001 From: Holger Badorreck <6099617+hoba87@users.noreply.github.com> Date: Sun, 14 Feb 2021 17:30:11 +0100 Subject: [PATCH 158/177] update kivy example (#573) * update old print syntax * remove pygtk, gtk dependencies * restore kivy pygtk dependency for linux, add platform dependent conditional statements * kivy example macos keyboard working * external pump message only for macos * Update kivy_.py Co-authored-by: Czarek Tomczak --- src/linux/binaries_64bit/kivy_.py | 46 ++++++++++++++++++++----------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/src/linux/binaries_64bit/kivy_.py b/src/linux/binaries_64bit/kivy_.py index bdfb6d2c..49543bf9 100644 --- a/src/linux/binaries_64bit/kivy_.py +++ b/src/linux/binaries_64bit/kivy_.py @@ -8,11 +8,20 @@ from cefpython3 import cefpython as cef -import pygtk -import gtk import sys import os import time +if sys.platform == 'linux': + import pygtk + import gtk + pygtk.require('2.0') +elif sys.platform == 'darwin': + import gi + gi.require_version("Gtk", "3.0") + from gi.repository import Gtk +elif sys.platform == 'win32': + # no gtk needed on Windows + pass from kivy.app import App from kivy.uix.button import Button @@ -28,9 +37,6 @@ # Global variables g_switches = None -# PyGTK required -pygtk.require('2.0') - class BrowserLayout(BoxLayout): @@ -150,9 +156,6 @@ def start_cef(self): # Configure CEF settings = { - # This directories must be set on Linux - "locales_dir_path": cef.GetModuleDirectory()+"/locales", - "resources_dir_path": cef.GetModuleDirectory(), "browser_subprocess_path": "%s/%s" % ( cef.GetModuleDirectory(), "subprocess"), "windowless_rendering_enabled": True, @@ -161,7 +164,15 @@ def start_cef(self): "enabled": False, }, "external_message_pump": False, # See Issue #246 + "multi_threaded_message_loop": False, } + if sys.platform == 'linux': + # This directories must be set on Linux + settings["locales_dir_path"] = cef.GetModuleDirectory() + "/locales" + settings["resources_dir_path"] = cef.GetModuleDirectory() + if sys.platform == 'darwin': + settings["external_message_pump"] = True # Temporary fix for Issue #246 + switches = { # Tweaking OSR performance by setting the same Chromium flags # as in upstream cefclient (# Issue #240). @@ -190,18 +201,21 @@ def start_cef(self): # Start idle - CEF message loop work. Clock.schedule_once(self._message_loop_work, 0) + windowInfo = cef.WindowInfo() + # TODO: For printing to work in off-screen-rendering mode # it is enough to call gtk_init(). It is not required # to provide window handle when calling SetAsOffscreen(). # However it still needs to be tested whether providing # window handle is required for mouse context menu and # popup widgets to work. - gtkwin = gtk.Window() - gtkwin.realize() - # WindowInfo offscreen flag - windowInfo = cef.WindowInfo() - windowInfo.SetAsOffscreen(gtkwin.window.xid) + if sys.platform == 'linux': + gtkwin = gtk.Window() + gtkwin.realize() + windowInfo.SetAsOffscreen(gtkwin.window.xid) + elif sys.platform == 'darwin' or sys.platform == 'win32': + windowInfo.SetAsOffscreen(0) # Create Broswer and naviagte to empty page <= OnPaint won't get # called yet @@ -519,12 +533,12 @@ def get_windows_key_code(self, kivycode): def go_forward(self, _): """Going to forward in browser history.""" - print "go forward" + print("go forward") self.browser.GoForward() def go_back(self, _): """Going back in browser history.""" - print "go back" + print("go back") self.browser.GoBack() def reload(self, _): @@ -864,7 +878,7 @@ def OnLoadingStateChange(self, is_loading, _): def OnPaint(self, element_type, paint_buffer, _): # print "OnPaint()" if element_type != cef.PET_VIEW: - print "Popups aren't implemented yet" + print("Popups aren't implemented yet") return # FPS meter ("fps" arg) From 55e63607afdce5d122f3d78884200a5e3f84938d Mon Sep 17 00:00:00 2001 From: gary Date: Sun, 14 Feb 2021 12:03:24 -0800 Subject: [PATCH 159/177] Add support for Python 3.8 and Upgrade Cython (#594) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: https://github.com/cztomczak/cefpython/issues/546 Had to include harfbuzz manually as newer Pango change this. See: https://github.com/eiskaltdcpp/eiskaltdcpp/issues/413 https://gitlab.gnome.org/GNOME/pango/-/issues/387 Also had to add `-Wno-deprecated-declarations` to get this to compile because of the following errors that didn't seem to be coming from this code directly: warning: ‘GTimeVal’ is deprecated: Use 'GDateTime' instead warning: ‘GTypeDebugFlags’ is deprecated --- README.md | 6 +++--- src/common/cefpython_public_api.h | 2 ++ tools/build.py | 2 +- tools/build_distrib.py | 2 +- tools/common.py | 2 ++ tools/installer/cefpython3.init.py | 3 +++ tools/installer/cefpython3.setup.py | 1 + tools/requirements.txt | 2 +- 8 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 546cd001..d4f4c493 100644 --- a/README.md +++ b/README.md @@ -210,9 +210,9 @@ support old operating systems then choose the v31 release. OS | Py2 | Py3 | 32bit | 64bit | Requirements --- | --- | --- | --- | --- | --- -Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Windows 7+ -Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,
Fedora 24+, openSUSE 13.3+ -Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ +Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | Yes | Yes | Windows 7+ +Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 3.8 | Yes | Yes | Debian 8+, Ubuntu 14.04+,
Fedora 24+, openSUSE 13.3+ +Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | No | Yes | MacOS 10.9+ These platforms are not supported yet: - ARM - see [Issue #267](../../issues/267) diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h index 53ad62c6..8e4ff60b 100644 --- a/src/common/cefpython_public_api.h +++ b/src/common/cefpython_public_api.h @@ -46,6 +46,8 @@ #include "../../build/build_cefpython/cefpython_py36_fixed.h" #elif PY_MINOR_VERSION == 7 #include "../../build/build_cefpython/cefpython_py37_fixed.h" +#elif PY_MINOR_VERSION == 8 +#include "../../build/build_cefpython/cefpython_py38_fixed.h" #endif // PY_MINOR_VERSION #endif // PY_MAJOR_VERSION diff --git a/tools/build.py b/tools/build.py index 522a9b08..b3bc9920 100644 --- a/tools/build.py +++ b/tools/build.py @@ -293,7 +293,7 @@ def setup_environ(): print("[build.py] PYTHON_INCLUDE: {python_include}" .format(python_include=os.environ["PYTHON_INCLUDE"])) - os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror" + os.environ["CEF_CCFLAGS"] = "-std=gnu++11 -DNDEBUG -Wall -Werror -Wno-deprecated-declarations" if FAST_FLAG: os.environ["CEF_CCFLAGS"] += " -O0" else: diff --git a/tools/build_distrib.py b/tools/build_distrib.py index e0a5bde1..f452bc0d 100644 --- a/tools/build_distrib.py +++ b/tools/build_distrib.py @@ -80,7 +80,7 @@ ALLOW_PARTIAL = False # Python versions -SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7)] +SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)] # Python search paths. It will use first Python found for specific version. # Supports replacement of one environment variable in path eg.: %ENV_KEY%. diff --git a/tools/common.py b/tools/common.py index 113bcd9e..226fd391 100644 --- a/tools/common.py +++ b/tools/common.py @@ -473,6 +473,8 @@ def get_msvs_for_python(vs_prefix=False): return "VS2015" if vs_prefix else "2015" elif sys.version_info[:2] == (3, 7): return "VS2015" if vs_prefix else "2015" + elif sys.version_info[:2] == (3, 8): + return "VS2015" if vs_prefix else "2015" else: print("ERROR: This version of Python is not supported") sys.exit(1) diff --git a/tools/installer/cefpython3.init.py b/tools/installer/cefpython3.init.py index ef784f2c..5f779a54 100644 --- a/tools/installer/cefpython3.init.py +++ b/tools/installer/cefpython3.init.py @@ -64,5 +64,8 @@ elif sys.version_info[:2] == (3, 7): # noinspection PyUnresolvedReferences from . import cefpython_py37 as cefpython +elif sys.version_info[:2] == (3, 8): + # noinspection PyUnresolvedReferences + from . import cefpython_py38 as cefpython else: raise Exception("Python version not supported: " + sys.version) diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py index 6814cbb7..2a926913 100644 --- a/tools/installer/cefpython3.setup.py +++ b/tools/installer/cefpython3.setup.py @@ -148,6 +148,7 @@ def main(): "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", "Topic :: Desktop Environment", "Topic :: Internet", "Topic :: Internet :: WWW/HTTP", diff --git a/tools/requirements.txt b/tools/requirements.txt index 81ebc0c5..4b083579 100644 --- a/tools/requirements.txt +++ b/tools/requirements.txt @@ -1,4 +1,4 @@ -Cython == 0.28.4 +Cython == 0.29.21 docopt >= 0.6.2 setuptools wheel From d6deaf8e2b87266d7b5fc4052fc05b5622056b17 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Sun, 14 Feb 2021 23:44:38 +0100 Subject: [PATCH 160/177] Support Python 3.8 and Python 3.9 (Issues #546 and #593). --- README.md | 6 +++--- docs/Build-instructions.md | 8 +++++--- examples/screenshot.py | 2 +- src/common/cefpython_public_api.h | 2 ++ src/compile_time_constants.pxi | 3 +++ src/subprocess/main_message_loop/util_win.cpp | 4 ++-- src/subprocess/main_message_loop/util_win.h | 2 +- tools/build.py | 2 +- tools/build_distrib.py | 5 +++-- tools/common.py | 6 ++++++ tools/cython_setup.py | 7 +++---- tools/installer/cefpython3.init.py | 3 +++ tools/installer/cefpython3.setup.py | 1 + tools/make_installer.py | 8 +++++--- 14 files changed, 39 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index d4f4c493..48a9af4a 100644 --- a/README.md +++ b/README.md @@ -210,9 +210,9 @@ support old operating systems then choose the v31 release. OS | Py2 | Py3 | 32bit | 64bit | Requirements --- | --- | --- | --- | --- | --- -Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | Yes | Yes | Windows 7+ -Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 3.8 | Yes | Yes | Debian 8+, Ubuntu 14.04+,
Fedora 24+, openSUSE 13.3+ -Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 | No | Yes | MacOS 10.9+ +Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+) +Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,
Fedora 24+, openSUSE 13.3+ +Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ These platforms are not supported yet: - ARM - see [Issue #267](../../issues/267) diff --git a/docs/Build-instructions.md b/docs/Build-instructions.md index 5df63bec..9ca4d6e9 100644 --- a/docs/Build-instructions.md +++ b/docs/Build-instructions.md @@ -66,8 +66,9 @@ are named "cefpythonXX" where XX is Chromium version number. from [here](https://www.microsoft.com/en-us/download/details.aspx?id=44266) 5) For Python 2.7 and when using using "Visual C++ compiler for Python 2.7" - you have to install "Visual C++ 2008 Redistributable Package (x64)" - from [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336) + you have to install "Visual C++ 2008 Redistributable Package" + from [here](https://www.microsoft.com/en-us/download/details.aspx?id=29) + and [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336) 6) Clone cefpython, checkout for example "cefpython57" branch that includes Chromium v57, then create a build/ directory and enter it: @@ -164,7 +165,8 @@ requirements common for all platforms. For Python 2.7 install "Microsoft Visual C++ Compiler for Python 2.7" from [here](https://www.microsoft.com/en-us/download/details.aspx?id=44266) * When using "Visual C++ compiler for Python 2.7" you have to install - "Microsoft Visual C++ 2008 Redistributable Package (x64)" from + "Microsoft Visual C++ 2008 Redistributable Package" from + [here](https://www.microsoft.com/en-us/download/details.aspx?id=29) and [here](https://www.microsoft.com/en-us/download/details.aspx?id=15336) * For Python 2.7 copy "cefpython/src/windows/py27/stdint.h" to "%LocalAppData%\Programs\Common\Microsoft\Visual C++ for Python\9.0\VC\include\" diff --git a/examples/screenshot.py b/examples/screenshot.py index d6dc661c..976ba538 100644 --- a/examples/screenshot.py +++ b/examples/screenshot.py @@ -42,7 +42,7 @@ import sys try: - from PIL import Image, PILLOW_VERSION + from PIL import Image, version as PILLOW_VERSION except ImportError: print("[screenshot.py] Error: PIL module not available. To install" " type: pip install Pillow") diff --git a/src/common/cefpython_public_api.h b/src/common/cefpython_public_api.h index 8e4ff60b..c796388e 100644 --- a/src/common/cefpython_public_api.h +++ b/src/common/cefpython_public_api.h @@ -48,6 +48,8 @@ #include "../../build/build_cefpython/cefpython_py37_fixed.h" #elif PY_MINOR_VERSION == 8 #include "../../build/build_cefpython/cefpython_py38_fixed.h" +#elif PY_MINOR_VERSION == 9 +#include "../../build/build_cefpython/cefpython_py39_fixed.h" #endif // PY_MINOR_VERSION #endif // PY_MAJOR_VERSION diff --git a/src/compile_time_constants.pxi b/src/compile_time_constants.pxi index 609470c1..bf130d6e 100644 --- a/src/compile_time_constants.pxi +++ b/src/compile_time_constants.pxi @@ -5,3 +5,6 @@ DEF UNAME_SYSNAME = "Windows" DEF PY_MAJOR_VERSION = 3 +cdef extern from "limits.h": + cdef int INT_MIN + cdef int INT_MAX diff --git a/src/subprocess/main_message_loop/util_win.cpp b/src/subprocess/main_message_loop/util_win.cpp index bc1f0965..834850e3 100644 --- a/src/subprocess/main_message_loop/util_win.cpp +++ b/src/subprocess/main_message_loop/util_win.cpp @@ -136,8 +136,8 @@ int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam) { return modifiers; } -bool IsKeyDown(WPARAM wparam) { - return (GetKeyState(wparam) & 0x8000) != 0; +bool IsKeyDown(int keycode) { + return (GetKeyState(keycode) & 0x8000) != 0; } float GetDeviceScaleFactor() { diff --git a/src/subprocess/main_message_loop/util_win.h b/src/subprocess/main_message_loop/util_win.h index 39870204..a716d938 100644 --- a/src/subprocess/main_message_loop/util_win.h +++ b/src/subprocess/main_message_loop/util_win.h @@ -31,7 +31,7 @@ WNDPROC SetWndProcPtr(HWND hWnd, WNDPROC wndProc); int GetCefMouseModifiers(WPARAM wparam); int GetCefKeyboardModifiers(WPARAM wparam, LPARAM lparam); -bool IsKeyDown(WPARAM wparam); +bool IsKeyDown(int keycode); // Returns the device scale factor. For example, 200% display scaling will // return 2.0. diff --git a/tools/build.py b/tools/build.py index b3bc9920..f3960283 100644 --- a/tools/build.py +++ b/tools/build.py @@ -809,7 +809,7 @@ def build_cefpython_module(): args = list() args.append("\"{python}\"".format(python=sys.executable)) args.append(os.path.join(TOOLS_DIR, os.path.basename(file))) - assert file in sys.argv[0] + assert os.path.basename(file) in sys.argv[0] args.extend(SYS_ARGV_ORIGINAL[1:]) command = " ".join(args) print("[build.py] Running command: %s" % command) diff --git a/tools/build_distrib.py b/tools/build_distrib.py index f452bc0d..01ae66da 100644 --- a/tools/build_distrib.py +++ b/tools/build_distrib.py @@ -80,13 +80,14 @@ ALLOW_PARTIAL = False # Python versions -SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8)] +SUPPORTED_PYTHON_VERSIONS = [(2, 7), (3, 4), (3, 5), (3, 6), (3, 7), (3, 8), (3, 9)] # Python search paths. It will use first Python found for specific version. # Supports replacement of one environment variable in path eg.: %ENV_KEY%. PYTHON_SEARCH_PATHS = dict( WINDOWS=[ "C:\\Python\\", + "C:\\Pythons\\Python\\", "%LOCALAPPDATA%\\Programs\\Python\\Python\\", "C:\\Program Files\\Python\\", "C:\\Program Files (x86)\\Python\\", @@ -614,7 +615,7 @@ def check_cpp_extension_dependencies_issue359(setup_dir, all_pythons): return checked_any = False for python in all_pythons: - if python["version2"] in ((3, 5), (3, 6), (3, 7)): + if python["version2"] in ((3, 5), (3, 6), (3, 7), (3, 8), (3, 9)): checked_any = True if not os.path.exists(os.path.join(setup_dir, "cefpython3", "msvcp140.dll")): diff --git a/tools/common.py b/tools/common.py index 226fd391..303ccb85 100644 --- a/tools/common.py +++ b/tools/common.py @@ -219,15 +219,19 @@ VS_PLATFORM_ARG = "x86" if ARCH32 else "amd64" +# Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9 VS2015_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 14.0" "\\VC\\vcvarsall.bat") +# Required for building old CEF branches < 2704 VS2013_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 12.0" "\\VC\\vcvarsall.bat") +# Python 3.4 VS2010_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 10.0" "\\VC\\vcvarsall.bat") +# Python 2.7 VS2008_VCVARS = ("C:\\Program Files (x86)\\Microsoft Visual Studio 9.0" "\\VC\\vcvarsall.bat") @@ -475,6 +479,8 @@ def get_msvs_for_python(vs_prefix=False): return "VS2015" if vs_prefix else "2015" elif sys.version_info[:2] == (3, 8): return "VS2015" if vs_prefix else "2015" + elif sys.version_info[:2] == (3, 9): + return "VS2015" if vs_prefix else "2015" else: print("ERROR: This version of Python is not supported") sys.exit(1) diff --git a/tools/cython_setup.py b/tools/cython_setup.py index 5b3049db..436bcb2c 100644 --- a/tools/cython_setup.py +++ b/tools/cython_setup.py @@ -147,17 +147,15 @@ def get_winsdk_lib(): if WINDOWS: if ARCH32: winsdk_libs = [ + # Windows 7 SDKs. r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib", r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib", - # Visual Studio 2008 installation - r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib", ] elif ARCH64: winsdk_libs = [ + # Windows 7 SDKs. r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Lib\\x64", r"C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0\\Lib\\x64", - # Visual Studio 2008 installation - r"C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A\\Lib\\x64", ] else: raise Exception("Unknown architecture") @@ -433,6 +431,7 @@ def get_ext_modules(options): # > Unknown Extension options: 'cython_directives' warnings.warn(msg) cython_directives={ # Any conversion to unicode must be explicit using .decode(). + "language_level": 2, # Yes, Py2 for all python versions. "c_string_type": "bytes", "c_string_encoding": "utf-8", "profile": ENABLE_PROFILING, diff --git a/tools/installer/cefpython3.init.py b/tools/installer/cefpython3.init.py index 5f779a54..624a26e7 100644 --- a/tools/installer/cefpython3.init.py +++ b/tools/installer/cefpython3.init.py @@ -67,5 +67,8 @@ elif sys.version_info[:2] == (3, 8): # noinspection PyUnresolvedReferences from . import cefpython_py38 as cefpython +elif sys.version_info[:2] == (3, 9): + # noinspection PyUnresolvedReferences + from . import cefpython_py39 as cefpython else: raise Exception("Python version not supported: " + sys.version) diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py index 2a926913..d14ee2ce 100644 --- a/tools/installer/cefpython3.setup.py +++ b/tools/installer/cefpython3.setup.py @@ -149,6 +149,7 @@ def main(): "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Topic :: Desktop Environment", "Topic :: Internet", "Topic :: Internet :: WWW/HTTP", diff --git a/tools/make_installer.py b/tools/make_installer.py index bc3b5cef..012e6657 100644 --- a/tools/make_installer.py +++ b/tools/make_installer.py @@ -338,7 +338,7 @@ def create_empty_log_file(log_file): def copy_cpp_extension_dependencies_issue359(pkg_dir): """CEF Python module is written in Cython and is a Python C++ - extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7 + extension and depends on msvcpXX.dll. For Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9 msvcp140.dll is required. See Issue #359. For Python 2.7 msvcp90.dll is required. Etc. These dependencies are not included with Python binaries from Python.org.""" @@ -365,10 +365,12 @@ def copy_cpp_extension_dependencies_issue359(pkg_dir): # in the package. Thus if included, msvcpxx.dll dependency is # required as well. - # Python 3.5 / 3.6 / 3.7 + # Python 3.5 / 3.6 / 3.7 / 3.8 / 3.9 if os.path.exists(os.path.join(pkg_dir, "cefpython_py35.pyd")) \ or os.path.exists(os.path.join(pkg_dir, "cefpython_py36.pyd")) \ - or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")): + or os.path.exists(os.path.join(pkg_dir, "cefpython_py37.pyd")) \ + or os.path.exists(os.path.join(pkg_dir, "cefpython_py38.pyd")) \ + or os.path.exists(os.path.join(pkg_dir, "cefpython_py39.pyd")): search_paths = [ # This is where Microsoft Visual C++ 2015 Update 3 installs # (14.00.24212). From 92aa6236268620105be0b3d5ce60412a8b5dbf5b Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 15 Feb 2021 19:01:48 +0100 Subject: [PATCH 161/177] Fix Python 3 error in build_distrib.py script (#546). --- tools/build_distrib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build_distrib.py b/tools/build_distrib.py index 01ae66da..61560743 100644 --- a/tools/build_distrib.py +++ b/tools/build_distrib.py @@ -379,7 +379,7 @@ def uninstall_cefpython3_packages(pythons): .format(python=python["executable"])) try: output = subprocess.check_output(command, shell=True) - except subprocess.CalledProcessError, exc: + except subprocess.CalledProcessError as exc: # pip show returns error code when package is not installed output = exc.output if not len(output.strip()): From 3beaaf5dc39c80eea54a9bba6c4c35965764d628 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 15 Feb 2021 19:31:02 +0100 Subject: [PATCH 162/177] Fix build_distrib.py on Python 3 (Issue #546). --- tools/build_distrib.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/build_distrib.py b/tools/build_distrib.py index 61560743..7adb535b 100644 --- a/tools/build_distrib.py +++ b/tools/build_distrib.py @@ -86,7 +86,7 @@ # Supports replacement of one environment variable in path eg.: %ENV_KEY%. PYTHON_SEARCH_PATHS = dict( WINDOWS=[ - "C:\\Python\\", + "C:\\Python??\\", "C:\\Pythons\\Python\\", "%LOCALAPPDATA%\\Programs\\Python\\Python\\", "C:\\Program Files\\Python\\", @@ -277,6 +277,8 @@ def search_for_pythons(search_arch): version_str = subprocess.check_output([python, "-c", version_code]) version_str = version_str.strip() + if sys.version_info >= (3, 0): + version_str = version_str.decode("utf-8") match = re.search("^$(\d+), (\d+), (\d+)$$", version_str) assert match, version_str major = match.group(1) @@ -288,6 +290,8 @@ def search_for_pythons(search_arch): "print(str(platform.architecture()[0]));") arch = subprocess.check_output([python, "-c", arch_code]) arch = arch.strip() + if sys.version_info >= (3, 0): + arch = arch.decode("utf-8") if version_tuple2 in SUPPORTED_PYTHON_VERSIONS \ and arch == search_arch: name = ("Python {major}.{minor}.{micro} {arch}" From 06d3b8c8e8164ea1a51caf00591b7eaedcbfc5ac Mon Sep 17 00:00:00 2001 From: cztomczak Date: Mon, 15 Feb 2021 23:26:45 +0100 Subject: [PATCH 163/177] Fix build_distrib.py script for Python 2.7 and Python 3.4 (latest pip versions are broken with these old Pythons). Fix screenshot.py example sometimes failing. When compiling for Python 3.4 you can encounter the the missing "ammintrin.h" header file error. Just copy it from the VS 2019 include/ directory. For Pythons 3.5 / 3.6 / 3.7 / 3.8 / 3.9 you can use the same VC++ 14.2 (VS 2019) compiler which is binary compatible with VC++ 14.1 (VS 2017) and VC++ 14.0 (VS 2015). Currently the subprocess.exe executable built by Python 3.4 (VC++ 10.0 compiler) gives the least amount of false-positives by AVs on virustotal.com . For comparison: Py34 (1/69), Py27 (2/69), Py39 (5/69). Results differ for 32bit and 64bit binaries. --- examples/screenshot.py | 9 ++++++--- tools/build_distrib.py | 28 ++++++++++++++++------------ 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/examples/screenshot.py b/examples/screenshot.py index 976ba538..5ca8d491 100644 --- a/examples/screenshot.py +++ b/examples/screenshot.py @@ -158,6 +158,8 @@ def save_screenshot(browser): "raw", "RGBA", 0, 1) image.save(SCREENSHOT_PATH, "PNG") print("[screenshot.py] Saved image: {path}".format(path=SCREENSHOT_PATH)) + # See comments in exit_app() why PostTask must be used + cef.PostTask(cef.TID_UI, exit_app, browser) def open_with_default_application(path): @@ -188,9 +190,10 @@ def OnLoadingStateChange(self, browser, is_loading, _): # Loading is complete sys.stdout.write(os.linesep) print("[screenshot.py] Web page loading is complete") - save_screenshot(browser) - # See comments in exit_app() why PostTask must be used - cef.PostTask(cef.TID_UI, exit_app, browser) + print("[screenshot.py] Will save screenshot in 2 seconds") + # Give up to 2 seconds for the OnPaint call. Most of the time + # it is already called, but sometimes it may be called later. + cef.PostDelayedTask(cef.TID_UI, 2000, save_screenshot, browser) def OnLoadError(self, browser, frame, error_code, failed_url, _): """Called when the resource load for a navigation fails diff --git a/tools/build_distrib.py b/tools/build_distrib.py index 7adb535b..051914f5 100644 --- a/tools/build_distrib.py +++ b/tools/build_distrib.py @@ -353,8 +353,14 @@ def install_upgrade_requirements(pythons): " for: {name}".format(name=python["name"])) # Upgrade pip - command = ("\"{python}\" -m pip install --upgrade pip" - .format(python=python["executable"])) + pip_version = "pip" + # Old Python versions require specific versions of pip, latest versions are broken with these. + if python["version2"] == (2, 7): + pip_version = "pip==20.3.4" + elif python["version2"] == (3, 4): + pip_version = "pip==19.1.1" + command = ("\"{python}\" -m pip install --upgrade {pip_version}" + .format(python=python["executable"], pip_version=pip_version)) command = sudo_command(command, python=python["executable"]) pcode = subprocess.call(command, shell=True) if pcode != 0: @@ -522,39 +528,37 @@ def build_cefpython_modules(pythons, arch): def backup_subprocess_executable_issue342(python): - """Use subprocess executable build by Python 2.7 to avoid - false-positives by AVs when building subprocess with Python 3. - Windows-only issue.""" + """Use subprocess executable built by Python 3.4 to have the least amount of + false-positives by AVs. Windows-only issue.""" if not WINDOWS: return if python["version2"] == (2, 7): print("[build_distrib.py] Backup subprocess executable built" - " with Python 2.7 (Issue #342)") + " with Python 3.4 (Issue #342)") cefpython_binary_basename = get_cefpython_binary_basename( get_os_postfix2_for_arch(python["arch"])) cefpython_binary = os.path.join(BUILD_DIR, cefpython_binary_basename) assert os.path.isdir(cefpython_binary) src = os.path.join(cefpython_binary, "subprocess.exe") dst = os.path.join(BUILD_CEFPYTHON, - "subprocess_py27_{arch}_issue342.exe" + "subprocess_py34_{arch}_issue342.exe" .format(arch=python["arch"])) shutil.copy(src, dst) def restore_subprocess_executable_issue342(arch): - """Use subprocess executable build by Python 2.7 to avoid - false-positives by AVs when building subprocess with Python 3. - Windows-only issue.""" + """Use subprocess executable built by Python 3.4 to have the least amount of + false-positives by AVs. Windows-only issue.""" if not WINDOWS: return print("[build_distrib.py] Restore subprocess executable built" - " with Python 2.7 (Issue #342)") + " with Python 3.4 (Issue #342)") cefpython_binary_basename = get_cefpython_binary_basename( get_os_postfix2_for_arch(arch)) cefpython_binary = os.path.join(BUILD_DIR, cefpython_binary_basename) assert os.path.isdir(cefpython_binary) src = os.path.join(BUILD_CEFPYTHON, - "subprocess_py27_{arch}_issue342.exe" + "subprocess_py34_{arch}_issue342.exe" .format(arch=arch)) assert os.path.isfile(src) dst = os.path.join(cefpython_binary, "subprocess.exe") From 0e2503c4675d683d2b853267ee0183e4e7fb5726 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Tue, 16 Feb 2021 19:18:02 +0100 Subject: [PATCH 164/177] Add JS bindings long integer test. Add comments on DPI awareness. --- examples/hello_world.py | 7 +++++++ unittests/main_test.py | 26 ++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/examples/hello_world.py b/examples/hello_world.py index 478c7060..789f4666 100644 --- a/examples/hello_world.py +++ b/examples/hello_world.py @@ -1,5 +1,12 @@ # Hello world example. Doesn't depend on any third party GUI framework. # Tested with CEF Python v57.0+. +# +# ==== High DPI support on Windows ==== +# To enable DPI awareness on Windows you have to either embed DPI aware manifest +# in your executable created with pyinstaller or change python.exe properties manually: +# Compatibility > High DPI scaling override > Application. +# Setting DPI awareness programmatically via a call to cef.DpiAware.EnableHighDpiSupport +# is problematic in Python, may not work and can cause display glitches. from cefpython3 import cefpython as cef import platform diff --git a/unittests/main_test.py b/unittests/main_test.py index 99397da8..ce71af20 100644 --- a/unittests/main_test.py +++ b/unittests/main_test.py @@ -58,17 +58,18 @@ print("test_function() ok"); // Test binding property: test_property1 - if (test_property1 == "Test binding property to the 'window' object") { + if (test_property1 === "Test binding property to the 'window' object") { print("test_property_1 ok"); } else { throw new Error("test_property1 contains invalid string"); } // Test binding property: test_property2 - if (JSON.stringify(test_property2) == '{"key1":"Test binding property'+ - ' to the \\'window\\' object","key2":["Inside list",1,2]}') { + if (JSON.stringify(test_property2) === '{"key1":"Test binding property'+ + ' to the \\'window\\' object","key2":["Inside list",2147483647,"2147483648"]}') { print("test_property2 ok"); } else { + print("test_property2 invalid value: " + JSON.stringify(test_property2)); throw new Error("test_property2 contains invalid value"); } @@ -81,7 +82,7 @@ print("[TIMER] Call Python function and then js callback that was"+ " passed (Issue #277 test)"); external.test_callbacks(function(msg_from_python, py_callback){ - if (msg_from_python == "String sent from Python") { + if (msg_from_python === "String sent from Python") { print("test_callbacks() ok"); var execution_time = new Date().getTime() - start_time; print("[TIMER]: Elapsed = "+String(execution_time)+" ms"); @@ -163,15 +164,23 @@ def test_main(self): cef.LoadCrlSetsFile(crlset) subtest_message("cef.LoadCrlSetsFile ok") - # High DPI on Windows + # High DPI on Windows. + # Setting DPI awareness from Python is usually too late and should be done + # via manifest file. Alternatively change python.exe properties > Compatibility + # > High DPI scaling override > Application. + # Using cef.DpiAware.EnableHighDpiSupport is problematic, it can cause + # display glitches. if WINDOWS: self.assertIsInstance(cef.DpiAware.GetSystemDpi(), tuple) window_size = cef.DpiAware.CalculateWindowSize(800, 600) self.assertIsInstance(window_size, tuple) self.assertGreater(window_size[0], 0) self.assertGreater(cef.DpiAware.Scale((800, 600))[0], 0) - cef.DpiAware.EnableHighDpiSupport() - self.assertTrue(cef.DpiAware.IsProcessDpiAware()) + + # OFF - see comments above. + # cef.DpiAware.EnableHighDpiSupport() + # self.assertTrue(cef.DpiAware.IsProcessDpiAware()) + # Make some calls again after DPI Aware was set self.assertIsInstance(cef.DpiAware.GetSystemDpi(), tuple) self.assertGreater(cef.DpiAware.Scale([800, 600])[0], 0) @@ -374,9 +383,10 @@ def init(self, test_case): self.test_case = test_case # Test binding properties to the 'window' object. + # 2147483648 is out of INT_MAX limit and will be sent to JS as string value. self.test_property1 = "Test binding property to the 'window' object" self.test_property2 = {"key1": self.test_property1, - "key2": ["Inside list", 1, 2]} + "key2": ["Inside list", 2147483647, 2147483648]} # Asserts for True/False will be checked just before shutdown self.test_for_True = True # Test whether asserts are working correctly From d2c72528addad8ef41a2a460946f32fe425ed183 Mon Sep 17 00:00:00 2001 From: cztomczak Date: Tue, 16 Feb 2021 19:31:32 +0100 Subject: [PATCH 165/177] Update the sponsors sections in README. --- README.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 48a9af4a..e9175971 100644 --- a/README.md +++ b/README.md @@ -55,30 +55,29 @@ PyGame, PyOpenGL, PyWin32, PySide and PySDL2.
- - + +
-Many Thanks to Lampix for sponsoring the -[v66 release](../../releases/tag/v66.0). Lampix is the first hardware -and software solution that turns any surface into a smart, augmented reality -or interactive surface. Please visit their website: -Lampix.com +Thank you to Fivestars for sponsoring the [v66.1 release](../../releases/tag/v66.1) +with Python 3.8 / 3.9 support. Fivestars helps local communities thrive by empowering +small businesses with cutting edge marketing technology. Please visit their website: +Fivestars.com
- - + +
-Many thanks to Fivestars for sponsoring the -[v49 legacy release](../../releases/tag/v49.0). Fivestars helps local -communities thrive by empowering small -businesses with cutting edge marketing technology. Please visit their website: -Fivestars.com +Thank you to Lampix for sponsoring the +[v66 release](../../releases/tag/v66.0). Lampix is the first hardware +and software solution that turns any surface into a smart, augmented reality +or interactive surface. Please visit their website: +Lampix.com
@@ -274,6 +273,8 @@ priority. ### Thanks to all +* [2021] Thank you to [Fivestars](https://www.fivestars.com/) for sponsoring + the v66.1 release with Python 3.8 / 3.9 support * [2018] Thanks to [Fivestars](https://www.fivestars.com/) for sponsoring the v49 release for legacy systems (WinXP/Vista) * [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66 From 431b9956db660d5552c31fb4a3a891f619ed84a8 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Tue, 13 Apr 2021 10:42:46 +0200 Subject: [PATCH 166/177] Fix Kivy example on Windows (#613). --- src/linux/binaries_64bit/kivy_.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/linux/binaries_64bit/kivy_.py b/src/linux/binaries_64bit/kivy_.py index 49543bf9..a9a1590b 100644 --- a/src/linux/binaries_64bit/kivy_.py +++ b/src/linux/binaries_64bit/kivy_.py @@ -1,7 +1,5 @@ -# An example of embedding CEF browser in the Kivy framework. -# The browser is embedded using off-screen rendering mode. - -# Tested using Kivy 1.7.2 stable, only on Linux. +# An example of embedding CEF browser with the Kivy framework +# by using off-screen rendering mode. # In this example kivy-lang is used to declare the layout which # contains two buttons (back, forward) and the browser view. @@ -44,7 +42,7 @@ def init(self, kwargs): super(BrowserLayout, self).init(kwargs) self.orientation = "vertical" - self.browser_widget = CefBrowser(id="browser") + self.browser_widget = CefBrowser() layout = BoxLayout() layout.size_hint_y = None From 80e6f3c9828fce40b103a4f51b8bc29d64c54b9c Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Wed, 21 Apr 2021 13:50:04 +0200 Subject: [PATCH 167/177] Fix link --- examples/README-examples.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/README-examples.md b/examples/README-examples.md index ea5871c8..ec2f9bcd 100644 --- a/examples/README-examples.md +++ b/examples/README-examples.md @@ -107,7 +107,7 @@ yet ported to latest CEF. Some of them are externally maintained. for reading/modifying web requests: see the [wxpython-response.py](https://github.com/cztomczak/cefpython/blob/cefpython31/cefpython/cef3/linux/binaries_64bit/wxpython-response.py) example in the cefpython31 branch. - Example of using Python network library (urllib3/openssl) instead of Chromium's - network library - see [gist by Massimiliano Dal Cero](https://gist.github.com/yattamax/0252a3c5dc54a2f81650d5c0eafabf99) + network library - see [gist by Massimiliano Dal Cero](https://gist.github.com/cztomczak/83b77cbdda03ccef81e22e8bd36a51f6) - Example of passing exceptions from Python to Javascript and using await syntax to receive values from python return values - see [Managed python calls example by Elliot Woods](https://github.com/elliotwoods/cefpython-tests/tree/0180b22eac10a1bde08820ca192fdc30eb93f00d/6.%20Managed%20python%20calls) ## More examples to come From 5679f28cec18a57a56e298da2927aac8d8f83ad6 Mon Sep 17 00:00:00 2001 From: relyx <12107287+Reskayoi@users.noreply.github.com> Date: Fri, 14 May 2021 17:18:03 +0800 Subject: [PATCH 168/177] fix OnDownloadData decoding bug (#621) --- api/WebRequestClient.md | 2 +- src/web_request.pyx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/WebRequestClient.md b/api/WebRequestClient.md index d8431cec..0c75a668 100644 --- a/api/WebRequestClient.md +++ b/api/WebRequestClient.md @@ -65,7 +65,7 @@ response (or -1 if not determined). | Parameter | Type | | --- | --- | | web_request | [WebRequest](WebRequest.md) | -| data | string | +| data | bytes | | Return | void | Called when some part of the response is read. |data| contains the current diff --git a/src/web_request.pyx b/src/web_request.pyx index 9891dade..8e51fca1 100644 --- a/src/web_request.pyx +++ b/src/web_request.pyx @@ -176,7 +176,7 @@ cdef public void WebRequestClient_OnDownloadData( if userCallback: userCallback( web_request=webRequest, - data=VoidPtrToString(data, dataLength)) + data=VoidPtrToBytes(data, dataLength)) except: (exc_type, exc_value, exc_trace) = sys.exc_info() sys.excepthook(exc_type, exc_value, exc_trace) From b070673ba96572f49354b5507822528430525099 Mon Sep 17 00:00:00 2001 From: jonastieppo Date: Thu, 19 Dec 2024 14:41:39 -0300 Subject: [PATCH 169/177] Update README.md (#675) Just updating to the latest version (really minor change). --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9175971..f9a76a57 100644 --- a/README.md +++ b/README.md @@ -147,7 +147,7 @@ also download packages for offline installation available on the [GitHub Releases](../../releases) pages. Command to install with pip: ``` -pip install cefpython3==66.0 +pip install cefpython3==66.1 ``` From 05586d5bd92b9b98f0d96f9d069f8c5b10223e9b Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sat, 8 Feb 2025 01:06:33 +0100 Subject: [PATCH 170/177] Update README.md --- README.md | 311 +++++++++++++----------------------------------------- 1 file changed, 71 insertions(+), 240 deletions(-) diff --git a/README.md b/README.md index f9a76a57..80bda463 100644 --- a/README.md +++ b/README.md @@ -2,22 +2,12 @@ Table of contents: * [Introduction](#introduction) -* [Latest releases sponsored by](#latest-releases-sponsored-by) - * [Thanks to all sponsors](#thanks-to-all-sponsors) * [Install](#install) -* [Tutorial](#tutorial) * [Examples](#examples) * [Support](#support) -* [Releases](#releases) - * [Next release](#next-release) - * [Latest release](#latest-release) - * [v49 release (WinXP/Vista)](#v49-release-winxpvista) - * [v31 release (old systems)](#v31-release-old-systems) * [Support development](#support-development) - * [Thanks to all](#thanks-to-all) -* [Seeking new sponsors](#seeking-new-sponsors) -* [Other READMEs](#other-readmes) -* [Quick links](#quick-links) +* [Seeking sponsors](#seeking-sponsors) +* [API](#api) ## Introduction @@ -49,39 +39,82 @@ frameworks such as PyQt, wxPython, PyGTK, PyGObject, Tkinter, Kivy, Panda3D, PyGame, PyOpenGL, PyWin32, PySide and PySDL2. -## Latest releases sponsored by +## Install - -
+You can install [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3) +package using pip tool. On Linux pip 8.1+ is required. You can +also download packages for offline installation available on the +[GitHub Releases](../../releases) pages. Command to install with pip: -
- - - -
+``` +pip install cefpython3==66.1 +``` -Thank you to Fivestars for sponsoring the [v66.1 release](../../releases/tag/v66.1) -with Python 3.8 / 3.9 support. Fivestars helps local communities thrive by empowering -small businesses with cutting edge marketing technology. Please visit their website: -Fivestars.com +Below is a table with supported platforms, python versions and architectures. - +OS | Py2 | Py3 | 32bit | 64bit | Requirements +--- | --- | --- | --- | --- | --- +Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+) +Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,
Fedora 24+, openSUSE 13.3+ +Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ -
- - - -
-Thank you to Lampix for sponsoring the -[v66 release](../../releases/tag/v66.0). Lampix is the first hardware -and software solution that turns any surface into a smart, augmented reality -or interactive surface. Please visit their website: -Lampix.com +## Examples + +- [Tutorial](docs/Tutorial.md) +- [All examples](examples/README-examples.md). +- [Snippets](examples/snippets/README-snippets.md). +- [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md). -
-### Thanks to all sponsors +## Support + +- Ask questions and report problems on the + [Forum](https://groups.google.com/group/cefpython) +- Supported examples are listed in the + [README-examples.md](examples/README-examples.md) file +- Documentation is in the [docs/](docs) directory: + - [Build instructions](docs/Build-instructions.md) + - [Contributing code](docs/Contributing-code.md) + - [Knowledge Base](docs/Knowledge-Base.md) + - [Migration guide](docs/Migration-guide.md) + - [Tutorial](docs/Tutorial.md) +- API reference is in the [api/](api) directory: + - [API categories](api/API-categories.md#api-categories) + - [API index](api/API-index.md#api-index) +- Additional documentation is available in + [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22) +- To search documentation use GitHub "This repository" search + at the top. To narrow results to documentation only select + "Markdown" in the right pane. +- You can vote on issues in the tracker to let us know which issues are + important to you. To do that add a +1 thumb up reaction to the first post + in the issue. See + [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc) + sorted by reactions. + + +## Support development + +If you would like to support general CEF Python development efforts +by making a donation then please click the Paypal Donate button below. + + + +

+ + +## Seeking sponsors + +CEF Python is seeking companies to sponsor development of this project. Most important +thing would be to have continuous monthly releases with updates to latest Chromium. There is +also lots of cool features and new settings that would be nice to implement. We have not yet +exposed all of upstream CEF APIs. If your company would like to sponsor CEF Python development efforts +then please contact [Czarek](https://www.linkedin.com/in/czarektomczak/). There are no active sponsors +at this moment. + + +### Previous sponsors @@ -139,209 +172,7 @@ or interactive surface. Please visit their website:

-## Install - -You can install [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3) -package using pip tool. On Linux pip 8.1+ is required. You can -also download packages for offline installation available on the -[GitHub Releases](../../releases) pages. Command to install with pip: - -``` -pip install cefpython3==66.1 -``` - - -## Tutorial - -See the [Tutorial.md](docs/Tutorial.md) document. - - -## Examples - -See the [README-examples.md](examples/README-examples.md) and -[README-snippets.md](examples/snippets/README-snippets.md) documents. - - -## Support - -- Ask questions and report problems on the - [Forum](https://groups.google.com/group/cefpython) -- Supported examples are listed in the - [README-examples.md](examples/README-examples.md) file -- Documentation is in the [docs/](docs) directory: - - [Build instructions](docs/Build-instructions.md) - - [Contributing code](docs/Contributing-code.md) - - [Knowledge Base](docs/Knowledge-Base.md) - - [Migration guide](docs/Migration-guide.md) - - [Tutorial](docs/Tutorial.md) -- API reference is in the [api/](api) directory: - - [API categories](api/API-categories.md#api-categories) - - [API index](api/API-index.md#api-index) -- Additional documentation is available in - [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22) -- To search documentation use GitHub "This repository" search - at the top. To narrow results to documentation only select - "Markdown" in the right pane. -- You can vote on issues in the tracker to let us know which issues are - important to you. To do that add a +1 thumb up reaction to the first post - in the issue. See - [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc) - sorted by reactions. - - -## Releases - -Information on planned new and current releases, supported platforms, -python versions, architectures and requirements. If you want to -support old operating systems then choose the v31 release. - -### Next release - -- To see planned new features or bugs to be fixed in the near future in one of - next releases, see the - [next release](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22next+release%22) - label in the tracker -- To see planned new features or bugs to be fixed in further future, see the - [next release 2](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22next+release+2%22) - label in the tracker - -### Latest release - -OS | Py2 | Py3 | 32bit | 64bit | Requirements ---- | --- | --- | --- | --- | --- -Windows | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 / 3.8 / 3.9 | Yes | Yes | Windows 7+ (Note that Python 3.9 supports Windows 8.1+) -Linux | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | Yes | Yes | Debian 8+, Ubuntu 14.04+,
Fedora 24+, openSUSE 13.3+ -Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ - -These platforms are not supported yet: -- ARM - see [Issue #267](../../issues/267) -- Android - see [Issue #307](../../issues/307) - - -### v49 release (WinXP/Vista) - -OS | Py2 | Py3 | 32bit | 64bit | Requirements ---- | --- | --- | --- | --- | --- -Windows | 2.7 | 3.4 | Yes | Yes | Windows XP+ - -- Install with command: `pip --no-cache-dir install cefpython3==49.0`. - - Please note that if you were previously installing cefpython3 - package it is required to use the `--no-cache-dir` flag, - otherwise pip will end up with error message - `No matching distribution found for cefpython3==49.0`. - This happens because 49.0 release occured after 57.0 and 66.0 - releases. -- Downloads are available on GitHub Releases tagged - [v49.0](../../releases/tag/v49.0). -- See [Migration guide](docs/Migration-guide.md) document for changes - in this release -- Documentation is available in the [docs/](../../tree/cefpython49-winxp/docs) - directory in the `cefpython49-winxp` branch -- API reference is available in the [api/](../../tree/cefpython49-winxp/api) - directory in the `cefpython49-winxp` branch - - -### v31 release (old systems) - -OS | Py2 | Py3 | 32bit | 64bit | Requirements ---- | --- | --- | --- | --- | --- -Windows | 2.7 | No | Yes | Yes | Windows XP+ -Linux | 2.7 | No | Yes | Yes | Debian 7+ / Ubuntu 12.04+ -Mac | 2.7 | No | Yes | Yes | MacOS 10.7+ - -Additional information for v31.2 release: -- On Windows/Mac you can install with command: `pip install cefpython3==31.2` -- Downloads are available on the GitHub Releases page tagged - [v31.2](../../releases/tag/v31.2). -- API reference is available in revision [169a1b2](../../tree/169a1b20d3cd09879070d41aab28cfa195d2a7d5/docs/api) -- Other documentation can be downloaded by cloning the - cefpython.wiki repository: `git clone git@github.com:cztomczak/cefpython.wiki.git` - - -## Support development - -If you would like to support general CEF Python development efforts -by making a donation then please click the Paypal Donate button below. -If you would like to see a specific feature implemented then you can make -a comment about that when making a donation and that will give it a higher -priority. - - - -

- - -### Thanks to all - -* [2021] Thank you to [Fivestars](https://www.fivestars.com/) for sponsoring - the v66.1 release with Python 3.8 / 3.9 support -* [2018] Thanks to [Fivestars](https://www.fivestars.com/) for sponsoring - the v49 release for legacy systems (WinXP/Vista) -* [2018] Many thanks to [Lampix](https://lampix.com/) for sponsoring the v66 - release for all platforms -* [2017] Many thanks to [HighSide Inc.](https://highside.io/) for sponsoring - the v55/v56 releases for all platforms -* [2016-2018] Thanks to JetBrains for providing an Open Source license for - [PyCharm](https://www.jetbrains.com/pycharm/) -* [2014] Thanks to Adam Duston for donating a Macbook to aid the development - of Mac port -* [2013-2015] Lots of thanks goes to [Cyan Inc.](http://www.blueplanet.com/) - for sponsoring this project for a long time, making CEF Python 3 mature -* [2013] Thanks to [Rentouch GmbH](http://www.rentouch.ch/) for sponsoring the - development of the off-screen rendering support -* [2013] Thanks to Thomas Wusatiuk for sponsoring the development of the web - response reading features -* [2012-2018] Thanks to those who have made a Paypal donation: - [Rentouch GmbH](http://www.rentouch.ch/), Walter Purvis, Rokas Stupuras, - Alex Rattray, Greg Kacy, Paul Korzhyk, Tomasz Tomanek. -* [2012-2017] Thanks to those who have donated their time through code - contributions, they are listed in the [Authors](Authors) file - - -## Seeking new sponsors - -CEF Python is seeking companies to sponsor further development of the project. -There are many proposals for new features submitted in the issue tracker. Most -notable are: - -* Monthly releases with latest Chromium -* An automated build system similar to upstream CEF Spotify Automated Builds -* ARM and Android support -* Multi-threaded support for increased performance -* Proprietary codecs support in build tools: H264, H265,AC3, EAC3, MPEG-4 -* More CEF API exposed, only about 50% is exposed so far -* Hundreds of new settings and Chromium preferences not yet exposed -* Easier integration with popular GUI toolkits in just a few lines of code - and support for more third party GUI frameworks -* More examples of implementing various advanced features and more snippets - as well - -If your company would like to sponsor CEF Python development efforts then -please contact -[Czarek](https://www.linkedin.com/in/czarektomczak/). -Long term sponsorships are welcome and Czarek is open to ideas about -the project. He would love to spend more time on developing this project, -but he can't afford doing so in his free time. Currently there is no company -supporting this project actively on a daily basis. - - -## Other READMEs - -- [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md) - - - -## Quick links - -### Docs - -- [Build instructions](docs/Build-instructions.md) -- [Knowledge Base](docs/Knowledge-Base.md) -- [Migration guide](docs/Migration-guide.md) -- [Tutorial](docs/Tutorial.md) - - -### API categories +## API #### Modules From 811fa74c8ef413d5b82371d6d74166e7d5eab47b Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sat, 8 Feb 2025 01:07:19 +0100 Subject: [PATCH 171/177] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 80bda463..35127ab7 100644 --- a/README.md +++ b/README.md @@ -62,9 +62,9 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ ## Examples - [Tutorial](docs/Tutorial.md) -- [All examples](examples/README-examples.md). -- [Snippets](examples/snippets/README-snippets.md). -- [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md). +- [All examples](examples/README-examples.md) +- [Snippets](examples/snippets/README-snippets.md) +- [PyInstaller packager](examples/pyinstaller/README-pyinstaller.md) ## Support From 6c72dc3d093d3eebbee3ff0b79dc58b762f10846 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sat, 8 Feb 2025 01:11:02 +0100 Subject: [PATCH 172/177] Update README.md --- README.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.md b/README.md index 35127ab7..2e127e63 100644 --- a/README.md +++ b/README.md @@ -86,13 +86,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22) - To search documentation use GitHub "This repository" search at the top. To narrow results to documentation only select - "Markdown" in the right pane. -- You can vote on issues in the tracker to let us know which issues are - important to you. To do that add a +1 thumb up reaction to the first post - in the issue. See - [Most popular issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc) - sorted by reactions. - + "Markdown" in the side pane. ## Support development From 0d3295e05212333f14155f416cc483bd2b2f3e3f Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sat, 8 Feb 2025 01:12:07 +0100 Subject: [PATCH 173/177] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e127e63..06d3a4e3 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ by making a donation then please click the Paypal Donate button below. -

+
## Seeking sponsors From a6f5def34270b8d64a733597146b98633a7e7dd3 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sat, 8 Feb 2025 01:17:13 +0100 Subject: [PATCH 174/177] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 06d3a4e3..b6fe4539 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ ## Support development -If you would like to support general CEF Python development efforts -by making a donation then please click the Paypal Donate button below. +To support general CEF Python development efforts please make a donation using PayPal button below: From de22be237b20b504eb6bdc385eae436eb12d225b Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sat, 8 Feb 2025 01:18:30 +0100 Subject: [PATCH 175/177] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b6fe4539..755d6299 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ ## Support development -To support general CEF Python development efforts please make a donation using PayPal button below: +To support general CEF Python development efforts you can make a donation using PayPal button below: From 5217c04feaa6b8a4abbcb18bba34ad586e3cecd1 Mon Sep 17 00:00:00 2001 From: Czarek Tomczak Date: Sat, 8 Feb 2025 01:23:50 +0100 Subject: [PATCH 176/177] Update README.md --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 755d6299..4ff688b0 100644 --- a/README.md +++ b/README.md @@ -41,15 +41,16 @@ PyGame, PyOpenGL, PyWin32, PySide and PySDL2. ## Install -You can install [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3) -package using pip tool. On Linux pip 8.1+ is required. You can -also download packages for offline installation available on the -[GitHub Releases](../../releases) pages. Command to install with pip: +Command to install with pip: ``` pip install cefpython3==66.1 ``` +Hosted at [pypi/cefpython3](https://pypi.python.org/pypi/cefpython3). On Linux pip 8.1+ is required. + +You can also download packages for offline installation available on the [GitHub Releases](../../releases) pages. + Below is a table with supported platforms, python versions and architectures. OS | Py2 | Py3 | 32bit | 64bit | Requirements From 3d6f6c19992cb112d6de8ff856bce443bdf3bbea Mon Sep 17 00:00:00 2001 From: Mandru-JashwanthKumar Date: Wed, 26 Nov 2025 10:17:23 +0530 Subject: [PATCH 177/177] Fix formatting of README.md documentation section --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ff688b0..b85f34c6 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ Mac | 2.7 | 3.4 / 3.5 / 3.6 / 3.7 | No | Yes | MacOS 10.9+ [Issues labelled Knowledge Base](../../issues?q=is%3Aissue+is%3Aopen+label%3A%22Knowledge+Base%22) - To search documentation use GitHub "This repository" search at the top. To narrow results to documentation only select - "Markdown" in the side pane. + "Markdown" in the side pane ## Support development