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

add options to run/support other desktop env's as well as load std x 

stuff.



SVN revision: 61364
This commit is contained in:
Carsten Haitzler 2011-07-14 08:18:55 +00:00
parent 52595240fd
commit 52d8eedc93
12 changed files with 216 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/Makefile.am
View File

@ -55,6 +55,7 @@ e_confirm_dialog.h \
e_container.h \
e_datastore.h \
e_desk.h \
e_deskenv.h \
e_desklock.h \
e_dialog.h \
e_dnd.h \
@ -203,6 +204,7 @@ e_confirm_dialog.c \
e_container.c \
e_datastore.c \
e_desk.c \
e_deskenv.c \
e_desklock.c \
e_dialog.c \
e_dnd.c \

5
src/bin/e_config.c
View File

@ -909,6 +909,11 @@ e_config_init(void)
E_CONFIG_VAL(D, T, backlight.normal, DOUBLE);
E_CONFIG_VAL(D, T, backlight.dim, DOUBLE);
E_CONFIG_VAL(D, T, backlight.transition, DOUBLE);
E_CONFIG_VAL(D, T, deskenv.load_xrdb, UCHAR);
E_CONFIG_VAL(D, T, deskenv.load_xmodmap, UCHAR);
E_CONFIG_VAL(D, T, deskenv.load_gnome, UCHAR);
E_CONFIG_VAL(D, T, deskenv.load_kde, UCHAR);
e_config_load();

7
src/bin/e_config.h
View File

@ -349,6 +349,13 @@ struct _E_Config
double dim;
double transition;
} backlight;
struct {
unsigned char load_xrdb;
unsigned char load_xmodmap;
unsigned char load_gnome;
unsigned char load_kde;
} deskenv;
};
struct _E_Config_Env_Var

58
src/bin/e_deskenv.c Normal file
View File

@ -0,0 +1,58 @@
#include "e.h"
EINTERN int
e_deskenv_init(void)
{
char buf[PATH_MAX], buf2[PATH_MAX];
// run xdrb -load .Xdefaults & .Xresources
// NOTE: one day we should replace this with an e based config + service
if (e_config->deskenv.load_xrdb)
{
e_user_homedir_concat(buf, sizeof(buf), ".Xdefaults");
if (ecore_file_exists(buf))
{
snprintf(buf2, sizeof(buf2), "xrdb -load %s", buf);
ecore_exe_run(buf2, NULL);
}
e_user_homedir_concat(buf, sizeof(buf), ".Xresources");
if (ecore_file_exists(buf))
{
snprintf(buf2, sizeof(buf2), "xrdb -load %s", buf);
ecore_exe_run(buf2, NULL);
}
}
// load ~/.Xmodmap
// NOTE: one day we should replace this with an e based config + service
if (e_config->deskenv.load_xmodmap)
{
e_user_homedir_concat(buf, sizeof(buf), ".Xmodmap");
if (ecore_file_exists(buf))
{
snprintf(buf2, sizeof(buf2), "xmodmap %s", buf);
ecore_exe_run(buf2, NULL);
}
}
// make gnome apps happy
// NOTE: one day we should replace this with an e based config + service
if (e_config->deskenv.load_gnome)
{
ecore_exe_run("gnome-settings-daemon", NULL);
}
// make kde apps happy
// NOTE: one day we should replace this with an e based config + service ??
if (e_config->deskenv.load_kde)
{
ecore_exe_run("kdeinit", NULL);
}
return 1;
}
EINTERN int
e_deskenv_shutdown(void)
{
return 1;
}

10
src/bin/e_deskenv.h Normal file
View File

@ -0,0 +1,10 @@
#ifdef E_TYPEDEFS
#else
#ifndef E_DESKENV_H
#define E_DESKENV_H
EINTERN int e_deskenv_init(void);
EINTERN int e_deskenv_shutdown(void);
#endif
#endif

1
src/bin/e_includes.h
View File

@ -139,3 +139,4 @@
#include "e_acpi.h"
#include "e_env.h"
#include "e_backlight.h"
#include "e_deskenv.h"

12
src/bin/e_main.c
View File

@ -1035,6 +1035,18 @@ main(int argc, char **argv)
}
_e_main_shutdown_push(e_thumb_shutdown);
if (!after_restart)
{
TS("deskenv");
/* init deskenv system */
if (!e_deskenv_init())
{
e_error_message_show(_("Enlightenment cannot set up its desktop environment system."));
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_deskenv_shutdown);
}
e_init_status_set(_("Setup File Ordering"));
TS("order");
if (!e_order_init())

4
src/modules/conf_applications/Makefile.am
View File

