randr - add "use output" option to use output name (or not)

@feat
fix calloc num, size where it's wrong
2024-05-30 18:45:12 +01:00 · 2024-05-30 17:43:56 +01:00 · 2024-05-30 07:59:51 +01:00 · 2024-05-30 07:59:51 +01:00 · 2024-05-16 13:50:47 +02:00 · 2024-04-23 09:39:56 +01:00
29 changed files with 1711 additions and 231 deletions
--- a/meson_options.txt
+++ b/meson_options.txt
@ -132,6 +132,10 @@ option('connman',
 	type: 'boolean',
 	value: true,
 	description: 'enable connman module: (default=true)')
+option('convertible',
+	type: 'boolean',
+	value: true,
+	description: 'enable convertible module: (default=true)')
 option('cpufreq',
 	type: 'boolean',
 	value: true,
--- a/po/es.po
+++ b/po/es.po
@ -6,14 +6,14 @@
 # DiegoJ <diegojromerolopez@gmail.com>, 2009.
 # Aníbal Garrido <khany@member.trisquel.info>, 2012.
 # Adrián Arévalo <adri58@gmail.com>, 2012, 2013, 2016.
-# Roy W. Reese <waterbearer54@gmx.org>, 2019
+# Roy W. Reese <waterbearer54@gmx.org>, 2024
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Enlightenment 0.22\n"
+"Project-Id-Version: Enlightenment 0.26\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-23 21:51+0100\n"
-"PO-Revision-Date: 2020-05-06 21:58+0200\n"
+"PO-Revision-Date: 2024-04-01 14:03+0200\n"
 "Last-Translator: RWR\n"
 "Language-Team: Español; Castellano <>\n"
 "Language: es\n"
@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.4.2\n"
 "X-Poedit-Basepath: /home/adrian/trunk/e\n"

 #: src/bin/e_about.c:17
@ -48,14 +48,13 @@ msgid "Enlightenment"
 msgstr "Enlightenment"

 #: src/bin/e_about.c:26
-#, fuzzy
 msgid ""
 "<title>Copyright &copy; 2000-2024, by the Enlightenment Development Team</"
 "><ps/><ps/>We hope you enjoy using this software as much as we enjoyed "
 "writing it.<ps/><ps/>To contact us please visit:<ps/><hilight>http://www."
 "enlightenment.org</><ps/><ps/>"
 msgstr ""
-"<title>Copyright &copy; 2000-2020, por el Equipo de Desarrollo de "
+"<title>Copyright &copy; 2000-2024, por el Equipo de Desarrollo de "
 "Enlightenment</><ps/><ps/>Esperamos que disfrute usando este software tanto "
 "como nosotros disfrutamos escribiéndolo.<ps/><ps/>Para contactar con "
 "nosotros visite:<ps/><hilight>http://www.enlightenment.org</><ps/><ps/>"
@ -199,9 +198,8 @@ msgid "Mouse to key"
 msgstr "De ratón a tecla"

 #: src/bin/e_actions.c:3472
-#, fuzzy
 msgid "Profile: Switch"
-msgstr "Selector de perfiles"
+msgstr "Perfil: Cambiar"

 #: src/bin/e_actions.c:3491 src/bin/e_actions.c:3502 src/bin/e_actions.c:3521
 #: src/bin/e_actions.c:3526 src/bin/e_actions.c:3531 src/bin/e_actions.c:3536
@ -625,30 +623,30 @@ msgstr "Enviar ratón una pantalla detrás"
 msgid "Send Mouse Forward/Back Screens..."
 msgstr "Enviar ratón adelante/atrás pantallas..."

-# oscurecer
+# oscurecer, atenuar
 #: src/bin/e_actions.c:3800
 msgid "Dim"
-msgstr "Disminuir brillo"
+msgstr "Atenuar"

 #: src/bin/e_actions.c:3803
 msgid "Undim"
-msgstr "Aumentar brillo"
+msgstr "Restaurar"

 #: src/bin/e_actions.c:3806
 msgid "Backlight Set"
-msgstr "Retroiluminación"
+msgstr "Configurar retroiluminación"

 #: src/bin/e_actions.c:3808
 msgid "Backlight Min"
-msgstr "Retroiluminación al mínimo"
+msgstr "Retroiluminación mín"

 #: src/bin/e_actions.c:3810
 msgid "Backlight Mid"
-msgstr "Retroiluminación a la mitad"
+msgstr "Retroiluminación 50%"

 #: src/bin/e_actions.c:3812
 msgid "Backlight Max"
-msgstr "Retroiluminación al máximo"
+msgstr "Retroiluminación max"

 #: src/bin/e_actions.c:3815
 msgid "Backlight Adjust"
@ -662,20 +660,18 @@ msgstr "Aumentar retroiluminación"
 msgid "Backlight Down"
 msgstr "Disminuir retroiluminación"

+# Blanking: "apagar" en Windows, Plasma; "en negro" en ajustes de XFCE.
 #: src/bin/e_actions.c:3824
-#, fuzzy
 msgid "Blanking Off"
-msgstr "Apagado de pantalla"
+msgstr "Deshabilitar apagado de pantalla"

 #: src/bin/e_actions.c:3826
-#, fuzzy
 msgid "Blanking On"
-msgstr "Apagado de pantalla"
+msgstr "Habilitar apagado de pantalla"

 #: src/bin/e_actions.c:3828
-#, fuzzy
 msgid "Blanking Toggle"
-msgstr "Apagado de pantalla"
+msgstr "Alternar apagado de pantalla"

 #: src/bin/e_actions.c:3833
 msgid "Update and re-apply screen setup"
@ -728,9 +724,8 @@ msgid "Push in Direction..."
 msgstr "Empujar hacia..."

 #: src/bin/e_actions.c:3886
-#, fuzzy
 msgid "Grow in Direction..."
-msgstr "Empujar hacia..."
+msgstr "Expandir hacia..."

 #: src/bin/e_actions.c:3892
 msgid "Drag Icon..."
@ -1123,9 +1118,8 @@ msgid "Enlightenment cannot initialize the XSettings system.\n"
 msgstr "Enlightenment no puede iniciar el sistema XSettings.\n"

 #: src/bin/e_comp_x_randr.c:453
-#, fuzzy
 msgid "Screen setup Error"
-msgstr "Error en la captura de pantalla"
+msgstr "Error: configuración de pantalla"

 #: src/bin/e_comp_x_randr.c:454
 msgid ""
@ -1133,6 +1127,10 @@ msgid ""
 "have. This should<br>be fixed by going to:<br><br><b>Settings -> Screen -> "
 "Screen Setup</><br><br>And configure at least one screen to be on."
 msgstr ""
+"Parece que no tiene ninguna pantalla<br>configurada para recibir los datos "
+"de salida. <br>Se debe arreglar yendo a:<br><br><b>Preferencias -> Pantalla -"
+"> Configuración de pantalla</><br><br>Y configurar al menos una pantalla a "
+"estar encendida."

 #: src/bin/e_comp_x_randr.c:462 src/bin/e_config_dialog.c:274
 #: src/bin/e_desktop_editor.c:907 src/bin/e_desktop_editor.c:971
@ -1353,9 +1351,9 @@ msgstr "Preferencias"
 #: src/bin/e_desk.c:123 src/bin/e_desk.c:185 src/bin/e_desk.c:242
 #: src/modules/conf_display/e_int_config_desk.c:78
 #: src/modules/conf_display/e_int_config_desk.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "Desktop %d,%d"
-msgstr "Escritorio"
+msgstr "Escritorio %d,%d"

 #: src/bin/e_desklock.c:235
 msgid "Error - no PAM support"
@ -2058,10 +2056,10 @@ msgstr "Tamaño:"
 msgid "Occupied blocks on disk:"
 msgstr "Bloques ocupados en el disco:"

+# Creo que refiere a cuando se ha montado o contectado al sistema
 #: src/bin/e_fm_prop.c:541
-#, fuzzy
 msgid "Taken on:"
-msgstr "Capturar imagen"
+msgstr "Conectado:"

 #: src/bin/e_fm_prop.c:551
 msgid "Last Accessed:"
@ -2181,7 +2179,6 @@ msgstr "Detener desplazamiento"

 # Gadcon = "gadget control"
 #: src/bin/e_gadcon.c:3229
-#, fuzzy
 msgid "Insufficient gadcon support"
 msgstr "Soporte insuficiente para gadcon"

@ -3156,10 +3153,10 @@ msgstr "'Swaps' de doble búfer"
 msgid "Triple buffered swaps"
 msgstr "'Swaps' de triple búfer"

+# Éste es un término estandarizado por Microsoft.
 #: src/bin/e_int_config_comp.c:292 src/bin/e_int_config_comp.c:517
-#, fuzzy
 msgid "Dithering"
-msgstr "Otras preferencias"
+msgstr "Interpolación de colores"

 #: src/bin/e_int_config_comp.c:298 src/bin/e_int_config_comp.c:544
 msgid "Rendering"
@ -3568,9 +3565,8 @@ msgid "Applications"
 msgstr "Aplicaciones"

 #: src/bin/e_int_menus.c:204
-#, fuzzy
 msgid "Blanking Block"
-msgstr "Apagado de pantalla"
+msgstr "Bloquear apagado de pantalla"

 #: src/bin/e_int_menus.c:212 src/bin/e_int_menus.c:1596
 #: src/modules/conf_window_manipulation/e_mod_main.c:17
@ -3921,7 +3917,6 @@ msgid "Enlightenment cannot set up its actions system.\n"
 msgstr "Enlightenment no puede configurar el sistema de acciones.\n"

 #: src/bin/e_main.c:794
-#, fuzzy
 msgid "Enlightenment cannot initialize the Privilege System access system.\n"
 msgstr ""
 "Enlightenment no puede iniciar el sistema de acceso del Sistema de "
@ -4047,7 +4042,7 @@ msgid "Version: %s\n"
 msgstr "Versión: %s\n"

 #: src/bin/e_main.c:1272
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options:\n"
 "  -display DISPLAY\n"
@ -4081,8 +4076,8 @@ msgstr ""
 "\t\tEG: -display :1.0\n"
 "\t-fake-xinerama-screen WxH+X+Y\n"
 "\t\tAgregar una pantalla xinerama falsa (en vez de las verdaderas)\n"
-" \t\tdado la geometría. Agregue todas las que quiera. Todos\n"
-"\t\treemplazen las verdaderas, si las haya. Se puede usar\n"
+" \t\tdado la geometría. Agregue todas las que quiera. Todas\n"
+"\t\treemplazen las verdaderas, si las hay. Se puede usar\n"
 "\t\testo para simular xinerama.\n"
 "\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen "
 "800x600+800+0\n"
@ -4471,117 +4466,142 @@ msgid "Error in Enlightenment System Service"
 msgstr "Error del Enlightenment System Service"

 #: src/bin/e_system.c:36
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because ecore_exe_run() failed."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque ecore_exe_run() ha fallado."

 #: src/bin/e_system.c:41
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because your user has no passwd file entry."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque su usuario no se encuentra en el archivo "
+"passwd."

 #: src/bin/e_system.c:46
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because your username is blank in the passwd file."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque su nombre está en blanco en el archivo passwd."

 #: src/bin/e_system.c:51
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because it could not allocate memory."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque no ha podido asignar memoria."

 #: src/bin/e_system.c:56
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because it can't find your user group entry."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque no puede encontrar su grupo de usuario."

 #: src/bin/e_system.c:61
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because your user group entry is blank."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque su grupo de usuario está en blanco."

 #: src/bin/e_system.c:66
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>since it can't become root. Missing setuid bit?"
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque no se puede hacer administrador. ¿Falta el "
+"bit setuid?"

 #: src/bin/e_system.c:71
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>since it can't become group root. Missing setuid bit?"
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque no se puede hacer grupo administrador. ¿Falta "
+"el bit setuid?"

 #: src/bin/e_system.c:76
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because the passwd file entry for root isn't found."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque no se encuentra ningún administrador en el "
+"archivo passwd."

 #: src/bin/e_system.c:81
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because the root home directory is blank."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque el directorio home del administrador está en "
+"blanco."

 #: src/bin/e_system.c:86
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because the root home directory is not a full path."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque la ruta al directorio home del administrador "
+"no es completa."

 #: src/bin/e_system.c:91
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because the root home directory can't be found."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque no se puede encontrar el directorio home del "
+"administrador."

 #: src/bin/e_system.c:96
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because it can't change the HOME environment."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque no se puede cambiar el entorno HOME."

 #: src/bin/e_system.c:101
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because it cannot change working directory to root's home."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque no se puede cambiar el directorio activo al "
+"home del administrador."

 #: src/bin/e_system.c:106
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system "
 "service<br>because your user is denied access to all services.<br>Please "
 "see /etc/enlightenment/system.conf."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de "
+"enlightenment_system<br>porque el usuario no tiene acceso a todos los "
+"servicios.<br>Por favor vea /etc/enlightenment/system.conf."

 #: src/bin/e_system.c:112
-#, fuzzy
 msgid ""
 "Enlightenment cannot successfully start<br>the enlightenment_system service "
 "for<br>some unknown reason."
-msgstr "Enlightenment no puede iniciar<br>el servicio de enlightenment_system."
+msgstr ""
+"Enlightenment no puede iniciar<br>el servicio de enlightenment_system<br>por "
+"un motivo desconocido."

 #: src/bin/e_theme_about.c:23
 msgid "Select Theme"
@ -5021,29 +5041,26 @@ msgid "Battery"
 msgstr "Batería"

 #: src/modules/battery/e_mod_main.c:236
-#, fuzzy
 msgid "Charging"
-msgstr "Margen"
+msgstr "Cargandose"

 #: src/modules/battery/e_mod_main.c:240
-#, fuzzy
 msgid "Discharging"
-msgstr "Descartar"
+msgstr "Descargandose"

 #: src/modules/battery/e_mod_main.c:245
-#, fuzzy
 msgid "Charged"
-msgstr "Grande"
+msgstr "Cargada"

 #: src/modules/battery/e_mod_main.c:434
-#, fuzzy, c-format
+#, c-format
 msgid "Battery: %s (%s)"
-msgstr "Batería"
+msgstr "Batería: %s (%s)"

 #: src/modules/battery/e_mod_main.c:436 src/modules/battery/e_mod_main.c:438
-#, fuzzy, c-format
+#, c-format
 msgid "Battery: %s"
-msgstr "Batería"
+msgstr "Batería: %s"

 #: src/modules/battery/e_mod_main.c:481
 msgid "Power Management Timing"
@ -5640,19 +5657,19 @@ msgstr "Tableta"

 #: src/modules/conf_bindings/e_int_config_acpibindings.c:421
 msgid "Next Media"
-msgstr ""
+msgstr "Siguiente medio"

 #: src/modules/conf_bindings/e_int_config_acpibindings.c:423
 msgid "Prev Media"
-msgstr ""
+msgstr "Anterior medio"

 #: src/modules/conf_bindings/e_int_config_acpibindings.c:425
 msgid "Stop Media"
-msgstr ""
+msgstr "Parar medio"

 #: src/modules/conf_bindings/e_int_config_acpibindings.c:427
 msgid "Play Media"
-msgstr ""
+msgstr "Reproducir medio"

 #: src/modules/conf_bindings/e_int_config_acpibindings.c:498
 #: src/modules/conf_bindings/e_int_config_edgebindings.c:4
@ -5998,46 +6015,41 @@ msgid "Signal Bindings Settings"
 msgstr "Preferencias de atajos de señales"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:675
-#, fuzzy
 msgid "Add Swipe Binding"
-msgstr "Agregar atajo de señal"
+msgstr "Agregar atajo de deslizamiento"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:686
-#, fuzzy
 msgid "Direction:"
-msgstr "Dirección"
+msgstr "Sentido:"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:696
-#, fuzzy
 msgid "Error:"
-msgstr "Error"
+msgstr "Error:"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:716
 msgid "Fingers:"
-msgstr ""
+msgstr "Dedos:"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:764
 #, c-format
 msgid ""
 "Using %d Fingers<br> <b>Direction</b> %f <b>Length</b> %f <b>Error</b> %f"
 msgstr ""
+"Utilizando %d Dados<br> <b>Sentido</b> %f <b>Longitud</b> %f <b>Error</b> %f"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:780
-#, fuzzy
 msgid "Swipe recognition"
-msgstr "Dirección"
+msgstr "Reconocimiento de deslizamiento"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:781
-#, fuzzy
 msgid "Do your swipe gesture.<br><br>Press <hilight>Escape</hilight> to abort"
 msgstr ""
-"Por favor, presionar una combinación de teclas,<ps/><ps/>o <hilight>Esc</"
-"hilight> para abortar."
+"Haga su gesto de deslizamiento.<br><br>Pulse <hilight>Esc</hilight> para "
+"abortar."

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:917
-#, fuzzy
 msgid "Swipe Bindings Help"
-msgstr "Configurar atajos"
+msgstr "Ayuda para atajos de deslizamiento"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:918
 msgid ""
@ -6048,16 +6060,22 @@ msgid ""
 "results. <br>3. If your session is running inside Xorg, ensure that your "
 "user is part of the libinput group.<br>"
 msgstr ""
+"Enlightenment usa libinput para detectar el gesto de deslizamiento. Si hay "
+"problemas:<br> 1. Prueba los gestos durante la ejecutación de \"libinput "
+"debug-events\" en el terminal. La salida del terminal se dirá la precisión "
+"de su equipo.<br>2. Esté atento para el error en el terminal, algunos "
+"dispositivos libinput dan resultados erroneos. <br>3. Si su sesión está "
+"dentro de Xorg, asegúrese de que su usurario pertenece al grupo de libinput."
+"<br>"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:932
 #: src/modules/conf_bindings/e_mod_main.c:38
-#, fuzzy
 msgid "Swipe Bindings"
-msgstr "Configurar atajos"
+msgstr "Atajos de deslizamiento"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:941
 msgid "Add by props"
-msgstr ""
+msgstr "Agregar por \"props\""

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:955
 #: src/modules/tiling/e_mod_config.c:219
@ -6065,14 +6083,12 @@ msgid "Help"
 msgstr "Ayuda"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:977
-#, fuzzy
 msgid "Open input devices"
-msgstr "No se puede desmontar el dispositivo"
+msgstr "Abrir dispositivos de entrada"

 #: src/modules/conf_bindings/e_int_config_swipebindings.c:1045
-#, fuzzy
 msgid "Swipe Bindings Settings"
-msgstr "Preferencias de los atajos de teclado"
+msgstr "Preferencias de los atajos de deslizamiento"

 #: src/modules/conf_bindings/e_mod_main.c:17
 #: src/modules/conf_interaction/e_mod_main.c:17
@ -6221,7 +6237,7 @@ msgstr "Entrar con PIN (inseguro)"

 #: src/modules/conf_display/e_int_config_desklock.c:253
 msgid "Locking"
-msgstr "Bloqueando"
+msgstr "Bloqueo"

 #: src/modules/conf_display/e_int_config_desklock.c:291
 msgid "Keyboard Layout"
@ -6259,7 +6275,7 @@ msgstr "Cuadro de inicio de sesión"

 #: src/modules/conf_display/e_int_config_desklock.c:322
 msgid "Lock after blanking"
-msgstr ""
+msgstr "Bloquear después del apagado"

 #: src/modules/conf_display/e_int_config_desklock.c:327
 #: src/modules/conf_display/e_int_config_screensaver.c:205
@ -6312,9 +6328,8 @@ msgid "Number of Desktops"
 msgstr "Número de escritorios"

 #: src/modules/conf_display/e_int_config_desks.c:174
-#, fuzzy
 msgid "Click to change wallpaper and name"
-msgstr "Clic para cambiar el fondo de pantalla"
+msgstr "Clic para cambiar el fondo de pantalla y nombre"

 #: src/modules/conf_display/e_int_config_desks.c:191
 msgid "Desktops"
@ -6362,9 +6377,10 @@ msgstr "%3.0f"
 msgid "Dim Backlight"
 msgstr "Retroiluminación suave"

+# DDC: Canal de Datos de Visualización o Canal de Datos de Pantalla
 #: src/modules/conf_display/e_int_config_dpms.c:159
 msgid "Desktop Monitor Support (DDC)"
-msgstr ""
+msgstr "Soporte de Datos de Pantalla (DDC)"

 #    ob = e_widget_check_add(evas, _("Idle Fade Time"), &(cfdata->enable_idle_dim));
 #    e_widget_on_change_hook_set(ob, _cb_disable, cfdata);
@ -6585,9 +6601,8 @@ msgstr "Aceleración"

 #: src/modules/conf_interaction/e_int_config_mouse.c:270
 #: src/modules/conf_interaction/e_int_config_mouse.c:308
-#, fuzzy
 msgid "Flat acceleration"
-msgstr "Aceleración"
+msgstr "Aceleración constante"

 #: src/modules/conf_interaction/e_int_config_mouse.c:272
 #: src/modules/conf_interaction/e_int_config_mouse.c:310
@ -6609,26 +6624,22 @@ msgstr "Botones"

 #: src/modules/conf_interaction/e_int_config_mouse.c:286
 #: src/modules/conf_interaction/e_int_config_mouse.c:321
-#, fuzzy
 msgid "Middle mouse button emulation"
-msgstr "Botón central"
+msgstr "Emulación del botón central"

 #: src/modules/conf_interaction/e_int_config_mouse.c:291
 #: src/modules/conf_interaction/e_int_config_mouse.c:332
-#, fuzzy
 msgid "Scrolling"
-msgstr "Sondeo"
+msgstr "Desplazamiento"

 #: src/modules/conf_interaction/e_int_config_mouse.c:293
 #: src/modules/conf_interaction/e_int_config_mouse.c:334
-#, fuzzy
 msgid "Natural scrolling"
-msgstr "Animar desplazamiento"
+msgstr "Desplazamiento natural"

 #: src/modules/conf_interaction/e_int_config_mouse.c:295
-#, fuzzy
 msgid "Hi-Res scrolling"
-msgstr "Animar desplazamiento"
+msgstr "Desplazamiento alta resolución"

 #: src/modules/conf_interaction/e_int_config_mouse.c:299
 #: src/modules/conf_interaction/e_mod_main.c:24
@ -6640,38 +6651,32 @@ msgid "Tap to click"
 msgstr "Tocar para clic"

 #: src/modules/conf_interaction/e_int_config_mouse.c:324
-#, fuzzy
 msgid "Clickpad"
-msgstr "Clic"
+msgstr "Panel clic (Clickpad)"

 #: src/modules/conf_interaction/e_int_config_mouse.c:327
 msgid "Palm detect"
-msgstr ""
+msgstr "Detectar palma"

 #: src/modules/conf_interaction/e_int_config_mouse.c:337
-#, fuzzy
 msgid "Horizontal scrolling"
-msgstr "Alineación horizontal"
+msgstr "Desplazamiento horizontal"

 #: src/modules/conf_interaction/e_int_config_mouse.c:340
-#, fuzzy
 msgid "Edge scrolling"
-msgstr "Animar desplazamiento"
+msgstr "Desplazamiento por los bordes"

 #: src/modules/conf_interaction/e_int_config_mouse.c:343
-#, fuzzy
 msgid "2 finger scrolling"
-msgstr "Animar desplazamiento"
+msgstr "Desplazamiento por 2 dedos"

 #: src/modules/conf_interaction/e_int_config_mouse.c:346
-#, fuzzy
 msgid "Circular scrolling"
-msgstr "Animar desplazamiento"
+msgstr "Desplazamiento circular"

 #: src/modules/conf_interaction/e_int_config_mouse.c:350
-#, fuzzy
 msgid "Touchpad"
-msgstr "Táctil"
+msgstr "Panel táctil"

 #: src/modules/conf_interaction/e_mod_main.c:20
 msgid "Touch"
@ -7137,9 +7142,8 @@ msgid "Laptop lid"
 msgstr "Tapa de portátil"

 #: src/modules/conf_randr/e_int_config_randr2.c:1055
-#, fuzzy
 msgid "Ignore Disconnect"
-msgstr "Ignorar hint"
+msgstr "Ignorar desconexión"

 #: src/modules/conf_randr/e_int_config_randr2.c:1064
 msgid "Priority"
@ -7180,7 +7184,7 @@ msgstr "Escala"

 #: src/modules/conf_randr/e_int_config_randr2.c:1180
 msgid "Response"
-msgstr ""
+msgstr "Respuesta"

 # Hay que encontrar algo más corto.
 # Preguntar a Massimo sobre cadenas largas en italiano.
@ -7189,9 +7193,8 @@ msgid "Restore on start"
 msgstr "Restaurar configuración al iniciar"

 #: src/modules/conf_randr/e_int_config_randr2.c:1201
-#, fuzzy
 msgid "Use command"
-msgstr "Comando"
+msgstr "Usar comando"

 # Controlar en vez de "pantalla", eso de hotplug de una pantalla externa:
 #    o = elm_check_add(win);
@ -7520,14 +7523,12 @@ msgid "%1.2f x"
 msgstr "%1.2f x"

 #: src/modules/conf_theme/e_int_config_scale.c:333
-#, fuzzy
 msgid "Set Application DPI"
-msgstr "Aplicación seleccionada"
+msgstr "Seleccione DPI de la aplicación"

 #: src/modules/conf_theme/e_int_config_scale.c:337
-#, fuzzy
 msgid "Application Base DPI"
-msgstr "Aplicaciones"
+msgstr "DPI de base de la aplicación"

 #: src/modules/conf_theme/e_int_config_scale.c:343
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:211
@ -7641,7 +7642,7 @@ msgstr "Transiciones"

 #: src/modules/conf_theme/e_int_config_transitions.c:232
 msgid "Animation Period Multiplier"
-msgstr ""
+msgstr "Multiplicador del periodo de animación"

 #: src/modules/conf_theme/e_int_config_wallpaper.c:104
 msgid "Wallpaper Settings"
@ -7718,7 +7719,7 @@ msgstr "Tema"
 #: src/modules/conf_theme/e_mod_main.c:103
 #: src/modules/conf_theme/e_mod_main.c:126
 msgid "Palette"
-msgstr ""
+msgstr "Paleta"

 #: src/modules/conf_theme/e_mod_main.c:100
 msgid "Application Theme"
@ -8215,9 +8216,10 @@ msgstr "Asegurar emplazamiento inicial de ventanas a la geometría útil"
 msgid "Adjust windows on shelf hide"
 msgstr "Ajustar las ventanas al ocultar el estante"

+# ¿Demasiado largo?
 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:275
 msgid "Set hidden state when not on current desktop"
-msgstr ""
+msgstr "Establecer estado escondido cuando no está en el escritorio actual"

 #: src/modules/conf_window_manipulation/e_int_config_window_geometry.c:283
 msgid "Follow Move"
@ -8336,9 +8338,8 @@ msgid "Ok"
 msgstr "Aceptar"

 #: src/modules/connman/agent.c:311
-#, fuzzy
 msgid "Connman Error"
-msgstr "Error de conexión"
+msgstr "Error de Connman"

 #: src/modules/connman/e_connman.c:905
 msgid "Connman Service Missing"
@ -8387,7 +8388,7 @@ msgstr "Ahorro de energía automático"

 #: src/modules/cpufreq/e_mod_config.c:88
 msgid "Update poll interval"
-msgstr "Intervalo de sondeo"
+msgstr "Intervalo de actualización"

 # "clock tick" = impulsos del reloj que no tiene significado fijo en terminos del tiempo
 # Antiguo: 0,01 segundo
@ -9114,7 +9115,7 @@ msgstr "Barra lateral"

 #: src/modules/fileman/e_mod_config.c:362
 msgid "Show Detailed Time and Date"
-msgstr ""
+msgstr "Muestra hora y fecha detalladas"

 #: src/modules/fileman/e_mod_config.c:403
 msgid "Open Dirs In Place"
@ -9225,9 +9226,8 @@ msgid "GTK Bookmarks"
 msgstr "Marcadores GTK"

 #: src/modules/fileman/e_mod_menu.c:521
-#, fuzzy
 msgid "Recent"
-msgstr "Archivos recientes"
+msgstr "Recientes"

 #: src/modules/fileman/e_mod_menu.c:600
 msgid "Current Directory"
@ -9252,9 +9252,10 @@ msgid_plural "Processing %d operations"
 msgstr[0] "Procesando %d operación"
 msgstr[1] "Procesando %d operaciones"

+# 2024: inactivo en vez de no se está utilizando - por ser más corta
 #: src/modules/fileman_opinfo/e_mod_main.c:345
 msgid "Filemanager is idle"
-msgstr "El gestor de archivos no se está utilizando"
+msgstr "El gestor de archivos está inactivo"

 #: src/modules/fileman_opinfo/e_mod_main.c:435
 msgid "EFM Operation Info"
@ -9323,6 +9324,7 @@ msgstr "Opciones de fondo"
 msgid "Desktop Overlay"
 msgstr "Capa encima del escritorio"

+# 2024: inicio en italiano; sólo move/resize en fr y pt
 #: src/modules/gadman/e_mod_gadman.c:1064
 msgid "Begin move/resize"
 msgstr "Mover/Redimensionar"
@ -9433,19 +9435,18 @@ msgid "Lock icon move"
 msgstr "Bloquear movimiento de los iconos"

 #: src/modules/ibar/e_mod_config.c:151
-#, fuzzy
 msgid "Don't show active windows"
-msgstr "No poner sobre ventanas"
+msgstr "No mostrar ventanas activas"

 # Al lanzar desde el iBar
 #: src/modules/ibar/e_mod_config.c:153
 msgid "Track launch"
 msgstr "Seguir lanzamiento"

+# it, fr, pt: sólo con miniatura (no vista)
 #: src/modules/ibar/e_mod_config.c:155
-#, fuzzy
 msgid "Miniview on mouse over"
-msgstr "Mostrar Menú al pasar el ratón"
+msgstr "Vista en miniatura al pasar el ratón"

 #: src/modules/ibar/e_mod_config.c:189
 msgid "Create new IBar source"
@ -9620,28 +9621,25 @@ msgid "Mute Volume of Focused Application"
 msgstr "Silenciar la aplicación con foco"

 #: src/modules/mixer/backend.c:390 src/modules/mixer/backend.c:456
-#, fuzzy
 msgid "Increase Mic Volume"
-msgstr "Subir volumen"
+msgstr "Subir volumen del micro"

 #: src/modules/mixer/backend.c:397 src/modules/mixer/backend.c:462
-#, fuzzy
 msgid "Decrease Mic Volume"
-msgstr "Bajar volumen"
+msgstr "Bajar volumen del micro"

+# 2024: ?por qué "volumen"?
 #: src/modules/mixer/backend.c:404
-#, fuzzy
 msgid "Mute Mic volume"
-msgstr "Silenciar"
+msgstr "Silenciar micro"

 #: src/modules/mixer/backend.c:429
 msgid "Mute Volume"
 msgstr "Silenciar"

 #: src/modules/mixer/backend.c:468
-#, fuzzy
 msgid "Mute Mic Volume"
-msgstr "Silenciar"
+msgstr "Silenciar micro"

 #: src/modules/mixer/emixer.c:1952
 msgid "Playback"
@ -9849,9 +9847,9 @@ msgid "Security update"
 msgstr "Actualización de seguridad"

 #: src/modules/packagekit/e_mod_packagekit.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown PackageKit"
-msgstr "Versión desconocida de PackageKit"
+msgstr "PackageKit desconocido"

 #: src/modules/packagekit/e_mod_packagekit.c:239
 msgid "No information available"
@ -9883,21 +9881,19 @@ msgid "Nothing to do"
 msgstr "Nada que hacer"

 #: src/modules/packagekit/e_mod_packagekit.c:294
-#, fuzzy
 msgid "Install updates"
-msgstr "Instalar todas las actualizaciones"
+msgstr "Instalar actualizaciones"

 #: src/modules/packagekit/e_mod_packagekit.c:299
-#, fuzzy, c-format
+#, c-format
 msgid "Install update"
 msgid_plural "Install %d updates"
-msgstr[0] "Instalar la actualización seleccionada"
-msgstr[1] "Instalar %d actualizaciones seleccionadas"
+msgstr[0] "Instalar la actualización"
+msgstr[1] "Instalar %d actualizaciones"

 #: src/modules/packagekit/e_mod_packagekit.c:578
-#, fuzzy
 msgid "Manage packages"
-msgstr "Gestor de paquetes"
+msgstr "Gestionar paquetes"

 #: src/modules/pager/e_mod_config.c:74
 msgid "Pager Settings"
@ -10061,48 +10057,44 @@ msgstr "Introduzca su contraseña"
 #: src/modules/polkit/auth_ui.c:148
 #, c-format
 msgid "Enter password for <b>%s</b>"
-msgstr ""
+msgstr "Escribir contraseña de <b>%s</b>"

 #: src/modules/polkit/auth_ui.c:150
 #, c-format
 msgid "Enter password for UID %u"
-msgstr ""
+msgstr "Escribir contraseña de UID %u"

 #: src/modules/procstats/e_mod_main.c:370
-#, fuzzy
 msgid "B"
-msgstr "KB"
+msgstr "B"

 #: src/modules/procstats/e_mod_main.c:370
-#, fuzzy
 msgid "KiB"
-msgstr "KB"
+msgstr "KiB"

 #: src/modules/procstats/e_mod_main.c:370
-#, fuzzy
 msgid "MiB"
-msgstr "MB"
+msgstr "MiB"

 #: src/modules/procstats/e_mod_main.c:370
-#, fuzzy
 msgid "GiB"
-msgstr "GB"
+msgstr "GiB"

 #: src/modules/procstats/e_mod_main.c:371
 msgid "TiB"
-msgstr ""
+msgstr "TiB"

 #: src/modules/procstats/e_mod_main.c:371
 msgid "PiB"
-msgstr ""
+msgstr "PiB"

 #: src/modules/procstats/e_mod_main.c:371
 msgid "EiB"
-msgstr ""
+msgstr "EiB"

 #: src/modules/procstats/e_mod_main.c:371
 msgid "ZiB"
-msgstr ""
+msgstr "ZiB"

 #: src/modules/quickaccess/e_mod_config.c:231
 msgid "Enter a unique name for this entry"
@ -10577,6 +10569,8 @@ msgid ""
 "This image will be uploaded without any encryption<ps/>to enlightenment.org. "
 "All screenshots uploaded are<ps/>available to everyone with no restrictions."
 msgstr ""
+"Esta imagen se subirá sin cifrado a enlightenment.org.<ps/>Todas la capturas "
+"de pantalla subidas están<ps/>disponibles a todos sin restricciones."

 #: src/modules/shot/e_mod_share.c:254
 msgid "Confirm"
@ -10654,9 +10648,8 @@ msgid "Show"
 msgstr "Mostrar"

 #: src/modules/tasks/e_mod_config.c:124
-#, fuzzy
 msgid "Preview Size"
-msgstr "Tamaño de la previsualización:"
+msgstr "Tamaño previsualización"

 #: src/modules/tasks/e_mod_main.c:309 src/modules/tasks/e_mod_main.c:945
 msgid "Tasks"
@ -10819,19 +10812,17 @@ msgstr "Preferencias del conmutador de ventanas"

 # Everything popup definido por un atajo de borde.
 #: src/modules/winlist/e_int_config_winlist.c:183
-#, fuzzy
 msgid "Large Mode Size"
-msgstr "Tamaño de la ventana emergente del borde"
+msgstr "Tamaño de modo grande"

 #: src/modules/winlist/e_int_config_winlist.c:188
-#, fuzzy
 msgid "List Mode Size"
-msgstr "Última modificación:"
+msgstr "Tamaño de modo listado"

+# 2024: it = visualizar; fr, pt = cuadricula
 #: src/modules/winlist/e_int_config_winlist.c:193
-#, fuzzy
 msgid "List Window Miniatures"
-msgstr "Ventanas perdidas"
+msgstr "Mostrar miniaturas de ventanas"

 #: src/modules/winlist/e_int_config_winlist.c:196
 msgid "Windows from other desks"
--- a/po/fr.po
+++ b/po/fr.po
@ -19,7 +19,7 @@ msgstr ""
 "Project-Id-Version: enlightenment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-23 21:51+0100\n"
-"PO-Revision-Date: 2024-01-24 08:37+0100\n"
+"PO-Revision-Date: 2024-05-15 14:34+0200\n"
 "Last-Translator: Philippe Jean Guillaumie <similar@orange.fr>\n"
 "Language-Team: French\n"
 "Language: fr\n"
@ -27,7 +27,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Poedit 3.4.2\n"
+"X-Generator: Poedit 3.4.3\n"
 "X-Poedit-SourceCharset: utf-8\n"

 #: src/bin/e_about.c:17
@ -143,11 +143,11 @@ msgstr "Voulez-vous vraiment fermer la session ?"

 #: src/bin/e_actions.c:2401
 msgid "Power off"
-msgstr "Éteindre"
+msgstr "Arrêt"

 #: src/bin/e_actions.c:2403
 msgid "Are you sure you want to power off your computer?"
-msgstr "Voulez-vous vraiment éteindre votre ordinateur ?"
+msgstr "Voulez-vous vraiment arrêter votre ordinateur ?"

 #: src/bin/e_actions.c:2459 src/bin/e_actions.c:4011
 msgid "Reboot"
@ -852,11 +852,11 @@ msgstr "Déconnexion"

 #: src/bin/e_actions.c:4003
 msgid "Power Off Now"
-msgstr "Éteindre directement"
+msgstr "Arrêt immédiat"

 #: src/bin/e_actions.c:4007
 msgid "Power Off"
-msgstr "Éteindre"
+msgstr "Arrêt"

 #: src/bin/e_actions.c:4015
 msgid "Suspend Now"
@ -1471,12 +1471,12 @@ msgstr "%s a été interrompu par un signal d'interruption."
 #: src/bin/e_exec.c:1070
 #, c-format
 msgid "%s was interrupted by a Quit Signal."
-msgstr "%s a été interrompu par un signal de sortie."
+msgstr "%s a été interrompu par un signal de sortie (Quit)."

 #: src/bin/e_exec.c:1074
 #, c-format
 msgid "%s was interrupted by an Abort Signal."
-msgstr "%s a été interrompu par un signal d'arrêt."
+msgstr "%s a été interrompu par un signal d'abandon (Abort)."

 #: src/bin/e_exec.c:1077
 #, c-format
@ -1929,8 +1929,8 @@ msgid ""
 "Are you sure you want to delete<ps/>the %d selected file in<ps/><hilight>%s</"
 "hilight>?"
 msgid_plural ""
-"Are you sure you want to delete<ps/>the %d selected files in<ps/"
-"><hilight>%s</hilight>?"
+"Are you sure you want to delete<ps/>the %d selected files in<ps/><hilight>"
+"%s</hilight>?"
 msgstr[0] ""
 "Voulez-vous vraiment supprimer<ps/>%d fichier sélectionné dans :<ps/"
 "><hilight>%s</hilight> ?"
@ -4315,8 +4315,8 @@ msgid ""
 "Powering off.<ps/>You cannot perform any other system actions<ps/>once a "
 "shutdown has been started."
 msgstr ""
-"Extinction en cours.<ps/>Vous ne pouvez pas effectuer d'autres actions "
-"système<ps/>pendant cette phase."
+"Arrêt en cours.<ps/>Vous ne pouvez pas effectuer d'autres actions système<ps/"
+">pendant cette phase."

 #: src/bin/e_sys.c:1058
 msgid ""
@ -5740,9 +5740,8 @@ msgstr "Erreur de raccourci clavier"
 #: src/modules/conf_bindings/e_int_config_keybindings.c:979
 #, c-format
 msgid ""
-"The binding key combination that you chose is already used by <ps/"
-"><hilight>%s</hilight> action.<ps/>Please choose another binding key "
-"combination."
+"The binding key combination that you chose is already used by <ps/><hilight>"
+"%s</hilight> action.<ps/>Please choose another binding key combination."
 msgstr ""
 "La séquence de raccourci que vous avez choisie est déjà utilisée<ps/>par "
 "l'action <hilight>%s</hilight>.<ps/>Choisissez une autre séquence de "
@ -8635,8 +8634,8 @@ msgstr ""
 "<hilight>&lt;Ctrl+Tab&gt;</hilight> détail des entrées (ça dépend du "
 "greffon)<ps/>    <hilight>&lt;Ctrl+« x »&gt;</hilight> va au greffon "
 "commençant par la lettre « x »<ps/>    <hilight>&lt;Ctrl+Flèche gauche / "
-"droite&gt;</hilight> circule parmi les greffons<ps/>    <hilight>&lt;"
-"Ctrl+Flèche haut / bas&gt;</hilight> va au premier / dernier élément<ps/>    "
+"droite&gt;</hilight> circule parmi les greffons<ps/>    <hilight>&lt;Ctrl"
+"+Flèche haut / bas&gt;</hilight> va au premier / dernier élément<ps/>    "
 "<hilight>&lt;Ctrl+1&gt;</hilight> commute le mode d'affichage (quitte cette "
 "page ;)<ps/>    <hilight>&lt;Ctrl+2&gt;</hilight> commute le mode "
 "d'affichage en liste<ps/>    <hilight>&lt;Ctrl+3&gt;</hilight> commute le "
@ -9900,8 +9899,8 @@ msgid ""
 "either the app is unknown to us<ps/>or it is not intended for use with this "
 "option.<ps/>Please choose an action to take:"
 msgstr ""
-"La fenêtre sélectionnée créée avec le nom :<ps/>%s<ps/>et la classe :<ps/"
-">%s<ps/> est introuvable dans la base de données des<ps/>applications pour "
+"La fenêtre sélectionnée créée avec le nom :<ps/>%s<ps/>et la classe :<ps/>"
+"%s<ps/> est introuvable dans la base de données des<ps/>applications pour "
 "les accès rapides.<ps/> Cela signifie que l'application est soit inconnue,"
 "<ps/>soit inutilisable dans ce cas de figure.<ps/>Choisissez une action à "
 "appliquer :"
@ -10894,7 +10893,7 @@ msgstr "Solaris"
 #: src/modules/xkbswitch/e_mod_config.c:811
 #: src/modules/xkbswitch/e_mod_config.c:1229
 msgid "Terminate X"
-msgstr "Arrêter serveur X"
+msgstr "Arrêter le serveur X"

 #: src/modules/xkbswitch/e_mod_config.c:1073
 msgid "Switch Layout"
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@ -278,6 +278,28 @@ _desklock_show_internal(Eina_Bool suspend)
   if (e_config->desklock_language)
     e_intl_language_set(e_config->desklock_language);

+   if ((e_config->xkb.lock_layout) && (e_config->xkb.desklock_layout))
+     {
+        if ((!e_config->xkb.lock_layout->name) ||
+            (!!strcmp(e_config->xkb.lock_layout->name, e_config->xkb.desklock_layout)))
+          {
+             e_config_xkb_layout_free(e_config->xkb.lock_layout);
+             e_config->xkb.lock_layout = NULL;
+          }
+     }
+   if ((e_config->xkb.desklock_layout) && (!e_config->xkb.lock_layout))
+     {
+        E_Config_XKB_Layout *cl;
+
+        EINA_LIST_FOREACH(e_config->xkb.used_layouts, l, cl)
+          {
+            if ((cl->name) && (!strcmp(cl->name, e_config->xkb.desklock_layout)))
+              {
+                 e_config->xkb.lock_layout = e_config_xkb_layout_dup(cl);
+                 break;
+              }
+          }
+     }
   if (e_config->xkb.lock_layout)
     e_xkb_layout_set(e_config->xkb.lock_layout);

--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@ -12,7 +12,7 @@ static Ecore_Event_Handler *_e_dpms_handler_desk_show = NULL;
 static unsigned int _e_dpms_timeout_standby = 0;
 static unsigned int _e_dpms_timeout_suspend = 0;
 static unsigned int _e_dpms_timeout_off = 0;
-static int _e_dpms_enabled = EINA_FALSE;
+static int _e_dpms_enabled = -1;
 E_API Eina_Bool e_dpms_actual = EINA_FALSE;

 #ifdef HAVE_WAYLAND
@ -43,15 +43,19 @@ e_dpms_update(void)
               {
                  ecore_x_dpms_enabled_set(enabled);
                  e_dpms_actual = enabled;
+                 if (_e_dpms_enabled) fprintf(stderr, "DPMS: on\n");
+                 else fprintf(stderr, "DPMS: off\n");
               }
             else
               {
                  ecore_x_dpms_enabled_set(0);
                  e_dpms_actual = EINA_FALSE;
+                 fprintf(stderr, "DPMS: off\n");
               }
          }
 #endif
     }
