Dialog support

This commit is contained in:
Sanel Zukan
2009-02-25 14:03:00 +00:00
parent ffb6f38ccd
commit 3b735c7778
3 changed files with 660 additions and 13 deletions

View File

@@ -12,10 +12,29 @@
#include <signal.h>
#include <errno.h>
#include <FL/Fl.H>
#include <FL/Fl_Box.H>
#include <FL/Fl_Button.H>
#include <FL/Fl_Input.H>
#include <FL/Fl_Pixmap.H>
#include <edelib/Run.h>
#include <edelib/Window.h>
#include <edelib/Nls.h>
#include "icons/run.xpm"
/*
* Window from X11 is alread included with Fl.H so we can't use
* EDELIB_NS_USING(Window) here. Stupid C++ namespaces
*/
#define LaunchWindow edelib::Window
EDELIB_NS_USING(run_program_fmt)
static Fl_Pixmap image_run(run_xpm);
static Fl_Input* dialog_input;
static int ret;
void help(void) {
puts("Usage: ede-launch [OPTIONS] program");
puts("EDE program launcher");
@@ -116,8 +135,8 @@ static int start_child_process(const char* cmd) {
}
if(WIFEXITED(status)) {
int v = WEXITSTATUS(status);
fprintf(stderr, "ede-launcher: child exited with '%i'\n", v);
/*int v = WEXITSTATUS(status);
fprintf(stderr, "ede-launcher: child exited with '%i'\n", v); */
} else if(WIFSIGNALED(status) && WTERMSIG(status) == SIGSEGV) {
start_crasher(cmd, SIGSEGV);
} else {
@@ -127,31 +146,78 @@ static int start_child_process(const char* cmd) {
return 0;
}
static int start_child_process_with_core(const char* cmd) {
static void start_child_process_with_core(const char* cmd) {
struct rlimit r;
if(getrlimit(RLIMIT_CORE, &r) == -1)
return -1; /* TODO: core dump error message */
if(getrlimit(RLIMIT_CORE, &r) == -1) {
ret = -1; /* TODO: core dump error message */
return;
}
rlim_t old = r.rlim_cur;
r.rlim_cur = RLIM_INFINITY;
if(setrlimit(RLIMIT_CORE, &r) == -1)
return -1; /* TODO: core dump error message */
if(setrlimit(RLIMIT_CORE, &r) == -1) {
ret = -1; /* TODO: core dump error message */
return;
}
int ret = start_child_process(cmd);
ret = start_child_process(cmd);
r.rlim_cur = old;
if(setrlimit(RLIMIT_CORE, &r) == -1)
return -1; /* TODO: core dump error message */
if(setrlimit(RLIMIT_CORE, &r) == -1) {
ret = -1; /* TODO: core dump error message */
return;
}
}
return ret;
static void cancel_cb(Fl_Widget*, void* w) {
LaunchWindow* win = (LaunchWindow*)w;
win->hide();
}
static void ok_cb(Fl_Widget*, void* w) {
LaunchWindow* win = (LaunchWindow*)w;
const char* cmd = dialog_input->value();
win->hide();
/* do not block dialog when program is starting */
Fl::check();
/* TODO: is 'cmd' safe to use here? */
start_child_process_with_core(cmd);
}
static void start_dialog(int argc, char** argv) {
LaunchWindow* win = new LaunchWindow(370, 160, _("Run Command"));
win->begin();
Fl_Box* icon = new Fl_Box(10, 10, 55, 55);
icon->image(image_run);
Fl_Box* txt = new Fl_Box(70, 10, 290, 69, _("Enter the name of the application you would like to run or the URL you would like to view"));
txt->align(132|FL_ALIGN_INSIDE);
dialog_input = new Fl_Input(70, 90, 290, 25, _("Open:"));
Fl_Button* ok = new Fl_Button(175, 125, 90, 25, _("&OK"));
ok->callback(ok_cb, win);
Fl_Button* cancel = new Fl_Button(270, 125, 90, 25, _("&Cancel"));
cancel->callback(cancel_cb, win);
win->end();
win->show(argc, argv);
while(win->shown())
Fl::wait();
}
int main(int argc, char** argv) {
if(argc != 2) {
if(argc == 1)
start_dialog(argc, argv);
else if(argc != 2) {
help();
return 0;
} else {
start_child_process_with_core(argv[1]);
}
return start_child_process_with_core(argv[1]);
return ret;
}