Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: keyboardio/Kaleidoscope
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 325c42ef696ec9438f1748114dc8d93b17e90cdc
Choose a base ref
..
head repository: keyboardio/Kaleidoscope
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 98454064ee7ede8c72f4606c5f609206b0fe9f6f
Choose a head ref
Showing 1,268 changed files with 317,506 additions and 12,277 deletions.
21 changes: 0 additions & 21 deletions src/kaleidoscope/host_keymap/common.h

This file was deleted.

36 changes: 36 additions & 0 deletions src/kaleidoscope/host_keymap/linux.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* Kaleidoscope - Firmware for computer input devices
* Copyright (C) 2013-2018 Keyboard.io, Inc.
*
* This program is free software: you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
* Foundation, version 3.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "kaleidoscope/host_keymap/ascii.h"
#include "kaleidoscope/host_keymap/unicode.h"
#include "kaleidoscope/host_keymap/non_printable.h"

#define HOST_KEYMAP_LINUX( ASCII_KEYMAP, \
UNICODE_KEYMAP, \
NON_PRINTABLE_KEYMAP) \
HOST_KEYMAP_ASCII_CONVERTER( \
ASCII_KEYMAP, \
ascii::CharParsingStandardFallback \
) \
HOST_KEYMAP_UNICODE_CONVERTER( \
UNICODE_KEYMAP, \
unicode::CharParsingStandardFallback \
) \
HOST_KEYMAP_NON_PRINTABLE_CONVERTER( \
NON_PRINTABLE_KEYMAP \
)
32 changes: 12 additions & 20 deletions src/kaleidoscope/host_keymap/linux/af/fa-olpc/keymap.h
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@

#pragma once

#include "kaleidoscope/host_keymap/common.h"
#include "kaleidoscope/host_keymap/linux.h"

// This file was autogenerated by host_keymap.
// Its content is based on information provided by the XKB X11 system
@@ -25,7 +25,7 @@
// layout: af
// variant: fa-olpc

#define _HOST_KEYMAP_ASCII_KEYMAP(OP) \
#define _HOST_KEYMAP_ASCII(OP) \
OP('\b', Key_Backspace) /* XKB_KEY_BackSpace, Back space, back char */ \
OP('\t', Key_Tab) /* XKB_KEY_Tab */ \
OP('\r', Key_Enter) /* XKB_KEY_Return, Return, enter */ \
@@ -61,7 +61,7 @@
OP('}', LSHIFT(Key_LeftBracket)) /* U+007d, XKB_KEY_braceright, RIGHT CURLY BRACKET */ \
OP('', Key_Delete) /* XKB_KEY_Delete, Delete, rubout */ \

#define _HOST_KEYMAP_UNICODE_KEYMAP(OP) \
#define _HOST_KEYMAP_UNICODE(OP) \
OP(L'\b', Key_Backspace) /* XKB_KEY_BackSpace, Back space, back char */ \
OP(L'\t', Key_Tab) /* XKB_KEY_Tab */ \
OP(L'\r', Key_Enter) /* XKB_KEY_Return, Return, enter */ \
@@ -173,7 +173,7 @@
OP(L'', LSHIFT(Key_B)) \
OP(L'', Key_Backtick) \

#define _HOST_KEYMAP_NON_PRINTABLE_KEYMAP(OP) \
#define _HOST_KEYMAP_NON_PRINTABLE(OP) \
OP(XKB_KEY_Alt_L, Key_LeftAlt) /* XKB_KEY_Alt_L, Left alt */ \
OP(XKB_KEY_Alt_R, Key_RightAlt) /* XKB_KEY_Alt_R, Right alt */ \
OP(XKB_KEY_Arabic_gaf, Key_Quote) \
@@ -311,20 +311,12 @@ namespace kaleidoscope {
namespace host_keymap {
namespace linux {
namespace af {
namespace fa - olpc {
namespace fa-olpc {

HOST_KEYMAP_ASCII_CONVERTER(
_HOST_KEYMAP_ASCII_KEYMAP,
ascii::CharParsingStandardFallback
)

HOST_KEYMAP_UNICODE_CONVERTER(
_HOST_KEYMAP_UNICODE_KEYMAP,
unicode::CharParsingStandardFallback
)

HOST_KEYMAP_NON_PRINTABLE_CONVERTER(
_HOST_KEYMAP_NON_PRINTABLE_KEYMAP
HOST_KEYMAP_LINUX(
_HOST_KEYMAP_ASCII,
_HOST_KEYMAP_UNICODE,
_HOST_KEYMAP_NON_PRINTABLE
)

} // namespace fa-olpc
@@ -333,7 +325,7 @@ HOST_KEYMAP_NON_PRINTABLE_CONVERTER(
} // namespace host_keymap
} // namespace kaleidoscope

#undef _HOST_KEYMAP_ASCII_KEYMAP
#undef _HOST_KEYMAP_UNICODE_KEYMAP
#undef _HOST_KEYMAP_NON_PRINTABLE_KEYMAP
#undef _HOST_KEYMAP_ASCII
#undef _HOST_KEYMAP_UNICODE
#undef _HOST_KEYMAP_NON_PRINTABLE

Loading