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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC vs. Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.52 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.99 by elmex, Fri Jul 14 17:35:34 2006 UTC