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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC.pm (file contents): Revision 1.65 by root, Thu May 25 21:18:09 2006 UTC vs. Revision 1.93 by root, Sun Jun 18 17:13:10 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.65 by root, Thu May 25 21:18:09 2006 UTC vs.
Revision 1.93 by root, Sun Jun 18 17:13:10 2006 UTC