Skip to content

Fix key code reading #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dspinellis wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix key code reading #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79bd13b
Include required header file for fd_set
dspinellis Nov 1, 2019
53b4b1f
Fix clash with built-in log function
dspinellis Nov 1, 2019
f6ca23e
Add header required for strcmp
dspinellis Nov 1, 2019
a38e46c
Fix key code reading
dspinellis Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions MapReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,10 @@ void MapReader::LoadMap(const char *filename,EventMapping *map)

i = 0;

while(i<KEY_NAME_MAXLENGTH && ptr[i]!='\0' && ptr[i]!='\n' && (!isspace(ptr[i])))
key_name[i] = ptr[i++];
while(i<KEY_NAME_MAXLENGTH && ptr[i]!='\0' && ptr[i]!='\n' && (!isspace(ptr[i]))) {
key_name[i] = ptr[i];
i++;
}

if(i==KEY_NAME_MAXLENGTH)
{
Expand Down Expand Up @@ -150,7 +152,7 @@ void MapReader::LoadMap(const char *filename,EventMapping *map)
key = Keys::Lookup(key_name);
if(key<0)
{
sprintf(error,"Unknown key name at line %d",line);
sprintf(error,"Unknown key name [%s] at line %d", key_name, line);
throw Exception("MapReader",error);
}
}
Expand Down
2 changes: 2 additions & 0 deletions hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
* Author: Thibault Kummer <bob@coldsource.net>
*/

#include <sys/select.h>
#include <hid.h>
#include <log.h>
#include <fcntl.h>
#include <unistd.h>
#include <dirent.h>
#include <stdio.h>
#include <string.h>

#define SYSFS_HIDRAW_CLASS_PATH "/sys/class/hidraw"

Expand Down
4 changes: 2 additions & 2 deletions include/log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ typedef enum LogLevel {

extern int currentLogLevel;

void log(LogLevel severity, const char* fmt, va_list args);
//void log(LogLevel severity, const char* fmt, ...);
void logmsg(LogLevel severity, const char* fmt, va_list args);
//void logmsg(LogLevel severity, const char* fmt, ...);

void info(const char* fmt, ...);
void warn(const char* fmt, ...);
Expand Down
12 changes: 6 additions & 6 deletions log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ const char* headers[] = {
"ERRO",
};

void log(LogLevel severity, const char* fmt, va_list args) {
void logmsg(LogLevel severity, const char* fmt, va_list args) {
if (severity < currentLogLevel) {
vfprintf(stderr, fmt, args);
putc('\n', stderr);
}
}

void log(LogLevel severity, const char* fmt, ...)
void logmsg(LogLevel severity, const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
log(severity, fmt, args);
logmsg(severity, fmt, args);
va_end(args);

}
Expand All @@ -48,23 +48,23 @@ void info(const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
log(LOG_INFO, fmt, args);
logmsg(LOG_INFO, fmt, args);
va_end(args);
}

void warn(const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
log(LOG_WARN, fmt, args);
logmsg(LOG_WARN, fmt, args);
va_end(args);
}

void error(const char* fmt, ...)
{
va_list args;
va_start(args, fmt);
log(LOG_ERROR, fmt, args);
logmsg(LOG_ERROR, fmt, args);
va_end(args);
}