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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

…		…
4	use strict;	4	use strict;
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
8	use CFPlus;	8	use CFPlus;
		9	use CFPlus::DB;
9	use CFPlus::UI;	10	use CFPlus::UI;
10	use CFPlus::Pod;	11	use CFPlus::Pod;
11	use CFPlus::Macro;	12	use CFPlus::Macro;
12	use CFPlus::Item;	13	use CFPlus::Item;
13		14
14	use Crossfire::Protocol::Base 0.95;	15	use Crossfire::Protocol::Base 0.95;
15		16
16	use base 'Crossfire::Protocol::Base';	17	use base 'Crossfire::Protocol::Base';
17		18
18	sub new {	19	sub new {
19	my $class = shift;	20	my ($class, %arg) = @_;
20		21
21	my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 });	22	my $self = $class->SUPER::new (%arg,
		23	setup_req => {
		24	extmap => 1,
		25	excmd => 1,
		26	xwidget1 => 1,#d#
		27	%{$arg{setup_req} \|\| {}},
		28	},
		29	);
22		30
23	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
24		32
25	my @cmd_help = map {	33	my @cmd_help = map {
26	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x	34	$_->{kw}[0] =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
…		…
37	for @args;	45	for @args;
38		46
39	map ["$cmd$_", $text],	47	map ["$cmd$_", $text],
40	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
41	@args	49	@args
42	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
43	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
44		52
		53	$self->connect_ext (ambient_music => sub {
		54	my ($songs) = @_;
		55	&::audio_music_set_ambient ($songs);
		56	});
		57
		58	$self->connect_ext (capabilities => sub {
		59	my (%cap) = @_;
		60
		61	#$self->send ("setup sound 0"); # we use a different protocol
		62	$self->update_fx_want;
		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	$_->() for values %{ $self->{on_exp_update} \|\| {} };
		72	});
		73
		74	()
		75	});
		76
		77	if (my $ts = $cap{tileset}) {
		78	if (my ($default) = grep $_->[2] & 1, @$ts) {
		79	$self->{tileset} = $default;
		80	$self->{tilesize} = $default->[3];
		81	$self->setup_req (tileset => $default->[0]);
		82
		83	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		84	my $h = int $self->{maph} * 32 / $self->{tilesize};
		85
		86	$self->setup_req (mapsize => "${w}x${h}");
		87	}
		88	}
		89	});
		90
		91	$self->{json_coder}
		92	->convert_blessed
		93	->filter_json_single_key_object (__w_ => sub {
		94	$self->{widget}{$_[0]}
		95	});
		96
		97	# widgetset new
		98	$self->connect_ext (ws_n => sub {
		99	my ($id) = @_;
		100
		101	$self->{widgetset}{$id} = {
		102	w => {},
		103	};
		104	});
		105
		106	# widgetset destroy
		107	$self->connect_ext (ws_d => sub {
		108	my ($id) = @_;
		109
		110	my $ws = delete $self->{widgetset}{$id}
		111	or return;
		112
		113	$_->destroy
		114	for values %{$ws->{w}};
		115	});
		116
		117	# widgetset create
		118	$self->connect_ext (ws_c => sub {
		119	my ($ws, $id, $class, $args) = @_;
		120
		121	for my $ev (grep /^on_/, keys %$args) {
		122	my $rid = $args->{$ev};
		123	$args->{$ev} = sub {
		124	my $id = shift->{s_id};
		125	$self->send_exti_msg (w_e => $id, $rid, @_);
		126
		127	1
		128	};
		129	}
		130
		131	$self->widget_associate (
		132	$ws, $id => scalar eval {
		133	local $SIG{__DIE__};
		134	"CFPlus::UI::$class"->new (%$args)
		135	}
		136	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		137	});
		138
		139	# widgetset associate
		140	$self->connect_ext (ws_a => sub {
		141	my (%ass) = @_;
		142
		143	# everything that has a name, wether conceivably useful or not
		144	my %wkw = (
		145	root => $CFPlus::UI::ROOT,
		146	tooltip => $CFPlus::UI::TOOLTIP,
		147
		148	mapwidget => $::MAPWIDGET,
		149	buttonbar => $::BUTTONBAR,
		150	metaserver => $::METASERVER,
		151	buttonbar => $::BUTTONBAR,
		152	login_button => $::LOGIN_BUTTON,
		153	quit_dialog => $::QUIT_DIALOG,
		154	host_entry => $::HOST_ENTRY,
		155	metaserver => $::METASERVER,
		156	server_info => $::SERVER_INFO,
		157
		158	setup_dialog => $::SETUP_DIALOG,
		159	setup_notebook => $::SETUP_NOTEBOOK,
		160	setup_server => $::SETUP_SERVER,
		161	setup_keyboard => $::SETUP_KEYBOARD,
		162
		163	pl_notebook => $::PL_NOTEBOOK,
		164	pl_window => $::PL_WINDOW,
		165	inventory_page => $::INVENTORY_PAGE,
		166	stats_page => $::STATS_PAGE,
		167	skill_page => $::SKILL_PAGE,
		168	spell_page => $::SPELL_PAGE,
		169	spell_list => $::SPELL_LIST,
		170
		171	floorbox => $::FLOORBOX,
		172	help_window => $::HELP_WINDOW,
		173	message_window => $::MESSAGE_WINDOW,
		174	statusbox => $::SDTATUSBOX,
		175
		176	inv => $::INV,
		177	invr => $::INVR,
		178	invr_hb => $::INVR_HB,
		179	);
		180
		181	while (my ($id, $name) = each %ass) {
		182	$self->widget_associate (undef, $id => $wkw{$name})
		183	or warn "server failed to associate non-existent well-known widget $name\n";
		184	}
		185	});
		186
		187	# widget call
		188	$self->connect_ext (w_c => sub {
		189	my ($id, $rid, $method, @args) = @_;
		190
		191	my $w = $self->{widget}{$id}
		192	or return;
		193
		194	if ($rid) {
		195	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		196	} else {
		197	$w->$method (@args);
		198	}
		199	});
		200
		201	# widget set
		202	$self->connect_ext (w_s => sub {
		203	my ($id, $attr) = @_;
		204
		205	my $w = $self->{widget}{$id}
		206	or return;
		207
		208	for (my $i = 0; $i < $#$attr; $i += 2) {
		209	my ($member, $value) = @$attr[$i, $i+1];
		210	if (defined $value) {
		211	$w->{$member} = $value;
		212	} else {
		213	delete $w->{$member};
		214	}
		215	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		216	}
		217	});
		218
		219	# widget get
		220	$self->connect_ext (w_g => sub {
		221	my ($id, $rid, $attr) = @_;
		222
		223	my $w = $self->{widget}{$id}
		224	or return;
		225
		226	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		227	});
		228
		229	# message window
		230	$self->connect_ext (channel_info => sub {
		231	my ($info) = @_;
		232	$self->{channels}->{$info->{id}} = $info;
		233	$::MESSAGE_WINDOW->add_channel ($info);
		234	});
		235
		236	# destroy widgets on logout
		237	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
		238	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
		239	$_->destroy
		240	for values %{delete $ws->{w} \|\| {}};
		241	}
		242	});
		243
