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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.36 by root, Thu Jun 15 15:33:58 2006 UTC vs.
Revision 1.67 by root, Mon Jul 24 08:23:28 2006 UTC

…		…
5		5
6	use Crossfire::Protocol::Constants;	6	use Crossfire::Protocol::Constants;
7		7
8	use CFClient;	8	use CFClient;
9	use CFClient::UI;	9	use CFClient::UI;
		10	use CFClient::Pod;
10		11
11	use base 'Crossfire::Protocol::Base';	12	use base 'Crossfire::Protocol::Base';
12
13	our %open_logs;
14		13
15	sub new {	14	sub new {
16	my $class = shift;	15	my $class = shift;
17		16
18	my $self = $class->SUPER::new (@_);	17	my $self = $class->SUPER::new (@_);
19		18
20	$self->{map_widget}->clr_commands;	19	$self->{map_widget}->clr_commands;
21		20
22	my $cmd_help = CFClient::load_pod CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {	21	my $cmd_help = CFClient::Pod::load CFClient::find_rcfile "pod/command_help.pod", command_help => 1, sub {
23	my ($pom) = @_;	22	my ($pom) = @_;
24		23
25	my @cmd_help;	24	my @cmd_help;
26		25
27	for my $head2 ($pom->head1->[-2]->head2) {	26	for my $head2 ($pom->head1->[-2]->head2) {
…		…
33	@args = (".*") unless @args;	32	@args = (".*") unless @args;
34		33
35	$_ = $_ eq ".*" ? "" : " $_"	34	$_ = $_ eq ".*" ? "" : " $_"
36	for @args;	35	for @args;
37		36
38	my $text = CFClient::pod_to_pango $head2->content;	37	my $text = CFClient::Pod::as_markup $head2->content;
39		38
40	push @cmd_help, ["$cmd$_", $text]	39	push @cmd_help, ["$cmd$_", $text]
41	for sort { (length $a) <=> (length $b) }	40	for sort { (length $a) <=> (length $b) }
42	@args;	41	@args;
43	}	42	}
…		…
63	$self	62	$self
64	}	63	}
65		64
66	sub logprint {	65	sub logprint {
67	my ($self, @a) = @_;	66	my ($self, @a) = @_;
		67
		68	$self->{log_fh} \|\|= do {
68	my $filename = "$Crossfire::VARDIR/log.$self->{host}";	69	my $path = "$Crossfire::VARDIR/log.$self->{host}";
69		70
70	my $fh = $open_logs{$filename};	71	open my $fh, ">>:utf8", $path
71	unless ($fh) {
72	# FIXME: handle this more gracefully?
73	open $fh, ">>", $filename
74	or die "Couldn't open logfile: log.$self->{host}: $!";	72	or die "Couldn't open logfile $path: $!";
75		73
76	$open_logs{$filename} = $fh;	74	$fh->autoflush (1);
		75
		76	$fh;
77	}	77	};
78		78
79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime (time);	79	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
80		80
81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",	81	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;	82	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
83		83
84	print $fh "$ts ", @a, "\n";	84	print {$self->{log_fh}} "$ts ", @a, "\n";
85	$fh->flush;
86	}	85	}
87		86
		87	sub _stat_numdiff {
		88	my ($self, $name, $old, $new) = @_;
88		89
		90	my $diff = $new - $old;
		91
		92	$diff = 0.01 * int $diff * 100;
		93
		94	0.1 >= abs $diff ? ()
		95	: $diff < 0 ? "$name$diff" : "$name+$diff"
		96	}
		97
		98	sub _stat_skillmaskdiff {
		99	my ($self, $name, $old, $new) = @_;
		100
		101	my $diff = $old ^ $new
		102	or return;
		103
		104	my @diff = map
		105	{
		106	$diff & $_
		107	? (($new & $_ ? "+" : "-") . $self->{spell_paths}{$_})
		108	: ()
		109	}
		110	sort { $a <=> $b } keys %{$self->{spell_paths}};
		111
		112	join "", @diff
		113	}
		114
		115	# all stats that are chacked against changes
		116	my @statchange = (
		117	[&CS_STAT_STR => \&_stat_numdiff, "Str"],
		118	[&CS_STAT_INT => \&_stat_numdiff, "Int"],
		119	[&CS_STAT_WIS => \&_stat_numdiff, "Wis"],
		120	[&CS_STAT_DEX => \&_stat_numdiff, "Dex"],
		121	[&CS_STAT_CON => \&_stat_numdiff, "Con"],
		122	[&CS_STAT_CHA => \&_stat_numdiff, "Cha"],
		123	[&CS_STAT_POW => \&_stat_numdiff, "Pow"],
		124	[&CS_STAT_WC => \&_stat_numdiff, "Wc"],
		125	[&CS_STAT_AC => \&_stat_numdiff, "Ac"],
		126	[&CS_STAT_DAM => \&_stat_numdiff, "Dam"],
		127	[&CS_STAT_SPEED => \&_stat_numdiff, "Speed"],
		128	[&CS_STAT_WEAP_SP => \&_stat_numdiff, "WSp"],
		129	[&CS_STAT_MAXHP => \&_stat_numdiff, "HP"],
		130	[&CS_STAT_MAXSP => \&_stat_numdiff, "Mana"],
		131	[&CS_STAT_MAXGRACE => \&_stat_numdiff, "Grace"],
		132	[&CS_STAT_WEIGHT_LIM => \&_stat_numdiff, "Weight"],
		133	[&CS_STAT_SPELL_ATTUNE => \&_stat_skillmaskdiff, "attuned"],
		134	[&CS_STAT_SPELL_REPEL => \&_stat_skillmaskdiff, "repelled"],
		135	[&CS_STAT_SPELL_DENY => \&_stat_skillmaskdiff, "denied"],
		136	[&CS_STAT_RES_PHYS => \&_stat_numdiff, "phys"],
		137	[&CS_STAT_RES_MAG => \&_stat_numdiff, "magic"],
		138	[&CS_STAT_RES_FIRE => \&_stat_numdiff, "fire"],
		139	[&CS_STAT_RES_ELEC => \&_stat_numdiff, "electricity"],
		140	[&CS_STAT_RES_COLD => \&_stat_numdiff, "cold"],
		141	[&CS_STAT_RES_CONF => \&_stat_numdiff, "confusion"],
		142	[&CS_STAT_RES_ACID => \&_stat_numdiff, "acid"],
		143	[&CS_STAT_RES_DRAIN => \&_stat_numdiff, "drain"],
		144	[&CS_STAT_RES_GHOSTHIT => \&_stat_numdiff, "ghosthit"],
		145	[&CS_STAT_RES_POISON => \&_stat_numdiff, "poison"],
		146	[&CS_STAT_RES_SLOW => \&_stat_numdiff, "slow"],
		147	[&CS_STAT_RES_PARA => \&_stat_numdiff, "paralyse"],
		148	[&CS_STAT_TURN_UNDEAD => \&_stat_numdiff, "turnundead"],
		149	[&CS_STAT_RES_FEAR => \&_stat_numdiff, "fear"],
		150	[&CS_STAT_RES_DEPLETE => \&_stat_numdiff, "depletion"],
		151	[&CS_STAT_RES_DEATH => \&_stat_numdiff, "death"],
		152	[&CS_STAT_RES_HOLYWORD => \&_stat_numdiff, "godpower"],
		153	[&CS_STAT_RES_BLIND => \&_stat_numdiff, "blind"],
		154	);
89		155
90	sub stats_update {	156	sub stats_update {
91	my ($self, $stats) = @_;	157	my ($self, $stats) = @_;
92		158
93	if (my $exp = $stats->{+CS_STAT_EXP64}) {	159	my $prev = $self->{prev_stats} \|\| { };
94	my $diff = $exp - $self->{prev_exp};	160
		161	if (my @diffs =
		162	(
		163	($stats->{+CS_STAT_EXP64} > $prev->{+CS_STAT_EXP64} ? ($stats->{+CS_STAT_EXP64} - $prev->{+CS_STAT_EXP64}) . " experience gained" : ()),
		164	map {
		165	$stats->{$_} && $prev->{$_}
		166	&& $stats->{$_}[1] > $prev->{$_}[1] ? "($self->{skill_info}{$_}+" . ($stats->{$_}[1] - $prev->{$_}[1]) . ")" : ()
		167	} sort { $a <=> $b } keys %{$self->{skill_info}}
		168	)
		169	) {
		170	my $msg = join " ", @diffs;
95	$self->{statusbox}->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)	171	$self->{statusbox}->add ($msg, group => "experience $msg", fg => [0.5, 1, 0.5, 0.8], timeout => 5);
96	if exists $self->{prev_exp} && $diff;
97	$self->{prev_exp} = $exp;
98	}	172	}
99		173
		174	if (
		175	my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
		176	) {
		177	my $msg = "<b>stat change</b>: " . (join " ", @diffs);
		178	$self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
		179	}
		180
100	::update_stats_window ($stats);	181	$self->update_stats_window ($stats, $prev);
		182
		183	$self->{prev_stats} = { %$stats };
		184	}
		185
		186	my %RES_TBL = (
		187	phys => CS_STAT_RES_PHYS,
		188	magic => CS_STAT_RES_MAG,
		189	fire => CS_STAT_RES_FIRE,
		190	elec => CS_STAT_RES_ELEC,
		191	cold => CS_STAT_RES_COLD,
		192	conf => CS_STAT_RES_CONF,
		193	acid => CS_STAT_RES_ACID,
		194	drain => CS_STAT_RES_DRAIN,
		195	ghit => CS_STAT_RES_GHOSTHIT,
		196	pois => CS_STAT_RES_POISON,
		197	slow => CS_STAT_RES_SLOW,
		198	para => CS_STAT_RES_PARA,
		199	tund => CS_STAT_TURN_UNDEAD,
		200	fear => CS_STAT_RES_FEAR,
		201	depl => CS_STAT_RES_DEPLETE,
		202	deat => CS_STAT_RES_DEATH,
		203	holyw => CS_STAT_RES_HOLYWORD,
		204	blind => CS_STAT_RES_BLIND,
		205	);
		206
		207	sub update_stats_window {
		208	my ($self, $stats, $prev) = @_;
		209
		210	# I love text protocols...
		211
		212	my $hp = $stats->{+CS_STAT_HP} * 1;
		213	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
		214	my $sp = $stats->{+CS_STAT_SP} * 1;
		215	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
		216	my $fo = $stats->{+CS_STAT_FOOD} * 1;
		217	my $fo_m = 999;
		218	my $gr = $stats->{+CS_STAT_GRACE} * 1;
		219	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
		220
		221	$::GAUGES->{hp} ->set_value ($hp, $hp_m);
		222	$::GAUGES->{mana} ->set_value ($sp, $sp_m);
		223	$::GAUGES->{food} ->set_value ($fo, $fo_m);
		224	$::GAUGES->{grace} ->set_value ($gr, $gr_m);
		225	$::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
		226	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
		227	my $rng = $stats->{+CS_STAT_RANGE};
		228	$rng =~ s/^Range: //; # thank you so much dear server
		229	$::GAUGES->{range} ->set_text ("Rng: " . $rng);
		230	my $title = $stats->{+CS_STAT_TITLE};
		231	$title =~ s/^Player: //;
		232	$::STATWIDS->{title} ->set_text ("Title: " . $title);
		233
		234	$::STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
		235	$::STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
		236	$::STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
		237	$::STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
		238	$::STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
		239	$::STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
		240	$::STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
		241	$::STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
		242	$::STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
		243	$::STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
		244	$::STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
		245	$::STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
		246	$::STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
		247
		248	$self->update_weight;
		249
		250	$::STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$RES_TBL{$_}})
		251	for keys %RES_TBL;
		252
		253	my $sktbl = $::STATWIDS->{skill_tbl};
		254	my @skills = keys %{ $self->{skill_info} };
		255
		256	if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
		257	$sktbl->clear;
		258
		259	$sktbl->add (0, 0, new CFClient::UI::Label text => "Experience", align => 1);
		260	$sktbl->add (1, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
		261	$sktbl->add (2, 0, new CFClient::UI::Label text => "Skill", expand => 1);
		262	$sktbl->add (3, 0, new CFClient::UI::Label text => "Experience", align => 1);
		263	$sktbl->add (4, 0, new CFClient::UI::Label text => "Lvl.", align => 1);
		264	$sktbl->add (5, 0, new CFClient::UI::Label text => "Skill", expand => 1);
		265
		266	my ($x, $y) = (0, 1);
		267	for (
		268	sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
		269	map [$_, $self->{skill_info}{$_}],
		270	grep exists $stats->{$_},
		271	@skills
		272	) {
		273	my ($idx, $name) = @$_;
		274
		275	$sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFClient::UI::Label
		276	text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0]);
		277	$sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFClient::UI::Label
		278	text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4);
		279	$sktbl->add ($x * 3 + 2, $y, new CFClient::UI::Label text => $name);
		280
		281	$x++ and ($x, $y) = (0, $y + 1);
		282	}
		283	}
		284
		285	for (grep exists $stats->{$_}, @skills) {
		286	$self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
		287	$self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
		288	}
