nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

load the engine out of the config shit. tho the ordering is fucked atm

Browse source
This commit is contained in:
Dana Jansens 2003-03-22 22:45:05 +00:00
parent 93783c2a04
commit 9f68b12062
4 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
openbox/config.c
View file

@ -22,21 +22,16 @@ void cparse_go(char *filename, FILE *);
void config_startup() void config_startup()
{ {
/* test definition */ /* set up built in variables! and their default values! */
ConfigDefEntry *def;
def = config_def_new("test", Config_String); config_def_set(config_def_new("engine", Config_String));
config_def_set(def); config_def_set(config_def_new("theme", Config_String));
config_def_set(config_def_new("font", Config_String));
config_def_set(config_def_new("font.shadow.offset", Config_Integer));
config_def_set(config_def_new("font.shadow.tint", Config_Integer));
config_def_set(config_def_new("titlebar.layout", Config_String));
def = config_def_new("test", Config_String); /*g_datalist_foreach(&config_def, print_config, NULL);*/
config_def_set(def);
def = config_def_new("testlist", Config_String);
config_def_add_value(def, "one");
config_def_add_value(def, "two");
config_def_set(def);
g_datalist_foreach(&config_def, print_config, NULL);
} }
void config_shutdown() void config_shutdown()
@ -75,7 +70,7 @@ gboolean config_set(char *name, ConfigValueType type, ConfigValue value)
name = g_ascii_strdown(name, -1); name = g_ascii_strdown(name, -1);
g_message("Setting %s", name); g_message("Setting %s", name);
g_datalist_foreach(&config_def, print_config, NULL); /*g_datalist_foreach(&config_def, print_config, NULL);*/
def = g_datalist_get_data(&config_def, name); def = g_datalist_get_data(&config_def, name);
if (def == NULL) { if (def == NULL) {

14
openbox/engine.c
View file

@ -1,4 +1,5 @@
#include "engine.h" #include "engine.h"
#include "config.h"
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
@ -58,14 +59,17 @@ static gboolean load(char *name)
return TRUE; return TRUE;
} }
void engine_startup(char *engine) void engine_startup()
{ {
module = NULL; ConfigValue engine;
if (engine != NULL) { module = NULL;
if (load(engine)) g_message("ENGINE STARTUP");
if (config_get("engine", Config_String, &engine)) {
g_warning("GOT ENGINE %s", engine.string);
if (load(engine.string))
return; return;
g_warning("Failed to load the engine '%s'", engine); g_warning("Failed to load the engine '%s'", engine.string);
g_message("Falling back to the default: '%s'", DEFAULT_ENGINE); g_message("Falling back to the default: '%s'", DEFAULT_ENGINE);
} }
if (!load(DEFAULT_ENGINE)) { if (!load(DEFAULT_ENGINE)) {

2
openbox/engine.h
View file

@ -3,7 +3,7 @@
#include "../engines/engineinterface.h" #include "../engines/engineinterface.h"
void engine_startup(char *engine); void engine_startup();
void engine_shutdown(); void engine_shutdown();
EngineFrameNew *engine_frame_new; EngineFrameNew *engine_frame_new;

6
openbox/openbox.c
View file

@ -148,7 +148,7 @@ int main(int argc, char **argv)
render_startup(); render_startup();
font_startup(); font_startup();
themerc_startup(); themerc_startup();
engine_startup(themerc_engine); engine_startup();
event_startup(); event_startup();
screen_startup(); screen_startup();
focus_startup(); focus_startup();
@ -156,8 +156,6 @@ int main(int argc, char **argv)
grab_startup(); grab_startup();
plugin_startup(); plugin_startup();
config_parse();
/* XXX load all plugins!! */ /* XXX load all plugins!! */
plugin_open("focus"); plugin_open("focus");
plugin_open("keyboard"); plugin_open("keyboard");
@ -165,6 +163,8 @@ int main(int argc, char **argv)
plugin_open("placement"); plugin_open("placement");
plugin_open("resistance"); plugin_open("resistance");
config_parse();
/* get all the existing windows */ /* get all the existing windows */
client_manage_all(); client_manage_all();