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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.144 by root, Fri Aug 3 02:20:32 2007 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC

…		…
21		21
22	my $self = $class->SUPER::new (%arg,	22	my $self = $class->SUPER::new (%arg,
23	setup_req => {	23	setup_req => {
24	extmap => 1,	24	extmap => 1,
25	excmd => 1,	25	excmd => 1,
26	ywidget => 1,#d#	26	xwidget1 => 1,#d#
27	%{$arg{setup_req} \|\| {}},	27	%{$arg{setup_req} \|\| {}},
28	},	28	},
29	);	29	);
30		30
31	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
…		…
57		57
58	$self->connect_ext (capabilities => sub {	58	$self->connect_ext (capabilities => sub {
59	my (%cap) = @_;	59	my (%cap) = @_;
60		60
61	#$self->send ("setup sound 0"); # we use a different protocol	61	#$self->send ("setup sound 0"); # we use a different protocol
62		62	$self->update_fx_want;
63	$self->send_exti_msg (fx_want => {
64	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
65	5 => !!$::CFG->{audio_enable}, # FT_SOUND
66	});
67		63
68	if (my $ts = $cap{tileset}) {	64	if (my $ts = $cap{tileset}) {
69	if (my ($default) = grep $_->[2] & 1, @$ts) {	65	if (my ($default) = grep $_->[2] & 1, @$ts) {
70	$self->{tileset} = $default;	66	$self->{tileset} = $default;
71	$self->{tilesize} = $default->[3];	67	$self->{tilesize} = $default->[3];
…		…
108	# widgetset create	104	# widgetset create
109	$self->connect_ext (ws_c => sub {	105	$self->connect_ext (ws_c => sub {
110	my ($ws, $id, $class, $args) = @_;	106	my ($ws, $id, $class, $args) = @_;
111		107
112	for my $ev (grep /^on_/, keys %$args) {	108	for my $ev (grep /^on_/, keys %$args) {
		109	my $rid = $args->{$ev};
113	$args->{$ev} = sub {	110	$args->{$ev} = sub {
114	my $id = shift->{s_id};	111	my $id = shift->{s_id};
115	$self->send_exti_msg (w_e => $id, $ev, \@_);	112	$self->send_exti_msg (w_e => $id, $rid, @_);
116		113
117	1	114	1
118	};	115	};
119	}	116	}
120		117
121	if (my $widget = eval {	118	$self->widget_associate (
		119	$ws, $id => scalar eval {
122	local $SIG{__DIE__};	120	local $SIG{__DIE__};
123	"CFPlus::UI::$class"->new (	121	"CFPlus::UI::$class"->new (%$args)
124	%$args,
125	s_ws => $ws,
126	s_id => $id,
127	)
128	}	122	}
129	) {
130	$self->{widget}{$id}
131	= $self->{widgetset}{$ws}{w}{$id}
132	= $widget;
133
134	$widget->connect (on_destroy => sub {
135	my ($widget) = @_;
136
137	delete $self->{widget}{$widget->{s_id}};
138	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
139	});
140	} else {
141	warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";	123	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142	$self->send_exti_msg (w_e => $id, "destroy");	124	});
		125
		126	# widgetset associate
		127	$self->connect_ext (ws_a => sub {
		128	my (%ass) = @_;
		129
		130	# everything that has a name, wether conceivably useful or not
		131	my %wkw = (
		132	root => $CFPlus::UI::ROOT,
		133	tooltip => $CFPlus::UI::TOOLTIP,
		134
		135	mapwidget => $::MAPWIDGET,
		136	buttonbar => $::BUTTONBAR,
		137	metaserver => $::METASERVER,
		138	buttonbar => $::BUTTONBAR,
		139	login_button => $::LOGIN_BUTTON,
		140	quit_dialog => $::QUIT_DIALOG,
		141	host_entry => $::HOST_ENTRY,
		142	metaserver => $::METASERVER,
		143	server_info => $::SERVER_INFO,
		144
		145	setup_dialog => $::SETUP_DIALOG,
		146	setup_notebook => $::SETUP_NOTEBOOK,
		147	setup_server => $::SETUP_SERVER,
		148	setup_keyboard => $::SETUP_KEYBOARD,
		149
		150	pl_notebook => $::PL_NOTEBOOK,
		151	pl_window => $::PL_WINDOW,
		152	inventory_page => $::INVENTORY_PAGE,
		153	stats_page => $::STATS_PAGE,
		154	skill_page => $::SKILL_PAGE,
		155	spell_page => $::SPELL_PAGE,
		156	spell_list => $::SPELL_LIST,
		157
		158	floorbox => $::FLOORBOX,
		159	help_window => $::HELP_WINDOW,
		160	message_window => $::MESSAGE_WINDOW,
		161	statusbox => $::SDTATUSBOX,
		162
		163	inv => $::INV,
		164	invr => $::INVR,
		165	invr_hb => $::INVR_HB,
		166
		167	);
		168
		169	while (my ($id, $name) = each %ass) {
		170	$self->widget_associate (undef, $id => $wkw{$name})
		171	or warn "server failed to associate non-existent well-known widget $name\n";
143	}	172	}
144	});	173	});
145		174
146	# widget call	175	# widget call
147	$self->connect_ext (w_c => sub {	176	$self->connect_ext (w_c => sub {
148	my ($id, $rid, $method, $args) = @_;	177	my ($id, $rid, $method, @args) = @_;
149		178
150	my $w = $self->{widget}{$id}	179	my $w = $self->{widget}{$id}
151	or return;	180	or return;
152		181
153	$args \|\|= [];
154
155	if ($rid) {	182	if ($rid) {
156	$self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);	183	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
157	} else {	184	} else {
158	$w->$method (@$args);	185	$w->$method (@args);
159	}	186	}
160	});	187	});
161		188
162	# widget set	189	# widget set
163	$self->connect_ext (w_s => sub {	190	$self->connect_ext (w_s => sub {
…		…
223	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	250	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224		251
225	$self	252	$self
226	}	253	}
227		254
		255	sub widget_associate {
		256	my ($self, $ws, $id, $widget) = @_;
		257
		258	if ($widget) {
		259	$widget->{s_id} = $id;
		260	$self->{widget}{$id} = $widget;
		261
		262	if ($ws) {
		263	$widget->{s_ws} = $ws;
		264	$self->{widgetset}{$ws}{w}{$id} = $widget;
		265	}
		266
		267	$widget->connect (on_destroy => sub {
		268	my ($widget) = @_;
		269
		270	delete $self->{widget}{$widget->{s_id}};
		271	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		272	if exists $widget->{s_ws};
		273	});
		274
		275	1
		276	} else {
		277	$self->send_exti_msg (w_e => $id, undef);
		278
		279	0
		280	}
		281	}
		282
		283	sub update_fx_want {
		284	my ($self) = @_;
		285
		286	$self->send_exti_msg (fx_want => {
		287	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		288	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		289	});
		290	}
		291
228	sub logprint {	292	sub logprint {
229	my ($self, @a) = @_;	293	my ($self, @a) = @_;
230		294
231	$self->{log_fh} \|\|= do {	295	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232	my $path = "$Crossfire::VARDIR/log.$self->{host}";
233
234	open my $fh, ">>:utf8", $path
235	or die "Couldn't open logfile $path: $!";
236
237	$fh->autoflush (1);
238
239	$fh;
240	};
241
242	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
243
244	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
245	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
246
247	print {$self->{log_fh}} "$ts ", @a, "\n";
248	}	296	}
249		297
250	sub _stat_numdiff {	298	sub _stat_numdiff {
251	my ($self, $name, $old, $new) = @_;	299	my ($self, $name, $old, $new) = @_;
252		300
…		…
517	}	565	}
518		566
519	sub feed_map1a {	567	sub feed_map1a {
520	my ($self, $data) = @_;	568	my ($self, $data) = @_;
521		569
522	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	570	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		571	my $delay;
		572
		573	for my $tile (@$missing) {
		574	next if $self->{delay}{$tile};
		575
		576	$delay = 1;
		577
		578	if (my $tex = $::CONN->{texture}[$tile]) {
		579	$tex->upload;
		580	} else {
		581	$self->{delay}{$tile} = 1;
		582
		583	# we assume the face is in-flight and will eventually come
		584	push @{$self->{face_cb}{$tile}}, sub {
		585	delete $self->{delay}{$tile};
		586	$_[0]->upload;
		587	};
		588	}
		589	}
		590
		591	if ($delay) {
		592	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		593	Event->timer (after => 0.03, cb => sub {
		594	$_[0]->w->cancel;
		595	$self->{map_widget}->update;
		596	});
		597	} else {
523	$self->{map_widget}->update;	598	$self->{map_widget}->update;
		599	}
524	}	600	}
525		601
526	sub magicmap {	602	sub magicmap {
527	my ($self, $w, $h, $x, $y, $data) = @_;	603	my ($self, $w, $h, $x, $y, $data) = @_;
528		604
…		…
535	my $map_info = delete $self->{map_info}	611	my $map_info = delete $self->{map_info}
536	or return;	612	or return;
537		613
538	my ($hash, $x, $y, $w, $h) = @$map_info;	614	my ($hash, $x, $y, $w, $h) = @$map_info;
539		615
540	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	616	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		617	$self->{map_cache_new}{$hash} = \$data;
541	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	618	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
542	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
543	}	619	}
544		620
545	sub map_clear {	621	sub map_clear {
546	my ($self) = @_;	622	my ($self) = @_;
547		623
…		…
560	do {	636	do {
561	$id = pop @{$self->{bg_fetch}}	637	$id = pop @{$self->{bg_fetch}}
562	or return;	638	or return;
563	} while $self->{texture}[$id];	639	} while $self->{texture}[$id];
564		640
565	CFPlus::DB::get tilecache => $id, sub {	641	CFPlus::DB::exists tilecache => $id, sub {
566	my ($data) = @_;	642	my ($exists) = @_;
567		643
568	return unless $self->{map}; # stop when destroyed	644	return unless $self->{map}; # stop when destroyed
569		645
570	$self->set_texture ($id => $data)	646	if ($exists) {
571	if defined $data;	647	$self->have_tile ($id);
		648	$self->{texture}[$id]->upload;
		649	}
572		650
573	$self->bg_fetch;	651	$self->bg_fetch;
574	};	652	};
575	}	653	}
576		654
577	sub load_map($$$) {	655	sub load_map($$$) {
578	my ($self, $hash, $x, $y) = @_;	656	my ($self, $hash, $x, $y) = @_;
579		657
580	my $gen = $self->{map_change_gen};	658	my $gen = $self->{map_change_gen};
581		659
582	CFPlus::DB::get $self->{mapcache} => $hash, sub {	660	my $cb = sub {
583	return unless $gen == $self->{map_change_gen};	661	return unless $gen == $self->{map_change_gen};
584		662
585	my ($data) = @_;	663	my ($data) = @_;
586		664
587	if (defined $data) {	665	if (defined $data) {
		666	$self->{map_cache_new}{$hash} = \$data;
		667
588	$data = Compress::LZF::decompress $data;	668	my $data = Compress::LZF::decompress $data;
589	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
590		669
591	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	670	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
592	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	671	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
593	$self->bg_fetch unless $inprogress;	672	$self->bg_fetch unless $inprogress;
594	}	673	}
595	};	674	};
		675
		676	if (my $rdata = $self->{map_cache_old}{$hash}) {
		677	$cb->($$rdata);
		678	} else {
		679	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		680	}
596	}	681	}
597		682
598	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	683	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
599	# (server resource,s latency, bandwidth), so this hack is warranted.	684	# (server resource,s latency, bandwidth), so this hack is warranted.
600	# the right fix is to make real tiled maps with an overview file	685	# the right fix is to make real tiled maps with an overview file
…		…
693	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	778	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
694		779
695	$self->flush_map;	780	$self->flush_map;
696		781
697	++$self->{map_change_gen};	782	++$self->{map_change_gen};
		783	$self->{map_cache_old} = delete $self->{map_cache_new};
698		784
699	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	785	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
700		786
701	my $mapmapw = $self->{mapmap}->{w};	787	my $mapmapw = $self->{mapmap}->{w};
702	my $mapmaph = $self->{mapmap}->{h};	788	my $mapmaph = $self->{mapmap}->{h};
…		…
732	$self->{map}->set_tileid ($facenum => $id);	818	$self->{map}->set_tileid ($facenum => $id);
733		819
734	CFPlus::DB::get tilecache => $id, $cb;	820	CFPlus::DB::get tilecache => $id, $cb;
735		821
736	} elsif ($face->{type} & 1) { # with metadata	822	} elsif ($face->{type} & 1) { # with metadata
737	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738	CFPlus::DB::get res_meta => $face->{name}, $cb;	823	CFPlus::DB::get res_meta => $face->{name}, $cb;
739	}	824	}
740	}	825	}
741		826
742	sub face_update {	827	sub face_update {
…		…
744		829
745	if ($face->{type} == 0) { # FT_FACE	830	if ($face->{type} == 0) { # FT_FACE
746	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }	831	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747	if $changed;	832	if $changed;
748		833
749	$self->set_texture ($face->{id} => delete $face->{data});	834	$self->have_tile ($face->{id});
750		835
751	} elsif ($face->{type} & 1) { # split metadata	836	} elsif ($face->{type} & 1) { # split metadata
752	my $cb = sub { };
753
754	if ($face->{type} == 3) { # FT_MUSIC
755	$cb = sub {
756	$self->{music_meta}{$facenum} = $face;
757
758	::message ({ markup => "downloaded song #$facenum" })
759	if $changed;
760
761	&::audio_music_push ($facenum);
762	};
763	} elsif ($face->{type} == 5) { # FT_SOUND
764	$cb = sub {
765	$self->{sound_meta}{$facenum} = $face;
766
767	::message ({ markup => "downloaded sound #$facenum" })
768	if $changed;
769
770	&::audio_sound_push ($facenum);
771	};
772	}
773
774	if ($changed) { # new data	837	if ($changed) { # new data
775	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};	838	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		839	$face->{meta} = $self->{json_coder}->decode ($meta_json);
776		840
777	CFPlus::DB::put res_data => $face->{name} => $data, sub { };	841	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
778	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub {	842	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
779	$face->{meta} = $self->{json_coder}->decode ($meta_json);
780	::add_license ($face);
781	$cb->();
782	};
783
784	} else {	843	} else {
785	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});	844	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		845	}
		846
786	::add_license ($face);	847	::add_license ($face);
787	$cb->();	848
		849	if ($face->{type} == 3) { # FT_MUSIC
		850	$self->{music_meta}{$facenum} = $face;
		851
		852	::message ({ markup => "downloaded song #$facenum" })
		853	if $changed;
		854
		855	&::audio_music_push ($facenum);
		856	} elsif ($face->{type} == 5) { # FT_SOUND
		857	$self->{sound_meta}{$facenum} = $face;
		858
		859	::message ({ markup => "downloaded sound #$facenum" })
		860	if $changed;
		861
		862	&::audio_sound_push ($facenum);
788	}	863	}
		864
789	}	865	}
790	}	866	}
791		867
792	sub smooth_update {	868	sub smooth_update {
793	my ($self, $facenum, $face) = @_;	869	my ($self, $facenum, $face) = @_;
794		870
795	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	871	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
796	}	872	}
797		873
798	sub set_texture {	874	sub have_tile {
799	my ($self, $id, $data) = @_;	875	my ($self, $tile) = @_;
800		876
801	return unless $self->{map};	877	return unless $self->{map};
802		878
803	$self->{texture}[$id] = my $tex =	879	my $tex = $self->{texture}[$tile] \|\|=
804	new_from_image CFPlus::Texture	880	new CFPlus::Texture
805	$data, minify => 1, mipmap => 1;	881	tile => $tile, minify => 1, mipmap => 1, delay => 1;
806		882
807	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
808	$self->{map_widget}->update;
809
810	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};	883	$_->($tex) for @{(delete $self->{face_cb}{$tile}) \|\| []};
811	}	884	}
812		885
813	sub connect_face_update {	886	sub connect_face_update {
814	my ($self, $id, $cb) = @_;	887	my ($self, $id, $cb) = @_;
815		888
…		…
899	$self->{$type} = $text;	972	$self->{$type} = $text;
900	} else {	973	} else {
901	$self->logprint ("msg: ", $text);	974	$self->logprint ("msg: ", $text);
902	return if $color < 0; # negative color == ignore if not understood	975	return if $color < 0; # negative color == ignore if not understood
903		976
904	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];	977	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
905		978
906	## try to create single paragraphs of multiple lines sent by the server	979	## try to create single paragraphs of multiple lines sent by the server
907	# no longer neecssary with TRT servers	980	# no longer neecssary with TRT servers
908	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	981	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
909		982
910	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })	983	::message ({
		984	fg => $fg,
		985	markup => $_,
		986	type => $type,
		987	extra => [@extra],
		988	color_flags => $color
911	for split /\n/, $text;	989	}) for split /\n/, $text;
912		990
913	$self->{statusbox}->add ($text,	991	$self->{statusbox}->add ($text,
914	group => $text,	992	group => $text,
915	fg => $fg,	993	fg => $fg,
916	timeout => $color >= 2 ? 180 : 10,	994	timeout => $color >= 2 ? 180 : 10,
…		…
1010	}	1088	}
1011		1089
1012	$::FLOORBOX->add_at (@add);	1090	$::FLOORBOX->add_at (@add);
1013	});	1091	});
1014		1092
1015	$::WANT_REFRESH++;	1093	$::WANT_REFRESH->start;
1016	}	1094	}
1017		1095
1018	sub set_opencont {	1096	sub set_opencont {
1019	my ($conn, $tag, $name) = @_;	1097	my ($conn, $tag, $name) = @_;
1020	$conn->{open_container} = $tag;	1098	$conn->{open_container} = $tag;
1021	update_floorbox;	1099	update_floorbox;
1022		1100
1023	$::INV_RIGHT_HB->clear ();	1101	$::INVR_HB->clear ();
1024	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1102	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1025		1103
1026	if ($tag != 0) { # Floor isn't closable, is it?	1104	if ($tag != 0) { # Floor isn't closable, is it?
1027	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1105	$::INVR_HB->add (new CFPlus::UI::Button
1028	text => "Close container",	1106	text => "Close container",
1029	tooltip => "Close the currently open container (if one is open)",	1107	tooltip => "Close the currently open container (if one is open)",
1030	on_activate => sub {	1108	on_activate => sub {
1031	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1109	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
1032	if $tag != 0;	1110	if $tag != 0;
1033	#if $CONN->{open_container} != 0;
1034	0	1111	0
1035	},	1112	},
1036	);	1113	);
1037	}	1114	}
1038		1115

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.144 by root, Fri Aug 3 02:20:32 2007 UTC vs. Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.144 by root, Fri Aug 3 02:20:32 2007 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC