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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.167 by root, Tue Aug 28 01:23:47 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	xwidget => 1,	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 (event_capabilities => sub {	53	$self->{json_coder}
54	my ($cap) = @_;	54	->convert_blessed
55		55	->filter_json_single_key_object (__w_ => sub {
56	if (my $ts = $cap->{tileset}) {	56	$self->{widget}{$_[0]}
57	if (my ($default) = grep $_->[2] & 1, @$ts) {
58	$self->{tileset} = $default;
59	$self->{tilesize} = $default->[3];
60	$self->setup_req (tileset => $default->[0]);
61
62	my $w = int $self->{mapw} * 32 / $self->{tilesize};
63	my $h = int $self->{maph} * 32 / $self->{tilesize};
64
65	$self->setup_req (mapsize => "${w}x${h}");
66	}
67	}
68	});
69
70	$self->connect_ext (ws_n => sub {
71	my ($arg) = @_;
72
73	$self->{widgetset}{$arg{id}} = {
74	w => {},
75	};	57	});
76	});
77		58
78	$self->connect_ext (ws_d => sub {	59	# destroy widgets on logout
79	my ($arg) = @_;
80
81	my $ws = delete $self->{widgetset}{$arg{id}}
82	or return;
83
84	$_->destroy
85	for values %{$ws->{w}};
86	});
87
88	$self->connect_ext (ws_c => sub {
89	my ($arg) = @_;
90
91	my $args = $arg->{args} \|\| {};
92
93	for my $ev (grep /^on_/, keys %$args) {
94	$args->{$ev} = sub {
95	my $id = shift->{s_id};
96	$self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
97
98	1
99	};
100	}
101
102	if (my $widget = eval {
103	local $SIG{__DIE__};
104	"CFPlus::UI::$arg->{class}"->new (
105	%$args,
106	s_ws => $arg->{ws},
107	s_id => $arg->{id},
108	)
109	}
110	) {
111	$self->{widget}{$arg->{id}}
112	= $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
113	= $widget;
114
115	$widget->connect (on_destroy => sub {
116	my ($widget) = @_;
117
118	delete $self->{widget}{$widget->{s_id}};
119	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
120	});
121	} else {
122	warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
123	$self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
124	}
125	});
126
127	$self->connect_ext (w_c => sub {
128	my ($arg) = @_;
129
130	my $w = $self->{widget}{$arg->{id}}
131	or return;
132	my $m = $arg->{name};
133
134	my @a = map {
135	"HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
136	? $self->{widget}{$_->{__widget_ref__}}
137	: $_
138	} @{ $arg->{args} \|\| [] };
139
140	if (exists $arg->{rid}) {
141	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
142	} else {
143	$w->$m (@a);
144	}
145	});
146
147	$self->connect_ext (w_s => sub {
148	my ($arg) = @_;
149
150	my $w = $self->{widget}{$arg->{id}}
151	or return;
152
153	$w->{$arg->{name}} = $arg->{value};
154	});
155
156	$self->connect_ext (w_g => sub {
157	my ($arg) = @_;
158
159	my $w = $self->{widget}{$arg->{id}}
160	or return;
161
162	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
163	});
164
165	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {	60	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
166	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	61	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
167	$_->destroy	62	$_->destroy
168	for values %{delete $ws->{w} \|\| {}};	63	for values %{delete $ws->{w} \|\| {}};
169	}	64	}
…		…
190	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	85	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
191		86
192	$self	87	$self
193	}	88	}
194		89
		90	sub update_fx_want {
		91	my ($self) = @_;
		92
		93	$self->send_exti_msg (fx_want => {
		94	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		95	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		96	6 => 1, # FT_RSRC
		97	});
		98	}
		99
		100	sub ext_capabilities {
		101	my ($self, %cap) = @_;
		102
		103	#$self->send ("setup sound 0"); # we use a different protocol
		104	$self->update_fx_want;
		105
		106	$self->send_exti_req (resource => "exp_table", sub {
		107	my ($exp_table) = @_;
		108
		109	$self->register_face_handler ($exp_table, sub {
		110	my ($face) = @_;
		111
		112	$self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
		113	$_->() for values %{ $self->{on_exp_update} \|\| {} };
		114	});
		115
		116	()
		117	});
		118
		119	if (my $ts = $cap{tileset}) {
		120	if (my ($default) = grep $_->[2] & 1, @$ts) {
		121	$self->{tileset} = $default;
		122	$self->{tilesize} = $default->[3];
		123	$self->setup_req (tileset => $default->[0]);
		124
		125	my $w = int $self->{mapw} * 32 / $self->{tilesize};
		126	my $h = int $self->{maph} * 32 / $self->{tilesize};
		127
		128	$self->setup_req (mapsize => "${w}x${h}");
		129	}
		130	}
		131	}
		132
		133	sub ext_ambient_music {
		134	my ($self, $songs) = @_;
		135	&::audio_music_set_ambient ($songs);
		136	}
		137
		138	#############################################################################
		139
		140	sub widget_associate {
		141	my ($self, $ws, $id, $widget) = @_;
		142
		143	if ($widget) {
		144	$widget->{s_id} = $id;
		145	$self->{widget}{$id} = $widget;
		146
		147	if ($ws) {
		148	$widget->{s_ws} = $ws;
		149	$self->{widgetset}{$ws}{w}{$id} = $widget;
		150	}
		151
		152	$widget->connect (on_destroy => sub {
		153	my ($widget) = @_;
		154
		155	delete $self->{widget}{$widget->{s_id}};
		156	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		157	if exists $widget->{s_ws};
		158	});
		159
		160	1
		161	} else {
		162	$self->send_exti_msg (w_e => $id, undef);
		163
		164	0
		165	}
		166	}
		167
		168	# widgetset new
		169	sub ext_ws_n {
		170	my ($self, $id) = @_;
		171
		172	$self->{widgetset}{$id} = {
		173	w => {},
		174	};
		175	}
		176
		177	# widgetset destroy
		178	sub ext_ws_d {
		179	my ($self, $id) = @_;
		180
		181	my $ws = delete $self->{widgetset}{$id}
		182	or return;
		183
		184	$_->destroy
		185	for values %{$ws->{w}};
		186	}
		187
		188	# widgetset create
		189	sub ext_ws_c {
		190	my ($self, $ws, $id, $class, $args) = @_;
		191
		192	for my $ev (grep /^on_/, keys %$args) {
		193	my $rid = $args->{$ev};
		194	$args->{$ev} = sub {
		195	my $id = shift->{s_id};
		196	$self->send_exti_msg (w_e => $id, $rid, @_);
		197
		198	1
		199	};
		200	}
		201
		202	$self->widget_associate (
		203	$ws, $id => scalar eval {
		204	local $SIG{__DIE__};
		205	"CFPlus::UI::$class"->new (%$args)
		206	}
		207	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
		208	}
		209
		210	# widgetset associate
		211	sub ext_ws_a {
		212	my ($self, %ass) = @_;
		213
		214	# everything that has a name, wether conceivably useful or not
		215	my %wkw = (
		216	root => $CFPlus::UI::ROOT,
		217	tooltip => $CFPlus::UI::TOOLTIP,
		218
		219	mapwidget => $::MAPWIDGET,
		220	buttonbar => $::BUTTONBAR,
		221	metaserver => $::METASERVER,
		222	buttonbar => $::BUTTONBAR,
		223	login_button => $::LOGIN_BUTTON,
		224	quit_dialog => $::QUIT_DIALOG,
		225	host_entry => $::HOST_ENTRY,
		226	metaserver => $::METASERVER,
		227	server_info => $::SERVER_INFO,
		228
		229	setup_dialog => $::SETUP_DIALOG,
		230	setup_notebook => $::SETUP_NOTEBOOK,
		231	setup_server => $::SETUP_SERVER,
		232	setup_keyboard => $::SETUP_KEYBOARD,
		233
		234	pl_notebook => $::PL_NOTEBOOK,
		235	pl_window => $::PL_WINDOW,
		236	inventory_page => $::INVENTORY_PAGE,
		237	stats_page => $::STATS_PAGE,
		238	skill_page => $::SKILL_PAGE,
		239	spell_page => $::SPELL_PAGE,
		240	spell_list => $::SPELL_LIST,
		241
		242	floorbox => $::FLOORBOX,
		243	help_window => $::HELP_WINDOW,
		244	message_window => $::MESSAGE_WINDOW,
		245	statusbox => $::SDTATUSBOX,
		246
		247	inv => $::INV,
		248	invr => $::INVR,
		249	invr_hb => $::INVR_HB,
		250	);
		251
		252	while (my ($id, $name) = each %ass) {
		253	$self->widget_associate (undef, $id => $wkw{$name})
		254	or warn "server failed to associate non-existent well-known widget $name\n";
		255	}
		256	}
		257
		258	# widget call
		259	sub ext_w_c {
		260	my ($self, $id, $rid, $method, @args) = @_;
		261
		262	my $w = $self->{widget}{$id}
		263	or return;
		264
		265	if ($rid) {
		266	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
		267	} else {
		268	$w->$method (@args);
		269	}
		270	}
		271
		272	# widget set
		273	sub ext_w_s {
		274	my ($self, $id, $attr) = @_;
		275
		276	my $w = $self->{widget}{$id}
		277	or return;
		278
		279	for (my $i = 0; $i < $#$attr; $i += 2) {
		280	my ($member, $value) = @$attr[$i, $i+1];
		281	if (defined $value) {
		282	$w->{$member} = $value;
		283	} else {
		284	delete $w->{$member};
		285	}
		286	$w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
		287	}
		288	}
		289
		290	# widget get
		291	sub ext_w_g {
		292	my ($self, $id, $rid, $attr) = @_;
		293
		294	my $w = $self->{widget}{$id}
		295	or return;
		296
		297	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		298	}
		299
		300	# message window
		301	sub ext_channel_info {
		302	my ($self, $info) = @_;
		303	$self->{channels}->{$info->{id}} = $info;
		304	$::MESSAGE_WINDOW->add_channel ($info);
		305	}
		306
		307	#############################################################################
		308
195	sub logprint {	309	sub logprint {
196	my ($self, @a) = @_;	310	my ($self, @a) = @_;
197		311
198	$self->{log_fh} \|\|= do {	312	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
199	my $path = "$Crossfire::VARDIR/log.$self->{host}";
200
201	open my $fh, ">>:utf8", $path
202	or die "Couldn't open logfile $path: $!";
203
204	$fh->autoflush (1);
205
206	$fh;
207	};
208
209	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
210
211	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
212	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
213
214	print {$self->{log_fh}} "$ts ", @a, "\n";
215	}	313	}
216		314
217	sub _stat_numdiff {	315	sub _stat_numdiff {
218	my ($self, $name, $old, $new) = @_;	316	my ($self, $name, $old, $new) = @_;
219		317
…		…
303		401
304	if (	402	if (
305	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange	403	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
306	) {	404	) {
307	my $msg = "<b>stat change</b>: " . (join " ", @diffs);	405	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
308	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);	406	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
309	}	407	}
310		408
311	$self->update_stats_window ($stats, $prev);	409	$self->update_stats_window ($stats, $prev);
312		410
313	$self->{prev_stats} = { %$stats };	411	$self->{prev_stats} = { %$stats };
…		…
352	$::GAUGES->{mana} ->set_value ($sp, $sp_m);	450	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
353	$::GAUGES->{food} ->set_value ($fo, $fo_m);	451	$::GAUGES->{food} ->set_value ($fo, $fo_m);
354	$::GAUGES->{grace} ->set_value ($gr, $gr_m);	452	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
355	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))	453	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
356	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");	454	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		455	$::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
357	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});	456	$::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
358	my $title = $stats->{+CS_STAT_TITLE};	457	my $title = $stats->{+CS_STAT_TITLE};
359	$title =~ s/^Player: //;	458	$title =~ s/^Player: //;
360	$::STATWIDS->{title} ->set_text ("Title: " . $title);	459	$::STATWIDS->{title} ->set_text ("Title: " . $title);
361		460
…		…
379	for keys %RES_TBL;	478	for keys %RES_TBL;
380		479
381	my $sktbl = $::STATWIDS->{skill_tbl};	480	my $sktbl = $::STATWIDS->{skill_tbl};
382	my @skills = keys %{ $self->{skill_info} };	481	my @skills = keys %{ $self->{skill_info} };
383		482
384	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {	483	my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		484	map [$_, $self->{skill_info}{$_}],
		485	grep exists $stats->{$_},
		486	@skills;
		487
		488	if ($self->{stat_order} ne join ",", map $_->[0], @order) {
		489	$self->{stat_order} = join ",", map $_->[0], @order;
		490
385	$sktbl->clear;	491	$sktbl->clear;
386		492
		493	my $sw = $self->{skillwid}{""} \|\|= [
387	$sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);	494	0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
388	$sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	495	1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		496	2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
389	$sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	497	3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
390	$sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);	498	4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
391	$sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);	499	5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
		500	6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
392	$sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);	501	7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
		502	];
		503
		504	my @add = @$sw;
393		505
394	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";	506	my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
395		507
396	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	508	my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
397	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);	509	my @TOOLTIP_EXP = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
398		510
399	my ($x, $y) = (0, 1);	511	my ($x, $y) = (0, 1);
400	for (	512	for (@order) {
401	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
402	map [$_, $self->{skill_info}{$_}],
403	grep exists $stats->{$_},
404	@skills
405	) {
406	my ($idx, $name) = @$_;	513	my ($idx, $name) = @$_;
407		514
408	my $spell_cb = sub {	515	my $spell_cb = sub {
409	my ($widget, $ev) = @_;	516	my ($widget, $ev) = @_;
410		517
…		…
425	}	532	}
426		533
427	1	534	1
428	};	535	};
429		536
430	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label	537	my $sw = $self->{skillwid}{$idx} \|\|= [
		538	# exp
		539	(new CFPlus::UI::Label
431	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);	540	align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
432	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label	541
		542	# level
		543	(new CFPlus::UI::Label
433	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);	544	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
		545
		546	# progress
		547	(new CFPlus::UI::ExperienceProgress),
		548
		549	# label
434	$sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,	550	(new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
435	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);	551	can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
		552	];
		553
		554	push @add,
		555	$x * 4 + 0, $y, $sw->[0],
		556	$x * 4 + 1, $y, $sw->[1],
		557	$x * 4 + 2, $y, $sw->[2],
		558	$x * 4 + 3, $y, $sw->[3],
		559	;
