alema/hkd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed trailing spaces

Browse Source
This commit is contained in:
Alessandro Mauri 2020-04-23 17:01:28 +02:00
parent 80bacaf775
commit 45c52ecf20
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
macrod.c
View File

@ -24,7 +24,7 @@
#define OS linux #define OS linux
#include <linux/input.h> #include <linux/input.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#endif #endif
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#define OS bsd #define OS bsd
#include <dev/evdev/input.h> #include <dev/evdev/input.h>
@ -59,7 +59,7 @@ int main (void)
/* Open the event directory */ /* Open the event directory */
DIR *ev_dir = opendir(ev_root); DIR *ev_dir = opendir(ev_root);
if (!ev_dir) if (!ev_dir)
die(); die();
int fd_num = 0; int fd_num = 0;
@ -71,13 +71,13 @@ int main (void)
void *tmp_p; void *tmp_p;
int tmp_fd; int tmp_fd;
unsigned char evtype_b[EV_MAX]; unsigned char evtype_b[EV_MAX];
if ((file_ent = readdir(ev_dir)) == NULL) if ((file_ent = readdir(ev_dir)) == NULL)
break; break;
/* Filter out non character devices */ /* Filter out non character devices */
if (file_ent->d_type != DT_CHR) if (file_ent->d_type != DT_CHR)
continue; continue;
/* Compose absolute path from relative */ /* Compose absolute path from relative */
strncpy(ev_path, ev_root, sizeof(ev_root) + NAME_MAX); strncpy(ev_path, ev_root, sizeof(ev_root) + NAME_MAX);
strncat(ev_path, file_ent->d_name, sizeof(ev_root) + NAME_MAX); strncat(ev_path, file_ent->d_name, sizeof(ev_root) + NAME_MAX);
@ -107,7 +107,7 @@ int main (void)
if (!tmp_p) if (!tmp_p)
die(); die();
fds = tmp_p; fds = tmp_p;
fds[fd_num].events = POLLIN; fds[fd_num].events = POLLIN;
fds[fd_num].fd = tmp_fd; fds[fd_num].fd = tmp_fd;
@ -119,13 +119,13 @@ int main (void)
exit(-1); exit(-1);
} }
// TODO: watch for events inside /dev/input and reload accordingly // TODO: watch for events inside /dev/input and reload accordingly
// could use the epoll syscall or the inotify API (linux), // could use the epoll syscall or the inotify API (linux),
// event API (openbsd), kqueue syscall (BSD and macos), a separate // event API (openbsd), kqueue syscall (BSD and macos), a separate
// process or some polling system inside the main loop to maintain // process or some polling system inside the main loop to maintain
// portability across other *NIX derivatives, could also use libev // portability across other *NIX derivatives, could also use libev
struct input_event event; struct input_event event;
struct pressed_buffer pb = {NULL, 0}; // Pressed keys buffer struct pressed_buffer pb = {NULL, 0}; // Pressed keys buffer
ssize_t rb; // Read bits ssize_t rb; // Read bits
/* Prepare for using epoll */ /* Prepare for using epoll */
@ -141,25 +141,25 @@ int main (void)
#endif #endif
for (;;) { for (;;) {
// TODO: better error reporting // TODO: better error reporting
/* On linux use epoll(2) as it gives better performance */ /* On linux use epoll(2) as it gives better performance */
#if OS == linux #if OS == linux
static struct epoll_event ev_type; static struct epoll_event ev_type;
if (epoll_wait(ev_fd, &ev_type, fd_num, -1) == -1 || term) if (epoll_wait(ev_fd, &ev_type, fd_num, -1) == -1 || term)
break; break;
// TODO: use and test kqueue(2) for BSD systems // TODO: use and test kqueue(2) for BSD systems
/* On other systems use poll(2) to wait por a file dscriptor /* On other systems use poll(2) to wait por a file dscriptor
* to become ready for reading. */ * to become ready for reading. */
#else // TODO: add unix and bsd cases #else // TODO: add unix and bsd cases
if (poll(fds, fd_num, -1) != -1 || term) if (poll(fds, fd_num, -1) != -1 || term)
break; break;
#endif #endif
static int i; static int i;
static unsigned int prev_size; static unsigned int prev_size;
prev_size = pb.size; prev_size = pb.size;
for (i = 0; i < fd_num; i++) { for (i = 0; i < fd_num; i++) {
#if OS == linux #if OS == linux
@ -193,7 +193,7 @@ int main (void)
} }
} }
} }
if (pb.size != prev_size) { if (pb.size != prev_size) {
printf("Pressed keys: "); printf("Pressed keys: ");
for (unsigned int i = 0; i < pb.size; i++) for (unsigned int i = 0; i < pb.size; i++)
@ -206,7 +206,9 @@ int main (void)
} }
} }
// TODO: better child handling, for now all children receive the same
// interrupts as the father so everything should work fine for now
wait(NULL); wait(NULL);
free(pb.buf); free(pb.buf);
if (!term) if (!term)
@ -220,16 +222,16 @@ int main (void)
// TODO: optimize functions to preallocate some memory // TODO: optimize functions to preallocate some memory
int pressBufferAdd (struct pressed_buffer *pb, unsigned short key) int pressBufferAdd (struct pressed_buffer *pb, unsigned short key)
{ {
/* Adds a keycode to the pressed buffer if it is not already present /* Adds a keycode to the pressed buffer if it is not already present
* Returns non zero if the key was not added. */ * Returns non zero if the key was not added. */
if (!pb) return 1; if (!pb) return 1;
if (pb->buf != NULL) { if (pb->buf != NULL) {
/* Linear search if the key is already buffered */ /* Linear search if the key is already buffered */
for (unsigned int i = 0; i < pb->size; i++) for (unsigned int i = 0; i < pb->size; i++)
if (key == pb->buf[i]) return 1; if (key == pb->buf[i]) return 1;
} }
unsigned short *b; unsigned short *b;
b = realloc(pb->buf, sizeof(unsigned short) * (pb->size + 1)); b = realloc(pb->buf, sizeof(unsigned short) * (pb->size + 1));
if (!b) { if (!b) {
@ -244,10 +246,10 @@ int pressBufferAdd (struct pressed_buffer *pb, unsigned short key)
int pressBufferRemove (struct pressed_buffer *pb, unsigned short key) int pressBufferRemove (struct pressed_buffer *pb, unsigned short key)
{ {
/* Removes a keycode from a pressed buffer if it is present returns /* Removes a keycode from a pressed buffer if it is present returns
* non zero in case of failure (key not present or buffer empty). */ * non zero in case of failure (key not present or buffer empty). */
if (!pb) return 1; if (!pb) return 1;
for (unsigned int i = 0; i < pb->size; i++) { for (unsigned int i = 0; i < pb->size; i++) {
if (pb->buf[i] == key) { if (pb->buf[i] == key) {
pb->size--; pb->size--;
@ -288,7 +290,7 @@ void execCommand (const char *path)
/* we are the child */ /* we are the child */
int ret = 0; int ret = 0;
ret = execl(path, path, (char *) NULL); ret = execl(path, path, (char *) NULL);
if (ret != 0) if (ret != 0)
exit(-1); exit(-1);
} }
} }