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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.61 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.84 by elmex, Wed May 31 12:44:17 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;
27
28	use CFClient::OpenGL;
29
30	our %GL_EXT;
31	our $GL_VERSION;
32
33	our $GL_NPOT;
34	our $GL_DEBUG = 1;
35
36	sub gl_init {
37	$GL_VERSION = gl_version * 1;
38	%GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
39
40	$GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} \|\| $GL_VERSION >= 2;
41	$GL_NPOT = 0 if gl_vendor =~ /ATI Technologies/; # ATI doesn't get it right...
42
43	glDisable GL_COLOR_MATERIAL;
44	glShadeModel GL_FLAT;
45	glDisable GL_DITHER;
46	glDisable GL_DEPTH_TEST;
47	glDepthMask 0;
48	glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
49
50	CFClient::Texture::restore_state ();
51	}
52
53	sub gl_check {
54	return unless $GL_DEBUG;
55
56	if (my $error = glGetError) {
57	my ($format, @args) = @_;
58	Carp::cluck sprintf "opengl error %x while $format", $error, @args;
59	}
60	}
61		29
62	sub find_rcfile($) {	30	sub find_rcfile($) {
63	my $path;	31	my $path;
64		32
65	for (grep !ref, @INC) {	33	for (grep !ref, @INC) {
…		…
100	}	68	}
101		69
102	close CFG;	70	close CFG;
103	}	71	}
104		72
105	mkdir "$Crossfire::VARDIR/pclient", 0777;	73	mkdir "$Crossfire::VARDIR/cfplus", 0777;
106		74
		75	our $DB_ENV;
		76
		77	{
		78	use strict;
		79
		80	my $recover = $BerkeleyDB::db_version >= 4.4
		81	? eval "DB_REGISTER \| DB_RECOVER"
		82	: 0;
		83
107	our $DB_ENV = new BerkeleyDB::Env	84	$DB_ENV = new BerkeleyDB::Env
108	-Home => "$Crossfire::VARDIR/pclient",	85	-Home => "$Crossfire::VARDIR/cfplus",
109	-Cachesize => 1_000_000,	86	-Cachesize => 1_000_000,
110	-ErrFile => "$Crossfire::VARDIR/pclient/errorlog.txt",	87	-ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
111	# -ErrPrefix => "DATABASE",	88	# -ErrPrefix => "DATABASE",
112	-Verbose => 1,	89	-Verbose => 1,
113	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN,	90	-Flags => DB_CREATE \| DB_RECOVER \| DB_INIT_MPOOL \| DB_INIT_LOCK \| DB_INIT_TXN \| $recover,
		91	-SetFlags => DB_AUTO_COMMIT \| DB_LOG_AUTOREMOVE,
114	or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error";	92	or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
		93	}
115		94
116	sub db_table($) {	95	sub db_table($) {
117	my ($table) = @_;	96	my ($table) = @_;
118		97
119	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;	98	$table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
120		99
121	new CFClient::Database	100	new CFClient::Database
122	-Env => $DB_ENV,	101	-Env => $DB_ENV,
123	-Filename => $table,	102	-Filename => $table,
124	# -Filename => "database",	103	# -Filename => "database",
125	# -Subname => $table,	104	# -Subname => $table,
126	-Property => DB_CHKSUM,	105	-Property => DB_CHKSUM,
127	-Flags => DB_CREATE \| DB_UPGRADE,	106	-Flags => DB_CREATE \| DB_UPGRADE,
128	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error";	107	or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
129	}	108	}
130		109
131	sub pod_to_pango($) {	110	sub pod_to_pango($) {
132	my ($pom) = @_;	111	my ($pom) = @_;
133		112
…		…
169	. $_[1]->content->present ($_[0])	148	. $_[1]->content->present ($_[0])
170	}	149	}
171		150
172	sub view_verbatim {	151	sub view_verbatim {
173	(join "",	152	(join "",
174	map +("\t" x ($indent / 2)) . "$_\n",	153	map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
175	split /\n/, CFClient::UI::Label::escape ($_[1]))	154	split /\n/, CFClient::UI::Label::escape ($_[1]))
176	. "\n"	155	. "\n"
177	}	156	}
178		157
179	sub view_textblock {	158	sub view_textblock {
180	("\t" x ($indent / 2)) . "$_[1]\n\n"	159	("\t" x ($indent / 2)) . "$_[1]\n\n"
181	}	160	}
182		161
183	sub view_head1 {	162	sub view_head1 {
184	"<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"	163	"\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
185	. $_[1]->content->present ($_[0])	164	. $_[1]->content->present ($_[0])
186	};	165	};
187		166
188	sub view_head2 {	167	sub view_head2 {
189	"<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"	168	"\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
		169	. $_[1]->content->present ($_[0])
		170	};
		171
		172	sub view_head3 {
		173	"\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
190	. $_[1]->content->present ($_[0])	174	. $_[1]->content->present ($_[0])
191	};	175	};
192		176
193	sub view_over {	177	sub view_over {
194	local $indent = $indent + $_[1]->indent;	178	local $indent = $indent + $_[1]->indent;
…		…
215	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });	199	$DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
216		200
217	$db->db_put ($key => $data)	201	$db->db_put ($key => $data)
218	}	202	}
219		203
220	package CFClient::Texture;	204	package CFClient::Item;
221		205
222	use strict;	206	use strict;
		207	use Crossfire::Protocol::Constants;