101	}	289	}
102		290
103	sub user_send {	291	sub user_send {
104	my ($self, $command) = @_;	292	my ($self, $command) = @_;
105		293
…		…
107	push @{$self->{record}}, $command;	295	push @{$self->{record}}, $command;
108	}	296	}
109		297
110	$self->logprint ("send: ", $command);	298	$self->logprint ("send: ", $command);
111	$self->send_command ($command);	299	$self->send_command ($command);
112	::status $command;	300	::status ($command);
113	}	301	}
114		302
115	sub start_record {	303	sub start_record {
116	my ($self) = @_;	304	my ($self) = @_;
117		305
…		…
160		348
161	$self->flush_map;	349	$self->flush_map;
162	delete $self->{neigh_map};	350	delete $self->{neigh_map};
163		351
164	$self->{map}->clear;	352	$self->{map}->clear;
		353	delete $self->{map_widget}{magicmap};
165	}	354	}
166		355
167		356
168	sub load_map($$$) {	357	sub load_map($$$) {
169	my ($self, $hash, $x, $y) = @_;	358	my ($self, $hash, $x, $y) = @_;
…		…
344	undef	533	undef
345	};	534	};
346	}	535	}
347		536
348	sub face_update {	537	sub face_update {
349	my ($self, $facenum, $face) = @_;	538	my ($self, $facenum, $face, $changed) = @_;
350		539
351	$self->{tilecache}->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes	540	$self->{tilecache}->put ($face->{id} => $face->{image}) if $changed;
352		541
353	$self->set_texture ($face->{id} => delete $face->{image});	542	$self->set_texture ($face->{id} => delete $face->{image});
354	}	543	}
355		544
356	sub set_texture {	545	sub set_texture {
…		…
397	[0.11, 0.56, 1.00],	586	[0.11, 0.56, 1.00],
398	[0.93, 0.46, 0.00],	587	[0.93, 0.46, 0.00],
399	[0.18, 0.54, 0.34],	588	[0.18, 0.54, 0.34],
400	[0.56, 0.73, 0.56],	589	[0.56, 0.73, 0.56],
401	[0.80, 0.80, 0.80],	590	[0.80, 0.80, 0.80],
402	[0.55, 0.41, 0.13],	591	[0.75, 0.61, 0.20],
403	[0.99, 0.77, 0.26],	592	[0.99, 0.77, 0.26],
404	[0.74, 0.65, 0.41],	593	[0.74, 0.65, 0.41],
405	);	594	);
406		595
407	$self->logprint ("info: ", $text);	596	$self->logprint ("info: ", $text);
…		…
409	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];	598	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
410		599
411	# try to create single paragraphs of multiple lines sent by the server	600	# try to create single paragraphs of multiple lines sent by the server
412	$text =~ s/(?<=\S)\n(?=\w)/ /g;	601	$text =~ s/(?<=\S)\n(?=\w)/ /g;
413		602
414	$text = CFClient::UI::Label::escape $text;	603	$text = CFClient::asxml $text;
415	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;	604	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
416	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;	605	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
417		606
418	$self->{logview}->add_paragraph ($color[$color],	607	$self->{logview}->add_paragraph ({ fg => $color[$color], markup => $_ })
419	join "\n", map "$time $_", split /\n/, $text);	608	for map "<span foreground='#ffffff'>$time</span> $_", split /\n/, $text;
		609	$self->{logview}->scroll_to_bottom;
