commit 0f45fad18cf56910aa339c7c6ad1a661e96cfb0d
parent 7414d9232751d378ff2840b7fb45e711b7f69477
Author: Drew DeVault <sir@cmpwn.com>
Date: Sun, 22 Oct 2017 11:38:30 -0400
Establish sway input submodule
Diffstat:
7 files changed, 91 insertions(+), 81 deletions(-)
diff --git a/include/sway/input.h b/include/sway/input.h
@@ -1,18 +1,19 @@
#ifndef _SWAY_INPUT_H
#define _SWAY_INPUT_H
-
#include <libinput.h>
+#include "sway/server.h"
#include "config.h"
#include "list.h"
+struct sway_input {
+ list_t *input_devices;
+};
+
struct input_config *new_input_config(const char* identifier);
char* libinput_dev_unique_id(struct libinput_device *dev);
-/**
- * Global input device list.
- */
-extern list_t *input_devices;
+struct sway_input *sway_input_create(struct sway_server *server);
/**
* Pointer used when reading input blocked.
diff --git a/include/sway/server.h b/include/sway/server.h
@@ -10,9 +10,6 @@
#include <wlr/xwayland.h>
struct sway_server {
- // TODO WLR
- //struct roots_input *input;
-
struct wl_display *wl_display;
struct wl_event_loop *wl_event_loop;
@@ -20,6 +17,8 @@ struct sway_server {
struct wlr_renderer *renderer;
struct wlr_data_device_manager *data_device_manager;
+
+ struct sway_input *input;
};
bool server_init(struct sway_server *server);
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt
@@ -26,7 +26,6 @@ add_executable(sway
criteria.c
debug_log.c
focus.c
- input.c
input_state.c
ipc-json.c
ipc-server.c
@@ -37,6 +36,8 @@ add_executable(sway
border.c
security.c
server.c
+
+ input/input.c
)
add_definitions(
diff --git a/sway/input.c b/sway/input.c
@@ -1,69 +0,0 @@
-#define _XOPEN_SOURCE 700
-#include <ctype.h>
-#include <float.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <libinput.h>
-#include "sway/config.h"
-#include "sway/input.h"
-#include "list.h"
-#include "log.h"
-
-struct input_config *new_input_config(const char* identifier) {
- struct input_config *input = calloc(1, sizeof(struct input_config));
- if (!input) {
- sway_log(L_DEBUG, "Unable to allocate input config");
- return NULL;
- }
- sway_log(L_DEBUG, "new_input_config(%s)", identifier);
- if (!(input->identifier = strdup(identifier))) {
- free(input);
- sway_log(L_DEBUG, "Unable to allocate input config");
- return NULL;
- }
-
- input->tap = INT_MIN;
- input->drag_lock = INT_MIN;
- input->dwt = INT_MIN;
- input->send_events = INT_MIN;
- input->click_method = INT_MIN;
- input->middle_emulation = INT_MIN;
- input->natural_scroll = INT_MIN;
- input->accel_profile = INT_MIN;
- input->pointer_accel = FLT_MIN;
- input->scroll_method = INT_MIN;
- input->left_handed = INT_MIN;
-
- return input;
-}
-
-char *libinput_dev_unique_id(struct libinput_device *device) {
- int vendor = libinput_device_get_id_vendor(device);
- int product = libinput_device_get_id_product(device);
- char *name = strdup(libinput_device_get_name(device));
-
- char *p = name;
- for (; *p; ++p) {
- if (*p == ' ') {
- *p = '_';
- }
- }
-
- sway_log(L_DEBUG, "rewritten name %s", name);
-
- int len = strlen(name) + sizeof(char) * 6;
- char *identifier = malloc(len);
- if (!identifier) {
- sway_log(L_ERROR, "Unable to allocate unique input device name");
- return NULL;
- }
-
- const char *fmt = "%d:%d:%s";
- snprintf(identifier, len, fmt, vendor, product, name);
- free(name);
- return identifier;
-}
-
-list_t *input_devices = NULL;
-struct input_config *current_input_config = NULL;
diff --git a/sway/input/input.c b/sway/input/input.c
@@ -0,0 +1,77 @@
+#define _XOPEN_SOURCE 700
+#include <ctype.h>
+#include <float.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include <libinput.h>
+#include "sway/config.h"
+#include "sway/input.h"
+#include "sway/server.h"
+#include "list.h"
+#include "log.h"
+
+struct input_config *current_input_config = NULL;
+
+struct sway_input *sway_input_create(struct sway_server *server) {
+ struct sway_input *input = calloc(1, sizeof(struct sway_input));
+ if (!input) {
+ return NULL;
+ }
+ return input;
+}
+
+struct input_config *new_input_config(const char* identifier) {
+ struct input_config *input = calloc(1, sizeof(struct input_config));
+ if (!input) {
+ sway_log(L_DEBUG, "Unable to allocate input config");
+ return NULL;
+ }
+ sway_log(L_DEBUG, "new_input_config(%s)", identifier);
+ if (!(input->identifier = strdup(identifier))) {
+ free(input);
+ sway_log(L_DEBUG, "Unable to allocate input config");
+ return NULL;
+ }
+
+ input->tap = INT_MIN;
+ input->drag_lock = INT_MIN;
+ input->dwt = INT_MIN;
+ input->send_events = INT_MIN;
+ input->click_method = INT_MIN;
+ input->middle_emulation = INT_MIN;
+ input->natural_scroll = INT_MIN;
+ input->accel_profile = INT_MIN;
+ input->pointer_accel = FLT_MIN;
+ input->scroll_method = INT_MIN;
+ input->left_handed = INT_MIN;
+
+ return input;
+}
+
+char *libinput_dev_unique_id(struct libinput_device *device) {
+ int vendor = libinput_device_get_id_vendor(device);
+ int product = libinput_device_get_id_product(device);
+ char *name = strdup(libinput_device_get_name(device));
+
+ char *p = name;
+ for (; *p; ++p) {
+ if (*p == ' ') {
+ *p = '_';
+ }
+ }
+
+ sway_log(L_DEBUG, "rewritten name %s", name);
+
+ int len = strlen(name) + sizeof(char) * 6;
+ char *identifier = malloc(len);
+ if (!identifier) {
+ sway_log(L_ERROR, "Unable to allocate unique input device name");
+ return NULL;
+ }
+
+ const char *fmt = "%d:%d:%s";
+ snprintf(identifier, len, fmt, vendor, product, name);
+ free(name);
+ return identifier;
+}
diff --git a/sway/ipc-server.c b/sway/ipc-server.c
@@ -476,12 +476,14 @@ void ipc_client_handle_command(struct ipc_client *client) {
goto exit_denied;
}
json_object *inputs = json_object_new_array();
+ /* TODO WLR
if (input_devices) {
for(int i = 0; i<input_devices->length; i++) {
struct libinput_device *device = input_devices->items[i];
json_object_array_add(inputs, ipc_json_describe_input(device));
}
}
+ */
const char *json_string = json_object_to_json_string(inputs);
ipc_send_reply(client, json_string, (uint32_t) strlen(json_string));
json_object_put(inputs);
diff --git a/sway/server.c b/sway/server.c
@@ -10,6 +10,7 @@
// TODO WLR: make Xwayland optional
#include <wlr/xwayland.h>
#include "sway/server.h"
+#include "sway/input.h"
#include "log.h"
bool server_init(struct sway_server *server) {
@@ -22,9 +23,7 @@ bool server_init(struct sway_server *server) {
server->renderer = wlr_gles2_renderer_create(server->backend);
wl_display_init_shm(server->wl_display);
- // TODO WLR
- //server->desktop = desktop_create(server, server.config);
- //server->input = input_create(&server, server.config);
+ server->input = sway_input_create(server);
server->data_device_manager =
wlr_data_device_manager_create(server->wl_display);