223		208
224	use Scalar::Util;	209	my $last_enter_count = 1;
225		210
226	use CFClient::OpenGL;	211	sub desc_string {
227
228	my %TEXTURES;
229
230	sub new {
231	my ($class, %data) = @_;
232
233	my $self = bless {
234	internalformat => GL_RGBA,
235	format => GL_RGBA,
236	type => GL_UNSIGNED_BYTE,
237	%data,
238	}, $class;
239
240	Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
241
242	$self->upload;
243
244	$self
245	}
246
247	sub new_from_image {
248	my ($class, $image, %arg) = @_;
249
250	$class->new (image => $image, %arg)
251	}
252
253	sub new_from_file {
254	my ($class, $path, %arg) = @_;
255
256	open my $fh, "<:raw", $path
257	or die "$path: $!";
258
259	local $/;
260	$class->new_from_image (<$fh>, %arg)
261	}
262
263	#sub new_from_surface {
264	# my ($class, $surface) = @_;
265	#
266	# $surface->rgba;
267	#
268	# $class->new (
269	# data => $surface->pixels,
270	# w => $surface->width,
271	# h => $surface->height,
272	# )
273	#}
274
275	sub new_from_layout {
276	my ($class, $layout, %arg) = @_;
277
278	my ($w, $h, $data, $format, $internalformat) = $layout->render;
279
280	$class->new (
281	w => $w,
282	h => $h,
283	data => $data,
284	format => $format,
285	internalformat => $format,
286	type => GL_UNSIGNED_BYTE,
287	%arg,
288	)
289	}
290
291	sub new_from_opengl {
292	my ($class, $w, $h, $cb) = @_;
293
294	$class->new (w => $w \|\| 1, h => $h \|\| 1, render_cb => $cb)
295	}
296
297	sub topot {
298	(grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0]
299	}
300
301	sub upload {
302	my ($self) = @_;	212	my ($self) = @_;
303		213
304	return unless $GL_VERSION;	214	my $desc =
		215	$self->{nrof} < 2
		216	? $self->{name}
		217	: "$self->{nrof} × $self->{name_pl}";
305		218
306	my $data;	219	$self->{flags} & F_OPEN
		220	and $desc .= " (open)";
		221	$self->{flags} & F_APPLIED
		222	and $desc .= " (applied)";
		223	$self->{flags} & F_UNPAID
		224	and $desc .= " (unpaid)";
		225	$self->{flags} & F_MAGIC
		226	and $desc .= " (magic)";
		227	$self->{flags} & F_CURSED
		228	and $desc .= " (cursed)";
		229	$self->{flags} & F_DAMNED
		230	and $desc .= " (damned)";
		231	$self->{flags} & F_LOCKED
		232	and $desc .= " *";
307		233
308	if (exists $self->{data}) {	234	$desc
309	$data = $self->{data};	235	}
310		236
311	} elsif (exists $self->{render_cb}) {	237	sub weight_string {
312	glViewport 0, 0, $self->{w}, $self->{h};	238	my ($self) = @_;
313	glMatrixMode GL_PROJECTION;
314	glLoadIdentity;
315	glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
316	glMatrixMode GL_MODELVIEW;
317	glLoadIdentity;
318	$self->{render_cb}->($self, $self->{w}, $self->{h});
319		239
320	} else {	240	my $weight = ($self->{nrof} \|\| 1) * $self->{weight};
321	($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
322	= CFClient::load_image_inline $self->{image};
323	}
324		241
325	my ($tw, $th) = @$self{qw(w h)};	242	$weight < 0 ? "?" : $weight * 0.001
		243	}
326		244
327	unless ($tw > 0 && $th > 0) {	245	sub do_n_dialog {
328	$tw = $th = 1;	246	my ($cb) = @_;
329	$data = "\x00" x 64;
330	}
331		247
332	$self->{minified} = [CFClient::average $tw, $th, $data]	248	my $w = new CFClient::UI::FancyFrame;
333	if $self->{minify};	249	$w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
334		250	$vb->add (new CFClient::UI::Label text => "Enter item count:");
335	unless ($GL_NPOT) {	251	$vb->add (my $entry = new CFClient::UI::Entry
336	# TODO: does not work for zero-sized textures	252	text => $last_enter_count,
337	$tw = topot $tw;	253	on_activate => sub {
338	$th = topot $th;	254	my ($entry) = @_;
339		255	$last_enter_count = $entry->get_text;
340	if (($tw != $self->{w} \|\| $th != $self->{h}) && defined $data) {	256	$cb->($last_enter_count);
341	my $bpp = (length $data) / ($self->{w} * $self->{h});	257	$w->hide;
342	$data = pack "(a" . ($tw * $bpp) . ")*",	258	$w = undef;
343	unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
344	$data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
345	}	259	}
		260	);
		261	$entry->focus_in;
		262	$w->show;
		263
		264	}
		265
		266	sub update_widgets {
		267	my ($self) = @_;
		268
		269	my $button_cb = sub {
		270	my (undef, $ev, $x, $y) = @_;
		271
		272	my $targ = $::CONN->{player}{tag};
		273
		274	if ($self->{container} == $::CONN->{player}{tag}) {
		275	$targ = $::CONN->{open_container};
		276	}
		277
		278	if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
		279	$::CONN->send ("move $targ $self->{tag} 0")
		280	if $targ \|\| !($self->{flags} & F_LOCKED);
		281	} elsif ($ev->{button} == 1) {
		282	$::CONN->send ("examine $self->{tag}");
		283	} elsif ($ev->{button} == 2) {
		284	$::CONN->send ("apply $self->{tag}");
		285	} elsif ($ev->{button} == 3) {
		286	my @menu_items = (
		287	["examine", sub { $::CONN->send ("examine $self->{tag}") }],
		288	["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
		289	["apply", sub { $::CONN->send ("apply $self->{tag}") }],
		290	(
		291	$self->{flags} & F_LOCKED
		292	? (
		293	["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
		294	)
		295	: (
		296	["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
		297	["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
		298	["move n",
		299	sub {
		300	do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
		301	}
		302	]
		303	)
		304	),
		305	);
		306
		307	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
		308	}
		309
		310	1
346	}	311	};
347		312
348	$self->{s} = $self->{w} / $tw;	313	my $tooltip_std = "<small>"
349	$self->{t} = $self->{h} / $th;	314	. "Left click - examine item\n"
		315	. "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
		316	. "Middle click - apply\n"
		317	. "Right click - further options"
		318	. "</small>\n";
350		319
351	$self->{name} \|\|= glGenTexture;	320	$self->{face_widget} \|\|= new CFClient::UI::Face
352		321	can_events => 1,
353	glBindTexture GL_TEXTURE_2D, $self->{name};	322	can_hover => 1,
354		323	anim => $self->{anim},
355	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;	324	animspeed => $self->{animspeed}, # TODO# must be set at creation time
356	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;	325	on_button_down => $button_cb,
357
358	if ($::FAST) {
359	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
360	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
361	} elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
362	# alternatively check for 0x8191
363	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
364	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
365	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
366	} else {
367	glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
368	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
369	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
370	}	326	;
		327	$self->{face_widget}{face} = $self->{face};
		328	$self->{face_widget}{anim} = $self->{anim};
		329	$self->{face_widget}{animspeed} = $self->{animspeed};
		330	$self->{face_widget}->set_tooltip (
		331	"<b>Face/Animation.</b>\n"
		332	. "Item uses face #$self->{face}. "
		333	. ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
		334	. "\n\n$tooltip_std"
		335	);
371		336
372	glGetError;	337	$self->{desc_widget} \|\|= new CFClient::UI::Label
373		338	can_events => 1,
374	if (defined $data) {	339	can_hover => 1,
375	glTexImage2D GL_TEXTURE_2D, 0,	340	ellipsise => 2,
376	$self->{internalformat},	341	align => -1,
377	$tw, $th,	342	on_button_down => $button_cb,
378	0,
379	$self->{format},
380	$self->{type},
381	$data;
382	CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
383	$tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
384	} else {
385	glCopyTexImage2D GL_TEXTURE_2D, 0,
386	$self->{internalformat},
387	0, 0,
388	$tw, $th,
389	0;
390	CFClient::gl_check "copying to texture %dx%d if=%x",
391	$tw, $th, $self->{internalformat};
392	}	343	;
		344	my $desc = CFClient::Item::desc_string $self;
		345	$self->{desc_widget}->set_text ($desc);
		346	$self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
393		347
394	glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side	348	$self->{weight_widget} \|\|= new CFClient::UI::Label
395	}	349	can_events => 1,
		350	can_hover => 1,
		351	ellipsise => 0,
		352	align => 0,
		353	on_button_down => $button_cb,
		354	;
		355	$self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
396		356
397	sub DESTROY {	357	$self->{weight_widget}->set_tooltip (
		358	"<b>Weight</b>.\n"
		359	. ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
		360	. ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
		361	. "\n\n$tooltip_std"
		362	);
		363	}
		364
		365	package CFClient::Binder;
		366
		367	my @ALLOWED_MODIFIER_KEYS = (
		368	(CFClient::SDLK_LSHIFT),
		369	(CFClient::SDLK_LCTRL ),
		370	(CFClient::SDLK_LALT ),
		371	(CFClient::SDLK_LMETA ),
		372
		373	(CFClient::SDLK_RSHIFT),
		374	(CFClient::SDLK_RCTRL ),
		375	(CFClient::SDLK_RALT ),
		376	(CFClient::SDLK_RMETA ),
		377	);
		378
		379	my %ALLOWED_MODIFIERS = (
		380	(CFClient::KMOD_LSHIFT) => "LSHIFT",
		381	(CFClient::KMOD_LCTRL ) => "LCTRL",
		382	(CFClient::KMOD_LALT ) => "LALT",
		383	(CFClient::KMOD_LMETA ) => "LMETA",
		384
		385	(CFClient::KMOD_RSHIFT) => "RSHIFT",
		386	(CFClient::KMOD_RCTRL ) => "RCTRL",
		387	(CFClient::KMOD_RALT ) => "RALT",
		388	(CFClient::KMOD_RMETA ) => "RMETA",
		389	);
		390
		391	my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
		392	my @DIRECT_BIND_KEYS = (
		393	CFClient::SDLK_F1,
		394	CFClient::SDLK_F2,
		395	CFClient::SDLK_F3,
		396	CFClient::SDLK_F4,
		397	CFClient::SDLK_F5,
		398	CFClient::SDLK_F6,
		399	CFClient::SDLK_F7,
		400	CFClient::SDLK_F8,
		401	CFClient::SDLK_F9,
		402	CFClient::SDLK_F10,
		403	CFClient::SDLK_F11,
		404	CFClient::SDLK_F12,
		405	CFClient::SDLK_F13,
		406	CFClient::SDLK_F14,
		407	CFClient::SDLK_F15,
		408	);
		409
		410	# this binding dialog asks for a key-combo to be pressed
		411	# and if successful it calls the $cb with $mod and $sym as args.
		412	sub open_binding_dialog {
398	my ($self) = @_;	413	my ($cb) = @_;
399		414
400	delete $TEXTURES{$self+0};	415	my $w = new CFClient::UI::FancyFrame
		416	title => "Bind Action",
		417	x => "center",
		418	y => "center";
401		419
402	glDeleteTexture delete $self->{name}	420	$w->add (my $vb = new CFClient::UI::VBox);
403	if $self->{name};	421	$vb->add (new CFClient::UI::Label
404	}	422	text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
		423	."You can only bind 0-9 and F1-F15 without modifiers."
		424	);
		425	$vb->add (my $entry = new CFClient::UI::Entry
		426	text => "",
		427	on_key_down => sub {
		428	my ($entry, $ev) = @_;
405		429
406	sub restore_state {	430	my $mod = $ev->{mod};
407	$_->upload	431	my $sym = $ev->{sym};
408	for values %TEXTURES;	432
		433	# XXX: This seems a little bit hackisch to me, but i have to ignore them
		434	if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
		435	return;
		436	}
		437
		438	if ($mod == CFClient::KMOD_NONE
		439	and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
		440	and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
		441	{
		442	$::STATUSBOX->add (
		443	"Can't bind key ".CFClient::SDL_GetKeyName ($sym)
		444	." directly without modifier! It would damage the completer handling."
		445	);
		446	return;
		447	}
		448
		449	$entry->focus_out;
		450
		451	$cb->($mod, $sym);
		452
		453	$w->destroy
		454	});
		455
		456	$entry->focus_in;
		457	$w->show;
		458	}
		459
		460	sub keycombo_to_name {
		461	my ($mod, $sym) = @_;
		462
		463	my $mods = join '+',
		464	map { $ALLOWED_MODIFIERS{$_} }
		465	grep { ($_ + 0) & ($mod + 0) }
		466	keys %ALLOWED_MODIFIERS;
		467	$mods .= "+" if $mods ne '';
		468
		469	return $mods . CFClient::SDL_GetKeyName ($sym);
409	}	470	}
410		471
411	1;	472	1;
412		473
413	=back	474	=back

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.61 by root, Wed May 24 21:49:58 2006 UTC vs. Revision 1.84 by elmex, Wed May 31 12:44:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.61 by root, Wed May 24 21:49:58 2006 UTC vs.
Revision 1.84 by elmex, Wed May 31 12:44:17 2006 UTC