420		610
421	$self->{statusbox}->add ($text,	611	$self->{statusbox}->add ($text,
422	group => $text,	612	group => $text,
423	fg => $color[$color],	613	fg => $color[$color],
424	timeout => $color >= 2 ? 60 : 10,	614	timeout => $color >= 2 ? 60 : 10,
…		…
433	}	623	}
434		624
435	sub spell_add {	625	sub spell_add {
436	my ($self, $spell) = @_;	626	my ($self, $spell) = @_;
437		627
438	# try to create single paragraphs of multiple lines sent by the server	628	# try to create single paragraphs out of the multiple lines sent by the server
439	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;	629	$spell->{message} =~ s/(?<=\S)\n(?=\w)/ /g;
440	$spell->{message} =~ s/\n+$//;	630	$spell->{message} =~ s/\n+$//;
441	$spell->{message} \|\|= "Server did not provide a description for this spell.";	631	$spell->{message} \|\|= "Server did not provide a description for this spell.";
442		632
443	$::SETUP_SPELLS->add_spell ($spell);	633	$::SPELL_PAGE->add_spell ($spell);
444		634
445	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});	635	$self->{map_widget}->add_command ("invoke $spell->{name}", CFClient::asxml $spell->{message});
446	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});	636	$self->{map_widget}->add_command ("cast $spell->{name}", CFClient::asxml $spell->{message});
447	}	637	}
448		638
449	sub spell_delete {	639	sub spell_delete {
450	my ($self, $spell) = @_;	640	my ($self, $spell) = @_;
		641
451	$::SETUP_SPELLS->remove_spell ($spell);	642	$::SPELL_PAGE->remove_spell ($spell);
452	}	643	}
453		644
454	sub addme_success {	645	sub addme_success {
455	my ($self) = @_;	646	my ($self) = @_;
456		647
457	my $skill_help = CFClient::load_pod CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {	648	my $skill_help = CFClient::Pod::load CFClient::find_rcfile "pod/skill_help.pod", skill_help => 1, sub {
458	my ($pom) = @_;	649	my ($pom) = @_;
459		650
460	my %skill_help;	651	my %skill_help;
461		652
462	for my $head2 ($pom->head1->[3]->head2) {	653	for my $head2 ($pom->head1->[3]->head2) {
463	$skill_help{$head2->title} = CFClient::pod_to_pango $head2->content;	654	$skill_help{$head2->title} = CFClient::Pod::as_markup $head2->content;
464	}	655	}
465		656
466	\%skill_help	657	\%skill_help
467	};	658	};
468		659
469	for my $skill (values %{$self->{skill_info}}) {	660	for my $skill (values %{$self->{skill_info}}) {
470	$self->{map_widget}->add_command ("ready_skill $skill",	661	$self->{map_widget}->add_command ("ready_skill $skill",
471	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")	662	(CFClient::asxml "Ready the skill '$skill'\n\n")
472	. $skill_help->{$skill});	663	. $skill_help->{$skill});
473	$self->{map_widget}->add_command ("use_skill $skill",	664	$self->{map_widget}->add_command ("use_skill $skill",
474	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")	665	(CFClient::asxml "Immediately use the skill '$skill'\n\n")
475	. $skill_help->{$skill});	666	. $skill_help->{$skill});
476	}	667	}
477	}	668	}
478		669
479	sub eof {	670	sub eof {
…		…
504		695
505	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();	696	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
506		697
507	$self->send ("requestinfo image_sums $face $face");	698	$self->send ("requestinfo image_sums $face $face");
508		699
509	$self->{statusbox}->add (CFClient::UI::Label::escape "prefetching $todo",	700	$self->{statusbox}->add (CFClient::asxml "prefetching $todo",
510	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	701	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
511	} elsif (!exists $self->{num_faces}) {	702	} elsif (!exists $self->{num_faces}) {
512	$self->send ("requestinfo image_info");	703	$self->send ("requestinfo image_info");
513		704
514	$self->{num_faces} = 0;	705	$self->{num_faces} = 0;
515		706
516	$self->{statusbox}->add (CFClient::UI::Label::escape "starting to prefetch",	707	$self->{statusbox}->add (CFClient::asxml "starting to prefetch",
517	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);	708	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
518	}	709	}
519	}	710	}
520		711
521	sub update_floorbox {	712	sub update_floorbox {
522	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {	713	$CFClient::UI::ROOT->on_refresh ($::FLOORBOX => sub {
523	return unless $::CONN;	714	return unless $::CONN;
524		715
525	$::FLOORBOX->clear;	716	$::FLOORBOX->clear;
526		717
527	my $row;	718	my $row;
528	for (@{ $::CONN->{container}{0} }) {	719	for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} \|\| 0} }) {
529	if ($row < 6) {	720	if ($row < 6) {
530	local $_->{face_widget}; # hack to force recreation of widget	721	local $_->{face_widget}; # hack to force recreation of widget
531	local $_->{desc_widget}; # hack to force recreation of widget	722	local $_->{desc_widget}; # hack to force recreation of widget
532	CFClient::Item::update_widgets $_;	723	CFClient::Item::update_widgets $_;
533		724
…		…
536		727
537	$row++;	728	$row++;
538	} else {	729	} else {
539	$::FLOORBOX->add (1, $row, new CFClient::UI::Button	730	$::FLOORBOX->add (1, $row, new CFClient::UI::Button
540	text => "More...",	731	text => "More...",
541	on_activate => sub { $::INV_WINDOW->toggle_visibility },	732	on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
542	);	733	);
543	last;	734	last;
544	}	735	}
545	}	736	}
		737	if ($::CONN->{open_container}) {
		738	$::FLOORBOX->add (1, $row++, new CFClient::UI::Button
		739	text => "Close container",
		740	on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
		741	);
		742	}
546	});	743	});
547		744
548	$::WANT_REFRESH++;	745	$::WANT_REFRESH++;
549	}	746	}
550		747
551	sub set_opencont {	748	sub set_opencont {
552	my ($conn, $tag, $name) = @_;	749	my ($conn, $tag, $name) = @_;
553	$conn->{open_container} = $tag;	750	$conn->{open_container} = $tag;
		751	update_floorbox;
554		752
555	$::INV_RIGHT_HB->clear ();	753	$::INV_RIGHT_HB->clear ();
556	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);	754	$::INV_RIGHT_HB->add (new CFClient::UI::Label align => 0, expand => 1, text => $name);
557		755
558	if ($tag != 0) { # Floor isn't closable, is it?	756	if ($tag != 0) { # Floor isn't closable, is it?
…		…
561	tooltip => "Close the currently open container (if one is open)",	759	tooltip => "Close the currently open container (if one is open)",
562	on_activate => sub {	760	on_activate => sub {
563	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	761	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
564	if $tag != 0;	762	if $tag != 0;
565	#if $CONN->{open_container} != 0;	763	#if $CONN->{open_container} != 0;
		764	0
566	},	765	},
567	);	766	);
568	}	767	}
569		768
570	$::INVR->set_items ($conn->{container}{$tag});	769	$::INVR->set_items ($conn->{container}{$tag});
571	}	770	}
572		771
573	sub update_container {	772	sub update_containers {
574	my ($tag) = @_;	773	my ($self) = @_;
575		774
576	$::INVR->set_items ($::CONN->{container}{$::CONN->{open_container}})	775	$CFClient::UI::ROOT->on_refresh ("update_containers_$self" => sub {
		776	my $todo = delete $self->{update_container}
		777	or return;
		778
		779	for my $tag (keys %$todo) {
		780	update_floorbox if $tag == 0 or $tag == $self->{open_container};
		781	if ($tag == 0) {
		782	$::INVR->set_items ($self->{container}{0})
577	if $tag == $::CONN->{open_container};	783	if $tag == $self->{open_container};
		784	} elsif ($tag == $self->{player}{tag}) {
		785	$::INV->set_items ($self->{container}{$tag})
		786	} else {
		787	$::INVR->set_items ($self->{container}{$tag})
		788	if $tag == $self->{open_container};
		789	}
		790	}
		791	});
578	}	792	}
579		793
580	sub container_add {	794	sub container_add {
581	my ($self, $tag, $items) = @_;	795	my ($self, $tag, $items) = @_;
582		796
583	#d# print "container_add: container $tag ($self->{player}{tag})\n";	797	$self->{update_container}{$tag}++;
584		798	$self->update_containers;
585	if ($tag == 0) {
586	update_floorbox;
587	update_container (0);
588	} elsif ($tag == $self->{player}{tag}) {
589	$::INV->set_items ($self->{container}{$self->{player}{tag}})
590	} else {
591	update_container ($tag);
592	}
593
594	# $self-<{player}{tag} => player inv
595	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
596	}	799	}
597		800
598	sub container_clear {	801	sub container_clear {
599	my ($self, $tag) = @_;	802	my ($self, $tag) = @_;
600		803
601	#d# print "container_clear: container $tag ($self->{player}{tag})\n";	804	$self->{update_container}{$tag}++;
602		805	$self->update_containers;
603	if ($tag == 0) {
604	update_floorbox;
605	update_container (0);
606	} elsif ($tag == $self->{player}{tag}) {
607	$::INV->set_items ($self->{container}{$tag})
608	} else {
609	update_container ($tag);
610	}
611
612	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
613	}	806	}
614		807
615	sub item_delete {	808	sub item_delete {
616	my ($self, @items) = @_;	809	my ($self, @items) = @_;
617		810
		811	$self->{update_container}{$_->{container}}++
618	for (@items) {	812	for @items;
619	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
620
621	if ($_->{container} == 0) {
622	update_floorbox;
623	update_container ($_->{tag});
624	} elsif ($_->{container} == $self->{player}{tag}) {
625	$::INV->set_items ($self->{container}{$self->{player}{tag}})
626	} else {
627	update_container ($_->{container});
628	}
629	}	813
		814	$self->update_containers;
630	}	815	}
631		816
632	sub item_update {	817	sub item_update {
633	my ($self, $item) = @_;	818	my ($self, $item) = @_;
634		819
635	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";	820	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
636		821
637	if ($item->{tag} == $self->{player}{tag}) {
638	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
639	return;
640	}
641
642	CFClient::Item::update_widgets $item;	822	CFClient::Item::update_widgets $item;
643		823
644	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {	824	if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
645	set_opencont ($::CONN, 0, "Floor");	825	set_opencont ($::CONN, 0, "Floor");
646		826
647	} elsif ($item->{flags} & F_OPEN) {	827	} elsif ($item->{flags} & F_OPEN) {
648	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);	828	set_opencont ($::CONN, $item->{tag}, CFClient::Item::desc_string $item);
		829
649	} else {	830	} else {
650	if ($item->{container} == 0) {	831	$self->{update_container}{$item->{container}}++;
651	update_floorbox;
652	update_container (0);	832	$self->update_containers;
653	} elsif ($item->{container} == $self->{player}{tag}) {
654	$::INV->set_items ($self->{container}{$item->{container}})
655	}
656	}	833	}
657	}	834	}
658		835
659	sub player_update {	836	sub player_update {
660	my ($self, $player) = @_;	837	my ($self, $player) = @_;
661		838
		839	$self->update_weight;
		840	}
		841
		842	sub update_weight {
		843	my ($self) = @_;
		844
		845	my $weight = .001 * $self->{player}{weight};
		846	my $limit = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
		847
662	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $player->{weight} / 1000);	848	$::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
		849	$::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
		850	$::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
663	}	851	}
664		852
665	sub update_server_info {	853	sub update_server_info {
666	my ($self) = @_;	854	my ($self) = @_;
667		855
…		…
737	name => "npc_dialog",	925	name => "npc_dialog",
738	force_w => $::WIDTH * 0.7,	926	force_w => $::WIDTH * 0.7,
739	force_h => $::HEIGHT * 0.7,	927	force_h => $::HEIGHT * 0.7,
740	title => "NPC Dialog",	928	title => "NPC Dialog",
741	kw => { hi => 0, yes => 0, no => 0 },	929	kw => { hi => 0, yes => 0, no => 0 },
		930	has_close_button => 1,
742	@_,	931	@_,
743	);	932	);
744		933
745	Scalar::Util::weaken (my $this = $self);	934	Scalar::Util::weaken (my $this = $self);
		935
		936	$self->connect (delete => sub { $this->destroy; 1 });