@ -23,7 +23,9 @@ module_la_SOURCES = e_mod_main.c \
e_int_config_apps.c \
e_int_config_apps.h \
e_int_config_defapps.c \
e_int_config_defapps.h
e_int_config_defapps.h \
e_int_config_deskenv.c \
e_int_config_deskenv.h
module_la_LIBADD = @e_libs@ @dlopen_libs@
module_la_LDFLAGS = -module -avoid-version

102
src/modules/conf_applications/e_int_config_deskenv.c Normal file
View File

@ -0,0 +1,102 @@
#include "e.h"
/* PROTOTYPES - same all the time */
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
/* Actual config data we will be playing with whil the dialog is active */
struct _E_Config_Dialog_Data
{
int load_xrdb;
int load_xmodmap;
int load_gnome;
int load_kde;
};
/* a nice easy setup function that does the dirty work */
E_Config_Dialog *
e_int_config_deskenv(E_Container *con, const char *params __UNUSED__)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
if (e_config_dialog_find("E", "windows/window_focus")) return NULL;
v = E_NEW(E_Config_Dialog_View, 1);
/* methods */
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply;
v->basic.create_widgets = _basic_create;
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Focus Settings"), "E",
"windows/desktop_environments", "preferences-desktop-environments",
0, v, NULL);
return cfd;
}
/**--CREATE--**/
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
cfdata->load_xrdb = e_config->deskenv.load_xrdb;
cfdata->load_xmodmap = e_config->deskenv.load_xmodmap;
cfdata->load_gnome = e_config->deskenv.load_gnome;
cfdata->load_kde = e_config->deskenv.load_kde;
}
static void *
_create_data(E_Config_Dialog *cfd __UNUSED__)
{
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(cfdata);
return cfdata;
}
static void
_free_data(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
E_FREE(cfdata);
}
/**--APPLY--**/
static int
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
{
e_config->deskenv.load_xrdb = cfdata->load_xrdb;
e_config->deskenv.load_xmodmap = cfdata->load_xmodmap;
e_config->deskenv.load_gnome = cfdata->load_gnome;
e_config->deskenv.load_kde = cfdata->load_kde;
e_config_save_queue();
return 1; /* Apply was OK */
}
/**--GUI--**/
static Evas_Object *
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
{
/* generate the core widget layout for a basic dialog */
Evas_Object *o, *ob;
o = e_widget_list_add(evas, 0, 0);
ob = e_widget_check_add(evas, _("Load X Resources"),
&(cfdata->load_xrdb));
e_widget_list_object_append(o, ob, 1, 0, 0.0);
ob = e_widget_check_add(evas, _("Load X Modifier Map"),
&(cfdata->load_xmodmap));
e_widget_list_object_append(o, ob, 1, 0, 0.0);
ob = e_widget_check_add(evas, _("Start GNOME services on login"),
&(cfdata->load_gnome));
e_widget_list_object_append(o, ob, 1, 0, 0.0);
ob = e_widget_check_add(evas, _("Start KDE services on login"),
&(cfdata->load_kde));
e_widget_list_object_append(o, ob, 1, 0, 0.0);
return o;
}

9
src/modules/conf_applications/e_int_config_deskenv.h Normal file
View File

@ -0,0 +1,9 @@
#ifdef E_TYPEDEFS
#else
#ifndef E_INT_CONFIG_DESKENV_H
#define E_INT_CONFIG_DESKENV_H
E_Config_Dialog *e_int_config_deskenv(E_Container *con, const char *params __UNUSED__);
#endif
#endif

5
src/modules/conf_applications/e_mod_main.c
View File

@ -41,6 +41,10 @@ e_modapi_init(E_Module *m)
_("Default Applications"), NULL,
"preferences-applications-default",
e_int_config_defapps);
e_configure_registry_item_add("applications/desktop_environments", 70,
_("Desktop Environments"), NULL,
"preferences-desktop-environments",
e_int_config_deskenv);
e_configure_registry_category_add("internal", -1, _("Internal"), NULL,
"enlightenment/internal");
e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"),
@ -67,6 +71,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_configure_registry_item_del("applications/restart_applications");
e_configure_registry_item_del("applications/startup_applications");
e_configure_registry_item_del("applications/default_applications");
e_configure_registry_item_del("applications/desktop_environments");
e_configure_registry_category_del("applications");
conf_module = NULL;
return 1;

2
src/modules/conf_applications/e_mod_main.h
View File

@ -4,10 +4,12 @@
#define E_TYPEDEFS 1
#include "e_int_config_apps.h"
#include "e_int_config_defapps.h"
#include "e_int_config_deskenv.h"
#undef E_TYPEDEFS
#include "e_int_config_apps.h"
#include "e_int_config_defapps.h"
#include "e_int_config_deskenv.h"
EAPI extern E_Module_Api e_modapi;