eukara/ngunix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Misc fix

Browse source
This commit is contained in:
eukos 2016-01-11 00:30:13 +01:00
parent b7493c0601
commit 025da296fe
1 changed files with 47 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
launcher/main.c
View file

@ -42,7 +42,7 @@ void launcher_settings_load()
if(access(engine_cfg_path, R_OK) != -1 )
{
fFile = fopen(engine_cfg_path, "r");
fscanf(fFile,"%d %d %d", &engine_memory, &engine_vid_width, &engine_vid_height, &engine_vid_border, &engine_hidden);
fscanf(fFile,"%d %d %d %d %d", &engine_memory, &engine_vid_width, &engine_vid_height, &engine_vid_border, &engine_hidden);
fclose(fFile);
printf("[LAUNCHER] Loaded settings... %dx%d @ %dMB memory\n", engine_vid_width, engine_vid_height, engine_memory);
}
@ -153,20 +153,19 @@ void launcher_start()
{
char cmd[128];
if(strlen(cmd_args) > 0)
{
if(engine_vid_border == 1)
sprintf(cmd, "./ngunix.x11 -data id1 -game %s -winsize %d %d -mem %d\n", cmd_args, engine_vid_width, engine_vid_height, engine_memory);
sprintf(cmd, "./ngunix.x11 -game %s -winsize %d %d -mem %d\n", cmd_args, engine_vid_width, engine_vid_height, engine_memory);
else
sprintf(cmd, "./ngunix.x11 -data id1 -game %s -winsize %d %d -mem %d -noborder\n", cmd_args, engine_vid_width, engine_vid_height, engine_memory);
sprintf(cmd, "./ngunix.x11 -game %s -winsize %d %d -mem %d -noborder\n", cmd_args, engine_vid_width, engine_vid_height, engine_memory);
}
else
{
if(engine_vid_border)
sprintf(cmd, "./ngunix.x11 -data id1 -winsize %d %d -mem %d\n", engine_vid_width, engine_vid_height, engine_memory);
sprintf(cmd, "./ngunix.x11 -winsize %d %d -mem %d\n", engine_vid_width, engine_vid_height, engine_memory);
else
sprintf(cmd, "./ngunix.x11 -data id1 -winsize %d %d -mem %d -noborder\n", engine_vid_width, engine_vid_height, engine_memory);
sprintf(cmd, "./ngunix.x11 -winsize %d %d -mem %d -noborder\n", engine_vid_width, engine_vid_height, engine_memory);
}
printf(cmd);
@ -181,6 +180,47 @@ gboolean resize_list(GtkWidget *window, GdkEvent *event, GtkWidget *widget)
gtk_widget_set_size_request(widget, 440, height - (118+41));
}
void launcher_settings_window()
{
GtkWidget *prefwindow;
//GtkWidget *frame;
GtkWidget *ltable1;
ltable1 = gtk_fixed_new();
prefwindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_window_set_title (prefwindow, "NGUNIX - Engine Settings");
gtk_container_set_border_width(GTK_CONTAINER(prefwindow), 10);
//frame = gtk_frame_new("Video Options");
//gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(prefwindow), ltable1);
GtkLabel *label1 = gtk_label_new("Video Width");
GtkLabel *label2 = gtk_label_new("Video Height");
GtkLabel *label3 = gtk_label_new("Video Memory");
gtk_fixed_put(GTK_FIXED(ltable1), label1, 0, 0);
gtk_fixed_put(GTK_FIXED(ltable1), label2, 0, 20);
gtk_fixed_put(GTK_FIXED(ltable1), label3, 0, 40);
GtkWidget *entry1 = gtk_entry_new();
GtkWidget *entry2 = gtk_entry_new();
GtkWidget *entry3 = gtk_entry_new();
gtk_fixed_put(GTK_FIXED(ltable1), entry1, 90, 0);
gtk_fixed_put(GTK_FIXED(ltable1), entry2, 90, 20);
gtk_fixed_put(GTK_FIXED(ltable1), entry3, 90, 40);
GtkWidget *check1 = gtk_check_button_new_with_label("Window Borders");
GtkWidget *check2 = gtk_check_button_new_with_label("Hide Unknown Mods");
gtk_fixed_put(GTK_FIXED(ltable1), check1, 0, 60);
gtk_fixed_put(GTK_FIXED(ltable1), check2, 0, 80);
gtk_widget_show_all(prefwindow);
g_signal_connect(prefwindow, "destroy", G_CALLBACK(gtk_widget_hide), NULL);
}
int main(int argc, char *argv[])
{
GtkWidget *window;
@ -264,6 +304,7 @@ int main(int argc, char *argv[])
g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
g_signal_connect(selection, "changed", G_CALLBACK(launcher_list_changed), listgames);
gtk_signal_connect (GTK_OBJECT (btnplay), "clicked", GTK_SIGNAL_FUNC (launcher_start),NULL);
gtk_signal_connect (GTK_OBJECT (btnsetting), "clicked", GTK_SIGNAL_FUNC (launcher_settings_window),NULL);
gtk_signal_connect (GTK_OBJECT (btnquit), "clicked", GTK_SIGNAL_FUNC (gtk_main_quit),NULL);
g_signal_connect(G_OBJECT(window), "configure-event", G_CALLBACK(resize_list), (gpointer)listwindow);