enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Remove config variables for locking. 

Send mode to root window so we can lock/unlock indicator window on startup.



SVN revision: 44518
This commit is contained in:
Christopher Michael 2009-12-16 21:39:04 +00:00
parent f9c88ca73e
commit d567df75c6
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/illume2/e_mod_config.c
View File

@ -41,7 +41,6 @@ il_config_init(E_Module *m)
E_CONFIG_VAL(D, T, policy.softkey.match.name, INT);
E_CONFIG_VAL(D, T, policy.softkey.match.title, INT);
E_CONFIG_VAL(D, T, policy.softkey.match.win_type, INT);
E_CONFIG_VAL(D, T, policy.softkey.locked, INT);
E_CONFIG_VAL(D, T, policy.home.class, STR);
E_CONFIG_VAL(D, T, policy.home.name, STR);
E_CONFIG_VAL(D, T, policy.home.title, STR);
@ -58,7 +57,6 @@ il_config_init(E_Module *m)
E_CONFIG_VAL(D, T, policy.indicator.match.name, INT);
E_CONFIG_VAL(D, T, policy.indicator.match.title, INT);
E_CONFIG_VAL(D, T, policy.indicator.match.win_type, INT);
E_CONFIG_VAL(D, T, policy.indicator.locked, INT);
il_cfg = e_config_domain_load("module.illume2", conf_edd);
if ((il_cfg) &&
@ -130,11 +128,6 @@ il_config_init(E_Module *m)
il_cfg->policy.mode.dual = 0;
il_cfg->policy.mode.side = 0;
}
if ((il_cfg->version & 0xffff) < 3)
{
il_cfg->policy.softkey.locked = 1;
il_cfg->policy.indicator.locked = 1;
}
il_cfg->version = (IL_CONFIG_MAJ << 16) | IL_CONFIG_MIN;
}
il_cfg->mod_dir = eina_stringshare_add(m->dir);
@ -154,6 +147,7 @@ il_config_init(E_Module *m)
_("Policy Settings"),
NULL, "enlightenment/policy",
il_config_policy_settings_show);
return 1;
}

4
src/modules/illume2/e_mod_config.h
View File

@ -1,7 +1,7 @@
#ifndef E_MOD_CONFIG_H
# define E_MOD_CONFIG_H
# define IL_CONFIG_MIN 3
# define IL_CONFIG_MIN 2
# define IL_CONFIG_MAJ 0
typedef struct _Il_Config Il_Config;
@ -26,7 +26,7 @@ struct _Il_Config
const char *class;
const char *name;
const char *title;
int win_type, locked;
int win_type;
struct
{
int class, name, title, win_type;

10
src/modules/illume2/e_mod_layout_illume.c
View File

@ -149,6 +149,16 @@ _border_add(E_Border *bd)
if ((bd->client.icccm.accepts_focus) && (bd->client.icccm.take_focus)
&& (!bd->lock_focus_out))
e_border_focus_set(bd, 1, 1);
if (bd == illume_border_top_shelf_get())
{
Ecore_X_Window xwin;
Ecore_X_Illume_Mode mode;
xwin = ecore_x_window_root_first_get();
mode = ecore_x_e_illume_mode_get(xwin);
ecore_x_e_illume_mode_send(xwin, mode);
}
}
static void

6
src/modules/illume2/e_mod_policy_settings.c
View File

@ -98,6 +98,7 @@ _il_config_policy_settings_changed(void *data, Evas_Object *obj, void *event)
static int
_il_config_policy_settings_change_timeout(void *data)
{
Ecore_X_Window xwin;
Ecore_X_Illume_Mode mode;
e_config_save_queue();
@ -108,8 +109,9 @@ _il_config_policy_settings_change_timeout(void *data)
else
mode = ECORE_X_ILLUME_MODE_SINGLE;
ecore_x_e_illume_mode_set(ecore_x_window_root_first_get(), mode);
ecore_x_e_illume_mode_send(ecore_x_window_root_first_get(), mode);
xwin = ecore_x_window_root_first_get();
ecore_x_e_illume_mode_set(xwin, mode);
ecore_x_e_illume_mode_send(xwin, mode);
return 0;
}