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

New logout dialog

Browse Source 
Some compilation fix with the new FLTK versions
This commit is contained in:
Sanel Zukan
2008-10-08 13:22:45 +00:00
parent 5687eae0ac
commit a28b95f255
5 changed files with 95 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
evoke/evoke.cpp
View File

@ -39,21 +39,28 @@ static void quit_signal(int sig) {
EvokeService::instance()->stop();
}
static void xmessage_handler(int, void*) {
static int xmessage_handler(int) {
#ifdef USE_FLTK_LOOP_EMULATION
XEvent xev;
while(XEventsQueued(fl_display, QueuedAfterReading)) {
XNextEvent(fl_display, &xev);
EvokeService::instance()->handle((const XEvent*)&xev);
}
return 1;
#else
return EvokeService::instance()->handle(fl_xevent);
#endif
}
#ifdef USE_FLTK_LOOP_EMULATION
static void xmessage_handler_fd(int, void*) {
xmessage_handler(0);
}
static int composite_handler(int ev) {
return EvokeService::instance()->composite_handle(fl_xevent);
}
#endif
static const char* next_param(int curr, char** argv, int argc) {
int j = curr + 1;
@ -64,7 +71,7 @@ static const char* next_param(int curr, char** argv, int argc) {
return argv[j];
}
void help(void) {
static void help(void) {
puts("Usage: evoke [OPTIONS]");
puts("EDE startup manager responsible for starting, quitting and tracking");
puts("various pieces of desktop environment and external programs.");
@ -236,7 +243,7 @@ int main(int argc, char** argv) {
* windows it already don't know.
*/
#ifdef USE_FLTK_LOOP_EMULATION
Fl::add_fd(ConnectionNumber(fl_display), 1, xmessage_handler);
Fl::add_fd(ConnectionNumber(fl_display), 1, xmessage_handler_fd);
Fl::add_handler(composite_handler);
#else
/*
@ -255,7 +262,7 @@ int main(int argc, char** argv) {
* send to xmessage_handler() and composite will wrongly draw the screen.
*/
if(XQLength(fl_display)) {
xmessage_handler(0, 0);
xmessage_handler(0);
continue;
}
#else