hugok
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Other minor changes

This commit is contained in:
rafspiny 2023-08-03 11:57:26 +02:00 committed by Carsten Haitzler
parent d2ccd898f9
commit 479b83eb81
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/convertible/dbus_acceleration.c
View File

@ -14,7 +14,7 @@ DbusAccelerometer*
sensor_proxy_init() sensor_proxy_init()
{ {
// Initialise DBUS component // Initialise DBUS component
if (accelerometer_dbus != NULL) if (accelerometer_dbus)
{ {
INF("We already have a struct filled"); INF("We already have a struct filled");
return accelerometer_dbus; return accelerometer_dbus;
@ -24,7 +24,7 @@ sensor_proxy_init()
// The next line is probably redundant // The next line is probably redundant
accelerometer_dbus->orientation = undefined; accelerometer_dbus->orientation = undefined;
INF("Getting dbus interfaces"); INF("Getting dbus interfaces");
accelerometer_dbus->sensor_proxy = get_dbus_interface(EFL_DBUS_ACC_IFACE); accelerometer_dbus->sensor_proxy = get_dbus_interface(EFL_DBUS_ACC_IFACE);
accelerometer_dbus->sensor_proxy_properties = get_dbus_interface(ELDBUS_FDO_INTERFACE_PROPERTIES); accelerometer_dbus->sensor_proxy_properties = get_dbus_interface(ELDBUS_FDO_INTERFACE_PROPERTIES);
@ -348,15 +348,14 @@ _is_device_a_touch_pointer(int dev_counter, int num_properties, char **iterator)
int is_correct_device = EINA_FALSE; int is_correct_device = EINA_FALSE;
for (int i=0; i<num_properties; i++) for (int i=0; i<num_properties; i++)
{ {
if (strstr(*iterator, "libinput Calibration Matrix") != NULL) if (strstr(*iterator, "libinput Calibration Matrix"))
is_correct_device = EINA_TRUE; is_correct_device = EINA_TRUE;
if (strstr(*iterator, "Axis Labels") != NULL) if (strstr(*iterator, "Axis Labels"))
{ {
int num_ret, unit_size_ret; int num_ret, unit_size_ret;
Ecore_X_Atom format_ret; Ecore_X_Atom format_ret;
char *result = NULL; char *result = ecore_x_input_device_property_get(dev_counter, *iterator, &num_ret, &format_ret, &unit_size_ret);
result = ecore_x_input_device_property_get(dev_counter, *iterator, &num_ret, &format_ret, &unit_size_ret); if (result) {
if (result != NULL) {
// TODO Shall check for the value "Abs MT Position" // TODO Shall check for the value "Abs MT Position"
} }
DBG("Looks like I found a device with calibration capabilities"); DBG("Looks like I found a device with calibration capabilities");
@ -399,7 +398,7 @@ _fetch_and_rotate_screen(const char* randr_id, enum screen_rotation orientation)
TransformationMatrix *matrix = calloc(1, sizeof(TransformationMatrix)); TransformationMatrix *matrix = calloc(1, sizeof(TransformationMatrix));
EINA_SAFETY_ON_NULL_RETURN_VAL(matrix, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(matrix, NULL);
result = ecore_x_input_device_property_get(x_dev_num, CTM_name, &num_ret, &format_ret, &unit_size_ret); result = ecore_x_input_device_property_get(x_dev_num, CTM_name, &num_ret, &format_ret, &unit_size_ret);
if (result != NULL) if (result)
{ {
DBG("Device with coordinates transformation matrix"); DBG("Device with coordinates transformation matrix");

4
src/modules/convertible/e_mod_main.c
View File

@ -264,7 +264,7 @@ e_modapi_init(E_Module *m)
snprintf(theme_overlay_path, sizeof(theme_overlay_path), "%s/e-module-convertible.edj", convertible_module->dir); snprintf(theme_overlay_path, sizeof(theme_overlay_path), "%s/e-module-convertible.edj", convertible_module->dir);
elm_theme_extension_add(NULL, theme_overlay_path); elm_theme_extension_add(NULL, theme_overlay_path);
econvertible_config_init(NULL); econvertible_config_init();
// Config DBus // Config DBus
DbusAccelerometer *accelerometer = sensor_proxy_init(); DbusAccelerometer *accelerometer = sensor_proxy_init();
@ -290,7 +290,7 @@ e_modapi_init(E_Module *m)
ERR("Error: could not add the signal handler for PropertiesChanged"); ERR("Error: could not add the signal handler for PropertiesChanged");
// Screen related part // Screen related part
E_Zone *zone = NULL; E_Zone *zone;
// Initialise screen part // Initialise screen part
DBG("Looking for the main screen"); DBG("Looking for the main screen");