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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.212 by root, Sun Aug 12 13:09:44 2007 UTC vs.
Revision 1.227 by root, Sun Sep 2 09:48:42 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3# do splash-screen thingy on win32
3my $startup_done = sub { }; 4my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN { 5BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") { 6 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) { 7 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 8 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 } 9 }
… …
30# do things only needed for single-binary version (par) 28# do things only needed for single-binary version (par)
31BEGIN { 29BEGIN {
32 if (%PAR::LibCache) { 30 if (%PAR::LibCache) {
33 @INC = grep ref, @INC; # weed out all paths except pars loader refs 31 @INC = grep ref, @INC; # weed out all paths except pars loader refs
34 32
35 my $tmp = $ENV{PAR_TEMP}; 33 my $root = $ENV{PAR_TEMP};
36 34
37 while (my ($filename, $zip) = each %PAR::LibCache) { 35 while (my ($filename, $zip) = each %PAR::LibCache) {
38 for ($zip->memberNames) { 36 for ($zip->memberNames) {
39 next unless /^root\/(.*)/; 37 next unless /^root\/(.*)/;
40 $zip->extractMember ($_, "$tmp/$1") 38 $zip->extractMember ($_, "$root/$1")
41 unless -e "$tmp/$1"; 39 unless -e "$root/$1";
42 } 40 }
43 } 41 }
44 42
45 if ($^O eq "MSWin32") { 43 if ($^O eq "MSWin32") {
46 # relocatable 44 # pango is relocatable on win32
47 } else { 45 } else {
46 open my $fh, "<:perlio", "$root/pangoversion"
47 or die "pangoversion: $!";
48 my $PANGO = <$fh>;
48 # unix, need to patch pango rc file 49 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules" 50 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!"; 51 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/; 52 local $/;
52 my $rc = <$fh>; 53 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones 54 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
54 55
55 mkdir "$tmp/pango-modules"; 56 mkdir "$root/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules" 57 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!"; 58 or die "$root/pango-modules/pango.modules: $!";
58 print $fh $rc; 59 print $fh $rc;
59 60
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!"; 63 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n"; 64 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
64 } 65 }
65 66
66 unshift @INC, $tmp; 67 unshift @INC, $root;
67 } 68 }
68} 69}
69 70
70# need to do it again because that pile of garbage called PAR nukes it before main 71# need to do it again because that pile of garbage called PAR nukes it before main
71unshift @INC, $ENV{PAR_TEMP} 72unshift @INC, $ENV{PAR_TEMP}
… …
86use CFPlus::DB; 87use CFPlus::DB;
87use CFPlus::UI; 88use CFPlus::UI;
88use CFPlus::UI::Canvas; 89use CFPlus::UI::Canvas;
89use CFPlus::UI::Inventory; 90use CFPlus::UI::Inventory;
90use CFPlus::UI::SpellList; 91use CFPlus::UI::SpellList;
92use CFPlus::UI::Dockable;
91use CFPlus::UI::MessageWindow; 93use CFPlus::UI::MessageWindow;
94use CFPlus::UI::ChatView;
92use CFPlus::Pod; 95use CFPlus::Pod;
93use CFPlus::MapWidget; 96use CFPlus::MapWidget;
94use CFPlus::Macro; 97use CFPlus::Macro;
95 98
96$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 99$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
126our $FONT_FIXED; 129our $FONT_FIXED;
127 130
128our $MAP; 131our $MAP;
129our $MAPMAP; 132our $MAPMAP;
130our $MAPWIDGET; 133our $MAPWIDGET;
134our $COMPLETER;
131our $BUTTONBAR; 135our $BUTTONBAR;
132our $METASERVER; 136our $METASERVER;
133our $LOGIN_BUTTON; 137our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 138our $QUIT_DIALOG;
135our $HOST_ENTRY; 139our $HOST_ENTRY;
… …
146our $PL_WINDOW; 150our $PL_WINDOW;
147 151
148our $MUSIC_PLAYING_WIDGET; 152our $MUSIC_PLAYING_WIDGET;
149our $LICENSE_WIDGET; 153our $LICENSE_WIDGET;
150 154
155our $PICKUP_PAGE;
151our $INVENTORY_PAGE; 156our $INVENTORY_PAGE;
152our $STATS_PAGE; 157our $STATS_PAGE;
153our $SKILL_PAGE; 158our $SKILL_PAGE;
154our $SPELL_PAGE; 159our $SPELL_PAGE;
155our $SPELL_LIST; 160our $SPELL_LIST;
… …
167our $STATUSBOX; 172our $STATUSBOX;
168our $DEBUG_STATUS; 173our $DEBUG_STATUS;
169 174
170our $INV; 175our $INV;
171our $INVR; 176our $INVR;
172our $INV_RIGHT_HB; 177our $INVR_HB;
173
174our $PICKUP_CFG;
175 178
176############################################################################# 179#############################################################################
177 180
178sub status { 181sub status {
179 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 182 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
182sub debug { 185sub debug {
183 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
184} 187}
185 188
186sub message { 189sub message {
187 my ($para) = @_;
188 $MESSAGE_WINDOW->message ($para); 190 $MESSAGE_WINDOW->message (@_);
189} 191}
190 192
191############################################################################# 193#############################################################################
192#TODO: maybe move into own audio module... 194#TODO: maybe move into own audio module...
193 195
… …
230 $channel->set_position_r ($dx, $dy, 20); 232 $channel->set_position_r ($dx, $dy, 20);
231 $chunk->play ($channel); 233 $chunk->play ($channel);
232 } 234 }
233 } else { 235 } else {
234 # sound_meta not set means data is in flight either way 236 # sound_meta not set means data is in flight either way
235 my $meta = $CONN->{sound_meta}{$face} 237 my $meta = $CONN->{face}[$face]
236 or return; 238 or return;
237 239
240 $meta->{data}
241 or return;
242
238 # if its a jingle, play it as ambient music 243 # if its a jingle, play it as ambient music
239 if ($meta->{meta}{jingle}) { 244 if ($meta->{data}{jingle}) {
240 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 245 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
241 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 246 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
242 &audio_music_push ($face); 247 &audio_music_push ($face);
243 } 248 }
244 } else { 249 } else {
245 # fetch from database 250 # fetch from database
246 CFPlus::DB::get res_data => $meta->{name}, sub { 251 CFPlus::DB::get res_data => $meta->{name}, sub {
247 my $rwops = new CFPlus::RW $_[0]; 252 my $rwops = new CFPlus::RW $_[0];
248 my $chunk = new CFPlus::MixChunk $rwops 253 my $chunk = new CFPlus::MixChunk $rwops
249 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError; 254 or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
250 $chunk->volume (($meta->{meta}{volume} || 1) * 128); 255 $chunk->volume (($meta->{data}{volume} || 1) * 128);
251 $AUDIO_CHUNK{$face} = $chunk; 256 $AUDIO_CHUNK{$face} = $chunk;
252 257
253 audio_sound_push ($face); 258 audio_sound_push ($face);
254 }; 259 };
255 } 260 }
… …
273sub audio_music_set_meta { 278sub audio_music_set_meta {
274 my ($meta) = @_; 279 my ($meta) = @_;
275 280
276 $MUSIC_PLAYING_META = $meta; 281 $MUSIC_PLAYING_META = $meta;
277 $MUSIC_PLAYING_WIDGET->set_markup ( 282 $MUSIC_PLAYING_WIDGET->set_markup (
278 "<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n" 283 "<b>Name</b>: " . (CFPlus::asxml $meta->{data}{name}) . "\n"
279 . "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n" 284 . "<b>Author</b>: " . (CFPlus::asxml $meta->{data}{author}) . "\n"
280 . "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n" 285 . "<b>Source</b>: " . (CFPlus::asxml $meta->{data}{source}) . "\n"
281 . "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license}) 286 . "<b>License</b>: " . (CFPlus::asxml $meta->{data}{license})
282 ); 287 );
283} 288}
284 289
285sub audio_music_update_volume { 290sub audio_music_update_volume {
286 return unless $MUSIC_PLAYING_META; 291 return unless $MUSIC_PLAYING_META;
287 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1; 292 my $volume = $MUSIC_PLAYING_META->{data}{volume} || 1;
288 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume}; 293 my $base = $MUSIC_PLAYING_META->{data}{jingle} ? 1 : $CFG->{bgm_volume};
289 CFPlus::MixMusic::volume $base * $volume * 128; 294 CFPlus::MixMusic::volume $base * $volume * 128;
290} 295}
291 296
292sub audio_music_start { 297sub audio_music_start {
293 my $meta = $MUSIC_PLAYING_META; 298 my $meta = $MUSIC_PLAYING_META;
… …
312 317
313 my $NOW = time; 318 my $NOW = time;
314 319
315 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 320 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
316 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 321 my $pos = $MUSIC_PLAYING_META->{stop_pos};
317 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 322 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
318 $MUSIC_START = time - $pos; 323 $MUSIC_START = time - $pos;
319 } else { 324 } else {
320 $MUSIC_PLAYER->play (0); 325 $MUSIC_PLAYER->play (0);
321 $MUSIC_START = time; 326 $MUSIC_START = time;
322 } 327 }
… …
336 $fade_out = 333; 341 $fade_out = 333;
337 } else { 342 } else {
338 return unless $CFG->{bgm_enable}; 343 return unless $CFG->{bgm_enable};
339 344
340 my @have = 345 my @have =
341 grep $_, 346 grep $_ && $_->{data},
342 map $CONN->{music_meta}{$_}, 347 map $CONN->{face}[$_],
343 @$MUSIC_WANT; 348 @$MUSIC_WANT;
349
350 # randomize music a bit so that the order is not always the same
351 $_->{stop_time} ||= rand for @have;
344 352
345 @MUSIC_HAVE = @have 353 @MUSIC_HAVE = @have
346 if @have; 354 if @have;
347 355
348 # default MUSIC_HAVE == MUSIC_DEFAULT 356 # default MUSIC_HAVE == MUSIC_DEFAULT
349 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE; 357 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
350 $fade_out = 1000; 358 $fade_out = 700;
351 } 359 }
352 360
353 # if the currently playing song is acceptable, let it continue 361 # if the currently playing song is acceptable, let it continue
354 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 362 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
355 363
… …
364 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 372 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
365 373
366 # if the most recently-played piece played very recently, 374 # if the most recently-played piece played very recently,
367 # resume it, else choose the oldest piece for rotation. 375 # resume it, else choose the oldest piece for rotation.
368 audio_music_set_meta 376 audio_music_set_meta
369 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 377 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
370 ? $MUSIC_HAVE[-1] 378 ? $MUSIC_HAVE[-1]
371 : $MUSIC_HAVE[0]; 379 : $MUSIC_HAVE[0];
372 380
373 audio_music_start; 381 audio_music_start;
374 } 382 }
… …
380 $MUSIC_WANT = $songs; 388 $MUSIC_WANT = $songs;
381 audio_music_push; 389 audio_music_push;
382} 390}
383 391
384sub audio_music_finished { 392sub audio_music_finished {
393 if ($MUSIC_PLAYING_META) {
394 $MUSIC_PLAYING_META->{stop_time} = time;
395 }
396
385 # we compress multiple jingles of the same type 397 # we compress multiple jingles of the same type
386 shift @MUSIC_JINGLE 398 shift @MUSIC_JINGLE
387 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 399 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
388 400
389 $MUSIC_PLAYING_WIDGET->clear; 401 $MUSIC_PLAYING_WIDGET->clear;
… …
771 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 783 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
772 ); 784 );
773 785
774 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1"); 786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Force OpenGL 1.1");
775 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
776 state => $CFG->{opengl11}, 788 state => $CFG->{force_opengl11},
777 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in " 789 tooltip => "Limit CFPlus to use OpenGL 1.1 features only. This will normally result in "
778 . "higher memory usage and slower performance. It will, however, help tremendously on " 790 . "higher memory usage and slower performance. It will, however, help tremendously on "
779 . "cards that claim to support a feature but fall back to software rendering. " 791 . "cards that claim to support a feature but fall back to software rendering. "
780 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 792 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
781 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 793 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you "
782 . "experience extremely low framerates and your card should do better, try this option.</b>", 794 . "experience extremely low framerates and your card should do better, try this option.</b>",
783 on_changed => sub { my ($self, $value) = @_; $CFG->{opengl11} = $value; 0 } 795 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
796 );
797
798 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Compress Textures");
799 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
800 state => $CFG->{texture_compression},
801 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
802 . "will save a lot of memory and increase performance. The compression algorithm "
803 . "can differ form card to card, so your mileage may vary. This setting is ignored in "
804 . "forced OpenGL 1.1 mode.",
805 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
784 ); 806 );
785 807
786 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 808 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
787 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 809 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
788 state => $CFG->{fast}, 810 state => $CFG->{fast},
… …
910 expand => 1, state => $CFG->{bgm_enable}, 932 expand => 1, state => $CFG->{bgm_enable},
911 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 933 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
912 on_changed => sub { 934 on_changed => sub {
913 $CFG->{bgm_enable} = $_[1]; 935 $CFG->{bgm_enable} = $_[1];
914 $CONN->update_fx_want if $CONN; 936 $CONN->update_fx_want if $CONN;
937 audio_music_push;
915 0 938 0
916 } 939 }
917 ); 940 );
918 $table->add_at (2, $row++, new CFPlus::UI::Slider 941 $table->add_at (2, $row++, new CFPlus::UI::Slider
919 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 942 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
… …
972 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 995 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
973 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 996 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
974 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 997 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
975 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 998 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
976 999
977 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1000 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1001 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1002 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
978 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1003 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
979 1004
980 $GAUGES = { 1005 $GAUGES = {
1006 exp => $exp, prg => $prg, sklprg => $sklprg,
981 exp => $exp, win => $win, range => $rng, 1007 win => $win, range => $rng,
982 food => $fg, mana => $mg, hp => $hg, grace => $gg 1008 hp => $hg, mana => $mg, grace => $gg, food => $fg,
983 }; 1009 };
984 1010
985 &set_gauge_window_fontsize; 1011 &set_gauge_window_fontsize;
986 1012
987 $win 1013 $win
… …
1188 $r 1214 $r
1189} 1215}
1190 1216
1191sub skill_window { 1217sub skill_window {
1192 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1218 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1219
1193 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1220 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1221
1194 $sw 1222 $sw
1195} 1223}
1196 1224
1197sub formsep($) { 1225sub formsep($) {
1198 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1226 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1610 $sw1->add ($INV = new CFPlus::UI::Inventory); 1638 $sw1->add ($INV = new CFPlus::UI::Inventory);
1611 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1639 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1612 1640
1613 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1641 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1614 1642
1615 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1643 $vb2->add ($INVR_HB = new CFPlus::UI::HBox);
1616 1644
1617 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1645 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1618 $sw2->add ($INVR = new CFPlus::UI::Inventory); 1646 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1619 1647
1620 # XXX: Call after $INVR = ... because set_opencont sets the items 1648 # XXX: Call after $INVR = ... because set_opencont sets the items
… …
1643} 1671}
1644 1672
1645sub add_license { 1673sub add_license {
1646 my ($meta) = @_; 1674 my ($meta) = @_;
1647 1675
1648 $meta = $meta->{meta} 1676 $meta = $meta->{data}
1649 or return; 1677 or return;
1650 1678
1651 $meta->{license} || $meta->{author} || $meta->{source} 1679 $meta->{license} || $meta->{author} || $meta->{source}
1652 or return; 1680 or return;
1653 1681
… …
1707 $ntb->add_tab ( 1735 $ntb->add_tab (
1708 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1736 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1709 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1737 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1710 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1738 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1711 ); 1739 );
1712 $ntb->add_tab (Pickup => autopickup_setup, 1740 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1713 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1741 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1714 1742
1715 $ntb->add_tab (Media => media_window, 1743 $ntb->add_tab (Media => media_window,
1716 "License, Author and Source info for media sent by the server."); 1744 "License, Author and Source info for media sent by the server.");
1717 1745
… …
1875 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 1903 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1876 ); 1904 );
1877 $hb->add (new CFPlus::UI::Button 1905 $hb->add (new CFPlus::UI::Button
1878 text => "Quit anyway", 1906 text => "Quit anyway",
1879 expand => 1, 1907 expand => 1,
1880 on_activate => sub { exit }, 1908 on_activate => sub { Event::unloop_all },
1881 ); 1909 );
1882 } 1910 }
1883 1911
1884 $QUIT_DIALOG->show; 1912 $QUIT_DIALOG->show;
1885 $QUIT_DIALOG->grab_focus; 1913 $QUIT_DIALOG->grab_focus;
… …
1958 1986
1959 $SDL_ACTIVE = 1; 1987 $SDL_ACTIVE = 1;
1960 $LAST_REFRESH = time - 0.01; 1988 $LAST_REFRESH = time - 0.01;
1961 1989
1962 CFPlus::OpenGL::init; 1990 CFPlus::OpenGL::init;
1991 CFPlus::Macro::init;
1963 1992
1964 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1993 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1965 1994
1966 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1995 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1967 1996
1968 ############################################################################# 1997 #############################################################################
1969 1998
1970 if ($DEBUG_STATUS) { 1999 if ($DEBUG_STATUS) {
1971 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2000 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1972 } else { 2001 } else {
1973 # create the widgets 2002 # create/configure the widgets
2003
2004 $CFPlus::UI::ROOT->connect (key_down => sub {
2005 my (undef, $ev) = @_;
2006
2007 if (my @macros = CFPlus::Macro::find $ev) {
2008 CFPlus::Macro::execute $_ for @macros;
2009
2010 return 1;
2011 }
2012
2013 0
2014 });
1974 2015
1975 $DEBUG_STATUS = new CFPlus::UI::Label 2016 $DEBUG_STATUS = new CFPlus::UI::Label
1976 padding => 0, 2017 padding => 0,
1977 z => 100, 2018 z => 100,
1978 force_x => "max", 2019 force_x => "max",
… …
2008 $MESSAGE_WINDOW->activate_console ($preset) 2049 $MESSAGE_WINDOW->activate_console ($preset)
2009 if $MESSAGE_WINDOW; 2050 if $MESSAGE_WINDOW;
2010 }); 2051 });
2011 $MAPWIDGET->show; 2052 $MAPWIDGET->show;
2012 $MAPWIDGET->grab_focus; 2053 $MAPWIDGET->grab_focus;
2054
2055 $COMPLETER = new CFPlus::MapWidget::Command::
2056 command => { },
2057 tooltip => "#completer_help",
2058 ;
2013 2059
2014 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2060 $SETUP_DIALOG = new CFPlus::UI::Toplevel
2015 title => "Setup", 2061 title => "Setup",
2016 name => "setup_dialog", 2062 name => "setup_dialog",
2017 x => 'center', 2063 x => 'center',
… …
2079 tooltip => "Terminates the program", 2125 tooltip => "Terminates the program",
2080 on_activate => sub { 2126 on_activate => sub {
2081 if ($CONN) { 2127 if ($CONN) {
2082 open_quit_dialog; 2128 open_quit_dialog;
2083 } else { 2129 } else {
2084 exit; 2130 Event::unloop_all;
2085 } 2131 }
2086 0 2132 0
2087 }, 2133 },
2088 ); 2134 );
2089 2135
2090 $BUTTONBAR->show; 2136 $BUTTONBAR->show;
2091 $SETUP_DIALOG->show; 2137 $SETUP_DIALOG->show;
2138 $MESSAGE_WINDOW->show;
2092 } 2139 }
2093 2140
2094 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2141 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2095} 2142}
2096 2143
… …
2141 delete $animate_object{$widget}; 2188 delete $animate_object{$widget};
2142} 2189}
2143 2190
2144%SDL_CB = ( 2191%SDL_CB = (
2145 CFPlus::SDL_QUIT => sub { 2192 CFPlus::SDL_QUIT => sub {
2146 exit; 2193 Event::unloop_all;
2147 }, 2194 },
2148 CFPlus::SDL_VIDEORESIZE => sub { 2195 CFPlus::SDL_VIDEORESIZE => sub {
2149 }, 2196 },
2150 CFPlus::SDL_VIDEOEXPOSE => sub { 2197 CFPlus::SDL_VIDEOEXPOSE => sub {
2151 CFPlus::UI::full_refresh; 2198 CFPlus::UI::full_refresh;
… …
2190 CFPlus::DB::Server::run; 2237 CFPlus::DB::Server::run;
2191 2238
2192 CFPlus::UI::set_layout ($::CFG->{layout}); 2239 CFPlus::UI::set_layout ($::CFG->{layout});
2193 2240
2194 my %DEF_CFG = ( 2241 my %DEF_CFG = (
2195 sdl_mode => 0, 2242 sdl_mode => 0,
2196 fullscreen => 0, 2243 fullscreen => 0,
2197 fast => 0, 2244 fast => 0,
2198 opengl11 => 0, 2245 force_opengl11 => undef,
2246 texture_compression => 1,
2199 map_scale => 1, 2247 map_scale => 1,
2200 fow_enable => 1, 2248 fow_enable => 1,
2201 fow_intensity => 0, 2249 fow_intensity => 0,
2202 map_smoothing => 1, 2250 map_smoothing => 1,
2203 gui_fontsize => 1, 2251 gui_fontsize => 1,
2204 log_fontsize => 0.7, 2252 log_fontsize => 0.7,
2205 gauge_fontsize => 1, 2253 gauge_fontsize => 1,
2206 gauge_size => 0.35, 2254 gauge_size => 0.35,
2207 stat_fontsize => 0.7, 2255 stat_fontsize => 0.7,
2208 mapsize => 100, 2256 mapsize => 100,
2209 audio_enable => 1, 2257 audio_enable => 1,
2210 effects_enable => 1, 2258 effects_enable => 1,
2211 effects_volume => 1, 2259 effects_volume => 1,
2212 bgm_enable => 1, 2260 bgm_enable => 1,
2213 bgm_volume => 0.5, 2261 bgm_volume => 0.5,
2214 output_sync => 1, 2262 output_sync => 1,
2215 output_count => 1, 2263 output_count => 1,
2216 output_rate => "", 2264 output_rate => "",
2217 pickup => 0, 2265 pickup => 0,
2218 inv_sort => "mtime", 2266 inv_sort => "mtime",
2219 default => "profile", # default profile 2267 default => "profile", # default profile
2220 show_tips => 1, 2268 show_tips => 1,
2221 logview_max_par => 1000, 2269 logview_max_par => 1000,
2222 ); 2270 );
2223 2271
2224 while (my ($k, $v) = each %DEF_CFG) { 2272 while (my ($k, $v) = each %DEF_CFG) {
2225 $CFG->{$k} = $v unless exists $CFG->{$k}; 2273 $CFG->{$k} = $v unless exists $CFG->{$k};
2226 } 2274 }
… …
2283# } 2331# }
2284# my $t2 = Time::HiRes::time; 2332# my $t2 = Time::HiRes::time;
2285# warn $t2-$t1; 2333# warn $t2-$t1;
2286# } 2334# }
2287 2335
2288 $startup_done->();
2289
2290 video_init; 2336 video_init;
2291 audio_init; 2337 audio_init;
2292} 2338}
2293 2339
2294show_tip_of_the_day if $CFG->{show_tips}; 2340show_tip_of_the_day if $CFG->{show_tips};
2295 2341
2342Event->idle (cb => sub {
2343 $_[0]->w->cancel;
2344 $startup_done->();
2345});
2346
2296Event::loop; 2347Event::loop;
2348
2349#video_shutdown;
2350#audio_shutdown;
2297#CFPlus::SDL_Quit; 2351CFPlus::SDL_Quit;
2298#CFPlus::_exit 0;
2299
2300END {
2301 video_shutdown;
2302 audio_shutdown;
2303 CFPlus::SDL_Quit;
2304 CFPlus::DB::Server::stop; 2352CFPlus::DB::Server::stop;
2305}
2306 2353
2307=head1 NAME 2354=head1 NAME
2308 2355
2309cfplus - A Crossfire TRT and Crossfire game client 2356cfplus - A Crossfire TRT and Crossfire game client
2310 2357

Diff Legend

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