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

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.53 by root, Fri Jul 18 22:32:55 2008 UTC vs.
Revision 1.97 by root, Thu Nov 26 07:19:12 2009 UTC

… …
17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp"); 17 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
18 } 18 }
19 19
20 require Win32::GUI::SplashScreen; 20 require Win32::GUI::SplashScreen;
21 21
22 # initialise the resolver now, as vista forces us back to the desktop
23 # when doing this.
24 use AnyEvent::DNS ();
25 AnyEvent::DNS::resolver;
26
22 Win32::GUI::SplashScreen::Show ( 27 Win32::GUI::SplashScreen::Show (
23 -file => "$ENV{PAR_TEMP}/SPLASH.bmp", 28 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
24 ); 29 );
25 30
26 $startup_done = sub { 31 $startup_done = sub {
… …
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } else { 59 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 60 # OS X
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 63 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 64 }
75 65
76 unshift @INC, $root; 66 unshift @INC, $root;
77 } 67 }
78} 68}
79 69
80# prepend private library directory 70# prepend private library directory and prepare env
81BEGIN { 71BEGIN {
82 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 74 if (-d $path) {
85 unshift @INC, $path; 75 unshift @INC, $path;
… …
90 80
91# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 83 if %PAR::LibCache;
94 84
95use Time::HiRes 'time';
96use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
97use List::Util qw(max min); 88use List::Util qw(max min);
98 89
99use Deliantra; 90use Deliantra;
100use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
101 92
102use AnyEvent::DNS; 93use AnyEvent::Util ();
103use AnyEvent::Socket (); 94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
104 96
105use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
106 99
107use DC; 100use DC;
108BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
109use DC::OpenGL (); 114use DC::OpenGL ();
110use DC::Protocol; 115use DC::Protocol;
111use DC::DB; 116use DC::DB;
112use DC::UI; 117use DC::UI;
113use DC::UI::Canvas; 118use DC::UI::Canvas;
114use DC::UI::Inventory; 119use DC::UI::Inventory;
115use DC::UI::SpellList; 120use DC::UI::SpellList;
116use DC::UI::Dockable; 121use DC::UI::Dockable;
117use DC::UI::Dockbar; 122use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 123use DC::UI::ChatView;
120use DC::MessageDistributor; 124use DC::MessageDistributor;
121use DC::Pod; 125use DC::Pod;
122use DC::MapWidget; 126use DC::MapWidget;
123use DC::Macro; 127use DC::Macro;
124 128
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
127 131
128$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
129 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
130}; 135};
131 136
132my $MAX_FPS = 60; 137my $MAX_FPS = 60;
133 138
… …
135 140
136our $LAST_REFRESH; 141our $LAST_REFRESH;
137our $NOW; 142our $NOW;
138 143
139our $CFG; 144our $CFG;
140our $CONN;
141our $PROFILE; # current profile 145our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 146our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 147
144our $WANT_REFRESH; 148our $WANT_REFRESH;
145 149
… …
154our $FONTSIZE; 158our $FONTSIZE;
155 159
156our $FONT_PROP; 160our $FONT_PROP;
157our $FONT_FIXED; 161our $FONT_FIXED;
158 162
163our $CONN;
164
159our $MAP; 165our $MAP;
160our $MAPMAP; 166our $MAPMAP;
161our $MAPWIDGET; 167our $MAPWIDGET;
162our $COMPLETER; 168our $COMPLETER;
163our $BUTTONBAR; 169our $MENUFRAME; # the rectangle at the top
170our $MENUBAR; # the hbox at the top
171our $MENUPOPUP;
172our $BUTTONBAR; # the menu buttons
164our $METASERVER; 173our $METASERVER;
165our $LOGIN_BUTTON; 174our $LOGIN_BUTTON;
166our $QUIT_DIALOG; 175our $QUIT_DIALOG;
167our $HOST_ENTRY; 176our $HOST_ENTRY;
168our $FULLSCREEN_ENABLE; 177our $FULLSCREEN_ENABLE;
… …
194our $FLOORBOX; 203our $FLOORBOX;
195our $GAUGES; 204our $GAUGES;
196our $STATWIDS; 205our $STATWIDS;
197 206
198our $SDL_ACTIVE; 207our $SDL_ACTIVE;
199our %SDL_CB; 208our @SDL_CB;
200 209
201our $ALT_ENTER_MESSAGE; 210our $ALT_ENTER_MESSAGE;
202our $STATUSBOX; 211our $STATUSBOX;
203our $MODBOX; 212our $MODBOX;
204our $DEBUG_STATUS; 213our $DEBUG_STATUS;
205 214
206our $INV; 215our $INV;
207our $INVR; 216our $INVR;
208our $INVR_HB; 217our $INVR_HB;
218
219#############################################################################
220
221# write a crash message blockingly to the socket, if possible
222# this is a bit too complicated for my tastes, but it was easy.
223*crash = sub($;$) {
224 my ($msg, $backtrace) = @_;
225
226 warn $msg;
227
228 return unless $CONN;
229
230 my $fh = $CONN->{fh}
231 or return;
232
233 my $buf = delete $CONN->{wbuf};
234
235 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
236
237 AnyEvent::Util::fh_nonblocking $fh, 0;
238 syswrite $fh, $buf;
239 AnyEvent::Util::fh_nonblocking $fh, 1;
240
241 $msg =~ s/\s+$//;
242
243 # backtrace as second step, in case it crashes, too
244 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
245 if $backtrace;
246};
247
248sub clienterror($;$) {
249 my ($msg, $backtrace) = @_;
250
251 warn $msg;
252
253 return unless $CONN;
254
255 $CONN->send_exti_msg (clientlog => $msg);
256 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
257}
209 258
210############################################################################# 259#############################################################################
211 260
212sub status { 261sub status {
213 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 262 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
295 or return; 344 or return;
296 345
297 $meta->{data} 346 $meta->{data}
298 or return; 347 or return;
299 348
300 # if its a jingle, play it as ambient music 349 # if it's a jingle, play it as ambient music
301 if ($meta->{data}{jingle}) { 350 if ($meta->{data}{jingle}) {
302 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 351 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
303 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 352 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
304 &audio_music_push ($face); 353 &audio_music_push ($face);
305 } 354 }
306 } else { 355 } else {
307 # fetch from database 356 # fetch from database
308 DC::DB::get res_data => $meta->{name}, sub { 357 DC::DB::get res_data => $meta->{name}, sub {
309 my $rwops = new DC::RW $_[0]; 358 my $rwops = new DC::RW $_[0];
310 my $chunk = new DC::MixChunk $rwops 359 my $chunk = new DC::MixChunk $rwops
311 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 360 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
312 $chunk->volume (($meta->{data}{volume} || 1) * 128); 361 $chunk->volume (($meta->{data}{volume} || 1) * 128);
313 $AUDIO_CHUNK{$face} = $chunk; 362 $AUDIO_CHUNK{$face} = $chunk;
314 363
315 audio_sound_push ($face); 364 audio_sound_push ($face);
316 }; 365 };
… …
363 412
364 audio_music_update_volume; 413 audio_music_update_volume;
365 414
366 $MUSIC_PLAYING_DATA = \$_[0]; 415 $MUSIC_PLAYING_DATA = \$_[0];
367 416
417 $meta->{path} or length $_[0]
418 or return clienterror "empty music face from res_data ($meta->{face})";#d#
419
368 my $rwops = $meta->{path} 420 my $rwops = $meta->{path}
369 ? new_from_file DC::RW $meta->{path} 421 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
370 : new DC::RW $$MUSIC_PLAYING_DATA; 422 : new DC::RW $$MUSIC_PLAYING_DATA;
371 423
372 $MUSIC_PLAYER = new DC::MixMusic $rwops 424 $MUSIC_PLAYER = new DC::MixMusic $rwops
373 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 425 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
374 426
375 my $NOW = time; 427 my $NOW = time;
376 428
377 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 429 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
378 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 430 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
496 $MUSIC_WANT = []; 548 $MUSIC_WANT = [];
497 @MUSIC_JINGLE = (); 549 @MUSIC_JINGLE = ();
498 %AUDIO_PLAY = (); 550 %AUDIO_PLAY = ();
499 %AUDIO_CHUNK = (); 551 %AUDIO_CHUNK = ();
500 552
553 DC::MixMusic::halt;
554 DC::Mix_AllocateChannels 0;
501 DC::Mix_CloseAudio if $SDL_MIXER; 555 DC::Mix_CloseAudio if $SDL_MIXER;
502 undef $SDL_MIXER; 556 undef $SDL_MIXER;
503} 557}
504 558
505############################################################################# 559#############################################################################
… …
736} 790}
737 791
738sub dc_connect { 792sub dc_connect {
739 my ($host, $port) = @_; 793 my ($host, $port) = @_;
740 794
741 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 795 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
796 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
742 797
743 $CONN = 798 $CONN =
744 new DC::Protocol 799 new DC::Protocol
745 host => $host, 800 host => $host,
746 port => $port, 801 port => $port,
747 user => $PROFILE->{user}, 802 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 803 pass => $PROFILE->{password},
749 mapw => $mapsize, 804 mapw => $mapw,
750 maph => $mapsize, 805 maph => $maph,
751 806
752 client => "$DC::VERSION $] $^O", 807 client => "$DC::VERSION $] $^O",
753 808
754 map_widget => $MAPWIDGET, 809 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 810 statusbox => $STATUSBOX,
… …
763 818
764 on_connect => sub { 819 on_connect => sub {
765 if ($_[0]) { 820 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 821 DC::lowdelay fileno $CONN->{fh};
767 822
768 status "login successful"; 823 status "successfully connected to the server";
769 } else { 824 } else {
770 undef $CONN; 825 undef $CONN;
771 status "unable to connect: $!"; 826 status "unable to connect: $!";
772 stop_game(); 827 stop_game();
773 } 828 }
… …
788 # hack to make SURE we find the IP address all right 843 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable. 844 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") { 845 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 846 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl 847 if ($_[0] ne "80.101.114.108") { # Perl
848 status "dns failure, trying differently";
849 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
850 unless (defined $host) {
793 status "dns failure, using hardcoded address"; 851 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95"; 852 $host = "129.13.162.95";
853 }
795 } 854 }
796 855
797 dc_connect $host, $port; 856 dc_connect $host, $port;
798 }; 857 };
799 } else { 858 } else {
800 dc_connect $host, $port; 859 dc_connect $host, $port;
801 } 860 }
802} 861}
803 862
804sub stop_game { 863sub stop_game {
864 crash "stop_game";
865
805 $LOGIN_BUTTON->set_text ("Login / Register"); 866 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 867 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 868 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 869 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 870 $SPELL_LIST->clear_spells;
… …
823} 884}
824 885
825sub graphics_setup { 886sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 887 my $vbox = new DC::UI::VBox;
827 888
889 {
890 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
891
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 892 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 893
830 my $row = 0; 894 my $row = 0;
831 895
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 896 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 897 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
834 can_events => 1, 898 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 899 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 900
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 901 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 902 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 903 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 904 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues " 905 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or " 906 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 907 . "by installing the right driver for your graphics card.");
844 908
909 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
910 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
911 value => $CFG->{uitheme},
912 options => [
913 [wood => "Wood (the default)"],
914 [plain => "Plain (very)"],
915 [blue => "Blue (dark)"],
916 [metal => "Metal (light)"],
917 ],
918 tooltip => "Choose the User Interface theme that you like most :)",
919 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
920 );
921
845 my $vidmode_tooltip = 922 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 923 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
847 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 924 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 925
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 926 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 927 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 928
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 929 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
930 c_rescale => 1,
853 force_w => $WIDTH * 0.1, expand => 1, 931 force_w => $WIDTH * 0.1, expand => 1,
932 range => [ ($CFG->{sdl_mode}) x 3 ],
854 tooltip => $vidmode_tooltip); 933 tooltip => $vidmode_tooltip);
855 $hbox->add (my $mode_label = new DC::UI::Label 934 $hbox->add (my $mode_label = new DC::UI::Label
856 height => 0.8, template => "9999x9999@9+9", 935 height => 0.8, template => "9999x9999@9+9",
857 can_events => 1, tooltip => $vidmode_tooltip); 936 can_events => 1, tooltip => $vidmode_tooltip);
858 937
859 $MODE_SLIDER->connect (changed => sub { 938 $MODE_SLIDER->connect (changed => sub {
860 my ($self, $value) = @_;
861
862 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
863 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
864 });
865 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
866
867 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
868 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
869 state => $CFG->{fullscreen},
870 tooltip => "Bring the client into fullscreen mode.",
871 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
872 );
873
874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
875 $table->add_at (1, $row++, new DC::UI::CheckBox
876 state => $CFG->{force_opengl11},
877 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
878 . "higher memory usage and slower performance. It will, however, help tremendously on "
879 . "cards that claim to support a feature but fall back to software rendering. "
880 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
881 . "but cards and drivers from other vendors (ATI) are often just as bad. "
882 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
883 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
884 );
885
886 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
887 $table->add_at (1, $row++, new DC::UI::CheckBox
888 state => $CFG->{disable_alpha},
889 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
890 . "by disabling a number of textures and transparency effects. Normally, these "
891 . "effects do not cost a lot of resources, but some graphics cards might fall "
892 . "back to etxremely slow rendering if this is enabled. If disabling this option "
893 . "noticably improves the framerate of the client please report this! "
894 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
895 on_changed => sub {
896 my ($self, $value) = @_; 939 my ($self, $value) = @_;
940
941 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
942 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
943 });
944 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
945
946 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
947 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
948 state => $CFG->{fullscreen},
949 tooltip => "Bring the client into fullscreen mode.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
951 );
952
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
954 $table->add_at (1, $row++, new DC::UI::CheckBox
955 state => $CFG->{force_opengl11},
956 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
957 . "higher memory usage and slower performance. It will, however, help tremendously on "
958 . "cards that claim to support a feature but fall back to software rendering. "
959 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
960 . "but cards and drivers from other vendors (ATI) are often just as bad. "
961 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
962 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
963 );
964
965 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
966 $table->add_at (1, $row++, new DC::UI::CheckBox
967 state => $CFG->{disable_alpha},
968 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
969 . "by disabling a number of textures and transparency effects. Normally, these "
970 . "effects do not cost a lot of resources, but some graphics cards might fall "
971 . "back to extremely slow rendering if this is enabled. If disabling this option "
972 . "noticably improves the framerate of the client please report this! "
973 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
974 on_changed => sub {
975 my ($self, $value) = @_;
897 $CFG->{disable_alpha} = $value; 976 $CFG->{disable_alpha} = $value;
898 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 977 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
978 0
899 0 979 }
900 } 980 );
901 );
902 981
903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 982 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
904 $table->add_at (1, $row++, new DC::UI::CheckBox 983 $table->add_at (1, $row++, new DC::UI::CheckBox
905 state => $CFG->{texture_compression}, 984 state => $CFG->{texture_compression},
906 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 985 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
907 . "will save a lot of memory and increase performance. The compression algorithm " 986 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
908 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 987 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
909 . "forced OpenGL 1.1 mode.", 988 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 989 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
911 ); 990 );
912 991
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 992 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
914 $table->add_at (1, $row++, new DC::UI::CheckBox 993 $table->add_at (1, $row++, new DC::UI::CheckBox
915 state => $CFG->{fast}, 994 state => $CFG->{fast},
916 tooltip => "Lower the visual quality considerably to speed up rendering.", 995 tooltip => "Lower the visual quality considerably to speed up rendering.",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
918 ); 997 );
919 998
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
921 $table->add_at (1, $row++, new DC::UI::Slider 1000 $table->add_at (1, $row++, new DC::UI::Slider
922 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1001 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
923 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1002 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
924 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1003 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
925 ); 1004 );
926 1005
927 $table->add_at (1, $row++, new DC::UI::Button 1006 $table->add_at (1, $row++, new DC::UI::Button
928 expand => 1, text => "Apply", 1007 expand => 1, text => "Apply",
929 tooltip => "Apply the video settings above.", 1008 tooltip => "Apply the video settings above.",
930 on_activate => sub { 1009 on_activate => sub {
931 video_shutdown (); 1010 video_shutdown ();
932 video_init (); 1011 video_init ();
1012 0
933 0 1013 }
934 } 1014 );
1015 }
1016
1017 {
1018 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1019
1020 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1021
1022 my $row = 0;
1023 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1024 $table->add_at (1, $row++, new DC::UI::CheckBox
1025 state => $CFG->{smooth_movement},
1026 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1027 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1028 . "then disable this option. Changes take effect immdiately.",
1029 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
935 ); 1030 );
936 1031
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1032 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
938 $table->add_at (1, $row++, new DC::UI::Slider 1033 $table->add_at (1, $row++, new DC::UI::Slider
939 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1034 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
940 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1035 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
941 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
942 ); 1037 );
943 1038
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
945 $table->add_at (1, $row++, new DC::UI::CheckBox 1040 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{map_smoothing}, 1041 state => $CFG->{map_smoothing},
947 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1042 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
948 . "This increases load on the graphics subsystem and works only with TRT servers. " 1043 . "This increases load on the graphics subsystem and works only with TRT servers. "
949 . "Changes take effect at next login only.", 1044 . "Changes take effect at next login only.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1045 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
951 ); 1046 );
952 1047
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
954 $table->add_at (1, $row++, new DC::UI::CheckBox 1049 $table->add_at (1, $row++, new DC::UI::CheckBox
955 state => $CFG->{fow_enable}, 1050 state => $CFG->{fow_enable},
956 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1051 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
957 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
958 ); 1053 );
959 1054
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
961 $table->add_at (1, $row++, new DC::UI::Slider 1056 $table->add_at (1, $row++, new DC::UI::Slider
962 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1057 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
963 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1058 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
964 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1059 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
965 ); 1060 );
966 1061
967 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1062 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
968 $table->add_at (1, $row++, new DC::UI::Slider 1063 $table->add_at (1, $row++, new DC::UI::Slider
969 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1064 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
970 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1065 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
971 . "but you still need to press apply to correctly re-layout the widget.", 1066 . "but you still need to press apply to correctly re-layout the widget.",
972 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1067 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
973 ); 1068 );
974 1069
975 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1070 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
976 $table->add_at (1, $row++, new DC::UI::Slider 1071 $table->add_at (1, $row++, new DC::UI::Slider
977 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1072 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
978 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1073 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
979 on_changed => sub { 1074 on_changed => sub {
980 $CFG->{gauge_fontsize} = $_[1]; 1075 $CFG->{gauge_fontsize} = $_[1];
981 &set_gauge_window_fontsize; 1076 &set_gauge_window_fontsize;
1077 0
982 0 1078 }
983 } 1079 );
984 );
985 1080
986 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1081 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
987 $table->add_at (1, $row++, new DC::UI::Slider 1082 $table->add_at (1, $row++, new DC::UI::Slider
988 range => [$CFG->{gauge_size}, 0.2, 0.8], 1083 range => [$CFG->{gauge_size}, 0.2, 0.8],
989 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1084 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
990 on_changed => sub { 1085 on_changed => sub {
991 $CFG->{gauge_size} = $_[1]; 1086 $CFG->{gauge_size} = $_[1];
992 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1087 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1088 0
993 0 1089 }
994 } 1090 );
995 ); 1091 }
996 1092
997 $vbox 1093 $vbox
998} 1094}
999 1095
1000our $AUDIO_HW_CHUNKSIZE; 1096our $AUDIO_HW_CHUNKSIZE;
… …
1163} 1259}
1164 1260
1165sub make_gauge_window { 1261sub make_gauge_window {
1166 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1262 my $gh = int $HEIGHT * $CFG->{gauge_size};
1167 1263
1168 my $win = new DC::UI::Frame ( 1264 $GAUGES->{win} = my $win = new DC::UI::Frame (
1169 force_x => 0, 1265 force_x => 0,
1170 force_y => "max", 1266 force_y => "max",
1171 force_w => $WIDTH, 1267 force_w => $WIDTH,
1172 force_h => $gh, 1268 force_h => $gh,
1173 ); 1269 );
… …
1189 (new DC::UI::Empty expand => 1), 1285 (new DC::UI::Empty expand => 1),
1190 (my $hb = new DC::UI::HBox), 1286 (my $hb = new DC::UI::HBox),
1191 ], 1287 ],
1192 ); 1288 );
1193 1289
1194 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1290 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1195 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1291 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1196 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1292 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1197 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1293 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1198
1199 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1200 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1201 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1202 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1203
1204 $GAUGES = {
1205 exp => $exp, prg => $prg, sklprg => $sklprg,
1206 win => $win, range => $rng,
1207 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1208 };
1209 1294
1210 &set_gauge_window_fontsize; 1295 &set_gauge_window_fontsize;
1211 1296
1212 $win 1297 $win
1213} 1298}
… …
1555 ); 1640 );
1556 1641
1557 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1642 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1558 $table->add_at (1, 4, new DC::UI::Entry 1643 $table->add_at (1, 4, new DC::UI::Entry
1559 text => $CFG->{profile}{default}{user}, 1644 text => $CFG->{profile}{default}{user},
1560 tooltip => "The name of your character on the server.", 1645 tooltip => "The name of your character on the server. The name is case-sensitive!",
1561 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1646 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1562 ); 1647 );
1563 1648
1564 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1649 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1565 $table->add_at (1, 5, new DC::UI::Entry 1650 $table->add_at (1, 5, new DC::UI::Entry
… …
1579 1 1664 1
1580 }, 1665 },
1581 ); 1666 );
1582 1667
1583 $vbox->add (new DC::UI::FancyFrame 1668 $vbox->add (new DC::UI::FancyFrame
1584 label => "Registering", 1669 label => "How to Play",
1585 min_h => 200, 1670 min_h => 240,
1586 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1671 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1587 markup => 1672 markup =>
1673 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1674 . "Then register a new account (or use an existing one if you have one). "
1588 "To register a new account, choose a username that hasn't been taken yet and " 1675 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1589 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1676 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1590 ), 1677 ),
1591 ); 1678 );
1592 1679
1593 $vbox 1680 $vbox
… …
1665 1752
1666 my $row = 0; 1753 my $row = 0;
1667 1754
1668 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1755 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1669 $table->add_at (1, $row++, new DC::UI::CheckBox 1756 $table->add_at (1, $row++, new DC::UI::CheckBox
1757 c_colspan => 2,
1670 state => $CFG->{show_tips}, 1758 state => $CFG->{show_tips},
1671 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1759 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1672 on_changed => sub { 1760 on_changed => sub {
1673 my ($self, $value) = @_; 1761 my ($self, $value) = @_;
1674 $CFG->{show_tips} = $value; 1762 $CFG->{show_tips} = $value;
… …
1676 } 1764 }
1677 ); 1765 );
1678 1766
1679 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1767 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1680 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1768 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1769 c_colspan => 2,
1681 text => $CFG->{logview_max_par}, 1770 text => $CFG->{logview_max_par},
1682 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1771 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1683 . "sends more messages than this number, older messages get removed to save memory and " 1772 . "sends more messages than this number, older messages get removed to save memory and "
1684 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1773 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1685 on_changed => sub { 1774 on_changed => sub {
… …
1687 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1776 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1688 0 1777 0
1689 }, 1778 },
1690 ); 1779 );
1691 1780
1781 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1782 $table->add_at (1, $row, new DC::UI::CheckBox
1783 state => $CFG->{config_autosave},
1784 tooltip => "Normally, configuration settings and the user interface layout "
1785 . "are saved on client exit. You can disable this behaviour by "
1786 . "unchecking this checkbox.",
1787 on_changed => sub {
1788 my ($self, $value) = @_;
1789 $CFG->{config_autosave} = $value;
1790 0
1791 }
1792 );
1793 $table->add_at (2, $row++, new DC::UI::Button
1794 text => "Save Now",
1795 tooltip => "Use this to manually save configuration and UI layout when "
1796 . "autosave is disabled.",
1797 on_activate => sub {
1798 DC::write_cfg;
1799 0
1800 }
1801 );
1802
1692 $table 1803 $table
1693} 1804}
1694 1805
1695sub autopickup_setup { 1806sub autopickup_setup {
1696 my $r = new DC::UI::ScrolledWindow ( 1807 my $r = new DC::UI::ScrolledWindow (
… …
1702 col_expand => [0, 1, 0, 1], 1813 col_expand => [0, 1, 0, 1],
1703 ); 1814 );
1704 1815
1705 for ( 1816 for (
1706 ["General", 0, 0, 1817 ["General", 0, 0,
1707 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1708 ["Inhibit autopickup" => PICKUP_INHIBIT], 1818# ["Inhibit autopickup" => PICKUP_INHIBIT],
1709 ["Stop before pickup" => PICKUP_STOP], 1819 ["Stop before pickup" => PICKUP_STOP],
1710 ["Debug autopickup" => PICKUP_DEBUG], 1820 ["Debug autopickup" => PICKUP_DEBUG],
1711 ], 1821 ],
1712 ["Weapons", 0, 6, 1822 ["Weapons", 0, 6,
1713 ["All weapons" => PICKUP_ALLWEAPON], 1823 ["All weapons" => PICKUP_ALLWEAPON],
… …
1739 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1849 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1740 ["Ignore cursed" => PICKUP_NOT_CURSED], 1850 ["Ignore cursed" => PICKUP_NOT_CURSED],
1741 ["Jewelery" => PICKUP_JEWELS], 1851 ["Jewelery" => PICKUP_JEWELS],
1742 ["Flesh" => PICKUP_FLESH], 1852 ["Flesh" => PICKUP_FLESH],
1743 ], 1853 ],
1744 ["Weight/Value ratio", 2, 17] 1854 ["Value/Weight ratio", 2, 17]
1745 ) 1855 )
1746 { 1856 {
1747 my ($title, $x, $y, @bits) = @$_; 1857 my ($title, $x, $y, @bits) = @$_;
1748 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1858 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1749 1859
… …
1761 $::CFG->{pickup} |= $mask; 1871 $::CFG->{pickup} |= $mask;
1762 } else { 1872 } else {
1763 $::CFG->{pickup} &= ~$mask; 1873 $::CFG->{pickup} &= ~$mask;
1764 } 1874 }
1765 1875
1766 $::CONN->send_command ("pickup $::CFG->{pickup}") 1876 $::CONN->send_pickup ($::CFG->{pickup})
1767 if defined $::CONN; 1877 if defined $::CONN;
1768 1878
1769 0 1879 0
1770 }); 1880 });
1771 1881
… …
1774 } 1884 }
1775 1885
1776 $table->add_at (2, 18, new DC::UI::ValSlider 1886 $table->add_at (2, 18, new DC::UI::ValSlider
1777 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1887 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1778 template => ">= 99", 1888 template => ">= 99",
1889 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1779 to_value => sub { ">= " . 5 * $_[0] }, 1890 to_value => sub { ">= " . 5 * $_[0] },
1780 on_changed => sub { 1891 on_changed => sub {
1781 my ($slider, $value) = @_; 1892 my ($slider, $value) = @_;
1782 1893
1783 $::CFG->{pickup} &= ~0xF; 1894 $::CFG->{pickup} &= ~0xF;
… …
1787 }); 1898 });
1788 1899
1789 $table->add_at (3, 18, new DC::UI::Button 1900 $table->add_at (3, 18, new DC::UI::Button
1790 text => "set", 1901 text => "set",
1791 on_activate => sub { 1902 on_activate => sub {
1792 $::CONN->send_command ("pickup $::CFG->{pickup}") 1903 $::CONN->send_pickup ($::CFG->{pickup})
1793 if defined $::CONN; 1904 if defined $::CONN;
1794 0 1905 0
1795 }); 1906 });
1796 1907
1797 $r 1908 $r
… …
1839 $::CFG->{inv_sort} = $_[1]; 1950 $::CFG->{inv_sort} = $_[1];
1840 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1951 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1841 }, 1952 },
1842 ); 1953 );
1843 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1954 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1844 #TODO# update to weigh/maxweight 1955 #TODO# update to weight/maxweight
1845 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1956 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1846 1957
1847 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1958 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1848 $sw1->add ($INV = new DC::UI::Inventory); 1959 $sw1->add ($INV = new DC::UI::Inventory);
1849 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1960 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
… …
1910 $PL_NOTEBOOK->set_current_page ($widget); 2021 $PL_NOTEBOOK->set_current_page ($widget);
1911 $PL_WINDOW->show; 2022 $PL_WINDOW->show;
1912 } 2023 }
1913} 2024}
1914 2025
1915sub player_window { 2026sub make_playerbook {
1916 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2027 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1917 x => "center", 2028 x => "center",
1918 y => "center", 2029 y => "center",
1919 force_w => $WIDTH * 9/10, 2030 force_w => $WIDTH * 9/10,
1920 force_h => $HEIGHT * 9/10, 2031 force_h => $HEIGHT * 9/10,
… …
1954 "License, Author and Source info for media sent by the server."); 2065 "License, Author and Source info for media sent by the server.");
1955 2066
1956 $ntb->set_current_page ($INVENTORY_PAGE); 2067 $ntb->set_current_page ($INVENTORY_PAGE);
1957 2068
1958 $plwin->add ($ntb); 2069 $plwin->add ($ntb);
1959 $plwin
1960} 2070}
1961 2071
1962sub keyboard_setup { 2072sub keyboard_setup {
1963 DC::Macro::keyboard_setup 2073 DC::Macro::keyboard_setup
1964} 2074}
1965 2075
1966sub help_window { 2076sub make_help_window {
1967 my $win = new DC::UI::Toplevel 2077 my $win = new DC::UI::Toplevel
1968 x => 'center', 2078 x => 'center',
1969 y => 'center', 2079 y => 'center',
1970 z => 4, 2080 z => 4,
1971 name => 'doc_browser', 2081 name => 'doc_browser',
… …
2060 2170
2061 $load_node->((DC::Pod::find @path)[0]); 2171 $load_node->((DC::Pod::find @path)[0]);
2062 $win->show; 2172 $win->show;
2063 }; 2173 };
2064 2174
2065 $win 2175 $HELP_WINDOW = $win;
2066}
2067
2068sub open_string_query {
2069 my ($title, $cb, $txt, $tooltip) = @_;
2070 my $dialog = new DC::UI::Toplevel
2071 x => "center",
2072 y => "center",
2073 z => 50,
2074 force_w => $WIDTH * 4/5,
2075 title => $title;
2076
2077 $dialog->add (
2078 my $e = new DC::UI::Entry
2079 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2080 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2081 tooltip => $tooltip
2082 );
2083
2084 $e->grab_focus;
2085 $e->set_text ($txt) if $txt;
2086 $dialog->show;
2087} 2176}
2088 2177
2089sub open_quit_dialog { 2178sub open_quit_dialog {
2090 unless ($QUIT_DIALOG) { 2179 unless ($QUIT_DIALOG) {
2091 $QUIT_DIALOG = new DC::UI::Toplevel 2180 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2113 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2202 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2114 ); 2203 );
2115 $hb->add (new DC::UI::Button 2204 $hb->add (new DC::UI::Button
2116 text => "Quit anyway", 2205 text => "Quit anyway",
2117 expand => 1, 2206 expand => 1,
2118 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2207 on_activate => sub {
2208 crash "Quit anyway";
2209 EV::unloop EV::UNLOOP_ALL;
2210 },
2119 ); 2211 );
2120 } 2212 }
2121 2213
2122 $QUIT_DIALOG->show; 2214 $QUIT_DIALOG->show;
2123 $QUIT_DIALOG->grab_focus; 2215 $QUIT_DIALOG->grab_focus;
2216}
2217
2218sub make_menubar {
2219 $MENUFRAME = new DC::UI::Toplevel
2220 border => 0,
2221 force_x => 0,
2222 force_y => 0,
2223 force_w => $::WIDTH,
2224 child => ($MENUBAR = new DC::UI::HBox),
2225 ;
2226
2227 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2228
2229 # XXX: this has to be done before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2230 make_gauge_window->show;
2231
2232# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2233# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2234
2235 make_playerbook;
2236
2237 $MENUPOPUP = DC::UI::Menu->new (items => [
2238 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2239 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2240 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2241 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2242 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2243 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2244 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2245 ["Quit…" , sub {
2246 if ($CONN) {
2247 open_quit_dialog;
2248 } else {
2249 EV::unloop EV::UNLOOP_ALL;
2250 }
2251 }],
2252 ]);
2253
2254 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2255 tooltip => "Shows the main menu",
2256 on_button_down => sub {
2257 my ($self, $ev) = @_;
2258 local $ev->{x} = 0;
2259 local $ev->{y} = 0;
2260 $MENUPOPUP->popup ($ev);
2261 },
2262 );
2263
2264 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2265 padding_x => 6,
2266 padding_y => 3,
2267 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2268 template => " Exp: 888,888,888,888 (lvl 188) ",
2269 );
2270
2271 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2272 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2273 . "will automatically pick up items as defined by your item pickup settings "
2274 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2275 . "disable autopickup by disabling this checkbox.",
2276 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2277 on_changed => sub {
2278 my ($self, $value) = @_;
2279 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2280 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2281 $CONN->send_pickup ($CFG->{pickup})
2282 if $CONN;
2283 },
2284 );
2285
2286 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2287 c_rescale => 1,
2288 padding_x => 6,
2289 padding_y => 3,
2290 force_w => $::WIDTH * 0.2,
2291 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2292 template => "two handed weapons 99%",
2293 );
2294
2295 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2296 expand => 1,
2297 align => 1, can_hover => 1, can_events => 1,
2298 text => "Range and Combat Slots",
2299 tooltip => "#stat_ranged",
2300 );
2301
2302 $MENUFRAME->show;
2303}
2304
2305sub open_string_query {
2306 my ($title, $cb, $txt, $tooltip) = @_;
2307 my $dialog = new DC::UI::Toplevel
2308 x => "center",
2309 y => "center",
2310 z => 50,
2311 force_w => $WIDTH * 4/5,
2312 title => $title;
2313
2314 $dialog->add (
2315 my $e = new DC::UI::Entry
2316 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2317 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2318 tooltip => $tooltip
2319 );
2320
2321 $e->grab_focus;
2322 $e->set_text ($txt) if $txt;
2323 $dialog->show;
2124} 2324}
2125 2325
2126sub show_tip_of_the_day { 2326sub show_tip_of_the_day {
2127 # find all tips 2327 # find all tips
2128 my @tod = DC::Pod::find tip_of_the_day => "*"; 2328 my @tod = DC::Pod::find tip_of_the_day => "*";
… …
2181 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2381 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2182 and die "SDL::Init failed!\n"; 2382 and die "SDL::Init failed!\n";
2183} 2383}
2184 2384
2185sub video_init { 2385sub video_init {
2386 DC::set_theme $CFG->{uitheme};
2387
2186 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2388 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2187 $SDL_REINIT = 0; 2389 $SDL_REINIT = 0;
2188 2390
2189 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2391 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2190 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2392 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2191 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2393 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2192 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2394 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2193 2395
2194 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2396 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2195 2397
2196 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} >= @SDL_MODES) { 2398 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2197 $CFG->{sdl_mode} = 0; 2399 $CFG->{sdl_mode} = 0; # lowest resolution by default
2400
2401 # now choose biggest mode <= 1024x768
2198 for (reverse 0 .. $#SDL_MODES) { 2402 for (0 .. $#SDL_MODES) {
2199 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2403 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2404 $CFG->{sdl_mode} = $_;
2405 }
2200 } 2406 }
2201 } 2407 }
2202 2408
2203 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2409 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2204 2410
2205 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2411 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2206 $FULLSCREEN = $CFG->{fullscreen}; 2412 $FULLSCREEN = $CFG->{fullscreen};
2207 $FAST = $CFG->{fast}; 2413 $FAST = $CFG->{fast};
2208 2414
2415 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2209 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2416 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2417 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2210 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2418 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2211 2419
2212 $SDL_ACTIVE = 1; 2420 $SDL_ACTIVE = 1;
2213 $LAST_REFRESH = time - 0.01; 2421 $LAST_REFRESH = time - 0.01;
2214 2422
… …
2261 2469
2262 (new DC::UI::Frame 2470 (new DC::UI::Frame
2263 bg => [0, 0, 0, 0.4], 2471 bg => [0, 0, 0, 0.4],
2264 force_x => 0, 2472 force_x => 0,
2265 force_y => "max", 2473 force_y => "max",
2266 child => (my $LR = new DC::UI::VBox), 2474 child => (my $LL = new DC::UI::VBox),
2267 )->show; 2475 )->show;
2268 2476
2269 $LR->add ($STATUSBOX); 2477 $LL->add ($STATUSBOX);
2270 $LR->add ($MODBOX); 2478 $LL->add ($MODBOX);
2271 $LR->add (new DC::UI::Label 2479 $LL->add (new DC::UI::Label
2272 align => 0, 2480 align => 0,
2273 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2481 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2274 fontsize => 0.5, 2482 fontsize => 0.5,
2275 fg => [1, 1, 0, 0.7], 2483 fg => [1, 1, 0, 0.7],
2276 ); 2484 );
2277 2485
2278 DC::UI::Toplevel->new ( 2486 DC::UI::Toplevel->new (
2279 title => "Minimap", 2487 title => "Minimap",
2280 name => "mapmap", 2488 name => "mapmap",
2281 x => 0, 2489 x => 0,
2282 y => $FONTSIZE + 8, 2490 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2283 border_bg => [1, 1, 1, 192/255], 2491 border_bg => [1, 1, 1, 192/255],
2284 bg => [1, 1, 1, 0], 2492 bg => [1, 1, 1, 0],
2285 child => ($MAPMAP = new DC::MapWidget::MapMap 2493 child => ($MAPMAP = new DC::MapWidget::MapMap
2286 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2494 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2287 ), 2495 ),
2288 )->show; 2496 )->show;
2289 2497
2290 $MAPWIDGET = new DC::MapWidget; 2498 $MAPWIDGET = new DC::MapWidget;
2291 $MAPWIDGET->connect (activate_console => sub { 2499 $MAPWIDGET->connect (activate_console => sub {
… …
2316 $METASERVER = metaserver_dialog; 2524 $METASERVER = metaserver_dialog;
2317 # the name is changed to not conflict with the older name as users could have hidden it 2525 # the name is changed to not conflict with the older name as users could have hidden it
2318 $MESSAGE_WINDOW = new DC::UI::Dockbar 2526 $MESSAGE_WINDOW = new DC::UI::Dockbar
2319 name => "message_window2", 2527 name => "message_window2",
2320 title => 'Messages', 2528 title => 'Messages',
2529 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2321 force_w => $::WIDTH * 0.6, 2530 force_w => $::WIDTH * 0.6,
2322 force_h => $::HEIGHT * 0.25, 2531 force_h => $::HEIGHT * 0.25,
2323 ; 2532 ;
2324 2533
2325 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2534 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2345 . "After pressing the combo the binding will be saved automatically and the " 2554 . "After pressing the combo the binding will be saved automatically and the "
2346 . "binding editor closes"); 2555 . "binding editor closes");
2347 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2556 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2348 "Some debuggin' options. Do not ask."); 2557 "Some debuggin' options. Do not ask.");
2349 2558
2350 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2559 make_help_window;
2560 make_menubar;
2351 2561
2352 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2353 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2354
2355# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2356# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2357
2358 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
2359
2360 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2361 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2362
2363 $BUTTONBAR->add (new DC::UI::Button
2364 text => "Save Config",
2365 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2366 on_activate => sub {
2367 $::CFG->{layout} = DC::UI::get_layout;
2368 DC::write_cfg;
2369 status "Configuration Saved";
2370 0
2371 },
2372 );
2373
2374 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2375 tooltip => "View Documentation");
2376
2377 $BUTTONBAR->add (new DC::UI::Button
2378 text => "Quit",
2379 tooltip => "Terminates the program",
2380 on_activate => sub {
2381 if ($CONN) {
2382 open_quit_dialog;
2383 } else {
2384 EV::unloop EV::UNLOOP_ALL;
2385 }
2386 0
2387 },
2388 );
2389
2390 $BUTTONBAR->show;
2391 $SETUP_DIALOG->show; 2562 $SETUP_DIALOG->show;
2392 $MESSAGE_WINDOW->show; 2563 $MESSAGE_WINDOW->show;
2393 } 2564 }
2394 2565
2395 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2566 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2396 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2567 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2397 2568
2398 $CAVEAT_LABEL->set_text ("None :)"); 2569 $CAVEAT_LABEL->set_text ("None :)");
2399 $CAVEAT_LABEL->set_text ("Non-accelerated video mode") 2570 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2571 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2572 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2400 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2573 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2401 2574
2402 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2575 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2403} 2576}
2404 2577
… …
2431my $want_refresh = EV::prepare_ns \&force_refresh; 2604my $want_refresh = EV::prepare_ns \&force_refresh;
2432 2605
2433my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2606my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2434 $NOW = EV::now; 2607 $NOW = EV::now;
2435 2608
2436 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2609 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2437 for DC::poll_events; 2610 for DC::poll_events;
2438 2611
2439 if (%animate_object) { 2612 if (%animate_object) {
2440 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2613 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2441 $WANT_REFRESH = 1; 2614 $WANT_REFRESH = 1;
… …
2453sub animation_stop { 2626sub animation_stop {
2454 my ($widget) = @_; 2627 my ($widget) = @_;
2455 delete $animate_object{$widget}; 2628 delete $animate_object{$widget};
2456} 2629}
2457 2630
2458%SDL_CB = (
2459 DC::SDL_QUIT => sub { 2631$SDL_CB[DC::SDL_QUIT] = sub {
2632 crash "SDL_QUIT";
2460 EV::unloop EV::UNLOOP_ALL; 2633 EV::unloop EV::UNLOOP_ALL;
2461 }, 2634};
2462 DC::SDL_VIDEORESIZE => sub { 2635$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2463 },
2464 DC::SDL_VIDEOEXPOSE => sub { 2636$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2465 DC::UI::full_refresh; 2637 DC::UI::full_refresh;
2466 }, 2638};
2467 DC::SDL_ACTIVEEVENT => sub { 2639$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2468# not useful, as APPACTIVE includes only iconified state, not unmapped 2640# not useful, as APPACTIVE includes only iconified state, not unmapped
2469# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2641# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2470# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2642# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2471# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2643# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2472# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2644# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2473# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2645# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2474 }, 2646};
2475 DC::SDL_KEYDOWN => sub { 2647$SDL_CB[DC::SDL_KEYDOWN] = sub {
2476 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2648 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2477 # alt-enter 2649 # alt-enter
2478 video_shutdown; 2650 video_shutdown;
2479 $FULLSCREEN_ENABLE->toggle; 2651 $FULLSCREEN_ENABLE->toggle;
2480 video_init; 2652 video_init;
2481 } else { 2653 } else {
2482 &DC::UI::feed_sdl_key_down_event; 2654 &DC::UI::feed_sdl_key_down_event;
2483 } 2655 }
2484 update_modbox; 2656 update_modbox;
2485 }, 2657};
2486 DC::SDL_KEYUP => sub { 2658$SDL_CB[DC::SDL_KEYUP] = sub {
2487 &DC::UI::feed_sdl_key_up_event; 2659 &DC::UI::feed_sdl_key_up_event;
2488 update_modbox; 2660 update_modbox;
2489 }, 2661};
2490 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2662$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2491 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2663$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2492 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2664$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2493 DC::SDL_USEREVENT => sub { 2665$SDL_CB[DC::SDL_USEREVENT] = sub {
2494 if ($_[0]{code} == 1) { 2666 if ($_[0]{code} == 1) {
2495 audio_channel_finished $_[0]{data1}; 2667 audio_channel_finished $_[0]{data1};
2496 } elsif ($_[0]{code} == 0) { 2668 } elsif ($_[0]{code} == 0) {
2497 audio_music_finished; 2669 audio_music_finished;
2498 }
2499 }, 2670 }
2500); 2671};
2501 2672
2502############################################################################# 2673#############################################################################
2503 2674
2504$SIG{INT} = $SIG{TERM} = sub { 2675$SIG{INT} = $SIG{TERM} = sub {
2505 EV::unloop; 2676 EV::unloop;
2506 #d# TODO calling exit here hangs the process in some futex 2677 #d# TODO calling exit here hangs the process in some futex
2507}; 2678};
2508 2679
2509{ 2680# due to mac os x + sdl combined braindamage, we need this contortion
2681sub main {
2682 {
2510 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2683 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2511 2684
2512 if (-e "$Deliantra::VARDIR/client.cf") { 2685 if (-e "$Deliantra::VARDIR/client.cf") {
2513 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2686 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2514 } else { 2687 } else {
2515 #TODO: compatibility cruft 2688 #TODO: compatibility cruft
2516 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2689 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2517 print STDERR "INFO: used old configuration file\n"; 2690 print STDERR "INFO: used old configuration file\n";
2518 } 2691 }
2519 2692
2520 DC::DB::Server::run; 2693 DC::DB::Server::run;
2521 2694
2522 if ($CFG->{db_schema} < 1) { 2695 if ($CFG->{db_schema} < 1) {
2523 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2696 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2524 DC::DB::nuke_db; 2697 DC::DB::nuke_db;
2525 $CFG->{db_schema} = 1; 2698 $CFG->{db_schema} = 1;
2526 DC::write_cfg; 2699 DC::write_cfg;
2527 } 2700 }
2528 2701
2529 DC::DB::open_db; 2702 DC::DB::open_db;
2530 2703
2531 DC::UI::set_layout ($::CFG->{layout}); 2704 DC::UI::set_layout ($::CFG->{layout});
2532 2705
2533 my %DEF_CFG = ( 2706 my %DEF_CFG = (
2707 config_autosave => 1,
2534 sdl_mode => 0, 2708 sdl_mode => undef,
2535 fullscreen => 1, 2709 fullscreen => 1,
2536 fast => 0, 2710 fast => 0,
2537 force_opengl11 => undef, 2711 force_opengl11 => undef,
2538 disable_alpha => 0, 2712 disable_alpha => 0,
2713 smooth_movement => 1,
2539 texture_compression => 1, 2714 texture_compression => 1,
2540 map_scale => 1, 2715 map_scale => 1,
2541 fow_enable => 1, 2716 fow_enable => 1,
2542 fow_intensity => 0, 2717 fow_intensity => 0,
2543 map_smoothing => 1, 2718 map_smoothing => 1,
2544 gui_fontsize => 1, 2719 gui_fontsize => 1,
2545 log_fontsize => 0.7, 2720 log_fontsize => 0.7,
2546 gauge_fontsize => 1, 2721 gauge_fontsize => 1,
2547 gauge_size => 0.35, 2722 gauge_size => 0.35,
2548 stat_fontsize => 0.7, 2723 stat_fontsize => 0.7,
2549 mapsize => 100, 2724 mapsize => 100,
2550 audio_enable => 1, 2725 audio_enable => 1,
2551 audio_hw_channels => 0, 2726 audio_hw_channels => 0,
2552 audio_hw_frequency => 0, 2727 audio_hw_frequency => 0,
2553 audio_hw_chunksize => 0, 2728 audio_hw_chunksize => 0,
2554 audio_mix_channels => 8, 2729 audio_mix_channels => 8,
2555 effects_enable => 1, 2730 effects_enable => 1,
2556 effects_volume => 1, 2731 effects_volume => 1,
2557 bgm_enable => 1, 2732 bgm_enable => 1,
2558 bgm_volume => 0.5, 2733 bgm_volume => 0.5,
2559 output_rate => "", 2734 output_rate => "",
2560 pickup => 0, 2735 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2561 inv_sort => "mtime", 2736 inv_sort => "mtime",
2562 default => "profile", # default profile 2737 default => "profile", # default profile
2563 show_tips => 1, 2738 show_tips => 1,
2564 logview_max_par => 1000, 2739 logview_max_par => 1000,
2565 shift_fire_stop => 0, 2740 shift_fire_stop => 0,
2741 uitheme => "wood",
2742 map_shift_x => -24, # arbitrary
2743 map_shift_y => +24, # arbitrary
2566 ); 2744 );
2567 2745
2568 while (my ($k, $v) = each %DEF_CFG) { 2746 while (my ($k, $v) = each %DEF_CFG) {
2569 $CFG->{$k} = $v unless exists $CFG->{$k}; 2747 $CFG->{$k} = $v unless exists $CFG->{$k};
2570 } 2748 }
2571 2749
2572 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2750 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2573 $PROFILE = $CFG->{profile}{default}; 2751 $PROFILE = $CFG->{profile}{default};
2574 2752
2575 # convert old bindings (only default profile matters) 2753 # convert old bindings (only default profile matters)
2576 if (my $bindings = delete $PROFILE->{bindings}) { 2754 if (my $bindings = delete $PROFILE->{bindings}) {
2577 while (my ($mod, $syms) = each %$bindings) { 2755 while (my ($mod, $syms) = each %$bindings) {
2578 while (my ($sym, $cmds) = each %$syms) { 2756 while (my ($sym, $cmds) = each %$syms) {
2579 push @{ $PROFILE->{macro} }, { 2757 push @{ $PROFILE->{macro} }, {
2580 accelkey => [$mod*1, $sym*1], 2758 accelkey => [$mod*1, $sym*1],
2581 action => $cmds, 2759 action => $cmds,
2760 };
2582 }; 2761 }
2583 } 2762 }
2584 } 2763 }
2585 }
2586 2764
2587 sdl_init; 2765 sdl_init;
2588 2766
2589 { 2767 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2768 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2769
2770 {
2590 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2771 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2591 DejaVuSans.ttf 2772 DejaVuSans.ttf
2592 DejaVuSansMono.ttf 2773 DejaVuSansMono.ttf
2593 DejaVuSans-Bold.ttf 2774 DejaVuSans-Bold.ttf
2594 DejaVuSansMono-Bold.ttf 2775 DejaVuSansMono-Bold.ttf
2595 DejaVuSans-Oblique.ttf 2776 DejaVuSans-Oblique.ttf
2596 DejaVuSansMono-Oblique.ttf 2777 DejaVuSansMono-Oblique.ttf
2597 DejaVuSans-BoldOblique.ttf 2778 DejaVuSans-BoldOblique.ttf
2598 DejaVuSansMono-BoldOblique.ttf 2779 DejaVuSansMono-BoldOblique.ttf
2780 mona.ttf
2599 ); 2781 );
2600 2782
2601 DC::add_font $_ for @fonts; 2783 DC::add_font $_ for @fonts;
2602 2784
2603 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2785 $FONT_PROP = new_from_file DC::Font $fonts[0];
2604 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2786 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2605 2787
2606 $FONT_PROP->make_default; 2788 $FONT_PROP->make_default;
2607 2789
2608 DC::pango_init; 2790 DC::pango_init;
2609 } 2791 }
2610 2792
2611# compare mono (ft) vs. rgba (cairo) 2793# compare mono (ft) vs. rgba (cairo)
2612# ft - 1.8s, cairo 3s, even in alpha-only mode 2794# ft - 1.8s, cairo 3s, even in alpha-only mode
2613# for my $rgba (0..1) { 2795# for my $rgba (0..1) {
2614# my $t1 = Time::HiRes::time; 2796# my $t1 = Time::HiRes::time;
… …
2619# } 2801# }
2620# my $t2 = Time::HiRes::time; 2802# my $t2 = Time::HiRes::time;
2621# warn $t2-$t1; 2803# warn $t2-$t1;
2622# } 2804# }
2623 2805
2624 video_init; 2806 video_init;
2625 audio_init; 2807 audio_init;
2626} 2808 }
2627 2809
2628show_tip_of_the_day if $CFG->{show_tips}; 2810 show_tip_of_the_day if $CFG->{show_tips};
2629 2811
2630our $STARTUP_CANCEL = EV::idle sub { 2812 our $STARTUP_CANCEL = EV::idle sub {
2631 undef $::STARTUP_CANCEL; 2813 undef $::STARTUP_CANCEL;
2632 $startup_done->(); 2814 $startup_done->();
2633}; 2815 };
2634 2816
2635delete $SIG{__DIE__}; 2817 delete $SIG{__DIE__};
2636EV::loop; 2818 EV::loop;
2637 2819
2820 DC::write_cfg if $CFG->{config_autosave};
2821
2638#video_shutdown; 2822 #video_shutdown;
2639#audio_shutdown; 2823 #audio_shutdown;
2824
2640DC::OpenGL::quit; 2825 DC::OpenGL::quit;
2641DC::SDL_Quit; 2826 DC::SDL_Quit;
2642DC::DB::Server::stop; 2827 DC::DB::Server::stop;
2828}
2829
2830DC::SDL_braino; # see sub above
2643 2831
2644=head1 NAME 2832=head1 NAME
2645 2833
2646deliantra - A Deliantra MORPG game client 2834deliantra - A Deliantra MORPG game client
2647 2835
… …
2664 4 show fps 2852 4 show fps
2665 8 suppress tooltips 2853 8 suppress tooltips
2666 2854
2667=head1 AUTHOR 2855=head1 AUTHOR
2668 2856
2669Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2857Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2670 2858
2671 2859
2672 2860

Diff Legend

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