From 38354ff713b873ca4adae0eb949e2345c3f20428 Mon Sep 17 00:00:00 2001
From: breadcat
Date: Thu, 28 May 2015 20:47:36 +0100
Subject: Small tidy up

---
 ahk-assistant.ahk |  8 +++++---
 functions.ahk     | 48 +++++++++++++++---------------------------------
 2 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/ahk-assistant.ahk b/ahk-assistant.ahk
index 36bc389..6b709c6 100644
--- a/ahk-assistant.ahk
+++ b/ahk-assistant.ahk
@@ -181,7 +181,7 @@ Ralt & e::typeAcuteE() ;awful, awful workaround
 
 #IfWinActive ahk_class ShockwaveFlashFullScreen ;full screen flash
   Ralt & Enter:: ;overflow
-  Alt & Enter::flashFullscreen() ;leave flash full screen with a keyboard command
+  Alt & Enter::toggleFullscreen() ;leave flash full screen with a keyboard command
 #IfWinActive
 
 #IfWinActive ahk_class FontViewWClass ;font previewer
@@ -261,11 +261,13 @@ Ralt & e::typeAcuteE() ;awful, awful workaround
   ^!d::Send ^j ;why Downloads is ctrl+j while addons is ctrl+alt+a will never make sense
   ^d::Send ^f ;bookmark remapped to find
   ^b::Send ^v ;replace bookmarks with paste
-  f6::Send ^l ;F6 jumps to address bar
-  ^+o::Send {AltDown}t<{AltUp}o ;ctrl+shift+o option
+  F6::Send ^l ;F6 jumps to address bar
+  ^+o::Send !to ;C-S-o options
   #o::Send, ^c^t^v{Enter} ;copy selected uri and open, right click option fails to recognise ~50% of what I try
   +PgDn::Send {Space 4}{Down 7} ;scroll down to specific part of a specific page, not really
   +PgUp::Send {Home} ;makes sense, kinda
+  Ralt & Enter:: ;overflow
+  Alt & Enter::toggleFullscreen() ;leave flash full screen with a keyboard command
 #IfWinActive
 
 #IfWinActive ahk_class MSPaintApp ;mspaint
diff --git a/functions.ahk b/functions.ahk
index 0e66990..652f1f3 100644
--- a/functions.ahk
+++ b/functions.ahk
@@ -156,7 +156,7 @@ cmdPaste() { ;C-v / S-insert pastes into cmd
     Return
   }
 
-flashFullscreen() { ;double click the window
+toggleFullscreen() { ;double click the window
     CoordMode, Mouse, Relative
     MouseMove, 250, 250
     Send {Click 2}
@@ -265,41 +265,23 @@ usePlaybackDevice(device) {
   }
 
 winSplit() { ;split active and previous window side by side, press again to swap positions
-    splitToggle := !splitToggle
-    If (splitToggle = "1") {
-        Tile("R")
-        Sleep, 15
-        Send {AltDown}{Tab}{AltUp}
-        Sleep, 10
-        Tile("L")
-        Sleep, 15
-        Send {AltDown}{Tab}{AltUp}
-      }
-    Else {
-        Send {AltDown}{Tab}{AltUp}
-        Sleep, 10
-        winSplit()
-      }
-    Return
+    Tile("R")
+    Sleep, 15
+    Send {AltDown}{Tab}{AltUp}
+    Sleep, 10
+    Tile("L")
+    Sleep, 15
+    Send {AltDown}{Tab}{AltUp}
   }
 
 winSplitH() { ;split active and previous window on top of each other, press again to swap positions
-    splitToggleH := !splitToggleH
-    If (splitToggleH = "1") {
-        Tile("T")
-        Sleep, 15
-        Send {AltDown}{Tab}{AltUp}
-        Sleep, 10
-        Tile("B")
-        Sleep, 15
-        Send {AltDown}{Tab}{AltUp}
-      }
-    Else {
-        Send {AltDown}{Tab}{AltUp}
-        Sleep, 10
-        winSplitH()
-      }
-    Return
+    Tile("T")
+    Sleep, 15
+    Send {AltDown}{Tab}{AltUp}
+    Sleep, 10
+    Tile("B")
+    Sleep, 15
+    Send {AltDown}{Tab}{AltUp}
   }
 
 kdeMove() { ;kde-windows (Easy Window Dragging -- KDE style (requires XP/2k/NT) -- by Jonny)
-- 
cgit v1.2.3