aboutsummaryrefslogtreecommitdiffstats
path: root/sway/main.c
diff options
context:
space:
mode:
authorLibravatar Cole Mickens <cole.mickens@gmail.com>2016-01-17 02:53:37 -0800
committerLibravatar Cole Mickens <cole.mickens@gmail.com>2016-01-19 06:51:36 -0800
commit28081b76891ddbbb825dee6c202037d78aa8f164 (patch)
tree6b7412f626f5d9f10dba8920a2543dfd3c5a662e /sway/main.c
parentAdd ffmpeg/imagemagick to depenency list (diff)
downloadsway-28081b76891ddbbb825dee6c202037d78aa8f164.tar.gz
sway-28081b76891ddbbb825dee6c202037d78aa8f164.tar.zst
sway-28081b76891ddbbb825dee6c202037d78aa8f164.zip
libinput
Diffstat (limited to 'sway/main.c')
-rw-r--r--sway/main.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sway/main.c b/sway/main.c
index e85f7269..bec6a725 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -17,6 +17,7 @@
17#include "handlers.h" 17#include "handlers.h"
18#include "ipc-client.h" 18#include "ipc-client.h"
19#include "ipc-server.h" 19#include "ipc-server.h"
20#include "input.h"
20#include "sway.h" 21#include "sway.h"
21 22
22static bool terminate_request = false; 23static bool terminate_request = false;
@@ -173,6 +174,8 @@ int main(int argc, char **argv) {
173 wlc_log_set_handler(wlc_log_handler); 174 wlc_log_set_handler(wlc_log_handler);
174 detect_proprietary(); 175 detect_proprietary();
175 176
177 input_devices = create_list();
178
176 /* Changing code earlier than this point requires detailed review */ 179 /* Changing code earlier than this point requires detailed review */
177 /* (That code runs as root on systems without logind, and wlc_init drops to 180 /* (That code runs as root on systems without logind, and wlc_init drops to
178 * another user.) */ 181 * another user.) */
@@ -208,6 +211,10 @@ int main(int argc, char **argv) {
208 wlc_run(); 211 wlc_run();
209 } 212 }
210 213
214 if (input_devices) {
215 free(input_devices);
216 }
217
211 ipc_terminate(); 218 ipc_terminate();
212 219
213 return 0; 220 return 0;