746		937
747	# better use a pane...	938	# better use a pane...
748	$self->add (my $hbox = new CFClient::UI::HBox);	939	$self->add (my $hbox = new CFClient::UI::HBox);
749	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);	940	$hbox->add ($self->{textview} = new CFClient::UI::TextScroller expand => 1);
750		941
…		…
762		953
763	return unless $text =~ /\S/;	954	return unless $text =~ /\S/;
764		955
765	$entry->set_text ("");	956	$entry->set_text ("");
766	$this->send ($text);	957	$this->send ($text);
		958
		959	0
767	},	960	},
768	);	961	);
769		962
770	$vbox->add ($self->{options} = new CFClient::UI::VBox);	963	$vbox->add ($self->{options} = new CFClient::UI::VBox);
771		964
772	$self->{close_button} = new CFClient::UI::Button	965	$self->{bye_button} = new CFClient::UI::Button
773	text => "Bye (close)",	966	text => "Bye (close)",
774	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",	967	tooltip => "Use this button to end talking to the NPC. This also closes the dialog window.",
775	on_activate => sub { $this->destroy },	968	on_activate => sub { $this->destroy; 1 },
776	;	969	;
777		970
778	$self->update_options;	971	$self->update_options;
779		972
780	$self->{token} = $self->{conn}->ext_token;	973	$self->{token} = $self->{conn}->ext_token;
781	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });	974	$self->{conn}->connect_ext ($self->{token} => sub { $this->feed (@_) });
782	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");	975	$self->{conn}->send ("ext npc_dialog_begin $self->{token} $self->{dx} $self->{dy}");
783		976
784	$self->{entry}->focus_in;	977	$self->{entry}->grab_focus;
785		978
786	$self->{textview}->add_paragraph ([1, 1, 0, 1], "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n");	979	$self->{textview}->add_paragraph ({
		980	fg => [1, 1, 0, 1],
		981	markup => "<small>[starting conversation with <b>$self->{title}</b>]</small>\n\n",
		982	});
