Update squeek2lvgl and fix further warnings

Relates to #18
This commit is contained in:
Johannes Marbach
2021-09-22 20:54:46 +02:00
parent 9276dd6187
commit b8d79037bf
4 changed files with 21 additions and 53 deletions

3
main.c
View File

@@ -408,7 +408,6 @@ int main(void) {
#define MAX_TOUCHSCREENS 1
char *touchscreens[MAX_TOUCHSCREENS] = { NULL };
lv_indev_drv_t touchscreen_indev_drvs[MAX_TOUCHSCREENS];
lv_indev_t *touchscreen_indevs[MAX_TOUCHSCREENS] = { NULL };
size_t num_touchscreens = libinput_find_devs(LIBINPUT_CAPABILITY_TOUCH, touchscreens, MAX_TOUCHSCREENS, false);
for (int i = 0; i < num_touchscreens; ++i) {
printf("found touchscreen %s\n", touchscreens[i]);
@@ -418,7 +417,7 @@ int main(void) {
touchscreen_indev_drvs[i].long_press_repeat_time = USHRT_MAX;
libinput_multi_init_driver(&touchscreen_indev_drvs[i]);
libinput_multi_set_file(&touchscreen_indev_drvs[i], touchscreens[i]);
touchscreen_indevs[i] = lv_indev_drv_register(&touchscreen_indev_drvs[i]);
lv_indev_drv_register(&touchscreen_indev_drvs[i]);
}
/* Initialise theme and styles */

View File

@@ -19,9 +19,9 @@
project(
'unl0kr',
'c',
version : '0.0',
default_options : ['warning_level=0'],
meson_version : '>=0.53.0',
version : '0.0.0',
default_options : 'warning_level=1',
meson_version : '>=0.53.0'
)
unl0kr_sources = [
@@ -175,6 +175,5 @@ executable(
dependencies : [
dependency('xkbcommon'),
dependency('libinput'),
],
c_args : ['-Wno-error=pedantic']
]
)

View File

@@ -33,9 +33,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_us[] = { \
static const int num_modifiers_lower_us = 0;
static const int modifier_idxs_lower_us[] = { \
\
};
static const int * const modifier_idxs_lower_us = NULL;
static const int num_switchers_lower_us = 2;
@@ -67,9 +65,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_us[] = { \
static const int num_modifiers_upper_us = 0;
static const int modifier_idxs_upper_us[] = { \
\
};
static const int * const modifier_idxs_upper_us = NULL;
static const int num_switchers_upper_us = 2;
@@ -101,9 +97,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_us[] = { \
static const int num_modifiers_numbers_us = 0;
static const int modifier_idxs_numbers_us[] = { \
\
};
static const int * const modifier_idxs_numbers_us = NULL;
static const int num_switchers_numbers_us = 1;
@@ -179,9 +173,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_de[] = { \
static const int num_modifiers_lower_de = 0;
static const int modifier_idxs_lower_de[] = { \
\
};
static const int * const modifier_idxs_lower_de = NULL;
static const int num_switchers_lower_de = 3;
@@ -213,9 +205,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_de[] = { \
static const int num_modifiers_upper_de = 0;
static const int modifier_idxs_upper_de[] = { \
\
};
static const int * const modifier_idxs_upper_de = NULL;
static const int num_switchers_upper_de = 3;
@@ -247,9 +237,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_de[] = { \
static const int num_modifiers_numbers_de = 0;
static const int modifier_idxs_numbers_de[] = { \
\
};
static const int * const modifier_idxs_numbers_de = NULL;
static const int num_switchers_numbers_de = 2;
@@ -281,9 +269,7 @@ static const lv_btnmatrix_ctrl_t attributes_special_de[] = { \
static const int num_modifiers_special_de = 0;
static const int modifier_idxs_special_de[] = { \
\
};
static const int * const modifier_idxs_special_de = NULL;
static const int num_switchers_special_de = 3;
@@ -369,9 +355,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_es[] = { \
static const int num_modifiers_lower_es = 0;
static const int modifier_idxs_lower_es[] = { \
\
};
static const int * const modifier_idxs_lower_es = NULL;
static const int num_switchers_lower_es = 3;
@@ -403,9 +387,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_es[] = { \
static const int num_modifiers_upper_es = 0;
static const int modifier_idxs_upper_es[] = { \
\
};
static const int * const modifier_idxs_upper_es = NULL;
static const int num_switchers_upper_es = 3;
@@ -437,9 +419,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_es[] = { \
static const int num_modifiers_numbers_es = 0;
static const int modifier_idxs_numbers_es[] = { \
\
};
static const int * const modifier_idxs_numbers_es = NULL;
static const int num_switchers_numbers_es = 2;
@@ -471,9 +451,7 @@ static const lv_btnmatrix_ctrl_t attributes_special_es[] = { \
static const int num_modifiers_special_es = 0;
static const int modifier_idxs_special_es[] = { \
\
};
static const int * const modifier_idxs_special_es = NULL;
static const int num_switchers_special_es = 3;
@@ -559,9 +537,7 @@ static const lv_btnmatrix_ctrl_t attributes_lower_fr[] = { \
static const int num_modifiers_lower_fr = 0;
static const int modifier_idxs_lower_fr[] = { \
\
};
static const int * const modifier_idxs_lower_fr = NULL;
static const int num_switchers_lower_fr = 3;
@@ -593,9 +569,7 @@ static const lv_btnmatrix_ctrl_t attributes_upper_fr[] = { \
static const int num_modifiers_upper_fr = 0;
static const int modifier_idxs_upper_fr[] = { \
\
};
static const int * const modifier_idxs_upper_fr = NULL;
static const int num_switchers_upper_fr = 3;
@@ -627,9 +601,7 @@ static const lv_btnmatrix_ctrl_t attributes_numbers_fr[] = { \
static const int num_modifiers_numbers_fr = 0;
static const int modifier_idxs_numbers_fr[] = { \
\
};
static const int * const modifier_idxs_numbers_fr = NULL;
static const int num_switchers_numbers_fr = 2;
@@ -661,9 +633,7 @@ static const lv_btnmatrix_ctrl_t attributes_special_fr[] = { \
static const int num_modifiers_special_fr = 0;
static const int modifier_idxs_special_fr[] = { \
\
};
static const int * const modifier_idxs_special_fr = NULL;
static const int num_switchers_special_fr = 3;