[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Main.pm

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.2 by root, Tue Dec 27 09:17:27 2011 UTC vs.
Revision 1.13 by root, Sat Jan 7 19:43:46 2012 UTC

…		…
17	die if $@;	17	die if $@;
18	}	18	}
19		19
20	use common::sense;	20	use common::sense;
21	use Carp 'verbose';	21	use Carp 'verbose';
		22	use Cwd ();
		23	use Digest::MD5 ();
22	use EV;	24	use EV;
23	BEGIN { *time = \&EV::time }	25	BEGIN { *time = \&EV::time }
24		26
25	use List::Util qw(max min);	27	use List::Util qw(max min);
26		28
…		…
40	# nop at compiletime	42	# nop at compiletime
41	}	43	}
42		44
43	BEGIN {	45	BEGIN {
44	$SIG{__DIE__} = sub {	46	$SIG{__DIE__} = sub {
45	return if $^S;	47	return if $^S; # quick reject
		48
		49	# return if there are any eval contexts in the csall stack
		50	for my $i (0..999) {
		51	my ($sub, $is_require) = (caller $i)[3, 7]
		52	or last;
		53	return if $sub eq "(eval)" && !$is_require;
		54	}
		55
46	crash "CRASH/DIE: $_[0]" => 1;	56	crash "CRASH/DIE: $_[0]" => 1;
47	DC::fatal Carp::longmess "$_[0]";	57	DC::fatal Carp::longmess "$_[0]";
48	}	58	}
49	}	59	}
50		60
…		…
133	our $PL_NOTEBOOK;	143	our $PL_NOTEBOOK;
134	our $PL_WINDOW;	144	our $PL_WINDOW;
135		145
136	our $MUSIC_PLAYING_WIDGET;	146	our $MUSIC_PLAYING_WIDGET;
137	our $LICENSE_WIDGET;	147	our $LICENSE_WIDGET;
		148	our $DOWNLOADS_WIDGET;
