mirror/ede
1
0
Fork 0
mirror of https://github.com/edeproject/ede.git synced 2023-08-10 21:13:03 +03:00
Code Issues Projects Releases Wiki Activity

Composite part now can be conditionally compiled

Browse Source 
Added some more common colors in ede-settings.xml
This commit is contained in:
Sanel Zukan 2008-06-09 15:08:45 +00:00
parent 3ea8f1d1f8
commit c19f08178e
4 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
evoke/EvokeService.cpp
View File

@ -198,7 +198,11 @@ void wake_up_cb(int fd, void* v) {
}
EvokeService::EvokeService() :
is_running(0), logfile(NULL), xsm(NULL), composite(NULL), pidfile(NULL), lockfile(NULL) {
is_running(0), logfile(NULL), xsm(NULL),
#ifdef HAVE_COMPOSITE
composite(NULL),
#endif
pidfile(NULL), lockfile(NULL) {
wake_up_pipe[0] = wake_up_pipe[1] = -1;
}
@ -207,7 +211,9 @@ EvokeService::~EvokeService() {
if(logfile)
delete logfile;
#ifdef HAVE_COMPOSITE
delete composite;
#endif
stop_xsettings_manager(true);
@ -500,12 +506,14 @@ void EvokeService::stop_xsettings_manager(bool serialize) {
}
void EvokeService::init_composite(void) {
#ifdef HAVE_COMPOSITE
composite = new Composite();
if(!composite->init()) {
delete composite;
composite = NULL;
}
#endif
}
void EvokeService::setup_atoms(Display* d) {
@ -725,8 +733,10 @@ bool EvokeService::find_and_unregister_process(pid_t pid, EvokeProcess& pc) {
}
int EvokeService::composite_handle(const XEvent* xev) {
#ifdef HAVE_COMPOSITE
if(composite)
return composite->handle_xevents(xev);
#endif
return 1;
}

5
evoke/EvokeService.h
View File

@ -15,7 +15,10 @@
#include "Log.h"
#include "Xsm.h"
#ifdef HAVE_COMPOSITE
#include "Composite.h"
#endif
#include <edelib/List.h>
#include <edelib/String.h>
@ -56,7 +59,9 @@ class EvokeService {
bool is_running;
Log* logfile;
Xsm* xsm;
#ifdef HAVE_COMPOSITE
Composite* composite;
#endif
char* pidfile;
char* lockfile;

5
evoke/Jamfile
View File

@ -19,7 +19,6 @@ ObjectC++Flags EvokeService.cpp evoke.cpp : -DUSE_FLTK_LOOP_EMULATION ;
SOURCE = evoke.cpp
EvokeService.cpp
Composite.cpp
ClassHack.c
Xsm.cpp
Spawn.cpp
@ -28,7 +27,11 @@ SOURCE = evoke.cpp
Logout.cpp
Autostart.cpp ;
# for composite
SOURCE += Composite.cpp ;
ObjectC++Flags $(SOURCE) : -DHAVE_COMPOSITE ;
LinkAgainst evoke : -lXcomposite -lXdamage -lXfixes -lXrender ;
#LinkAgainst evoke : -lpthread ;
EdeProgram evoke : $(SOURCE) ;

8
evoke/ede-settings.xml
View File

@ -1,11 +1,11 @@
<? xml version="1.0" encoding="UTF-8" ?>
<ede-settings>
<setting name="Fltk/Background" type="color" red="186" green="182" blue="77" alpha="0" />
<setting name="Fltk/Background2" type="color" red="34" green="42" blue="161" alpha="0" />
<setting name="Fltk/Background" type="color" red="220" green="222" blue="227" alpha="0" />
<setting name="Fltk/Background2" type="color" red="239" green="239" blue="239" alpha="0" />
<setting name="Gtk/CanChangeAccels" type="int" value="0" />
<setting name="Gtk/CursorThemeName" type="string" value="default" />
<setting name="Gtk/CursorThemeSize" type="int" value="16" />
<setting name="Gtk/FontName" type="string" value="Sans 10" />
<setting name="Gtk/FontName" type="string" value="Sans 8" />
<setting name="Gtk/KeyThemeName" type="string" value="Default" />
<setting name="Gtk/ToolbarStyle" type="string" value="icons" />
<setting name="Net/Background/Normal" type="color" red="186" green="45" blue="23" alpha="0" />
@ -13,7 +13,7 @@
<setting name="Net/CursorBlinkTime" type="int" value="500" />
<setting name="Net/DndDragThreshold" type="int" value="8" />
<setting name="Net/DoubleClickTime" type="int" value="300" />
<setting name="Net/IconThemeName" type="string" value="Rodent" />
<setting name="Net/IconThemeName" type="string" value="edeneu" />
<setting name="Net/ThemeName" type="string" value="Raleigh" />
<setting name="Net/UserName" type="string" value="John Foo" />
</ede-settings>