787		983
788	$self->show;	984	$self->show;
789	$self	985	$self
790	};	986	};
791		987
…		…
793	my ($self) = @_;	989	my ($self) = @_;
794		990
795	Scalar::Util::weaken $self;	991	Scalar::Util::weaken $self;
796		992
797	$self->{options}->clear;	993	$self->{options}->clear;
798	$self->{options}->add ($self->{close_button});	994	$self->{options}->add ($self->{bye_button});
799		995
800	for my $kw (sort keys %{ $self->{kw} }) {	996	for my $kw (sort keys %{ $self->{kw} }) {
801	$self->{options}->add (new CFClient::UI::Button	997	$self->{options}->add (new CFClient::UI::Button
802	text => $kw,	998	text => $kw,
803	on_activate => sub {	999	on_activate => sub {
804	$self->send ($kw);	1000	$self->send ($kw);
		1001	0
805	},	1002	},
806	);	1003	);
807	}	1004	}
808	}	1005	}
809		1006
810	sub feed {	1007	sub feed {
811	my ($self, $data) = @_;	1008	my ($self, $data) = @_;
812		1009
		1010	Scalar::Util::weaken $self;
		1011
813	my ($type, $msg) = split / /, $data, 2;	1012	my ($type, $msg) = split / /, $data, 2;
814		1013
815	if ($type eq "msg") {	1014	if ($type eq "msg") {
816	my ($msg, @kw) = split /\x00/, $msg;	1015	my ($msg, @kw) = split /\x00/, $msg;
		1016
		1017	utf8::decode $_ for ($msg, @kw);
		1018
817	$self->{kw}{$_} = 1 for @kw;	1019	$self->{kw}{$_} = 1 for @kw;
818		1020
819	$msg = CFClient::UI::Label::escape $msg;	1021	$msg = "\n" . CFClient::UI::asxml $msg;
820	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };	1022	my $match = join "\|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
821	$msg =~ s/($match)/<span foreground='#c0c0ff' underline='none'>$1<\/span>/gi; # underline when http-ready, huh.	1023	my @link;
		1024	$msg =~ s{
		1025	($match)
		1026	}{
		1027	my $kw = $1;
		1028
		1029	push @link, new CFClient::UI::Label
		1030	markup => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
		1031	can_hover => 1,
		1032	can_events => 1,
		1033	padding_x => 0,
		1034	padding_y => 0,
		1035	on_button_up => sub {
		1036	$self->send ($kw);
		1037	};
		1038
		1039	chr 0xfffc
		1040	}giex;
822		1041
823	$self->{textview}->add_paragraph ([1, 1, 1, 1], "\n$msg");	1042	$self->{textview}->add_paragraph ({ markup => $msg, widget => \@link });
		1043	$self->{textview}->scroll_to_bottom;
824	$self->update_options;	1044	$self->update_options;
825	} else {	1045	} else {
826	$self->destroy;	1046	$self->destroy;
827	}	1047	}
828		1048
…		…
830	}	1050	}
831		1051
832	sub send {	1052	sub send {
833	my ($self, $msg) = @_;	1053	my ($self, $msg) = @_;
834		1054
		1055	$self->{textview}->add_paragraph ({ markup => "\n" . CFClient::asxml $msg });
		1056	$self->{textview}->scroll_to_bottom;
		1057
		1058	utf8::encode $msg;
835	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");	1059	$self->{conn}->send ("ext npc_dialog_tell $self->{token} $msg");
836	$self->{textview}->add_paragraph ([1, 1, 0, 1], "\n" . CFClient::UI::Label::escape $msg);
837	}	1060	}
838		1061
839	sub destroy {	1062	sub destroy {
840	my ($self) = @_;	1063	my ($self) = @_;
841		1064
842	#Carp::cluck "debug\n";#d# #todo# enable: destroyx gets called twice because scalar keys {} is 1	1065	#Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
843		1066
		1067	$self->{conn}->send ("ext npc_dialog_end $self->{token}") if $self->{token};
844	delete $self->{conn}{npc_dialog};	1068	delete $self->{conn}{npc_dialog};
845	$self->{conn}->disconnect_ext ($self->{token});	1069	$self->{conn}->disconnect_ext ($self->{token});
846		1070
847	$self->SUPER::destroy;	1071	$self->SUPER::destroy;
848	}	1072	}
849		1073
850	1;	1074	1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.36 by root, Thu Jun 15 15:33:58 2006 UTC vs. Revision 1.67 by root, Mon Jul 24 08:23:28 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.36 by root, Thu Jun 15 15:33:58 2006 UTC vs.
Revision 1.67 by root, Mon Jul 24 08:23:28 2006 UTC