138		149
139	our $PICKUP_PAGE;	150	our $PICKUP_PAGE;
140	our $INVENTORY_PAGE;	151	our $INVENTORY_PAGE;
141	our $STATS_PAGE;	152	our $STATS_PAGE;
142	our $SKILL_PAGE;	153	our $SKILL_PAGE;
…		…
185	AnyEvent::Util::fh_nonblocking $fh, 1;	196	AnyEvent::Util::fh_nonblocking $fh, 1;
186		197
187	$msg =~ s/\s+$//;	198	$msg =~ s/\s+$//;
188		199
189	# backtrace as second step, in case it crashes, too	200	# backtrace as second step, in case it crashes, too
190	crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"	201	crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated"
191	if $backtrace;	202	if $backtrace;
192	};	203	};
193		204
194	sub clienterror($;$) {	205	sub clienterror($;$) {
195	my ($msg, $backtrace) = @_;	206	my ($msg, $backtrace) = @_;
…		…
197	warn $msg;	208	warn $msg;
198		209
199	return unless $CONN;	210	return unless $CONN;
200		211
201	$CONN->send_exti_msg (clientlog => $msg);	212	$CONN->send_exti_msg (clientlog => $msg);
202	$CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;	213	$CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION$Urlader::EXE_VER, generated") if $backtrace;
203	}	214	}
204		215
205	#############################################################################	216	#############################################################################
206		217
207	sub status {	218	sub status {
…		…
512		523
513	DC::Mix_CloseAudio if $SDL_MIXER;	524	DC::Mix_CloseAudio if $SDL_MIXER;
514	undef $SDL_MIXER;	525	undef $SDL_MIXER;
515		526
516	DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;	527	DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
		528	}
		529
		530	#############################################################################
		531	# Over-the-air updates
		532
		533	sub ota_update {
		534	my ($face, $size, $md5) = @_;
		535
		536	my $coro = Coro::async_pool {
		537	my $override = "$Urlader::EXE_DIR/override";
		538
		539	$MESSAGE_DIST->add_channel ({
		540	id => "ota_update",
		541	title => "Update",
		542	tooltip => "<b>Software Update Log</b>",
		543	});
		544
		545	$MESSAGE_DIST->message ({ type => "ota_update", markup => "preparing override..." });
		546
		547	my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY \| IO::AIO::O_CREAT \| IO::AIO::O_TRUNC, 0777;
		548
		549	unless ($fh) {
		550	$MESSAGE_DIST->message ({ type => "ota_update", markup => (DC::asxml "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!") });
		551	return;
		552	}
		553
		554	$MESSAGE_DIST->message ({ type => "ota_update", markup => "downloading $size bytes..." });
		555
		556	my $cv = AE::cv;
		557	my $error;
		558
		559	$cv->begin (Coro::rouse_cb);
		560	$CONN->ask_face (
		561	$face,
		562	-1000,
		563	sub {
		564	$STATUSBOX->add (
		565	(sprintf "update download: %d/%d", $size - $_[1], $size),
		566	pri => -9, group => "ota_update", timeout => 60, fg => [1, 1, 0, 1]
		567	);
		568
		569	$cv->begin;
		570	my $len = length $_[2];
		571	IO::AIO::aio_write $fh, $_[1], $len, $_[2], undef, sub {
		572	$error \|\|= $_[0] != $len;
		573	$cv->end;
		574	};
		575	},
		576	sub {
		577	$cv->end;
		578	},
		579	);
		580
		581	Coro::rouse_wait;
		582
		583	$STATUSBOX->clr_group ("ota_update");
		584
		585	$error \|\|= Coro::AIO::aio_fsync $fh;
		586	$error \|\|= Coro::AIO::aio_close $fh;
		587
		588	if ($error) {
		589	$MESSAGE_DIST->message ({ type => "ota_update", markup => "file write error, update aborted." });
		590	Coro::AIO::aio_unlink "$override.tmp";
		591	return;
		592	}
		593
		594	{
		595	$MESSAGE_DIST->message ({ type => "ota_update", markup => "verifying update file..." });
		596
		597	my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0;
		598
		599	if ($fh) {
		600	$error \|\|= Coro::AIO::aio_stat "$override.tmp";
		601	$error \|\|= -s _ != $size;
		602	$error \|\|= Coro::AIO::aio_readahead $fh, 0, $size;
		603
		604	my $f_md5 = new Digest::MD5;
		605	binmode $fh; # ugh :(
		606	$f_md5->addfile ($fh);
		607	$f_md5 = $f_md5->hexdigest;
		608	$error \|\|= $md5 ne $f_md5;
		609	}
		610	}
		611
		612	if ($error) {
		613	$MESSAGE_DIST->message ({ type => "ota_update", markup => "verification failed, update aborted." });
		614	Coro::AIO::aio_unlink "$override.tmp";
		615	return;
		616	}
		617
		618	$MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." });
		619
		620	if (Coro::AIO::aio_rename "$override.tmp", $override) {
		621	$MESSAGE_DIST->message ({ type => "ota_update", markup => "unable to replace override file, update aborted." });
		622	Coro::AIO::aio_unlink "$override.tmp";
		623	}
		624
		625	$MESSAGE_DIST->message ({ type => "ota_update", markup => "success - update becomes active after restarting." });
		626	};
		627
		628	$CONN->{ota_update} = Guard::guard {
		629	$coro->cancel;
		630	};
		631	}
		632
		633	sub ota_update_ask {
		634	my ($ok, $face, $ver, $size, $md5, $changes) = @_;
		635
		636	$CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel
		637	x => "center",
		638	y => "center",
		639	z => 55,
		640	force_w => $::WIDTH * 0.7,
		641	force_h => $::HEIGHT * 0.7,
		642	title => "Software update available",
		643	child => my $vbox = new DC::UI::VBox,
		644	;
		645
		646	$vbox->add (new DC::UI::Label
		647	ellipsise => 0,
		648	text => "The server offers a software update, "
		649	. "do you want to start downloading this update in the background?",
		650	);
		651
		652	$vbox->add (new DC::UI::FancyFrame
		653	expand => 1,
		654	label => "Details",
		655	child => (new DC::UI::TextScroller
		656	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4,
		657	par => [{
		658	markup => "<tt>Old revision: $Urlader::EXE_VER\n"
		659	. "New revision: $ver\n"
		660	. "Download size: $size bytes</tt>\n\n"
		661	. "Changes:\n\n"
		662	. DC::asxml $changes
		663	}],
		664	),
		665	);
		666
		667	$vbox->add (my $hbox = new DC::UI::HBox);
		668
		669	$hbox->add (new DC::UI::Button
		670	expand => 1,
		671	text => "Not now",
		672	on_activate => sub {
		673	$dialog->destroy;
		674	0
		675	}
		676	);
		677	$hbox->add (new DC::UI::Button
		678	expand => 1,
		679	text => "Yes, start downloading",
		680	on_activate => sub {
		681	$dialog->destroy;
		682	ota_update $face, $size, $md5;
		683	0
		684	},
		685	);
		686
		687	$dialog->show;
		688	}
		689
		690	sub ota_update_check {
		691	return unless defined $Urlader::EXE_ID;
		692
		693	::message { markup => "Checking for software update..." };
		694
		695	$CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub {
		696	my ($ok, $face, $ver, $size, $md5, $changes) = @_;
		697
		698	if ($ok) {
		699	if (defined $ver) {
		700	::message { markup => "Server offers version $ver (we are version $Urlader::EXE_VER)." };
		701	&ota_update_ask;
		702	} else {
		703	::message { markup => "Server has no newer version." };
		704	}
		705	} else {
		706	::message { markup => "Server does not support software update." };
		707	}
		708
		709	# $self->register_face_handler ($exp_table, sub {
		710	# my ($face) = @_;
		711
		712	# $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		713	# $_->() for values %{ $self->{on_exp_update} \|\| {} };
		714	# });
		715
		716	()
		717	});
517	}	718	}
518		719
519	#############################################################################	720	#############################################################################
520		721
521	sub destroy_query_dialog {	722	sub destroy_query_dialog {
…		…
764	mapw => $mapw,	965	mapw => $mapw,
765	maph => $maph,	966	maph => $maph,
766		967
767	c_version => {	968	c_version => {
768	client => "deliantra",	969	client => "deliantra",
769	clientver => $DC::VERSION,	970	clientver => "$DC::VERSION$Urlader::EXE_VER",
770	gl_vendor => DC::OpenGL::gl_vendor,	971	gl_vendor => DC::OpenGL::gl_vendor,
771	gl_version => DC::OpenGL::gl_version,	972	gl_version => DC::OpenGL::gl_version,
772	},	973	},
773		974
774	map_widget => $MAPWIDGET,	975	map_widget => $MAPWIDGET,
…		…
782	},	983	},
783		984
784	on_connect => sub {	985	on_connect => sub {
785	if ($_[0]) {	986	if ($_[0]) {
786	DC::lowdelay fileno $CONN->{fh};	987	DC::lowdelay fileno $CONN->{fh};
		988
		989	ota_update_check;
787		990
788	status "successfully connected to the server";	991	status "successfully connected to the server";
789	} else {	992	} else {
790	undef $CONN;	993	undef $CONN;
791	status "unable to connect: $!";	994	status "unable to connect: $!";
…		…
1131	text => $CFG->{audio_driver},	1334	text => $CFG->{audio_driver},
1132	template => "dsound1234",	1335	template => "dsound1234",
1133	tooltip => "You can override the audio driver to use here. Leaving it empty will result "	1336	tooltip => "You can override the audio driver to use here. Leaving it empty will result "
1134	. "in Deliantra picking one automatically. GNU/Linux users often prefer specific "	1337	. "in Deliantra picking one automatically. GNU/Linux users often prefer specific "
1135	. "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "	1338	. "drivers though, and can experiment with <b>alsa</b>, <b>dsp</b>, <b>esd</b>, <b>pulse</b>, <b>arts</b>, <b>nas</b> "
1136	. "or other system-specific drivers. Selecting the wrong driver here will simply result"	1339	. "or other system-specific drivers. Selecting the wrong driver here will simply result "
1137	. "in no sound.",	1340	. "in no sound.",
1138	on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }	1341	on_changed => sub { my ($self, $value) = @_; $CFG->{audio_driver} = $value; 1 }
1139	);	1342	);
1140		1343
1141	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");	1344	$table->add_at (0, $row, new DC::UI::Label align => 1, text => "Sound Effects");
…		…
1841		2044
1842	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Data Directory");	2045	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Data Directory");
1843	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $Deliantra::VARDIR, tooltip => "");	2046	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $Deliantra::VARDIR, tooltip => "");
1844	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Database Directory");	2047	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Database Directory");
1845	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => "");	2048	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => "");
		2049	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)");
		2050	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => "");
1846	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)");	2051	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)");
1847	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $::EXE_ID, tooltip => "");	2052	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => "");
1848	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Version (Prebuilt)");	2053	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Revision (Prebuilt)");
1849	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $::EXE_VER, tooltip => "");	2054	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => "");
1850	$table->add_at (0, $row , new DC::UI::Label align => 1, text => "Update (Prebuilt)");
1851	$table->add_at (1, $row++, new DC::UI::Label align => 0, text => $::UPDPAR, tooltip => "");
1852	}	2055	}
1853		2056
1854	$vbox	2057	$vbox
1855	}	2058	}
1856		2059
…		…
2030		2233
2031	sub media_window {	2234	sub media_window {
2032	my $vb = new DC::UI::VBox;	2235	my $vb = new DC::UI::VBox;
2033		2236
2034	$vb->add (new DC::UI::FancyFrame	2237	$vb->add (new DC::UI::FancyFrame
2035	label => "Currently playing music",	2238	label => "Current background music",
2036	child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,	2239	child => new DC::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
2037	child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),	2240	child => ($MUSIC_PLAYING_WIDGET = new DC::UI::Label ellipsise => 0, fontsize => 0.8),
2038	);	2241	);
		2242
		2243	$vb->add (new DC::UI::FancyFrame
		2244	label => "Current downloads",
		2245	child => ($DOWNLOADS_WIDGET = new DC::UI::Table
		2246	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		2247	);
		2248
		2249	$DOWNLOADS_WIDGET->connect (visibility_change => sub {
		2250	my ($self) = @_;
		2251
		2252	delete $self->{updater};
		2253	return unless $_[1];
		2254
		2255	$self->{updater} = AE::timer 0, 0.7, sub {
		2256	$self->clear;
		2257
		2258	return unless $CONN;
		2259
		2260	my @nums = sort { $b <=> $a } keys %{ $CONN->{ix_recv_buf} };
		2261	return unless @nums;
		2262
		2263	$self->add_at (0, 0, new DC::UI::Label align => 1, text => "Face");
		2264	$self->add_at (1, 0, new DC::UI::Label align => 0, text => "Octets/Total");
		2265
		2266	for my $row (0 .. $#nums) {
		2267	my $num = $nums[$row];
		2268
		2269	my $total = length $CONN->{ix_recv_buf}{$num};
		2270	my $got = $total - $CONN->{ix_recv_ofs}{$num};
		2271
		2272	$self->add_at (0, $row + 1, new DC::UI::Label align => 1, text => $num, tooltip => "");
		2273	$self->add_at (1, $row + 1, new DC::UI::Label align => 0, text => "$got/$total", tooltip => "");
		2274	}
		2275	};
		2276	});
2039		2277
2040	$vb->add (new DC::UI::FancyFrame	2278	$vb->add (new DC::UI::FancyFrame
2041	label => "Other media used in this session",	2279	label => "Other media used in this session",
2042	expand => 1,	2280	expand => 1,
2043	child => ($LICENSE_WIDGET = new DC::UI::TextScroller	2281	child => ($LICENSE_WIDGET = new DC::UI::TextScroller
2044	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),	2282	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
2045	);	2283	);
2046		2284
2047	$vb	2285	$vb
2048	}	2286	}
2049		2287
…		…
2234	sub open_quit_dialog {	2472	sub open_quit_dialog {
2235	unless ($QUIT_DIALOG) {	2473	unless ($QUIT_DIALOG) {
2236	$QUIT_DIALOG = new DC::UI::Toplevel	2474	$QUIT_DIALOG = new DC::UI::Toplevel
2237	x => "center",	2475	x => "center",
2238	y => "center",	2476	y => "center",
2239	z => 50,	2477	z => 60,
2240	title => "Really Quit?",	2478	title => "Really Quit?",
2241	on_key_down => sub {	2479	on_key_down => sub {
2242	my ($dialog, $ev) = @_;	2480	my ($dialog, $ev) = @_;
2243	$ev->{sym} == 27 and $dialog->hide;	2481	$ev->{sym} == 27 and $dialog->hide;
2244	}	2482	}
…		…
2460	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);	2698	my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2461		2699
2462	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	2700	($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2463	$FULLSCREEN = $CFG->{fullscreen};	2701	$FULLSCREEN = $CFG->{fullscreen};
2464	$FAST = $CFG->{fast};	2702	$FAST = $CFG->{fast};
		2703
		2704	DC::SDL_WM_SetCaption "Deliantra MORPG Client $DC::VERSION$Urlader::EXE_VER", "Deliantra"; # must be after SDL_Init
2465		2705
2466	# due to mac os x braindamage, we simply retry with !fullscreen in case of an error	2706	# due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2467	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN	2707	DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2468	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN	2708	or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2469	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";	2709	or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
…		…
2838	};	3078	};
2839	}	3079	}
2840	}	3080	}
2841	}	3081	}
2842		3082
		3083	# fontconfig doesn't support relative paths anymore, so use abs_path and keep fingers crossed
		3084	# these are ignored under windows, for some reason, and thus set in the loader
2843	$ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";	3085	$ENV{FONTCONFIG_FILE} = "fonts.conf";
2844	$ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";	3086	$ENV{FONTCONFIG_PATH} = Cwd::abs_path DC::find_rcfile "fonts";
		3087	$ENV{FONTCONFIG_DIR} = $ENV{FONTCONFIG_PATH}; # helps with older versions
2845		3088
2846	{	3089	{
2847	my @fonts = map DC::find_rcfile "fonts/$_", qw(	3090	my @fonts = map DC::find_rcfile "fonts/$_", qw(
2848	DejaVuSans.ttf	3091	DejaVuSans.ttf
2849	DejaVuSansMono.ttf	3092	DejaVuSansMono.ttf

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents): Revision 1.2 by root, Tue Dec 27 09:17:27 2011 UTC vs. Revision 1.13 by root, Sat Jan 7 19:43:46 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.2 by root, Tue Dec 27 09:17:27 2011 UTC vs.
Revision 1.13 by root, Sat Jan 7 19:43:46 2012 UTC