From 6dc31087477e496d3be9b4cf8fc7d6b81adb994b Mon Sep 17 00:00:00 2001
From: Artur Shaikhullin <ashaihullin@gmail.com>
Date: Sat, 30 Dec 2017 23:35:12 +0600
Subject: [PATCH] Get OS name using python

---
 qutebrowser/browser/webengine/webenginetab.py |  3 ++-
 qutebrowser/javascript/webengine_caret.js     | 15 ++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index b816e8f2a..42cbc3d2a 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -21,6 +21,7 @@
 
 import math
 import functools
+import platform
 import html as html_utils
 
 import sip
@@ -202,7 +203,7 @@ class WebEngineCaret(browsertab.AbstractCaret):
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_entered(self, mode):
         self._tab.run_js_async(
-            javascript.assemble('caret', 'setInitialCursor'))
+            javascript.assemble('caret', 'setInitialCursor', platform.platform()))
 
     @pyqtSlot(usertypes.KeyMode)
     def _on_mode_left(self):
diff --git a/qutebrowser/javascript/webengine_caret.js b/qutebrowser/javascript/webengine_caret.js
index 001afa8a7..89eb9969f 100644
--- a/qutebrowser/javascript/webengine_caret.js
+++ b/qutebrowser/javascript/webengine_caret.js
@@ -494,9 +494,6 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     CaretBrowsing.blinkFlag = true;
 
-    CaretBrowsing.isWindows =
-        window.navigator.userAgent.indexOf("Windows") !== -1;
-
     CaretBrowsing.isControlThatNeedsArrowKeys = function(node) { // eslint-disable-line complexity,max-len
         if (!node) {
             return false;
@@ -590,9 +587,9 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         document.body.appendChild(node);
     };
 
-    CaretBrowsing.setInitialCursor = function() {
-        const sel = window.getSelection();
-        if (sel.rangeCount > 0) {
+    CaretBrowsing.setInitialCursor = function(platform) {
+        CaretBrowsing.isWindows = platform === "Windows";
+        if (window.getSelection().rangeCount > 0) {
             return;
         }
 
@@ -960,7 +957,7 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
         CaretBrowsing.isCaretVisible =
             (CaretBrowsing.isEnabled && CaretBrowsing.isWindowFocused);
         if (CaretBrowsing.isCaretVisible && !CaretBrowsing.caretElement) {
-            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.setInitialCursor(CaretBrowsing.isWindows);
             CaretBrowsing.updateCaretOrSelection(true);
             if (CaretBrowsing.caretElement) {
                 CaretBrowsing.blinkFunctionId = window.setInterval(
@@ -1012,9 +1009,9 @@ window._qutebrowser.caret = (function() { // eslint-disable-line max-statements,
 
     const funcs = {};
 
-    funcs.setInitialCursor = () => {
+    funcs.setInitialCursor = (platform) => {
         if (!CaretBrowsing.initiated) {
-            CaretBrowsing.setInitialCursor();
+            CaretBrowsing.setInitialCursor(platform);
             return;
         }