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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.68 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.91 by root, Wed Jun 7 06:28:28 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.68 by root, Thu May 25 21:48:22 2006 UTC vs. Revision 1.91 by root, Wed Jun 7 06:28:28 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.68 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.91 by root, Wed Jun 7 06:28:28 2006 UTC