45	$self->{map_widget}->add_command (@$_)	244	$self->{map_widget}->add_command (@$_)
46	for @cmd_help;	245	for @cmd_help;
47
48	$self->{noface} = new_from_file CFPlus::Texture
49	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50		246
51	{	247	{
52	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture	248	$self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;	249	CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});	250	$self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55	}	251	}
56		252
		253	{
		254	$self->{noface} = my $tex = new_from_file CFPlus::Texture
		255	CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
		256	$self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		257	}
		258
57	$self->{open_container} = 0;	259	$self->{open_container} = 0;
58		260
59	# "global"
60	$self->{tilecache} = CFPlus::db_table "tilecache"
61	or die "tilecache: unable to open database table";
62	$self->{facemap} = CFPlus::db_table "facemap"
63	or die "facemap: unable to open database table";
64
65	# per server	261	# per server
66	$self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}"	262	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67	or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68		263
69	$self	264	$self
		265	}
		266
		267	sub widget_associate {
		268	my ($self, $ws, $id, $widget) = @_;
		269
		270	if ($widget) {
		271	$widget->{s_id} = $id;
		272	$self->{widget}{$id} = $widget;
		273
		274	if ($ws) {
		275	$widget->{s_ws} = $ws;
		276	$self->{widgetset}{$ws}{w}{$id} = $widget;
		277	}
		278
		279	$widget->connect (on_destroy => sub {
		280	my ($widget) = @_;
		281
		282	delete $self->{widget}{$widget->{s_id}};
		283	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		284	if exists $widget->{s_ws};
		285	});
		286
		287	1
		288	} else {
		289	$self->send_exti_msg (w_e => $id, undef);
		290
		291	0
		292	}
		293	}
		294
		295	sub update_fx_want {
		296	my ($self) = @_;
		297
		298	$self->send_exti_msg (fx_want => {
		299	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		300	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		301	6 => 1, # FT_RSRC
		302	});
70	}	303	}
71		304
72	sub logprint {	305	sub logprint {
73	my ($self, @a) = @_;	306	my ($self, @a) = @_;
74		307
75	$self->{log_fh} \|\|= do {	308	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
76	my $path = "$Crossfire::VARDIR/log.$self->{host}";
77
78	open my $fh, ">>:utf8", $path
79	or die "Couldn't open logfile $path: $!";
80
81	$fh->autoflush (1);
82
83	$fh;
84	};
85
86	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
87
88	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
89	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
90
91	print {$self->{log_fh}} "$ts ", @a, "\n";
92	}	309	}
93		310
94	sub _stat_numdiff {	311	sub _stat_numdiff {
95	my ($self, $name, $old, $new) = @_;	312	my ($self, $name, $old, $new) = @_;
96		313
…		…
229	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	446	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
230	$::GAUGES->{food} ->set_value ($fo, $fo_m);	447	$::GAUGES->{food} ->set_value ($fo, $fo_m);
231	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	448	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
232	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	449	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
233	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	450	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
234	my $rng = $stats->{+CS_STAT_RANGE};	451	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
235	$rng =~ s/^Range: //; # thank you so much dear server	452	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
236	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
237	my $title = $stats->{+CS_STAT_TITLE};	453	my $title = $stats->{+CS_STAT_TITLE};
238	$title =~ s/^Player: //;	454	$title =~ s/^Player: //;
239	$::STATWIDS->{title} ->set_text ("Title: " . $title);	455	$::STATWIDS->{title} ->set_text ("Title: " . $title);
240		456
241	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});	457	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
…		…
261	my @skills = keys %{ $self->{skill_info} };	477	my @skills = keys %{ $self->{skill_info} };
262		478
263	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	479	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
264	$sktbl->clear;	480	$sktbl->clear;
265		481
		482	my $sw = $self->{skillwid}{""} \|\|= [
266	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	483	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
267	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	484	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		485	2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
268	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	486	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
269	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	487	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
270	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	488	5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		489	6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
271	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	490	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		491	];
		492
		493	my @add = @$sw;
