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.65 by root, Sat Aug 30 06:49:05 2008 UTC vs.
Revision 1.106 by root, Sat Apr 3 03:02:28 2010 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 {
27 Win32::GUI::SplashScreen::Done (1); 32 Win32::GUI::SplashScreen::Done (1);
28 }; 33 };
29 } 34 }
30} 35}
31 36
32use strict; 37use common::sense;
33use utf8;
34 38
35use Carp 'verbose'; 39use Carp 'verbose';
36 40
37# do things only needed for single-binary version (par) 41# do things only needed for single-binary version (par)
38BEGIN { 42BEGIN {
49 } 53 }
50 } 54 }
51 55
52 if ($^O eq "MSWin32") { 56 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 57 # pango is relocatable on win32
54 } elsif (-e "$root/pangoversion") {
55 open my $fh, "<:perlio", "$root/pangoversion"
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";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
72 or die "$ENV{PANGO_RC_FILE}: $!";
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } else { 58 } else {
75 # OS X 59 # OS X
76 $ENV{FC_CONFIG_FILE} = "$root/fonts.conf"; # no effect??!?!
77 $ENV{FC_CONFIG_DIR} = $root; # no effect??!?!
78 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
79 $ENV{DYLD_LIBRARY_PATH} = $root; 61 $ENV{DYLD_LIBRARY_PATH} = $root;
80 chdir $root; # for pango modules, maybe other things 62 chdir $root; # for pango modules, maybe other things
81 } 63 }
82 64
83 unshift @INC, $root; 65 unshift @INC, $root;
84 } 66 }
85} 67}
86 68
87# prepend private library directory 69# prepend private library directory and prepare env
88BEGIN { 70BEGIN {
89 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
90 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
91 if (-d $path) { 73 if (-d $path) {
92 unshift @INC, $path; 74 unshift @INC, $path;
97 79
98# need to do it again because that pile of garbage called PAR nukes it before main 80# need to do it again because that pile of garbage called PAR nukes it before main
99unshift @INC, $ENV{PAR_TEMP} 81unshift @INC, $ENV{PAR_TEMP}
100 if %PAR::LibCache; 82 if %PAR::LibCache;
101 83
102use Time::HiRes 'time';
103use EV; 84use EV;
85BEGIN { *time = \&EV::time }
86
104use List::Util qw(max min); 87use List::Util qw(max min);
105 88
106use Deliantra; 89use Deliantra;
107use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
108 91
109use AnyEvent::DNS; 92use AnyEvent::Util ();
110use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
111 95
112use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
113 98
114use DC; 99use DC;
115BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$_[0]" unless $^S } } 100
101sub crash($;$) {
102 # nop during compiletime
103}
104
105BEGIN {
106 $SIG{__DIE__} = sub {
107 return if $^S;
108 crash "CRASH/DIE: $_[0]" => 1;
109 DC::fatal Carp::longmess "$_[0]";
110 }
111}
112
116use DC::OpenGL (); 113use DC::OpenGL ();
117use DC::Protocol; 114use DC::Protocol;
118use DC::DB; 115use DC::DB;
119use DC::UI; 116use DC::UI;
120use DC::UI::Canvas; 117use DC::UI::Canvas;
130 127
131$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
132$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
133 130
134$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
135 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
136}; 134};
137 135
138my $MAX_FPS = 60; 136my $MAX_FPS = 60;
139 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
140our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
141 141
142our $LAST_REFRESH; 142our $LAST_REFRESH;
143our $NOW; 143our $NOW;
144 144
145our $CFG; 145our $CFG;
146our $CONN;
147our $PROFILE; # current profile 146our $PROFILE; # current profile
148our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
149 148
150our $WANT_REFRESH; 149our $WANT_REFRESH;
151 150
160our $FONTSIZE; 159our $FONTSIZE;
161 160
162our $FONT_PROP; 161our $FONT_PROP;
163our $FONT_FIXED; 162our $FONT_FIXED;
164 163
164our $CONN;
165
165our $MAP; 166our $MAP;
166our $MAPMAP; 167our $MAPMAP;
167our $MAPWIDGET; 168our $MAPWIDGET;
168our $COMPLETER; 169our $COMPLETER;
169our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
170our $METASERVER; 174our $METASERVER;
171our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
172our $QUIT_DIALOG; 176our $QUIT_DIALOG;
173our $HOST_ENTRY; 177our $HOST_ENTRY;
174our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
200our $FLOORBOX; 204our $FLOORBOX;
201our $GAUGES; 205our $GAUGES;
202our $STATWIDS; 206our $STATWIDS;
203 207
204our $SDL_ACTIVE; 208our $SDL_ACTIVE;
205our %SDL_CB; 209our @SDL_CB;
206 210
207our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
208our $STATUSBOX; 212our $STATUSBOX;
209our $MODBOX; 213our $MODBOX;
210our $DEBUG_STATUS; 214our $DEBUG_STATUS;
211 215
212our $INV; 216our $INV;
213our $INVR; 217our $INVR;
214our $INVR_HB; 218our $INVR_HB;
219
220#############################################################################
221
222# write a crash message blockingly to the socket, if possible
223# this is a bit too complicated for my tastes, but it was easy.
224*crash = sub($;$) {
225 my ($msg, $backtrace) = @_;
226
227 warn $msg;
228
229 return unless $CONN;
230
231 my $fh = $CONN->{fh}
232 or return;
233
234 my $buf = delete $CONN->{wbuf};
235
236 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
237
238 AnyEvent::Util::fh_nonblocking $fh, 0;
239 syswrite $fh, $buf;
240 AnyEvent::Util::fh_nonblocking $fh, 1;
241
242 $msg =~ s/\s+$//;
243
244 # backtrace as second step, in case it crashes, too
245 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
246 if $backtrace;
247};
248
249sub clienterror($;$) {
250 my ($msg, $backtrace) = @_;
251
252 warn $msg;
253
254 return unless $CONN;
255
256 $CONN->send_exti_msg (clientlog => $msg);
257 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
258}
215 259
216############################################################################# 260#############################################################################
217 261
218sub status { 262sub status {
219 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 263 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
301 or return; 345 or return;
302 346
303 $meta->{data} 347 $meta->{data}
304 or return; 348 or return;
305 349
306 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
307 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
308 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 352 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
309 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
310 &audio_music_push ($face); 354 &audio_music_push ($face);
311 } 355 }
312 } else { 356 } else {
313 # fetch from database 357 # fetch from database
314 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
315 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
316 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
317 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 361 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
318 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
319 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
320 364
321 audio_sound_push ($face); 365 audio_sound_push ($face);
322 }; 366 };
369 413
370 audio_music_update_volume; 414 audio_music_update_volume;
371 415
372 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
373 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
374 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
375 ? new_from_file DC::RW $meta->{path} 422 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
376 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
377 424
378 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
379 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
380 427
381 my $NOW = time; 428 my $NOW = time;
382 429
383 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
384 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
493 sub audio_tab_update; 540 sub audio_tab_update;
494 audio_tab_update; 541 audio_tab_update;
495} 542}
496 543
497sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
498 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
499 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
500 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
501 553
502 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
742} 794}
743 795
744sub dc_connect { 796sub dc_connect {
745 my ($host, $port) = @_; 797 my ($host, $port) = @_;
746 798
747 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 799 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
800 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
748 801
749 $CONN = 802 $CONN =
750 new DC::Protocol 803 new DC::Protocol
751 host => $host, 804 host => $host,
752 port => $port, 805 port => $port,
753 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
754 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
755 mapw => $mapsize, 808 mapw => $mapw,
756 maph => $mapsize, 809 maph => $maph,
757 810
758 client => "$DC::VERSION $] $^O", 811 client => "$DC::VERSION $] $^O",
759 812
760 map_widget => $MAPWIDGET, 813 map_widget => $MAPWIDGET,
761 statusbox => $STATUSBOX, 814 statusbox => $STATUSBOX,
769 822
770 on_connect => sub { 823 on_connect => sub {
771 if ($_[0]) { 824 if ($_[0]) {
772 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
773 826
774 status "login successful"; 827 status "successfully connected to the server";
775 } else { 828 } else {
776 undef $CONN; 829 undef $CONN;
777 status "unable to connect: $!"; 830 status "unable to connect: $!";
778 stop_game(); 831 stop_game();
779 } 832 }
781 ; 834 ;
782} 835}
783 836
784sub start_game { 837sub start_game {
785 status "logging in..."; 838 status "logging in...";
839
840 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
841 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
842 or return status "$server: unable to parse server address, try an empty field.";
786 843
787 $LOGIN_BUTTON->set_text ("Logout"); 844 $LOGIN_BUTTON->set_text ("Logout");
788 $SETUP_DIALOG->hide; 845 $SETUP_DIALOG->hide;
789
790 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
791 846
792 $MAP = new DC::Map; 847 $MAP = new DC::Map;
793 848
794 # hack to make SURE we find the IP address all right 849 # hack to make SURE we find the IP address all right
795 # can be removed once AnyEvent::DNS is proven stable. 850 # can be removed once AnyEvent::DNS is proven stable.
796 if ($host eq "gameserver.deliantra.net") { 851 if ($host eq "gameserver.deliantra.net") {
797 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 852 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
798 if ($_[0] ne "80.101.114.108") { # Perl 853 if ($_[0] ne "80.101.114.108") { # Perl
854 status "dns failure, trying differently";
855 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
856 unless (defined $host) {
799 status "dns failure, using hardcoded address"; 857 status "dns failure, using hardcoded address";
800 $host = "129.13.162.95"; 858 $host = "129.13.162.95";
859 }
801 } 860 }
802 861
803 dc_connect $host, $port; 862 dc_connect $host, $port;
804 }; 863 };
805 } else { 864 } else {
806 dc_connect $host, $port; 865 dc_connect $host, $port;
807 } 866 }
808} 867}
809 868
810sub stop_game { 869sub stop_game {
870 crash "stop_game";
871
811 $LOGIN_BUTTON->set_text ("Login / Register"); 872 $LOGIN_BUTTON->set_text ("Login / Register");
812 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 873 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
813 $SETUP_DIALOG->show; 874 $SETUP_DIALOG->show;
814 $PL_WINDOW->hide; 875 $PL_WINDOW->hide;
815 $SPELL_LIST->clear_spells; 876 $SPELL_LIST->clear_spells;
829} 890}
830 891
831sub graphics_setup { 892sub graphics_setup {
832 my $vbox = new DC::UI::VBox; 893 my $vbox = new DC::UI::VBox;
833 894
895 {
896 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
897
834 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 898 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
835 899
836 my $row = 0; 900 my $row = 0;
837 901
838 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 902 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
839 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 903 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
840 can_events => 1, 904 can_events => 1,
841 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 905 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
842 906
843 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
844 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 908 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
845 can_events => 1, 909 can_events => 1,
846 tooltip => "This field shows any known issues with your config or driver, such as " 910 tooltip => "This field shows any known issues with your config or driver, such as "
847 . "a non-accelerated display format. You can try to work around these issues " 911 . "a non-accelerated display format. You can try to work around these issues "
848 . "by selecting a different video mode, changing the settings below or " 912 . "by selecting a different video mode, changing the settings below or "
849 . "by installing the right driver for your graphics card."); 913 . "by installing the right driver for your graphics card.");
850 914
915 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
916 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
917 value => $CFG->{uitheme},
918 options => [
919 [wood => "Wood (the default)"],
920 [plain => "Plain (very)"],
921 [blue => "Blue (dark)"],
922 [metal => "Metal (light)"],
923 ],
924 tooltip => "Choose the User Interface theme that you like most :)",
925 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
926 );
927
851 my $vidmode_tooltip = 928 my $vidmode_tooltip =
852 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 929 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
853 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 930 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
854 931
855 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
856 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
857 934
858 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 935 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
936 c_rescale => 1,
859 force_w => $WIDTH * 0.1, expand => 1, 937 force_w => $WIDTH * 0.1, expand => 1,
860 range => [ ($CFG->{sdl_mode}) x 3 ], 938 range => [ ($CFG->{sdl_mode}) x 3 ],
861 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
862 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
863 height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
864 can_events => 1, tooltip => $vidmode_tooltip); 942 can_events => 1, tooltip => $vidmode_tooltip);
865 943
866 $MODE_SLIDER->connect (changed => sub { 944 $MODE_SLIDER->connect (changed => sub {
867 my ($self, $value) = @_;
868
869 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
870 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
871 });
872 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
873
874 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
875 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
876 state => $CFG->{fullscreen},
877 tooltip => "Bring the client into fullscreen mode.",
878 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
879 );
880
881 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
882 $table->add_at (1, $row++, new DC::UI::CheckBox
883 state => $CFG->{force_opengl11},
884 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
885 . "higher memory usage and slower performance. It will, however, help tremendously on "
886 . "cards that claim to support a feature but fall back to software rendering. "
887 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
888 . "but cards and drivers from other vendors (ATI) are often just as bad. "
889 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
890 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
891 );
892
893 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
894 $table->add_at (1, $row++, new DC::UI::CheckBox
895 state => $CFG->{disable_alpha},
896 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
897 . "by disabling a number of textures and transparency effects. Normally, these "
898 . "effects do not cost a lot of resources, but some graphics cards might fall "
899 . "back to etxremely slow rendering if this is enabled. If disabling this option "
900 . "noticably improves the framerate of the client please report this! "
901 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
902 on_changed => sub {
903 my ($self, $value) = @_; 945 my ($self, $value) = @_;
946
947 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
948 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
949 });
950 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
951
952 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
953 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
954 state => $CFG->{fullscreen},
955 tooltip => "Bring the client into fullscreen mode.",
956 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
957 );
958
959 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
960 $table->add_at (1, $row++, new DC::UI::CheckBox
961 state => $CFG->{force_opengl11},
962 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
963 . "higher memory usage and slower performance. It will, however, help tremendously on "
964 . "cards that claim to support a feature but fall back to software rendering. "
965 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
966 . "but cards and drivers from other vendors (ATI) are often just as bad. "
967 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
968 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
969 );
970
971 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
972 $table->add_at (1, $row++, new DC::UI::CheckBox
973 state => $CFG->{disable_alpha},
974 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
975 . "by disabling a number of textures and transparency effects. Normally, these "
976 . "effects do not cost a lot of resources, but some graphics cards might fall "
977 . "back to extremely slow rendering if this is enabled. If disabling this option "
978 . "noticably improves the framerate of the client please report this! "
979 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
980 on_changed => sub {
981 my ($self, $value) = @_;
904 $CFG->{disable_alpha} = $value; 982 $CFG->{disable_alpha} = $value;
905 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 983 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
984 0
906 0 985 }
907 } 986 );
908 );
909 987
910 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 988 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
911 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
912 state => $CFG->{texture_compression}, 990 state => $CFG->{texture_compression},
913 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 991 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
914 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). " 992 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
915 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in " 993 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
916 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 994 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
917 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 995 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
918 ); 996 );
919 997
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 998 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
921 $table->add_at (1, $row++, new DC::UI::CheckBox 999 $table->add_at (1, $row++, new DC::UI::CheckBox
922 state => $CFG->{fast}, 1000 state => $CFG->{fast},
923 tooltip => "Lower the visual quality considerably to speed up rendering.", 1001 tooltip => "Lower the visual quality considerably to speed up rendering.",
924 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
925 ); 1003 );
926 1004
927 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1005 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
928 $table->add_at (1, $row++, new DC::UI::Slider 1006 $table->add_at (1, $row++, new DC::UI::Slider
929 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1007 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
930 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1008 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
931 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1009 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
932 ); 1010 );
933 1011
934 $table->add_at (1, $row++, new DC::UI::Button 1012 $table->add_at (1, $row++, new DC::UI::Button
935 expand => 1, text => "Apply", 1013 expand => 1, text => "Apply",
936 tooltip => "Apply the video settings above.", 1014 tooltip => "Apply the video settings above.",
937 on_activate => sub { 1015 on_activate => sub {
938 video_shutdown (); 1016 video_shutdown ();
939 video_init (); 1017 video_init ();
1018 0
940 0 1019 }
941 } 1020 );
942 ); 1021 }
943 1022
1023 {
1024 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1025
1026 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1027
1028 my $row = 0;
944 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1029 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
945 $table->add_at (1, $row++, new DC::UI::CheckBox 1030 $table->add_at (1, $row++, new DC::UI::CheckBox
946 state => $CFG->{smooth_movement}, 1031 state => $CFG->{smooth_movement},
947 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1032 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
948 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1033 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
949 . "then disable this option. Changes take effect immdiately.", 1034 . "then disable this option. Changes take effect immdiately.",
950 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1035 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
951 ); 1036 );
952 1037
1038 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1039 $table->add_at (1, $row++, new DC::UI::CheckBox
1040 state => $CFG->{smooth_transitions},
1041 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1042 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1043 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1044 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1045 );
1046
1047
953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1048 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
954 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
955 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
956 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
957 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1052 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
958 ); 1053 );
959 1054
960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1055 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
961 $table->add_at (1, $row++, new DC::UI::CheckBox 1056 $table->add_at (1, $row++, new DC::UI::CheckBox
962 state => $CFG->{map_smoothing}, 1057 state => $CFG->{map_smoothing},
963 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1058 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
964 . "This increases load on the graphics subsystem and works only with TRT servers. " 1059 . "This increases load on the graphics subsystem and works only with TRT servers. "
965 . "Changes take effect at next login only.", 1060 . "Changes take effect at next login only.",
966 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1061 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
967 ); 1062 );
968 1063
969 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1064 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
970 $table->add_at (1, $row++, new DC::UI::CheckBox 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
971 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
972 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1067 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
973 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
974 ); 1069 );
975 1070
1071 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1072 $table->add_at (1, $row++, new DC::UI::ImageButton
1073 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1074 bg => [0.3, 0.3, 0.2],
1075 force_w => 64,
1076 force_h => 64,
1077 tooltip => "<b>Fog of War Pattern.</b> The pattern that is overlaid over areas hidden from view. Click to cycle through various alternatives. Changes are instant.",
1078 on_activate => sub {
1079 my ($self) = @_;
1080 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1081 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1082 $MAPWIDGET->update;
1083 }
1084 );
1085
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1086 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
977 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
978 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
979 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1089 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
980 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
981 ); 1091 );
982 1092
983 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1093 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
984 $table->add_at (1, $row++, new DC::UI::Slider 1094 $table->add_at (1, $row++, new DC::UI::Slider
985 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1095 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
986 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1096 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
987 . "but you still need to press apply to correctly re-layout the widget.", 1097 . "but you still need to press apply to correctly re-layout the widget.",
988 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1098 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
989 ); 1099 );
990 1100
991 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1101 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
992 $table->add_at (1, $row++, new DC::UI::Slider 1102 $table->add_at (1, $row++, new DC::UI::Slider
993 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1103 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
994 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1104 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
995 on_changed => sub { 1105 on_changed => sub {
996 $CFG->{gauge_fontsize} = $_[1]; 1106 $CFG->{gauge_fontsize} = $_[1];
997 &set_gauge_window_fontsize; 1107 &set_gauge_window_fontsize;
1108 0
998 0 1109 }
999 } 1110 );
1000 );
1001 1111
1002 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1112 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
1003 $table->add_at (1, $row++, new DC::UI::Slider 1113 $table->add_at (1, $row++, new DC::UI::Slider
1004 range => [$CFG->{gauge_size}, 0.2, 0.8], 1114 range => [$CFG->{gauge_size}, 0.2, 0.8],
1005 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1115 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1006 on_changed => sub { 1116 on_changed => sub {
1007 $CFG->{gauge_size} = $_[1]; 1117 $CFG->{gauge_size} = $_[1];
1008 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1118 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1119 0
1009 0 1120 }
1010 } 1121 );
1011 ); 1122 }
1012 1123
1013 $vbox 1124 $vbox
1014} 1125}
1015 1126
1016our $AUDIO_HW_CHUNKSIZE; 1127our $AUDIO_HW_CHUNKSIZE;
1029 1140
1030 my $text = !$freq 1141 my $text = !$freq
1031 ? "audio is off" 1142 ? "audio is off"
1032 : "audio is enabled\n" 1143 : "audio is enabled\n"
1033 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
1034 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1035 1148
1036 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
1037} 1150}
1038 1151
1039sub audio_setup { 1152sub audio_setup {
1179} 1292}
1180 1293
1181sub make_gauge_window { 1294sub make_gauge_window {
1182 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1183 1296
1184 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1185 force_x => 0, 1298 force_x => 0,
1186 force_y => "max", 1299 force_y => "max",
1187 force_w => $WIDTH, 1300 force_w => $WIDTH,
1188 force_h => $gh, 1301 force_h => $gh,
1189 ); 1302 );
1205 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1206 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1207 ], 1320 ],
1208 ); 1321 );
1209 1322
1210 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1323 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1211 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1324 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1212 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1325 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1213 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1326 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1214
1215 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1216 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1217 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1218 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1219
1220 $GAUGES = {
1221 exp => $exp, prg => $prg, sklprg => $sklprg,
1222 win => $win, range => $rng,
1223 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1224 };
1225 1327
1226 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1227 1329
1228 $win 1330 $win
1229} 1331}
1570 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1672 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1571 ); 1673 );
1572 1674
1573 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1675 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1574 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1575 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1576 tooltip => "The name of your character on the server.", 1678 tooltip => "The name of your character on the server. The name is case-sensitive!",
1577 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1578 ); 1680 );
1579 1681
1580 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1682 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1581 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1582 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1583 hidden => 1, 1685 hidden => 1,
1584 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1585 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1586 ); 1688 );
1587 1689
1588 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1589 expand => 1, 1691 expand => 1,
1590 text => "Login / Register", 1692 text => "Login / Register",
1626 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1728 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1627 1729
1628 $vbox->add ( 1730 $vbox->add (
1629 $HOST_ENTRY = new DC::UI::Entry 1731 $HOST_ENTRY = new DC::UI::Entry
1630 expand => 1, 1732 expand => 1,
1631 text => $CFG->{profile}{default}{host}, 1733 text => $PROFILE->{host},
1632 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1734 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1633 on_changed => sub { 1735 on_changed => sub {
1634 my ($self, $value) = @_; 1736 my ($self, $value) = @_;
1635 $CFG->{profile}{default}{host} = $value; 1737 $PROFILE->{host} = $value;
1636 1 1738 1
1637 } 1739 }
1638 ); 1740 );
1639 1741
1640 if (0) { #d# disabled 1742 if (0) { #d# disabled
1683 1785
1684 my $row = 0; 1786 my $row = 0;
1685 1787
1686 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1788 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1687 $table->add_at (1, $row++, new DC::UI::CheckBox 1789 $table->add_at (1, $row++, new DC::UI::CheckBox
1790 c_colspan => 2,
1688 state => $CFG->{show_tips}, 1791 state => $CFG->{show_tips},
1689 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1792 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1690 on_changed => sub { 1793 on_changed => sub {
1691 my ($self, $value) = @_; 1794 my ($self, $value) = @_;
1692 $CFG->{show_tips} = $value; 1795 $CFG->{show_tips} = $value;
1694 } 1797 }
1695 ); 1798 );
1696 1799
1697 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1800 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1698 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1801 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1802 c_colspan => 2,
1699 text => $CFG->{logview_max_par}, 1803 text => $CFG->{logview_max_par},
1700 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1804 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1701 . "sends more messages than this number, older messages get removed to save memory and " 1805 . "sends more messages than this number, older messages get removed to save memory and "
1702 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1806 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1703 on_changed => sub { 1807 on_changed => sub {
1705 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1809 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1706 0 1810 0
1707 }, 1811 },
1708 ); 1812 );
1709 1813
1814 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1815 $table->add_at (1, $row, new DC::UI::CheckBox
1816 state => $CFG->{config_autosave},
1817 tooltip => "Normally, configuration settings and the user interface layout "
1818 . "are saved on client exit. You can disable this behaviour by "
1819 . "unchecking this checkbox.",
1820 on_changed => sub {
1821 my ($self, $value) = @_;
1822 $CFG->{config_autosave} = $value;
1823 0
1824 }
1825 );
1826 $table->add_at (2, $row++, new DC::UI::Button
1827 text => "Save Now",
1828 tooltip => "Use this to manually save configuration and UI layout when "
1829 . "autosave is disabled.",
1830 on_activate => sub {
1831 DC::write_cfg;
1832 0
1833 }
1834 );
1835
1710 $table 1836 $table
1711} 1837}
1712 1838
1713sub autopickup_setup { 1839sub autopickup_setup {
1714 my $r = new DC::UI::ScrolledWindow ( 1840 my $r = new DC::UI::ScrolledWindow (
1720 col_expand => [0, 1, 0, 1], 1846 col_expand => [0, 1, 0, 1],
1721 ); 1847 );
1722 1848
1723 for ( 1849 for (
1724 ["General", 0, 0, 1850 ["General", 0, 0,
1725 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1726 ["Inhibit autopickup" => PICKUP_INHIBIT], 1851# ["Inhibit autopickup" => PICKUP_INHIBIT],
1727 ["Stop before pickup" => PICKUP_STOP], 1852 ["Stop before pickup" => PICKUP_STOP],
1728 ["Debug autopickup" => PICKUP_DEBUG], 1853 ["Debug autopickup" => PICKUP_DEBUG],
1729 ], 1854 ],
1730 ["Weapons", 0, 6, 1855 ["Weapons", 0, 6,
1731 ["All weapons" => PICKUP_ALLWEAPON], 1856 ["All weapons" => PICKUP_ALLWEAPON],
1779 $::CFG->{pickup} |= $mask; 1904 $::CFG->{pickup} |= $mask;
1780 } else { 1905 } else {
1781 $::CFG->{pickup} &= ~$mask; 1906 $::CFG->{pickup} &= ~$mask;
1782 } 1907 }
1783 1908
1784 $::CONN->send_command ("pickup $::CFG->{pickup}") 1909 $::CONN->send_pickup ($::CFG->{pickup})
1785 if defined $::CONN; 1910 if defined $::CONN;
1786 1911
1787 0 1912 0
1788 }); 1913 });
1789 1914
1806 }); 1931 });
1807 1932
1808 $table->add_at (3, 18, new DC::UI::Button 1933 $table->add_at (3, 18, new DC::UI::Button
1809 text => "set", 1934 text => "set",
1810 on_activate => sub { 1935 on_activate => sub {
1811 $::CONN->send_command ("pickup $::CFG->{pickup}") 1936 $::CONN->send_pickup ($::CFG->{pickup})
1812 if defined $::CONN; 1937 if defined $::CONN;
1813 0 1938 0
1814 }); 1939 });
1815 1940
1816 $r 1941 $r
1817} 1942}
1818 1943
1819my %SORT_ORDER = ( 1944my %SORT_ORDER = (
1820 type => sub { 1945 type => sub {
1946 use sort 'stable';
1821 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1947 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1822 }, 1948 },
1823 mtime => sub { 1949 mtime => sub {
1950 use sort 'stable';
1824 my $NOW = time; 1951 my $NOW = time;
1825 sort { 1952 sort {
1826 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1953 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1827 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1954 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1828 1955
1829 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1956 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1830 or $btime <=> $atime 1957 or $btime <=> $atime
1831 or $a->{type} <=> $b->{type} 1958 or $a->{type} <=> $b->{type}
1832 } @_ 1959 } @_
1833 }, 1960 },
1834 weight => sub { sort { 1961 weight => sub {
1962 use sort 'stable';
1963 sort {
1835 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1964 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1836 or $a->{type} <=> $b->{type} 1965 or $a->{type} <=> $b->{type}
1837 } @_ }, 1966 } @_
1967 },
1838); 1968);
1839 1969
1840sub inventory_widget { 1970sub inventory_widget {
1841 my $hb = new DC::UI::HBox homogeneous => 1; 1971 my $hb = new DC::UI::HBox homogeneous => 1;
1842 1972
1929 $PL_NOTEBOOK->set_current_page ($widget); 2059 $PL_NOTEBOOK->set_current_page ($widget);
1930 $PL_WINDOW->show; 2060 $PL_WINDOW->show;
1931 } 2061 }
1932} 2062}
1933 2063
1934sub player_window { 2064sub make_playerbook {
1935 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2065 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1936 x => "center", 2066 x => "center",
1937 y => "center", 2067 y => "center",
1938 force_w => $WIDTH * 9/10, 2068 force_w => $WIDTH * 9/10,
1939 force_h => $HEIGHT * 9/10, 2069 force_h => $HEIGHT * 9/10,
1973 "License, Author and Source info for media sent by the server."); 2103 "License, Author and Source info for media sent by the server.");
1974 2104
1975 $ntb->set_current_page ($INVENTORY_PAGE); 2105 $ntb->set_current_page ($INVENTORY_PAGE);
1976 2106
1977 $plwin->add ($ntb); 2107 $plwin->add ($ntb);
1978 $plwin
1979} 2108}
1980 2109
1981sub keyboard_setup { 2110sub keyboard_setup {
1982 DC::Macro::keyboard_setup 2111 DC::Macro::keyboard_setup
1983} 2112}
1984 2113
1985sub help_window { 2114sub make_help_window {
1986 my $win = new DC::UI::Toplevel 2115 my $win = new DC::UI::Toplevel
1987 x => 'center', 2116 x => 'center',
1988 y => 'center', 2117 y => 'center',
1989 z => 4, 2118 z => 4,
1990 name => 'doc_browser', 2119 name => 'doc_browser',
2079 2208
2080 $load_node->((DC::Pod::find @path)[0]); 2209 $load_node->((DC::Pod::find @path)[0]);
2081 $win->show; 2210 $win->show;
2082 }; 2211 };
2083 2212
2084 $win 2213 $HELP_WINDOW = $win;
2085}
2086
2087sub open_string_query {
2088 my ($title, $cb, $txt, $tooltip) = @_;
2089 my $dialog = new DC::UI::Toplevel
2090 x => "center",
2091 y => "center",
2092 z => 50,
2093 force_w => $WIDTH * 4/5,
2094 title => $title;
2095
2096 $dialog->add (
2097 my $e = new DC::UI::Entry
2098 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2099 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2100 tooltip => $tooltip
2101 );
2102
2103 $e->grab_focus;
2104 $e->set_text ($txt) if $txt;
2105 $dialog->show;
2106} 2214}
2107 2215
2108sub open_quit_dialog { 2216sub open_quit_dialog {
2109 unless ($QUIT_DIALOG) { 2217 unless ($QUIT_DIALOG) {
2110 $QUIT_DIALOG = new DC::UI::Toplevel 2218 $QUIT_DIALOG = new DC::UI::Toplevel
2132 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2240 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2133 ); 2241 );
2134 $hb->add (new DC::UI::Button 2242 $hb->add (new DC::UI::Button
2135 text => "Quit anyway", 2243 text => "Quit anyway",
2136 expand => 1, 2244 expand => 1,
2137 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2245 on_activate => sub {
2246 crash "Quit anyway";
2247 EV::unloop EV::UNLOOP_ALL;
2248 },
2138 ); 2249 );
2139 } 2250 }
2140 2251
2141 $QUIT_DIALOG->show; 2252 $QUIT_DIALOG->show;
2142 $QUIT_DIALOG->grab_focus; 2253 $QUIT_DIALOG->grab_focus;
2254}
2255
2256sub make_menubar {
2257 $MENUFRAME = new DC::UI::Toplevel
2258 border => 0,
2259 force_x => 0,
2260 force_y => 0,
2261 force_w => $::WIDTH,
2262 child => ($MENUBAR = new DC::UI::HBox),
2263 ;
2264
2265 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2266
2267 # 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
2268 make_gauge_window->show;
2269
2270# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2271# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2272
2273 make_playerbook;
2274
2275 $MENUPOPUP = DC::UI::Menu->new (items => [
2276 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2277 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2278 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2279 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2280 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2281 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2282 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2283 ["Quit…" , sub {
2284 if ($CONN) {
2285 open_quit_dialog;
2286 } else {
2287 EV::unloop EV::UNLOOP_ALL;
2288 }
2289 }],
2290 ]);
2291
2292 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2293 tooltip => "Shows the main menu",
2294 on_button_down => sub {
2295 my ($self, $ev) = @_;
2296 local $ev->{x} = 0;
2297 local $ev->{y} = 0;
2298 $MENUPOPUP->popup ($ev);
2299 },
2300 );
2301
2302 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2303 padding_x => 6,
2304 padding_y => 3,
2305 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2306 template => " Exp: 888,888,888,888 (lvl 188) ",
2307 );
2308
2309 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2310 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2311 . "will automatically pick up items as defined by your item pickup settings "
2312 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2313 . "disable autopickup by disabling this checkbox.",
2314 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2315 on_changed => sub {
2316 my ($self, $value) = @_;
2317 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2318 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2319 $CONN->send_pickup ($CFG->{pickup})
2320 if $CONN;
2321 },
2322 );
2323
2324 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2325 c_rescale => 1,
2326 padding_x => 6,
2327 padding_y => 3,
2328 force_w => $::WIDTH * 0.2,
2329 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2330 template => "two handed weapons 99%",
2331 );
2332
2333 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2334 expand => 1,
2335 align => 1, can_hover => 1, can_events => 1,
2336 text => "Range and Combat Slots",
2337 tooltip => "#stat_ranged",
2338 );
2339
2340 $MENUFRAME->show;
2341}
2342
2343sub open_string_query {
2344 my ($title, $cb, $txt, $tooltip) = @_;
2345 my $dialog = new DC::UI::Toplevel
2346 x => "center",
2347 y => "center",
2348 z => 50,
2349 force_w => $WIDTH * 4/5,
2350 title => $title;
2351
2352 $dialog->add (
2353 my $e = new DC::UI::Entry
2354 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2355 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2356 tooltip => $tooltip
2357 );
2358
2359 $e->grab_focus;
2360 $e->set_text ($txt) if $txt;
2361 $dialog->show;
2143} 2362}
2144 2363
2145sub show_tip_of_the_day { 2364sub show_tip_of_the_day {
2146 # find all tips 2365 # find all tips
2147 my @tod = DC::Pod::find tip_of_the_day => "*"; 2366 my @tod = DC::Pod::find tip_of_the_day => "*";
2200 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2419 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2201 and die "SDL::Init failed!\n"; 2420 and die "SDL::Init failed!\n";
2202} 2421}
2203 2422
2204sub video_init { 2423sub video_init {
2424 DC::set_theme $CFG->{uitheme};
2425
2205 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2426 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2206 $SDL_REINIT = 0; 2427 $SDL_REINIT = 0;
2207 2428
2208 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2429 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2209 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2430 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2213 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2434 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2214 2435
2215 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2436 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2216 $CFG->{sdl_mode} = 0; # lowest resolution by default 2437 $CFG->{sdl_mode} = 0; # lowest resolution by default
2217 2438
2218 # now choose biggets mode <= 1024x768 2439 # now choose biggest mode <= 1024x768
2219 for (0 .. $#SDL_MODES) { 2440 for (0 .. $#SDL_MODES) {
2220 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2441 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2221 $CFG->{sdl_mode} = $_; 2442 $CFG->{sdl_mode} = $_;
2222 } 2443 }
2223 } 2444 }
2286 2507
2287 (new DC::UI::Frame 2508 (new DC::UI::Frame
2288 bg => [0, 0, 0, 0.4], 2509 bg => [0, 0, 0, 0.4],
2289 force_x => 0, 2510 force_x => 0,
2290 force_y => "max", 2511 force_y => "max",
2291 child => (my $LR = new DC::UI::VBox), 2512 child => (my $LL = new DC::UI::VBox),
2292 )->show; 2513 )->show;
2293 2514
2294 $LR->add ($STATUSBOX); 2515 $LL->add ($STATUSBOX);
2295 $LR->add ($MODBOX); 2516 $LL->add ($MODBOX);
2296 $LR->add (new DC::UI::Label 2517 $LL->add (new DC::UI::Label
2297 align => 0, 2518 align => 0,
2298 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2519 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2299 fontsize => 0.5, 2520 fontsize => 0.5,
2300 fg => [1, 1, 0, 0.7], 2521 fg => [1, 1, 0, 0.7],
2301 ); 2522 );
2302 2523
2303 DC::UI::Toplevel->new ( 2524 DC::UI::Toplevel->new (
2304 title => "Minimap", 2525 title => "Minimap",
2305 name => "mapmap", 2526 name => "mapmap",
2306 x => 0, 2527 x => 0,
2307 y => $FONTSIZE + 8, 2528 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2308 border_bg => [1, 1, 1, 192/255], 2529 border_bg => [1, 1, 1, 192/255],
2309 bg => [1, 1, 1, 0], 2530 bg => [1, 1, 1, 0],
2310 child => ($MAPMAP = new DC::MapWidget::MapMap 2531 child => ($MAPMAP = new DC::MapWidget::MapMap
2311 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2532 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2312 ), 2533 ),
2313 )->show; 2534 )->show;
2314 2535
2315 $MAPWIDGET = new DC::MapWidget; 2536 $MAPWIDGET = new DC::MapWidget;
2316 $MAPWIDGET->connect (activate_console => sub { 2537 $MAPWIDGET->connect (activate_console => sub {
2341 $METASERVER = metaserver_dialog; 2562 $METASERVER = metaserver_dialog;
2342 # the name is changed to not conflict with the older name as users could have hidden it 2563 # the name is changed to not conflict with the older name as users could have hidden it
2343 $MESSAGE_WINDOW = new DC::UI::Dockbar 2564 $MESSAGE_WINDOW = new DC::UI::Dockbar
2344 name => "message_window2", 2565 name => "message_window2",
2345 title => 'Messages', 2566 title => 'Messages',
2567 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2346 force_w => $::WIDTH * 0.6, 2568 force_w => $::WIDTH * 0.6,
2347 force_h => $::HEIGHT * 0.25, 2569 force_h => $::HEIGHT * 0.25,
2348 ; 2570 ;
2349 2571
2350 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2572 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2370 . "After pressing the combo the binding will be saved automatically and the " 2592 . "After pressing the combo the binding will be saved automatically and the "
2371 . "binding editor closes"); 2593 . "binding editor closes");
2372 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2594 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2373 "Some debuggin' options. Do not ask."); 2595 "Some debuggin' options. Do not ask.");
2374 2596
2375 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2597 make_help_window;
2598 make_menubar;
2376 2599
2377 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2378 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2379
2380# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2381# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2382
2383 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
2384
2385 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2386 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2387
2388 $BUTTONBAR->add (new DC::UI::Button
2389 text => "Save Config",
2390 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2391 on_activate => sub {
2392 $::CFG->{layout} = DC::UI::get_layout;
2393 DC::write_cfg;
2394 status "Configuration Saved";
2395 0
2396 },
2397 );
2398
2399 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2400 tooltip => "View Documentation");
2401
2402 $BUTTONBAR->add (new DC::UI::Button
2403 text => "Quit",
2404 tooltip => "Terminates the program",
2405 on_activate => sub {
2406 if ($CONN) {
2407 open_quit_dialog;
2408 } else {
2409 EV::unloop EV::UNLOOP_ALL;
2410 }
2411 0
2412 },
2413 );
2414
2415 $BUTTONBAR->show;
2416 $SETUP_DIALOG->show; 2600 $SETUP_DIALOG->show;
2417 $MESSAGE_WINDOW->show; 2601 $MESSAGE_WINDOW->show;
2418 } 2602 }
2419 2603
2420 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2604 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2421 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2605 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2422 2606
2423 $CAVEAT_LABEL->set_text ("None :)"); 2607 $CAVEAT_LABEL->set_text ("None :)");
2608 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2609 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2424 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2610 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2425 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2611 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2426 2612
2427 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2613 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2428} 2614}
2456my $want_refresh = EV::prepare_ns \&force_refresh; 2642my $want_refresh = EV::prepare_ns \&force_refresh;
2457 2643
2458my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2644my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2459 $NOW = EV::now; 2645 $NOW = EV::now;
2460 2646
2461 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2647 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2462 for DC::poll_events; 2648 for DC::poll_events;
2463 2649
2464 if (%animate_object) { 2650 if (%animate_object) {
2465 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2651 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2466 $WANT_REFRESH = 1; 2652 $WANT_REFRESH = 1;
2478sub animation_stop { 2664sub animation_stop {
2479 my ($widget) = @_; 2665 my ($widget) = @_;
2480 delete $animate_object{$widget}; 2666 delete $animate_object{$widget};
2481} 2667}
2482 2668
2483%SDL_CB = (
2484 DC::SDL_QUIT => sub { 2669$SDL_CB[DC::SDL_QUIT] = sub {
2670 crash "SDL_QUIT";
2485 EV::unloop EV::UNLOOP_ALL; 2671 EV::unloop EV::UNLOOP_ALL;
2486 }, 2672};
2487 DC::SDL_VIDEORESIZE => sub { 2673$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2488 },
2489 DC::SDL_VIDEOEXPOSE => sub { 2674$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2490 DC::UI::full_refresh; 2675 DC::UI::full_refresh;
2491 }, 2676};
2492 DC::SDL_ACTIVEEVENT => sub { 2677$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2493# not useful, as APPACTIVE includes only iconified state, not unmapped 2678# not useful, as APPACTIVE includes only iconified state, not unmapped
2494# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2679# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2495# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2680# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2496# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2681# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2497# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2682# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2498# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2683# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2499 }, 2684};
2500 DC::SDL_KEYDOWN => sub { 2685$SDL_CB[DC::SDL_KEYDOWN] = sub {
2501 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2686 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2502 # alt-enter 2687 # alt-enter
2503 video_shutdown; 2688 video_shutdown;
2504 $FULLSCREEN_ENABLE->toggle; 2689 $FULLSCREEN_ENABLE->toggle;
2505 video_init; 2690 video_init;
2506 } else { 2691 } else {
2507 &DC::UI::feed_sdl_key_down_event; 2692 &DC::UI::feed_sdl_key_down_event;
2508 } 2693 }
2509 update_modbox; 2694 update_modbox;
2510 }, 2695};
2511 DC::SDL_KEYUP => sub { 2696$SDL_CB[DC::SDL_KEYUP] = sub {
2512 &DC::UI::feed_sdl_key_up_event; 2697 &DC::UI::feed_sdl_key_up_event;
2513 update_modbox; 2698 update_modbox;
2514 }, 2699};
2515 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2700$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2516 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2701$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2517 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2702$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2518 DC::SDL_USEREVENT => sub { 2703$SDL_CB[DC::SDL_USEREVENT] = sub {
2519 if ($_[0]{code} == 1) { 2704 if ($_[0]{code} == 1) {
2520 audio_channel_finished $_[0]{data1}; 2705 audio_channel_finished $_[0]{data1};
2521 } elsif ($_[0]{code} == 0) { 2706 } elsif ($_[0]{code} == 0) {
2522 audio_music_finished; 2707 audio_music_finished;
2523 }
2524 }, 2708 }
2525); 2709};
2526 2710
2527############################################################################# 2711#############################################################################
2528 2712
2529$SIG{INT} = $SIG{TERM} = sub { 2713$SIG{INT} = $SIG{TERM} = sub {
2530 EV::unloop; 2714 EV::unloop;
2531 #d# TODO calling exit here hangs the process in some futex 2715 #d# TODO calling exit here hangs the process in some futex
2532}; 2716};
2533 2717
2534# due to mac os x + sdl combined briandamage, we need this contortion 2718# due to mac os x + sdl combined braindamage, we need this contortion
2535sub main { 2719sub main {
2536 { 2720 {
2537 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2721 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2538 2722
2539 if (-e "$Deliantra::VARDIR/client.cf") { 2723 if (-e "$Deliantra::VARDIR/client.cf") {
2556 DC::DB::open_db; 2740 DC::DB::open_db;
2557 2741
2558 DC::UI::set_layout ($::CFG->{layout}); 2742 DC::UI::set_layout ($::CFG->{layout});
2559 2743
2560 my %DEF_CFG = ( 2744 my %DEF_CFG = (
2745 config_autosave => 1,
2561 sdl_mode => undef, 2746 sdl_mode => undef,
2562 fullscreen => 1, 2747 fullscreen => 1,
2563 fast => 0, 2748 fast => 0,
2564 force_opengl11 => undef, 2749 force_opengl11 => undef,
2565 disable_alpha => 0, 2750 disable_alpha => 0,
2566 smooth_movement => 1, 2751 smooth_movement => 1,
2752 smooth_transitions => 1,
2567 texture_compression => 1, 2753 texture_compression => 1,
2568 map_scale => 1, 2754 map_scale => 1,
2569 fow_enable => 1, 2755 fow_enable => 1,
2570 fow_intensity => 0, 2756 fow_intensity => 0,
2757 fow_texture => 0,
2571 map_smoothing => 1, 2758 map_smoothing => 1,
2572 gui_fontsize => 1, 2759 gui_fontsize => 1,
2573 log_fontsize => 0.7, 2760 log_fontsize => 0.7,
2574 gauge_fontsize => 1, 2761 gauge_fontsize => 1,
2575 gauge_size => 0.35, 2762 gauge_size => 0.35,
2583 effects_enable => 1, 2770 effects_enable => 1,
2584 effects_volume => 1, 2771 effects_volume => 1,
2585 bgm_enable => 1, 2772 bgm_enable => 1,
2586 bgm_volume => 0.5, 2773 bgm_volume => 0.5,
2587 output_rate => "", 2774 output_rate => "",
2588 pickup => 0, 2775 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2589 inv_sort => "mtime", 2776 inv_sort => "mtime",
2590 default => "profile", # default profile 2777 default => "profile", # default profile
2591 show_tips => 1, 2778 show_tips => 1,
2592 logview_max_par => 1000, 2779 logview_max_par => 1000,
2593 shift_fire_stop => 0, 2780 shift_fire_stop => 0,
2594 ); 2781 uitheme => "wood",
2782 map_shift_x => -24, # arbitrary
2783 map_shift_y => +24, # arbitrary
2595 2784 );
2785
2596 while (my ($k, $v) = each %DEF_CFG) { 2786 while (my ($k, $v) = each %DEF_CFG) {
2597 $CFG->{$k} = $v unless exists $CFG->{$k}; 2787 $CFG->{$k} = $v unless exists $CFG->{$k};
2598 } 2788 }
2599 2789
2600 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2790 my @args = @ARGV;
2791
2792 my $profile = 'default';
2793
2794 for (my $i = 0; $i < @args; $i++) {
2795 if ($args[$i] =~ /^--?profile$/) {
2796 $profile = $args[$i + 1];
2797 splice @args, $i, 2, ();
2798 $i = 0;
2799 } elsif ($args[$i] =~ /^--?h/) {
2800 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2801 exit 0;
2802 }
2803 }
2804
2805 $CFG->{profile}{$profile} ||= {};
2601 $PROFILE = $CFG->{profile}{default}; 2806 $PROFILE = $CFG->{profile}{$profile};
2807 $PROFILE->{host} ||= "gameserver.deliantra.net";
2808
2809 $PROFILE->{host} = $args[0] if @args > 0;
2810 $PROFILE->{user} = $args[1] if @args > 1;
2811 $PROFILE->{password} = $args[2] if @args > 2;
2602 2812
2603 # convert old bindings (only default profile matters) 2813 # convert old bindings (only default profile matters)
2604 if (my $bindings = delete $PROFILE->{bindings}) { 2814 if (my $bindings = delete $PROFILE->{bindings}) {
2605 while (my ($mod, $syms) = each %$bindings) { 2815 while (my ($mod, $syms) = each %$bindings) {
2606 while (my ($sym, $cmds) = each %$syms) { 2816 while (my ($sym, $cmds) = each %$syms) {
2612 } 2822 }
2613 } 2823 }
2614 2824
2615 sdl_init; 2825 sdl_init;
2616 2826
2827 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2828 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2829
2617 { 2830 {
2618 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2831 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2619 DejaVuSans.ttf 2832 DejaVuSans.ttf
2620 DejaVuSansMono.ttf 2833 DejaVuSansMono.ttf
2621 DejaVuSans-Bold.ttf 2834 DejaVuSans-Bold.ttf
2622 DejaVuSansMono-Bold.ttf 2835 DejaVuSansMono-Bold.ttf
2623 DejaVuSans-Oblique.ttf 2836 DejaVuSans-Oblique.ttf
2624 DejaVuSansMono-Oblique.ttf 2837 DejaVuSansMono-Oblique.ttf
2625 DejaVuSans-BoldOblique.ttf 2838 DejaVuSans-BoldOblique.ttf
2626 DejaVuSansMono-BoldOblique.ttf 2839 DejaVuSansMono-BoldOblique.ttf
2840 mona.ttf
2627 ); 2841 );
2628 2842
2629 DC::add_font $_ for @fonts; 2843 DC::add_font $_ for @fonts;
2630 2844
2631 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2845 $FONT_PROP = new_from_file DC::Font $fonts[0];
2632 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2846 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2633 2847
2634 $FONT_PROP->make_default; 2848 $FONT_PROP->make_default;
2635 2849
2661 }; 2875 };
2662 2876
2663 delete $SIG{__DIE__}; 2877 delete $SIG{__DIE__};
2664 EV::loop; 2878 EV::loop;
2665 2879
2880 DC::write_cfg if $CFG->{config_autosave};
2881
2666#video_shutdown; 2882 #video_shutdown;
2667#audio_shutdown; 2883 #audio_shutdown;
2884
2668 DC::OpenGL::quit; 2885 DC::OpenGL::quit;
2669 DC::SDL_Quit; 2886 DC::SDL_Quit;
2670 DC::DB::Server::stop; 2887 DC::DB::Server::stop;
2671} 2888}
2672 2889
2676 2893
2677deliantra - A Deliantra MORPG game client 2894deliantra - A Deliantra MORPG game client
2678 2895
2679=head1 SYNOPSIS 2896=head1 SYNOPSIS
2680 2897
2681Just run it - no commandline arguments are supported. 2898 deliantra [--profile name] [host [user [password]]]
2899 deliantra --help
2682 2900
2683=head1 USAGE 2901=head1 USAGE
2684 2902
2685deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2903The deliantra client utilises OpenGL for all UI elements and the game. It
2686be used in fullscreen mode and interactively. 2904is supposed to be used in fullscreen mode and interactively.
2687 2905
2688=head1 DEBUGGING 2906=head1 DEBUGGING
2689
2690 2907
2691CFPLUS_DEBUG - environment variable 2908CFPLUS_DEBUG - environment variable
2692 2909
2693 1 draw borders around widgets 2910 1 draw borders around widgets
2694 2 add low-level widget info to tooltips 2911 2 add low-level widget info to tooltips

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines