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.219 by root, Tue Aug 21 00:59:34 2007 UTC vs.
Revision 1.229 by root, Mon Oct 8 17:01:03 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;
… …
180sub debug { 185sub debug {
181 $DEBUG_STATUS->set_text ($_[0]); 186 $DEBUG_STATUS->set_text ($_[0]);
182} 187}
183 188
184sub message { 189sub message {
185 my ($para) = @_;
186 $MESSAGE_WINDOW->message ($para); 190 $MESSAGE_WINDOW->message (@_);
187} 191}
188 192
189############################################################################# 193#############################################################################
190#TODO: maybe move into own audio module... 194#TODO: maybe move into own audio module...
191 195
… …
313 317
314 my $NOW = time; 318 my $NOW = time;
315 319
316 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 320 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
317 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 321 my $pos = $MUSIC_PLAYING_META->{stop_pos};
318 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos); 322 $MUSIC_PLAYER->fade_in_pos (0, 700, $pos);
319 $MUSIC_START = time - $pos; 323 $MUSIC_START = time - $pos;
320 } else { 324 } else {
321 $MUSIC_PLAYER->play (0); 325 $MUSIC_PLAYER->play (0);
322 $MUSIC_START = time; 326 $MUSIC_START = time;
323 } 327 }
… …
341 my @have = 345 my @have =
342 grep $_ && $_->{data}, 346 grep $_ && $_->{data},
343 map $CONN->{face}[$_], 347 map $CONN->{face}[$_],
344 @$MUSIC_WANT; 348 @$MUSIC_WANT;
345 349
350 # randomize music a bit so that the order is not always the same
351 $_->{stop_time} ||= rand for @have;
352
346 @MUSIC_HAVE = @have 353 @MUSIC_HAVE = @have
347 if @have; 354 if @have;
348 355
349 # default MUSIC_HAVE == MUSIC_DEFAULT 356 # default MUSIC_HAVE == MUSIC_DEFAULT
350 @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;
351 $fade_out = 1000; 358 $fade_out = 700;
352 } 359 }
353 360
354 # if the currently playing song is acceptable, let it continue 361 # if the currently playing song is acceptable, let it continue
355 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE; 362 return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
356 363
… …
365 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE; 372 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
366 373
367 # if the most recently-played piece played very recently, 374 # if the most recently-played piece played very recently,
368 # resume it, else choose the oldest piece for rotation. 375 # resume it, else choose the oldest piece for rotation.
369 audio_music_set_meta 376 audio_music_set_meta
370 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME 377 $MUSIC_HAVE[-1]{stop_pos} && $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
371 ? $MUSIC_HAVE[-1] 378 ? $MUSIC_HAVE[-1]
372 : $MUSIC_HAVE[0]; 379 : $MUSIC_HAVE[0];
373 380
374 audio_music_start; 381 audio_music_start;
375 } 382 }
… …
381 $MUSIC_WANT = $songs; 388 $MUSIC_WANT = $songs;
382 audio_music_push; 389 audio_music_push;
383} 390}
384 391
385sub audio_music_finished { 392sub audio_music_finished {
393 if ($MUSIC_PLAYING_META) {
394 $MUSIC_PLAYING_META->{stop_time} = time;
395 }
396
386 # we compress multiple jingles of the same type 397 # we compress multiple jingles of the same type
387 shift @MUSIC_JINGLE 398 shift @MUSIC_JINGLE
388 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0]; 399 while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
389 400
390 $MUSIC_PLAYING_WIDGET->clear; 401 $MUSIC_PLAYING_WIDGET->clear;
… …
397} 408}
398 409
399sub audio_init { 410sub audio_init {
400 if ($CFG->{audio_enable}) { 411 if ($CFG->{audio_enable}) {
401 $ENV{MIX_EFFECTSMAXSPEED} = 1; 412 $ENV{MIX_EFFECTSMAXSPEED} = 1;
402 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 413 $SDL_MIXER = !CFPlus::Mix_OpenAudio
414 $CFG->{audio_hw_frequency},
415 CFPlus::MIX_DEFAULT_FORMAT,
416 $CFG->{audio_hw_channels},
417 $CFG->{audio_hw_chunksize};
403 418
404 unless ($SDL_MIXER) { 419 if ($SDL_MIXER) {
420 CFPlus::Mix_AllocateChannels $CFG->{audio_mix_channels};
421
422 audio_music_finished;
423 } else {
405 status "Unable to open sound device: there will be no sound"; 424 status "Unable to open sound device: there will be no sound";
406 return;
407 } 425 }
408
409 CFPlus::Mix_AllocateChannels 16;
410
411 audio_music_finished;
412 } else { 426 } else {
413 undef $SDL_MIXER; 427 undef $SDL_MIXER;
414 } 428 }
429
430 sub audio_tab_update;
431 audio_tab_update;
415} 432}
416 433
417sub audio_shutdown { 434sub audio_shutdown {
418 undef $MUSIC_PLAYER; 435 undef $MUSIC_PLAYER;
419 undef $MUSIC_PLAYING_META; 436 undef $MUSIC_PLAYING_META;
… …
879 ); 896 );
880 897
881 $vbox 898 $vbox
882} 899}
883 900
901our $AUDIO_HW_CHUNKSIZE;
902our $AUDIO_INFO;
903
904sub audio_tab_update {
905 my ($freq, $format, $chans) = CFPlus::Mix_QuerySpec;
906
907 $AUDIO_HW_CHUNKSIZE->set_options ([
908 [0, "default", "system default"],
909 map {
910 my $ms = sprintf "%dms", 1000 * $_ / $CFG->{audio_hw_frequency};
911 [$_, $ms, "$ms ($_ samples)"],
912 } 256, 512, 1024, 2048, 4096, 8192, 16384, 32768
913 ]);
914
915 my $text = !$freq
916 ? "audio is off"
917 : "Frequency (Hz): $freq\n"
918 . "Channels: $chans";
919
920 $AUDIO_INFO->set_text ($text);
921}
922
884sub audio_setup { 923sub audio_setup {
885 my $vbox = new CFPlus::UI::VBox; 924 my $vbox = new CFPlus::UI::VBox;
886 925
887 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]); 926 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
888 927
… …
890 929
891 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 930 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
892 $table->add_at (1, $row++, new CFPlus::UI::CheckBox 931 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
893 state => $CFG->{audio_enable}, 932 state => $CFG->{audio_enable},
894 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 933 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
895 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 934 on_changed => sub { $CFG->{audio_enable} = $_[1]; 1 }
896 ); 935 );
897# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
898# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
899# $CFG->{effects_volume} = $_[1];
900# });
901 936
902 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects"); 937 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
903 $table->add_at (1, $row, new CFPlus::UI::CheckBox 938 $table->add_at (1, $row, new CFPlus::UI::CheckBox
904 expand => 1, state => $CFG->{effects_enable}, 939 expand => 1, state => $CFG->{effects_enable},
905 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.", 940 tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
906 on_changed => sub { 941 on_changed => sub {
907 $CFG->{effects_enable} = $_[1]; 942 $CFG->{effects_enable} = $_[1];
908 $CONN->update_fx_want if $CONN; 943 $CONN->update_fx_want if $CONN;
909 0 944 1
910 } 945 }
911 ); 946 );
912 $table->add_at (2, $row++, new CFPlus::UI::Slider 947 $table->add_at (2, $row++, new CFPlus::UI::Slider
913 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128], 948 expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
914 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this " 949 tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
915 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.", 950 . "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
916 on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 } 951 on_changed => sub { $CFG->{effects_volume} = $_[1]; 1 }
917 ); 952 );
918 953
919 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 954 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
920 $table->add_at (1, $row, new CFPlus::UI::CheckBox 955 $table->add_at (1, $row, new CFPlus::UI::CheckBox
921 expand => 1, state => $CFG->{bgm_enable}, 956 expand => 1, state => $CFG->{bgm_enable},
922 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 957 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
923 on_changed => sub { 958 on_changed => sub {
924 $CFG->{bgm_enable} = $_[1]; 959 $CFG->{bgm_enable} = $_[1];
925 $CONN->update_fx_want if $CONN; 960 $CONN->update_fx_want if $CONN;
926 audio_music_push; 961 audio_music_push;
927 0 962 1
928 } 963 }
929 ); 964 );
930 $table->add_at (2, $row++, new CFPlus::UI::Slider 965 $table->add_at (2, $row++, new CFPlus::UI::Slider
931 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 966 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
932 tooltip => "The volume of the background music. Changes are instant.", 967 tooltip => "The volume of the background music. Changes are instant.",
933 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 } 968 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
969 );
970
971 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Frequency");
972 $table->add_at (1, $row++, new CFPlus::UI::Selector
973 c_colspan => 2, expand => 1,
974 value => $CFG->{audio_hw_frequency},
975 options => [
976 [11025, "11 kHz" , "11kHz (low quality)"],
977 [22050, "22 kHz" , "22kHz (reduced quality)"],
978 [44100, "44.1 kHz", "44.1kHz (cd quality)"],
979 [48000, "48 kHz" , "48kHz (studio quality)"],
980 ],
981 tooltip => "The sampling frequency to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
982 on_changed => sub {
983 $CFG->{audio_hw_frequency} = $_[1];
984 audio_tab_update;
985 1
986 }
987 );
988
989 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Channels");
990 $table->add_at (1, $row++, new CFPlus::UI::Selector
991 c_colspan => 2, expand => 1,
992 value => $CFG->{audio_hw_channels},
993 options => [
994 [1, "Mono" , "Mono (single channel, low quality)"],
995 [2, "Stereo" , "Stereo (dual channe, standard quality)"],
996 [4, "4 Ch Surround", "4 Channel Surround Sound (3d sound, high quality)"],
997 [6, "6 Ch Surround", "6 Channel Surround Sound (3d sound + center + lfe)"],
998 ],
999 tooltip => "The number of independent sound channels to use. Higher sounds better, but also more cpu-intensive and might cause stuttering.",
1000 on_changed => sub {
1001 $CFG->{audio_hw_channels} = $_[1];
1002 audio_tab_update;
1003 1
1004 }
1005 );
1006
1007 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Latency");
1008 $table->add_at (1, $row++, $AUDIO_HW_CHUNKSIZE = new CFPlus::UI::Selector
1009 c_colspan => 2, expand => 1,
1010 value => $CFG->{audio_hw_chunksize},
1011 tooltip => "The guarenteed latency. Lower is better, but also more cpu-intensive and might cause stuttering. If music playback "
1012 . "is stuttering, increase this value. Values of 50-100ms are optimal.",
1013 on_changed => sub {
1014 $CFG->{audio_hw_chunksize} = $_[1]
1015 if $_[1];
1016 audio_tab_update;
1017 1
1018 }
1019 );
1020
1021 # should really be a slider
1022 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Mixer Voices");
1023 $table->add_at (1, $row++, new CFPlus::UI::ValSlider
1024 c_colspan => 2, expand => 1,
1025 tooltip => "The number of simultaneous sound effects possible. Higher is better, but also more cpu-intensive and might cause stuttering.",
1026 range => [$::CFG->{audio_mix_channels}, 4, 32, 0, 1],
1027 template => ">= 99",
1028 on_changed => sub {
1029 my ($slider, $value) = @_;
1030
1031 $CFG->{audio_mix_channels} = $value
1032 if $value;
1033 1;
1034 }
934 ); 1035 );
935 1036
936 $table->add_at (1, $row++, new CFPlus::UI::Button 1037 $table->add_at (1, $row++, new CFPlus::UI::Button
937 c_colspan => 2, expand => 1, align => 0, text => "Apply", 1038 c_colspan => 2, expand => 1, align => 0, text => "Apply",
938 tooltip => "Apply the audio settings", 1039 tooltip => "Apply the audio settings",
… …
940 audio_shutdown (); 1041 audio_shutdown ();
941 audio_init (); 1042 audio_init ();
942 0 1043 0
943 } 1044 }
944 ); 1045 );
1046
1047 $vbox->add (new CFPlus::UI::FancyFrame
1048 expand => 1,
1049 label => "Audio Info",
1050 child => ($AUDIO_INFO = new CFPlus::UI::Label ellipsise => 0),
1051 );
1052
1053 audio_tab_update;
945 1054
946 $vbox 1055 $vbox
947} 1056}
948 1057
949sub set_gauge_window_fontsize { 1058sub set_gauge_window_fontsize {
… …
984 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1093 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
985 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1094 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
986 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1095 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
987 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food"); 1096 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
988 1097
989 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp"); 1098 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1099 $vbox->add (my $prg = new CFPlus::UI::ExperienceProgress);
1100 $vbox->add (my $sklprg = new CFPlus::UI::ExperienceProgress);
990 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged"); 1101 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
991 1102
992 $GAUGES = { 1103 $GAUGES = {
1104 exp => $exp, prg => $prg, sklprg => $sklprg,
993 exp => $exp, win => $win, range => $rng, 1105 win => $win, range => $rng,
994 food => $fg, mana => $mg, hp => $hg, grace => $gg 1106 hp => $hg, mana => $mg, grace => $gg, food => $fg,
995 }; 1107 };
996 1108
997 &set_gauge_window_fontsize; 1109 &set_gauge_window_fontsize;
998 1110
999 $win 1111 $win
… …
1200 $r 1312 $r
1201} 1313}
1202 1314
1203sub skill_window { 1315sub skill_window {
1204 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1); 1316 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
1317
1205 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]); 1318 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, .1, 0, 0, 1, .1]);
1319
1206 $sw 1320 $sw
1207} 1321}
1208 1322
1209sub formsep($) { 1323sub formsep($) {
1210 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 1324 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
… …
1719 $ntb->add_tab ( 1833 $ntb->add_tab (
1720 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1834 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1721 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1835 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1722 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1836 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1723 ); 1837 );
1724 $ntb->add_tab (Pickup => autopickup_setup, 1838 $ntb->add_tab (Pickup => $PICKUP_PAGE = autopickup_setup,
1725 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1839 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1726 1840
1727 $ntb->add_tab (Media => media_window, 1841 $ntb->add_tab (Media => media_window,
1728 "License, Author and Source info for media sent by the server."); 1842 "License, Author and Source info for media sent by the server.");
1729 1843
… …
1970 2084
1971 $SDL_ACTIVE = 1; 2085 $SDL_ACTIVE = 1;
1972 $LAST_REFRESH = time - 0.01; 2086 $LAST_REFRESH = time - 0.01;
1973 2087
1974 CFPlus::OpenGL::init; 2088 CFPlus::OpenGL::init;
2089 CFPlus::Macro::init;
1975 2090
1976 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 2091 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1977 2092
1978 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 2093 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1979 2094
1980 ############################################################################# 2095 #############################################################################
1981 2096
1982 if ($DEBUG_STATUS) { 2097 if ($DEBUG_STATUS) {
1983 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 2098 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1984 } else { 2099 } else {
1985 # create the widgets 2100 # create/configure the widgets
2101
2102 $CFPlus::UI::ROOT->connect (key_down => sub {
2103 my (undef, $ev) = @_;
2104
2105 if (my @macros = CFPlus::Macro::find $ev) {
2106 CFPlus::Macro::execute $_ for @macros;
2107
2108 return 1;
2109 }
2110
2111 0
2112 });
1986 2113
1987 $DEBUG_STATUS = new CFPlus::UI::Label 2114 $DEBUG_STATUS = new CFPlus::UI::Label
1988 padding => 0, 2115 padding => 0,
1989 z => 100, 2116 z => 100,
1990 force_x => "max", 2117 force_x => "max",
… …
2020 $MESSAGE_WINDOW->activate_console ($preset) 2147 $MESSAGE_WINDOW->activate_console ($preset)
2021 if $MESSAGE_WINDOW; 2148 if $MESSAGE_WINDOW;
2022 }); 2149 });
2023 $MAPWIDGET->show; 2150 $MAPWIDGET->show;
2024 $MAPWIDGET->grab_focus; 2151 $MAPWIDGET->grab_focus;
2152
2153 $COMPLETER = new CFPlus::MapWidget::Command::
2154 command => { },
2155 tooltip => "#completer_help",
2156 ;
2025 2157
2026 $SETUP_DIALOG = new CFPlus::UI::Toplevel 2158 $SETUP_DIALOG = new CFPlus::UI::Toplevel
2027 title => "Setup", 2159 title => "Setup",
2028 name => "setup_dialog", 2160 name => "setup_dialog",
2029 x => 'center', 2161 x => 'center',
… …
2154 delete $animate_object{$widget}; 2286 delete $animate_object{$widget};
2155} 2287}
2156 2288
2157%SDL_CB = ( 2289%SDL_CB = (
2158 CFPlus::SDL_QUIT => sub { 2290 CFPlus::SDL_QUIT => sub {
2159 exit; 2291 Event::unloop_all;
2160 }, 2292 },
2161 CFPlus::SDL_VIDEORESIZE => sub { 2293 CFPlus::SDL_VIDEORESIZE => sub {
2162 }, 2294 },
2163 CFPlus::SDL_VIDEOEXPOSE => sub { 2295 CFPlus::SDL_VIDEOEXPOSE => sub {
2164 CFPlus::UI::full_refresh; 2296 CFPlus::UI::full_refresh;
… …
2219 gauge_fontsize => 1, 2351 gauge_fontsize => 1,
2220 gauge_size => 0.35, 2352 gauge_size => 0.35,
2221 stat_fontsize => 0.7, 2353 stat_fontsize => 0.7,
2222 mapsize => 100, 2354 mapsize => 100,
2223 audio_enable => 1, 2355 audio_enable => 1,
2356 audio_hw_channels => 2,
2357 audio_hw_frequency => 22050,
2358 audio_hw_chunksize => 0,
2359 audio_mix_channels => 8,
2224 effects_enable => 1, 2360 effects_enable => 1,
2225 effects_volume => 1, 2361 effects_volume => 1,
2226 bgm_enable => 1, 2362 bgm_enable => 1,
2227 bgm_volume => 0.5, 2363 bgm_volume => 0.5,
2228 output_sync => 1, 2364 output_sync => 1,
… …
2297# } 2433# }
2298# my $t2 = Time::HiRes::time; 2434# my $t2 = Time::HiRes::time;
2299# warn $t2-$t1; 2435# warn $t2-$t1;
2300# } 2436# }
2301 2437
2302 $startup_done->();
2303
2304 video_init; 2438 video_init;
2305 audio_init; 2439 audio_init;
2306} 2440}
2307 2441
2308show_tip_of_the_day if $CFG->{show_tips}; 2442show_tip_of_the_day if $CFG->{show_tips};
2443
2444Event->idle (cb => sub {
2445 $_[0]->w->cancel;
2446 $startup_done->();
2447});
2309 2448
2310Event::loop; 2449Event::loop;
2311 2450
2312#video_shutdown; 2451#video_shutdown;
2313#audio_shutdown; 2452#audio_shutdown;

Diff Legend

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