272		494
273	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	495	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
274		496
275	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	497	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
276	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	498	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
…		…
304	}	526	}
305		527
306	1	528	1
307	};	529	};
308		530
309	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	531	my $sw = $self->{skillwid}{$idx} \|\|= [
		532	# exp
		533	(new CFPlus::UI::Label
310	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	534	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
311	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	535
		536	# level
		537	(new CFPlus::UI::Label
312	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	538	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		539
		540	# progress
		541	(new CFPlus::UI::ExperienceProgress),
		542
		543	# label
313	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	544	(new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
314	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	545	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		546	];
		547
		548	push @add,
		549	$x * 4 + 0, $y, $sw->[0],
		550	$x * 4 + 1, $y, $sw->[1],
		551	$x * 4 + 2, $y, $sw->[2],
		552	$x * 4 + 3, $y, $sw->[3],
		553	;
315		554
316	$x++ and ($x, $y) = (0, $y + 1);	555	$x++ and ($x, $y) = (0, $y + 1);
317	}	556	}
		557
		558	$sktbl->add_at (@add);
318	}	559	}
319		560
320	for (grep exists $stats->{$_}, @skills) {	561	for (grep exists $stats->{$_}, @skills) {
		562	my $sw = $self->{skillwid}{$_};
321	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));	563	$sw->[0]->set_text (::formsep ($stats->{$_}[1]));
322	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);	564	$sw->[1]->set_text ($stats->{$_}[0] * 1);
		565	$sw->[2]->set_value (@{$stats->{$_}});
323	}	566	}
324	}	567	}
325		568
326	sub macro_send {	569	sub macro_send {
327	my ($self, $macro) = @_;	570	my ($self, $macro) = @_;
…		…
355	}	598	}
356		599
357	sub feed_map1a {	600	sub feed_map1a {
358	my ($self, $data) = @_;	601	my ($self, $data) = @_;
359		602
360	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	603	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		604	my $delay;
		605
		606	for my $tile (@$missing) {
		607	next if $self->{delay}{$tile};
		608
		609	$delay = 1;
		610
		611	if (my $tex = $::CONN->{texture}[$tile]) {
		612	$tex->upload;
		613	} else {
		614	$self->{delay}{$tile} = 1;
		615
		616	# we assume the face is in-flight and will eventually come
		617	push @{$self->{tile_cb}{$tile}}, sub {
		618	delete $self->{delay}{$tile};
		619	$_[0]->upload;
		620	};
		621	}
		622	}
		623
		624	if ($delay) {
		625	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		626	Event->timer (after => 0.03, cb => sub {
		627	$_[0]->w->cancel;
		628	$self->{map_widget}->update;
		629	});
		630	} else {
361	$self->{map_widget}->update;	631	$self->{map_widget}->update;
		632	}
362	}	633	}
363		634
364	sub magicmap {	635	sub magicmap {
365	my ($self, $w, $h, $x, $y, $data) = @_;	636	my ($self, $w, $h, $x, $y, $data) = @_;
366		637
…		…
373	my $map_info = delete $self->{map_info}	644	my $map_info = delete $self->{map_info}
374	or return;	645	or return;
375		646
376	my ($hash, $x, $y, $w, $h) = @$map_info;	647	my ($hash, $x, $y, $w, $h) = @$map_info;
377		648
378	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	649	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
379	$self->{mapcache}->put ($hash => Compress::LZF::compress $data);	650	$self->{map_cache_new}{$hash} = \$data;
380	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	651	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
381	}	652	}
382		653
383	sub map_clear {	654	sub map_clear {
384	my ($self) = @_;	655	my ($self) = @_;
385		656
…		…
388		659
389	$self->{map}->clear;	660	$self->{map}->clear;
390	delete $self->{map_widget}{magicmap};	661	delete $self->{map_widget}{magicmap};
391	}	662	}
392		663
		664	sub bg_fetch {
		665	my ($self) = @_;
		666
		667	my $tile;
		668
		669	do {
		670	$tile = pop @{$self->{bg_fetch}}
		671	or return;
		672	} while $self->{texture}[$tile];
		673
		674	CFPlus::DB::get tilecache => $tile, sub {
		675	my ($data) = @_;
		676
		677	return unless $self->{map}; # stop when destroyed
		678
		679	if (defined $data) {
		680	$self->have_tile ($tile, $data);
		681	$self->{texture}[$tile]->upload;
		682	}
		683
		684	$self->bg_fetch;
		685	};
		686	}
393		687
394	sub load_map($$$) {	688	sub load_map($$$) {
395	my ($self, $hash, $x, $y) = @_;	689	my ($self, $hash, $x, $y) = @_;
396		690
397	if (defined (my $data = $self->{mapcache}->get ($hash))) {	691	my $gen = $self->{map_change_gen};
		692
		693	my $cb = sub {
		694	return unless $gen == $self->{map_change_gen};
		695
		696	my ($data) = @_;
		697
		698	if (defined $data) {
		699	$self->{map_cache_new}{$hash} = \$data;
		700
398	$data = Compress::LZF::decompress $data;	701	my $data = Compress::LZF::decompress $data;
399	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
400	for my $id ($self->{map}->set_rect ($x, $y, $data)) {
401	my $data = $self->{tilecache}->get ($id)
402	or next;
403		702
404	$self->set_texture ($id => $data);	703	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
		704	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
		705	$self->bg_fetch unless $inprogress;
405	}	706	}
		707	};
		708
		709	if (my $rdata = $self->{map_cache_old}{$hash}) {
		710	$cb->($$rdata);
		711	} else {
		712	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
406	}	713	}
407	}	714	}
408		715
409	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	716	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410	# (server resource,s latency, bandwidth), so this hack is warranted.	717	# (server resource,s latency, bandwidth), so this hack is warranted.
…		…
475		782
476	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)	783	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	784	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478		785
479	} else {	786	} else {
		787	my $gen = $self->{map_change_gen};
480	$self->send_mapinfo ("spatial $path$tile", sub {	788	$self->send_mapinfo ("spatial $path$tile", sub {
		789	return unless $gen == $self->{map_change_gen};
		790
481	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	791	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482		792
483	return if $mode ne "spatial";	793	return if $mode ne "spatial";
484		794
485	$x += $self->{map}->ox;	795	$x += $self->{map}->ox;
…		…
499		809
500	sub map_change {	810	sub map_change {
501	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	811	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502		812
503	$self->flush_map;	813	$self->flush_map;
		814
		815	++$self->{map_change_gen};
		816	$self->{map_cache_old} = delete $self->{map_cache_new};
504		817
505	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	818	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506		819
507	my $mapmapw = $self->{mapmap}->{w};	820	my $mapmapw = $self->{mapmap}->{w};
508	my $mapmaph = $self->{mapmap}->{h};	821	my $mapmaph = $self->{mapmap}->{h};
…		…
525	$self->load_map ($hash, $x, $y);	838	$self->load_map ($hash, $x, $y);
526	$self->flood_fill (0, 0, 0, "", $hash, $flags);	839	$self->flood_fill (0, 0, 0, "", $hash, $flags);
527	}	840	}
528		841
529	sub face_find {	842	sub face_find {
530	my ($self, $facenum, $face) = @_;	843	my ($self, $facenum, $face, $cb) = @_;
531		844
532	my $hash = "$face->{chksum},$face->{name}";	845	if ($face->{type} == 0) { # FT_FACE
		846	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
533		847
534	my $id = $self->{facemap}->get ($hash);
535
536	unless ($id) {
537	# create new id for face
538	# I love transactions
539	for (1..100) {
540	my $txn = $CFPlus::DB_ENV->txn_begin;
541	my $status = $self->{facemap}->db_get (id => $id);
542	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
543	$id = ($id \|\| 64) + 1;
544	if ($self->{facemap}->put (id => $id) == 0
545	&& $self->{facemap}->put ($hash => $id) == 0) {
546	$txn->txn_commit;
547
548	goto gotid;
549	}
550	}
551	$txn->txn_abort;
552	}
553
554	CFPlus::fatal "maximum number of transaction retries reached - database problems?";
555	}
556
557	gotid:
558	$face->{id} = $id;	848	$face->{id} = $id;
559	$self->{map}->set_face ($facenum => $id);	849	$self->{map}->set_tileid ($facenum => $id);
560	$self->{faceid}[$facenum] = $id;#d#
561		850
562	my $face = $self->{tilecache}->get ($id);	851	CFPlus::DB::get tilecache => $id, $cb;
563		852
564	if ($face) {	853	} elsif ($face->{type} & 1) { # with metadata
565	#$self->face_prefetch;	854	CFPlus::DB::get res_meta => $face->{name}, $cb;
566	$face	855
567	} else {	856	} else { # no metadata
568	my $tex = $self->{noface};	857	CFPlus::DB::get res_data => $face->{name}, $cb;
569	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570	undef
571	};	858	}
572	}	859	}
573		860
574	sub face_update {	861	sub face_update {
575	my ($self, $facenum, $face, $changed) = @_;	862	my ($self, $facenum, $face, $changed) = @_;
576		863
577	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;	864	if ($face->{type} == 0) {
		865	# image, FT_FACE
		866	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
		867	if $changed;
578		868
579	$self->set_texture ($face->{id} => delete $face->{image});	869	$self->have_tile ($face->{id}, delete $face->{data});
580	}
581		870
582	sub set_texture {	871	} elsif ($face->{type} & 1) {
		872	# split metadata case, FT_MUSIC, FT_SOUND
		873	if ($changed) { # new data
		874	my ($meta, $data) = unpack "(w/a)", $face->{data};
		875	$face->{data} = $meta;
		876
		877	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		878	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		879	}
		880
		881	$face->{data} = $self->{json_coder}->decode ($face->{data});
		882
		883	::add_license ($face);
		884
		885	if ($face->{type} == 3) { # FT_MUSIC
		886	::message ({ markup => "downloaded song #$facenum" })
		887	if $changed;
		888
		889	&::audio_music_push ($facenum);
		890	} elsif ($face->{type} == 5) { # FT_SOUND
		891	::message ({ markup => "downloaded sound #$facenum" })
		892	if $changed;
		893
		894	&::audio_sound_push ($facenum);
		895	}
		896
		897	} else {
		898	# flat resource case, FT_RSRC
		899	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		900	if $changed;
		901	}
		902
		903	if (my $cbs = $self->{face_cb}{$facenum}) {
		904	$_->($face, $changed) for @$cbs;
		905	}
		906	}
		907
		908	sub smooth_update {
		909	my ($self, $facenum, $face) = @_;
		910
		911	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
		912	}
		913
		914	sub have_tile {
583	my ($self, $id, $data) = @_;	915	my ($self, $tile, $data) = @_;
584		916
585	$self->{texture}[$id] \|\|= do {	917	return unless $self->{map};
586	my $tex =	918
		919	my $tex = $self->{texture}[$tile] \|\|=
587	new_from_image CFPlus::Texture	920	new CFPlus::Texture
		921	tile => $tile,
		922	image => $data, delete_image => 1,
588	$data, minify => 1, mipmap => 1;	923	minify => 1, mipmap => 1;
589		924
590	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	925	if (my $cbs = delete $self->{tile_cb}{$tile}) {
591	$self->{map_widget}->update;	926	$_->($tex) for @$cbs;
592
593	$tex
594	};	927	}
		928	}
		929
		930	# call in non-void context registers a temporary
		931	# hook with handle, otherwise its permanent
		932	sub on_face_change {
		933	my ($self, $num, $cb) = @_;
		934
		935	push @{$self->{face_cb}{$num}}, $cb;
		936
		937	defined wantarray
		938	? CFPlus::guard {
		939	@{$self->{face_cb}{$num}}
		940	= grep $_ != $cb,
		941	@{$self->{face_cb}{$num}};
		942	}
		943	: ()
		944	}
		945
		946	# call in non-void context registers a temporary
		947	# hook with handle, otherwise its permanent
		948	sub register_face_handler {
		949	my ($self, $num, $cb) = @_;
		950
		951	return unless $num;
		952
		953	# invoke if available right now
		954	$cb->($self->{face}[$num], 0)
		955	unless exists $self->{face}[$num]{loading};
		956
		957	# future changes
		958	$self->on_face_change ($num => $cb)
595	}	959	}
596		960
597	sub sound_play {	961	sub sound_play {
598	my ($self, $x, $y, $soundnum, $type) = @_;	962	my ($self, $type, $face, $dx, $dy, $vol) = @_;
599		963
600	$self->{sound_play}->($x, $y, $soundnum, $type);	964	&::audio_sound_play ($face, $dx, $dy, $vol)
		965	unless $type & 1; # odd types are silent for future expansion
601	}	966	}
602		967
603	my $LAST_QUERY; # server is stupid, stupid, stupid	968	my $LAST_QUERY; # server is stupid, stupid, stupid
604		969
605	sub query {	970	sub query {
…		…
609	$LAST_QUERY = $prompt;	974	$LAST_QUERY = $prompt;
610		975
611	$self->{query}-> ($self, $flags, $prompt);	976	$self->{query}-> ($self, $flags, $prompt);
612	}	977	}
613		978
614	sub drawinfo {	979	sub sanitise_xml($) {
615	my ($self, $color, $text) = @_;	980	local $_ = shift;
616		981
617	my @color = (	982	# we now weed out all tags we do not support
		983	s%<(?!/?i>\|/?u>\|/?b>\|fg \|/fg>)%<%g;
		984	# now all entities
		985	s/&(?!amp;\|lt;\|gt;\|apos;\|quot;\|#[0-9]+;\|#x[0-9a-fA-F]+;)/&/g;
		986
		987	# handle some elements
		988	s/<fg name='([^'])'>(.?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
		989	s/<fg name="([^"])">(.?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
		990
		991	$_
		992	}
		993
		994	our %NAME_TO_COLOR = (
		995	black => 0,
		996	white => 1,
		997	darkblue => 2,
		998	red => 3,
		999	orange => 4,
		1000	lightblue => 5,
		1001	darkorange => 6,
		1002	green => 7,
		1003	darkgreen => 8,
		1004	grey => 9,
		1005	brown => 10,
		1006	yellow => 11,
		1007	tan => 12,
		1008	);
		1009
		1010	our @CF_COLOR = (
618	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	1011	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619	[1.00, 1.00, 1.00],	1012	[1.00, 1.00, 1.00],
620	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]	1013	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621	[1.00, 0.00, 0.00],	1014	[1.00, 0.00, 0.00],
622	[1.00, 0.54, 0.00],	1015	[1.00, 0.54, 0.00],
623	[0.11, 0.56, 1.00],	1016	[0.11, 0.56, 1.00],
624	[0.93, 0.46, 0.00],	1017	[0.93, 0.46, 0.00],
625	[0.18, 0.54, 0.34],	1018	[0.18, 0.54, 0.34],
626	[0.56, 0.73, 0.56],	1019	[0.56, 0.73, 0.56],
627	[0.80, 0.80, 0.80],	1020	[0.80, 0.80, 0.80],
628	[0.75, 0.61, 0.20],	1021	[0.75, 0.61, 0.20],
629	[0.99, 0.77, 0.26],	1022	[0.99, 0.77, 0.26],
630	[0.74, 0.65, 0.41],	1023	[0.74, 0.65, 0.41],
631	);	1024	);
632		1025
633	my $fg = $color[$color % @color];	1026	sub msg {
		1027	my ($self, $color, $type, $text, @extra) = @_;
634		1028
		1029	$text = sanitise_xml $text;
		1030
		1031	if (my $cb = $self->{cb_msg}{$type}) {
		1032	$_->($self, $color, $type, $text, @extra) for values %$cb;
		1033	} elsif ($type =~ /^(?:chargen-race-title\|chargen-race-description)$/) {
		1034	$type =~ s/-/_/g;
		1035	$self->{$type} = $text;
		1036	} else {
635	$self->logprint ("info: ", $text);	1037	$self->logprint ("msg: ", $text);
		1038	return if $color < 0; # negative color == ignore if not understood
636		1039
		1040	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
		1041
637	# try to create single paragraphs of multiple lines sent by the server	1042	## try to create single paragraphs of multiple lines sent by the server
		1043	# no longer neecssary with TRT servers
638	$text =~ s/(?<=\S)\n(?=\w)/ /g;	1044	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
639		1045
640	$text = CFPlus::asxml $text;	1046	::message ({
641	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	1047	fg => $fg,
642	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	1048	markup => $_,
643		1049	type => $type,
644	::message ({ fg => $fg, markup => $_ })	1050	extra => [@extra],
		1051	color_flags => $color
645	for split /\n/, $text;	1052	}) for split /\n/, $text;
646		1053
647	$self->{statusbox}->add ($text,	1054	$self->{statusbox}->add ($text,
648	group => $text,	1055	group => $text,
649	fg => $fg,	1056	fg => $fg,
650	timeout => $color >= 2 ? 180 : 10,	1057	timeout => $color >= 2 ? 180 : 10,
651	tooltip_font => $::FONT_FIXED,	1058	tooltip_font => $::FONT_FIXED,
652	);	1059	);
653	}	1060	}
654
655	sub drawextinfo {
656	my ($self, $color, $type, $subtype, $message) = @_;
657
658	$self->drawinfo ($color, $message);
659	}	1061	}
660		1062
661	sub spell_add {	1063	sub spell_add {
662	my ($self, $spell) = @_;	1064	my ($self, $spell) = @_;
663		1065
…		…
679	}	1081	}
680		1082
681	sub setup {	1083	sub setup {
682	my ($self, $setup) = @_;	1084	my ($self, $setup) = @_;
683		1085
		1086	$self->{map_widget}->set_tilesize ($self->{tilesize});
684	$::MAP->resize ($self->{mapw}, $self->{maph});	1087	$::MAP->resize ($self->{mapw}, $self->{maph});
685	}	1088	}
686		1089
687	sub addme_success {	1090	sub addme_success {
688	my ($self) = @_;	1091	my ($self) = @_;
…		…
710	$self->{map_widget}->clr_commands;	1113	$self->{map_widget}->clr_commands;
711		1114
712	::stop_game ();	1115	::stop_game ();
713	}	1116	}
714		1117
715	sub image_info {
716	my ($self, $numfaces) = @_;
717
718	$self->{num_faces} = $numfaces;
719	$self->{face_prefetch} = [1 .. $numfaces];
720	$self->face_prefetch;
721	}
722
723	sub face_prefetch {
724	my ($self) = @_;
725
726	return unless $::CFG->{face_prefetch};
727
728	if ($self->{num_faces}) {
729	return if @{ $self->{send_queue} \|\| [] };
730	my $todo = @{ $self->{face_prefetch} }
731	or return;
732
733	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
734
735	$self->send ("requestinfo image_sums $face $face");
736
737	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
738	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
739	} elsif (!exists $self->{num_faces}) {
740	$self->send ("requestinfo image_info");
741
742	$self->{num_faces} = 0;
743
744	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
745	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
746	}
747	}
748
749	sub update_floorbox {	1118	sub update_floorbox {
750	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1119	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
751	return unless $::CONN;	1120	return unless $::CONN;
752		1121
753	$::FLOORBOX->clear;	1122	$::FLOORBOX->clear;
		1123
		1124	my @add;
754		1125
755	my $row;	1126	my $row;
756	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1127	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
757	if ($row < 6) {	1128	if ($row < 6) {
758	local $_->{face_widget}; # hack to force recreation of widget	1129	local $_->{face_widget}; # hack to force recreation of widget
759	local $_->{desc_widget}; # hack to force recreation of widget	1130	local $_->{desc_widget}; # hack to force recreation of widget
760	CFPlus::Item::update_widgets $_;	1131	CFPlus::Item::update_widgets $_;
761		1132
		1133	push @add,
762	$::FLOORBOX->add (0, $row, $_->{face_widget});	1134	0, $row, $_->{face_widget},
763	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1135	1, $row, $_->{desc_widget};
764		1136
765	$row++;	1137	$row++;
766	} else {	1138	} else {
767	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1139	push @add, 1, $row, new CFPlus::UI::Button
768	text => "More...",	1140	text => "More...",
769	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1141	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
770	);	1142	;
771	last;	1143	last;
772	}	1144	}
773	}	1145	}
774	if ($::CONN->{open_container}) {	1146	if ($::CONN->{open_container}) {
775	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1147	push @add, 1, $row++, new CFPlus::UI::Button
776	text => "Close container",	1148	text => "Close container",
777	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1149	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
778	);	1150	;
779	}	1151	}
780	});
781		1152
		1153	$::FLOORBOX->add_at (@add);
		1154	});
		1155