+   else fprintf(stderr, "DPMS: unchanged (%s)\n", enabled ? "on" : "off");
   if (!enabled) return;

   if (e_config->screensaver_enable)
--- a/src/bin/e_font.c
+++ b/src/bin/e_font.c
@ -163,7 +163,7 @@ _e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, con
        int len;

        len = s1 - font;
-        name = calloc(sizeof(char), len + 1);
+        name = calloc(len + 1, sizeof(char));
        strncpy(name, font, len);

        /* Get subname (should be english)  */
@ -204,7 +204,7 @@ _e_font_fontconfig_name_parse(Eina_Hash **font_hash, E_Font_Properties *efp, con

                  len = s2 - style;
                  style_old = style;
-                  style = calloc(sizeof(char), len + 1);
+                  style = calloc(len + 1, sizeof(char));
                  strncpy(style, style_old, len);
                  efp->styles = eina_list_append(efp->styles, eina_stringshare_add(style));
                  free(style);
--- a/src/bin/e_imc_main.c
+++ b/src/bin/e_imc_main.c
@ -145,7 +145,7 @@ main(int argc, char **argv)
   /* else create new imc */
   if (write_ops != 0)
     {
-        write_imc = calloc(sizeof(E_Input_Method_Config), 1);
+        write_imc = calloc(1, sizeof(E_Input_Method_Config));
        write_imc->version = E_INTL_INPUT_METHOD_CONFIG_VERSION;
        if (read_imc)
          {
--- a/src/bin/e_randr2.c
+++ b/src/bin/e_randr2.c
@ -91,6 +91,7 @@ e_randr2_init(void)
   E_CONFIG_VAL(D, T, hotplug_response, DOUBLE);
   E_CONFIG_VAL(D, T, restore, UCHAR);
   E_CONFIG_VAL(D, T, use_cmd, UCHAR);
+   E_CONFIG_VAL(D, T, ignore_output, UCHAR);
   E_CONFIG_VAL(D, T, ignore_hotplug_events, UCHAR);
   E_CONFIG_VAL(D, T, ignore_acpi_events, UCHAR);
   E_CONFIG_VAL(D, T, default_policy, UINT);
@ -395,6 +396,7 @@ _config_load(void)
   cfg->screens = NULL;
   cfg->restore = 1;
   cfg->use_cmd = 0;
+   cfg->ignore_output = 0;
   cfg->ignore_hotplug_events = 0;
   cfg->ignore_acpi_events = 0;
   cfg->default_policy = E_RANDR2_POLICY_EXTEND;
@ -644,9 +646,20 @@ _config_screen_match_count(E_Randr2 *r, E_Config_Randr2 *cfg)
        if (!cs->id) continue;
        EINA_LIST_FOREACH(r->screens, ll, s)
          {
+             const char *s1, *s2;
+
             if ((!s->id) || (!s->info.connected) ||
                 (_screen_closed(s))) continue;
-             if (!strcmp(cs->id, s->id)) count++;
+             s1 = cs->id;
+             s2 = s->id;
+             if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+               {
+                  s1 = strchr(cs->id, '/');
+                  if (!s1) s1 = cs->id;
+                  s2 = strchr(s->id, '/');
+                  if (!s2) s2 = s->id;
+               }
+             if (!strcmp(s1, s2)) count++;
          }
     }
   return count;
@ -667,10 +680,18 @@ _screens_fingerprint(E_Randr2 *r)
        if (!s->id) eina_strbuf_append(buf, ":NULL:");
        else
          {
+             const char *s1;
+
             eina_strbuf_append(buf, ":");
-             eina_strbuf_append(buf, s->id);
+             s1 = s->id;
+             if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+               {
+                  s1 = strchr(s->id, '/');
+                  if (!s1) s1 = s->id;
+               }
+             eina_strbuf_append(buf, s1);
             eina_strbuf_append(buf, ":");
-// Don't do this asbecause this forces a screen replug when you open and
+// Don't do this because this forces a screen replug when you open and
 // close your laptop lid and if that is the only thing you open or close...
 //             if (s->info.lid_closed) eina_strbuf_append(buf, ":LC:");
 //             else eina_strbuf_append(buf, ":LO:");
@ -733,7 +754,23 @@ _screens_differ(E_Randr2 *r1, E_Randr2 *r2)
               printf("RRR: look at r1 screen ID %s\n", ss->id);
             else
               printf("RRR: look at r1 screen ID NIL\n");
-             if ((ss->id) && (!strcmp(s->id, ss->id))) break;
+
+             if (ss->id)
+               {
+                  const char *ss1, *ss2;
+
+                  ss1 = s->id;
+                  ss2 = ss->id;
+                  if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+                    {
+                       ss1 = strchr(s->id, '/');
+                       if (!ss1) ss1 = s->id;
+                       ss2 = strchr(ss->id, '/');
+                       if (!ss2) ss2 = ss->id;
+                    }
+
+                  if (!strcmp(ss1, ss2)) break;
+               }
             ss = NULL;
          }
        if (!ss)
@ -973,7 +1010,19 @@ _screen_id_find(const char *id)
   Eina_List *l;
   EINA_LIST_FOREACH(e_randr2->screens, l, s)
     {
-        if (!strcmp(s->id, id)) return s;
+        const char *s1, *s2;
+
+        s1 = s->id;
+        s2 = id;
+        if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+          {
+             s1 = strchr(s->id, '/');
+             if (!s1) s1 = s->id;
+             s2 = strchr(id, '/');
+             if (!s2) s2 = id;
+          }
+
+        if (!strcmp(s1, s2)) return s;
     }
   return NULL;
 }
@ -1001,8 +1050,21 @@ _config_screen_string_find(E_Config_Randr2 *cfg, const char *id)
   if ((!id) || (!cfg)) return NULL;
   EINA_LIST_FOREACH(cfg->screens, l, cs)
     {
+        const char *s1, *s2;
+
        if (!cs->id) continue;
-        if (!strcmp(cs->id, id)) return cs;
+
+        s1 = cs->id;
+        s2 = id;
+        if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+          {
+             s1 = strchr(cs->id, '/');
+             if (!s1) s1 = cs->id;
+             s2 = strchr(id, '/');
+             if (!s2) s2 = id;
+          }
+
+        if (!strcmp(s1, s2)) return cs;
     }
   return NULL;
 }
@ -1482,8 +1544,19 @@ e_randr2_config_screen_find(E_Randr2_Screen *s, E_Config_Randr2 *cfg)
   if (!s->id) return NULL;
   EINA_LIST_FOREACH(cfg->screens, l, cs)
     {
+        const char *s1, *s2;
+
        if (!cs->id) continue;
-        if (!strcmp(cs->id, s->id)) return cs;
+        s1 = cs->id;
+        s2 = s->id;
+        if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+          {
+             s1 = strchr(cs->id, '/');
+             if (!s1) s1 = cs->id;
+             s2 = strchr(s->id, '/');
+             if (!s2) s2 = s->id;
+          }
+        if (!strcmp(s1, s2)) return cs;
     }
   return NULL;
 }
@ -1615,7 +1688,18 @@ e_randr2_screen_id_find(const char *id)
   if (!id) return NULL;
   EINA_LIST_FOREACH(e_randr2->screens, l, s)
     {
-        if (!strcmp(id, s->id)) return s;
+        const char *s1, *s2;
+
+        s1 = id;
+        s2 = s->id;
+        if ((e_randr2_cfg) && (e_randr2_cfg->ignore_output))
+          {
+             s1 = strchr(id, '/');
+             if (!s1) s1 = id;
+             s2 = strchr(s->id, '/');
+             if (!s2) s2 = s->id;
+          }
+        if (!strcmp(s1, s2)) return s;
     }
   return NULL;
 }
