ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

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

… …
24use utf8; 24use utf8;
25 25
26use Carp (); 26use Carp ();
27use AnyEvent (); 27use AnyEvent ();
28use BerkeleyDB; 28use BerkeleyDB;
29use Pod::POM ();
30use Scalar::Util ();
31use Storable (); # finally
29 32
30use CFClient::OpenGL; 33package CFClient::PodToPango;
31 34
32our %GL_EXT; 35use base Pod::POM::View::Text;
33our $GL_VERSION;
34 36
35our $GL_NPOT; 37our $VERSION = 1; # bump if resultant formatting changes
36our $GL_DEBUG = 1;
37 38
38sub gl_init { 39our $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; 48sub 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
55sub gl_check { 54sub 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
61sub 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
68sub view_textblock {
69 ("\t" x ($indent / 2)) . "$_[1]\n\n"
70}
71
72sub 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
77sub view_head2 {
78 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
79 . $_[1]->content->present ($_[0])
80};
81
82sub view_head3 {
83 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
84 . $_[1]->content->present ($_[0])
85};
86
87sub view_over {
88 local $indent = $indent + $_[1]->indent;
89 $_[1]->content->present ($_[0])
90}
91
92package CFClient::Database;
93
94our @ISA = BerkeleyDB::Btree::;
95
96sub get($$) {
97 my $data;
98
99 $_[0]->db_get ($_[1], $data) == 0
100 ? $data
101 : ()
102}
103
104my %DB_SYNC;
105
106sub 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
114package CFClient;
63 115
64sub find_rcfile($) { 116sub 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
159our $DB_ENV;
160
161{
162 use strict;
163
107mkdir "$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
109our $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
118sub db_table($) { 180sub 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
195my $pod_cache = db_table "pod_cache";
196
197sub 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
133sub pod_to_pango($) { 225sub 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
148package CFClient::PodToPango;
149
150use base Pod::POM::View::Text;
151
152our $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
161sub view_seq_text {
162 my $text = $_[1];
163 $text =~ s/\s+/ /g;
164 CFClient::UI::Label::escape ($text)
165}
166
167sub view_item {
168 ("\t" x ($indent / 4))
169 . $_[1]->title->present ($_[0])
170 . "\n"
171 . $_[1]->content->present ($_[0])
172}
173
174sub view_verbatim {
175 (join "",
176 map +("\t" x ($indent / 2)) . "$_\n",
177 split /\n/, CFClient::UI::Label::escape ($_[1]))
178 . "\n"
179}
180
181sub view_textblock {
182 ("\t" x ($indent / 2)) . "$_[1]\n\n"
183}
184
185sub view_head1 {
186 "<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
187 . $_[1]->content->present ($_[0])
188};
189
190sub view_head2 {
191 "<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
192 . $_[1]->content->present ($_[0])
193};
194
195sub view_over {
196 local $indent = $indent + $_[1]->indent;
197 $_[1]->content->present ($_[0])
198}
199
200package CFClient::Database;
201
202our @ISA = BerkeleyDB::Btree::;
203
204sub get($$) {
205 my $data;
206
207 $_[0]->db_get ($_[1], $data) == 0
208 ? $data
209 : ()
210}
211
212my %DB_SYNC;
213
214sub 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
222package CFClient::Item; 240package CFClient::Item;
241
242use strict;
243use Crossfire::Protocol::Constants;
244
245my $last_enter_count = 1;
223 246
224sub desc_string { 247sub 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
281sub 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
258sub update_widgets { 302sub update_widgets {
259 my ($self) = @_; 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
354 };
260 355
261 my $tooltip_std = "<small>" 356 my $tooltip_std = "<small>"
262 . "Left click - examine item\n" 357 . "Left click - examine item\n"
263 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n" 358 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
264 . "Middle click - apply\n" 359 . "Middle click - apply\n"
360 . "Shift-Middle click - lock/unlock\n"
265 . "Right click - further options" 361 . "Right click - further options"
266 . "</small>\n"; 362 . "</small>\n";
267 363
268 $self->{face_widget} ||= new CFClient::UI::Face can_events => 1, can_hover => 1; 364 $self->{face_widget} ||= new CFClient::UI::Face
365 can_events => 1,
366 can_hover => 1,
367 anim => $self->{anim},
368 animspeed => $self->{animspeed}, # TODO# must be set at creation time
369 on_button_down => $button_cb,
370 ;
269 $self->{face_widget}{face} = $self->{face}; 371 $self->{face_widget}{face} = $self->{face};
270 $self->{face_widget}{anim} = $self->{anim}; 372 $self->{face_widget}{anim} = $self->{anim};
271 $self->{face_widget}{animspeed} = $self->{animespeed}; 373 $self->{face_widget}{animspeed} = $self->{animspeed};
272 $self->{face_widget}->set_tooltip ( 374 $self->{face_widget}->set_tooltip (
273 "<b>Face/Animation.</b>\n" 375 "<b>Face/Animation.</b>\n"
274 . "Item uses face #$self->{face}. " 376 . "Item uses face #$self->{face}. "
275 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 377 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
276 . "\n\n$tooltip_std" 378 . "\n\n$tooltip_std"
277 ); 379 );
278 380
279 $self->{desc_widget} ||= new CFClient::UI::Label ellipsise => 2, can_events => 1, can_hover => 1; 381 $self->{desc_widget} ||= new CFClient::UI::Label
280 $self->{desc_widget}->set_text (CFClient::Item::desc_string $self); 382 can_events => 1,
383 can_hover => 1,
384 ellipsise => 2,
385 align => -1,
386 on_button_down => $button_cb,
387 ;
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");
281 391
282 $self->{weight_widget} ||= new CFClient::UI::Label ellipsise => 0, can_events => 1, can_hover => 1, align => 0.5; 392 $self->{weight_widget} ||= new CFClient::UI::Label
393 can_events => 1,
394 can_hover => 1,
395 ellipsise => 0,
396 align => 0,
397 on_button_down => $button_cb,
398 ;
283 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 399 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
284 400
285 $self->{weight_widget}->set_tooltip ( 401 $self->{weight_widget}->set_tooltip (
286 "<b>Weight</b>.\n" 402 "<b>Weight</b>.\n"
287 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 403 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
288 . ($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. ")
289 . "\n\n$tooltip_std" 405 . "\n\n$tooltip_std"
290 ); 406 );
291} 407}
292 408
293package CFClient::Texture; 409package CFClient::Binder;
294 410
295use strict; 411my @ALLOWED_MODIFIER_KEYS = (
412 CFClient::SDLK_LSHIFT,
413 CFClient::SDLK_LCTRL ,
414 CFClient::SDLK_LALT ,
415 CFClient::SDLK_LMETA ,
296 416
297use Scalar::Util; 417 CFClient::SDLK_RSHIFT,
418 CFClient::SDLK_RCTRL ,
419 CFClient::SDLK_RALT ,
420 CFClient::SDLK_RMETA ,
421);
298 422
299use CFClient::OpenGL; 423my %ALLOWED_MODIFIERS = (
424 CFClient::KMOD_LSHIFT => "LSHIFT",
425 CFClient::KMOD_LCTRL => "LCTRL",
426 CFClient::KMOD_LALT => "LALT",
427 CFClient::KMOD_LMETA => "LMETA",
300 428
301my %TEXTURES; 429 CFClient::KMOD_RSHIFT => "RSHIFT",
430 CFClient::KMOD_RCTRL => "RCTRL",
431 CFClient::KMOD_RALT => "RALT",
432 CFClient::KMOD_RMETA => "RMETA",
433);
302 434
303sub new { 435my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
304 my ($class, %data) = @_; 436my @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);
305 453
306 my $self = bless { 454# this binding dialog asks for a key-combo to be pressed
307 internalformat => GL_RGBA, 455# and if successful it calls the $cb with $mod and $sym as args.
308 format => GL_RGBA, 456sub open_binding_dialog {
309 type => GL_UNSIGNED_BYTE, 457 my ($cb) = @_;
310 %data,
311 }, $class;
312 458
313 Scalar::Util::weaken ($TEXTURES{$self+0} = $self); 459 my $w = new CFClient::UI::FancyFrame
460 title => "Bind Action",
461 x => "center",
462 y => "center";
314 463
315 $self->upload; 464 $w->add (my $vb = new CFClient::UI::VBox);
316 465 $vb->add (new CFClient::UI::Label
317 $self 466 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
318} 467 ."You can only bind 0-9 and F1-F15 without modifiers."
319
320sub new_from_image {
321 my ($class, $image, %arg) = @_;
322
323 $class->new (image => $image, %arg)
324}
325
326sub new_from_file {
327 my ($class, $path, %arg) = @_;
328
329 open my $fh, "<:raw", $path
330 or die "$path: $!";
331
332 local $/;
333 $class->new_from_image (<$fh>, %arg)
334}
335
336#sub new_from_surface {
337# my ($class, $surface) = @_;
338#
339# $surface->rgba;
340#
341# $class->new (
342# data => $surface->pixels,
343# w => $surface->width,
344# h => $surface->height,
345# )
346#}
347
348sub new_from_layout {
349 my ($class, $layout, %arg) = @_;
350
351 my ($w, $h, $data, $format, $internalformat) = $layout->render;
352
353 $class->new (
354 w => $w,
355 h => $h,
356 data => $data,
357 format => $format,
358 internalformat => $format,
359 type => GL_UNSIGNED_BYTE,
360 %arg,
361 ) 468 );
362} 469 $vb->add (my $entry = new CFClient::UI::Entry
470 text => "",
471 on_key_down => sub {
472 my ($entry, $ev) = @_;
363 473
364sub new_from_opengl { 474 my $mod = $ev->{mod};
365 my ($class, $w, $h, $cb) = @_; 475 my $sym = $ev->{sym};
366 476
367 $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
368} 478 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
479 return;
480 }
369 481
370sub topot { 482 if ($mod == CFClient::KMOD_NONE
371 (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})}
372} 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 }
373 492
374sub upload { 493 $entry->grab_focus;
375 my ($self) = @_;
376 494
377 return unless $GL_VERSION; 495 $cb->($mod, $sym);
378 496
379 my $data; 497 $w->destroy
380
381 if (exists $self->{data}) {
382 $data = $self->{data};
383
384 } elsif (exists $self->{render_cb}) {
385 glViewport 0, 0, $self->{w}, $self->{h};
386 glMatrixMode GL_PROJECTION;
387 glLoadIdentity;
388 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
389 glMatrixMode GL_MODELVIEW;
390 glLoadIdentity;
391 $self->{render_cb}->($self, $self->{w}, $self->{h});
392
393 } else {
394 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type})
395 = CFClient::load_image_inline $self->{image};
396 }
397
398 my ($tw, $th) = @$self{qw(w h)};
399
400 unless ($tw > 0 && $th > 0) {
401 $tw = $th = 1;
402 $data = "\x00" x 64;
403 }
404
405 $self->{minified} = [CFClient::average $tw, $th, $data]
406 if $self->{minify};
407
408 unless ($GL_NPOT) {
409 # TODO: does not work for zero-sized textures
410 $tw = topot $tw;
411 $th = topot $th;
412
413 if (($tw != $self->{w} || $th != $self->{h}) && defined $data) {
414 my $bpp = (length $data) / ($self->{w} * $self->{h});
415 $data = pack "(a" . ($tw * $bpp) . ")*",
416 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
417 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
418 } 498 });
419 }
420 499
421 $self->{s} = $self->{w} / $tw; 500 $entry->grab_focus;
422 $self->{t} = $self->{h} / $th; 501 $w->show;
423
424 $self->{name} ||= glGenTexture;
425
426 glBindTexture GL_TEXTURE_2D, $self->{name};
427
428 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
429 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
430
431 if ($::FAST) {
432 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST;
433 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST;
434 } elsif ($self->{mipmap} && $GL_VERSION >= 1.4) {
435 # alternatively check for 0x8191
436 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, 1;
437 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
438 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR;
439 } else {
440 glTexParameter GL_TEXTURE_2D, GL_GENERATE_MIPMAP, $self->{mipmap};
441 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
442 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR;
443 }
444
445 glGetError;
446
447 if (defined $data) {
448 glTexImage2D GL_TEXTURE_2D, 0,
449 $self->{internalformat},
450 $tw, $th,
451 0,
452 $self->{format},
453 $self->{type},
454 $data;
455 CFClient::gl_check "uploading texture %dx%d if=%x f=%x t=%x",
456 $tw, $th, $self->{internalformat}, $self->{format}, $self->{type};
457 } else {
458 glCopyTexImage2D GL_TEXTURE_2D, 0,
459 $self->{internalformat},
460 0, 0,
461 $tw, $th,
462 0;
463 CFClient::gl_check "copying to texture %dx%d if=%x",
464 $tw, $th, $self->{internalformat};
465 }
466
467 glBindTexture GL_TEXTURE_2D, 0; # just to be on the safe side
468} 502}
469 503
470sub DESTROY { 504sub keycombo_to_name {
471 my ($self) = @_; 505 my ($mod, $sym) = @_;
472 506
473 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 '';
474 512
475 glDeleteTexture delete $self->{name} 513 return $mods . CFClient::SDL_GetKeyName ($sym);
476 if $self->{name};
477}
478
479sub restore_state {
480 $_->upload
481 for values %TEXTURES;
482} 514}
483 515
4841; 5161;
485 517
486=back 518=back

Diff Legend

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