Base commit

6 files changed, 391 insertions, 0 deletions

diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..668c6417858d
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,22 @@
+pkgbase = xkeyboard-config-hhk
+	pkgdesc = X keyboard configuration files with a patch for a layout emulating a happy hacking keyboard
+	pkgver = 2.15
+	pkgrel = 1
+	url = http://www.freedesktop.org/wiki/Software/XKeyboardConfig
+	arch = any
+	license = custom
+	makedepends = intltool
+	makedepends = xorg-xkbcomp
+	provides = xkeyboard-config
+	provides = xkbdata
+	conflicts = xkeyboard-config
+	conflicts = xkbdata
+	replaces = xkeyboard-config
+	replaces = xkbdata
+	source = http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-2.15.tar.bz2
+	source = hhk.patch
+	sha256sums = 0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf
+	sha256sums = 2bfa71b4297156bf948abea8c7bcd5b7c24986e3bbac7dbe5662ae7c1ea6cff0
+
+pkgname = xkeyboard-config-hhk
+
diff --git a/30-keyboard.conf b/30-keyboard.conf
new file mode 100644
index 000000000000..2f99f348b862
--- /dev/null
+++ b/30-keyboard.conf
@@ -0,0 +1,9 @@
+Section "InputClass"
+	Identifier "Happily Hacked Keyboard"
+	MatchDevicePath "/dev/input/event*"
+	MatchIsKeyboard "on"
+	Driver "evdev"
+
+	Option "XkbLayout" "us"
+	Option "XkbVariant" "hhk"
+EndSection
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..ad410e113021
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..87f30ec0a3c6
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 213730 2014-05-28 19:24:41Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xkeyboard-config-hhk
+pkgver=2.15
+pkgrel=1
+pkgdesc="X keyboard configuration files with a patch for a layout emulating a happy hacking keyboard"
+arch=(any)
+license=('custom')
+url="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
+makedepends=('intltool' 'xorg-xkbcomp')
+provides=('xkeyboard-config' 'xkbdata')
+replaces=('xkeyboard-config' 'xkbdata')
+conflicts=('xkeyboard-config' 'xkbdata')
+source=(
+	http://xorg.freedesktop.org/archive/individual/data/${pkgname/-hhk/}/${pkgname/-hhk/}-${pkgver}.tar.bz2
+    hhk.patch
+)
+sha256sums=('0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf'
+'2bfa71b4297156bf948abea8c7bcd5b7c24986e3bbac7dbe5662ae7c1ea6cff0')
+
+prepare() {
+	cd ${srcdir}/${pkgname/-hhk/}-${pkgver}
+	patch -p1 < ${startdir}/hhk.patch
+}
+
+build() {
+	cd ${srcdir}/${pkgname/-hhk/}-${pkgver}
+
+  ./configure --prefix=/usr \
+      --with-xkb-base=/usr/share/X11/xkb \
+      --with-xkb-rules-symlink=xorg \
+      --enable-compat-rules=yes
+  make
+ }
+ 
+ package() { 
+	cd ${srcdir}/${pkgname/-hhk/}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/share/X11/xkb/compiled"
+
+  install -m755 -d "${pkgdir}/var/lib/xkb"
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/README.md b/README.md
new file mode 100644
index 000000000000..9b5da8ba60d9
--- /dev/null
+++ b/README.md
@@ -0,0 +1,43 @@
+hhk-emulate
+===========
+A xkb keyboard layout that emulates the layout of the happy hacking keyboard
+
+Installation
+------------
+
+###Arch users
+Install the package `xkeyboard-config-hhk` from the AUR
+
+###Everyone else
+  1. Download xkeyboard-config
+
+  2. Apply `hhk.patch`
+
+  3. `./configure` and `make`
+
+  4. `make install` or just replace the patch affected files
+
+Usage
+-----
+To temporarily change your layout:
+
+  setxkbmap -layout us -variant hhk
+
+To change your layout on boot create a new file in `/etc/X11/xorg.conf.d/` named something like `30-keyboard.conf` with contents similar to:
+```
+Section "InputClass"
+  Identifier "Happily Hacked Keyboard"
+  MatchDevicePath "/dev/input/event*"
+  MatchIsKeyboard "on"
+  Driver "evdev"
+
+	 Option "XkbLayout" "us"
+  Option "XkbVariant" "hhk"
+EndSection
+```
+
+Contribute
+----------
+If you find anything that could use improving, submit a pull request or create
+an issue.
+
diff --git a/hhk.patch b/hhk.patch
new file mode 100644
index 000000000000..bdee571aa4db
--- /dev/null
+++ b/hhk.patch
@@ -0,0 +1,69 @@
+diff --git a/rules/base.xml.in b/rules/base.xml.in
+index 0b0c148..ffd8897 100644
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -1387,6 +1387,18 @@
+         </variant>
+         <variant>
+           <configItem>
++            <name>hhk</name>
++            <_description>English (Happy Hacking Keyboard)</_description>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++           <name>hhk_mac</name>
++           <_description>English (Happy Hacking Keyboard for Macs)</_description>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
+             <name>rus</name>
+             <!-- Keyboard indicator for Russian layouts -->
+             <_shortDescription>ru</_shortDescription>
+diff --git a/rules/evdev.xml.in b/rules/evdev.xml.in
+index 0b0c148..4be6928 100644
+--- a/rules/evdev.xml.in
++++ b/rules/evdev.xml.in
+@@ -1386,6 +1386,18 @@
+           </configItem>
+         </variant>
+         <variant>
++		  <configItem>
++            <name>hhk</name>
++            <_description>English (Happy Hacking Keyboard)</_description>
++          </configItem>
++        </variant>
++        <variant>
++          <configItem>
++           <name>hhk_mac</name>
++           <_description>English (Happy Hacking Keyboard for Macs)</_description>
++          </configItem>
++        </variant>
++        <variant>
+           <configItem>
+             <name>rus</name>
+             <!-- Keyboard indicator for Russian layouts -->
+diff --git a/symbols/us b/symbols/us
+index d5a6c18..4b5b8e4 100644
+--- a/symbols/us
++++ b/symbols/us
+@@ -1561,3 +1561,18 @@ partial alphanumeric_keys
+ 	xkb_symbols "sun_type6" {
+ 	include "sun_vndr/us(sun_type6)"
+ };
++
++partial alphanumeric_keys
++xkb_symbols "hhk_mac" {
++       include "us(basic)"
++       include "ctrl(swapcaps)"
++       key <BKSL> {    [ BackSpace, BackSpace  ]       };
++       key <BKSP> {    [ backslash,    bar     ]       };
++       name[Group1]= "English (US, Happy Hacking Keyboard)";
++};
++
++partial alphanumeric_keys
++xkb_symbols "hhk" {
++       include "us(hhk_mac)"
++       include "altwin(swap_alt_win)"
++};