From 9b163d2feb332107794a0f6e3573afe92c40b7fe Mon Sep 17 00:00:00 2001
From: Nathan Sharfi <me@ngalt.com>
Date: Sun, 1 May 2016 13:55:00 -0700
Subject: [PATCH] =?UTF-8?q?zweihander:=20Add=20=E2=8C=98`,=20=E2=8C=98?=
 =?UTF-8?q?=E2=87=A7`,=20=E2=8C=A5=E2=87=A5,=20=E2=8C=A5=E2=87=A7=E2=87=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../keymaps/zweihander-osx/keymap.c           |  14 +++++++-------
 .../keymaps/zweihander-osx/readme.markdown    |   5 +++++
 .../keymaps/zweihander-osx/zweihander-osx.hex | Bin 51772 -> 51772 bytes
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
index cc94e13337..f53232c3cd 100644
--- a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
@@ -95,9 +95,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 2: Media keys
  *                                                dim             brighten
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |  F14 |           |  F15 |      |      |      |      |      |  Power |
+ * |        |      |      |      |      |      |  F14 |           |  F15 |  ⌘W  | ⌘⇧`  |  ⌘`  | ⌥⇧⇥  |  ⌥⇥  |  Power |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | PgUp |      |      |      |           |      |  ⌘]  |  ⌥⌘↑ |   ↑  |  ⌥⌘↓ |      |        |
+ * |        |      |      | PgUp |      |      |      |           |      |  ⌘]  | ⌥⌘↑  |   ↑  | ⌥⌘↓  |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |        |      | Home | PgDn |  End |      |------|           |------|  ⌘[  |   ←  |   ↓  |   →  |      |    ⏯  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -124,11 +124,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                     KC_TRNS,
                                   KC_TRNS, KC_TRNS, KC_TRNS,
     // right hand
-       KC_F15 ,  KC_TRNS,                           KC_TRNS, KC_TRNS,               KC_TRNS, KC_TRNS, KC_PWR,
-       KC_TRNS,  LGUI(KC_RBRC), LGUI(LALT(KC_UP)),  KC_UP  , LGUI(LALT(KC_DOWN)),   KC_TRNS, KC_TRNS,
-                 LGUI(KC_LBRC), KC_LEFT,            KC_DOWN, KC_RGHT,               KC_TRNS, KC_MPLY,
-       KC_TRNS,  LSFT(KC_SPC),  KC_SPC ,            KC_MPRV, KC_MNXT,               KC_TRNS, KC_TRNS,
-                                KC_VOLU,            KC_VOLD, KC_MUTE,               KC_TRNS, KC_TRNS,
+       KC_F15 ,  LGUI(KC_W),    LGUI(LSFT(KC_GRV)), LGUI(KC_GRV),   LALT(LSFT(KC_TAB)),     LALT(KC_TAB),   KC_PWR,
+       KC_TRNS,  LGUI(KC_RBRC), LGUI(LALT(KC_UP)),  KC_UP  ,        LGUI(LALT(KC_DOWN)),    KC_TRNS,        KC_TRNS,
+                 LGUI(KC_LBRC), KC_LEFT,            KC_DOWN,        KC_RGHT,                KC_TRNS,        KC_MPLY,
+       KC_TRNS,  LSFT(KC_SPC),  KC_SPC ,            KC_MPRV,        KC_MNXT,                KC_TRNS,        KC_TRNS,
+                                KC_VOLU,            KC_VOLD,        KC_MUTE,                KC_TRNS,        KC_TRNS,
        KC_TRNS, KC_TRNS,
        KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown
index 8103c6b327..7bce7c6909 100644
--- a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown
+++ b/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown
@@ -1,5 +1,7 @@
 # The Zweihander Layout
 
+NB: the backtick (\`) is special in Markdown. If I write ⌘\` in this readme, I mean “command-backtick”, not “command-backslash-backtick”.
+
 This layout is tuned for people who…
 
 
@@ -12,10 +14,13 @@ This layout doesn’t make any concessions for Windows use. While it should work
 
 I tend to have my mouse in my left hand, but I like to use my other hand to make things go faster. I’ve added a bunch of buttons to the media layer to speed up browsing in Safari and Finder:
 
+- Close Window (⌘W)
 - Back (⌘[)
 - Forward (⌘])
 - Open and Close Parent Folder (⌥⌘↓)
 - Go Up and Close Just-Left Folder (⌥⌘↑)
+- Cycle through open windows in current application (⌘\` and ⌘⇧\`)
+- Cycle through tabs in current window (⌥⇥ and ⌥⇧⇥)
 - Space (page down in browsers; Quick Look in the Finder)
 - Shift-Space (page up in web browsers)
 
diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex b/keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
index 9b783c957c89c80b8caae9e9f5d35946b5556f38..3e313c3724e7b5d37fb688cd68a2a680af8ba60f 100644
GIT binary patch
delta 139
zcmdlpg?Y~u<_&J_?uL#A7RCk!7DjGB>}+6U00M>v29_?oTvkBZ$PvglHZ^cGH8OBE
z1+syP3>+;Xih$x4Kyd>%=gGb7(wat224<#)2F@mKKqXE<C9Y62fLaV3Eg*V;icBUa
PvWYO68g72h9(o7>$DJSv

delta 129
zcmdlpg?Y~u<_&J_?goYi2F3;k7DjGB>}+6U00KZUCs$rBD<Ey;2o*3jGH^BpvVn>W
z94#S=Knj842Igjyd)cMs!CXTFXA?J|5+|U!Ff)K!3>+;c$Fs>XnY(R%&K`OQ0EONi
Ay#N3J