436		560
437	$x++ and ($x, $y) = (0, $y + 1);	561	$x++ and ($x, $y) = (0, $y + 1);
438	}	562	}
439	}
440		563
441	for (grep exists $stats->{$_}, @skills) {	564	$sktbl->add_at (@add);
442	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
443	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
444	}	565	}
445	}
446		566
447	sub macro_send {	567	for (@order) {
448	my ($self, $macro) = @_;	568	my ($idx, $name) = @$_;
		569	my $val = $stats->{$idx};
449		570
450	for my $cmd (@{ $macro->{action} }) {	571	next if $prev->{$idx}[1] eq $val->[1];
451	$self->send_command ($cmd);	572
		573	my $sw = $self->{skillwid}{$idx};
		574	$sw->[0]->set_text (::formsep ($val->[1]));
		575	$sw->[1]->set_text ($val->[0] * 1);
		576	$sw->[2]->set_value (@$val);
		577
		578	$::GAUGES->{sklprg}->set_label ("$name %d%%");
		579	$::GAUGES->{sklprg}->set_value (@$val);
452	}	580	}
453	}	581	}
454		582
455	sub user_send {	583	sub user_send {
456	my ($self, $command) = @_;	584	my ($self, $command) = @_;
…		…
458	$self->{record}->($command)	586	$self->{record}->($command)
459	if $self->{record};	587	if $self->{record};
460		588
461	$self->logprint ("send: ", $command);	589	$self->logprint ("send: ", $command);
462	$self->send_command ($command);	590	$self->send_command ($command);
463	::status ($command);
464	}	591	}
465		592
466	sub record {	593	sub record {
467	my ($self, $cb) = @_;	594	my ($self, $cb) = @_;
468		595
…		…
476	}	603	}
477		604
478	sub feed_map1a {	605	sub feed_map1a {
479	my ($self, $data) = @_;	606	my ($self, $data) = @_;
480		607
481	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	608	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		609	my $delay;
		610
		611	for my $tile (@$missing) {
		612	next if $self->{delay}{$tile};
		613
		614	$delay = 1;
		615
		616	if (my $tex = $::CONN->{texture}[$tile]) {
		617	$tex->upload;
		618	} else {
		619	$self->{delay}{$tile} = 1;
		620
		621	# we assume the face is in-flight and will eventually come
		622	push @{$self->{tile_cb}{$tile}}, sub {
		623	delete $self->{delay}{$tile};
		624	$_[0]->upload;
		625	};
		626	}
		627	}
		628
		629	if ($delay) {
		630	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		631	Event->timer (after => 0.03, cb => sub {
		632	$_[0]->w->cancel;
		633	$self->{map_widget}->update
		634	if $self->{map_widget};
		635	});
		636	} else {
482	$self->{map_widget}->update;	637	$self->{map_widget}->update;
		638	}
483	}	639	}
484		640
485	sub magicmap {	641	sub magicmap {
486	my ($self, $w, $h, $x, $y, $data) = @_;	642	my ($self, $w, $h, $x, $y, $data) = @_;
487		643
…		…
494	my $map_info = delete $self->{map_info}	650	my $map_info = delete $self->{map_info}
495	or return;	651	or return;
496		652
497	my ($hash, $x, $y, $w, $h) = @$map_info;	653	my ($hash, $x, $y, $w, $h) = @$map_info;
498		654
499	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	655	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		656	$self->{map_cache_new}{$hash} = \$data;
500	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	657	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
501	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
502	}	658	}
503		659
504	sub map_clear {	660	sub map_clear {
505	my ($self) = @_;	661	my ($self) = @_;
506		662
…		…
512	}	668	}
513		669
514	sub bg_fetch {	670	sub bg_fetch {
515	my ($self) = @_;	671	my ($self) = @_;
516		672
517	my $id;	673	my $tile;
518		674
519	do {	675	do {
520	$id = pop @{$self->{bg_fetch}}	676	$tile = pop @{$self->{bg_fetch}}
521	or return;	677	or return;
522	} while $self->{texture}[$id];	678	} while $self->{texture}[$tile];
523		679
524	CFPlus::DB::get tilecache => $id, sub {	680	CFPlus::DB::get tilecache => $tile, sub {
525	my ($data) = @_;	681	my ($data) = @_;
526		682
527	return unless $self->{map}; # stop when destroyed	683	return unless $self->{map}; # stop when destroyed
528		684
529	$self->set_texture ($id => $data)
530	if defined $data;	685	if (defined $data) {
		686	$self->have_tile ($tile, $data);
		687	$self->{texture}[$tile]->upload;
		688	}
531		689
532	$self->bg_fetch;	690	$self->bg_fetch;
533	};	691	};
534	}	692	}
535		693
536	sub load_map($$$) {	694	sub load_map($$$) {
537	my ($self, $hash, $x, $y) = @_;	695	my ($self, $hash, $x, $y) = @_;
538		696
539	my $gen = $self->{map_change_gen};	697	my $gen = $self->{map_change_gen};
540		698
541	CFPlus::DB::get $self->{mapcache} => $hash, sub {	699	my $cb = sub {
542	return unless $gen == $self->{map_change_gen};	700	return unless $gen == $self->{map_change_gen};
543		701
544	my ($data) = @_;	702	my ($data) = @_;
545		703
546	if (defined $data) {	704	if (defined $data) {
		705	$self->{map_cache_new}{$hash} = \$data;
		706
547	$data = Compress::LZF::decompress $data;	707	my $data = Compress::LZF::decompress $data;
548	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
549		708
550	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	709	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
551	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	710	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
552	$self->bg_fetch unless $inprogress;	711	$self->bg_fetch unless $inprogress;
553	}	712	}
554	};	713	};
		714
		715	if (my $rdata = $self->{map_cache_old}{$hash}) {
		716	$cb->($$rdata);
		717	} else {
		718	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		719	}
555	}	720	}
556		721
557	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	722	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
558	# (server resource,s latency, bandwidth), so this hack is warranted.	723	# (server resource,s latency, bandwidth), so this hack is warranted.
559	# the right fix is to make real tiled maps with an overview file	724	# the right fix is to make real tiled maps with an overview file
…		…
652	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	817	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
653		818
654	$self->flush_map;	819	$self->flush_map;
655		820
656	++$self->{map_change_gen};	821	++$self->{map_change_gen};
		822	$self->{map_cache_old} = delete $self->{map_cache_new};
