ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Unix/prefs_editor_gtk.cpp
(Generate patch)

Comparing BasiliskII/src/Unix/prefs_editor_gtk.cpp (file contents):
Revision 1.28 by gbeauche, 2005-06-19T15:52:09Z vs.
Revision 1.34 by gbeauche, 2006-04-17T14:25:57Z

# Line 39 | Line 39
39   #include "prefs.h"
40   #include "prefs_editor.h"
41  
42 + #define DEBUG 0
43 + #include "debug.h"
44 +
45  
46   // Global variables
47   static GtkWidget *win;                          // Preferences window
# Line 60 | Line 63 | static void read_settings(void);
63   *  Utility functions
64   */
65  
66 + #if ! GLIB_CHECK_VERSION(2,0,0)
67 + #define G_OBJECT(obj)                                                   GTK_OBJECT(obj)
68 + #define g_object_get_data(obj, key)                             gtk_object_get_data((obj), (key))
69 + #define g_object_set_data(obj, key, data)               gtk_object_set_data((obj), (key), (data))
70 + #endif
71 +
72   struct opt_desc {
73          int label_id;
74          GtkSignalFunc func;
# Line 69 | Line 78 | struct combo_desc {
78          int label_id;
79   };
80  
81 + struct file_req_assoc {
82 +        file_req_assoc(GtkWidget *r, GtkWidget *e) : req(r), entry(e) {}
83 +        GtkWidget *req;
84 +        GtkWidget *entry;
85 + };
86 +
87 + static void cb_browse_ok(GtkWidget *button, file_req_assoc *assoc)
88 + {
89 +        gchar *file = (char *)gtk_file_selection_get_filename(GTK_FILE_SELECTION(assoc->req));
90 +        gtk_entry_set_text(GTK_ENTRY(assoc->entry), file);
91 +        gtk_widget_destroy(assoc->req);
92 +        delete assoc;
93 + }
94 +
95 + static void cb_browse(GtkWidget *widget, void *user_data)
96 + {
97 +        GtkWidget *req = gtk_file_selection_new(GetString(STR_BROWSE_TITLE));
98 +        gtk_signal_connect_object(GTK_OBJECT(req), "delete_event", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(req));
99 +        gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(req)->ok_button), "clicked", GTK_SIGNAL_FUNC(cb_browse_ok), new file_req_assoc(req, (GtkWidget *)user_data));
100 +        gtk_signal_connect_object(GTK_OBJECT(GTK_FILE_SELECTION(req)->cancel_button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(req));
101 +        gtk_widget_show(req);
102 + }
103 +
104 + static GtkWidget *make_browse_button(GtkWidget *entry)
105 + {
106 +        GtkWidget *button;
107 +
108 +        button = gtk_button_new_with_label(GetString(STR_BROWSE_CTRL));
109 +        gtk_widget_show(button);
110 +        gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc)cb_browse, (void *)entry);
111 +        return button;
112 + }
113 +
114   static void add_menu_item(GtkWidget *menu, int label_id, GtkSignalFunc func)
115   {
116          GtkWidget *item = gtk_menu_item_new_with_label(GetString(label_id));
# Line 82 | Line 124 | static GtkWidget *make_pane(GtkWidget *n
124          GtkWidget *frame, *label, *box;
125  
126          frame = gtk_frame_new(NULL);
127 <        gtk_widget_show(frame);
86 <        gtk_container_border_width(GTK_CONTAINER(frame), 4);
87 <
88 <        label = gtk_label_new(GetString(title_id));
89 <        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, label);
127 >        gtk_container_set_border_width(GTK_CONTAINER(frame), 4);
128  
129          box = gtk_vbox_new(FALSE, 4);
92        gtk_widget_show(box);
130          gtk_container_set_border_width(GTK_CONTAINER(box), 4);
131          gtk_container_add(GTK_CONTAINER(frame), box);
132 +
133 +        gtk_widget_show_all(frame);
134 +
135 +        label = gtk_label_new(GetString(title_id));
136 +        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, label);
137          return box;
138   }
139  
# Line 132 | Line 174 | static GtkWidget *make_table(GtkWidget *
174          return table;
175   }
176  
177 + static GtkWidget *table_make_option_menu(GtkWidget *table, int row, int label_id, const opt_desc *options, int active)
178 + {
179 +        GtkWidget *label, *opt, *menu;
180 +
181 +        label = gtk_label_new(GetString(label_id));
182 +        gtk_widget_show(label);
183 +        gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row + 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
184 +
185 +        opt = gtk_option_menu_new();
186 +        gtk_widget_show(opt);
187 +        menu = gtk_menu_new();
188 +
189 +        while (options->label_id) {
190 +                add_menu_item(menu, options->label_id, options->func);
191 +                options++;
192 +        }
193 +        gtk_menu_set_active(GTK_MENU(menu), active);
194 +
195 +        gtk_option_menu_set_menu(GTK_OPTION_MENU(opt), menu);
196 +        gtk_table_attach(GTK_TABLE(table), opt, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
197 +        return menu;
198 + }
199 +
200 + static GtkWidget *table_make_combobox(GtkWidget *table, int row, int label_id, const char *default_value, GList *glist)
201 + {
202 +        GtkWidget *label, *combo;
203 +        char str[32];
204 +
205 +        label = gtk_label_new(GetString(label_id));
206 +        gtk_widget_show(label);
207 +        gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row + 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
208 +        
209 +        combo = gtk_combo_new();
210 +        gtk_widget_show(combo);
211 +        gtk_combo_set_popdown_strings(GTK_COMBO(combo), glist);
212 +
213 +        gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(combo)->entry), default_value);
214 +        gtk_table_attach(GTK_TABLE(table), combo, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
215 +        
216 +        return combo;
217 + }
218 +
219 + static GtkWidget *table_make_combobox(GtkWidget *table, int row, int label_id, const char *default_value, const combo_desc *options)
220 + {
221 +        GList *glist = NULL;
222 +        while (options->label_id) {
223 +                glist = g_list_append(glist, (void *)GetString(options->label_id));
224 +                options++;
225 +        }
226 +
227 +        return table_make_combobox(table, row, label_id, default_value, glist);
228 + }
229 +
230 + static GtkWidget *table_make_file_entry(GtkWidget *table, int row, int label_id, const char *prefs_item, bool only_dirs = false)
231 + {
232 +        GtkWidget *box, *label, *entry, *button;
233 +
234 +        label = gtk_label_new(GetString(label_id));
235 +        gtk_widget_show(label);
236 +        gtk_table_attach(GTK_TABLE(table), label, 0, 1, row, row + 1, (GtkAttachOptions)0, (GtkAttachOptions)0, 4, 4);
237 +
238 +        const char *str = PrefsFindString(prefs_item);
239 +        if (str == NULL)
240 +                str = "";
241 +
242 +        box = gtk_hbox_new(FALSE, 4);
243 +        gtk_widget_show(box);
244 +        gtk_table_attach(GTK_TABLE(table), box, 1, 2, row, row + 1, (GtkAttachOptions)(GTK_FILL | GTK_EXPAND), (GtkAttachOptions)0, 4, 4);
245 +
246 +        entry = gtk_entry_new();
247 +        gtk_entry_set_text(GTK_ENTRY(entry), str);
248 +        gtk_widget_show(entry);
249 +        gtk_box_pack_start(GTK_BOX(box), entry, TRUE, TRUE, 0);
250 +
251 +        button = make_browse_button(entry);
252 +        gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
253 +        g_object_set_data(G_OBJECT(entry), "chooser_button", button);
254 +        return entry;
255 + }
256 +
257   static GtkWidget *make_option_menu(GtkWidget *top, int label_id, const opt_desc *options, int active)
258   {
259          GtkWidget *box, *label, *opt, *menu;
# Line 306 | Line 428 | static void mn_about(...)
428          dialog = gnome_about_new(
429                  "Basilisk II",
430                  version,
431 <                "Copyright (C) 1997-2004 Christian Bauer",
431 >                "Copyright (C) 1997-2005 Christian Bauer",
432                  authors,
433                  "Basilisk II comes with ABSOLUTELY NO WARRANTY."
434                  "This is free software, and you are welcome to redistribute it"
# Line 322 | Line 444 | static void mn_about(...)
444          char str[512];
445          sprintf(str,
446                  "Basilisk II\nVersion %d.%d\n\n"
447 <                "Copyright (C) 1997-2004 Christian Bauer et al.\n"
447 >                "Copyright (C) 1997-2005 Christian Bauer et al.\n"
448                  "E-mail: Christian.Bauer@uni-mainz.de\n"
449                  "http://www.uni-mainz.de/~bauec002/B2Main.html\n\n"
450                  "Basilisk II comes with ABSOLUTELY NO\n"
# Line 363 | Line 485 | static void mn_zap_pram(...)
485   // Menu item descriptions
486   static GtkItemFactoryEntry menu_items[] = {
487          {(gchar *)GetString(STR_PREFS_MENU_FILE_GTK),           NULL,                   NULL,                                                   0, "<Branch>"},
488 <        {(gchar *)GetString(STR_PREFS_ITEM_START_GTK),          NULL,                   GTK_SIGNAL_FUNC(cb_start),              0, NULL},
488 >        {(gchar *)GetString(STR_PREFS_ITEM_START_GTK),          "<control>S",   GTK_SIGNAL_FUNC(cb_start),              0, NULL},
489          {(gchar *)GetString(STR_PREFS_ITEM_ZAP_PRAM_GTK),       NULL,                   GTK_SIGNAL_FUNC(mn_zap_pram),   0, NULL},
490          {(gchar *)GetString(STR_PREFS_ITEM_SEPL_GTK),           NULL,                   NULL,                                                   0, "<Separator>"},
491          {(gchar *)GetString(STR_PREFS_ITEM_QUIT_GTK),           "<control>Q",   GTK_SIGNAL_FUNC(cb_quit),               0, NULL},
# Line 397 | Line 519 | bool PrefsEditor(void)
519          gtk_box_pack_start(GTK_BOX(box), menu_bar, FALSE, TRUE, 0);
520  
521          GtkWidget *notebook = gtk_notebook_new();
400        gtk_widget_show(notebook);
522          gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_TOP);
523          gtk_notebook_set_scrollable(GTK_NOTEBOOK(notebook), FALSE);
524          gtk_box_pack_start(GTK_BOX(box), notebook, TRUE, TRUE, 0);
525 +        gtk_widget_realize(notebook);
526  
527          create_volumes_pane(notebook);
528          create_scsi_pane(notebook);
# Line 409 | Line 531 | bool PrefsEditor(void)
531          create_serial_pane(notebook);
532          create_memory_pane(notebook);
533          create_jit_pane(notebook);
534 +        gtk_widget_show(notebook);
535  
536          static const opt_desc buttons[] = {
537                  {STR_START_BUTTON, GTK_SIGNAL_FUNC(cb_start)},
# Line 437 | Line 560 | static void cl_selected(GtkWidget *list,
560          selected_volume = row;
561   }
562  
440 struct file_req_assoc {
441        file_req_assoc(GtkWidget *r, GtkWidget *e) : req(r), entry(e) {}
442        GtkWidget *req;
443        GtkWidget *entry;
444 };
445
563   // Volume selected for addition
564   static void add_volume_ok(GtkWidget *button, file_req_assoc *assoc)
565   {
# Line 994 | Line 1111 | static GtkWidget *w_mouse_wheel_lines;
1111   // Set sensitivity of widgets
1112   static void set_input_sensitive(void)
1113   {
1114 <        gtk_widget_set_sensitive(w_keycode_file, PrefsFindBool("keycodes"));
1114 >        const bool use_keycodes = PrefsFindBool("keycodes");
1115 >        gtk_widget_set_sensitive(w_keycode_file, use_keycodes);
1116 >        gtk_widget_set_sensitive(GTK_WIDGET(g_object_get_data(G_OBJECT(w_keycode_file), "chooser_button")), use_keycodes);
1117          gtk_widget_set_sensitive(w_mouse_wheel_lines, PrefsFindInt32("mousewheelmode") == 1);
1118   }
1119  
# Line 1024 | Line 1143 | static void read_input_settings(void)
1143   // Create "Input" pane
1144   static void create_input_pane(GtkWidget *top)
1145   {
1146 <        GtkWidget *box, *hbox, *menu, *label;
1146 >        GtkWidget *box, *hbox, *menu, *label, *button;
1147          GtkObject *adj;
1148  
1149          box = make_pane(top, STR_INPUT_PANE_TITLE);
1150  
1151          make_checkbox(box, STR_KEYCODES_CTRL, "keycodes", GTK_SIGNAL_FUNC(tb_keycodes));
1152 <        w_keycode_file = make_file_entry(box, STR_KEYCODE_FILE_CTRL, "keycodefile");
1152 >
1153 >        hbox = gtk_hbox_new(FALSE, 4);
1154 >        gtk_widget_show(hbox);
1155 >        gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
1156 >
1157 >        label = gtk_label_new(GetString(STR_KEYCODES_CTRL));
1158 >        gtk_widget_show(label);
1159 >        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
1160 >
1161 >        const char *str = PrefsFindString("keycodefile");
1162 >        if (str == NULL)
1163 >                str = "";
1164 >
1165 >        w_keycode_file = gtk_entry_new();
1166 >        gtk_entry_set_text(GTK_ENTRY(w_keycode_file), str);
1167 >        gtk_widget_show(w_keycode_file);
1168 >        gtk_box_pack_start(GTK_BOX(hbox), w_keycode_file, TRUE, TRUE, 0);
1169 >
1170 >        button = make_browse_button(w_keycode_file);
1171 >        gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
1172 >        g_object_set_data(G_OBJECT(w_keycode_file), "chooser_button", button);
1173  
1174          make_separator(box);
1175  
# Line 1271 | Line 1410 | static void create_serial_pane(GtkWidget
1410   *  "Memory/Misc" pane
1411   */
1412  
1413 < static GtkObject *w_ramsize_adj;
1413 > static GtkWidget *w_ramsize;
1414   static GtkWidget *w_rom_file;
1415  
1416   // "Ignore SEGV" button toggled
# Line 1296 | Line 1435 | static void mn_cpu_68040(...) {PrefsRepl
1435   // Read settings from widgets and set preferences
1436   static void read_memory_settings(void)
1437   {
1438 <        PrefsReplaceInt32("ramsize", int(GTK_ADJUSTMENT(w_ramsize_adj)->value) << 20);
1438 >        const char *str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(w_ramsize)->entry));
1439 >        PrefsReplaceInt32("ramsize", atoi(str) << 20);
1440  
1441 <        const char *str = get_file_entry_path(w_rom_file);
1441 >        str = get_file_entry_path(w_rom_file);
1442          if (str && strlen(str))
1443                  PrefsReplaceString("rom", str);
1444          else
# Line 1309 | Line 1449 | static void read_memory_settings(void)
1449   // Create "Memory/Misc" pane
1450   static void create_memory_pane(GtkWidget *top)
1451   {
1452 <        GtkWidget *box, *hbox, *vbox, *hbox2, *label, *scale;
1452 >        GtkWidget *box, *hbox, *table, *label, *menu;
1453  
1454          box = make_pane(top, STR_MEMORY_MISC_PANE_TITLE);
1455 +        table = make_table(box, 2, 5);
1456  
1457 <        hbox = gtk_hbox_new(FALSE, 4);
1458 <        gtk_widget_show(hbox);
1459 <
1460 <        label = gtk_label_new(GetString(STR_RAMSIZE_SLIDER));
1461 <        gtk_widget_show(label);
1462 <        gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
1463 <
1464 <        vbox = gtk_vbox_new(FALSE, 4);
1465 <        gtk_widget_show(vbox);
1466 <
1467 <        gfloat min, max;
1468 <        min = 1;
1469 <        max = 1024;
1470 <        w_ramsize_adj = gtk_adjustment_new(min, min, max, 1, 16, 0);
1471 <        gtk_adjustment_set_value(GTK_ADJUSTMENT(w_ramsize_adj), PrefsFindInt32("ramsize") >> 20);
1472 <
1332 <        scale = gtk_hscale_new(GTK_ADJUSTMENT(w_ramsize_adj));
1333 <        gtk_widget_show(scale);
1334 <        gtk_scale_set_digits(GTK_SCALE(scale), 0);
1335 <        gtk_box_pack_start(GTK_BOX(vbox), scale, TRUE, TRUE, 0);
1336 <
1337 <        hbox2 = gtk_hbox_new(FALSE, 4);
1338 <        gtk_widget_show(hbox2);
1339 <
1340 <        char val[32];
1341 <        sprintf(val, GetString(STR_RAMSIZE_FMT), int(min));
1342 <        label = gtk_label_new(val);
1343 <        gtk_widget_show(label);
1344 <        gtk_box_pack_start(GTK_BOX(hbox2), label, FALSE, FALSE, 0);
1345 <
1346 <        sprintf(val, GetString(STR_RAMSIZE_FMT), int(max));
1347 <        label = gtk_label_new(val);
1348 <        gtk_widget_show(label);
1349 <        gtk_box_pack_end(GTK_BOX(hbox2), label, FALSE, FALSE, 0);
1350 <        gtk_box_pack_start(GTK_BOX(vbox), hbox2, TRUE, TRUE, 0);
1351 <        gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 0);
1352 <        gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
1457 >        static const combo_desc options[] = {
1458 >                STR_RAMSIZE_2MB_LAB,
1459 >                STR_RAMSIZE_4MB_LAB,
1460 >                STR_RAMSIZE_8MB_LAB,
1461 >                STR_RAMSIZE_16MB_LAB,
1462 >                STR_RAMSIZE_32MB_LAB,
1463 >                STR_RAMSIZE_64MB_LAB,
1464 >                STR_RAMSIZE_128MB_LAB,
1465 >                STR_RAMSIZE_256MB_LAB,
1466 >                STR_RAMSIZE_512MB_LAB,
1467 >                STR_RAMSIZE_1024MB_LAB,
1468 >                0
1469 >        };
1470 >        char default_ramsize[10];
1471 >        sprintf(default_ramsize, "%d", PrefsFindInt32("ramsize") >> 20);
1472 >        w_ramsize = table_make_combobox(table, 0, STR_RAMSIZE_CTRL, default_ramsize, options);
1473  
1474          static const opt_desc model_options[] = {
1475                  {STR_MODELID_5_LAB, GTK_SIGNAL_FUNC(mn_modelid_5)},
# Line 1361 | Line 1481 | static void create_memory_pane(GtkWidget
1481                  case 5: active = 0; break;
1482                  case 14: active = 1; break;
1483          }
1484 <        make_option_menu(box, STR_MODELID_CTRL, model_options, active);
1484 >        table_make_option_menu(table, 2, STR_MODELID_CTRL, model_options, active);
1485  
1486   #if EMULATED_68K
1487          static const opt_desc cpu_options[] = {
# Line 1380 | Line 1500 | static void create_memory_pane(GtkWidget
1500                  case 3: active = fpu ? 3 : 2; break;
1501                  case 4: active = 4;
1502          }
1503 <        make_option_menu(box, STR_CPU_CTRL, cpu_options, active);
1503 >        table_make_option_menu(table, 3, STR_CPU_CTRL, cpu_options, active);
1504   #endif
1505  
1506 <        w_rom_file = make_file_entry(box, STR_ROM_FILE_CTRL, "rom");
1506 >        w_rom_file = table_make_file_entry(table, 4, STR_ROM_FILE_CTRL, "rom");
1507  
1508   #ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
1509          make_checkbox(box, STR_IGNORESEGV_CTRL, "ignoresegv", GTK_SIGNAL_FUNC(tb_ignoresegv));
# Line 1405 | Line 1525 | static void read_settings(void)
1525          read_memory_settings();
1526          read_jit_settings();
1527   }
1528 +
1529 +
1530 + #ifdef STANDALONE_GUI
1531 + #include <errno.h>
1532 + #include <sys/wait.h>
1533 + #include "rpc.h"
1534 +
1535 + /*
1536 + *  Fake unused data and functions
1537 + */
1538 +
1539 + uint8 XPRAM[XPRAM_SIZE];
1540 + void MountVolume(void *fh) { }
1541 + void FileDiskLayout(loff_t size, uint8 *data, loff_t &start_byte, loff_t &real_size) { }
1542 +
1543 +
1544 + /*
1545 + *  Display alert
1546 + */
1547 +
1548 + static void dl_destroyed(void)
1549 + {
1550 +        gtk_main_quit();
1551 + }
1552 +
1553 + static void display_alert(int title_id, int prefix_id, int button_id, const char *text)
1554 + {
1555 +        char str[256];
1556 +        sprintf(str, GetString(prefix_id), text);
1557 +
1558 +        GtkWidget *dialog = gtk_dialog_new();
1559 +        gtk_window_set_title(GTK_WINDOW(dialog), GetString(title_id));
1560 +        gtk_container_border_width(GTK_CONTAINER(dialog), 5);
1561 +        gtk_widget_set_uposition(GTK_WIDGET(dialog), 100, 150);
1562 +        gtk_signal_connect(GTK_OBJECT(dialog), "destroy", GTK_SIGNAL_FUNC(dl_destroyed), NULL);
1563 +
1564 +        GtkWidget *label = gtk_label_new(str);
1565 +        gtk_widget_show(label);
1566 +        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0);
1567 +
1568 +        GtkWidget *button = gtk_button_new_with_label(GetString(button_id));
1569 +        gtk_widget_show(button);
1570 +        gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(dl_quit), GTK_OBJECT(dialog));
1571 +        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, FALSE, FALSE, 0);
1572 +        GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
1573 +        gtk_widget_grab_default(button);
1574 +        gtk_widget_show(dialog);
1575 +
1576 +        gtk_main();
1577 + }
1578 +
1579 +
1580 + /*
1581 + *  Display error alert
1582 + */
1583 +
1584 + void ErrorAlert(const char *text)
1585 + {
1586 +        display_alert(STR_ERROR_ALERT_TITLE, STR_GUI_ERROR_PREFIX, STR_QUIT_BUTTON, text);
1587 + }
1588 +
1589 +
1590 + /*
1591 + *  Display warning alert
1592 + */
1593 +
1594 + void WarningAlert(const char *text)
1595 + {
1596 +        display_alert(STR_WARNING_ALERT_TITLE, STR_GUI_WARNING_PREFIX, STR_OK_BUTTON, text);
1597 + }
1598 +
1599 +
1600 + /*
1601 + *  RPC handlers
1602 + */
1603 +
1604 + static int handle_ErrorAlert(rpc_connection_t *connection)
1605 + {
1606 +        D(bug("handle_ErrorAlert\n"));
1607 +
1608 +        int error;
1609 +        char *str;
1610 +        if ((error = rpc_method_get_args(connection, RPC_TYPE_STRING, &str, RPC_TYPE_INVALID)) < 0)
1611 +                return error;
1612 +
1613 +        ErrorAlert(str);
1614 +        free(str);
1615 +        return RPC_ERROR_NO_ERROR;
1616 + }
1617 +
1618 + static int handle_WarningAlert(rpc_connection_t *connection)
1619 + {
1620 +        D(bug("handle_WarningAlert\n"));
1621 +
1622 +        int error;
1623 +        char *str;
1624 +        if ((error = rpc_method_get_args(connection, RPC_TYPE_STRING, &str, RPC_TYPE_INVALID)) < 0)
1625 +                return error;
1626 +
1627 +        WarningAlert(str);
1628 +        free(str);
1629 +        return RPC_ERROR_NO_ERROR;
1630 + }
1631 +
1632 + static int handle_Exit(rpc_connection_t *connection)
1633 + {
1634 +        D(bug("handle_Exit\n"));
1635 +
1636 +        return RPC_ERROR_NO_ERROR;
1637 + }
1638 +
1639 +
1640 + /*
1641 + *  Start standalone GUI
1642 + */
1643 +
1644 + int main(int argc, char *argv[])
1645 + {
1646 + #ifdef HAVE_GNOMEUI
1647 +        // Init GNOME/GTK
1648 +        char version[16];
1649 +        sprintf(version, "%d.%d", VERSION_MAJOR, VERSION_MINOR);
1650 +        gnome_init("Basilisk II", version, argc, argv);
1651 + #else
1652 +        // Init GTK
1653 +        gtk_set_locale();
1654 +        gtk_init(&argc, &argv);
1655 + #endif
1656 +
1657 +        // Read preferences
1658 +        PrefsInit(argc, argv);
1659 +
1660 +        // Show preferences editor
1661 +        bool start = PrefsEditor();
1662 +
1663 +        // Exit preferences
1664 +        PrefsExit();
1665 +
1666 +        // Transfer control to the executable
1667 +        if (start) {
1668 +                char gui_connection_path[64];
1669 +                sprintf(gui_connection_path, "/org/BasiliskII/GUI/%d", getpid());
1670 +                
1671 +                int pid = fork();
1672 +                if (pid == 0) {                 // Child
1673 +                        char b2_path[PATH_MAX];
1674 +                        strcpy(b2_path, argv[0]);
1675 +                        char *p = strrchr(b2_path, '/');
1676 +                        p = p ? p + 1 : b2_path;
1677 +                        *p = '\0';
1678 +                        strcat(b2_path, "BasiliskII");
1679 +                        execl(b2_path, b2_path, "--gui-connection", gui_connection_path, (char *)NULL);
1680 +
1681 +                        char str[256];
1682 +                        sprintf(str, GetString(STR_NO_B2_EXE_FOUND), b2_path, strerror(errno));
1683 +                        ErrorAlert(str);
1684 +                        return 1;
1685 +                }
1686 +                else {                                  // Parent
1687 +                        rpc_connection_t *connection;
1688 +                        if ((connection = rpc_init_server(gui_connection_path)) == NULL) {
1689 +                                printf("ERROR: failed to initialize GUI-side RPC server connection\n");
1690 +                                return 1;
1691 +                        }
1692 +
1693 +                        static const rpc_method_descriptor_t vtable[] = {
1694 +                                { RPC_METHOD_ERROR_ALERT,                       handle_ErrorAlert },
1695 +                                { RPC_METHOD_WARNING_ALERT,                     handle_WarningAlert },
1696 +                                { RPC_METHOD_EXIT,                                      handle_Exit }
1697 +                        };
1698 +                        if (rpc_method_add_callbacks(connection, vtable, sizeof(vtable) / sizeof(vtable[0])) < 0) {
1699 +                                printf("ERROR: failed to setup GUI method callbacks\n");
1700 +                                return 1;
1701 +                        }
1702 +
1703 +                        if (rpc_listen(connection) < 0) {
1704 +                                printf("ERROR: failed to initialize RPC server thread\n");
1705 +                                return 1;
1706 +                        }
1707 +
1708 +                        int status, ret = -1;
1709 +                        while (waitpid(pid, &status, 0) != pid)
1710 +                                ;
1711 +                        if (WIFEXITED(status))
1712 +                                ret = WEXITSTATUS(status);
1713 +
1714 +                        rpc_exit(connection);
1715 +                        return ret;
1716 +                }
1717 +        }
1718 +
1719 +        return 0;
1720 + }
1721 + #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines