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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.51 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.96 by root, Sun Jul 2 18:52:04 2006 UTC

…		…
19		19
20	use XSLoader;	20	use XSLoader;
21	XSLoader::load "CFClient", $VERSION;	21	XSLoader::load "CFClient", $VERSION;
22	}	22	}
23		23
		24	use utf8;
		25
24	use Carp ();	26	use Carp ();
25	use AnyEvent;	27	use AnyEvent ();
26	use BerkeleyDB;	28	use BerkeleyDB;
27	use CFClient::OpenGL;	29	use Pod::POM ();
		30	use Scalar::Util ();
		31	use Storable (); # finally
28		32
29	our %GL_EXT;	33	package CFClient::PodToPango;
30	our $GL_VERSION;
31		34
32	our $GL_NPOT;	35	use base Pod::POM::View::Text;
33	our $GL_DEBUG = 1;
34		36
35	sub gl_init {	37	our $VERSION = 1; # bump if resultant formatting changes
36	$GL_VERSION = gl_version * 1;
37	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
38		38
39	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;	39	our $indent = 0;
40		40
41	glDisable GL_COLOR_MATERIAL;	41	*view_seq_code =
42	glShadeModel GL_FLAT;	42	*view_seq_bold = sub { "<b>$_[1]</b>" };
43	glDisable GL_DITHER;	43	*view_seq_italic = sub { "<i>$_[1]</i>" };
44	glDisable GL_DEPTH_TEST;	44	*view_seq_space =
45	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;	45	*view_seq_link =
		46	*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
46		47
47	CFClient::Texture::restore_state ();	48	sub view_seq_text {
		49	my $text = $_[1];
		50	$text =~ s/\s+/ /g;
		51	CFClient::UI::Label::escape ($text)
48	}	52	}
49		53
50	sub gl_check {	54	sub view_item {
51	return unless $GL_DEBUG;	55	("\t" x ($indent / 4))
52		56	. $_[1]->title->present ($_[0])
53	if (my $error = glGetError) {	57	. "\n\n"
54	Carp::cluck sprintf "opengl error %x while %s", $error, sprintf @_;	58	. $_[1]->content->present ($_[0])
55	}
56	}	59	}
		60
		61	sub view_verbatim {
		62	(join "",
		63	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
		64	split /\n/, CFClient::UI::Label::escape ($_[1]))
		65	. "\n"
		66	}
		67
		68	sub view_textblock {
		69	("\t" x ($indent / 2)) . "$_[1]\n\n"
		70	}
		71
		72	sub view_head1 {
		73	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		74	. $_[1]->content->present ($_[0])
		75	};
		76
		77	sub view_head2 {
		78	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		79	. $_[1]->content->present ($_[0])
		80	};
		81
		82	sub view_head3 {
		83	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		84	. $_[1]->content->present ($_[0])
		85	};
		86
		87	sub view_over {
		88	local $indent = $indent + $_[1]->indent;
		89	$_[1]->content->present ($_[0])
		90	}
		91
		92	package CFClient::Database;
		93
		94	our @ISA = BerkeleyDB::Btree::;
		95
		96	sub get($$) {
		97	my $data;
		98
		99	$_[0]->db_get ($_[1], $data) == 0
		100	? $data
		101	: ()
		102	}
		103
		104	my %DB_SYNC;
		105
		106	sub put($$$) {
		107	my ($db, $key, $data) = @_;
		108
		109	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
		110
		111	$db->db_put ($key => $data)
		112	}
		113
		114	package CFClient;
57		115
58	sub find_rcfile($) {	116	sub find_rcfile($) {
59	my $path;	117	my $path;
60		118
61	for (grep !ref, @INC) {	119	for (grep !ref, @INC) {
…		…
96	}	154	}
97		155
98	close CFG;	156	close CFG;
99	}	157	}
100		158
		159	our $DB_ENV;
		160
		161	{
		162	use strict;
		163
101	mkdir "$Crossfire::VARDIR/pclient", 0777;	164	mkdir "$Crossfire::VARDIR/cfplus", 0777;
		165	my $recover = $BerkeleyDB::db_version >= 4.4
		166	? eval "DB_REGISTER \| DB_RECOVER"
		167	: 0;
102		168
103	our $DB_ENV = new BerkeleyDB::Env	169	$DB_ENV = new BerkeleyDB::Env
104	-Home => "$Crossfire::VARDIR/pclient",	170	-Home => "$Crossfire::VARDIR/cfplus",
105	-Cachesize => 1_000_000,	171	-Cachesize => 1_000_000,
106	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	172	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
107	# -ErrPrefix => "DATABASE",	173	# -ErrPrefix => "DATABASE",
108	-Verbose => 1,	174	-Verbose => 1,
109	-Flags => DB_CREATE \| DB_RECOVER_FATAL \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	175	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		176	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
110	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	177	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		178	}
111		179
112	sub db_table($) {	180	sub db_table($) {
113	my ($table) = @_;	181	my ($table) = @_;
114		182
115	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	183	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
116		184
117	new CFClient::Database	185	new CFClient::Database
118	-Env => $DB_ENV,	186	-Env => $DB_ENV,
119	-Filename => $table,	187	-Filename => $table,
120	# -Filename => "database",	188	# -Filename => "database",
121	# -Subname => $table,	189	# -Subname => $table,
122	-Property => DB_CHKSUM,	190	-Property => DB_CHKSUM,
123	-Flags => DB_CREATE \| DB_UPGRADE,	191	-Flags => DB_CREATE \| DB_UPGRADE,
124	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	192	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
125	}	193	}
126		194
		195	my $pod_cache = db_table "pod_cache";
		196
		197	sub load_pod($$$$) {
		198	my ($path, $filtertype, $filterversion, $filtercb) = @_;
		199
		200	stat $path
		201	or die "$path: $!";
		202
		203	my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
		204
		205	my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
		206
		207	return $pom if $chash eq $phash;
		208
		209	my $pod = do {
		210	local $/;
		211	open my $pod, "<:utf8", $_[0]
		212	or die "$_[0]: $!";
		213	<$pod>
		214	};
		215
		216	#utf8::downgrade $pod;
		217
		218	$pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
		219
		220	$pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
		221
		222	$pom
		223	}
		224
		225	sub pod_to_pango($) {
		226	my ($pom) = @_;
		227
		228	$pom->present ("CFClient::PodToPango")
		229	}
		230
		231	sub pod_to_pango_list($) {
		232	my ($pom) = @_;
		233
		234	[
		235	map s/^(\s)// && [40 length $1, length $_ ? $_ : " "],
		236	split /\n/, $pom->present ("CFClient::PodToPango")
		237	]
		238	}
		239
127	package CFClient::Database;	240	package CFClient::Item;
128
129	our @ISA = BerkeleyDB::Btree::;
130
131	sub get($$) {
132	my $data;
133
134	$_[0]->db_get ($_[1], $data) == 0
135	? $data
136	: ()
137	}
138
139	my %DB_SYNC;
140
141	sub put($$$) {
142	my ($db, $key, $data) = @_;
143
144	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
145
146	$db->db_put ($key => $data)
147	}
148
149	package CFClient::Texture;
150		241
151	use strict;	242	use strict;
		243	use Crossfire::Protocol::Constants;
152		244
153	use Scalar::Util;	245	my $last_enter_count = 1;
154		246
155	use CFClient::OpenGL;	247	sub desc_string {
156
157	my %TEXTURES;
158
159	sub new {
160	my ($class, %data) = @_;
161
162	my $self = bless {
163	internalformat => GL_RGBA,
164	format => GL_RGBA,
165	type => GL_UNSIGNED_BYTE,
166	%data,
167	}, $class;
168
169	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
170
171	$self->upload;
172
173	$self
174	}
175
176	sub new_from_image {
177	my ($class, $image, %arg) = @_;
178
179	$class->new (image => $image, %arg)
180	}
181
182	sub new_from_file {
183	my ($class, $path, %arg) = @_;
184
185	open my $fh, "<:raw", $path
186	or die "$path: $!";
187
188	local $/;
189	$class->new_from_image (<$fh>, %arg)
190	}
191
192	#sub new_from_surface {
193	# my ($class, $surface) = @_;
194	#
195	# $surface->rgba;
196	#
197	# $class->new (
198	# data => $surface->pixels,
199	# w => $surface->width,
200	# h => $surface->height,
201	# )
202	#}
203
204	sub new_from_layout {
205	my ($class, $layout, %arg) = @_;
206
207	my ($w, $h, $data, $format, $internalformat) = $layout->render;
208
209	$class->new (
210	w => $w,
211	h => $h,
212	data => $data,
213	format => $format,
214	internalformat => $format,
215	type => GL_UNSIGNED_BYTE,
216	%arg,
217	)
218	}
219
220	sub new_from_opengl {
221	my ($class, $w, $h, $cb) = @_;
222
223	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
224	}
225
226	sub topot {
227	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
228	}
229
230	sub upload {
231	my ($self) = @_;	248	my ($self) = @_;
232		249
233	return unless $GL_VERSION;	250	my $desc =
		251	$self->{nrof} < 2
		252	? $self->{name}
		253	: "$self->{nrof} × $self->{name_pl}";
234		254
235	my $data;	255	$self->{flags} & F_OPEN
		256	and $desc .= " (open)";
		257	$self->{flags} & F_APPLIED
		258	and $desc .= " (applied)";
		259	$self->{flags} & F_UNPAID
		260	and $desc .= " (unpaid)";
		261	$self->{flags} & F_MAGIC
		262	and $desc .= " (magic)";
		263	$self->{flags} & F_CURSED
		264	and $desc .= " (cursed)";
		265	$self->{flags} & F_DAMNED
		266	and $desc .= " (damned)";
		267	$self->{flags} & F_LOCKED
		268	and $desc .= " *";
236		269
237	if (exists $self->{data}) {	270	$desc
238	$data = $self->{data};	271	}
239		272
240	} elsif (exists $self->{render_cb}) {	273	sub weight_string {
241	glViewport 0, 0, $self->{w}, $self->{h};	274	my ($self) = @_;
242	glMatrixMode GL_PROJECTION;
243	glLoadIdentity;
244	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
245	glMatrixMode GL_MODELVIEW;
246	glLoadIdentity;
247	$self->{render_cb}->($self, $self->{w}, $self->{h});
248		275
249	} else {	276	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
250	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
251	= CFClient::load_image_inline $self->{image};
252	}
253		277
254	my ($tw, $th) = @$self{qw(w h)};	278	$weight < 0 ? "?" : $weight * 0.001
		279	}
255		280
256	unless ($tw > 0 && $th > 0) {	281	sub do_n_dialog {
257	$tw = $th = 1;	282	my ($cb) = @_;
258	$data = "\x00" x 64;
259	}
260		283
261	$self->{minified} = [CFClient::average $tw, $th, $data]	284	my $w = new CFClient::UI::FancyFrame;
262	if $self->{minify};	285	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
263		286	$vb->add (new CFClient::UI::Label text => "Enter item count:");
264	unless ($GL_NPOT) {	287	$vb->add (my $entry = new CFClient::UI::Entry
265	# TODO: does not work for zero-sized textures	288	text => $last_enter_count,
266	$tw = topot $tw;	289	on_activate => sub {
267	$th = topot $th;	290	my ($entry) = @_;
268		291	$last_enter_count = $entry->get_text;
269	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	292	$cb->($last_enter_count);
270	my $bpp = (length $data) / ($self->{w} * $self->{h});	293	$w->hide;
271	$data = pack "(a" . ($tw * $bpp) . ")*",	294	$w = undef;
272	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
273	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
274	}	295	}
		296	);
		297	$entry->grab_focus;
		298	$w->show;
		299
		300	}
		301
		302	sub update_widgets {
		303	my ($self) = @_;
		304
		305	# necessary to avoid cyclic references
		306	Scalar::Util::weaken $self;
		307
		308	my $button_cb = sub {
		309	my (undef, $ev, $x, $y) = @_;
		310
		311	my $targ = $::CONN->{player}{tag};
		312
		313	if ($self->{container} == $::CONN->{player}{tag}) {
		314	$targ = $::CONN->{open_container};
		315	}
		316
		317	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		318	$::CONN->send ("move $targ $self->{tag} 0")
		319	if $targ \|\| !($self->{flags} & F_LOCKED);
		320	} elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
		321	$self->{flags} & F_LOCKED
		322	? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
		323	: $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
		324	} elsif ($ev->{button} == 1) {
		325	$::CONN->send ("examine $self->{tag}");
		326	} elsif ($ev->{button} == 2) {
		327	$::CONN->send ("apply $self->{tag}");
		328	} elsif ($ev->{button} == 3) {
		329	my @menu_items = (
		330	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
		331	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		332	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
		333	(
		334	$self->{flags} & F_LOCKED
		335	? (
		336	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
		337	)
		338	: (
		339	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
		340	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		341	["move n",
		342	sub {
		343	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		344	}
		345	]
		346	)
		347	),
		348	);
		349
		350	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		351	}
		352
		353	1
275	}	354	};
276		355
277	$self->{s} = $self->{w} / $tw;	356	my $tooltip_std = "<small>"
278	$self->{t} = $self->{h} / $th;	357	. "Left click - examine item\n"
		358	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
		359	. "Middle click - apply\n"
		360	. "Shift-Middle click - lock/unlock\n"
		361	. "Right click - further options"
		362	. "</small>\n";
279		363
280	$self->{name} \|\|= glGenTexture;	364	$self->{face_widget} \|\|= new CFClient::UI::Face
281		365	can_events => 1,
282	glBindTexture GL_TEXTURE_2D, $self->{name};	366	can_hover => 1,
283		367	anim => $self->{anim},
284	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	368	animspeed => $self->{animspeed}, # TODO# must be set at creation time
285	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	369	on_button_down => $button_cb,
286
287	if ($::FAST) {
288	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
289	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
290	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
291	# alternatively check for 0x8191
292	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
293	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
294	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
295	} else {
296	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
297	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
298	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
299	}	370	;
		371	$self->{face_widget}{face} = $self->{face};
		372	$self->{face_widget}{anim} = $self->{anim};
		373	$self->{face_widget}{animspeed} = $self->{animspeed};
		374	$self->{face_widget}->set_tooltip (
		375	"<b>Face/Animation.</b>\n"
		376	. "Item uses face #$self->{face}. "
		377	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
		378	. "\n\n$tooltip_std"
		379	);
300		380
301	glGetError;	381	$self->{desc_widget} \|\|= new CFClient::UI::Label
302		382	can_events => 1,
303	if (defined $data) {	383	can_hover => 1,
304	glTexImage2D GL_TEXTURE_2D, 0,	384	ellipsise => 2,
305	$self->{internalformat},	385	align => -1,
306	$tw, $th, # need to pad texture first	386	on_button_down => $button_cb,
307	0,
308	$self->{format},
309	$self->{type},
310	$data;
311	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
312	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
313	} else {
314	glCopyTexImage2D GL_TEXTURE_2D, 0,
315	$self->{internalformat},
316	0, 0,
317	$tw, $th,
318	0;
319	CFClient::gl_check "copying to texture %dx%d if=%x",
320	$tw, $th, $self->{internalformat};
321	}	387	;
322	}	388	my $desc = CFClient::Item::desc_string $self;
		389	$self->{desc_widget}->set_text ($desc);
		390	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
323		391
324	sub DESTROY {	392	$self->{weight_widget} \|\|= new CFClient::UI::Label
325	my ($self) = @_;	393	can_events => 1,
		394	can_hover => 1,
		395	ellipsise => 0,
		396	align => 0,
		397	on_button_down => $button_cb,
		398	;
		399	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
326		400
327	delete $TEXTURES{$self+0};	401	$self->{weight_widget}->set_tooltip (
328		402	"<b>Weight</b>.\n"
329	glDeleteTexture delete $self->{name}	403	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
330	if $self->{name};	404	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
		405	. "\n\n$tooltip_std"
		406	);
331	}	407	}
332
333	sub restore_state{
334	$_->upload
335	for values %TEXTURES;
336	};
337		408
338	1;	409	1;
339		410
340	=back	411	=back
341		412

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.51 by root, Sun May 14 20:51:19 2006 UTC vs. Revision 1.96 by root, Sun Jul 2 18:52:04 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.51 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.96 by root, Sun Jul 2 18:52:04 2006 UTC