657		823
658	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	824	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
659		825
660	my $mapmapw = $self->{mapmap}->{w};	826	my $mapmapw = $self->{mapmap}->{w};
661	my $mapmaph = $self->{mapmap}->{h};	827	my $mapmaph = $self->{mapmap}->{h};
…		…
680	}	846	}
681		847
682	sub face_find {	848	sub face_find {
683	my ($self, $facenum, $face, $cb) = @_;	849	my ($self, $facenum, $face, $cb) = @_;
684		850
685	my $hash = "$face->{chksum},$face->{name}";	851	if ($face->{type} == 0) { # FT_FACE
686
687	my $id = CFPlus::DB::get_tile_id_sync $hash;	852	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
688		853
689	$face->{id} = $id;	854	$face->{id} = $id;
690	$self->{faceid}[$facenum] = $id;
691
692	$self->{map}->set_tileid ($facenum => $id);	855	$self->{map}->set_tileid ($facenum => $id);
693		856
694	CFPlus::DB::get tilecache => $id, $cb;	857	CFPlus::DB::get tilecache => $id, $cb;
		858
		859	} elsif ($face->{type} & 1) { # with metadata
		860	CFPlus::DB::get res_meta => $face->{name}, $cb;
		861
		862	} else { # no metadata
		863	CFPlus::DB::get res_data => $face->{name}, $cb;
		864	}
695	}	865	}
696		866
697	sub face_update {	867	sub face_update {
698	my ($self, $facenum, $face, $changed) = @_;	868	my ($self, $facenum, $face, $changed) = @_;
699		869
		870	if ($face->{type} == 0) {
		871	# image, FT_FACE
700	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	872	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
701	if $changed;	873	if $changed;
702		874
703	$self->set_texture ($face->{id} => delete $face->{image});	875	$self->have_tile ($face->{id}, delete $face->{data});
		876
		877	} elsif ($face->{type} & 1) {
		878	# split metadata case, FT_MUSIC, FT_SOUND
		879	if ($changed) { # new data
		880	my ($meta, $data) = unpack "(w/a)", $face->{data};
		881	$face->{data} = $meta;
		882
		883	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		884	CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
		885	}
		886
		887	$face->{data} = $self->{json_coder}->decode ($face->{data});
		888
		889	::add_license ($face);
		890
		891	if ($face->{type} == 3) { # FT_MUSIC
		892	::message ({ markup => "downloaded song #$facenum" })
		893	if $changed;
		894
		895	&::audio_music_push ($facenum);
		896	} elsif ($face->{type} == 5) { # FT_SOUND
		897	::message ({ markup => "downloaded sound #$facenum" })
		898	if $changed;
		899
		900	&::audio_sound_push ($facenum);
		901	}
		902
		903	} else {
		904	# flat resource case, FT_RSRC
		905	CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
		906	if $changed;
		907	}
		908
		909	if (my $cbs = $self->{face_cb}{$facenum}) {
		910	$_->($face, $changed) for @$cbs;
		911	}
704	}	912	}
705		913
706	sub smooth_update {	914	sub smooth_update {
707	my ($self, $facenum, $face) = @_;	915	my ($self, $facenum, $face) = @_;
708		916
709	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	917	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
710	}	918	}
711		919
712	sub set_texture {	920	sub have_tile {
713	my ($self, $id, $data) = @_;	921	my ($self, $tile, $data) = @_;
714		922
715	$self->{texture}[$id] = my $tex =	923	return unless $self->{map};
		924
		925	my $tex = $self->{texture}[$tile] \|\|=
716	new_from_image CFPlus::Texture	926	new CFPlus::Texture
		927	tile => $tile,
		928	image => $data, delete_image => 1,
717	$data, minify => 1, mipmap => 1;	929	minify => 1, mipmap => 1;
718		930
719	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});	931	if (my $cbs = delete $self->{tile_cb}{$tile}) {
720	$self->{map_widget}->update;	932	$_->($tex) for @$cbs;
		933	}
		934	}
		935
		936	# call in non-void context registers a temporary
		937	# hook with handle, otherwise its permanent
		938	sub on_face_change {
		939	my ($self, $num, $cb) = @_;
		940
		941	push @{$self->{face_cb}{$num}}, $cb;
		942
		943	defined wantarray
		944	? CFPlus::guard {
		945	@{$self->{face_cb}{$num}}
		946	= grep $_ != $cb,
		947	@{$self->{face_cb}{$num}};
		948	}
		949	: ()
		950	}
		951
		952	# call in non-void context registers a temporary
		953	# hook with handle, otherwise its permanent
		954	sub register_face_handler {
		955	my ($self, $num, $cb) = @_;
		956
		957	return unless $num;
		958
		959	# invoke if available right now
		960	$cb->($self->{face}[$num], 0)
		961	unless exists $self->{face}[$num]{loading};
		962
		963	# future changes
		964	$self->on_face_change ($num => $cb)
721	}	965	}
722		966
723	sub sound_play {	967	sub sound_play {
724	my ($self, $x, $y, $soundnum, $type) = @_;	968	my ($self, $type, $face, $dx, $dy, $vol) = @_;
725		969
726	$self->{sound_play}->($x, $y, $soundnum, $type);	970	&::audio_sound_play ($face, $dx, $dy, $vol)
		971	unless $type & 1; # odd types are silent for future expansion
727	}	972	}
728		973
729	my $LAST_QUERY; # server is stupid, stupid, stupid	974	my $LAST_QUERY; # server is stupid, stupid, stupid
730		975
731	sub query {	976	sub query {
…		…
796	$self->{$type} = $text;	1041	$self->{$type} = $text;
797	} else {	1042	} else {
798	$self->logprint ("msg: ", $text);	1043	$self->logprint ("msg: ", $text);
799	return if $color < 0; # negative color == ignore if not understood	1044	return if $color < 0; # negative color == ignore if not understood
800		1045
801	my $fg = $CF_COLOR[$color % @CF_COLOR];	1046	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
802		1047
803	## try to create single paragraphs of multiple lines sent by the server	1048	## try to create single paragraphs of multiple lines sent by the server
804	# no longer neecssary with TRT servers	1049	# no longer neecssary with TRT servers
805	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	1050	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
806		1051
807	::message ({ fg => $fg, markup => $_ })	1052	::message ({
		1053	fg => $fg,
		1054	markup => $_,
		1055	type => $type,
		1056	extra => [@extra],
		1057	color_flags => $color
808	for split /\n/, $text;	1058	}) for split /\n/, $text;
809		1059
810	$self->{statusbox}->add ($text,	1060	$self->{statusbox}->add ($text,
811	group => $text,	1061	group => $text,
812	fg => $fg,	1062	fg => $fg,
813	timeout => $color >= 2 ? 180 : 10,	1063	timeout => $color >= 2 ? 180 : 10,
…		…
869	$self->{map_widget}->clr_commands;	1119	$self->{map_widget}->clr_commands;
870		1120
871	::stop_game ();	1121	::stop_game ();
872	}	1122	}
873		1123
874	sub image_info {
875	my ($self, $numfaces) = @_;
876
877	$self->{num_faces} = $numfaces;
878	$self->{face_prefetch} = [1 .. $numfaces];
879	$self->face_prefetch;
880	}
881
882	sub face_prefetch {
883	my ($self) = @_;
884
885	return unless $::CFG->{face_prefetch};
886
887	if ($self->{num_faces}) {
888	return if @{ $self->{send_queue} \|\| [] };
889	my $todo = @{ $self->{face_prefetch} }
890	or return;
891
892	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
893
894	$self->send ("requestinfo image_sums $face $face");
895
896	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
897	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
898	} elsif (!exists $self->{num_faces}) {
899	$self->send ("requestinfo image_info");
900
901	$self->{num_faces} = 0;
902
903	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
904	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
905	}
906	}
907
908	sub update_floorbox {	1124	sub update_floorbox {
909	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1125	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
910	return unless $::CONN;	1126	return unless $::CONN;
911		1127
912	$::FLOORBOX->clear;	1128	$::FLOORBOX->clear;
		1129
		1130	my @add;
913		1131
914	my $row;	1132	my $row;
915	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {	1133	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
916	if ($row < 6) {	1134	if ($row < 6) {
917	local $_->{face_widget}; # hack to force recreation of widget	1135	local $_->{face_widget}; # hack to force recreation of widget
918	local $_->{desc_widget}; # hack to force recreation of widget	1136	local $_->{desc_widget}; # hack to force recreation of widget
919	CFPlus::Item::update_widgets $_;	1137	CFPlus::Item::update_widgets $_;
920		1138
		1139	push @add,
921	$::FLOORBOX->add (0, $row, $_->{face_widget});	1140	0, $row, $_->{face_widget},
922	$::FLOORBOX->add (1, $row, $_->{desc_widget});	1141	1, $row, $_->{desc_widget};
923		1142
924	$row++;	1143	$row++;
925	} else {	1144	} else {
926	$::FLOORBOX->add (1, $row, new CFPlus::UI::Button	1145	push @add, 1, $row, new CFPlus::UI::Button
927	text => "More...",	1146	text => "More...",
928	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },	1147	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
929	);	1148	;
930	last;	1149	last;
931	}	1150	}
932	}	1151	}
933	if ($::CONN->{open_container}) {	1152	if ($::CONN->{open_container}) {
934	$::FLOORBOX->add (1, $row++, new CFPlus::UI::Button	1153	push @add, 1, $row++, new CFPlus::UI::Button
935	text => "Close container",	1154	text => "Close container",
936	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }	1155	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
937	);	1156	;
938	}	1157	}
		1158
		1159	$::FLOORBOX->add_at (@add);
939	});	1160	});
940		1161
941	$::WANT_REFRESH++;	1162	$::WANT_REFRESH->start;
942	}	1163	}
943		1164
944	sub set_opencont {	1165	sub set_opencont {
945	my ($conn, $tag, $name) = @_;	1166	my ($conn, $tag, $name) = @_;
946	$conn->{open_container} = $tag;	1167	$conn->{open_container} = $tag;
947	update_floorbox;	1168	update_floorbox;
948		1169
949	$::INV_RIGHT_HB->clear ();	1170	$::INVR_HB->clear ();
950	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1171	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
951		1172
952	if ($tag != 0) { # Floor isn't closable, is it?	1173	if ($tag != 0) { # Floor isn't closable, is it?
953	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1174	$::INVR_HB->add (new CFPlus::UI::Button
954	text => "Close container",	1175	text => "Close container",
955	tooltip => "Close the currently open container (if one is open)",	1176	tooltip => "Close the currently open container (if one is open)",
956	on_activate => sub {	1177	on_activate => sub {
957	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1178	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
958	if $tag != 0;	1179	if $tag != 0;
959	#if $CONN->{open_container} != 0;
960	0	1180	0
961	},	1181	},
962	);	1182	);
963	}	1183	}
964		1184
…		…
1063	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1283	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1064	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1284	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1065	. "map size $self->{mapw}×$self->{maph}\n"	1285	. "map size $self->{mapw}×$self->{maph}\n"
1066	);	1286	);
1067		1287
1068	::setup_build_button ($self->{editor_support}->{builder_ui});
1069	}	1288	}
1070		1289
1071	sub logged_in {	1290	sub logged_in {
1072	my ($self) = @_;	1291	my ($self) = @_;
1073		1292
1074	$self->send_ext_req (cfplus_support => version => 1, sub {	1293	$self->send_ext_req (cfplus_support => version => 2, sub {
		1294	my (%msg) = @_;
		1295
1075	$self->{cfplus_ext} = $_[0]{version};	1296	$self->{cfplus_ext} = $msg{version};
1076	$self->update_server_info;	1297	$self->update_server_info;
1077		1298
1078	if ($self->{cfplus_ext} >= 2) {	1299	if ($self->{cfplus_ext} >= 2) {
1079	$self->send_ext_req ("editor_support", sub {	1300	$self->send_ext_req ("editor_support", sub {
1080	$self->{editor_support} = $_[0];	1301	$self->{editor_support} = { @_ };
1081	$self->update_server_info;	1302	$self->update_server_info;
1082		1303
1083	0	1304	0
1084	});	1305	});
1085	}	1306	}
…		…
1093	$self->send_command ("output-count $::CFG->{output_count}");	1314	$self->send_command ("output-count $::CFG->{output_count}");
1094	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1315	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1095	$self->send_command ("pickup $::CFG->{pickup}");	1316	$self->send_command ("pickup $::CFG->{pickup}");
1096	}	1317	}
1097		1318
1098	sub buildat {
1099	my ($self, $builditem, $x, $y) = @_;
1100
1101	if ($self->{cfplus_ext}) {
1102	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1103	}
1104	}
1105
1106	sub lookat {	1319	sub lookat {
1107	my ($self, $x, $y) = @_;	1320	my ($self, $x, $y) = @_;
1108		1321
1109	if ($self->{cfplus_ext}) {	1322	if ($self->{cfplus_ext}) {
1110	$self->send_ext_req (lookat => dx => $x, dy => $y, sub {	1323	$self->send_ext_req (lookat => $x, $y, sub {
1111	my ($msg) = @_;	1324	my (%msg) = @_;
1112		1325
1113	if (exists $msg->{npc_dialog}) {	1326	if (exists $msg{npc_dialog}) {
1114	# start npc chat dialog	1327	# start npc chat dialog
1115	$self->{npc_dialog} = new CFPlus::NPCDialog::	1328	$self->{npc_dialog} = new CFPlus::NPCDialog::
1116	dx => $x,	1329	token => $msg{npc_dialog},
1117	dy => $y,
1118	title => "$msg->{npc_dialog} (NPC)",	1330	title => "$msg{npc_dialog}[0] (NPC)",
1119	conn => $self,	1331	conn => $self,
1120	;	1332	;
1121	}	1333	}
1122	});	1334	});
1123	}	1335	}
…		…
1130		1342
1131	(delete $self->{npc_dialog})->destroy	1343	(delete $self->{npc_dialog})->destroy
1132	if $self->{npc_dialog};	1344	if $self->{npc_dialog};
1133		1345
1134	$self->SUPER::destroy;	1346	$self->SUPER::destroy;
		1347
		1348	%$self = ();
1135	}	1349	}
1136		1350
1137	package CFPlus::NPCDialog;	1351	package CFPlus::NPCDialog;
1138		1352
1139	our @ISA = 'CFPlus::UI::Toplevel';	1353	our @ISA = 'CFPlus::UI::Toplevel';
…		…
1186	on_activate => sub { $this->destroy; 1 },	1400	on_activate => sub { $this->destroy; 1 },
1187	;	1401	;
1188		1402
1189	$self->update_options;	1403	$self->update_options;
1190		1404
1191	$self->{id} = $self->{conn}->send_ext_req (	1405	$self->{id} = "npc-channel-" . $self->{conn}->token;
1192	npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},	1406	$self->{conn}->connect_ext ($self->{id} => sub {
1193	sub { $this && $this->feed (@_) }	1407	$this->feed (@_) if $this;
1194	);	1408	});
		1409
		1410	$self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
1195		1411
1196	$self->{entry}->grab_focus;	1412	$self->{entry}->grab_focus;
1197		1413
1198	$self->{textview}->add_paragraph ({	1414	$self->{textview}->add_paragraph ({
1199	fg => [1, 1, 0, 1],	1415	fg => [1, 1, 0, 1],
…		…
1222	);	1438	);
1223	}	1439	}
1224	}	1440	}
1225		1441
1226	sub feed {	1442	sub feed {
1227	my ($self, $msg) = @_;	1443	my ($self, $type, @arg) = @_;
1228		1444
1229	CFPlus::weaken $self;	1445	CFPlus::weaken $self;
1230		1446
1231	if ($msg->{msgtype} eq "reply") {	1447	if ($type eq "update") {
		1448	my (%info) = @arg;
		1449
1232	$self->{kw}{$_} = 1 for @{$msg->{add_topics} \|\| []};	1450	$self->{kw}{$_} = 1 for @{$info{add_topics} \|\| []};
1233	$self->{kw}{$_} = 0 for @{$msg->{del_topics} \|\| []};	1451	$self->{kw}{$_} = 0 for @{$info{del_topics} \|\| []};
1234
1235	my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
1236	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
1237	my @link;
1238	$text =~ s{
1239	($match)
1240	}{
1241	my $kw = $1;
1242
1243	push @link, new CFPlus::UI::Label
1244	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
1245	can_hover => 1,
1246	can_events => 1,
1247	padding_x => 0,
1248	padding_y => 0,
1249	on_button_up => sub {
1250	$self->send ($kw);
1251	};
1252
1253	"\x{fffc}"
1254	}giex;
1255		1452
		1453	if (exists $info{msg}) {
		1454	my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
		1455	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
		1456	my @link;
		1457	$text =~ s{
		1458	($match)
		1459	}{
		1460	my $kw = $1;
		1461
		1462	push @link, new CFPlus::UI::Label
		1463	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1464	can_hover => 1,
		1465	can_events => 1,
		1466	padding_x => 0,
		1467	padding_y => 0,
		1468	on_button_up => sub {
		1469	$self->send ($kw);
		1470	};
		1471
		1472	"\x{fffc}"
		1473	}giex;
		1474
1256	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });	1475	$self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
1257	$self->{textview}->scroll_to_bottom;	1476	$self->{textview}->scroll_to_bottom;
		1477	}
		1478
1258	$self->update_options;	1479	$self->update_options;
1259	} else {	1480	} else {
1260	$self->destroy;	1481	$self->destroy;
1261	}	1482	}
1262		1483
…		…
1267	my ($self, $msg) = @_;	1488	my ($self, $msg) = @_;
1268		1489
1269	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });	1490	$self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
1270	$self->{textview}->scroll_to_bottom;	1491	$self->{textview}->scroll_to_bottom;
1271		1492
1272	$self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);	1493	$self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
1273	}	1494	}
1274		1495
1275	sub destroy {	1496	sub destroy {
1276	my ($self) = @_;	1497	my ($self) = @_;
1277		1498
1278	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1	1499	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
1279		1500
1280	if ($self->{conn}) {	1501	if ($self->{conn}) {
1281	$self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};	1502	$self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
1282	delete $self->{conn}{npc_dialog};	1503	delete $self->{conn}{npc_dialog};
1283	$self->{conn}->disconnect_ext ($self->{id});	1504	$self->{conn}->disconnect_ext ($self->{id});
1284	}	1505	}
1285		1506
1286	$self->SUPER::destroy;	1507	$self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs. Revision 1.167 by root, Tue Aug 28 01:23:47 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.167 by root, Tue Aug 28 01:23:47 2007 UTC