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.66 by root, Mon Sep 1 09:12:08 2008 UTC vs.
Revision 1.105 by root, Sat Apr 3 02:58:25 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::Util (); 92use AnyEvent::Util ();
110use AnyEvent::DNS;
111use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
112 95
113use Compress::LZF; 96use Compress::LZF;
114use JSON::XS; 97use JSON::XS;
115 98
116use DC; 99use DC;
117 100
118#############################################################################
119
120our $CONN;
121
122# write a crash message blockingly to the socket, if possible
123# this is a bit too complicated for my tastes, but it was easy.
124sub crash($;$) { 101sub crash($;$) {
125 my ($msg, $backtrace) = @_; 102 # nop during compiletime
126
127 return unless $CONN;
128
129 my $fh = $CONN->{fh}
130 or return;
131
132 my $buf = delete $CONN->{wbuf};
133
134 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
135
136 AnyEvent::Util::fh_nonblocking $fh, 0;
137
138 syswrite $fh, $buf;
139 AnyEvent::Util::fh_nonblocking $fh, 1;
140
141 $msg =~ s/\s+$//;
142
143 # backtrace as second step, in case it crashes, too
144 crash (Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated")
145 if $backtrace;
146} 103}
147
148#############################################################################
149 104
150BEGIN { 105BEGIN {
151 $SIG{__DIE__} = sub { 106 $SIG{__DIE__} = sub {
152 return if $^S; 107 return if $^S;
153 crash ("CRASH/DIE: $_[0]" => 1); 108 crash "CRASH/DIE: $_[0]" => 1;
154 DC::fatal Carp::longmess "$_[0]"; 109 DC::fatal Carp::longmess "$_[0]";
155 } 110 }
156} 111}
157 112
158use DC::OpenGL (); 113use DC::OpenGL ();
… …
172 127
173$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
174$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
175 130
176$EV::DIED = sub { 131$EV::DIED = sub {
177 crash ("CRASH/EV::DIED: $@" => 1); 132 crash "CRASH/EV::DIED: $@" => 0;
178 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
179}; 134};
180 135
181my $MAX_FPS = 60; 136my $MAX_FPS = 60;
137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
182 139
183our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
184 141
185our $LAST_REFRESH; 142our $LAST_REFRESH;
186our $NOW; 143our $NOW;
… …
202our $FONTSIZE; 159our $FONTSIZE;
203 160
204our $FONT_PROP; 161our $FONT_PROP;
205our $FONT_FIXED; 162our $FONT_FIXED;
206 163
164our $CONN;
165
207our $MAP; 166our $MAP;
208our $MAPMAP; 167our $MAPMAP;
209our $MAPWIDGET; 168our $MAPWIDGET;
210our $COMPLETER; 169our $COMPLETER;
211our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
212our $METASERVER; 174our $METASERVER;
213our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
214our $QUIT_DIALOG; 176our $QUIT_DIALOG;
215our $HOST_ENTRY; 177our $HOST_ENTRY;
216our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
… …
242our $FLOORBOX; 204our $FLOORBOX;
243our $GAUGES; 205our $GAUGES;
244our $STATWIDS; 206our $STATWIDS;
245 207
246our $SDL_ACTIVE; 208our $SDL_ACTIVE;
247our %SDL_CB; 209our @SDL_CB;
248 210
249our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
250our $STATUSBOX; 212our $STATUSBOX;
251our $MODBOX; 213our $MODBOX;
252our $DEBUG_STATUS; 214our $DEBUG_STATUS;
253 215
254our $INV; 216our $INV;
255our $INVR; 217our $INVR;
256our $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}
257 259
258############################################################################# 260#############################################################################
259 261
260sub status { 262sub status {
261 $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]);
… …
343 or return; 345 or return;
344 346
345 $meta->{data} 347 $meta->{data}
346 or return; 348 or return;
347 349
348 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
349 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
350 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
351 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
352 &audio_music_push ($face); 354 &audio_music_push ($face);
353 } 355 }
354 } else { 356 } else {
355 # fetch from database 357 # fetch from database
356 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
357 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
358 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
359 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;
360 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
361 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
362 364
363 audio_sound_push ($face); 365 audio_sound_push ($face);
364 }; 366 };
… …
411 413
412 audio_music_update_volume; 414 audio_music_update_volume;
413 415
414 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
415 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
416 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
417 ? 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
418 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
419 424
420 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
421 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
422 427
423 my $NOW = time; 428 my $NOW = time;
424 429
425 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
426 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
… …
535 sub audio_tab_update; 540 sub audio_tab_update;
536 audio_tab_update; 541 audio_tab_update;
537} 542}
538 543
539sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
540 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
541 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
542 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
543 553
544 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
… …
784} 794}
785 795
786sub dc_connect { 796sub dc_connect {
787 my ($host, $port) = @_; 797 my ($host, $port) = @_;
788 798
789 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;
790 801
791 $CONN = 802 $CONN =
792 new DC::Protocol 803 new DC::Protocol
793 host => $host, 804 host => $host,
794 port => $port, 805 port => $port,
795 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
796 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
797 mapw => $mapsize, 808 mapw => $mapw,
798 maph => $mapsize, 809 maph => $maph,
799 810
800 client => "$DC::VERSION $] $^O", 811 client => "$DC::VERSION $] $^O",
801 812
802 map_widget => $MAPWIDGET, 813 map_widget => $MAPWIDGET,
803 statusbox => $STATUSBOX, 814 statusbox => $STATUSBOX,
… …
811 822
812 on_connect => sub { 823 on_connect => sub {
813 if ($_[0]) { 824 if ($_[0]) {
814 DC::lowdelay fileno $CONN->{fh}; 825 DC::lowdelay fileno $CONN->{fh};
815 826
816 status "login successful"; 827 status "successfully connected to the server";
817 } else { 828 } else {
818 undef $CONN; 829 undef $CONN;
819 status "unable to connect: $!"; 830 status "unable to connect: $!";
820 stop_game(); 831 stop_game();
821 } 832 }
… …
823 ; 834 ;
824} 835}
825 836
826sub start_game { 837sub start_game {
827 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.";
828 843
829 $LOGIN_BUTTON->set_text ("Logout"); 844 $LOGIN_BUTTON->set_text ("Logout");
830 $SETUP_DIALOG->hide; 845 $SETUP_DIALOG->hide;
831
832 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
833 846
834 $MAP = new DC::Map; 847 $MAP = new DC::Map;
835 848
836 # hack to make SURE we find the IP address all right 849 # hack to make SURE we find the IP address all right
837 # can be removed once AnyEvent::DNS is proven stable. 850 # can be removed once AnyEvent::DNS is proven stable.
838 if ($host eq "gameserver.deliantra.net") { 851 if ($host eq "gameserver.deliantra.net") {
839 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 852 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
840 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) {
841 status "dns failure, using hardcoded address"; 857 status "dns failure, using hardcoded address";
842 $host = "129.13.162.95"; 858 $host = "129.13.162.95";
859 }
843 } 860 }
844 861
845 dc_connect $host, $port; 862 dc_connect $host, $port;
846 }; 863 };
847 } else { 864 } else {
… …
873} 890}
874 891
875sub graphics_setup { 892sub graphics_setup {
876 my $vbox = new DC::UI::VBox; 893 my $vbox = new DC::UI::VBox;
877 894
895 {
896 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
897
878 $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]);
879 899
880 my $row = 0; 900 my $row = 0;
881 901
882 $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");
883 $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,
884 can_events => 1, 904 can_events => 1,
885 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 905 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
886 906
887 $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");
888 $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,
889 can_events => 1, 909 can_events => 1,
890 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 "
891 . "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 "
892 . "by selecting a different video mode, changing the settings below or " 912 . "by selecting a different video mode, changing the settings below or "
893 . "by installing the right driver for your graphics card."); 913 . "by installing the right driver for your graphics card.");
894 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
895 my $vidmode_tooltip = 928 my $vidmode_tooltip =
896 "<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). "
897 . "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>.";
898 931
899 $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");
900 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 933 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
901 934
902 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 935 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
936 c_rescale => 1,
903 force_w => $WIDTH * 0.1, expand => 1, 937 force_w => $WIDTH * 0.1, expand => 1,
904 range => [ ($CFG->{sdl_mode}) x 3 ], 938 range => [ ($CFG->{sdl_mode}) x 3 ],
905 tooltip => $vidmode_tooltip); 939 tooltip => $vidmode_tooltip);
906 $hbox->add (my $mode_label = new DC::UI::Label 940 $hbox->add (my $mode_label = new DC::UI::Label
907 height => 0.8, template => "9999x9999@9+9", 941 height => 0.8, template => "9999x9999@9+9",
908 can_events => 1, tooltip => $vidmode_tooltip); 942 can_events => 1, tooltip => $vidmode_tooltip);
909 943
910 $MODE_SLIDER->connect (changed => sub { 944 $MODE_SLIDER->connect (changed => sub {
911 my ($self, $value) = @_;
912
913 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
914 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
915 });
916 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
917
918 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
919 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
920 state => $CFG->{fullscreen},
921 tooltip => "Bring the client into fullscreen mode.",
922 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
923 );
924
925 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
926 $table->add_at (1, $row++, new DC::UI::CheckBox
927 state => $CFG->{force_opengl11},
928 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
929 . "higher memory usage and slower performance. It will, however, help tremendously on "
930 . "cards that claim to support a feature but fall back to software rendering. "
931 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
932 . "but cards and drivers from other vendors (ATI) are often just as bad. "
933 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
934 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
935 );
936
937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
938 $table->add_at (1, $row++, new DC::UI::CheckBox
939 state => $CFG->{disable_alpha},
940 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
941 . "by disabling a number of textures and transparency effects. Normally, these "
942 . "effects do not cost a lot of resources, but some graphics cards might fall "
943 . "back to etxremely slow rendering if this is enabled. If disabling this option "
944 . "noticably improves the framerate of the client please report this! "
945 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
946 on_changed => sub {
947 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) = @_;
948 $CFG->{disable_alpha} = $value; 982 $CFG->{disable_alpha} = $value;
949 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 983 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
984 0
950 0 985 }
951 } 986 );
952 );
953 987
954 $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");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 989 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{texture_compression}, 990 state => $CFG->{texture_compression},
957 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 "
958 . "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). "
959 . "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 "
960 . "forced OpenGL 1.1 mode and when using the Apple renderer.", 994 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
961 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 995 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
962 ); 996 );
963 997
964 $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");
965 $table->add_at (1, $row++, new DC::UI::CheckBox 999 $table->add_at (1, $row++, new DC::UI::CheckBox
966 state => $CFG->{fast}, 1000 state => $CFG->{fast},
967 tooltip => "Lower the visual quality considerably to speed up rendering.", 1001 tooltip => "Lower the visual quality considerably to speed up rendering.",
968 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1002 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
969 ); 1003 );
970 1004
971 $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");
972 $table->add_at (1, $row++, new DC::UI::Slider 1006 $table->add_at (1, $row++, new DC::UI::Slider
973 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1007 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
974 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.",
975 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1009 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
976 ); 1010 );
977 1011
978 $table->add_at (1, $row++, new DC::UI::Button 1012 $table->add_at (1, $row++, new DC::UI::Button
979 expand => 1, text => "Apply", 1013 expand => 1, text => "Apply",
980 tooltip => "Apply the video settings above.", 1014 tooltip => "Apply the video settings above.",
981 on_activate => sub { 1015 on_activate => sub {
982 video_shutdown (); 1016 video_shutdown ();
983 video_init (); 1017 video_init ();
1018 0
984 0 1019 }
985 } 1020 );
986 ); 1021 }
987 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;
988 $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");
989 $table->add_at (1, $row++, new DC::UI::CheckBox 1030 $table->add_at (1, $row++, new DC::UI::CheckBox
990 state => $CFG->{smooth_movement}, 1031 state => $CFG->{smooth_movement},
991 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. "
992 . "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, "
993 . "then disable this option. Changes take effect immdiately.", 1034 . "then disable this option. Changes take effect immdiately.",
994 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1035 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
995 ); 1036 );
996 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
997 $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");
998 $table->add_at (1, $row++, new DC::UI::Slider 1049 $table->add_at (1, $row++, new DC::UI::Slider
999 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1050 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
1000 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1051 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
1001 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 }
1002 ); 1053 );
1003 1054
1004 $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");
1005 $table->add_at (1, $row++, new DC::UI::CheckBox 1056 $table->add_at (1, $row++, new DC::UI::CheckBox
1006 state => $CFG->{map_smoothing}, 1057 state => $CFG->{map_smoothing},
1007 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. "
1008 . "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. "
1009 . "Changes take effect at next login only.", 1060 . "Changes take effect at next login only.",
1010 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1061 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
1011 ); 1062 );
1012 1063
1013 $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");
1014 $table->add_at (1, $row++, new DC::UI::CheckBox 1065 $table->add_at (1, $row++, new DC::UI::CheckBox
1015 state => $CFG->{fow_enable}, 1066 state => $CFG->{fow_enable},
1016 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.",
1017 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1068 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
1018 ); 1069 );
1019 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
1020 $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");
1021 $table->add_at (1, $row++, new DC::UI::Slider 1087 $table->add_at (1, $row++, new DC::UI::Slider
1022 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1088 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
1023 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.",
1024 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1090 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
1025 ); 1091 );
1026 1092
1027 $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");
1028 $table->add_at (1, $row++, new DC::UI::Slider 1094 $table->add_at (1, $row++, new DC::UI::Slider
1029 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1095 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
1030 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, "
1031 . "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.",
1032 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 },
1033 ); 1099 );
1034 1100
1035 $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");
1036 $table->add_at (1, $row++, new DC::UI::Slider 1102 $table->add_at (1, $row++, new DC::UI::Slider
1037 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1103 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
1038 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.",
1039 on_changed => sub { 1105 on_changed => sub {
1040 $CFG->{gauge_fontsize} = $_[1]; 1106 $CFG->{gauge_fontsize} = $_[1];
1041 &set_gauge_window_fontsize; 1107 &set_gauge_window_fontsize;
1108 0
1042 0 1109 }
1043 } 1110 );
1044 );
1045 1111
1046 $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");
1047 $table->add_at (1, $row++, new DC::UI::Slider 1113 $table->add_at (1, $row++, new DC::UI::Slider
1048 range => [$CFG->{gauge_size}, 0.2, 0.8], 1114 range => [$CFG->{gauge_size}, 0.2, 0.8],
1049 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.",
1050 on_changed => sub { 1116 on_changed => sub {
1051 $CFG->{gauge_size} = $_[1]; 1117 $CFG->{gauge_size} = $_[1];
1052 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1118 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1119 0
1053 0 1120 }
1054 } 1121 );
1055 ); 1122 }
1056 1123
1057 $vbox 1124 $vbox
1058} 1125}
1059 1126
1060our $AUDIO_HW_CHUNKSIZE; 1127our $AUDIO_HW_CHUNKSIZE;
… …
1073 1140
1074 my $text = !$freq 1141 my $text = !$freq
1075 ? "audio is off" 1142 ? "audio is off"
1076 : "audio is enabled\n" 1143 : "audio is enabled\n"
1077 . "frequency (Hz): $freq\n" 1144 . "frequency (Hz): $freq\n"
1078 . "channels: $chans"; 1145 . "channels: $chans\n"
1146 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1147 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1079 1148
1080 $AUDIO_INFO->set_text ($text); 1149 $AUDIO_INFO->set_text ($text);
1081} 1150}
1082 1151
1083sub audio_setup { 1152sub audio_setup {
… …
1223} 1292}
1224 1293
1225sub make_gauge_window { 1294sub make_gauge_window {
1226 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1295 my $gh = int $HEIGHT * $CFG->{gauge_size};
1227 1296
1228 my $win = new DC::UI::Frame ( 1297 $GAUGES->{win} = my $win = new DC::UI::Frame (
1229 force_x => 0, 1298 force_x => 0,
1230 force_y => "max", 1299 force_y => "max",
1231 force_w => $WIDTH, 1300 force_w => $WIDTH,
1232 force_h => $gh, 1301 force_h => $gh,
1233 ); 1302 );
… …
1249 (new DC::UI::Empty expand => 1), 1318 (new DC::UI::Empty expand => 1),
1250 (my $hb = new DC::UI::HBox), 1319 (my $hb = new DC::UI::HBox),
1251 ], 1320 ],
1252 ); 1321 );
1253 1322
1254 $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");
1255 $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");
1256 $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");
1257 $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");
1258
1259 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1260 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1261 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1262 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1263
1264 $GAUGES = {
1265 exp => $exp, prg => $prg, sklprg => $sklprg,
1266 win => $win, range => $rng,
1267 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1268 };
1269 1327
1270 &set_gauge_window_fontsize; 1328 &set_gauge_window_fontsize;
1271 1329
1272 $win 1330 $win
1273} 1331}
… …
1614 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]),
1615 ); 1673 );
1616 1674
1617 $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");
1618 $table->add_at (1, 4, new DC::UI::Entry 1676 $table->add_at (1, 4, new DC::UI::Entry
1619 text => $CFG->{profile}{default}{user}, 1677 text => $PROFILE->{user},
1620 tooltip => "The name of your character on the server.", 1678 tooltip => "The name of your character on the server. The name is case-sensitive!",
1621 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1679 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1622 ); 1680 );
1623 1681
1624 $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");
1625 $table->add_at (1, 5, new DC::UI::Entry 1683 $table->add_at (1, 5, new DC::UI::Entry
1626 text => $CFG->{profile}{default}{password}, 1684 text => $PROFILE->{password},
1627 hidden => 1, 1685 hidden => 1,
1628 tooltip => "The password for your character.", 1686 tooltip => "The password for your character.",
1629 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1687 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1630 ); 1688 );
1631 1689
1632 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1690 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1633 expand => 1, 1691 expand => 1,
1634 text => "Login / Register", 1692 text => "Login / Register",
… …
1670 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1728 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1671 1729
1672 $vbox->add ( 1730 $vbox->add (
1673 $HOST_ENTRY = new DC::UI::Entry 1731 $HOST_ENTRY = new DC::UI::Entry
1674 expand => 1, 1732 expand => 1,
1675 text => $CFG->{profile}{default}{host}, 1733 text => $PROFILE->{host},
1676 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>)",
1677 on_changed => sub { 1735 on_changed => sub {
1678 my ($self, $value) = @_; 1736 my ($self, $value) = @_;
1679 $CFG->{profile}{default}{host} = $value; 1737 $PROFILE->{host} = $value;
1680 1 1738 1
1681 } 1739 }
1682 ); 1740 );
1683 1741
1684 if (0) { #d# disabled 1742 if (0) { #d# disabled
… …
1727 1785
1728 my $row = 0; 1786 my $row = 0;
1729 1787
1730 $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");
1731 $table->add_at (1, $row++, new DC::UI::CheckBox 1789 $table->add_at (1, $row++, new DC::UI::CheckBox
1790 c_colspan => 2,
1732 state => $CFG->{show_tips}, 1791 state => $CFG->{show_tips},
1733 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?",
1734 on_changed => sub { 1793 on_changed => sub {
1735 my ($self, $value) = @_; 1794 my ($self, $value) = @_;
1736 $CFG->{show_tips} = $value; 1795 $CFG->{show_tips} = $value;
… …
1738 } 1797 }
1739 ); 1798 );
1740 1799
1741 $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");
1742 $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,
1743 text => $CFG->{logview_max_par}, 1803 text => $CFG->{logview_max_par},
1744 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 "
1745 . "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 "
1746 . "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.",
1747 on_changed => sub { 1807 on_changed => sub {
… …
1749 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1809 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1750 0 1810 0
1751 }, 1811 },
1752 ); 1812 );
1753 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
1754 $table 1836 $table
1755} 1837}
1756 1838
1757sub autopickup_setup { 1839sub autopickup_setup {
1758 my $r = new DC::UI::ScrolledWindow ( 1840 my $r = new DC::UI::ScrolledWindow (
… …
1764 col_expand => [0, 1, 0, 1], 1846 col_expand => [0, 1, 0, 1],
1765 ); 1847 );
1766 1848
1767 for ( 1849 for (
1768 ["General", 0, 0, 1850 ["General", 0, 0,
1769 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1770 ["Inhibit autopickup" => PICKUP_INHIBIT], 1851# ["Inhibit autopickup" => PICKUP_INHIBIT],
1771 ["Stop before pickup" => PICKUP_STOP], 1852 ["Stop before pickup" => PICKUP_STOP],
1772 ["Debug autopickup" => PICKUP_DEBUG], 1853 ["Debug autopickup" => PICKUP_DEBUG],
1773 ], 1854 ],
1774 ["Weapons", 0, 6, 1855 ["Weapons", 0, 6,
1775 ["All weapons" => PICKUP_ALLWEAPON], 1856 ["All weapons" => PICKUP_ALLWEAPON],
… …
1823 $::CFG->{pickup} |= $mask; 1904 $::CFG->{pickup} |= $mask;
1824 } else { 1905 } else {
1825 $::CFG->{pickup} &= ~$mask; 1906 $::CFG->{pickup} &= ~$mask;
1826 } 1907 }
1827 1908
1828 $::CONN->send_command ("pickup $::CFG->{pickup}") 1909 $::CONN->send_pickup ($::CFG->{pickup})
1829 if defined $::CONN; 1910 if defined $::CONN;
1830 1911
1831 0 1912 0
1832 }); 1913 });
1833 1914
… …
1850 }); 1931 });
1851 1932
1852 $table->add_at (3, 18, new DC::UI::Button 1933 $table->add_at (3, 18, new DC::UI::Button
1853 text => "set", 1934 text => "set",
1854 on_activate => sub { 1935 on_activate => sub {
1855 $::CONN->send_command ("pickup $::CFG->{pickup}") 1936 $::CONN->send_pickup ($::CFG->{pickup})
1856 if defined $::CONN; 1937 if defined $::CONN;
1857 0 1938 0
1858 }); 1939 });
1859 1940
1860 $r 1941 $r
… …
1973 $PL_NOTEBOOK->set_current_page ($widget); 2054 $PL_NOTEBOOK->set_current_page ($widget);
1974 $PL_WINDOW->show; 2055 $PL_WINDOW->show;
1975 } 2056 }
1976} 2057}
1977 2058
1978sub player_window { 2059sub make_playerbook {
1979 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2060 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1980 x => "center", 2061 x => "center",
1981 y => "center", 2062 y => "center",
1982 force_w => $WIDTH * 9/10, 2063 force_w => $WIDTH * 9/10,
1983 force_h => $HEIGHT * 9/10, 2064 force_h => $HEIGHT * 9/10,
… …
2017 "License, Author and Source info for media sent by the server."); 2098 "License, Author and Source info for media sent by the server.");
2018 2099
2019 $ntb->set_current_page ($INVENTORY_PAGE); 2100 $ntb->set_current_page ($INVENTORY_PAGE);
2020 2101
2021 $plwin->add ($ntb); 2102 $plwin->add ($ntb);
2022 $plwin
2023} 2103}
2024 2104
2025sub keyboard_setup { 2105sub keyboard_setup {
2026 DC::Macro::keyboard_setup 2106 DC::Macro::keyboard_setup
2027} 2107}
2028 2108
2029sub help_window { 2109sub make_help_window {
2030 my $win = new DC::UI::Toplevel 2110 my $win = new DC::UI::Toplevel
2031 x => 'center', 2111 x => 'center',
2032 y => 'center', 2112 y => 'center',
2033 z => 4, 2113 z => 4,
2034 name => 'doc_browser', 2114 name => 'doc_browser',
… …
2123 2203
2124 $load_node->((DC::Pod::find @path)[0]); 2204 $load_node->((DC::Pod::find @path)[0]);
2125 $win->show; 2205 $win->show;
2126 }; 2206 };
2127 2207
2128 $win 2208 $HELP_WINDOW = $win;
2129}
2130
2131sub open_string_query {
2132 my ($title, $cb, $txt, $tooltip) = @_;
2133 my $dialog = new DC::UI::Toplevel
2134 x => "center",
2135 y => "center",
2136 z => 50,
2137 force_w => $WIDTH * 4/5,
2138 title => $title;
2139
2140 $dialog->add (
2141 my $e = new DC::UI::Entry
2142 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2143 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2144 tooltip => $tooltip
2145 );
2146
2147 $e->grab_focus;
2148 $e->set_text ($txt) if $txt;
2149 $dialog->show;
2150} 2209}
2151 2210
2152sub open_quit_dialog { 2211sub open_quit_dialog {
2153 unless ($QUIT_DIALOG) { 2212 unless ($QUIT_DIALOG) {
2154 $QUIT_DIALOG = new DC::UI::Toplevel 2213 $QUIT_DIALOG = new DC::UI::Toplevel
… …
2187 2246
2188 $QUIT_DIALOG->show; 2247 $QUIT_DIALOG->show;
2189 $QUIT_DIALOG->grab_focus; 2248 $QUIT_DIALOG->grab_focus;
2190} 2249}
2191 2250
2251sub make_menubar {
2252 $MENUFRAME = new DC::UI::Toplevel
2253 border => 0,
2254 force_x => 0,
2255 force_y => 0,
2256 force_w => $::WIDTH,
2257 child => ($MENUBAR = new DC::UI::HBox),
2258 ;
2259
2260 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2261
2262 # 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
2263 make_gauge_window->show;
2264
2265# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2266# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2267
2268 make_playerbook;
2269
2270 $MENUPOPUP = DC::UI::Menu->new (items => [
2271 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2272 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2273 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2274 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2275 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2276 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2277 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2278 ["Quit…" , sub {
2279 if ($CONN) {
2280 open_quit_dialog;
2281 } else {
2282 EV::unloop EV::UNLOOP_ALL;
2283 }
2284 }],
2285 ]);
2286
2287 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2288 tooltip => "Shows the main menu",
2289 on_button_down => sub {
2290 my ($self, $ev) = @_;
2291 local $ev->{x} = 0;
2292 local $ev->{y} = 0;
2293 $MENUPOPUP->popup ($ev);
2294 },
2295 );
2296
2297 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2298 padding_x => 6,
2299 padding_y => 3,
2300 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2301 template => " Exp: 888,888,888,888 (lvl 188) ",
2302 );
2303
2304 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2305 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2306 . "will automatically pick up items as defined by your item pickup settings "
2307 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2308 . "disable autopickup by disabling this checkbox.",
2309 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2310 on_changed => sub {
2311 my ($self, $value) = @_;
2312 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2313 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2314 $CONN->send_pickup ($CFG->{pickup})
2315 if $CONN;
2316 },
2317 );
2318
2319 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2320 c_rescale => 1,
2321 padding_x => 6,
2322 padding_y => 3,
2323 force_w => $::WIDTH * 0.2,
2324 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2325 template => "two handed weapons 99%",
2326 );
2327
2328 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2329 expand => 1,
2330 align => 1, can_hover => 1, can_events => 1,
2331 text => "Range and Combat Slots",
2332 tooltip => "#stat_ranged",
2333 );
2334
2335 $MENUFRAME->show;
2336}
2337
2338sub open_string_query {
2339 my ($title, $cb, $txt, $tooltip) = @_;
2340 my $dialog = new DC::UI::Toplevel
2341 x => "center",
2342 y => "center",
2343 z => 50,
2344 force_w => $WIDTH * 4/5,
2345 title => $title;
2346
2347 $dialog->add (
2348 my $e = new DC::UI::Entry
2349 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2350 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2351 tooltip => $tooltip
2352 );
2353
2354 $e->grab_focus;
2355 $e->set_text ($txt) if $txt;
2356 $dialog->show;
2357}
2358
2192sub show_tip_of_the_day { 2359sub show_tip_of_the_day {
2193 # find all tips 2360 # find all tips
2194 my @tod = DC::Pod::find tip_of_the_day => "*"; 2361 my @tod = DC::Pod::find tip_of_the_day => "*";
2195 2362
2196 DC::DB::get state => "tip_of_the_day", sub { 2363 DC::DB::get state => "tip_of_the_day", sub {
… …
2247 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2414 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2248 and die "SDL::Init failed!\n"; 2415 and die "SDL::Init failed!\n";
2249} 2416}
2250 2417
2251sub video_init { 2418sub video_init {
2419 DC::set_theme $CFG->{uitheme};
2420
2252 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2421 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2253 $SDL_REINIT = 0; 2422 $SDL_REINIT = 0;
2254 2423
2255 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2424 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2256 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2425 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
… …
2260 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2429 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2261 2430
2262 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2431 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2263 $CFG->{sdl_mode} = 0; # lowest resolution by default 2432 $CFG->{sdl_mode} = 0; # lowest resolution by default
2264 2433
2265 # now choose biggets mode <= 1024x768 2434 # now choose biggest mode <= 1024x768
2266 for (0 .. $#SDL_MODES) { 2435 for (0 .. $#SDL_MODES) {
2267 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) { 2436 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2268 $CFG->{sdl_mode} = $_; 2437 $CFG->{sdl_mode} = $_;
2269 } 2438 }
2270 } 2439 }
… …
2333 2502
2334 (new DC::UI::Frame 2503 (new DC::UI::Frame
2335 bg => [0, 0, 0, 0.4], 2504 bg => [0, 0, 0, 0.4],
2336 force_x => 0, 2505 force_x => 0,
2337 force_y => "max", 2506 force_y => "max",
2338 child => (my $LR = new DC::UI::VBox), 2507 child => (my $LL = new DC::UI::VBox),
2339 )->show; 2508 )->show;
2340 2509
2341 $LR->add ($STATUSBOX); 2510 $LL->add ($STATUSBOX);
2342 $LR->add ($MODBOX); 2511 $LL->add ($MODBOX);
2343 $LR->add (new DC::UI::Label 2512 $LL->add (new DC::UI::Label
2344 align => 0, 2513 align => 0,
2345 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2514 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2346 fontsize => 0.5, 2515 fontsize => 0.5,
2347 fg => [1, 1, 0, 0.7], 2516 fg => [1, 1, 0, 0.7],
2348 ); 2517 );
2349 2518
2350 DC::UI::Toplevel->new ( 2519 DC::UI::Toplevel->new (
2351 title => "Minimap", 2520 title => "Minimap",
2352 name => "mapmap", 2521 name => "mapmap",
2353 x => 0, 2522 x => 0,
2354 y => $FONTSIZE + 8, 2523 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2355 border_bg => [1, 1, 1, 192/255], 2524 border_bg => [1, 1, 1, 192/255],
2356 bg => [1, 1, 1, 0], 2525 bg => [1, 1, 1, 0],
2357 child => ($MAPMAP = new DC::MapWidget::MapMap 2526 child => ($MAPMAP = new DC::MapWidget::MapMap
2358 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2527 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2359 ), 2528 ),
2360 )->show; 2529 )->show;
2361 2530
2362 $MAPWIDGET = new DC::MapWidget; 2531 $MAPWIDGET = new DC::MapWidget;
2363 $MAPWIDGET->connect (activate_console => sub { 2532 $MAPWIDGET->connect (activate_console => sub {
… …
2388 $METASERVER = metaserver_dialog; 2557 $METASERVER = metaserver_dialog;
2389 # the name is changed to not conflict with the older name as users could have hidden it 2558 # the name is changed to not conflict with the older name as users could have hidden it
2390 $MESSAGE_WINDOW = new DC::UI::Dockbar 2559 $MESSAGE_WINDOW = new DC::UI::Dockbar
2391 name => "message_window2", 2560 name => "message_window2",
2392 title => 'Messages', 2561 title => 'Messages',
2562 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2393 force_w => $::WIDTH * 0.6, 2563 force_w => $::WIDTH * 0.6,
2394 force_h => $::HEIGHT * 0.25, 2564 force_h => $::HEIGHT * 0.25,
2395 ; 2565 ;
2396 2566
2397 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2567 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
… …
2417 . "After pressing the combo the binding will be saved automatically and the " 2587 . "After pressing the combo the binding will be saved automatically and the "
2418 . "binding editor closes"); 2588 . "binding editor closes");
2419 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2589 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2420 "Some debuggin' options. Do not ask."); 2590 "Some debuggin' options. Do not ask.");
2421 2591
2422 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2592 make_help_window;
2593 make_menubar;
2423 2594
2424 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2425 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2426
2427# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2428# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2429
2430 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
2431
2432 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2433 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2434
2435 $BUTTONBAR->add (new DC::UI::Button
2436 text => "Save Config",
2437 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2438 on_activate => sub {
2439 $::CFG->{layout} = DC::UI::get_layout;
2440 DC::write_cfg;
2441 status "Configuration Saved";
2442 0
2443 },
2444 );
2445
2446 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2447 tooltip => "View Documentation");
2448
2449 $BUTTONBAR->add (new DC::UI::Button
2450 text => "Quit",
2451 tooltip => "Terminates the program",
2452 on_activate => sub {
2453 if ($CONN) {
2454 open_quit_dialog;
2455 } else {
2456 EV::unloop EV::UNLOOP_ALL;
2457 }
2458 0
2459 },
2460 );
2461
2462 $BUTTONBAR->show;
2463 $SETUP_DIALOG->show; 2595 $SETUP_DIALOG->show;
2464 $MESSAGE_WINDOW->show; 2596 $MESSAGE_WINDOW->show;
2465 } 2597 }
2466 2598
2467 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2599 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2468 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2600 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2469 2601
2470 $CAVEAT_LABEL->set_text ("None :)"); 2602 $CAVEAT_LABEL->set_text ("None :)");
2603 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2604 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2471 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2605 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2472 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2606 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2473 2607
2474 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2608 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2475} 2609}
… …
2503my $want_refresh = EV::prepare_ns \&force_refresh; 2637my $want_refresh = EV::prepare_ns \&force_refresh;
2504 2638
2505my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2639my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2506 $NOW = EV::now; 2640 $NOW = EV::now;
2507 2641
2508 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2642 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2509 for DC::poll_events; 2643 for DC::poll_events;
2510 2644
2511 if (%animate_object) { 2645 if (%animate_object) {
2512 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2646 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2513 $WANT_REFRESH = 1; 2647 $WANT_REFRESH = 1;
… …
2525sub animation_stop { 2659sub animation_stop {
2526 my ($widget) = @_; 2660 my ($widget) = @_;
2527 delete $animate_object{$widget}; 2661 delete $animate_object{$widget};
2528} 2662}
2529 2663
2530%SDL_CB = (
2531 DC::SDL_QUIT => sub { 2664$SDL_CB[DC::SDL_QUIT] = sub {
2532 crash "SDL_QUIT"; 2665 crash "SDL_QUIT";
2533 EV::unloop EV::UNLOOP_ALL; 2666 EV::unloop EV::UNLOOP_ALL;
2534 }, 2667};
2535 DC::SDL_VIDEORESIZE => sub { 2668$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2536 },
2537 DC::SDL_VIDEOEXPOSE => sub { 2669$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2538 DC::UI::full_refresh; 2670 DC::UI::full_refresh;
2539 }, 2671};
2540 DC::SDL_ACTIVEEVENT => sub { 2672$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2541# not useful, as APPACTIVE includes only iconified state, not unmapped 2673# not useful, as APPACTIVE includes only iconified state, not unmapped
2542# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2674# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2543# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2675# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2544# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2676# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2545# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2677# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2546# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2678# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2547 }, 2679};
2548 DC::SDL_KEYDOWN => sub { 2680$SDL_CB[DC::SDL_KEYDOWN] = sub {
2549 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2681 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2550 # alt-enter 2682 # alt-enter
2551 video_shutdown; 2683 video_shutdown;
2552 $FULLSCREEN_ENABLE->toggle; 2684 $FULLSCREEN_ENABLE->toggle;
2553 video_init; 2685 video_init;
2554 } else { 2686 } else {
2555 &DC::UI::feed_sdl_key_down_event; 2687 &DC::UI::feed_sdl_key_down_event;
2556 } 2688 }
2557 update_modbox; 2689 update_modbox;
2558 }, 2690};
2559 DC::SDL_KEYUP => sub { 2691$SDL_CB[DC::SDL_KEYUP] = sub {
2560 &DC::UI::feed_sdl_key_up_event; 2692 &DC::UI::feed_sdl_key_up_event;
2561 update_modbox; 2693 update_modbox;
2562 }, 2694};
2563 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2695$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2564 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2696$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2565 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2566 DC::SDL_USEREVENT => sub { 2698$SDL_CB[DC::SDL_USEREVENT] = sub {
2567 if ($_[0]{code} == 1) { 2699 if ($_[0]{code} == 1) {
2568 audio_channel_finished $_[0]{data1}; 2700 audio_channel_finished $_[0]{data1};
2569 } elsif ($_[0]{code} == 0) { 2701 } elsif ($_[0]{code} == 0) {
2570 audio_music_finished; 2702 audio_music_finished;
2571 }
2572 }, 2703 }
2573); 2704};
2574 2705
2575############################################################################# 2706#############################################################################
2576 2707
2577$SIG{INT} = $SIG{TERM} = sub { 2708$SIG{INT} = $SIG{TERM} = sub {
2578 EV::unloop; 2709 EV::unloop;
2579 #d# TODO calling exit here hangs the process in some futex 2710 #d# TODO calling exit here hangs the process in some futex
2580}; 2711};
2581 2712
2582# due to mac os x + sdl combined briandamage, we need this contortion 2713# due to mac os x + sdl combined braindamage, we need this contortion
2583sub main { 2714sub main {
2584 { 2715 {
2585 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2716 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2586 2717
2587 if (-e "$Deliantra::VARDIR/client.cf") { 2718 if (-e "$Deliantra::VARDIR/client.cf") {
… …
2604 DC::DB::open_db; 2735 DC::DB::open_db;
2605 2736
2606 DC::UI::set_layout ($::CFG->{layout}); 2737 DC::UI::set_layout ($::CFG->{layout});
2607 2738
2608 my %DEF_CFG = ( 2739 my %DEF_CFG = (
2740 config_autosave => 1,
2609 sdl_mode => undef, 2741 sdl_mode => undef,
2610 fullscreen => 1, 2742 fullscreen => 1,
2611 fast => 0, 2743 fast => 0,
2612 force_opengl11 => undef, 2744 force_opengl11 => undef,
2613 disable_alpha => 0, 2745 disable_alpha => 0,
2614 smooth_movement => 1, 2746 smooth_movement => 1,
2747 smooth_transitions => 1,
2615 texture_compression => 1, 2748 texture_compression => 1,
2616 map_scale => 1, 2749 map_scale => 1,
2617 fow_enable => 1, 2750 fow_enable => 1,
2618 fow_intensity => 0, 2751 fow_intensity => 0,
2752 fow_texture => 0,
2619 map_smoothing => 1, 2753 map_smoothing => 1,
2620 gui_fontsize => 1, 2754 gui_fontsize => 1,
2621 log_fontsize => 0.7, 2755 log_fontsize => 0.7,
2622 gauge_fontsize => 1, 2756 gauge_fontsize => 1,
2623 gauge_size => 0.35, 2757 gauge_size => 0.35,
… …
2631 effects_enable => 1, 2765 effects_enable => 1,
2632 effects_volume => 1, 2766 effects_volume => 1,
2633 bgm_enable => 1, 2767 bgm_enable => 1,
2634 bgm_volume => 0.5, 2768 bgm_volume => 0.5,
2635 output_rate => "", 2769 output_rate => "",
2636 pickup => 0, 2770 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2637 inv_sort => "mtime", 2771 inv_sort => "mtime",
2638 default => "profile", # default profile 2772 default => "profile", # default profile
2639 show_tips => 1, 2773 show_tips => 1,
2640 logview_max_par => 1000, 2774 logview_max_par => 1000,
2641 shift_fire_stop => 0, 2775 shift_fire_stop => 0,
2642 ); 2776 uitheme => "wood",
2777 map_shift_x => -24, # arbitrary
2778 map_shift_y => +24, # arbitrary
2643 2779 );
2780
2644 while (my ($k, $v) = each %DEF_CFG) { 2781 while (my ($k, $v) = each %DEF_CFG) {
2645 $CFG->{$k} = $v unless exists $CFG->{$k}; 2782 $CFG->{$k} = $v unless exists $CFG->{$k};
2646 } 2783 }
2647 2784
2648 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2785 my @args = @ARGV;
2786
2787 my $profile = 'default';
2788
2789 for (my $i = 0; $i < @args; $i++) {
2790 if ($args[$i] =~ /^--?profile$/) {
2791 $profile = $args[$i + 1];
2792 splice @args, $i, 2, ();
2793 $i = 0;
2794 } elsif ($args[$i] =~ /^--?h/) {
2795 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2796 exit 0;
2797 }
2798 }
2799
2800 $CFG->{profile}{$profile} ||= {};
2649 $PROFILE = $CFG->{profile}{default}; 2801 $PROFILE = $CFG->{profile}{$profile};
2802 $PROFILE->{host} ||= "gameserver.deliantra.net";
2803
2804 $PROFILE->{host} = $args[0] if @args > 0;
2805 $PROFILE->{user} = $args[1] if @args > 1;
2806 $PROFILE->{password} = $args[2] if @args > 2;
2650 2807
2651 # convert old bindings (only default profile matters) 2808 # convert old bindings (only default profile matters)
2652 if (my $bindings = delete $PROFILE->{bindings}) { 2809 if (my $bindings = delete $PROFILE->{bindings}) {
2653 while (my ($mod, $syms) = each %$bindings) { 2810 while (my ($mod, $syms) = each %$bindings) {
2654 while (my ($sym, $cmds) = each %$syms) { 2811 while (my ($sym, $cmds) = each %$syms) {
… …
2660 } 2817 }
2661 } 2818 }
2662 2819
2663 sdl_init; 2820 sdl_init;
2664 2821
2822 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2823 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2824
2665 { 2825 {
2666 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2826 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2667 DejaVuSans.ttf 2827 DejaVuSans.ttf
2668 DejaVuSansMono.ttf 2828 DejaVuSansMono.ttf
2669 DejaVuSans-Bold.ttf 2829 DejaVuSans-Bold.ttf
2670 DejaVuSansMono-Bold.ttf 2830 DejaVuSansMono-Bold.ttf
2671 DejaVuSans-Oblique.ttf 2831 DejaVuSans-Oblique.ttf
2672 DejaVuSansMono-Oblique.ttf 2832 DejaVuSansMono-Oblique.ttf
2673 DejaVuSans-BoldOblique.ttf 2833 DejaVuSans-BoldOblique.ttf
2674 DejaVuSansMono-BoldOblique.ttf 2834 DejaVuSansMono-BoldOblique.ttf
2835 mona.ttf
2675 ); 2836 );
2676 2837
2677 DC::add_font $_ for @fonts; 2838 DC::add_font $_ for @fonts;
2678 2839
2679 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2840 $FONT_PROP = new_from_file DC::Font $fonts[0];
2680 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2841 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2681 2842
2682 $FONT_PROP->make_default; 2843 $FONT_PROP->make_default;
2683 2844
… …
2709 }; 2870 };
2710 2871
2711 delete $SIG{__DIE__}; 2872 delete $SIG{__DIE__};
2712 EV::loop; 2873 EV::loop;
2713 2874
2875 DC::write_cfg if $CFG->{config_autosave};
2876
2714#video_shutdown; 2877 #video_shutdown;
2715#audio_shutdown; 2878 #audio_shutdown;
2879
2716 DC::OpenGL::quit; 2880 DC::OpenGL::quit;
2717 DC::SDL_Quit; 2881 DC::SDL_Quit;
2718 DC::DB::Server::stop; 2882 DC::DB::Server::stop;
2719} 2883}
2720 2884
… …
2724 2888
2725deliantra - A Deliantra MORPG game client 2889deliantra - A Deliantra MORPG game client
2726 2890
2727=head1 SYNOPSIS 2891=head1 SYNOPSIS
2728 2892
2729Just run it - no commandline arguments are supported. 2893 deliantra [--profile name] [host [user [password]]]
2894 deliantra --help
2730 2895
2731=head1 USAGE 2896=head1 USAGE
2732 2897
2733deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2898The deliantra client utilises OpenGL for all UI elements and the game. It
2734be used in fullscreen mode and interactively. 2899is supposed to be used in fullscreen mode and interactively.
2735 2900
2736=head1 DEBUGGING 2901=head1 DEBUGGING
2737
2738 2902
2739CFPLUS_DEBUG - environment variable 2903CFPLUS_DEBUG - environment variable
2740 2904
2741 1 draw borders around widgets 2905 1 draw borders around widgets
2742 2 add low-level widget info to tooltips 2906 2 add low-level widget info to tooltips

Diff Legend

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