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.64 by root, Sat Aug 30 04:43:02 2008 UTC vs.
Revision 1.107 by root, Thu Apr 8 03:51:26 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines