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.39 by root, Mon May 5 16:58:35 2008 UTC vs.
Revision 1.102 by elmex, Sat Mar 20 00:50:06 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 {
50 } 55 }
51 56
52 if ($^O eq "MSWin32") { 57 if ($^O eq "MSWin32") {
53 # pango is relocatable on win32 58 # pango is relocatable on win32
54 } else { 59 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 60 # OS X
56 or die "pangoversion: $!";
57 my $PANGO = <$fh>;
58 # unix, need to patch pango rc file
59 open my $fh, "<:perlio", "$root/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
60 or die "$root/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
61 local $/;
62 my $rc = <$fh>;
63 $rc =~ s/^\//$root\//gm; # replace abs paths by relative ones
64
65 mkdir "$root/pango-modules";
66 open my $fh, ">:perlio", "$root/pango-modules/pango.modules"
67 or die "$root/pango-modules/pango.modules: $!";
68 print $fh $rc;
69
70 $ENV{PANGO_RC_FILE} = "$root/pango.rc"; 61 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 62 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 63 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 64 }
75 65
76 unshift @INC, $root; 66 unshift @INC, $root;
77 } 67 }
78} 68}
79 69
80# prepend private library directory 70# prepend private library directory and prepare env
81BEGIN { 71BEGIN {
82 for (grep !ref, @INC) { 72 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 73 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 74 if (-d $path) {
85 unshift @INC, $path; 75 unshift @INC, $path;
90 80
91# need to do it again because that pile of garbage called PAR nukes it before main 81# need to do it again because that pile of garbage called PAR nukes it before main
92unshift @INC, $ENV{PAR_TEMP} 82unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 83 if %PAR::LibCache;
94 84
95use Time::HiRes 'time';
96use EV; 85use EV;
86BEGIN { *time = \&EV::time }
87
97use List::Util qw(max min); 88use List::Util qw(max min);
98 89
99use Deliantra; 90use Deliantra;
100use Deliantra::Protocol::Constants; 91use Deliantra::Protocol::Constants;
101 92
93use AnyEvent::Util ();
94use AnyEvent::Socket ();
95use AnyEvent::DNS ();
96
102use Compress::LZF; 97use Compress::LZF;
98use JSON::XS;
103 99
104use DC; BEGIN { $SIG{__DIE__} = sub { DC::fatal Carp::longmess "$@" unless $^S } } 100use DC;
101
102sub crash($;$) {
103 # nop during compiletime
104}
105
106BEGIN {
107 $SIG{__DIE__} = sub {
108 return if $^S;
109 crash "CRASH/DIE: $_[0]" => 1;
110 DC::fatal Carp::longmess "$_[0]";
111 }
112}
113
105use DC::OpenGL (); 114use DC::OpenGL ();
106use DC::Protocol; 115use DC::Protocol;
107use DC::DB; 116use DC::DB;
108use DC::UI; 117use DC::UI;
109use DC::UI::Canvas; 118use DC::UI::Canvas;
110use DC::UI::Inventory; 119use DC::UI::Inventory;
111use DC::UI::SpellList; 120use DC::UI::SpellList;
112use DC::UI::Dockable; 121use DC::UI::Dockable;
113use DC::UI::Dockbar; 122use DC::UI::Dockbar;
114use DC::UI::MessageWindow;
115use DC::UI::ChatView; 123use DC::UI::ChatView;
116use DC::MessageDistributor; 124use DC::MessageDistributor;
117use DC::Pod; 125use DC::Pod;
118use DC::MapWidget; 126use DC::MapWidget;
119use DC::Macro; 127use DC::Macro;
120 128
121$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 129$SIG{QUIT} = sub { Carp::cluck "QUIT" };
122$SIG{PIPE} = 'IGNORE'; 130$SIG{PIPE} = 'IGNORE';
123 131
124$EV::DIED = sub { 132$EV::DIED = sub {
133 crash "CRASH/EV::DIED: $@" => 0;
125 DC::fatal Carp::longmess $@; 134 DC::fatal Carp::longmess $@;
126}; 135};
127 136
128my $MAX_FPS = 60; 137my $MAX_FPS = 60;
129 138
139our $DEFAULT_SERVER = "gameserver.deliantra.net";
140
130our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 141our $META_SERVER = "http://metaserver.schmorp.de/current.json";
131 142
132our $LAST_REFRESH; 143our $LAST_REFRESH;
133our $NOW; 144our $NOW;
134 145
135our $CFG; 146our $CFG;
136our $CONN;
137our $PROFILE; # current profile 147our $PROFILE; # current profile
138our $FAST; # fast, low-quality mode, possibly useful for software-rendering 148our $FAST; # fast, low-quality mode, possibly useful for software-rendering
139 149
140our $WANT_REFRESH; 150our $WANT_REFRESH;
141 151
152our $MODE_SLIDER;
153our $CAVEAT_LABEL;
154
142our @SDL_MODES; 155our @SDL_MODES;
156our $SDL_REINIT = 1;
143our $WIDTH; 157our $WIDTH;
144our $HEIGHT; 158our $HEIGHT;
145our $FULLSCREEN; 159our $FULLSCREEN;
146our $FONTSIZE; 160our $FONTSIZE;
147 161
148our $FONT_PROP; 162our $FONT_PROP;
149our $FONT_FIXED; 163our $FONT_FIXED;
150 164
165our $CONN;
166
151our $MAP; 167our $MAP;
152our $MAPMAP; 168our $MAPMAP;
153our $MAPWIDGET; 169our $MAPWIDGET;
154our $COMPLETER; 170our $COMPLETER;
155our $BUTTONBAR; 171our $MENUFRAME; # the rectangle at the top
172our $MENUBAR; # the hbox at the top
173our $MENUPOPUP;
174our $BUTTONBAR; # the menu buttons
156our $METASERVER; 175our $METASERVER;
157our $LOGIN_BUTTON; 176our $LOGIN_BUTTON;
158our $QUIT_DIALOG; 177our $QUIT_DIALOG;
159our $HOST_ENTRY; 178our $HOST_ENTRY;
160our $FULLSCREEN_ENABLE; 179our $FULLSCREEN_ENABLE;
186our $FLOORBOX; 205our $FLOORBOX;
187our $GAUGES; 206our $GAUGES;
188our $STATWIDS; 207our $STATWIDS;
189 208
190our $SDL_ACTIVE; 209our $SDL_ACTIVE;
191our %SDL_CB; 210our @SDL_CB;
192 211
193our $ALT_ENTER_MESSAGE; 212our $ALT_ENTER_MESSAGE;
194our $STATUSBOX; 213our $STATUSBOX;
195our $MODBOX; 214our $MODBOX;
196our $DEBUG_STATUS; 215our $DEBUG_STATUS;
197 216
198our $INV; 217our $INV;
199our $INVR; 218our $INVR;
200our $INVR_HB; 219our $INVR_HB;
220
221#############################################################################
222
223# write a crash message blockingly to the socket, if possible
224# this is a bit too complicated for my tastes, but it was easy.
225*crash = sub($;$) {
226 my ($msg, $backtrace) = @_;
227
228 warn $msg;
229
230 return unless $CONN;
231
232 my $fh = $CONN->{fh}
233 or return;
234
235 my $buf = delete $CONN->{wbuf};
236
237 $buf .= pack "n/a*", "exti " . JSON::XS::encode_json [clientlog => undef, substr $msg, 0, 8000];
238
239 AnyEvent::Util::fh_nonblocking $fh, 0;
240 syswrite $fh, $buf;
241 AnyEvent::Util::fh_nonblocking $fh, 1;
242
243 $msg =~ s/\s+$//;
244
245 # backtrace as second step, in case it crashes, too
246 crash Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated"
247 if $backtrace;
248};
249
250sub clienterror($;$) {
251 my ($msg, $backtrace) = @_;
252
253 warn $msg;
254
255 return unless $CONN;
256
257 $CONN->send_exti_msg (clientlog => $msg);
258 $CONN->send_exti_msg (clientlog => Carp::longmess "$msg\nbacktrace, for client version $DC::VERSION, generated") if $backtrace;
259}
201 260
202############################################################################# 261#############################################################################
203 262
204sub status { 263sub status {
205 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 264 $STATUSBOX->add (DC::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
287 or return; 346 or return;
288 347
289 $meta->{data} 348 $meta->{data}
290 or return; 349 or return;
291 350
292 # if its a jingle, play it as ambient music 351 # if it's a jingle, play it as ambient music
293 if ($meta->{data}{jingle}) { 352 if ($meta->{data}{jingle}) {
294 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue 353 if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
295 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 354 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
296 &audio_music_push ($face); 355 &audio_music_push ($face);
297 } 356 }
298 } else { 357 } else {
299 # fetch from database 358 # fetch from database
300 DC::DB::get res_data => $meta->{name}, sub { 359 DC::DB::get res_data => $meta->{name}, sub {
301 my $rwops = new DC::RW $_[0]; 360 my $rwops = new DC::RW $_[0];
302 my $chunk = new DC::MixChunk $rwops 361 my $chunk = new DC::MixChunk $rwops
303 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " unloadable: " . DC::Mix_GetError; 362 or Carp::confess "sound face " . (JSON::XS::encode_json $meta) . " (" . (unpack "H64", $_[0]) . ") unloadable: " . DC::Mix_GetError;
304 $chunk->volume (($meta->{data}{volume} || 1) * 128); 363 $chunk->volume (($meta->{data}{volume} || 1) * 128);
305 $AUDIO_CHUNK{$face} = $chunk; 364 $AUDIO_CHUNK{$face} = $chunk;
306 365
307 audio_sound_push ($face); 366 audio_sound_push ($face);
308 }; 367 };
355 414
356 audio_music_update_volume; 415 audio_music_update_volume;
357 416
358 $MUSIC_PLAYING_DATA = \$_[0]; 417 $MUSIC_PLAYING_DATA = \$_[0];
359 418
419 $meta->{path} or length $_[0]
420 or return clienterror "empty music face from res_data ($meta->{face})";#d#
421
360 my $rwops = $meta->{path} 422 my $rwops = $meta->{path}
361 ? new_from_file DC::RW $meta->{path} 423 ? (new_from_file DC::RW $meta->{path} or return clienterror "unable to load music face $meta->{path}: $!")#d#clienterror
362 : new DC::RW $$MUSIC_PLAYING_DATA; 424 : new DC::RW $$MUSIC_PLAYING_DATA;
363 425
364 $MUSIC_PLAYER = new DC::MixMusic $rwops 426 $MUSIC_PLAYER = new DC::MixMusic $rwops
365 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 427 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
366 428
367 my $NOW = time; 429 my $NOW = time;
368 430
369 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 431 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
370 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 432 my $pos = $MUSIC_PLAYING_META->{stop_pos};
479 sub audio_tab_update; 541 sub audio_tab_update;
480 audio_tab_update; 542 audio_tab_update;
481} 543}
482 544
483sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
484 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
485 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
486 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
487 554
488 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
725 792
726 $vbox->add (@dialog); 793 $vbox->add (@dialog);
727 $dialog->show; 794 $dialog->show;
728} 795}
729 796
730sub start_game { 797sub dc_connect {
731 status "logging in..."; 798 my ($host, $port) = @_;
732 799
733 $LOGIN_BUTTON->set_text ("Logout");
734 $SETUP_DIALOG->hide;
735
736 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 800 my $mapw = List::Util::min 48, List::Util::max 11, int 1.5 + $WIDTH * $CFG->{mapsize} * 0.01 / 32;
801 my $maph = List::Util::min 48, List::Util::max 11, int 1.5 + $HEIGHT * $CFG->{mapsize} * 0.01 / 32;
737 802
738 my ($host, $port) = split /:/, $PROFILE->{host};
739
740 $MAP = new DC::Map;
741
742 $CONN = eval { 803 $CONN =
743 new DC::Protocol 804 new DC::Protocol
744 host => $host, 805 host => $host,
745 port => $port || 13327, 806 port => $port,
746 user => $PROFILE->{user}, 807 user => $PROFILE->{user},
747 pass => $PROFILE->{password}, 808 pass => $PROFILE->{password},
748 mapw => $mapsize, 809 mapw => $mapw,
749 maph => $mapsize, 810 maph => $maph,
750 811
751 client => "$DC::VERSION $] $^O", 812 client => "$DC::VERSION $] $^O",
752 813
753 map_widget => $MAPWIDGET, 814 map_widget => $MAPWIDGET,
754 statusbox => $STATUSBOX, 815 statusbox => $STATUSBOX,
757 query => \&server_query, 818 query => \&server_query,
758 819
759 setup_req => { 820 setup_req => {
760 smoothing => $CFG->{map_smoothing}*1, 821 smoothing => $CFG->{map_smoothing}*1,
761 }, 822 },
762 };
763 823
764 if ($CONN) { 824 on_connect => sub {
825 if ($_[0]) {
765 DC::lowdelay fileno $CONN->{fh}; 826 DC::lowdelay fileno $CONN->{fh};
766 827
767 status "login successful"; 828 status "successfully connected to the server";
829 } else {
830 undef $CONN;
831 status "unable to connect: $!";
832 stop_game();
833 }
834 },
835 ;
836}
837
838sub start_game {
839 status "logging in...";
840
841 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
842 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
843 or return status "$server: unable to parse server address, try an empty field.";
844
845 $LOGIN_BUTTON->set_text ("Logout");
846 $SETUP_DIALOG->hide;
847
848 $MAP = new DC::Map;
849
850 # hack to make SURE we find the IP address all right
851 # can be removed once AnyEvent::DNS is proven stable.
852 if ($host eq "gameserver.deliantra.net") {
853 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
854 if ($_[0] ne "80.101.114.108") { # Perl
855 status "dns failure, trying differently";
856 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
857 unless (defined $host) {
858 status "dns failure, using hardcoded address";
859 $host = "129.13.162.95";
860 }
861 }
862
863 dc_connect $host, $port;
864 };
768 } else { 865 } else {
769 warn $@; 866 dc_connect $host, $port;
770 status "unable to connect";
771 stop_game();
772 } 867 }
773} 868}
774 869
775sub stop_game { 870sub stop_game {
871 crash "stop_game";
872
776 $LOGIN_BUTTON->set_text ("Login / Register"); 873 $LOGIN_BUTTON->set_text ("Login / Register");
777 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 874 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
778 $SETUP_DIALOG->show; 875 $SETUP_DIALOG->show;
779 $PL_WINDOW->hide; 876 $PL_WINDOW->hide;
780 $SPELL_LIST->clear_spells; 877 $SPELL_LIST->clear_spells;
794} 891}
795 892
796sub graphics_setup { 893sub graphics_setup {
797 my $vbox = new DC::UI::VBox; 894 my $vbox = new DC::UI::VBox;
798 895
896 {
897 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
898
799 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 899 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
800 900
801 my $row = 0; 901 my $row = 0;
802 902
803 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 903 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
804 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 904 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
805 can_events => 1, 905 can_events => 1,
806 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 906 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
807 907
908 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
909 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
910 can_events => 1,
911 tooltip => "This field shows any known issues with your config or driver, such as "
912 . "a non-accelerated display format. You can try to work around these issues "
913 . "by selecting a different video mode, changing the settings below or "
914 . "by installing the right driver for your graphics card.");
915
916 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
917 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
918 value => $CFG->{uitheme},
919 options => [
920 [wood => "Wood (the default)"],
921 [plain => "Plain (very)"],
922 [blue => "Blue (dark)"],
923 [metal => "Metal (light)"],
924 ],
925 tooltip => "Choose the User Interface theme that you like most :)",
926 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
927 );
928
808 my $vidmode_tooltip = 929 my $vidmode_tooltip =
809 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 930 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
810 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 931 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
811 932
812 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 933 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
813 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 934 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
814 935
815 $hbox->add (my $mode_slider = new DC::UI::Slider 936 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
816 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1], 937 c_rescale => 1,
938 force_w => $WIDTH * 0.1, expand => 1,
939 range => [ ($CFG->{sdl_mode}) x 3 ],
817 tooltip => $vidmode_tooltip); 940 tooltip => $vidmode_tooltip);
818 $hbox->add (my $mode_label = new DC::UI::Label 941 $hbox->add (my $mode_label = new DC::UI::Label
819 height => 0.8, template => "9999x9999@9+9", 942 height => 0.8, template => "9999x9999@9+9",
820 can_events => 1, tooltip => $vidmode_tooltip); 943 can_events => 1, tooltip => $vidmode_tooltip);
821 944
822 $mode_slider->connect (changed => sub { 945 $MODE_SLIDER->connect (changed => sub {
823 my ($self, $value) = @_; 946 my ($self, $value) = @_;
824 947
825 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 948 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
826 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]}); 949 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
827 }); 950 });
828 $mode_slider->emit (changed => $mode_slider->{range}[0]); 951 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
829 952
830 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen"); 953 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
831 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox 954 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
832 state => $CFG->{fullscreen}, 955 state => $CFG->{fullscreen},
833 tooltip => "Bring the client into fullscreen mode.", 956 tooltip => "Bring the client into fullscreen mode.",
834 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 957 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
835 ); 958 );
836 959
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1"); 960 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
838 $table->add_at (1, $row++, new DC::UI::CheckBox 961 $table->add_at (1, $row++, new DC::UI::CheckBox
839 state => $CFG->{force_opengl11}, 962 state => $CFG->{force_opengl11},
840 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in " 963 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
841 . "higher memory usage and slower performance. It will, however, help tremendously on " 964 . "higher memory usage and slower performance. It will, however, help tremendously on "
842 . "cards that claim to support a feature but fall back to software rendering. " 965 . "cards that claim to support a feature but fall back to software rendering. "
843 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, " 966 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
844 . "but cards and drivers from other vendors (ATI) are often just as bad. <b>If you " 967 . "but cards and drivers from other vendors (ATI) are often just as bad. "
845 . "experience extremely low framerates and your card should do better, try this option.</b>", 968 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
846 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 } 969 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
847 ); 970 );
848 971
972 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
973 $table->add_at (1, $row++, new DC::UI::CheckBox
974 state => $CFG->{disable_alpha},
975 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
976 . "by disabling a number of textures and transparency effects. Normally, these "
977 . "effects do not cost a lot of resources, but some graphics cards might fall "
978 . "back to extremely slow rendering if this is enabled. If disabling this option "
979 . "noticably improves the framerate of the client please report this! "
980 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
981 on_changed => sub {
982 my ($self, $value) = @_;
983 $CFG->{disable_alpha} = $value;
984 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
985 0
986 }
987 );
988
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 989 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
850 $table->add_at (1, $row++, new DC::UI::CheckBox 990 $table->add_at (1, $row++, new DC::UI::CheckBox
851 state => $CFG->{texture_compression}, 991 state => $CFG->{texture_compression},
852 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 992 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
853 . "will save a lot of memory and increase performance. The compression algorithm " 993 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
854 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 994 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
855 . "forced OpenGL 1.1 mode.", 995 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
856 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 996 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
857 ); 997 );
858 998
859 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 999 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
860 $table->add_at (1, $row++, new DC::UI::CheckBox 1000 $table->add_at (1, $row++, new DC::UI::CheckBox
861 state => $CFG->{fast}, 1001 state => $CFG->{fast},
862 tooltip => "Lower the visual quality considerably to speed up rendering.", 1002 tooltip => "Lower the visual quality considerably to speed up rendering.",
863 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1003 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
864 ); 1004 );
865 1005
866 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1006 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
867 $table->add_at (1, $row++, new DC::UI::Slider 1007 $table->add_at (1, $row++, new DC::UI::Slider
868 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1008 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
869 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1009 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
870 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1010 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
871 ); 1011 );
872 1012
873 $table->add_at (1, $row++, new DC::UI::Button 1013 $table->add_at (1, $row++, new DC::UI::Button
874 expand => 1, text => "Apply", 1014 expand => 1, text => "Apply",
875 tooltip => "Apply the video settings above.", 1015 tooltip => "Apply the video settings above.",
876 on_activate => sub { 1016 on_activate => sub {
877 video_shutdown (); 1017 video_shutdown ();
878 video_init (); 1018 video_init ();
1019 0
879 0 1020 }
880 } 1021 );
1022 }
1023
1024 {
1025 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1026
1027 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1028
1029 my $row = 0;
1030 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
1031 $table->add_at (1, $row++, new DC::UI::CheckBox
1032 state => $CFG->{smooth_movement},
1033 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
1034 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1035 . "then disable this option. Changes take effect immdiately.",
1036 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
881 ); 1037 );
882 1038
1039 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1040 $table->add_at (1, $row++, new DC::UI::CheckBox
1041 state => $CFG->{smooth_transitions},
1042 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1043 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1044 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1045 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1046 );
1047
1048
883 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1049 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
884 $table->add_at (1, $row++, new DC::UI::Slider 1050 $table->add_at (1, $row++, new DC::UI::Slider
885 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1051 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
886 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1052 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
887 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1053 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
888 ); 1054 );
889 1055
890 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1056 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
891 $table->add_at (1, $row++, new DC::UI::CheckBox 1057 $table->add_at (1, $row++, new DC::UI::CheckBox
892 state => $CFG->{map_smoothing}, 1058 state => $CFG->{map_smoothing},
893 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1059 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
894 . "This increases load on the graphics subsystem and works only with TRT servers. " 1060 . "This increases load on the graphics subsystem and works only with TRT servers. "
895 . "Changes take effect at next login only.", 1061 . "Changes take effect at next login only.",
896 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1062 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
897 ); 1063 );
898 1064
899 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1065 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
900 $table->add_at (1, $row++, new DC::UI::CheckBox 1066 $table->add_at (1, $row++, new DC::UI::CheckBox
901 state => $CFG->{fow_enable}, 1067 state => $CFG->{fow_enable},
902 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1068 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
903 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1069 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
904 ); 1070 );
905 1071
1072 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1073 $table->add_at (1, $row++, new DC::UI::ImageButton
1074 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1075 bg => [0.3, 0.3, 0.2],
1076 force_w => 64,
1077 force_h => 64,
1078 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.",
1079 on_activate => sub {
1080 my ($self) = @_;
1081 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1082 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1083 $MAPWIDGET->update;
1084 }
1085 );
1086
906 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1087 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
907 $table->add_at (1, $row++, new DC::UI::Slider 1088 $table->add_at (1, $row++, new DC::UI::Slider
908 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1089 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
909 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1090 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
910 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1091 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
911 ); 1092 );
912 1093
913 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1094 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
914 $table->add_at (1, $row++, new DC::UI::Slider 1095 $table->add_at (1, $row++, new DC::UI::Slider
915 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1096 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
916 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1097 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
917 . "but you still need to press apply to correctly re-layout the widget.", 1098 . "but you still need to press apply to correctly re-layout the widget.",
918 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1099 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
919 ); 1100 );
920 1101
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1102 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 1103 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1104 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1105 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
925 on_changed => sub { 1106 on_changed => sub {
926 $CFG->{gauge_fontsize} = $_[1]; 1107 $CFG->{gauge_fontsize} = $_[1];
927 &set_gauge_window_fontsize; 1108 &set_gauge_window_fontsize;
1109 0
928 0 1110 }
929 } 1111 );
930 );
931 1112
932 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1113 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
933 $table->add_at (1, $row++, new DC::UI::Slider 1114 $table->add_at (1, $row++, new DC::UI::Slider
934 range => [$CFG->{gauge_size}, 0.2, 0.8], 1115 range => [$CFG->{gauge_size}, 0.2, 0.8],
935 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1116 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
936 on_changed => sub { 1117 on_changed => sub {
937 $CFG->{gauge_size} = $_[1]; 1118 $CFG->{gauge_size} = $_[1];
938 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1119 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1120 0
939 0 1121 }
940 } 1122 );
941 ); 1123 }
942 1124
943 $vbox 1125 $vbox
944} 1126}
945 1127
946our $AUDIO_HW_CHUNKSIZE; 1128our $AUDIO_HW_CHUNKSIZE;
959 1141
960 my $text = !$freq 1142 my $text = !$freq
961 ? "audio is off" 1143 ? "audio is off"
962 : "audio is enabled\n" 1144 : "audio is enabled\n"
963 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
964 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
965 1149
966 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
967} 1151}
968 1152
969sub audio_setup { 1153sub audio_setup {
1109} 1293}
1110 1294
1111sub make_gauge_window { 1295sub make_gauge_window {
1112 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1296 my $gh = int $HEIGHT * $CFG->{gauge_size};
1113 1297
1114 my $win = new DC::UI::Frame ( 1298 $GAUGES->{win} = my $win = new DC::UI::Frame (
1115 force_x => 0, 1299 force_x => 0,
1116 force_y => "max", 1300 force_y => "max",
1117 force_w => $WIDTH, 1301 force_w => $WIDTH,
1118 force_h => $gh, 1302 force_h => $gh,
1119 ); 1303 );
1135 (new DC::UI::Empty expand => 1), 1319 (new DC::UI::Empty expand => 1),
1136 (my $hb = new DC::UI::HBox), 1320 (my $hb = new DC::UI::HBox),
1137 ], 1321 ],
1138 ); 1322 );
1139 1323
1140 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1324 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1141 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1325 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1142 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1326 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1143 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1327 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1144
1145 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1146 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1147 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1148 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1149
1150 $GAUGES = {
1151 exp => $exp, prg => $prg, sklprg => $sklprg,
1152 win => $win, range => $rng,
1153 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1154 };
1155 1328
1156 &set_gauge_window_fontsize; 1329 &set_gauge_window_fontsize;
1157 1330
1158 $win 1331 $win
1159} 1332}
1501 ); 1674 );
1502 1675
1503 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1676 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1504 $table->add_at (1, 4, new DC::UI::Entry 1677 $table->add_at (1, 4, new DC::UI::Entry
1505 text => $CFG->{profile}{default}{user}, 1678 text => $CFG->{profile}{default}{user},
1506 tooltip => "The name of your character on the server.", 1679 tooltip => "The name of your character on the server. The name is case-sensitive!",
1507 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1680 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1508 ); 1681 );
1509 1682
1510 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1683 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1511 $table->add_at (1, 5, new DC::UI::Entry 1684 $table->add_at (1, 5, new DC::UI::Entry
1525 1 1698 1
1526 }, 1699 },
1527 ); 1700 );
1528 1701
1529 $vbox->add (new DC::UI::FancyFrame 1702 $vbox->add (new DC::UI::FancyFrame
1530 label => "Registering", 1703 label => "How to Play",
1531 min_h => 200, 1704 min_h => 240,
1532 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1705 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1533 markup => 1706 markup =>
1707 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1708 . "Then register a new account (or use an existing one if you have one). "
1534 "To register a new account, choose a username that hasn't been taken yet and " 1709 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1535 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1710 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1536 ), 1711 ),
1537 ); 1712 );
1538 1713
1539 $vbox 1714 $vbox
1611 1786
1612 my $row = 0; 1787 my $row = 0;
1613 1788
1614 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1789 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1615 $table->add_at (1, $row++, new DC::UI::CheckBox 1790 $table->add_at (1, $row++, new DC::UI::CheckBox
1791 c_colspan => 2,
1616 state => $CFG->{show_tips}, 1792 state => $CFG->{show_tips},
1617 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1793 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1618 on_changed => sub { 1794 on_changed => sub {
1619 my ($self, $value) = @_; 1795 my ($self, $value) = @_;
1620 $CFG->{show_tips} = $value; 1796 $CFG->{show_tips} = $value;
1622 } 1798 }
1623 ); 1799 );
1624 1800
1625 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1801 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1626 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1802 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1803 c_colspan => 2,
1627 text => $CFG->{logview_max_par}, 1804 text => $CFG->{logview_max_par},
1628 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1805 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1629 . "sends more messages than this number, older messages get removed to save memory and " 1806 . "sends more messages than this number, older messages get removed to save memory and "
1630 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1807 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1631 on_changed => sub { 1808 on_changed => sub {
1633 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1810 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1634 0 1811 0
1635 }, 1812 },
1636 ); 1813 );
1637 1814
1815 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1816 $table->add_at (1, $row, new DC::UI::CheckBox
1817 state => $CFG->{config_autosave},
1818 tooltip => "Normally, configuration settings and the user interface layout "
1819 . "are saved on client exit. You can disable this behaviour by "
1820 . "unchecking this checkbox.",
1821 on_changed => sub {
1822 my ($self, $value) = @_;
1823 $CFG->{config_autosave} = $value;
1824 0
1825 }
1826 );
1827 $table->add_at (2, $row++, new DC::UI::Button
1828 text => "Save Now",
1829 tooltip => "Use this to manually save configuration and UI layout when "
1830 . "autosave is disabled.",
1831 on_activate => sub {
1832 DC::write_cfg;
1833 0
1834 }
1835 );
1836
1638 $table 1837 $table
1639} 1838}
1640 1839
1641sub autopickup_setup { 1840sub autopickup_setup {
1642 my $r = new DC::UI::ScrolledWindow ( 1841 my $r = new DC::UI::ScrolledWindow (
1648 col_expand => [0, 1, 0, 1], 1847 col_expand => [0, 1, 0, 1],
1649 ); 1848 );
1650 1849
1651 for ( 1850 for (
1652 ["General", 0, 0, 1851 ["General", 0, 0,
1653 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1654 ["Inhibit autopickup" => PICKUP_INHIBIT], 1852# ["Inhibit autopickup" => PICKUP_INHIBIT],
1655 ["Stop before pickup" => PICKUP_STOP], 1853 ["Stop before pickup" => PICKUP_STOP],
1656 ["Debug autopickup" => PICKUP_DEBUG], 1854 ["Debug autopickup" => PICKUP_DEBUG],
1657 ], 1855 ],
1658 ["Weapons", 0, 6, 1856 ["Weapons", 0, 6,
1659 ["All weapons" => PICKUP_ALLWEAPON], 1857 ["All weapons" => PICKUP_ALLWEAPON],
1685 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1883 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1686 ["Ignore cursed" => PICKUP_NOT_CURSED], 1884 ["Ignore cursed" => PICKUP_NOT_CURSED],
1687 ["Jewelery" => PICKUP_JEWELS], 1885 ["Jewelery" => PICKUP_JEWELS],
1688 ["Flesh" => PICKUP_FLESH], 1886 ["Flesh" => PICKUP_FLESH],
1689 ], 1887 ],
1690 ["Weight/Value ratio", 2, 17] 1888 ["Value/Weight ratio", 2, 17]
1691 ) 1889 )
1692 { 1890 {
1693 my ($title, $x, $y, @bits) = @$_; 1891 my ($title, $x, $y, @bits) = @$_;
1694 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1892 $table->add_at ($x, $y, new DC::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1695 1893
1707 $::CFG->{pickup} |= $mask; 1905 $::CFG->{pickup} |= $mask;
1708 } else { 1906 } else {
1709 $::CFG->{pickup} &= ~$mask; 1907 $::CFG->{pickup} &= ~$mask;
1710 } 1908 }
1711 1909
1712 $::CONN->send_command ("pickup $::CFG->{pickup}") 1910 $::CONN->send_pickup ($::CFG->{pickup})
1713 if defined $::CONN; 1911 if defined $::CONN;
1714 1912
1715 0 1913 0
1716 }); 1914 });
1717 1915
1720 } 1918 }
1721 1919
1722 $table->add_at (2, 18, new DC::UI::ValSlider 1920 $table->add_at (2, 18, new DC::UI::ValSlider
1723 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1921 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1724 template => ">= 99", 1922 template => ">= 99",
1923 tooltip => "Pick up items whose value/weight (silver/kg) ratio is equal or higher than this setting (which is specified in gold coins).",
1725 to_value => sub { ">= " . 5 * $_[0] }, 1924 to_value => sub { ">= " . 5 * $_[0] },
1726 on_changed => sub { 1925 on_changed => sub {
1727 my ($slider, $value) = @_; 1926 my ($slider, $value) = @_;
1728 1927
1729 $::CFG->{pickup} &= ~0xF; 1928 $::CFG->{pickup} &= ~0xF;
1733 }); 1932 });
1734 1933
1735 $table->add_at (3, 18, new DC::UI::Button 1934 $table->add_at (3, 18, new DC::UI::Button
1736 text => "set", 1935 text => "set",
1737 on_activate => sub { 1936 on_activate => sub {
1738 $::CONN->send_command ("pickup $::CFG->{pickup}") 1937 $::CONN->send_pickup ($::CFG->{pickup})
1739 if defined $::CONN; 1938 if defined $::CONN;
1740 0 1939 0
1741 }); 1940 });
1742 1941
1743 $r 1942 $r
1744} 1943}
1745 1944
1746my %SORT_ORDER = ( 1945my %SORT_ORDER = (
1747 type => undef, 1946 type => sub {
1947 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1948 },
1748 mtime => sub { 1949 mtime => sub {
1749 my $NOW = time; 1950 my $NOW = time;
1750 sort { 1951 sort {
1751 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1952 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1752 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1953 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1783 $::CFG->{inv_sort} = $_[1]; 1984 $::CFG->{inv_sort} = $_[1];
1784 $INV->set_sort_order ($SORT_ORDER{$_[1]}); 1985 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1785 }, 1986 },
1786 ); 1987 );
1787 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1); 1988 $hb1->add (new DC::UI::Label text => "Weight: ", align => 1, expand => 1);
1788 #TODO# update to weigh/maxweight 1989 #TODO# update to weight/maxweight
1789 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0); 1990 $hb1->add ($STATWIDS->{i_weight} = new DC::UI::Label align => 0);
1790 1991
1791 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 1992 $vb1->add (my $sw1 = new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
1792 $sw1->add ($INV = new DC::UI::Inventory); 1993 $sw1->add ($INV = new DC::UI::Inventory);
1793 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}}); 1994 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1854 $PL_NOTEBOOK->set_current_page ($widget); 2055 $PL_NOTEBOOK->set_current_page ($widget);
1855 $PL_WINDOW->show; 2056 $PL_WINDOW->show;
1856 } 2057 }
1857} 2058}
1858 2059
1859sub player_window { 2060sub make_playerbook {
1860 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2061 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1861 x => "center", 2062 x => "center",
1862 y => "center", 2063 y => "center",
1863 force_w => $WIDTH * 9/10, 2064 force_w => $WIDTH * 9/10,
1864 force_h => $HEIGHT * 9/10, 2065 force_h => $HEIGHT * 9/10,
1898 "License, Author and Source info for media sent by the server."); 2099 "License, Author and Source info for media sent by the server.");
1899 2100
1900 $ntb->set_current_page ($INVENTORY_PAGE); 2101 $ntb->set_current_page ($INVENTORY_PAGE);
1901 2102
1902 $plwin->add ($ntb); 2103 $plwin->add ($ntb);
1903 $plwin
1904} 2104}
1905 2105
1906sub keyboard_setup { 2106sub keyboard_setup {
1907 DC::Macro::keyboard_setup 2107 DC::Macro::keyboard_setup
1908} 2108}
1909 2109
1910sub help_window { 2110sub make_help_window {
1911 my $win = new DC::UI::Toplevel 2111 my $win = new DC::UI::Toplevel
1912 x => 'center', 2112 x => 'center',
1913 y => 'center', 2113 y => 'center',
1914 z => 4, 2114 z => 4,
1915 name => 'doc_browser', 2115 name => 'doc_browser',
2004 2204
2005 $load_node->((DC::Pod::find @path)[0]); 2205 $load_node->((DC::Pod::find @path)[0]);
2006 $win->show; 2206 $win->show;
2007 }; 2207 };
2008 2208
2009 $win 2209 $HELP_WINDOW = $win;
2010}
2011
2012sub open_string_query {
2013 my ($title, $cb, $txt, $tooltip) = @_;
2014 my $dialog = new DC::UI::Toplevel
2015 x => "center",
2016 y => "center",
2017 z => 50,
2018 force_w => $WIDTH * 4/5,
2019 title => $title;
2020
2021 $dialog->add (
2022 my $e = new DC::UI::Entry
2023 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2024 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2025 tooltip => $tooltip
2026 );
2027
2028 $e->grab_focus;
2029 $e->set_text ($txt) if $txt;
2030 $dialog->show;
2031} 2210}
2032 2211
2033sub open_quit_dialog { 2212sub open_quit_dialog {
2034 unless ($QUIT_DIALOG) { 2213 unless ($QUIT_DIALOG) {
2035 $QUIT_DIALOG = new DC::UI::Toplevel 2214 $QUIT_DIALOG = new DC::UI::Toplevel
2057 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2236 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2058 ); 2237 );
2059 $hb->add (new DC::UI::Button 2238 $hb->add (new DC::UI::Button
2060 text => "Quit anyway", 2239 text => "Quit anyway",
2061 expand => 1, 2240 expand => 1,
2062 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2241 on_activate => sub {
2242 crash "Quit anyway";
2243 EV::unloop EV::UNLOOP_ALL;
2244 },
2063 ); 2245 );
2064 } 2246 }
2065 2247
2066 $QUIT_DIALOG->show; 2248 $QUIT_DIALOG->show;
2067 $QUIT_DIALOG->grab_focus; 2249 $QUIT_DIALOG->grab_focus;
2250}
2251
2252sub make_menubar {
2253 $MENUFRAME = new DC::UI::Toplevel
2254 border => 0,
2255 force_x => 0,
2256 force_y => 0,
2257 force_w => $::WIDTH,
2258 child => ($MENUBAR = new DC::UI::HBox),
2259 ;
2260
2261 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2262
2263 # 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
2264 make_gauge_window->show;
2265
2266# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2267# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2268
2269 make_playerbook;
2270
2271 $MENUPOPUP = DC::UI::Menu->new (items => [
2272 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2273 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2274 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2275 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2276 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2277 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2278 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2279 ["Quit…" , sub {
2280 if ($CONN) {
2281 open_quit_dialog;
2282 } else {
2283 EV::unloop EV::UNLOOP_ALL;
2284 }
2285 }],
2286 ]);
2287
2288 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2289 tooltip => "Shows the main menu",
2290 on_button_down => sub {
2291 my ($self, $ev) = @_;
2292 local $ev->{x} = 0;
2293 local $ev->{y} = 0;
2294 $MENUPOPUP->popup ($ev);
2295 },
2296 );
2297
2298 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2299 padding_x => 6,
2300 padding_y => 3,
2301 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2302 template => " Exp: 888,888,888,888 (lvl 188) ",
2303 );
2304
2305 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2306 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2307 . "will automatically pick up items as defined by your item pickup settings "
2308 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2309 . "disable autopickup by disabling this checkbox.",
2310 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2311 on_changed => sub {
2312 my ($self, $value) = @_;
2313 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2314 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2315 $CONN->send_pickup ($CFG->{pickup})
2316 if $CONN;
2317 },
2318 );
2319
2320 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2321 c_rescale => 1,
2322 padding_x => 6,
2323 padding_y => 3,
2324 force_w => $::WIDTH * 0.2,
2325 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2326 template => "two handed weapons 99%",
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2330 expand => 1,
2331 align => 1, can_hover => 1, can_events => 1,
2332 text => "Range and Combat Slots",
2333 tooltip => "#stat_ranged",
2334 );
2335
2336 $MENUFRAME->show;
2337}
2338
2339sub open_string_query {
2340 my ($title, $cb, $txt, $tooltip) = @_;
2341 my $dialog = new DC::UI::Toplevel
2342 x => "center",
2343 y => "center",
2344 z => 50,
2345 force_w => $WIDTH * 4/5,
2346 title => $title;
2347
2348 $dialog->add (
2349 my $e = new DC::UI::Entry
2350 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2351 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2352 tooltip => $tooltip
2353 );
2354
2355 $e->grab_focus;
2356 $e->set_text ($txt) if $txt;
2357 $dialog->show;
2068} 2358}
2069 2359
2070sub show_tip_of_the_day { 2360sub show_tip_of_the_day {
2071 # find all tips 2361 # find all tips
2072 my @tod = DC::Pod::find tip_of_the_day => "*"; 2362 my @tod = DC::Pod::find tip_of_the_day => "*";
2120 $dialog->show; 2410 $dialog->show;
2121 }; 2411 };
2122} 2412}
2123 2413
2124sub sdl_init { 2414sub sdl_init {
2125 DC::SDL_Init 2415 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2126 and die "SDL::Init failed!\n"; 2416 and die "SDL::Init failed!\n";
2127} 2417}
2128 2418
2129sub video_init { 2419sub video_init {
2420 DC::set_theme $CFG->{uitheme};
2421
2422 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2423 $SDL_REINIT = 0;
2424
2425 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2426 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2427 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2428 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2429
2430 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2431
2130 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 2432 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2433 $CFG->{sdl_mode} = 0; # lowest resolution by default
2434
2435 # now choose biggest mode <= 1024x768
2436 for (0 .. $#SDL_MODES) {
2437 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2438 $CFG->{sdl_mode} = $_;
2439 }
2440 }
2441 }
2131 2442
2132 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2443 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2133 2444
2134 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2445 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2135 $FULLSCREEN = $CFG->{fullscreen}; 2446 $FULLSCREEN = $CFG->{fullscreen};
2136 $FAST = $CFG->{fast}; 2447 $FAST = $CFG->{fast};
2137 2448
2449 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2138 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2450 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2451 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2139 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2452 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2140 2453
2141 $SDL_ACTIVE = 1; 2454 $SDL_ACTIVE = 1;
2142 $LAST_REFRESH = time - 0.01; 2455 $LAST_REFRESH = time - 0.01;
2143 2456
2190 2503
2191 (new DC::UI::Frame 2504 (new DC::UI::Frame
2192 bg => [0, 0, 0, 0.4], 2505 bg => [0, 0, 0, 0.4],
2193 force_x => 0, 2506 force_x => 0,
2194 force_y => "max", 2507 force_y => "max",
2195 child => (my $LR = new DC::UI::VBox), 2508 child => (my $LL = new DC::UI::VBox),
2196 )->show; 2509 )->show;
2197 2510
2198 $LR->add ($STATUSBOX); 2511 $LL->add ($STATUSBOX);
2199 $LR->add ($MODBOX); 2512 $LL->add ($MODBOX);
2200 $LR->add (new DC::UI::Label 2513 $LL->add (new DC::UI::Label
2201 align => 0, 2514 align => 0,
2202 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2515 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2203 fontsize => 0.5, 2516 fontsize => 0.5,
2204 fg => [1, 1, 0, 0.7], 2517 fg => [1, 1, 0, 0.7],
2205 ); 2518 );
2206 2519
2207 DC::UI::Toplevel->new ( 2520 DC::UI::Toplevel->new (
2208 title => "Minimap", 2521 title => "Minimap",
2209 name => "mapmap", 2522 name => "mapmap",
2210 x => 0, 2523 x => 0,
2211 y => $FONTSIZE + 8, 2524 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2212 border_bg => [1, 1, 1, 192/255], 2525 border_bg => [1, 1, 1, 192/255],
2213 bg => [1, 1, 1, 0], 2526 bg => [1, 1, 1, 0],
2214 child => ($MAPMAP = new DC::MapWidget::MapMap 2527 child => ($MAPMAP = new DC::MapWidget::MapMap
2215 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2528 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2216 ), 2529 ),
2217 )->show; 2530 )->show;
2218 2531
2219 $MAPWIDGET = new DC::MapWidget; 2532 $MAPWIDGET = new DC::MapWidget;
2220 $MAPWIDGET->connect (activate_console => sub { 2533 $MAPWIDGET->connect (activate_console => sub {
2242 has_close_button => 1, 2555 has_close_button => 1,
2243 ; 2556 ;
2244 2557
2245 $METASERVER = metaserver_dialog; 2558 $METASERVER = metaserver_dialog;
2246 # the name is changed to not conflict with the older name as users could have hidden it 2559 # the name is changed to not conflict with the older name as users could have hidden it
2247 $MESSAGE_WINDOW = new DC::UI::Dockbar (name => "message_window2", title => 'Messages'); 2560 $MESSAGE_WINDOW = new DC::UI::Dockbar
2561 name => "message_window2",
2562 title => 'Messages',
2563 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2564 force_w => $::WIDTH * 0.6,
2565 force_h => $::HEIGHT * 0.25,
2566 ;
2567
2248 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2568 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2249 2569
2250 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1, 2570 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new DC::UI::Notebook expand => 1,
2251 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1); 2571 filter => new DC::UI::ScrolledWindow expand => 1, scroll_y => 1);
2252 2572
2268 . "After pressing the combo the binding will be saved automatically and the " 2588 . "After pressing the combo the binding will be saved automatically and the "
2269 . "binding editor closes"); 2589 . "binding editor closes");
2270 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2590 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2271 "Some debuggin' options. Do not ask."); 2591 "Some debuggin' options. Do not ask.");
2272 2592
2273 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2593 make_help_window;
2594 make_menubar;
2274 2595
2275 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2276 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2277
2278# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2279# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2280
2281 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
2282
2283 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2284 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2285
2286 $BUTTONBAR->add (new DC::UI::Button
2287 text => "Save Config",
2288 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2289 on_activate => sub {
2290 $::CFG->{layout} = DC::UI::get_layout;
2291 DC::write_cfg;
2292 status "Configuration Saved";
2293 0
2294 },
2295 );
2296
2297 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2298 tooltip => "View Documentation");
2299
2300 $BUTTONBAR->add (new DC::UI::Button
2301 text => "Quit",
2302 tooltip => "Terminates the program",
2303 on_activate => sub {
2304 if ($CONN) {
2305 open_quit_dialog;
2306 } else {
2307 EV::unloop EV::UNLOOP_ALL;
2308 }
2309 0
2310 },
2311 );
2312
2313 $BUTTONBAR->show;
2314 $SETUP_DIALOG->show; 2596 $SETUP_DIALOG->show;
2315 $MESSAGE_WINDOW->show; 2597 $MESSAGE_WINDOW->show;
2316 } 2598 }
2317 2599
2600 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2601 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2602
2603 $CAVEAT_LABEL->set_text ("None :)");
2604 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2605 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2606 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2607 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2608
2318 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2609 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2319} 2610}
2320 2611
2321sub video_shutdown { 2612sub video_shutdown {
2322 DC::OpenGL::shutdown; 2613 DC::OpenGL::shutdown;
2614 DC::SDL_QuitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2323 2615
2324 undef $SDL_ACTIVE; 2616 undef $SDL_ACTIVE;
2325} 2617}
2326 2618
2327my %animate_object; 2619my %animate_object;
2346my $want_refresh = EV::prepare_ns \&force_refresh; 2638my $want_refresh = EV::prepare_ns \&force_refresh;
2347 2639
2348my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2640my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2349 $NOW = EV::now; 2641 $NOW = EV::now;
2350 2642
2351 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2643 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2352 for DC::poll_events; 2644 for DC::poll_events;
2353 2645
2354 if (%animate_object) { 2646 if (%animate_object) {
2355 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2647 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2356 $WANT_REFRESH = 1; 2648 $WANT_REFRESH = 1;
2368sub animation_stop { 2660sub animation_stop {
2369 my ($widget) = @_; 2661 my ($widget) = @_;
2370 delete $animate_object{$widget}; 2662 delete $animate_object{$widget};
2371} 2663}
2372 2664
2373%SDL_CB = (
2374 DC::SDL_QUIT => sub { 2665$SDL_CB[DC::SDL_QUIT] = sub {
2666 crash "SDL_QUIT";
2375 EV::unloop EV::UNLOOP_ALL; 2667 EV::unloop EV::UNLOOP_ALL;
2376 }, 2668};
2377 DC::SDL_VIDEORESIZE => sub { 2669$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2378 },
2379 DC::SDL_VIDEOEXPOSE => sub { 2670$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2380 DC::UI::full_refresh; 2671 DC::UI::full_refresh;
2381 }, 2672};
2382 DC::SDL_ACTIVEEVENT => sub { 2673$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2383# not useful, as APPACTIVE includes only iconified state, not unmapped 2674# not useful, as APPACTIVE includes only iconified state, not unmapped
2384# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2675# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2385# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2676# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2386# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2677# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2387# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2678# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2388# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2679# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2389 }, 2680};
2390 DC::SDL_KEYDOWN => sub { 2681$SDL_CB[DC::SDL_KEYDOWN] = sub {
2391 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2682 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2392 # alt-enter 2683 # alt-enter
2684 video_shutdown;
2393 $FULLSCREEN_ENABLE->toggle; 2685 $FULLSCREEN_ENABLE->toggle;
2394 video_shutdown;
2395 video_init; 2686 video_init;
2396 } else { 2687 } else {
2397 &DC::UI::feed_sdl_key_down_event; 2688 &DC::UI::feed_sdl_key_down_event;
2398 } 2689 }
2399 update_modbox; 2690 update_modbox;
2400 }, 2691};
2401 DC::SDL_KEYUP => sub { 2692$SDL_CB[DC::SDL_KEYUP] = sub {
2402 &DC::UI::feed_sdl_key_up_event; 2693 &DC::UI::feed_sdl_key_up_event;
2403 update_modbox; 2694 update_modbox;
2404 }, 2695};
2405 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2696$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2406 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2697$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2407 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2698$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2408 DC::SDL_USEREVENT => sub { 2699$SDL_CB[DC::SDL_USEREVENT] = sub {
2409 if ($_[0]{code} == 1) { 2700 if ($_[0]{code} == 1) {
2410 audio_channel_finished $_[0]{data1}; 2701 audio_channel_finished $_[0]{data1};
2411 } elsif ($_[0]{code} == 0) { 2702 } elsif ($_[0]{code} == 0) {
2412 audio_music_finished; 2703 audio_music_finished;
2413 }
2414 }, 2704 }
2415); 2705};
2416 2706
2417############################################################################# 2707#############################################################################
2418 2708
2419$SIG{INT} = $SIG{TERM} = sub { 2709$SIG{INT} = $SIG{TERM} = sub {
2420 EV::unloop; 2710 EV::unloop;
2421 #d# TODO calling exit here hangs the process in some futex 2711 #d# TODO calling exit here hangs the process in some futex
2422}; 2712};
2423 2713
2424{ 2714# due to mac os x + sdl combined braindamage, we need this contortion
2715sub main {
2716 {
2425 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2717 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2426 2718
2427 if (-e "$Deliantra::VARDIR/client.cf") { 2719 if (-e "$Deliantra::VARDIR/client.cf") {
2428 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2720 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2429 } else { 2721 } else {
2430 #TODO: compatibility cruft 2722 #TODO: compatibility cruft
2431 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2723 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2432 print STDERR "INFO: used old configuration file\n"; 2724 print STDERR "INFO: used old configuration file\n";
2433 } 2725 }
2434 2726
2435 DC::DB::Server::run; 2727 DC::DB::Server::run;
2436 2728
2437 if ($CFG->{db_schema} < 1) { 2729 if ($CFG->{db_schema} < 1) {
2438 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2730 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2439 DC::DB::nuke_db; 2731 DC::DB::nuke_db;
2440 $CFG->{db_schema} = 1; 2732 $CFG->{db_schema} = 1;
2441 DC::write_cfg; 2733 DC::write_cfg;
2442 } 2734 }
2443 2735
2444 DC::DB::open_db; 2736 DC::DB::open_db;
2445 2737
2446 DC::UI::set_layout ($::CFG->{layout}); 2738 DC::UI::set_layout ($::CFG->{layout});
2447 2739
2448 my %DEF_CFG = ( 2740 my %DEF_CFG = (
2741 config_autosave => 1,
2449 sdl_mode => 0, 2742 sdl_mode => undef,
2450 fullscreen => 1, 2743 fullscreen => 1,
2451 fast => 0, 2744 fast => 0,
2452 force_opengl11 => undef, 2745 force_opengl11 => undef,
2746 disable_alpha => 0,
2747 smooth_movement => 1,
2748 smooth_transitions => 1,
2453 texture_compression => 1, 2749 texture_compression => 1,
2454 map_scale => 1, 2750 map_scale => 1,
2455 fow_enable => 1, 2751 fow_enable => 1,
2456 fow_intensity => 0, 2752 fow_intensity => 0,
2753 fow_texture => 0,
2457 map_smoothing => 1, 2754 map_smoothing => 1,
2458 gui_fontsize => 1, 2755 gui_fontsize => 1,
2459 log_fontsize => 0.7, 2756 log_fontsize => 0.7,
2460 gauge_fontsize => 1, 2757 gauge_fontsize => 1,
2461 gauge_size => 0.35, 2758 gauge_size => 0.35,
2462 stat_fontsize => 0.7, 2759 stat_fontsize => 0.7,
2463 mapsize => 100, 2760 mapsize => 100,
2464 audio_enable => 1, 2761 audio_enable => 1,
2465 audio_hw_channels => 0, 2762 audio_hw_channels => 0,
2466 audio_hw_frequency => 0, 2763 audio_hw_frequency => 0,
2467 audio_hw_chunksize => 0, 2764 audio_hw_chunksize => 0,
2468 audio_mix_channels => 8, 2765 audio_mix_channels => 8,
2469 effects_enable => 1, 2766 effects_enable => 1,
2470 effects_volume => 1, 2767 effects_volume => 1,
2471 bgm_enable => 1, 2768 bgm_enable => 1,
2472 bgm_volume => 0.5, 2769 bgm_volume => 0.5,
2473 output_rate => "", 2770 output_rate => "",
2474 pickup => 0, 2771 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2475 inv_sort => "mtime", 2772 inv_sort => "mtime",
2476 default => "profile", # default profile 2773 default => "profile", # default profile
2477 show_tips => 1, 2774 show_tips => 1,
2478 logview_max_par => 1000, 2775 logview_max_par => 1000,
2776 shift_fire_stop => 0,
2777 uitheme => "wood",
2778 map_shift_x => -24, # arbitrary
2779 map_shift_y => +24, # arbitrary
2479 ); 2780 );
2480 2781
2481 while (my ($k, $v) = each %DEF_CFG) { 2782 while (my ($k, $v) = each %DEF_CFG) {
2482 $CFG->{$k} = $v unless exists $CFG->{$k}; 2783 $CFG->{$k} = $v unless exists $CFG->{$k};
2483 } 2784 }
2484 2785
2485 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2786 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net";
2486 $PROFILE = $CFG->{profile}{default}; 2787 $PROFILE = $CFG->{profile}{default};
2487 2788
2789 $PROFILE->{host} = $ARGV[0] if @ARGV > 0;
2790 $PROFILE->{user} = $ARGV[1] if @ARGV > 1;
2791 $PROFILE->{password} = $ARGV[2] if @ARGV > 2;
2792
2488 # convert old bindings (only default profile matters) 2793 # convert old bindings (only default profile matters)
2489 if (my $bindings = delete $PROFILE->{bindings}) { 2794 if (my $bindings = delete $PROFILE->{bindings}) {
2490 while (my ($mod, $syms) = each %$bindings) { 2795 while (my ($mod, $syms) = each %$bindings) {
2491 while (my ($sym, $cmds) = each %$syms) { 2796 while (my ($sym, $cmds) = each %$syms) {
2492 push @{ $PROFILE->{macro} }, { 2797 push @{ $PROFILE->{macro} }, {
2493 accelkey => [$mod*1, $sym*1], 2798 accelkey => [$mod*1, $sym*1],
2494 action => $cmds, 2799 action => $cmds,
2800 };
2495 }; 2801 }
2496 } 2802 }
2497 } 2803 }
2498 }
2499 2804
2500 sdl_init; 2805 sdl_init;
2501 2806
2502 @SDL_MODES = DC::SDL_ListModes 8, 8; 2807 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2503 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2808 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2504 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2505 2809
2506 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2810 {
2507
2508 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2509
2510 {
2511 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2811 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2512 DejaVuSans.ttf 2812 DejaVuSans.ttf
2513 DejaVuSansMono.ttf 2813 DejaVuSansMono.ttf
2514 DejaVuSans-Bold.ttf 2814 DejaVuSans-Bold.ttf
2515 DejaVuSansMono-Bold.ttf 2815 DejaVuSansMono-Bold.ttf
2516 DejaVuSans-Oblique.ttf 2816 DejaVuSans-Oblique.ttf
2517 DejaVuSansMono-Oblique.ttf 2817 DejaVuSansMono-Oblique.ttf
2518 DejaVuSans-BoldOblique.ttf 2818 DejaVuSans-BoldOblique.ttf
2519 DejaVuSansMono-BoldOblique.ttf 2819 DejaVuSansMono-BoldOblique.ttf
2820 mona.ttf
2520 ); 2821 );
2521 2822
2522 DC::add_font $_ for @fonts; 2823 DC::add_font $_ for @fonts;
2523 2824
2524 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2825 $FONT_PROP = new_from_file DC::Font $fonts[0];
2525 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2826 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2526 2827
2527 $FONT_PROP->make_default; 2828 $FONT_PROP->make_default;
2528 2829
2529 DC::pango_init; 2830 DC::pango_init;
2530 } 2831 }
2531 2832
2532# compare mono (ft) vs. rgba (cairo) 2833# compare mono (ft) vs. rgba (cairo)
2533# ft - 1.8s, cairo 3s, even in alpha-only mode 2834# ft - 1.8s, cairo 3s, even in alpha-only mode
2534# for my $rgba (0..1) { 2835# for my $rgba (0..1) {
2535# my $t1 = Time::HiRes::time; 2836# my $t1 = Time::HiRes::time;
2540# } 2841# }
2541# my $t2 = Time::HiRes::time; 2842# my $t2 = Time::HiRes::time;
2542# warn $t2-$t1; 2843# warn $t2-$t1;
2543# } 2844# }
2544 2845
2545 video_init; 2846 video_init;
2546 audio_init; 2847 audio_init;
2547} 2848 }
2548 2849
2549show_tip_of_the_day if $CFG->{show_tips}; 2850 show_tip_of_the_day if $CFG->{show_tips};
2550 2851
2551our $STARTUP_CANCEL = EV::idle sub { 2852 our $STARTUP_CANCEL = EV::idle sub {
2552 undef $::STARTUP_CANCEL; 2853 undef $::STARTUP_CANCEL;
2553 $startup_done->(); 2854 $startup_done->();
2554}; 2855 };
2555 2856
2556delete $SIG{__DIE__}; 2857 delete $SIG{__DIE__};
2557EV::loop; 2858 EV::loop;
2558 2859
2860 DC::write_cfg if $CFG->{config_autosave};
2861
2559#video_shutdown; 2862 #video_shutdown;
2560#audio_shutdown; 2863 #audio_shutdown;
2864
2561DC::OpenGL::quit; 2865 DC::OpenGL::quit;
2562DC::SDL_Quit; 2866 DC::SDL_Quit;
2563DC::DB::Server::stop; 2867 DC::DB::Server::stop;
2868}
2869
2870DC::SDL_braino; # see sub above
2564 2871
2565=head1 NAME 2872=head1 NAME
2566 2873
2567deliantra - A Deliantra MORPG game client 2874deliantra - A Deliantra MORPG game client
2568 2875
2585 4 show fps 2892 4 show fps
2586 8 suppress tooltips 2893 8 suppress tooltips
2587 2894
2588=head1 AUTHOR 2895=head1 AUTHOR
2589 2896
2590Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2897Marc Lehmann <deliantra@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2591 2898
2592 2899
2593 2900

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines