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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.132 by root, Tue Jul 24 05:13:23 2007 UTC vs.
Revision 1.156 by root, Tue Aug 21 00:59:34 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;
…		…
48	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
49	@args	49	@args
50	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
51	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
52		52
53	$self->connect_ext (music => sub {	53	$self->connect_ext (ambient_music => sub {
54	my ($ev) = @_;	54	my ($songs) = @_;
55		55	&::audio_music_set_ambient ($songs);
56	&::audio_music_set ($self->{songs} = $ev->{play})
57	if $ev->{play};
58	});	56	});
59		57
60	$self->connect_ext (capabilities => sub {	58	$self->connect_ext (capabilities => sub {
61	my (%cap) = @_;	59	my (%cap) = @_;
62		60
63	$self->send_exti_msg (fx_want => {	61	#$self->send ("setup sound 0"); # we use a different protocol
64	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC	62	$self->update_fx_want;
65	5 => !!$::CFG->{audio_enable}, # FT_SOUND	63
		64	$self->send_exti_req (resource => "exp_table", sub {
		65	my ($exp_table) = @_;
		66
		67	$self->register_face_handler ($exp_table, sub {
		68	my ($face) = @_;
		69
		70	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		71
		72	#TODO: update all interested parties
		73	});
		74
		75	()
66	});	76	});
67		77
68	if (my $ts = $cap{tileset}) {	78	if (my $ts = $cap{tileset}) {
69	if (my ($default) = grep $_->[2] & 1, @$ts) {	79	if (my ($default) = grep $_->[2] & 1, @$ts) {
70	$self->{tileset} = $default;	80	$self->{tileset} = $default;
…		…
108	# widgetset create	118	# widgetset create
109	$self->connect_ext (ws_c => sub {	119	$self->connect_ext (ws_c => sub {
110	my ($ws, $id, $class, $args) = @_;	120	my ($ws, $id, $class, $args) = @_;
111		121
112	for my $ev (grep /^on_/, keys %$args) {	122	for my $ev (grep /^on_/, keys %$args) {
		123	my $rid = $args->{$ev};
113	$args->{$ev} = sub {	124	$args->{$ev} = sub {
114	my $id = shift->{s_id};	125	my $id = shift->{s_id};
115	$self->send_exti_msg (w_e => $id, $ev, \@_);	126	$self->send_exti_msg (w_e => $id, $rid, @_);
116		127
117	1	128	1
118	};	129	};
119	}	130	}
120		131
121	if (my $widget = eval {	132	$self->widget_associate (
		133	$ws, $id => scalar eval {
122	local $SIG{__DIE__};	134	local $SIG{__DIE__};
123	"CFPlus::UI::$class"->new (	135	"CFPlus::UI::$class"->new (%$args)
124	%$args,
125	s_ws => $ws,
126	s_id => $id,
127	)
128	}	136	}
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";	137	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
142	$self->send_exti_msg (w_e => $id, "destroy");	138	});
		139
		140	# widgetset associate
		141	$self->connect_ext (ws_a => sub {
		142	my (%ass) = @_;
		143
		144	# everything that has a name, wether conceivably useful or not
		145	my %wkw = (
		146	root => $CFPlus::UI::ROOT,
		147	tooltip => $CFPlus::UI::TOOLTIP,
		148
		149	mapwidget => $::MAPWIDGET,
		150	buttonbar => $::BUTTONBAR,
		151	metaserver => $::METASERVER,
		152	buttonbar => $::BUTTONBAR,
		153	login_button => $::LOGIN_BUTTON,
		154	quit_dialog => $::QUIT_DIALOG,
		155	host_entry => $::HOST_ENTRY,
		156	metaserver => $::METASERVER,
		157	server_info => $::SERVER_INFO,
		158
		159	setup_dialog => $::SETUP_DIALOG,
		160	setup_notebook => $::SETUP_NOTEBOOK,
		161	setup_server => $::SETUP_SERVER,
		162	setup_keyboard => $::SETUP_KEYBOARD,
		163
		164	pl_notebook => $::PL_NOTEBOOK,
		165	pl_window => $::PL_WINDOW,
		166	inventory_page => $::INVENTORY_PAGE,
		167	stats_page => $::STATS_PAGE,
		168	skill_page => $::SKILL_PAGE,
		169	spell_page => $::SPELL_PAGE,
		170	spell_list => $::SPELL_LIST,
		171
		172	floorbox => $::FLOORBOX,
		173	help_window => $::HELP_WINDOW,
		174	message_window => $::MESSAGE_WINDOW,
		175	statusbox => $::SDTATUSBOX,
		176
		177	inv => $::INV,
		178	invr => $::INVR,
		179	invr_hb => $::INVR_HB,
		180
		181	);
		182
		183	while (my ($id, $name) = each %ass) {
		184	$self->widget_associate (undef, $id => $wkw{$name})
		185	or warn "server failed to associate non-existent well-known widget $name\n";
143	}	186	}
144	});	187	});
145		188
146	# widget call	189	# widget call
147	$self->connect_ext (w_c => sub {	190	$self->connect_ext (w_c => sub {
148	my ($id, $rid, $method, $args) = @_;	191	my ($id, $rid, $method, @args) = @_;
149		192
150	my $w = $self->{widget}{$id}	193	my $w = $self->{widget}{$id}
151	or return;	194	or return;
152		195
153	$args \|\|= [];
154
155	if ($rid) {	196	if ($rid) {
156	$self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);	197	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
157	} else {	198	} else {
158	$w->$method (@$args);	199	$w->$method (@args);
159	}	200	}
160	});	201	});
161		202
162	# widget set	203	# widget set
163	$self->connect_ext (w_s => sub {	204	$self->connect_ext (w_s => sub {
…		…
185	or return;	226	or return;
186		227
187	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);	228	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
188	});	229	});
189		230
		231	# message window
		232	$self->connect_ext (channel_info => sub {
		233	my ($info) = @_;
		234	$self->{channels}->{$info->{id}} = $info;
		235	$::MESSAGE_WINDOW->add_channel ($info);
		236	});
		237
190	# destroy widgets on logout	238	# destroy widgets on logout
191	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {	239	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
192	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	240	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
193	$_->destroy	241	$_->destroy
194	for values %{delete $ws->{w} \|\| {}};	242	for values %{delete $ws->{w} \|\| {}};
…		…
216	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	264	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
217		265
218	$self	266	$self
219	}	267	}
220		268
		269	sub widget_associate {
		270	my ($self, $ws, $id, $widget) = @_;
		271
		272	if ($widget) {
		273	$widget->{s_id} = $id;
		274	$self->{widget}{$id} = $widget;
		275
		276	if ($ws) {
		277	$widget->{s_ws} = $ws;
		278	$self->{widgetset}{$ws}{w}{$id} = $widget;
		279	}
		280
		281	$widget->connect (on_destroy => sub {
		282	my ($widget) = @_;
		283
		284	delete $self->{widget}{$widget->{s_id}};
		285	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		286	if exists $widget->{s_ws};
		287	});
		288
		289	1
		290	} else {
		291	$self->send_exti_msg (w_e => $id, undef);
		292
		293	0
		294	}
		295	}
		296
		297	sub update_fx_want {
		298	my ($self) = @_;
		299
		300	$self->send_exti_msg (fx_want => {
		301	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		302	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		303	6 => 1, # FT_RSRC
		304	});
		305	}
		306
221	sub logprint {	307	sub logprint {
222	my ($self, @a) = @_;	308	my ($self, @a) = @_;
223		309
224	$self->{log_fh} \|\|= do {	310	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
225	my $path = "$Crossfire::VARDIR/log.$self->{host}";
226
227	open my $fh, ">>:utf8", $path
228	or die "Couldn't open logfile $path: $!";
229
230	$fh->autoflush (1);
231
232	$fh;
233	};
234
235	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
236
237	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
238	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
239
240	print {$self->{log_fh}} "$ts ", @a, "\n";
241	}	311	}
242		312
243	sub _stat_numdiff {	313	sub _stat_numdiff {
244	my ($self, $name, $old, $new) = @_;	314	my ($self, $name, $old, $new) = @_;
245		315
…		…
510	}	580	}
511		581
512	sub feed_map1a {	582	sub feed_map1a {
513	my ($self, $data) = @_;	583	my ($self, $data) = @_;
514		584
515	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	585	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		586	my $delay;
		587
		588	for my $tile (@$missing) {
		589	next if $self->{delay}{$tile};
		590
		591	$delay = 1;
		592
		593	if (my $tex = $::CONN->{texture}[$tile]) {
		594	$tex->upload;
		595	} else {
		596	$self->{delay}{$tile} = 1;
		597
		598	# we assume the face is in-flight and will eventually come
		599	push @{$self->{tile_cb}{$tile}}, sub {
		600	delete $self->{delay}{$tile};
		601	$_[0]->upload;
		602	};
		603	}
		604	}
		605
		606	if ($delay) {
		607	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		608	Event->timer (after => 0.03, cb => sub {
		609	$_[0]->w->cancel;
		610	$self->{map_widget}->update;
		611	});
		612	} else {
516	$self->{map_widget}->update;	613	$self->{map_widget}->update;
		614	}
517	}	615	}
518		616
519	sub magicmap {	617	sub magicmap {
520	my ($self, $w, $h, $x, $y, $data) = @_;	618	my ($self, $w, $h, $x, $y, $data) = @_;
521		619
…		…
528	my $map_info = delete $self->{map_info}	626	my $map_info = delete $self->{map_info}
529	or return;	627	or return;
530		628
531	my ($hash, $x, $y, $w, $h) = @$map_info;	629	my ($hash, $x, $y, $w, $h) = @$map_info;
532		630
533	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	631	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		632	$self->{map_cache_new}{$hash} = \$data;
534	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	633	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
535	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
536	}	634	}
537		635
538	sub map_clear {	636	sub map_clear {
539	my ($self) = @_;	637	my ($self) = @_;
540		638
…		…
546	}	644	}
547		645
548	sub bg_fetch {	646	sub bg_fetch {
549	my ($self) = @_;	647	my ($self) = @_;
550		648
551	my $id;	649	my $tile;
552		650
553	do {	651	do {
554	$id = pop @{$self->{bg_fetch}}	652	$tile = pop @{$self->{bg_fetch}}
555	or return;	653	or return;
556	} while $self->{texture}[$id];	654	} while $self->{texture}[$tile];
557		655
558	CFPlus::DB::get tilecache => $id, sub {	656	CFPlus::DB::get tilecache => $tile, sub {
559	my ($data) = @_;	657	my ($data) = @_;
560		658
561	return unless $self->{map}; # stop when destroyed	659	return unless $self->{map}; # stop when destroyed
562		660
563	$self->set_texture ($id => $data)
564	if defined $data;	661	if (defined $data) {
		662	$self->have_tile ($tile, $data);
		663	$self->{texture}[$tile]->upload;
		664	}
565		665
566	$self->bg_fetch;	666	$self->bg_fetch;
567	};	667	};
568	}	668	}
569		669
570	sub load_map($$$) {	670	sub load_map($$$) {
571	my ($self, $hash, $x, $y) = @_;	671	my ($self, $hash, $x, $y) = @_;
572		672
573	my $gen = $self->{map_change_gen};	673	my $gen = $self->{map_change_gen};
574		674
575	CFPlus::DB::get $self->{mapcache} => $hash, sub {	675	my $cb = sub {
576	return unless $gen == $self->{map_change_gen};	676	return unless $gen == $self->{map_change_gen};
577		677
578	my ($data) = @_;	678	my ($data) = @_;
579		679
580	if (defined $data) {	680	if (defined $data) {
		681	$self->{map_cache_new}{$hash} = \$data;
		682
581	$data = Compress::LZF::decompress $data;	683	my $data = Compress::LZF::decompress $data;
582	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
583		684
584	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	685	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
585	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	686	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
586	$self->bg_fetch unless $inprogress;	687	$self->bg_fetch unless $inprogress;
587	}	688	}
588	};	689	};
		690
		691	if (my $rdata = $self->{map_cache_old}{$hash}) {
		692	$cb->($$rdata);
		693	} else {
		694	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		695	}
589	}	696	}
590		697
591	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	698	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
592	# (server resource,s latency, bandwidth), so this hack is warranted.	699	# (server resource,s latency, bandwidth), so this hack is warranted.
593	# the right fix is to make real tiled maps with an overview file	700	# the right fix is to make real tiled maps with an overview file
…		…
686	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	793	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
687		794
688	$self->flush_map;	795	$self->flush_map;
689		796
690	++$self->{map_change_gen};	797	++$self->{map_change_gen};
		798	$self->{map_cache_old} = delete $self->{map_cache_new};
691		799
692	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	800	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
693		801
694	my $mapmapw = $self->{mapmap}->{w};	802	my $mapmapw = $self->{mapmap}->{w};
695	my $mapmaph = $self->{mapmap}->{h};	803	my $mapmaph = $self->{mapmap}->{h};
…		…
717	my ($self, $facenum, $face, $cb) = @_;	825	my ($self, $facenum, $face, $cb) = @_;
718		826
719	if ($face->{type} == 0) { # FT_FACE	827	if ($face->{type} == 0) { # FT_FACE
720	my $id = CFPlus::DB::get_tile_id_sync $face->{name};	828	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
721		829
722	$face->{id} = $id;	830	$face->{id} = $id;
723	$self->{faceid}[$facenum] = $id;
724
725	$self->{map}->set_tileid ($facenum => $id);	831	$self->{map}->set_tileid ($facenum => $id);
726		832
727	CFPlus::DB::get tilecache => $id, $cb;	833	CFPlus::DB::get tilecache => $id, $cb;
728		834
729	} elsif ($face->{type} & 1) { # with metadata	835	} elsif ($face->{type} & 1) { # with metadata
730	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
731	CFPlus::DB::get "res-metadata" => $face->{name}, $cb;	836	CFPlus::DB::get res_meta => $face->{name}, $cb;
		837
		838	} else { # no metadata
		839	CFPlus::DB::get res_data => $face->{name}, $cb;
732	}	840	}
733	}	841	}
734		842
735	sub face_update {	843	sub face_update {
736	my ($self, $facenum, $face, $changed) = @_;	844	my ($self, $facenum, $face, $changed) = @_;
737		845
738	if ($face->{type} == 0) { # FT_FACE	846	if ($face->{type} == 0) {
		847	# image, FT_FACE
739	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }	848	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
740	if $changed;	849	if $changed;
741		850
742	$self->set_texture ($face->{id} => delete $face->{data});	851	$self->have_tile ($face->{id}, delete $face->{data});
743		852
744	} elsif ($face->{type} & 1) { # split metadata	853	} elsif ($face->{type} & 1) {
745	my $cb = sub { };	854	# split metadata case, FT_MUSIC, FT_SOUND
		855	if ($changed) { # new data
		856	my ($meta, $data) = unpack "(w/a)", $face->{data};
		857	$face->{data} = $meta;
		858
		859	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		860	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		861	}
		862
		863	$face->{data} = $self->{json_coder}->decode ($face->{data});
		864
		865	::add_license ($face);
746		866
747	if ($face->{type} == 3) { # FT_MUSIC	867	if ($face->{type} == 3) { # FT_MUSIC
748	$cb = sub {
749	$self->{music_meta}{$facenum} = $face;
750
751	::message ({ markup => "downloaded song #$facenum" })	868	::message ({ markup => "downloaded song #$facenum" })
752	if $changed;	869	if $changed;
753		870
754	&::audio_music_set ($self->{songs});	871	&::audio_music_push ($facenum);
		872	} elsif ($face->{type} == 5) { # FT_SOUND
		873	::message ({ markup => "downloaded sound #$facenum" })
		874	if $changed;
		875
		876	&::audio_sound_push ($facenum);
755	};	877	}
756	}
757		878
758	if ($changed) { # new data
759	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
760	my $path = CFPlus::DB::path_of_res $face->{name};
761
762	CFPlus::DB::write_file $path, $data, sub {
763	CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
764	$face->{meta} = $self->{json_coder}->decode ($meta_json);
765	$face->{path} = $path;
766
767	$cb->();
768	};
769	};
770	} else {	879	} else {
771	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});	880	# flat resource case, FT_RSRC
772	$cb->();	881	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
773	}	882	if $changed;
		883	}
		884
		885	if (my $cbs = $self->{face_cb}{$facenum}) {
		886	$_->($face, $changed) for @$cbs;
774	}	887	}
775	}	888	}
776		889
777	sub smooth_update {	890	sub smooth_update {
778	my ($self, $facenum, $face) = @_;	891	my ($self, $facenum, $face) = @_;
779		892
780	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	893	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
781	}	894	}
782		895
783	sub set_texture {	896	sub have_tile {
784	my ($self, $id, $data) = @_;	897	my ($self, $tile, $data) = @_;
785		898
786	return unless $self->{map};	899	return unless $self->{map};
787		900
788	$self->{texture}[$id] = my $tex =	901	my $tex = $self->{texture}[$tile] \|\|=
789	new_from_image CFPlus::Texture	902	new CFPlus::Texture
		903	tile => $tile,
		904	image => $data, delete_image => 1,
790	$data, minify => 1, mipmap => 1;	905	minify => 1, mipmap => 1;
791		906
792	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	907	if (my $cbs = delete $self->{tile_cb}{$tile}) {
793	$self->{map_widget}->update;	908	$_->($tex) for @$cbs;
794		909	}
795	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};
796	}	910	}
797		911
798	sub connect_face_update {	912	# call in non-void context registers a temporary
		913	# hook with handle, otherwise its permanent
		914	sub on_face_change {
799	my ($self, $id, $cb) = @_;	915	my ($self, $num, $cb) = @_;
800		916
801	push @{$self->{face_cb}{$id}}, $cb;	917	push @{$self->{face_cb}{$num}}, $cb;
802		918
		919	defined wantarray
803	CFPlus::guard {	920	? CFPlus::guard {
804	@{$self->{face_cb}{$id}}	921	@{$self->{face_cb}{$num}}
805	= grep $_ != $cb,	922	= grep $_ != $cb,
806	@{$self->{face_cb}{$id}};	923	@{$self->{face_cb}{$num}};
807	}	924	}
		925	: ()
		926	}
		927
		928	# call in non-void context registers a temporary
		929	# hook with handle, otherwise its permanent
		930	sub register_face_handler {
		931	my ($self, $num, $cb) = @_;
		932
		933	# invoke if available right now
		934	$cb->($self->{face}[$num], 0)
		935	unless exists $self->{face}[$num]{loading};
		936
		937	# future changes
		938	$self->on_face_change ($num => $cb)
808	}	939	}
809		940
810	sub sound_play {	941	sub sound_play {
811	my ($self, $x, $y, $soundnum, $type) = @_;	942	my ($self, $type, $face, $dx, $dy, $vol) = @_;
812		943
813	$self->{sound_play}->($x, $y, $soundnum, $type);	944	&::audio_sound_play ($face, $dx, $dy, $vol)
		945	unless $type & 1; # odd types are silent for future expansion
814	}	946	}
815		947
816	my $LAST_QUERY; # server is stupid, stupid, stupid	948	my $LAST_QUERY; # server is stupid, stupid, stupid
817		949
818	sub query {	950	sub query {
…		…
883	$self->{$type} = $text;	1015	$self->{$type} = $text;
884	} else {	1016	} else {
885	$self->logprint ("msg: ", $text);	1017	$self->logprint ("msg: ", $text);
886	return if $color < 0; # negative color == ignore if not understood	1018	return if $color < 0; # negative color == ignore if not understood
887		1019
888	my $fg = $CF_COLOR[$color % @CF_COLOR];	1020	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
889		1021
890	## try to create single paragraphs of multiple lines sent by the server	1022	## try to create single paragraphs of multiple lines sent by the server
891	# no longer neecssary with TRT servers	1023	# no longer neecssary with TRT servers
892	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1024	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
893		1025
894	::message ({ fg => $fg, markup => $_ })	1026	::message ({
		1027	fg => $fg,
		1028	markup => $_,
		1029	type => $type,
		1030	extra => [@extra],
		1031	color_flags => $color
895	for split /\n/, $text;	1032	}) for split /\n/, $text;
896		1033
897	$self->{statusbox}->add ($text,	1034	$self->{statusbox}->add ($text,
898	group => $text,	1035	group => $text,
899	fg => $fg,	1036	fg => $fg,
900	timeout => $color >= 2 ? 180 : 10,	1037	timeout => $color >= 2 ? 180 : 10,
…		…
956	$self->{map_widget}->clr_commands;	1093	$self->{map_widget}->clr_commands;
957		1094
958	::stop_game ();	1095	::stop_game ();
959	}	1096	}
960		1097
961	sub image_info {
962	my ($self, $numfaces) = @_;
963
964	$self->{num_faces} = $numfaces;
965	$self->{face_prefetch} = [1 .. $numfaces];
966	$self->face_prefetch;
967	}
968
969	sub face_prefetch {
970	my ($self) = @_;
971
972	return unless $::CFG->{face_prefetch};
973
974	if ($self->{num_faces}) {
975	return if @{ $self->{send_queue} \|\| [] };
976	my $todo = @{ $self->{face_prefetch} }
977	or return;
978
979	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
980
981	$self->send ("requestinfo image_sums $face $face");
982
983	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
984	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
985	} elsif (!exists $self->{num_faces}) {
986	$self->send ("requestinfo image_info");
987
988	$self->{num_faces} = 0;
989
990	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
991	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992	}
993	}
994
995	sub update_floorbox {	1098	sub update_floorbox {
996	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1099	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
997	return unless $::CONN;	1100	return unless $::CONN;
998		1101
999	$::FLOORBOX->clear;	1102	$::FLOORBOX->clear;
…		…
1028	}	1131	}
1029		1132
1030	$::FLOORBOX->add_at (@add);	1133	$::FLOORBOX->add_at (@add);
1031	});	1134	});
1032		1135
1033	$::WANT_REFRESH++;	1136	$::WANT_REFRESH->start;
1034	}	1137	}
1035		1138
1036	sub set_opencont {	1139	sub set_opencont {
1037	my ($conn, $tag, $name) = @_;	1140	my ($conn, $tag, $name) = @_;
1038	$conn->{open_container} = $tag;	1141	$conn->{open_container} = $tag;
1039	update_floorbox;	1142	update_floorbox;
1040		1143
1041	$::INV_RIGHT_HB->clear ();	1144	$::INVR_HB->clear ();
1042	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1145	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1043		1146
1044	if ($tag != 0) { # Floor isn't closable, is it?	1147	if ($tag != 0) { # Floor isn't closable, is it?
1045	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1148	$::INVR_HB->add (new CFPlus::UI::Button
1046	text => "Close container",	1149	text => "Close container",
1047	tooltip => "Close the currently open container (if one is open)",	1150	tooltip => "Close the currently open container (if one is open)",
1048	on_activate => sub {	1151	on_activate => sub {
1049	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1152	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
1050	if $tag != 0;	1153	if $tag != 0;
1051	#if $CONN->{open_container} != 0;
1052	0	1154	0
1053	},	1155	},
1054	);	1156	);
1055	}	1157	}
1056		1158
…		…
1155	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1257	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1156	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1258	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1157	. "map size $self->{mapw}×$self->{maph}\n"	1259	. "map size $self->{mapw}×$self->{maph}\n"
1158	);	1260	);
1159		1261
1160	::setup_build_button ($self->{editor_support}->{builder_ui});
1161	}	1262	}
1162		1263
1163	sub logged_in {	1264	sub logged_in {
1164	my ($self) = @_;	1265	my ($self) = @_;
1165		1266
…		…
1185		1286
1186	$self->send_command ("output-sync $::CFG->{output_sync}");	1287	$self->send_command ("output-sync $::CFG->{output_sync}");
1187	$self->send_command ("output-count $::CFG->{output_count}");	1288	$self->send_command ("output-count $::CFG->{output_count}");
1188	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1289	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1189	$self->send_command ("pickup $::CFG->{pickup}");	1290	$self->send_command ("pickup $::CFG->{pickup}");
1190	}
1191
1192	sub buildat {
1193	my ($self, $builditem, $x, $y) = @_;
1194
1195	if ($self->{cfplus_ext}) {
1196	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1197	}
1198	}	1291	}
1199		1292
1200	sub lookat {	1293	sub lookat {
1201	my ($self, $x, $y) = @_;	1294	my ($self, $x, $y) = @_;
1202		1295

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.132 by root, Tue Jul 24 05:13:23 2007 UTC vs. Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.132 by root, Tue Jul 24 05:13:23 2007 UTC vs.
Revision 1.156 by root, Tue Aug 21 00:59:34 2007 UTC