782	$::WANT_REFRESH++;	1156	$::WANT_REFRESH->start;
783	}	1157	}
784		1158
785	sub set_opencont {	1159	sub set_opencont {
786	my ($conn, $tag, $name) = @_;	1160	my ($conn, $tag, $name) = @_;
787	$conn->{open_container} = $tag;	1161	$conn->{open_container} = $tag;
788	update_floorbox;	1162	update_floorbox;
789		1163
790	$::INV_RIGHT_HB->clear ();	1164	$::INVR_HB->clear ();
791	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1165	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
792		1166
793	if ($tag != 0) { # Floor isn't closable, is it?	1167	if ($tag != 0) { # Floor isn't closable, is it?
794	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1168	$::INVR_HB->add (new CFPlus::UI::Button
795	text => "Close container",	1169	text => "Close container",
796	tooltip => "Close the currently open container (if one is open)",	1170	tooltip => "Close the currently open container (if one is open)",
797	on_activate => sub {	1171	on_activate => sub {
798	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1172	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
799	if $tag != 0;	1173	if $tag != 0;
800	#if $CONN->{open_container} != 0;
801	0	1174	0
802	},	1175	},
803	);	1176	);
804	}	1177	}
805		1178
…		…
895	$::SERVER_INFO->set_markup (	1268	$::SERVER_INFO->set_markup (
896	"server <tt>$self->{host}:$self->{port}</tt>\n"	1269	"server <tt>$self->{host}:$self->{port}</tt>\n"
897	. "protocol version <tt>$self->{version}</tt>\n"	1270	. "protocol version <tt>$self->{version}</tt>\n"
898	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"	1271	. "minimap support $yesno[$self->{setup}{mapinfocmd} > 0]\n"
899	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"	1272	. "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
		1273	. "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
900	. "editing support $yesno[!!$self->{editor_support}]\n"	1274	. "editing support $yesno[!!$self->{editor_support}]\n"
901	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"	1275	. "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
		1276	. "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
902	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1277	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
903	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1278	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
904	. "map size $self->{mapw}×$self->{maph}\n"	1279	. "map size $self->{mapw}×$self->{maph}\n"
905	);	1280	);
906		1281
907	::setup_build_button ($self->{editor_support}->{builder_ui});
908	}	1282	}
909		1283
910	sub logged_in {	1284	sub logged_in {
911	my ($self) = @_;	1285	my ($self) = @_;
912		1286
913	$self->send_ext_req (cfplus_support => version => 1, sub {	1287	$self->send_ext_req (cfplus_support => version => 2, sub {
		1288	my (%msg) = @_;
		1289
914	$self->{cfplus_ext} = $_[0]{version};	1290	$self->{cfplus_ext} = $msg{version};
915	$self->update_server_info;	1291	$self->update_server_info;
916		1292
917	if ($self->{cfplus_ext} >= 2) {	1293	if ($self->{cfplus_ext} >= 2) {
918	$self->send_ext_req ("editor_support", sub {	1294	$self->send_ext_req ("editor_support", sub {
919	$self->{editor_support} = $_[0];	1295	$self->{editor_support} = { @_ };
920	$self->update_server_info;	1296	$self->update_server_info;
921		1297
922	0	1298	0
923	});	1299	});
924	}	1300	}
…		…
928		1304
929	$self->update_server_info;	1305	$self->update_server_info;
930		1306
931	$self->send_command ("output-sync $::CFG->{output_sync}");	1307	$self->send_command ("output-sync $::CFG->{output_sync}");
932	$self->send_command ("output-count $::CFG->{output_count}");	1308	$self->send_command ("output-count $::CFG->{output_count}");
		1309	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
933	$self->send_command ("pickup $::CFG->{pickup}");	1310	$self->send_command ("pickup $::CFG->{pickup}");
934	}
935
936	sub buildat {
937	my ($self, $builditem, $x, $y) = @_;
938
939	if ($self->{cfplus_ext}) {
940	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
941	}
942	}	1311	}
943		1312
944	sub lookat {	1313	sub lookat {
945	my ($self, $x, $y) = @_;	1314	my ($self, $x, $y) = @_;
946		1315
947	if ($self->{cfplus_ext}) {	1316	if ($self->{cfplus_ext}) {
948	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1317	$self->send_ext_req (lookat => $x, $y, sub {
949	my ($msg) = @_;	1318	my (%msg) = @_;
950		1319
951	if (exists $msg->{npc_dialog}) {	1320	if (exists $msg{npc_dialog}) {
952	# start npc chat dialog	1321	# start npc chat dialog
953	$self->{npc_dialog} = new CFPlus::NPCDialog::	1322	$self->{npc_dialog} = new CFPlus::NPCDialog::
954	dx => $x,	1323	token => $msg{npc_dialog},
955	dy => $y,
956	title => "$msg->{npc_dialog} (NPC)",	1324	title => "$msg{npc_dialog}[0] (NPC)",
957	conn => $self,	1325	conn => $self,
958	;	1326	;
959	}	1327	}
960	});	1328	});
961	}	1329	}
…		…
968		1336
969	(delete $self->{npc_dialog})->destroy	1337	(delete $self->{npc_dialog})->destroy
970	if $self->{npc_dialog};	1338	if $self->{npc_dialog};
971		1339
972	$self->SUPER::destroy;	1340	$self->SUPER::destroy;
		1341
		1342	%$self = ();
973	}	1343	}
974		1344
975	package CFPlus::NPCDialog;	1345	package CFPlus::NPCDialog;
976		1346
977	our @ISA = 'CFPlus::UI::Toplevel';	1347	our @ISA = 'CFPlus::UI::Toplevel';
…		…
1024	on_activate => sub { $this->destroy; 1 },	1394	on_activate => sub { $this->destroy; 1 },
1025	;	1395	;
1026		1396
1027	$self->update_options;	1397	$self->update_options;
1028		1398
1029	$self->{id} = $self->{conn}->send_ext_req (	1399	$self->{id} = "npc-channel-" . $self->{conn}->token;
1030	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1400	$self->{conn}->connect_ext ($self->{id} => sub {
1031	sub { $this && $this->feed (@_) }	1401	$this->feed (@_) if $this;
1032	);	1402	});
		1403
		1404	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1033		1405
1034	$self->{entry}->grab_focus;	1406	$self->{entry}->grab_focus;
1035		1407
1036	$self->{textview}->add_paragraph ({	1408	$self->{textview}->add_paragraph ({
1037	fg => [1, 1, 0, 1],	1409	fg => [1, 1, 0, 1],
…		…
1060	);	1432	);
1061	}	1433	}
1062	}	1434	}
1063		1435
1064	sub feed {	1436	sub feed {
1065	my ($self, $msg) = @_;	1437	my ($self, $type, @arg) = @_;
1066		1438
1067	CFPlus::weaken $self;	1439	CFPlus::weaken $self;
1068		1440
1069	if ($msg->{msgtype} eq "reply") {	1441	if ($type eq "update") {
		1442	my (%info) = @arg;
		1443
1070	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1444	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1071	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1445	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1072
1073	my $text = "\n" . CFPlus::asxml $msg->{msg};
1074	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1075	my @link;
1076	$text =~ s{
1077	($match)
1078	}{
1079	my $kw = $1;
1080
1081	push @link, new CFPlus::UI::Label
1082	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1083	can_hover => 1,
1084	can_events => 1,
1085	padding_x => 0,
1086	padding_y => 0,
1087	on_button_up => sub {
1088	$self->send ($kw);
1089	};
1090
1091	"\x{fffc}"
1092	}giex;
1093		1446
		1447	if (exists $info{msg}) {
		1448	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1449	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1450	my @link;
		1451	$text =~ s{
		1452	($match)
		1453	}{
		1454	my $kw = $1;
		1455
		1456	push @link, new CFPlus::UI::Label
		1457	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1458	can_hover => 1,
		1459	can_events => 1,
		1460	padding_x => 0,
		1461	padding_y => 0,
		1462	on_button_up => sub {
		1463	$self->send ($kw);
		1464	};
		1465
		1466	"\x{fffc}"
		1467	}giex;
		1468
1094	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1469	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1095	$self->{textview}->scroll_to_bottom;	1470	$self->{textview}->scroll_to_bottom;
		1471	}
		1472
1096	$self->update_options;	1473	$self->update_options;
1097	} else {	1474	} else {
1098	$self->destroy;	1475	$self->destroy;
1099	}	1476	}
1100		1477
…		…
1105	my ($self, $msg) = @_;	1482	my ($self, $msg) = @_;
1106		1483
1107	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1484	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1108	$self->{textview}->scroll_to_bottom;	1485	$self->{textview}->scroll_to_bottom;
1109		1486
1110	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1487	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1111	}	1488	}
1112		1489
1113	sub destroy {	1490	sub destroy {
1114	my ($self) = @_;	1491	my ($self) = @_;
1115		1492
1116	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1493	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1117		1494
1118	if ($self->{conn}) {	1495	if ($self->{conn}) {
1119	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1496	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1120	delete $self->{conn}{npc_dialog};	1497	delete $self->{conn}{npc_dialog};
1121	$self->{conn}->disconnect_ext ($self->{id});	1498	$self->{conn}->disconnect_ext ($self->{id});
1122	}	1499	}
1123		1500
1124	$self->SUPER::destroy;	1501	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC vs. Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC vs.
Revision 1.158 by root, Tue Aug 21 11:23:04 2007 UTC