[ViewVC] Diff of: cebix/BasiliskII/src/Unix/prefs_editor

Comparing BasiliskII/src/Unix/prefs_editor_gtk.cpp (file contents):
Revision 1.34 by gbeauche, 2006-04-17T14:25:57Z vs.
Revision 1.37 by gbeauche, 2006-04-18T22:17:31Z

#	Line 45 \| Line 45
45
46		// Global variables
47		static GtkWidget *win; // Preferences window
48	<	static bool start_clicked = true; // Return value of PrefsEditor() function
48	>	static bool start_clicked = false; // Return value of PrefsEditor() function
49
50
51		// Prototypes
#	Line 712 \| Line 712 \| *static GtkWidget w_jit_cache_size;**
712		static GtkWidget *w_jit_lazy_flush;
713		static GtkWidget *w_jit_follow_const_jumps;
714
715	+	// Are we running a JIT capable CPU?
716	+	static bool is_jit_capable(void)
717	+	{
718	+	#if USE_JIT && (defined __i386__ \|\| defined __x86_64__)
719	+	return true;
720	+	#elif defined __APPLE__ && defined __MACH__
721	+	// XXX run-time detect so that we can use a PPC GUI prefs editor
722	+	static char cpu[10];
723	+	if (cpu[0] == 0) {
724	+	FILE *fp = popen("uname -p", "r");
725	+	if (fp == NULL)
726	+	return false;
727	+	fgets(cpu, sizeof(cpu) - 1, fp);
728	+	fclose(fp);
729	+	}
730	+	if (cpu[0] == 'i' && cpu[2] == '8' && cpu[3] == '6') // XXX assuming i?86
731	+	return true;
732	+	#endif
733	+	return false;
734	+	}
735	+
736		// Set sensitivity of widgets
737		static void set_jit_sensitive(void)
738		{
#	Line 750 \| Line 771 \| static void tb_jit_follow_const_jumps(Gt
771		// Read settings from widgets and set preferences
772		static void read_jit_settings(void)
773		{
774	<	#if USE_JIT
754	<	bool jit_enabled = PrefsFindBool("jit");
774	>	bool jit_enabled = is_jit_capable() && PrefsFindBool("jit");
775		if (jit_enabled) {
776		const char *str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(w_jit_cache_size)->entry));
777		PrefsReplaceInt32("jitcachesize", atoi(str));
778		}
759	–	#endif
779		}
780
781		// Create "JIT Compiler" pane
782		static void create_jit_pane(GtkWidget *top)
783		{
784	<	#if USE_JIT
784	>	if (!is_jit_capable())
785	>	return;
786	>
787		GtkWidget box, table, label, menu;
788		char str[32];
789
#	Line 788 \| Line 809 \| *static void create_jit_pane(GtkWidget t**
809		w_jit_follow_const_jumps = make_checkbox(box, STR_JIT_FOLLOW_CONST_JUMPS, "jitinline", GTK_SIGNAL_FUNC(tb_jit_follow_const_jumps));
810
811		set_jit_sensitive();
791	–	#endif
812		}
813
814		/*
#	Line 1540 \| Line 1560 \| uint8 XPRAM[XPRAM_SIZE];
1560		void MountVolume(void *fh) { }
1561		void FileDiskLayout(loff_t size, uint8 *data, loff_t &start_byte, loff_t &real_size) { }
1562
1563	+	#if defined __APPLE__ && defined __MACH__
1564	+	void DarwinAddCDROMPrefs(void) { }
1565	+	void DarwinAddFloppyPrefs(void) { }
1566	+	void DarwinAddSerialPrefs(void) { }
1567	+	bool DarwinCDReadTOC(char , uint8 ) { }
1568	+	#endif
1569	+
1570
1571		/*
1572		* Display alert
#	Line 1601 \| Line 1628 \| *void WarningAlert(const char text)**
1628		* RPC handlers
1629		*/
1630
1631	+	static GMainLoop *g_gui_loop;
1632	+
1633		static int handle_ErrorAlert(rpc_connection_t *connection)
1634		{
1635		D(bug("handle_ErrorAlert\n"));
#	Line 1633 \| Line 1662 \| static int handle_Exit(rpc_connection_t
1662		{
1663		D(bug("handle_Exit\n"));
1664
1665	+	g_main_quit(g_gui_loop);
1666		return RPC_ERROR_NO_ERROR;
1667		}
1668
1669
1670		/*
1671	+	* SIGCHLD handler
1672	+	*/
1673	+
1674	+	static char g_app_path[PATH_MAX];
1675	+	static rpc_connection_t *g_gui_connection = NULL;
1676	+
1677	+	static void sigchld_handler(int sig, siginfo_t sip, void )
1678	+	{
1679	+	D(bug("Child %d exitted with status = %x\n", sip->si_pid, sip->si_status));
1680	+
1681	+	// XXX perform a new wait because sip->si_status is sometimes not
1682	+	// the exit _value_ on MacOS X but rather the usual status field
1683	+	// from waitpid() -- we could arrange this code in some other way...
1684	+	int status;
1685	+	if (waitpid(sip->si_pid, &status, 0) < 0)
1686	+	status = sip->si_status;
1687	+	if (WIFEXITED(status))
1688	+	status = WEXITSTATUS(status);
1689	+	if (status & 0x80)
1690	+	status \|= -1 ^0xff;
1691	+
1692	+	if (status < 0) { // negative -> execlp/-errno
1693	+	char str[256];
1694	+	sprintf(str, GetString(STR_NO_B2_EXE_FOUND), g_app_path, strerror(-status));
1695	+	ErrorAlert(str);
1696	+	status = 1;
1697	+	}
1698	+
1699	+	if (status != 0) {
1700	+	if (g_gui_connection)
1701	+	rpc_exit(g_gui_connection);
1702	+	exit(status);
1703	+	}
1704	+	}
1705	+
1706	+
1707	+	/*
1708		* Start standalone GUI
1709		*/
1710
#	Line 1667 \| Line 1734 \| *int main(int argc, char argv[])**
1734		if (start) {
1735		char gui_connection_path[64];
1736		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);
1737
1738	+	// Catch exits from the child process
1739	+	struct sigaction sigchld_sa, old_sigchld_sa;
1740	+	sigemptyset(&sigchld_sa.sa_mask);
1741	+	sigchld_sa.sa_sigaction = sigchld_handler;
1742	+	sigchld_sa.sa_flags = SA_NOCLDSTOP \| SA_SIGINFO;
1743	+	if (sigaction(SIGCHLD, &sigchld_sa, &old_sigchld_sa) < 0) {
1744		char str[256];
1745	<	sprintf(str, GetString(STR_NO_B2_EXE_FOUND), b2_path, strerror(errno));
1745	>	sprintf(str, GetString(STR_SIG_INSTALL_ERR), SIGCHLD, strerror(errno));
1746		ErrorAlert(str);
1747		return 1;
1748		}
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	–	}
1749
1750	<	static const rpc_method_descriptor_t vtable[] = {
1751	<	{ RPC_METHOD_ERROR_ALERT, handle_ErrorAlert },
1752	<	{ RPC_METHOD_WARNING_ALERT, handle_WarningAlert },
1753	<	{ RPC_METHOD_EXIT, handle_Exit }
1754	<	};
1755	<	if (rpc_method_add_callbacks(connection, vtable, sizeof(vtable) / sizeof(vtable[0])) < 0) {
1756	<	printf("ERROR: failed to setup GUI method callbacks\n");
1757	<	return 1;
1750	>	// Search and run the BasiliskII executable
1751	>	char *p;
1752	>	strcpy(g_app_path, argv[0]);
1753	>	if ((p = strstr(g_app_path, "BasiliskIIGUI.app/Contents/MacOS")) != NULL) {
1754	>	strcpy(p, "BasiliskII.app/Contents/MacOS/BasiliskII");
1755	>	if (access(g_app_path, X_OK) < 0) {
1756	>	char str[256];
1757	>	sprintf(str, GetString(STR_NO_B2_EXE_FOUND), g_app_path, strerror(errno));
1758	>	WarningAlert(str);
1759	>	strcpy(g_app_path, "/Applications/BasiliskII.app/Contents/MacOS/BasiliskII");
1760		}
1761	+	} else {
1762	+	p = strrchr(g_app_path, '/');
1763	+	p = p ? p + 1 : g_app_path;
1764	+	strcpy(p, "BasiliskII");
1765	+	}
1766
1767	<	if (rpc_listen(connection) < 0) {
1768	<	printf("ERROR: failed to initialize RPC server thread\n");
1769	<	return 1;
1770	<	}
1767	>	int pid = fork();
1768	>	if (pid == 0) {
1769	>	D(bug("Trying to execute %s\n", g_app_path));
1770	>	execlp(g_app_path, g_app_path, "--gui-connection", gui_connection_path, (char *)NULL);
1771	>	#ifdef _POSIX_PRIORITY_SCHEDULING
1772	>	// XXX get a chance to run the parent process so that to not confuse/upset GTK...
1773	>	sched_yield();
1774	>	#endif
1775	>	_exit(-errno);
1776	>	}
1777
1778	<	int status, ret = -1;
1779	<	while (waitpid(pid, &status, 0) != pid)
1780	<	;
1781	<	if (WIFEXITED(status))
1782	<	ret = WEXITSTATUS(status);
1778	>	// Establish a connection to Basilisk II
1779	>	if ((g_gui_connection = rpc_init_server(gui_connection_path)) == NULL) {
1780	>	printf("ERROR: failed to initialize GUI-side RPC server connection\n");
1781	>	return 1;
1782	>	}
1783	>	static const rpc_method_descriptor_t vtable[] = {
1784	>	{ RPC_METHOD_ERROR_ALERT, handle_ErrorAlert },
1785	>	{ RPC_METHOD_WARNING_ALERT, handle_WarningAlert },
1786	>	{ RPC_METHOD_EXIT, handle_Exit }
1787	>	};
1788	>	if (rpc_method_add_callbacks(g_gui_connection, vtable, sizeof(vtable) / sizeof(vtable[0])) < 0) {
1789	>	printf("ERROR: failed to setup GUI method callbacks\n");
1790	>	return 1;
1791	>	}
1792	>	int socket;
1793	>	if ((socket = rpc_listen_socket(g_gui_connection)) < 0) {
1794	>	printf("ERROR: failed to initialize RPC server thread\n");
1795	>	return 1;
1796	>	}
1797
1798	<	rpc_exit(connection);
1799	<	return ret;
1798	>	g_gui_loop = g_main_new(TRUE);
1799	>	while (g_main_is_running(g_gui_loop)) {
1800	>
1801	>	// Process a few events pending
1802	>	const int N_EVENTS_DISPATCH = 10;
1803	>	for (int i = 0; i < N_EVENTS_DISPATCH; i++) {
1804	>	if (!g_main_iteration(FALSE))
1805	>	break;
1806	>	}
1807	>
1808	>	// Check for RPC events (100 ms timeout)
1809	>	int ret = rpc_wait_dispatch(g_gui_connection, 100000);
1810	>	if (ret == 0)
1811	>	continue;
1812	>	if (ret < 0)
1813	>	break;
1814	>	rpc_dispatch(g_gui_connection);
1815		}
1816	+
1817	+	rpc_exit(g_gui_connection);
1818	+	return 0;
1819		}
1820
1821		return 0;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing BasiliskII/src/Unix/prefs_editor_gtk.cpp (file contents): Revision 1.34 by gbeauche, 2006-04-17T14:25:57Z vs. Revision 1.37 by gbeauche, 2006-04-18T22:17:31Z

Diff Legend

Comparing BasiliskII/src/Unix/prefs_editor_gtk.cpp (file contents):
Revision 1.34 by gbeauche, 2006-04-17T14:25:57Z vs.
Revision 1.37 by gbeauche, 2006-04-18T22:17:31Z