--- a/src/bin/e_randr2.h
+++ b/src/bin/e_randr2.h
@ -103,6 +103,7 @@ struct _E_Config_Randr2
   unsigned char  ignore_hotplug_events;
   unsigned char  ignore_acpi_events;
   unsigned char  use_cmd;
+   unsigned char  ignore_output;
   E_Randr2_Policy default_policy;
   double         hotplug_response;
 };
--- a/src/bin/e_sys_main.c
+++ b/src/bin/e_sys_main.c
@ -342,6 +342,7 @@ main(int argc,
                  rm = EINA_FALSE;
                  eina_stringshare_del(s);
               }
+             eina_iterator_free(it);
             if (rm)
               {
                  if (rmdir(path))
--- a/src/bin/system/e_system_ddc.c
+++ b/src/bin/system/e_system_ddc.c
@ -304,9 +304,14 @@ err:
 static Eina_Bool
 _ddc_init(void)
 {
-   // .so.3 is ABI compatible twith .so.2 for out uses - see
-   // https://www.ddcutil.com/c_api_99/ for changes between them
-   ddc_lib = dlopen("libddcutil.so.4", RTLD_NOW | RTLD_LOCAL);
+   // .so.[345] are ABI compatible with .so.2 for our uses - see
+   // the changes listed at:
+   // - https://www.ddcutil.com/c_api_99/
+   // - https://www.ddcutil.com/c_api_120/
+   // - https://www.ddcutil.com/c_api_200/
+   ddc_lib = dlopen("libddcutil.so.5", RTLD_NOW | RTLD_LOCAL);
+   if (!ddc_lib)
+     ddc_lib = dlopen("libddcutil.so.4", RTLD_NOW | RTLD_LOCAL);
   if (!ddc_lib)
     ddc_lib = dlopen("libddcutil.so.3", RTLD_NOW | RTLD_LOCAL);
   if (!ddc_lib)
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@ -947,6 +947,7 @@ e_modapi_init(E_Module *m)
 E_API int
 e_modapi_shutdown(E_Module *m EINA_UNUSED)
 {
+   E_FREE_LIST(handlers, ecore_event_handler_del);
   if (act)
     {
        e_action_predef_name_del("Clock", "Toggle calendar");
--- a/src/modules/conf_randr/e_int_config_randr2.c
+++ b/src/modules/conf_randr/e_int_config_randr2.c
@ -31,6 +31,7 @@ struct _E_Config_Dialog_Data
   Evas_Object *policy_obj;
   int restore;
   int use_cmd;
+   int no_ignore_output;
   int hotplug;
   int acpi;
   int screen;
@ -105,6 +106,7 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED)
   if (cfd->data) cfdata->params = strdup(cfd->data);
   cfdata->restore = e_randr2_cfg->restore;
   cfdata->use_cmd = e_randr2_cfg->use_cmd;
+   cfdata->no_ignore_output = !e_randr2_cfg->ignore_output;
   cfdata->hotplug = !e_randr2_cfg->ignore_hotplug_events;
   cfdata->acpi = !e_randr2_cfg->ignore_acpi_events;
   cfdata->policy = e_randr2_cfg->default_policy;
@ -157,6 +159,14 @@ _cb_use_cmd_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_U
   e_config_dialog_changed_set(cfdata->cfd, EINA_TRUE);
 }

+static void
+_cb_no_ignore_output_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED)
+{
+   E_Config_Dialog_Data *cfdata = data;
+   cfdata->no_ignore_output = elm_check_state_get(obj);
+   e_config_dialog_changed_set(cfdata->cfd, EINA_TRUE);
+}
+
 static void
 _cb_hotplug_changed(void *data EINA_UNUSED, Evas_Object *obj, void *event EINA_UNUSED)
 {
@ -1204,6 +1214,15 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas EINA_UNUSED, E_Config_Dialog_Data
   evas_object_show(o);
   evas_object_smart_callback_add(o, "changed", _cb_use_cmd_changed, cfdata);

+   o = elm_check_add(win);
+   evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
+   evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_object_text_set(o, _("Use output"));
+   elm_check_state_set(o, cfdata->no_ignore_output);
+   elm_box_pack_end(bx2, o);
+   evas_object_show(o);
+   evas_object_smart_callback_add(o, "changed", _cb_no_ignore_output_changed, cfdata);
+
   o = elm_check_add(win);
   evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0);
   evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -1249,6 +1268,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)

   e_randr2_cfg->restore = cfdata->restore;
   e_randr2_cfg->use_cmd = cfdata->use_cmd;
