ton of xkb fixes:

* e will no longer lose your currently selected layout on restart
* desklock layout switching now works real güd
* new e_config values to determine current and current user-selected kbd layout
* wasted my entire morning doing this

ticket #1538



SVN revision: 77356

1 files changed, 4 insertions, 2 deletions

diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index ead8996eff..0df1794db1 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -37,7 +37,7 @@ typedef struct _E_Event_Config_Icon_Theme   E_Event_Config_Icon_Theme;
 /* increment this whenever a new set of config values are added but the users
  * config doesn't need to be wiped - simply new values need to be put in
  */
-#define E_CONFIG_FILE_GENERATION 0x0156
+#define E_CONFIG_FILE_GENERATION 0x0157
 #define E_CONFIG_FILE_VERSION    ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
 
 struct _E_Config
@@ -386,7 +386,9 @@ struct _E_Config
       int         only_label;
       const char *default_model;
       int         cur_group;
-      int         desklock_group;
+      const char *cur_layout; // whatever the current layout is
+      const char *selected_layout; // whatever teh current layout that the user has selected is
+      const char *desklock_layout;
    } xkb;
    
    unsigned char exe_always_single_instance;