summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-06-16 10:39:20 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-06-16 10:39:20 +0900
commitc65e2cb4c711b8b57a355613db02593898254eed (patch)
treef2df797a20814ec19eb7264d664e54ec476b3d77 /src
parent4d68c301276830321507312b13103fec0311ab8b (diff)
add reported acpi events for several button/... events not handled yet
Diffstat (limited to 'src')
-rw-r--r--src/bin/e_acpi.c3
-rw-r--r--src/bin/e_acpi.h5
-rw-r--r--src/modules/conf_bindings/e_int_config_acpibindings.c6
3 files changed, 13 insertions, 1 deletions
diff --git a/src/bin/e_acpi.c b/src/bin/e_acpi.c
index 470e3ca49..d6ab3145b 100644
--- a/src/bin/e_acpi.c
+++ b/src/bin/e_acpi.c
@@ -73,6 +73,9 @@ static E_ACPI_Device_Simple _devices_simple[] =
73 {"video/brightnessdown", E_ACPI_TYPE_BRIGHTNESS_DOWN}, 73 {"video/brightnessdown", E_ACPI_TYPE_BRIGHTNESS_DOWN},
74 {"video/brightnessup", E_ACPI_TYPE_BRIGHTNESS_UP}, 74 {"video/brightnessup", E_ACPI_TYPE_BRIGHTNESS_UP},
75 {"video/switchmode", E_ACPI_TYPE_VIDEO}, 75 {"video/switchmode", E_ACPI_TYPE_VIDEO},
76 {"button/zoom", E_ACPI_TYPE_ZOOM},
77 {"button/screenlock", E_ACPI_TYPE_SCREENLOCK},
78 {"button/battery", E_ACPI_TYPE_BATTERY_BUTTON},
76 79
77 {NULL, E_ACPI_TYPE_UNKNOWN} 80 {NULL, E_ACPI_TYPE_UNKNOWN}
78}; 81};
diff --git a/src/bin/e_acpi.h b/src/bin/e_acpi.h
index 743f47e84..60b8df7e5 100644
--- a/src/bin/e_acpi.h
+++ b/src/bin/e_acpi.h
@@ -30,7 +30,10 @@ typedef enum _E_Acpi_Type
30 E_ACPI_TYPE_VOLUME_DOWN, // 23 30 E_ACPI_TYPE_VOLUME_DOWN, // 23
31 E_ACPI_TYPE_VOLUME_UP, // 24 31 E_ACPI_TYPE_VOLUME_UP, // 24
32 E_ACPI_TYPE_TABLET_ON, // 25 32 E_ACPI_TYPE_TABLET_ON, // 25
33 E_ACPI_TYPE_TABLET_OFF // 26 33 E_ACPI_TYPE_TABLET_OFF, // 26
34 E_ACPI_TYPE_ZOOM, // 27
35 E_ACPI_TYPE_SCREENLOCK, // 28
36 E_ACPI_TYPE_BATTERY_BUTTON // 29
34} E_Acpi_Type; 37} E_Acpi_Type;
35 38
36/* enum for acpi signals */ 39/* enum for acpi signals */
diff --git a/src/modules/conf_bindings/e_int_config_acpibindings.c b/src/modules/conf_bindings/e_int_config_acpibindings.c
index cb47a4573..e34232c79 100644
--- a/src/modules/conf_bindings/e_int_config_acpibindings.c
+++ b/src/modules/conf_bindings/e_int_config_acpibindings.c
@@ -399,6 +399,12 @@ _binding_label_get(E_Config_Binding_Acpi *binding)
399 return _("Tablet On"); 399 return _("Tablet On");
400 if (binding->type == E_ACPI_TYPE_TABLET_OFF) 400 if (binding->type == E_ACPI_TYPE_TABLET_OFF)
401 return _("Tablet Off"); 401 return _("Tablet Off");
402 if (binding->type == E_ACPI_TYPE_ZOOM)
403 return _("Zoom");
404 if (binding->type == E_ACPI_TYPE_SCREENLOCK)
405 return _("Screenlock");
406 if (binding->type == E_ACPI_TYPE_BATTERY_BUTTON)
407 return _("Battery Button");
402 408
403 return _("Unknown"); 409 return _("Unknown");
404} 410}