+   e_randr2_cfg->ignore_output = !cfdata->no_ignore_output;
   e_randr2_cfg->ignore_hotplug_events = !cfdata->hotplug;
   e_randr2_cfg->ignore_acpi_events = !cfdata->acpi;
   e_randr2_cfg->default_policy = cfdata->policy;
--- a/src/modules/convertible/accelerometer-orientation.h
+++ b/src/modules/convertible/accelerometer-orientation.h
@ -0,0 +1,16 @@
+//
+// Created by raffaele on 01/05/19.
+//
+
+#ifndef E_GADGET_CONVERTIBLE_IIO_SENSOR_ACCELEROMETER_H
+#define E_GADGET_CONVERTIBLE_IIO_SENSOR_ACCELEROMETER_H
+
+// Those costants are the possible states for the orientation of the accelerometer.
+
+#define ACCELEROMETER_ORIENTATION_UNDEFINED "undefined"
+#define ACCELEROMETER_ORIENTATION_NORMAL "normal"
+#define ACCELEROMETER_ORIENTATION_LEFT "left-up"
+#define ACCELEROMETER_ORIENTATION_RIGHT "right-up"
+#define ACCELEROMETER_ORIENTATION_BOTTOM "bottom-up"
+
+#endif //E_GADGET_CONVERTIBLE_IIO_SENSOR_ACCELEROMETER_H
--- a/src/modules/convertible/convertible_logging.h
+++ b/src/modules/convertible/convertible_logging.h
@ -0,0 +1,22 @@
+//
+// Created by raffaele on 29/05/19.
+//
+
+#ifndef E_GADGET_CONVERTIBLE_CONVERTIBLE_LOGGING_H
+#define E_GADGET_CONVERTIBLE_CONVERTIBLE_LOGGING_H
+
+#undef CRIT
+#undef ERR
+#undef WARN
+#undef INF
+#undef DBG
+
+extern int _convertible_log_dom;
+#define CRIT(...)     EINA_LOG_DOM_CRIT(_convertible_log_dom, __VA_ARGS__)
+#define ERR(...)      EINA_LOG_DOM_ERR(_convertible_log_dom, __VA_ARGS__)
+#define WARN(...)      EINA_LOG_DOM_WARN(_convertible_log_dom, __VA_ARGS__)
+#define INF(...)      EINA_LOG_DOM_INFO(_convertible_log_dom, __VA_ARGS__)
+#define DBG(...)      EINA_LOG_DOM_DBG(_convertible_log_dom, __VA_ARGS__)
+
+
+#endif //E_GADGET_CONVERTIBLE_CONVERTIBLE_LOGGING_H
--- a/src/modules/convertible/dbus_acceleration.c
+++ b/src/modules/convertible/dbus_acceleration.c
@ -0,0 +1,495 @@
+//
+// Created by raffaele on 01/05/19.
+//
+//#include <Ecore_X.h>
+#include "convertible_logging.h"
+#include "accelerometer-orientation.h"
+#include "dbus_acceleration.h"
+#include "e_mod_main.h"
+#include "input_rotation.h"
+
+static DbusAccelerometer* accelerometer_dbus;
+
+
+static int
+_convertible_rotation_get(const screen_rotation orientation)
+{
+    switch (orientation)
+    {
+        case NORMAL: return 0;
+        case LEFT_UP: return 90;
+        case FLIPPED: return 180;
+        case RIGHT_UP: return 270;
+
+        default: return 0;
+    }
+}
+
+static const float *
+_get_matrix_rotation_transformation(int rotation)
+{
+    const float *transformation;
+    switch (rotation) {
+        case 90:
+            transformation = MATRIX_ROTATION_90;
+            break;
+        case 180:
+            transformation = MATRIX_ROTATION_180;
+            break;
+        case 270:
+            transformation = MATRIX_ROTATION_270;
+            break;
+        default:
+            transformation = MATRIX_ROTATION_IDENTITY;
+    }
+    return transformation;
+}
+
+
+static int
+_is_device_a_touch_pointer(int dev_counter, int num_properties, char **iterator)
+{
+    // Looking for a device with either a libinput property for calibration or the old evdev Axlis labels property.
+    int is_correct_device = EINA_FALSE;
+    for (int i = 0; i < num_properties; i++)
+    {
+        if (strstr(*iterator, "libinput Calibration Matrix"))
+            is_correct_device = EINA_TRUE;
+        if (strstr(*iterator, "Axis Labels"))
+        {
+            int num_ret, unit_size_ret;
+            Ecore_X_Atom format_ret;
+            char *result = ecore_x_input_device_property_get(dev_counter, *iterator, &num_ret, &format_ret, &unit_size_ret);
+            if (result) {
+                // TODO Shall check for the value "Abs MT Position"
+            }
+            DBG("Looks like I found a device with calibration capabilities");
+            is_correct_device = EINA_TRUE;
+            free(result);
+        }
+        iterator++;
+    }
+    return is_correct_device;
+}
+
+
+static int
+_fetch_X_device_input_number(void)
+{
+    // I should get the touchscreen associated with the screen probably by looking at the classes of the input devices
+    // I need to submit my patch to add getters for other XIDeviceInfo fields, like raster mentioned in his commit.
+    const char *dev_name;
+    char **property_name;
+    int dev_num = ecore_x_input_device_num_get();
+    int dev_number = -1;
+
+    for (int dev_counter = 0; dev_counter < dev_num; dev_counter++)
+    {
+        dev_name = ecore_x_input_device_name_get(dev_counter);
+        // Less horrible hack that relies on the presence of a property containing the work Calibration
+        DBG("Found device with name %s", dev_name);
+        int num_properties;
+        property_name = ecore_x_input_device_properties_list(dev_counter, &num_properties);
+        DBG("Found %d properties", num_properties);
+        char **iterator = property_name;
+        int is_correct_device = _is_device_a_touch_pointer(dev_counter, num_properties, iterator);
+        if (is_correct_device == EINA_FALSE)
+            continue;
+        iterator = property_name;
+        for (int i = 0; i < num_properties; i++)
+        {
+            if (!strcmp(*iterator, CTM_name))
+            {
+                dev_number = dev_counter;
+                DBG("Setting device: %d", dev_number);
+                break;
+            }
+            iterator++;
+        }
+    }
+
+    return dev_number;
+}
+
+
+/**
+ * Fetch a screen from its ID and rotate it according to the rotation parameter
+ * @param randr_id The randr2 id
+ * @param rotation The expected rotation
+ */
+static void
+_fetch_and_rotate_screen(const char* randr_id, screen_rotation orientation)
+{
+    DBG("Working on screen %s", randr_id);
+    E_Randr2_Screen *rotatable_screen = e_randr2_screen_id_find(randr_id);
+    if (rotatable_screen == NULL)
+    {
+        DBG("Failed to load screen for id %s", randr_id);
+        return;
+    }
+
+    E_Config_Randr2_Screen *screen_randr_cfg = e_randr2_config_screen_find(rotatable_screen, e_randr2_cfg);
+    if (screen_randr_cfg == NULL)
+    {
+        DBG("Failed to load screen configuration for id %s", randr_id);
+        return;
+    }
+    int rotation = _convertible_rotation_get(orientation);
+    DBG("Screen %s is going to be rotated to %d", randr_id, rotation);
+
+    if (rotation == screen_randr_cfg->rotation)
+    {
+        WARN("Screen %s is already rotated to %d degrees", randr_id, rotation);
+    } else {
+        screen_randr_cfg->rotation = rotation;
+        e_randr2_config_apply();
+        DBG("Screen %s rotated to %d", randr_id, rotation);
+
+        int x_dev_num = _fetch_X_device_input_number();
+        if (x_dev_num == -1) {
+            ERR("Unable to find a pointer device with coordinate transformation capabilities");
+            return;
+        }
+        DBG("Rotating input number %d", x_dev_num);
+
+        int num_ret, unit_size_ret;
+        Ecore_X_Atom format_ret;
+        char *result = NULL;
+        TransformationMatrix *matrix = calloc(1, sizeof(TransformationMatrix));
+        if (matrix == NULL)
+        {
+            ERR("Unable to allocate memory for the transformation matrix");
+            return;
+        }
+
+        result = ecore_x_input_device_property_get(x_dev_num, CTM_name, &num_ret, &format_ret, &unit_size_ret);
+        if (result)
+        {
+            DBG("Device with coordinates transformation matrix");
+            // format_ret of 116 -> ECORE_X_ATOM_FLOAT
+            // num_ret of 9 -> 9 (float) to read
+            // unit_size_ret of 32 -> each float is 32 bits
+            memcpy(matrix->values, result, sizeof(matrix->values));
+            const float * rotation_matrix_2d = _get_matrix_rotation_transformation(rotation);
+            memcpy(matrix->values, rotation_matrix_2d, 6 * sizeof(*rotation_matrix_2d));
+            ecore_x_input_device_property_set(x_dev_num, CTM_name, matrix->values, num_ret, format_ret, unit_size_ret);
+
+            DBG("Input device %d rotated to %d", x_dev_num, rotation);
+        } else {
+            ERR("Unable to fetch coordinates transformation matrix for device %d", x_dev_num);
+        }
+        free(result);
+        free(matrix);
+    }
+}
+
+/**
+ * Helper to get the interface
+ * */
+static Eldbus_Proxy *
+_get_dbus_interface(const char *IFACE)
+{
+    DBG("Working on interface: %s", IFACE);
+    Eldbus_Connection *conn;
+    Eldbus_Object *obj;
+    Eldbus_Proxy *sensor_proxy;
+
+    conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
+    if (!conn)
+    {
+        ERR("Error: could not get system bus");
+        return NULL;
+    }
+    obj = eldbus_object_get(conn, EFL_DBUS_ACC_BUS, EFL_DBUS_ACC_PATH);
+    if (!obj)
+    {
+        ERR("Error: could not get object");
+        return NULL;
+    }
+    sensor_proxy = eldbus_proxy_get(obj, IFACE);
+    if (!sensor_proxy)
+    {
+        ERR("Error: could not get proxy for interface %s", IFACE);
+        return NULL;
+    }
+
+    return sensor_proxy;
+}
+
+/**
+ * Helper function to extract ta boolean property from the message
+ * @param msg The message coming from the get property invocation
+ * @param variant
+ * @param boolean_property_value The boolean property pointer where the value should be stored, if read
+ * @return
+ */
+static Eina_Bool
+_access_bool_property(const Eldbus_Message *msg, Eldbus_Message_Iter **variant, Eina_Bool *boolean_property_value)
+{
+    char *type;
+    Eina_Bool res = EINA_TRUE;
+
+    if (!eldbus_message_arguments_get(msg, "v", variant))
+    {
+        WARN("Error getting arguments.");
+        res = EINA_FALSE;
+    }
+    type = eldbus_message_iter_signature_get((*variant));
+    if (type == NULL)
+    {
+        WARN("Unable to get the type.");
+        res = EINA_FALSE;
+        return res;
+    }
+
+    if (type[0] != 'b')
+    {
+        WARN("Expected type is int.");
+        res = EINA_FALSE;
+        free(type);
+        return res;
+    }
+    if (type[1])
+    {
+        WARN("It is a complex type, not handle yet.");
+        res = EINA_FALSE;
+    }
+
+    if (!eldbus_message_iter_arguments_get((*variant), "b", boolean_property_value))
+    {
+        WARN("error in eldbus_message_iter_arguments_get()");
+        res = EINA_FALSE;
+    }
+    free(type);
+    return res;
+}
+
+/**
+ * Callback definition to handle the execution of the ReleaseAccelerometer() method of DBUS
+ * interface net.hadess.SensorProxy
+ * @param data not used
+ * @param msg The message
+ * @param pending
+ */
+static void
+_on_accelerometer_released(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
+{
+    const char *errname, *errmsg;
+
+    INF("Going to release the accelerometer_dbus");
+    if (eldbus_message_error_get(msg, &errname, &errmsg))
+    {
+        ERR("Error: %s %s", errname, errmsg);
+        return;
+    }
+    INF("Accelerometer released");
+}
+
+
+/**
+ * Callback definition to handle the execution of the ClaimAccelerometer() method of DBUS
+ * interface net.hadess.SensorProxy
+ * @param data not used
+ * @param msg The message
+ * @param pending
+ */
+static void
+_on_accelerometer_claimed(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
+{
+    const char *errname, *errmsg;
+
+    INF("Going to claim the accelerometer_dbus");
+    if (eldbus_message_error_get(msg, &errname, &errmsg))
+    {
+        ERR("Error: %s %s", errname, errmsg);
+        return;
+    }
+    INF("Accelerometer claimed");
+}
+
+/**
+ * Callback definition to handle the request of the hasAccelerometer property of DBUS interface net.hadess.SensorProxy
+ * @param data DbusAccelerometer
+ * @param msg The message
+ * @param pending
+ */
+static void
+_on_has_accelerometer(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
+{
+    const char *errname, *errmsg;
+    Eina_Bool has_accelerometer = EINA_FALSE;
+    Eldbus_Message_Iter *variant = NULL;
+
+    if (eldbus_message_error_get(msg, &errname, &errmsg))
+    {
+        ERR("Error: %s %s", errname, errmsg);
+    }
+
+    _access_bool_property(msg, &variant, &has_accelerometer);
+    DbusAccelerometer *accelerometer = data;
+    accelerometer->has_accelerometer = has_accelerometer;
+    DBG("Has Accelerometer: %d", accelerometer->has_accelerometer);
+}
+
+
+DbusAccelerometer*
+sensor_proxy_init(void)
+{
+   // Initialise DBUS component
+   if (accelerometer_dbus)
+   {
+      INF("We already have a struct filled");
+      return accelerometer_dbus;
+   }
+   accelerometer_dbus  = calloc(1, sizeof(DbusAccelerometer));
+   EINA_SAFETY_ON_NULL_RETURN_VAL(accelerometer_dbus, NULL);
+
+   // The next line is probably redundant
+   accelerometer_dbus->orientation = UNDEFINED;
+
+   INF("Getting dbus interfaces");
+   accelerometer_dbus->sensor_proxy = _get_dbus_interface(EFL_DBUS_ACC_IFACE);
+   accelerometer_dbus->sensor_proxy_properties = _get_dbus_interface(ELDBUS_FDO_INTERFACE_PROPERTIES);
+   if (accelerometer_dbus->sensor_proxy == NULL)
+   {
+      ERR("Unable to get the proxy for interface %s", EFL_DBUS_ACC_IFACE);
+      return accelerometer_dbus;
+   }
+
+   accelerometer_dbus->pending_has_orientation = eldbus_proxy_property_get(accelerometer_dbus->sensor_proxy,
+                                                                            "HasAccelerometer", _on_has_accelerometer,
+                                                                            accelerometer_dbus);
+   if (!accelerometer_dbus->pending_has_orientation)
+   {
+      ERR("Error: could not get property HasAccelerometer");
+   }
+
+   // Claim the accelerometer_dbus
+   accelerometer_dbus->pending_acc_claim = eldbus_proxy_call(accelerometer_dbus->sensor_proxy, "ClaimAccelerometer",
+                                                              _on_accelerometer_claimed, accelerometer_dbus, -1, "");
+
+   if (!accelerometer_dbus->pending_acc_claim)
+   {
+      ERR("Error: could not call ClaimAccelerometer");
+   }
+
+   return accelerometer_dbus;
+}
+
+void
+sensor_proxy_shutdown(void)
+{
+   INF("Removing signal handler dbus_property_changed_sh");
+   eldbus_signal_handler_del(accelerometer_dbus->dbus_property_changed_sh);
+
+   // TODO Should to this and wait for the release before continuing
+   INF("Freeing convertible resources");
+   accelerometer_dbus->pending_acc_crelease = eldbus_proxy_call(accelerometer_dbus->sensor_proxy, "ReleaseAccelerometer", _on_accelerometer_released, accelerometer_dbus, -1, "");
+   if (accelerometer_dbus)
+   {
+      e_object_del(E_OBJECT(accelerometer_dbus));
+      free(accelerometer_dbus);
+      accelerometer_dbus = NULL;
+   }
+
+   DBG("Shutting down ELDBUS");
+   eldbus_shutdown();
+}
+
+/**
+ * Helper function to extract ta string property from the message
+ * @param msg The message coming from the get property invocation
+ * @param variant
+ * @return Enum specifying the orientation. UNDEFINED by default
+ */
+static screen_rotation
+_access_string_property(const Eldbus_Message *msg, Eldbus_Message_Iter **variant)
+{
+   screen_rotation rotation = UNDEFINED;
+   char *type = NULL;
+
+   if (!eldbus_message_arguments_get(msg, "v", variant))
+   {
+      WARN("Error getting arguments.");
+   }
+   type = eldbus_message_iter_signature_get((*variant));
+   if (type == NULL)
+   {
+      WARN("Unable to get the type.");
+      return rotation;
+   }
+   if (type[0] != 's')
+   {
+      WARN("Expected type is string(s).");
+      free(type);
+      return rotation;
+   }
+   if (type[1])
+   {
+      WARN("It is a complex type, not handle yet.");
+   }
+
+   const char *string_property_value;
+   if (!eldbus_message_iter_arguments_get(*variant, "s", &string_property_value))
+   {
+      WARN("error in eldbus_message_iter_arguments_get()");
+   }
+
+   if (strcmp(ACCELEROMETER_ORIENTATION_RIGHT, string_property_value) == 0)
+      rotation = RIGHT_UP;
+   if (strcmp(ACCELEROMETER_ORIENTATION_LEFT, string_property_value) == 0)
+      rotation = LEFT_UP;
+   if (strcmp(ACCELEROMETER_ORIENTATION_BOTTOM, string_property_value) == 0)
+      rotation = FLIPPED;
+   if (strcmp(ACCELEROMETER_ORIENTATION_NORMAL, string_property_value) == 0)
+      rotation = NORMAL;
+
+   free(type);
+   return rotation;
+}
+
+void
+on_accelerometer_orientation(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED)
+{
+   INF("New orientation received");
+   Instance *inst = data;
+
+   if (inst->locked_position == EINA_TRUE)
+   {
+      WARN("Locked position. Ignoring rotation");
+      return;
+   }
+
+   const char *errname, *errmsg;
+   screen_rotation orientation;
+   Eldbus_Message_Iter *variant = NULL;
+
+   if (eldbus_message_error_get(msg, &errname, &errmsg))
+   {
+      ERR("Error: %s %s", errname, errmsg);
+      return;
+   }
+
+   orientation = _access_string_property(msg, &variant);
+   if (orientation == UNDEFINED)
+   {
+      INF("Failed to retrieve the orientation from dbus message");
+      return;
+   }
+
+   inst->accelerometer->orientation = orientation;
+   DBG("Current Orientation: %d", inst->accelerometer->orientation);
+
+   if (inst->randr2_ids == NULL)
+      ERR("Screen not set.");
+   else
+   {
+      Eina_List *l;
+      char *randr_id = NULL;
+      EINA_LIST_FOREACH(inst->randr2_ids, l, randr_id)
+      {
+         _fetch_and_rotate_screen(randr_id, orientation);
+      }
+   }
+}
+
--- a/src/modules/convertible/dbus_acceleration.h
+++ b/src/modules/convertible/dbus_acceleration.h
@ -0,0 +1,45 @@
+#include <Ecore.h>
+#include <Elementary.h>
+#include <e.h>
+
+#ifndef EFL_DBUS_ACCELERATION
+#define EFL_DBUS_ACCELERATION
+
+#define EFL_DBUS_ACC_BUS "net.hadess.SensorProxy"
+#define EFL_DBUS_ACC_PATH "/net/hadess/SensorProxy"
+#define EFL_DBUS_ACC_IFACE "net.hadess.SensorProxy"
+
+// This enum represents the 4 states of screen rotation plus UNDEFINED
+typedef enum {UNDEFINED, NORMAL, RIGHT_UP, FLIPPED, LEFT_UP} screen_rotation;
+
+typedef struct _DbusAccelerometer DbusAccelerometer;
+
+struct _DbusAccelerometer
+{
+   Eina_Bool has_accelerometer;
+   screen_rotation orientation;
+   Eldbus_Proxy *sensor_proxy, *sensor_proxy_properties;
+   Eldbus_Pending *pending_has_orientation, *pending_orientation, *pending_acc_claim, *pending_acc_crelease;
+   Eldbus_Signal_Handler *dbus_property_changed_sh;
+};
+
+/**
+ * Fetch the DBUS interfaces and fill the DbusAccelerometer struct
+ * */
+DbusAccelerometer* sensor_proxy_init(void);
+
+
+void sensor_proxy_shutdown(void);
+
+void
+on_has_accelerometer(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED);
+
+/**
+ * Callback definition to handle the request of the accelerometer property of DBUS interface net.hadess.SensorProxy
+ * @param data DbusAccelerometer
+ * @param msg The message
+ * @param pending
+ */
+void
+on_accelerometer_orientation(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED);
+#endif
--- a/src/modules/convertible/e-gadget-convertible.c
+++ b/src/modules/convertible/e-gadget-convertible.c
@ -0,0 +1,55 @@
+//
+// Created by raffaele on 04/05/19.
+//
+#include "convertible_logging.h"
+#include "e-gadget-convertible.h"
+#include "e_mod_main.h"
+
+static void
+_update_instances(const Instance *current_instance)
+{
+  Eina_List *l;
+  Instance *instance;
+
+  EINA_LIST_FOREACH(instances, l, instance)
+    {
+      if (current_instance != instance)
+        {
+          instance->locked_position = current_instance->locked_position;
+          if (instance->locked_position == EINA_TRUE)
+            edje_object_signal_emit(instance->o_button, "e,lock,rotation,icon", "convertible/tablet");
+          else
+            edje_object_signal_emit(instance->o_button, "e,unlock,rotation,icon", "convertible/tablet");
+
+          instance->disabled_keyboard = current_instance->disabled_keyboard;
+          if (instance->disabled_keyboard == EINA_TRUE)
+            edje_object_signal_emit(instance->o_button, "e,disable,keyboard,icon", "convertible/input");
+          else
+            edje_object_signal_emit(instance->o_button, "e,enable,keyboard,icon", "convertible/input");
+        }
+    }
+}
+
+void
+_rotation_signal_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+                    const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
+{
+  Instance *inst = data;
+  if (eina_str_has_prefix(sig, "e,unlock"))
+    inst->locked_position = EINA_FALSE;
+  if (eina_str_has_prefix(sig, "e,lock"))
+    inst->locked_position = EINA_TRUE;
+  _update_instances(inst);
+}
+
+void
+_keyboard_signal_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+                    const char *sig EINA_UNUSED, const char *src EINA_UNUSED)
+{
+  Instance *inst = data;
+  if (eina_str_has_prefix(sig, "e,enable,keyboard"))
+    inst->disabled_keyboard = EINA_FALSE;
+  if (eina_str_has_prefix(sig, "e,disable,keyboard"))
+    inst->disabled_keyboard = EINA_TRUE;
+  _update_instances(inst);
+}
--- a/src/modules/convertible/e-gadget-convertible.h
+++ b/src/modules/convertible/e-gadget-convertible.h
@ -0,0 +1,24 @@
+//
+// Created by raffaele on 04/05/19.
+//
+#include <Ecore.h>
+#include <Elementary.h>
+#include "e_mod_main.h"
+
+#ifndef E_GADGET_CONVERTIBLE_E_GADGET_CONVERTIBLE_H
+#define E_GADGET_CONVERTIBLE_E_GADGET_CONVERTIBLE_H
+
+/* LIST OF INSTANCES */
+extern Eina_List *instances;
+
+/* gadcon callback for actions */
+void
+_rotation_signal_cb(void *data EINA_UNUSED, Evas_Object *obj, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
+
+void
+_keyboard_signal_cb(void *data EINA_UNUSED, Evas_Object *obj, const char *sig EINA_UNUSED, const char *src EINA_UNUSED);
+
+/* end gadcon callback for actions */
+
+
+#endif //E_GADGET_CONVERTIBLE_E_GADGET_CONVERTIBLE_H
--- a/src/modules/convertible/e-module-convertible.edj
+++ b/src/modules/convertible/e-module-convertible.edj
--- a/src/modules/convertible/e_mod_config.c
+++ b/src/modules/convertible/e_mod_config.c
@ -0,0 +1,173 @@
+//
+// Created by raffaele on 01/08/19.
+//
+#include "convertible_logging.h"
+#include "e.h"
+#include "e_mod_config.h"
+
+static Convertible_Config *conv_config = NULL;
+E_Config_DD *config_edd = NULL;
+EINTERN Convertible_Config *convertible_config;
+
+/**
+ * Create the config structure
+ * */
+static void
+_econvertible_config_dd_new(void)
+{
+//   c_zone = E_CONFIG_DD_NEW("Econvertible_Zone_Config", Convertible_Zone_Config);
+//   E_CONFIG_VAL(c_zone, Convertible_Zone_Config, name, STR);
+//   E_CONFIG_VAL(c_zone, Convertible_Zone_Config, follow_rotation, INT);
+
+   // TODO Not sure what his line does. Apparently, it is needed to specify the type of the configuration data structure
+   config_edd = E_CONFIG_DD_NEW("Convertible_Config", Convertible_Config);
+
+   E_CONFIG_VAL(config_edd, Convertible_Config, version, INT);
+   E_CONFIG_VAL(config_edd, Convertible_Config, disable_keyboard_on_rotation, INT);
+//   E_CONFIG_LIST(config_edd, Convertible_Config, rotatable_screen_configuration, c_zone);
+}
+
+/**
+ * Update the *conv_config data structure based on the settings coming from the dialog panel
+ * @param config The config coming from the Dialog Panel (E_Config_Dialog_data)
+ */
+static void
+_config_set(Convertible_Config *config)
+{
+   DBG("config_set disable_keyboard_on_rotation %d", config->disable_keyboard_on_rotation);
+   conv_config->disable_keyboard_on_rotation = config->disable_keyboard_on_rotation;
+   e_config_domain_save("module.convertible", config_edd, config);
+}
+
+/**
+ * Initialise the configuration object
+ *
+ * @param cfg
+ * @return
+ */
+static void*
+_create_data(E_Config_Dialog *cfg EINA_UNUSED)
+{
+   E_Config_Dialog_Data *dialog_data;
+
+   dialog_data = E_NEW(E_Config_Dialog_Data, 1);
+   dialog_data->config = malloc(sizeof(Convertible_Config));
+   dialog_data->config->disable_keyboard_on_rotation = conv_config->disable_keyboard_on_rotation;
+//   dialog_data->config->rotatable_screen_configuration = conv_config->rotatable_screen_configuration;
+
+   DBG("disable_keyboard_on_rotation %d", dialog_data->config->disable_keyboard_on_rotation);
+   return dialog_data;
+}
+
+/**
+ * Release memory for the data structure holding the configuration
+ *
+ * @param c
+ * @param dialog_data
+ */
+static void
+_free_data(E_Config_Dialog *c EINA_UNUSED, E_Config_Dialog_Data *dialog_data)
+{
+   free(dialog_data->config);
+   free(dialog_data);
+}
+
+/**
+ * This function should store the modified settings into the data structure referred by the pointer conv_config
+ * @param cfd
+ * @param cfdata
+ * @return
+ */
+static int
+_basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
+{
+   DBG("_basic_apply_data");
+   _config_set(cfdata->config);
+   return 1;
+}
+
+/**
+ * Create the panel by adding all the items like labels, checkbox and lists
+ *
+ * @param cfd
+ * @param evas
+ * @param cfdata
+ * @return
+ */
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas,
+                      E_Config_Dialog_Data *cfdata)
+{
+   Evas_Object *o, *evas_option_input_disable; //, *evas_label_section_screens; // *list_item_screen,
+//   Evas_Object *screen_list = NULL;
+
+   o = e_widget_list_add(evas, 0, 0);
+
+   evas_option_input_disable = e_widget_check_add(evas, "Disable input when rotated", &(cfdata->config->disable_keyboard_on_rotation));
+   e_widget_list_object_append(o, evas_option_input_disable, 0, 0, 0);
+
+   DBG("After basic_create_widget");
+   return o;
+   }
+
+/**
+ * This function initialise the config dialog for the module
+ * @param comp
+ * @param p
+ * @return
+ */
+E_Config_Dialog*
+e_int_config_convertible_module(Evas_Object *comp, const char *p EINA_UNUSED)
+{
+   E_Config_Dialog *cfd;
+   E_Config_Dialog_View *v;
+
+   if (e_config_dialog_find("E", "windows/convertible"))
+      return NULL;
+
+   v = E_NEW(E_Config_Dialog_View, 1);
+   v->create_cfdata = _create_data;
+   v->free_cfdata = _free_data;
+   v->basic.apply_cfdata = _basic_apply_data;
+   v->basic.create_widgets = _basic_create_widgets;
+
+   cfd = e_config_dialog_new(comp,
+                             "Convertible Configuration",
+                             "E", "windows/convertible",
+                             NULL,
+                             0, v, NULL);
+   return cfd;
+}
+
+void
+econvertible_config_init(void)
+{
+   _econvertible_config_dd_new();
+   conv_config = e_config_domain_load("module.econvertible", config_edd);
+
+   //   Check version
+   if (conv_config && !e_util_module_config_check(_("Convertible Module"),
+                                                conv_config->version,
+                                                MOD_CONFIG_FILE_VERSION))
+   {
+      free(conv_config);
+      return;
+   }
+
+
+   if (!conv_config)
+   {
+      conv_config = E_NEW(Convertible_Config, 1);
+      conv_config->disable_keyboard_on_rotation = 1;
+//      conv_config->rotatable_screen_configuration = NULL;
+   }
+
+   conv_config->version = MOD_CONFIG_FILE_VERSION;
+   DBG("Config loaded");
+}
+
+void econvertible_config_shutdown(void)
+{
+   E_CONFIG_DD_FREE(config_edd);
+   E_FREE(convertible_config);
+}
--- a/src/modules/convertible/e_mod_config.h
+++ b/src/modules/convertible/e_mod_config.h
@ -0,0 +1,40 @@
+//
+// Created by raffaele on 01/08/19.
+//
+#include <e.h>
+#include "e_mod_main.h"
+
+#ifndef E_GADGET_CONVERTIBLE_E_MOD_CONFIG_H
+#define E_GADGET_CONVERTIBLE_E_MOD_CONFIG_H
+
+/* Increment for Major Changes */
+#define MOD_CONFIG_FILE_EPOCH      1
+/* Increment for Minor Changes (ie: user doesn't need a new config) */
+#define MOD_CONFIG_FILE_GENERATION 0
+#define MOD_CONFIG_FILE_VERSION    ((MOD_CONFIG_FILE_EPOCH * 1000000) + MOD_CONFIG_FILE_GENERATION)
+
+// Definition of the data structure to hold the gadget configuration
+typedef struct _Convertible_Config Convertible_Config;
+struct _Convertible_Config
+{
+   int version;
+   int disable_keyboard_on_rotation;
+};
+
+// As far as I understand, this structure should hold data useful for the configuration and a pointer to
+// another structure holding the configuration options
+struct _E_Config_Dialog_Data
+{
+   Convertible_Config *config;
+   Evas_Object *zones;
+   Evas_Object *inputs;
+};
+
+E_Config_Dialog*
+e_int_config_convertible_module(Evas_Object *comp, const char *p);
+void
+econvertible_config_init(void);
+void
+econvertible_config_shutdown(void);
+
+#endif //E_GADGET_CONVERTIBLE_E_MOD_CONFIG_H
--- a/src/modules/convertible/e_mod_main.c
+++ b/src/modules/convertible/e_mod_main.c
@ -0,0 +1,373 @@
+//
+// Created by raffaele on 04/05/19.
+//
+#include <e.h>
+#include <e_module.h>
+#include <e_gadcon.h>
+#include "convertible_logging.h"
+#include "accelerometer-orientation.h"
+#include "e-gadget-convertible.h"
+#include "e_mod_main.h"
+#include "dbus_acceleration.h"
+#include "e_mod_config.h"
+
+
+// The main module reference
+E_Module *convertible_module;
+Instance *inst;
+
+// Configuration
+extern Convertible_Config *convertible_config;
+static E_Config_DD *config_edd;
+
+// Logger
+int _convertible_log_dom;
+
+/* module setup */
+E_API E_Module_Api e_modapi =
+ {
+        E_MODULE_API_VERSION,
+        "convertible"
+ };
+
+
+/* LIST OF INSTANCES */
+Eina_List *instances = NULL;
+
+
+/* gadcon requirements */
+static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style);
+static void             _gc_shutdown(E_Gadcon_Client *gcc);
+static void             _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient);
+static const char      *_gc_label(const E_Gadcon_Client_Class *client_class);
+static Evas_Object     *_gc_icon(const E_Gadcon_Client_Class *client_class, Evas *evas);
+static const char      *_gc_id_new(const E_Gadcon_Client_Class *client_class);
+/* and actually define the gadcon class that this module provides (just 1) */
+static const E_Gadcon_Client_Class _gadcon_class =
+{
+        GADCON_CLIENT_CLASS_VERSION,
+        "convertible",
+        {
+                _gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL,
+                e_gadcon_site_is_not_toolbar
+        },
+        E_GADCON_CLIENT_STYLE_PLAIN
+};
+
+
+static E_Gadcon_Client *
+_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style)
+{
+   Evas_Object *evas_object;
+   E_Gadcon_Client *gcc;
+   Instance *instance;
+
+   evas_object = edje_object_add(gc->evas);
+   e_theme_edje_object_set(evas_object, "base/theme/modules/convertible",
+                           "e/modules/convertible/main");
+
+   instance = E_NEW(Instance, 1);
+   instance->accelerometer = inst->accelerometer;
+   instance->disabled_keyboard = inst->disabled_keyboard;
+   instance->locked_position = inst->locked_position;
+   instance->randr2_ids = inst->randr2_ids;
+   instance->o_button = evas_object;
+
+   instances = eina_list_append(instances, instance);
+
+   gcc = e_gadcon_client_new(gc, name, id, style, evas_object);
+   gcc->data = instance;
+
+    evas_object_size_hint_aspect_set(evas_object, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
+    //    evas_object_smart_callback_add(parent, "gadget_site_anchor", _anchor_change, inst);
+
+    // Adding callback for EDJE object
+    INF("Adding callback for creation and other events from EDJE");
+    edje_object_signal_callback_add(evas_object, "e,lock,rotation", "tablet", _rotation_signal_cb, instance);
+    edje_object_signal_callback_add(evas_object, "e,unlock,rotation", "tablet", _rotation_signal_cb, instance);
+    edje_object_signal_callback_add(evas_object, "e,enable,keyboard", "input", _keyboard_signal_cb, instance);
+    edje_object_signal_callback_add(evas_object, "e,disable,keyboard", "input", _keyboard_signal_cb, instance);
+    
+    inst->o_button = evas_object;
+
+    return gcc;
+}
+
+static void
+_gc_shutdown(E_Gadcon_Client *gcc)
+{
+   DBG("CONVERTIBLE gadcon shutdown");
+   Instance *instance;
+
+   if (!(instance = gcc->data)) return;
+   instances = eina_list_remove(instances, instance);
+   instance->accelerometer = NULL;
+
+   // Remove callbacks
+   DBG("Removing EDJE callbacks");
+   edje_object_signal_callback_del(instance->o_button, "lock,rotation", "tablet", _rotation_signal_cb);
+   edje_object_signal_callback_del(instance->o_button, "unlock,rotation", "tablet", _rotation_signal_cb);
+   edje_object_signal_callback_del(instance->o_button, "enable,keyboard", "keyboard", _keyboard_signal_cb);
+   edje_object_signal_callback_del(instance->o_button, "disable,keyboard", "keyboard", _keyboard_signal_cb);
+
+   evas_object_del(instance->o_button);
+
+   E_FREE(instance);
+}
+
+static void
+_gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient)
+{
+   Evas_Coord mw, mh;
+   char buf[PATH_MAX];
+   const char *s = "float";
+
+   Instance *current_instance = gcc->data;
+   switch (orient)
+   {
+      case E_GADCON_ORIENT_FLOAT:
+         s = "float";
+           break;
+
+      case E_GADCON_ORIENT_HORIZ:
+         s = "horizontal";
+           break;
+
+      case E_GADCON_ORIENT_VERT:
+         s = "vertical";
+           break;
+
+      case E_GADCON_ORIENT_LEFT:
+         s = "left";
+           break;
+
+      case E_GADCON_ORIENT_RIGHT:
+         s = "right";
+           break;
+
+      case E_GADCON_ORIENT_TOP:
+         s = "top";
+           break;
+
+      case E_GADCON_ORIENT_BOTTOM:
+         s = "bottom";
+           break;
+
+      case E_GADCON_ORIENT_CORNER_TL:
+         s = "top_left";
+           break;
+
+      case E_GADCON_ORIENT_CORNER_TR:
+         s = "top_right";
+           break;
+
+      case E_GADCON_ORIENT_CORNER_BL:
+         s = "bottom_left";
+           break;
+
+      case E_GADCON_ORIENT_CORNER_BR:
+         s = "bottom_right";
+           break;
+
+      case E_GADCON_ORIENT_CORNER_LT:
+         s = "left_top";
+           break;
+
+      case E_GADCON_ORIENT_CORNER_RT:
+         s = "right_top";
+           break;
+
+      case E_GADCON_ORIENT_CORNER_LB:
+         s = "left_bottom";
+           break;
+
+      case E_GADCON_ORIENT_CORNER_RB:
+         s = "right_bottom";
+           break;
+
+      default:
+         break;
+   }
+   snprintf(buf, sizeof(buf), "e,state,orientation,%s", s);
+   edje_object_signal_emit(current_instance->o_button, buf, "e");
+   edje_object_message_signal_process(current_instance->o_button);
+
+   mw = 0, mh = 0;
+   edje_object_size_min_get(current_instance->o_button, &mw, &mh);
+   if ((mw < 1) || (mh < 1))
+      edje_object_size_min_calc(current_instance->o_button, &mw, &mh);
+   if (mw < 4) mw = 4;
+   if (mh < 4) mh = 4;
+   e_gadcon_client_aspect_set(gcc, mw, mh);
+   e_gadcon_client_min_size_set(gcc, mw, mh);
+}
+
+static const char *
+_gc_label(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
+{
+   return "Convertible";
+}
+
+static Evas_Object *
+_gc_icon(const E_Gadcon_Client_Class *client_class EINA_UNUSED, Evas *evas)
+{
+   Evas_Object *o;
+   char buf[PATH_MAX];
+
+   o = edje_object_add(evas);
+   snprintf(buf, sizeof(buf), "%s/e-module-convertible.edj", convertible_module->dir);
+   edje_object_file_set(o, buf, "icon");
+   return o;
+}
+
+static const char *
+_gc_id_new(const E_Gadcon_Client_Class *client_class EINA_UNUSED)
+{
+   static char buf[PATH_MAX];
+
+   snprintf(buf, sizeof(buf), "%s.%d", client_class->name,
+             eina_list_count(instances) + 1);
+   return buf;
+}
+
+
+/**
+ * Prepare to fetch the new value for the DBUS property that has changed
+ * */
+static void
+_cb_properties_changed(void *data, const Eldbus_Message *msg)
+{
+   Instance *current_instance = data;
+   Eldbus_Message_Iter *array, *invalidate;
+   char *iface;
+
+   if (!eldbus_message_arguments_get(msg, "sa{sv}as", &iface, &array, &invalidate))
+      ERR("Error getting data from properties changed signal.");
+   // Given that the property changed, let's get the new value
+   Eldbus_Pending *pending_operation = eldbus_proxy_property_get(current_instance->accelerometer->sensor_proxy,
+                                                                 "AccelerometerOrientation",
+                                                                 on_accelerometer_orientation, current_instance);
+   if (!pending_operation)
+      ERR("Error: could not get property AccelerometerOrientation");
+}
+
+E_API void *
+e_modapi_init(E_Module *m)
+{
+   // Initialise the logger
+   _convertible_log_dom = eina_log_domain_register("convertible", EINA_COLOR_LIGHTBLUE);
+   convertible_module = m;
+
+   char theme_overlay_path[PATH_MAX];
+   snprintf(theme_overlay_path, sizeof(theme_overlay_path), "%s/e-module-convertible.edj", convertible_module->dir);
+   elm_theme_extension_add(NULL, theme_overlay_path);
+
+   econvertible_config_init();
+
+   // Config DBus
+   DbusAccelerometer *accelerometer = sensor_proxy_init();
+   inst = E_NEW(Instance, 1);
+   inst->accelerometer = accelerometer;
+   inst->locked_position = EINA_FALSE;
+   inst->disabled_keyboard = EINA_FALSE;
+
+   // Making sure we rotate the screen to the current orientation coming from the sensor
+   inst->accelerometer->pending_orientation = eldbus_proxy_property_get(inst->accelerometer->sensor_proxy,
+                                                                 "AccelerometerOrientation",
+                                                                 on_accelerometer_orientation, inst);
+   if (!inst->accelerometer->pending_orientation)
+   {
+      ERR("Error: could not get property AccelerometerOrientation");
+   }
+
+   // Set the callback for property changed event
+   accelerometer->dbus_property_changed_sh = eldbus_proxy_signal_handler_add(accelerometer->sensor_proxy_properties,
+                                                                    "PropertiesChanged",
+                                                                    _cb_properties_changed, inst);
+   if (!accelerometer->dbus_property_changed_sh)
+      ERR("Error: could not add the signal handler for PropertiesChanged");
+
+   // Screen related part
+   E_Zone *zone;
+
+   // Initialise screen part
+   DBG("Looking for the main screen");
+   Eina_List *l;
+   inst->randr2_ids = NULL;
+   EINA_LIST_FOREACH(e_comp->zones, l, zone)
+      {
+      // Get the screen for the zone
+      E_Randr2_Screen *screen = e_randr2_screen_id_find(zone->randr2_id);
+      DBG("name randr2 id %s", zone->randr2_id);
+      DBG("rot_90 %i", screen->info.can_rot_90);
+
+      // Arbitrarily chosen a condition to check that rotation is enabled
+      if (screen->info.can_rot_90 == EINA_TRUE)
+         {
+         char *randr2_id = strdup(zone->randr2_id);
+         if (randr2_id == NULL)
+            ERR("Can't copy the screen name");
+         else
+            inst->randr2_ids = eina_list_append(inst->randr2_ids, randr2_id);
+         if (eina_error_get())
+            ERR("Memory is low. List allocation failed.");
+         }
+      }
+
+   if (inst->randr2_ids == NULL)
+      ERR("Unable to find rotatable screens");
+
+   DBG("%d screen(s) has been found", eina_list_count(inst->randr2_ids));
+
+   e_gadcon_provider_register(&_gadcon_class);
+
+   INF("Creating menu entries for settings");
+   e_configure_registry_category_add("extensions", 90, _("Extensions"), NULL,
+                                     "preferences-extensions");
+   e_configure_registry_item_add("extensions/convertible", 30, _("Convertible"), NULL,
+                                 "preferences-desktop-edge-bindings", e_int_config_convertible_module);
+
+   instances = eina_list_append(instances, inst);
+
+   return m;
+}
+
+E_API int
+e_modapi_shutdown(E_Module *m EINA_UNUSED)
+{
+   INF("Freeing configuration");
+   econvertible_config_shutdown();
+
+   e_configure_registry_item_del("extensions/convertible");
+
+   // Shutdown Dbus
+   sensor_proxy_shutdown();
+
+   // Remove screen info
+   char *element;
+   EINA_LIST_FREE(inst->randr2_ids, element)
+      free(element);
+
+   free(inst);
+
+   INF("Shutting down the module");
+   convertible_module = NULL;
+   e_gadcon_provider_unregister(&_gadcon_class);
+
+   // Removing logger
+   DBG("Removing the logger");
+   eina_log_domain_unregister(_convertible_log_dom);
+   _convertible_log_dom = -1;
+
+   return 1;
+}
+
+E_API int
+e_modapi_save(E_Module *m EINA_UNUSED)
+{
+   if (convertible_config)
+   {
+      e_config_domain_save("module.convertible", config_edd, convertible_config);
+   }
+   return 1;
+}
--- a/src/modules/convertible/e_mod_main.h
+++ b/src/modules/convertible/e_mod_main.h
@ -0,0 +1,25 @@
+//
+// Created by raffaele on 04/05/19.
+//
+#include <e.h>
+#include "dbus_acceleration.h"
+
+
+#ifndef E_GADGET_CONVERTIBLE_CONVERTIBLE_H
+#define E_GADGET_CONVERTIBLE_CONVERTIBLE_H
+
+typedef struct _Instance Instance;
+
+struct _Instance
+{
+    Evas_Object           *o_button;
+    DbusAccelerometer     *accelerometer;
+    // I hate to put DBUS related stuff in this struct. Unfortunately, I did not (quickly) find a better way of
+    // handling signals across multiple instances sharing one DbusAccelerometer struct.
+    Eina_List             *randr2_ids;
+
+    Eina_Bool             locked_position;
+    Eina_Bool             disabled_keyboard;
+};
+
+#endif //E_GADGET_CONVERTIBLE_CONVERTIBLE_H
--- a/src/modules/convertible/input_rotation.h
+++ b/src/modules/convertible/input_rotation.h
@ -0,0 +1,20 @@
+//
+// Created by raffaele on 18/12/19.
+//
+
+#ifndef E_GADGET_CONVERTIBLE_INPUT_ROTATION_H
+#define E_GADGET_CONVERTIBLE_INPUT_ROTATION_H
+
+typedef struct _TransformationMatrix {
+   float values[9];
+} TransformationMatrix;
+
+
+static const float MATRIX_ROTATION_IDENTITY[6] = {1, 0, 0, 0, 1, 0 };
+static const float MATRIX_ROTATION_270[6] = {0, 1, 0, -1, 0, 1 };
+static const float MATRIX_ROTATION_180[6] = {-1, 0, 1, 0, -1, 1 };
+static const float MATRIX_ROTATION_90[6] = {0, -1, 1, 1, 0, 0 };
+
+// "Coordinate Transformation Matrix"
+static const char *CTM_name = "Coordinate Transformation Matrix";
+#endif //E_GADGET_CONVERTIBLE_INPUT_ROTATION_H
--- a/src/modules/convertible/meson.build
+++ b/src/modules/convertible/meson.build
@ -0,0 +1,12 @@
+src = files(
+        'e_mod_main.c',
+        'dbus_acceleration.h',
+        'dbus_acceleration.c',
+        'e-gadget-convertible.h',
+        'e-gadget-convertible.c',
+        'accelerometer-orientation.h',
+        'convertible_logging.h',
+        'e_mod_main.h',
+        'e_mod_config.h',
+        'e_mod_config.c'
+)
--- a/src/modules/convertible/module.desktop
+++ b/src/modules/convertible/module.desktop
@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Link
+Name=E-convertible
+GenericName=E-convertible
+Comment=Helps to manage screen rotation based on accelerometer
+Comment[fr]=Permet de gérer la rotation de l'écran en fonction de l'accéléromètre.
+Comment[it]=Consente di gestire la rotazione dello schermo usando l'accelerometro
+Icon=e-module-convertible
+X-Enlightenment-ModuleType=system
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@ -5,7 +5,7 @@ module_includes2 = [ '../..'   , '../bin'   , '../bin/efx'  ]
 module_deps      = [ deps_e, dep_dl ]

 mods = [
-# standard run of the mill modules with cion and desktop
+# standard run of the mill modules with icon and desktop
  'ibar',
  'pager',
  'temperature',
@ -29,6 +29,7 @@ mods = [
  'conf_performance',
  'conf_paths',
  'conf_interaction',
+  'convertible',
  'gadman',
  'geolocation',
  'connman',
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@ -1019,11 +1019,49 @@ e_modapi_init(E_Module *m)
     {
        Evas_Object *o;
        char buf[PATH_MAX];
+        int iw = 0, ih = 0;
+#define ARGB(a, r, g, b) ((a << 24) | (r << 16) | (g << 8) | b)
+#define B ARGB(  0,   0,   0,   0),
+#define W ARGB(255, 255, 255, 255),
+#define O ARGB(255, 255, 188,   0),
+        unsigned int *idata;
+        static const unsigned int wllogo[16 * 16] =
+          {
+             B B B B B B B B B B B B B B B B
+             B B B B B B O O O O B B B B B B
+             B B B W O O O O O O O O B B B B
+             B B B W W O O O O O O O W B B B
+             B B O W W O O O O O O O W W B B
+             B B O W W O O W W O O O W W B B
+             B O O W W W O W W O O W W O O B
+             B O O W W W W W W W O W W O O B
+             B O O W W W W W W W O W W O O B
+             B O O W W W W O W W W W W O O B
+             B B O W W W W O O W W W W O B B
+             B B O W W W W O O W W W O O B B
+             B B B O W W W O O W W W O B B B
+             B B B B O W O O O W W O B B B B
+             B B B B B B O O O O B B B B B B
+             B B B B B B B B B B B B B B B B
+          };

        o = evas_object_image_filled_add(ecore_evas_get(e_comp->ee));
        evas_object_name_set(o, "__e_wl_watermark");
        e_prefix_data_concat_static(buf, "data/images/wayland.png");
        evas_object_image_file_set(o, buf, NULL);
+        evas_object_image_size_get(o, &iw, &ih);
+        if ((iw <= 1) && (ih <= 1))
+          { // someonme removed the watermark - use low res hardcoded logo
+             evas_object_image_alpha_set(o, EINA_TRUE);
+             evas_object_image_size_set(o, 16, 16);
+             idata = evas_object_image_data_get(o, EINA_TRUE);
+             if (idata)
+               {
+                  memcpy(idata, wllogo, 16 * 16 * sizeof(unsigned int));
+                  evas_object_image_data_set(o, idata);
+                  evas_object_image_data_update_add(o, 0, 0, 16, 16);
+              }
+          }
        evas_object_move(o, w - 40 - 16, 16);
        evas_object_resize(o, 40, 40);
        evas_object_pass_events_set(o, EINA_TRUE);
Author	SHA1	Message	Date
Carsten Haitzler	d747083714	randr - add "use output" option to use output name (or not) @feat	2024-05-30 18:45:12 +01:00
Carsten Haitzler	6547408cec	fix calloc num, size where it's wrong @fix	2024-05-30 17:43:56 +01:00
Carsten Haitzler	a2d1c10d76	e dpms - start dpms in unknown state + debug prints/logs @fix	2024-05-30 07:59:51 +01:00
Carsten Haitzler	31f45efbfe	convertible - fix indents (fixes compiler warn) no actual bug fixes - just formatting	2024-05-30 07:59:51 +01:00
maxerba	2e54f9851e	Updating french translation	2024-05-16 13:50:47 +02:00
Carsten Haitzler	8b06ca97a6	e sys main - fix minor leaking iterator - unused code now	2024-04-23 09:39:56 +01:00
Ross Vandegrift	9c4b442335	attempt to dlopen libddcutil.so.5 first The backwards-incompatible changes in libddcutil.so.5 are documented at https://www.ddcutil.com/c_api_200/ - a quick grep says that the only affected symbol appearing in E is ddca_set_global_sleep_multiplier (which is already optional). This change does not make any of the changes suggested in the "Library Initialization" section of the above doc.	2024-04-03 22:03:54 -07:00
maxerba	4e32c90b7d	Updating spanish translation	2024-04-01 18:35:16 +02:00
maxerba	5e25ae24f8	Adding french comment and updating italian	2024-03-14 18:49:10 +01:00
rafspiny	3def50bd6a	Use proper icon Add icon to edj file Correct icon Enable sync for edje keyboard lock/unlock Fix keyboard signals in icon Using the correct part from the edje	2024-03-12 07:19:50 -07:00
rafspiny	318de512f2	Make instances extern WIP	2024-03-12 07:19:50 -07:00
rafspiny	5efba6f8a3	Remove unused code	2024-03-12 07:19:50 -07:00
rafspiny	f34460bf96	Introduce version for config	2024-03-12 07:19:50 -07:00
rafspiny	bd1ebaebad	Add e prefix to signales	2024-03-12 07:19:50 -07:00
rafspiny	74cd743aa0	Add typedef enum Specify no parameters on some functions	2024-03-12 07:19:50 -07:00
rafspiny	16bf105f34	Fix icon and translate strign	2024-03-12 07:19:50 -07:00
rafspiny	dcf621326b	Rebase	2024-03-12 07:19:50 -07:00
rafspiny	bb37914492	Fix icon	2024-03-12 07:19:50 -07:00
rafspiny	e7fb1684ce	Allegedly using the icon from edj	2024-03-12 07:19:50 -07:00
rafspiny	a2bdd3c3ff	Move icon for convertible configuration to screen section	2024-03-12 07:19:50 -07:00
rafspiny	801e552985	Add border to icon Add filling to icon	2024-03-12 07:19:50 -07:00
rafspiny	8c184e7ef0	Address shadowing warnings	2024-03-12 07:19:50 -07:00
rafspiny	5992d94c85	Silly me. Order!	2024-03-12 07:19:50 -07:00
rafspiny	6939a34c1d	Prefix local functions static.	2024-03-12 07:19:50 -07:00
rafspiny	1f36cc158b	Prefix local static functions with underscore.	2024-03-12 07:19:50 -07:00
rafspiny	b12978c7c9	Prefix local static functions with underscore.	2024-03-12 07:19:50 -07:00
rafspiny	ffd51d8fca	WIP	2024-03-12 07:19:50 -07:00
rafspiny	5e7fa42b8c	Make some functions static	2024-03-12 07:19:50 -07:00
rafspiny	d60a6fd16b	Forgot to update reference to renamed enum values	2024-03-12 07:19:50 -07:00
rafspiny	5b042e08e2	Forgot to update reference to renamed enum values	2024-03-12 07:19:50 -07:00
rafspiny	fbfd52f679	Forgot to update reference to renamed enum values	2024-03-12 07:19:50 -07:00
rafspiny	faa5c6ae84	Functions renaming	2024-03-12 07:19:50 -07:00
rafspiny	095e14f439	Syntax sugar in for loops	2024-03-12 07:19:50 -07:00
rafspiny	fc30c75946	More readable strcmp in ifs	2024-03-12 07:19:50 -07:00
rafspiny	a139e88811	Enum with all caps values.	2024-03-12 07:19:50 -07:00
rafspiny	43b233348a	Other minor changes	2024-03-12 07:19:50 -07:00
rafspiny	4ea8172e51	Correctly defien function with no params	2024-03-12 07:19:50 -07:00
rafspiny	479b83eb81	Other minor changes	2024-03-12 07:19:50 -07:00
rafspiny	d2ccd898f9	Use strdup	2024-03-12 07:19:50 -07:00
rafspiny	3c3a1ac603	Removed dbus initialization	2024-03-12 07:19:50 -07:00
rafspiny	608e2fcebf	Address calloc failure	2024-03-12 07:19:50 -07:00
rafspiny	ff71a650c2	Address linting comments.	2024-03-12 07:19:50 -07:00
rafspiny	1edbc5cca4	Fix icon	2024-03-12 07:19:50 -07:00
rafspiny	7f33315dcd	First attempt at integrating convertible module	2024-03-12 07:19:50 -07:00
Carsten Haitzler	e10a0d2be1	clock module - fix - free handlers on mod shudtown @fix	2024-03-06 18:57:43 +00:00
Carsten Haitzler	efe2f7b267	wl - put in hardcoded 16x16 image for wl logo if file not found if someone has removed the wl logo png file or it fails to load - use a hardcoded low res 16x16 image data set instead of the wl logo. this way we have a watermark that works so we know it's wayland or not.	2024-03-04 20:18:37 +00:00
Carsten Haitzler	ed64f9e0b8	desklock - fix kbd layout set for desklock so it works e just didn't store the kbd layout - set it up if it is not on desklock based on layout name stored. @fix	2024-02-24 20:43:03 +00:00