From cf59d80a5a4fe46def51a914edeeb57e8056f3e8 Mon Sep 17 00:00:00 2001
From: Dmitry Sadovnychyi <dyriax@gmail.com>
Date: Tue, 25 Aug 2015 14:13:06 +0800
Subject: [PATCH 1/2] Change cursor style on crosshair while selecting

#12
---
 lib/sublime-select.coffee | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/sublime-select.coffee b/lib/sublime-select.coffee
index 6577dde..4db72dc 100644
--- a/lib/sublime-select.coffee
+++ b/lib/sublime-select.coffee
@@ -3,21 +3,25 @@ os = require 'os'
 inputCfg = switch os.platform()
   when 'win32'
     selectKey: 'altKey'
+    selectIdentifier: 'Alt'
     mainMouseNum: 1
     middleMouseNum: 2
     enableMiddleMouse: true
   when 'darwin'
     selectKey: 'altKey'
+    selectIdentifier: 'Alt'
     mainMouseNum: 1
     middleMouseNum: 2
     enableMiddleMouse: true
   when 'linux'
     selectKey: 'shiftKey'
+    selectIdentifier: 'Shift'
     mainMouseNum: 2
     middleMouseNum: 2
     enableMiddleMouse: false
   else
     selectKey: 'shiftKey'
+    selectIdentifier: 'Shift'
     mainMouseNum: 2
     middleMouseNum: 2
     enableMiddleMouse: false
@@ -65,6 +69,15 @@ module.exports =
         if e.which == 0
           resetState()
 
+    onKeyDown = (e) ->
+      if e['keyIdentifier'] == inputCfg.selectIdentifier and e['type'] == 'keydown'
+        editorElement.shadowRoot.querySelector(
+          '.lines').style.cursor = 'crosshair'
+
+    onKeyUp = (e) ->
+      if e['keyIdentifier'] == inputCfg.selectIdentifier and e['type'] == 'keyup'
+        editorElement.shadowRoot.querySelector('.lines').style.cursor = ''
+
     # Hijack all the mouse events while selecting
     hijackMouseEvent = (e) ->
       if mouseStartPos
@@ -100,9 +113,6 @@ module.exports =
     _mainMouseDown = (e) ->
       e.which is inputCfg.mainMouseNum
 
-    _keyDown = (e) ->
-      e[inputCfg.selectKey]
-
     _mainMouseAndKeyDown = (e) ->
       _mainMouseDown(e) and e[inputCfg.selectKey]
 
@@ -132,6 +142,8 @@ module.exports =
     editor.onDidChangeSelectionRange onRangeChange
     editorElement.onmousedown   = onMouseDown
     editorElement.onmousemove   = onMouseMove
+    editorElement.onkeydown     = onKeyDown
+    editorElement.onkeyup       = onKeyUp
     editorElement.onmouseup     = hijackMouseEvent
     editorElement.onmouseleave  = hijackMouseEvent
     editorElement.onmouseenter  = hijackMouseEvent

From 0a98f24d8be732c0d57c434495287d8964998cc8 Mon Sep 17 00:00:00 2001
From: Dmitry Sadovnychyi <git@dmit.ro>
Date: Fri, 15 Jan 2016 10:42:41 +0800
Subject: [PATCH 2/2] Remove merge comment

---
 lib/sublime-select.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/sublime-select.coffee b/lib/sublime-select.coffee
index 249f1be..0fe34a2 100644
--- a/lib/sublime-select.coffee
+++ b/lib/sublime-select.coffee
@@ -35,7 +35,6 @@ selectKeyMap =
   Ctrl: 'ctrlKey'
 
 inputCfg = defaultCfg
-# >>>>>>> bigfive/master
 
 module.exports =
   config: