From bf09ac712316a98e1cceef82968bec252782e9ff Mon Sep 17 00:00:00 2001 From: Anton Anikin Date: Thu, 27 Feb 2025 16:22:54 +0800 Subject: [PATCH] clang-format --- .clang-format | 198 ++++++++++++++++++++ src/keycode.c | 491 ++++++++++++++++++++++++++++++++------------------ src/keycode.h | 36 ++-- 3 files changed, 534 insertions(+), 191 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..54c368e --- /dev/null +++ b/.clang-format @@ -0,0 +1,198 @@ +# # https://clang.llvm.org/docs/ClangFormatStyleOptions.html +# # https://clang-format-configurator.site + +IndentWidth: 4 +TabWidth: 4 +UseTab: Never +ColumnLimit: 80 + +AlignAfterOpenBracket: AlwaysBreak # Align, DontAlign, AlwaysBreak, BlockIndent +AlignArrayOfStructures: Right # Left, Right +AlignConsecutiveAssignments: + Enabled: true + AcrossEmptyLines: false + AcrossComments: true + AlignCompound: true + PadOperators: true +AlignConsecutiveBitFields: + Enabled: true + AcrossEmptyLines: false + AcrossComments: true + AlignCompound: true + PadOperators: true +AlignConsecutiveDeclarations: None +AlignConsecutiveMacros: + Enabled: true + AcrossEmptyLines: false + AcrossComments: true + AlignCompound: true + PadOperators: true +AlignEscapedNewlines: Right # DontAlign, Left, Right + +AllowShortCaseLabelsOnASingleLine: true +AlignConsecutiveShortCaseStatements: # AllowShortCaseLabelsOnASingleLine: true + Enabled: false + +BreakBeforeBinaryOperators: true +AlignOperands: AlignAfterOperator # Align, AlignAfterOperator + +AlignTrailingComments: + Kind: Always # Leave, Always, Never + OverEmptyLines: 1 + +AllowShortBlocksOnASingleLine: Never # Never, Empty, Always +AllowShortEnumsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None # None, InlineOnly, Empty, Inline, All +AllowShortIfStatementsOnASingleLine: Never # Never, WithoutElse, OnlyFirstIf, AllIfsAndElse +AllowShortLambdasOnASingleLine: None # None, Empty, Inline, All +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterReturnType: All # None, All, TopLevel, AllDefinitions, TopLevelDefinitions +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: Yes # No, MultiLine, Yes + +# AttributeMacros # TODO + +AllowAllArgumentsOnNextLine: false +AllowAllParametersOfDeclarationOnNextLine: false +BinPackArguments: false +BinPackParameters: false + +BitFieldColonSpacing: Both # Both, None, Before, After + +BreakBeforeBraces: Custom +BraceWrapping: + AfterCaseLabel: false + AfterClass: true + AfterControlStatement: MultiLine # Never, MultiLine, Always + AfterEnum: true + AfterFunction: true + AfterNamespace: false + AfterStruct: true + AfterUnion: true + AfterExternBlock: false + BeforeCatch: true + BeforeElse: true + BeforeLambdaBody: false + BeforeWhile: false + IndentBraces: false + SplitEmptyFunction: true + SplitEmptyRecord: true + SplitEmptyNamespace: true + +# BracedInitializerIndentWidth: 4 +BreakAfterAttributes: Always # Always, Leave, Never +# BreakBeforeBinaryOperators # TODO +# BreakBeforeConceptDeclarations # TODO +# BreakBeforeInlineASMColon # TODO +BreakBeforeTernaryOperators: true + +ConstructorInitializerIndentWidth: 2 +BreakConstructorInitializers: BeforeComma # BeforeColon, BeforeComma, AfterColon +BreakInheritanceList: BeforeComma # BeforeColon, BeforeComma, AfterColon, AfterComma + +BreakStringLiterals: true +# ColumnLimit # TODO +# CommentPragmas # TODO +CompactNamespaces: false +# ContinuationIndentWidth: 4 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +# DisableFormat: false +EmptyLineAfterAccessModifier: Never # Never, Leave, Always +EmptyLineBeforeAccessModifier: Always # Never, Leave, LogicalBlock, Always +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: true +# ForEachMacros: +# IfMacros: +IncludeBlocks: Preserve # Preserve, Merge, Regroup +# IncludeCategories: # TODO +# IncludeIsMainRegex +# IncludeIsMainSourceRegex + +AccessModifierOffset: -2 +IndentAccessModifiers: false +IndentCaseBlocks: false +IndentCaseLabels: true +IndentExternBlock: NoIndent # AfterExternBlock, NoIndent, Indent +IndentGotoLabels: false +IndentPPDirectives: None # None, AfterHash, BeforeHash +IndentRequiresClause: true # C++ +# IndentWrappedFunctionNames: false +InsertBraces: true +InsertNewlineAtEOF: true +# InsertTrailingCommas: #TODO + +# works only for C++14 and C23 +# IntegerLiteralSeparator: +# Binary: 4 +# Decimal: 3 +# Hex: 2 +IntegerLiteralSeparator: + Binary: -1 + Decimal: -1 + Hex: -1 + +KeepEmptyLinesAtEOF: false +KeepEmptyLinesAtTheStartOfBlocks: false +LambdaBodyIndentation: Signature # Signature, OuterScope +# LineEnding: +# MacroBlockBegin: +# MacroBlockEnd: +# Macros: +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: None # None, Inner, All +# NamespaceMacros: +PPIndentWidth: -1 +PackConstructorInitializers: Never # Never, BinPack, CurrentLine, NextLine, NextLineOnly +# PenaltyBreakAssignment: +# PenaltyBreakBeforeFirstCallParameter: +# PenaltyBreakComment +# PenaltyBreakFirstLessLess +# PenaltyBreakOpenParenthesis +# PenaltyBreakString +# PenaltyBreakTemplateDeclaration +# PenaltyExcessCharacter +# PenaltyIndentedWhitespace +# PenaltyReturnTypeOnItsOwnLine +PointerAlignment: Left +QualifierAlignment: Left +# QualifierOrder: TODO +# RawStringFormats: +ReferenceAlignment: Left +ReflowComments: true +RemoveBracesLLVM: false +RemoveParentheses: ReturnStatement +RemoveSemicolon: true +# RequiresClausePositionStyle: # TODO, C++ +# RequiresExpressionIndentation: # TODO, C++ +SeparateDefinitionBlocks: Always +# ShortNamespaceLines: 1 +SortIncludes: CaseSensitive +SortUsingDeclarations: LexicographicNumeric +SpaceAfterCStyleCast: false +SpaceAfterLogicalNot: false +SpaceAfterTemplateKeyword: true +SpaceAroundPointerQualifiers: Default +SpaceBeforeAssignmentOperators: true +SpaceBeforeCaseColon: false +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeParens: ControlStatements +SpaceBeforeRangeBasedForLoopColon: true +SpaceBeforeSquareBrackets: false +SpaceInEmptyBlock: false +SpacesBeforeTrailingComments: 2 +SpacesInAngles: Never +SpacesInContainerLiterals: false +SpacesInLineCommentPrefix: + Minimum: 1 + Maximum: -1 +SpacesInParens: Never +# SpacesInParensOptions: +SpacesInSquareBrackets: false +# StatementAttributeLikeMacros: +# StatementMacros: +# TypeNames: +# TypenameMacros: +# WhitespaceSensitiveMacros: diff --git a/src/keycode.c b/src/keycode.c index a90f81d..f03739a 100644 --- a/src/keycode.c +++ b/src/keycode.c @@ -6,12 +6,12 @@ // http://forum.shelek.ru/index.php/topic,9792.0.html #include -#include #include +#include #include void -save_termsettings(struct termios *original_settings) +save_termsettings(struct termios* original_settings) { // man tcsetattr struct termios new_settings; @@ -21,7 +21,7 @@ save_termsettings(struct termios *original_settings) // Disable canonical mode, and set buffer size to 1 byte new_settings.c_lflag &= (~ICANON); - //new_settings.c_lflag &= ICANON; + // new_settings.c_lflag &= ICANON; // Timeout in deciseconds for noncanonical read new_settings.c_cc[VTIME] = 0; @@ -36,7 +36,7 @@ save_termsettings(struct termios *original_settings) } void -restore_termsettings(const struct termios *original_settings) +restore_termsettings(const struct termios* original_settings) { tcsetattr(0, TCSANOW, original_settings); } @@ -51,19 +51,19 @@ keycode() save_termsettings(&original_settings); - int len = 1; + int len = 1; int code = 0; buffer[0] = getchar(); if (buffer[0] == KEY_ESC) { - //printf("ESC in\n"); + // printf("ESC in\n"); struct termios current_settings; tcgetattr(0, ¤t_settings); current_settings.c_cc[VMIN] = 0; tcsetattr(0, TCSANOW, ¤t_settings); - while ((buffer[len] = getchar()) > 0) { - //printf("ESC_go; code = %3d\n", buffer[len]); + while ((buffer[len] = getchar()) > 0) { + // printf("ESC_go; code = %3d\n", buffer[len]); len++; } clearerr(stdin); @@ -74,7 +74,8 @@ keycode() if (len == 1) { code = buffer[0]; - } else { + } + else { /*if (code == 0) { printf("len = %d\n", len); for (int i = 0; i < len; i++) { @@ -84,38 +85,114 @@ keycode() }*/ // ugly code - if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 65)) code = KEY_UP; - if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 66)) code = KEY_DOWN; - if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 67)) code = KEY_RIGHT; - if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 68)) code = KEY_LEFT; + if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 65)) { + code = KEY_UP; + } + if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 66)) { + code = KEY_DOWN; + } + if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 67)) { + code = KEY_RIGHT; + } + if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 68)) { + code = KEY_LEFT; + } - if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 72)) code = KEY_HOME; - if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 70)) code = KEY_END; + if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 72)) { + code = KEY_HOME; + } + if ((len == 3) && (buffer[1] == 91) && (buffer[2] == 70)) { + code = KEY_END; + } // inside tmux on ubuntu 20.04 - if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 126)) code = KEY_HOME; - if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 52) && (buffer[3] == 126)) code = KEY_END; + if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 49) + && (buffer[3] == 126)) + { + code = KEY_HOME; + } + if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 52) + && (buffer[3] == 126)) + { + code = KEY_END; + } - if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 126)) code = KEY_INS; - if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 51) && (buffer[3] == 126)) code = KEY_DEL; + if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 50) + && (buffer[3] == 126)) + { + code = KEY_INS; + } + if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 51) + && (buffer[3] == 126)) + { + code = KEY_DEL; + } - if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 53) && (buffer[3] == 126)) code = KEY_PGUP; - if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 54) && (buffer[3] == 126)) code = KEY_PGDN; + if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 53) + && (buffer[3] == 126)) + { + code = KEY_PGUP; + } + if ((len == 4) && (buffer[1] == 91) && (buffer[2] == 54) + && (buffer[3] == 126)) + { + code = KEY_PGDN; + } - if ((len == 3) && (buffer[1] == 79) && (buffer[2] == 80)) code = KEY_F1; - if ((len == 3) && (buffer[1] == 79) && (buffer[2] == 81)) code = KEY_F2; - if ((len == 3) && (buffer[1] == 79) && (buffer[2] == 82)) code = KEY_F3; - if ((len == 3) && (buffer[1] == 79) && (buffer[2] == 83)) code = KEY_F4; + if ((len == 3) && (buffer[1] == 79) && (buffer[2] == 80)) { + code = KEY_F1; + } + if ((len == 3) && (buffer[1] == 79) && (buffer[2] == 81)) { + code = KEY_F2; + } + if ((len == 3) && (buffer[1] == 79) && (buffer[2] == 82)) { + code = KEY_F3; + } + if ((len == 3) && (buffer[1] == 79) && (buffer[2] == 83)) { + code = KEY_F4; + } - if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 53) && (buffer[4] == 126)) code = KEY_F5; - if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 55) && (buffer[4] == 126)) code = KEY_F6; - if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 56) && (buffer[4] == 126)) code = KEY_F7; - if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 57) && (buffer[4] == 126)) code = KEY_F8; + if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 49) + && (buffer[3] == 53) && (buffer[4] == 126)) + { + code = KEY_F5; + } + if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 49) + && (buffer[3] == 55) && (buffer[4] == 126)) + { + code = KEY_F6; + } + if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 49) + && (buffer[3] == 56) && (buffer[4] == 126)) + { + code = KEY_F7; + } + if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 49) + && (buffer[3] == 57) && (buffer[4] == 126)) + { + code = KEY_F8; + } - if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 48) && (buffer[4] == 126)) code = KEY_F9; - if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 49) && (buffer[4] == 126)) code = KEY_F10; - if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 51) && (buffer[4] == 126)) code = KEY_F11; - if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 52) && (buffer[4] == 126)) code = KEY_F12; + if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 50) + && (buffer[3] == 48) && (buffer[4] == 126)) + { + code = KEY_F9; + } + if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 50) + && (buffer[3] == 49) && (buffer[4] == 126)) + { + code = KEY_F10; + } + if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 50) + && (buffer[3] == 51) && (buffer[4] == 126)) + { + code = KEY_F11; + } + if ((len == 5) && (buffer[1] == 91) && (buffer[2] == 50) + && (buffer[3] == 52) && (buffer[4] == 126)) + { + code = KEY_F12; + } /*if (code == 0) { printf("len = %d\n", len); @@ -144,7 +221,7 @@ keycode() int buffer[10]; char len = 1; - int code = -1; + int code = -1; buffer[0] = getchar(); @@ -154,43 +231,120 @@ keycode() len++; if (len == 2) { - if (buffer[1] == KEY_ESC) + if (buffer[1] == KEY_ESC) { code = KEY_ESC; - else if ((buffer[1] != 79) && (buffer[1] != 91)) + } + else if ((buffer[1] != 79) && (buffer[1] != 91)) { code = 0; - } else if (len == 3) { - if ((buffer[1] == 91) && (buffer[2] == 65)) code = KEY_UP; - if ((buffer[1] == 91) && (buffer[2] == 66)) code = KEY_DOWN; - if ((buffer[1] == 91) && (buffer[2] == 67)) code = KEY_RIGHT; - if ((buffer[1] == 91) && (buffer[2] == 68)) code = KEY_LEFT; + } + } + else if (len == 3) { + if ((buffer[1] == 91) && (buffer[2] == 65)) { + code = KEY_UP; + } + if ((buffer[1] == 91) && (buffer[2] == 66)) { + code = KEY_DOWN; + } + if ((buffer[1] == 91) && (buffer[2] == 67)) { + code = KEY_RIGHT; + } + if ((buffer[1] == 91) && (buffer[2] == 68)) { + code = KEY_LEFT; + } - if ((buffer[1] == 91) && (buffer[2] == 72)) code = KEY_HOME; - if ((buffer[1] == 91) && (buffer[2] == 70)) code = KEY_END; + if ((buffer[1] == 91) && (buffer[2] == 72)) { + code = KEY_HOME; + } + if ((buffer[1] == 91) && (buffer[2] == 70)) { + code = KEY_END; + } - if ((buffer[1] == 79) && (buffer[2] == 80)) code = KEY_F1; - if ((buffer[1] == 79) && (buffer[2] == 81)) code = KEY_F2; - if ((buffer[1] == 79) && (buffer[2] == 82)) code = KEY_F3; - if ((buffer[1] == 79) && (buffer[2] == 83)) code = KEY_F4; - } else if (len == 4) { - if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 126)) code = KEY_INS; - if ((buffer[1] == 91) && (buffer[2] == 51) && (buffer[3] == 126)) code = KEY_DEL; + if ((buffer[1] == 79) && (buffer[2] == 80)) { + code = KEY_F1; + } + if ((buffer[1] == 79) && (buffer[2] == 81)) { + code = KEY_F2; + } + if ((buffer[1] == 79) && (buffer[2] == 82)) { + code = KEY_F3; + } + if ((buffer[1] == 79) && (buffer[2] == 83)) { + code = KEY_F4; + } + } + else if (len == 4) { + if ((buffer[1] == 91) && (buffer[2] == 50) + && (buffer[3] == 126)) + { + code = KEY_INS; + } + if ((buffer[1] == 91) && (buffer[2] == 51) + && (buffer[3] == 126)) + { + code = KEY_DEL; + } - if ((buffer[1] == 91) && (buffer[2] == 53) && (buffer[3] == 126)) code = KEY_PGUP; - if ((buffer[1] == 91) && (buffer[2] == 54) && (buffer[3] == 126)) code = KEY_PGDN; - } else if (len == 5) { - if ((buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 53) && (buffer[4] == 126)) code = KEY_F5; - if ((buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 55) && (buffer[4] == 126)) code = KEY_F6; - if ((buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 56) && (buffer[4] == 126)) code = KEY_F7; - if ((buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 57) && (buffer[4] == 126)) code = KEY_F8; + if ((buffer[1] == 91) && (buffer[2] == 53) + && (buffer[3] == 126)) + { + code = KEY_PGUP; + } + if ((buffer[1] == 91) && (buffer[2] == 54) + && (buffer[3] == 126)) + { + code = KEY_PGDN; + } + } + else if (len == 5) { + if ((buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 53) + && (buffer[4] == 126)) + { + code = KEY_F5; + } + if ((buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 55) + && (buffer[4] == 126)) + { + code = KEY_F6; + } + if ((buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 56) + && (buffer[4] == 126)) + { + code = KEY_F7; + } + if ((buffer[1] == 91) && (buffer[2] == 49) && (buffer[3] == 57) + && (buffer[4] == 126)) + { + code = KEY_F8; + } - if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 48) && (buffer[4] == 126)) code = KEY_F9; - if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 49) && (buffer[4] == 126)) code = KEY_F10; - if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 51) && (buffer[4] == 126)) code = KEY_F11; - if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 52) && (buffer[4] == 126)) code = KEY_F12; - } else + if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 48) + && (buffer[4] == 126)) + { + code = KEY_F9; + } + if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 49) + && (buffer[4] == 126)) + { + code = KEY_F10; + } + if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 51) + && (buffer[4] == 126)) + { + code = KEY_F11; + } + if ((buffer[1] == 91) && (buffer[2] == 50) && (buffer[3] == 52) + && (buffer[4] == 126)) + { + code = KEY_F12; + } + } + else { code = 0; + } - if (code >= 0) break; + if (code >= 0) { + break; + } } } @@ -215,43 +369,89 @@ int keycode() { int code = -1; - int key = getch(); + int key = getch(); if (key == 0) { key = getch(); - //printf("(%3d;%3d) ", 0, key); + // printf("(%3d;%3d) ", 0, key); - if (key == 59) code = KEY_F1; - if (key == 60) code = KEY_F2; - if (key == 61) code = KEY_F3; - if (key == 62) code = KEY_F4; - if (key == 63) code = KEY_F5; - if (key == 64) code = KEY_F6; - if (key == 65) code = KEY_F7; - if (key == 66) code = KEY_F8; - if (key == 67) code = KEY_F9; - if (key == 68) code = KEY_F10; - } else if (key == 224) { + if (key == 59) { + code = KEY_F1; + } + if (key == 60) { + code = KEY_F2; + } + if (key == 61) { + code = KEY_F3; + } + if (key == 62) { + code = KEY_F4; + } + if (key == 63) { + code = KEY_F5; + } + if (key == 64) { + code = KEY_F6; + } + if (key == 65) { + code = KEY_F7; + } + if (key == 66) { + code = KEY_F8; + } + if (key == 67) { + code = KEY_F9; + } + if (key == 68) { + code = KEY_F10; + } + } + else if (key == 224) { key = keycode(); - //printf("(%3d;%3d) ", 224, key); + // printf("(%3d;%3d) ", 224, key); - if (key == 133) code = KEY_F11; - if (key == 134) code = KEY_F12; + if (key == 133) { + code = KEY_F11; + } + if (key == 134) { + code = KEY_F12; + } - if (key == 82) code = KEY_INS; - if (key == 83) code = KEY_DEL; + if (key == 82) { + code = KEY_INS; + } + if (key == 83) { + code = KEY_DEL; + } - if (key == 71) code = KEY_HOME; - if (key == 79) code = KEY_END; + if (key == 71) { + code = KEY_HOME; + } + if (key == 79) { + code = KEY_END; + } - if (key == 73) code = KEY_PGUP; - if (key == 81) code = KEY_PGDN; + if (key == 73) { + code = KEY_PGUP; + } + if (key == 81) { + code = KEY_PGDN; + } - if (key == 72) code = KEY_UP; - if (key == 80) code = KEY_DOWN; - if (key == 75) code = KEY_LEFT; - if (key == 77) code = KEY_RIGHT; - } else { + if (key == 72) { + code = KEY_UP; + } + if (key == 80) { + code = KEY_DOWN; + } + if (key == 75) { + code = KEY_LEFT; + } + if (key == 77) { + code = KEY_RIGHT; + } + } + else { code = key; } @@ -269,89 +469,34 @@ test_keycodes() int code; while ((code = keycode()) != 'q') { switch (code) { - case KEY_UP : - printf("KEY_UP "); - break; - case KEY_DOWN : - printf("KEY_DOWN "); - break; - case KEY_RIGHT: - printf("KEY_RIGHT "); - break; - case KEY_LEFT : - printf("KEY_LEFT "); - break; - case KEY_TAB : - printf("KEY_TAB "); - break; - case KEY_BS : - printf("KEY_BS "); - break; - case KEY_SPACE: - printf("KEY_SPACE "); - break; - case KEY_INS : - printf("KEY_INS "); - break; - case KEY_DEL : - printf("KEY_DEL "); - break; - case KEY_ESC : - printf("KEY_ESC "); - break; - case KEY_ENTER: - printf("KEY_ENTER "); - break; - case KEY_F1 : - printf("KEY_F1 "); - break; - case KEY_F2 : - printf("KEY_F2 "); - break; - case KEY_F3 : - printf("KEY_F3 "); - break; - case KEY_F4 : - printf("KEY_F4 "); - break; - case KEY_F5 : - printf("KEY_F5 "); - break; - case KEY_F6 : - printf("KEY_F6 "); - break; - case KEY_F7 : - printf("KEY_F7 "); - break; - case KEY_F8 : - printf("KEY_F8 "); - break; - case KEY_F9 : - printf("KEY_F9 "); - break; - case KEY_F10: - printf("KEY_F10 "); - break; - case KEY_F11: - printf("KEY_F11 "); - break; - case KEY_F12: - printf("KEY_F12 "); - break; - case KEY_HOME : - printf("KEY_HOME "); - break; - case KEY_END : - printf("KEY_END "); - break; - case KEY_PGUP : - printf("KEY_PGUP "); - break; - case KEY_PGDN : - printf("KEY_PGDN "); - break; - default: - printf("%d - '%c'", code, code); + case KEY_UP: printf("KEY_UP "); break; + case KEY_DOWN: printf("KEY_DOWN "); break; + case KEY_RIGHT: printf("KEY_RIGHT "); break; + case KEY_LEFT: printf("KEY_LEFT "); break; + case KEY_TAB: printf("KEY_TAB "); break; + case KEY_BS: printf("KEY_BS "); break; + case KEY_SPACE: printf("KEY_SPACE "); break; + case KEY_INS: printf("KEY_INS "); break; + case KEY_DEL: printf("KEY_DEL "); break; + case KEY_ESC: printf("KEY_ESC "); break; + case KEY_ENTER: printf("KEY_ENTER "); break; + case KEY_F1: printf("KEY_F1 "); break; + case KEY_F2: printf("KEY_F2 "); break; + case KEY_F3: printf("KEY_F3 "); break; + case KEY_F4: printf("KEY_F4 "); break; + case KEY_F5: printf("KEY_F5 "); break; + case KEY_F6: printf("KEY_F6 "); break; + case KEY_F7: printf("KEY_F7 "); break; + case KEY_F8: printf("KEY_F8 "); break; + case KEY_F9: printf("KEY_F9 "); break; + case KEY_F10: printf("KEY_F10 "); break; + case KEY_F11: printf("KEY_F11 "); break; + case KEY_F12: printf("KEY_F12 "); break; + case KEY_HOME: printf("KEY_HOME "); break; + case KEY_END: printf("KEY_END "); break; + case KEY_PGUP: printf("KEY_PGUP "); break; + case KEY_PGDN: printf("KEY_PGDN "); break; + default: printf("%d - '%c'", code, code); } printf("\n"); } diff --git a/src/keycode.h b/src/keycode.h index 017edd1..d9abc4c 100644 --- a/src/keycode.h +++ b/src/keycode.h @@ -28,32 +28,32 @@ test_keycodes(); #endif -#define KEY_INS 1000 -#define KEY_DEL 1001 +#define KEY_INS 1000 +#define KEY_DEL 1001 #define KEY_UP 1002 #define KEY_DOWN 1003 #define KEY_RIGHT 1004 #define KEY_LEFT 1005 -#define KEY_F1 1006 -#define KEY_F2 1007 -#define KEY_F3 1008 -#define KEY_F4 1009 -#define KEY_F5 1010 -#define KEY_F6 1011 -#define KEY_F7 1012 -#define KEY_F8 1013 -#define KEY_F9 1014 -#define KEY_F10 1015 -#define KEY_F11 1016 -#define KEY_F12 1017 +#define KEY_F1 1006 +#define KEY_F2 1007 +#define KEY_F3 1008 +#define KEY_F4 1009 +#define KEY_F5 1010 +#define KEY_F6 1011 +#define KEY_F7 1012 +#define KEY_F8 1013 +#define KEY_F9 1014 +#define KEY_F10 1015 +#define KEY_F11 1016 +#define KEY_F12 1017 -#define KEY_HOME 1018 -#define KEY_END 1019 +#define KEY_HOME 1018 +#define KEY_END 1019 -#define KEY_PGUP 1020 -#define KEY_PGDN 1021 +#define KEY_PGUP 1020 +#define KEY_PGDN 1021 #ifdef __cplusplus }