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.58 by root, Sun Aug 17 01:27:33 2008 UTC vs.
Revision 1.108 by root, Thu Apr 8 04:49:32 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 {
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 } else { 58 } else {
55 open my $fh, "<:perlio", "$root/pangoversion" 59 # 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"; 60 $ENV{PANGO_RC_FILE} = "$root/pango.rc";
71 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE} 61 $ENV{DYLD_LIBRARY_PATH} = $root;
72 or die "$ENV{PANGO_RC_FILE}: $!"; 62 chdir $root; # for pango modules, maybe other things
73 print $fh "[Pango]\nModuleFiles = $root/pango-modules\n";
74 } 63 }
75 64
76 unshift @INC, $root; 65 unshift @INC, $root;
77 } 66 }
78} 67}
79 68
80# prepend private library directory 69# prepend private library directory and prepare env
81BEGIN { 70BEGIN {
82 for (grep !ref, @INC) { 71 for (grep !ref, @INC) {
83 my $path = "$_/Deliantra/Client/private"; 72 my $path = "$_/Deliantra/Client/private";
84 if (-d $path) { 73 if (-d $path) {
85 unshift @INC, $path; 74 unshift @INC, $path;
90 79
91# 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
92unshift @INC, $ENV{PAR_TEMP} 81unshift @INC, $ENV{PAR_TEMP}
93 if %PAR::LibCache; 82 if %PAR::LibCache;
94 83
95use Time::HiRes 'time';
96use EV; 84use EV;
85BEGIN { *time = \&EV::time }
86
97use List::Util qw(max min); 87use List::Util qw(max min);
98 88
99use Deliantra; 89use Deliantra;
100use Deliantra::Protocol::Constants; 90use Deliantra::Protocol::Constants;
101 91
102use AnyEvent::DNS; 92use AnyEvent::Util ();
103use AnyEvent::Socket (); 93use AnyEvent::Socket ();
94use AnyEvent::DNS ();
104 95
105use Compress::LZF; 96use Compress::LZF;
97use JSON::XS;
106 98
107use DC; 99use DC;
108BEGIN { $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
109use DC::OpenGL (); 113use DC::OpenGL ();
110use DC::Protocol; 114use DC::Protocol;
111use DC::DB; 115use DC::DB;
112use DC::UI; 116use DC::UI;
113use DC::UI::Canvas; 117use DC::UI::Canvas;
114use DC::UI::Inventory; 118use DC::UI::Inventory;
115use DC::UI::SpellList; 119use DC::UI::SpellList;
116use DC::UI::Dockable; 120use DC::UI::Dockable;
117use DC::UI::Dockbar; 121use DC::UI::Dockbar;
118use DC::UI::MessageWindow;
119use DC::UI::ChatView; 122use DC::UI::ChatView;
120use DC::MessageDistributor; 123use DC::MessageDistributor;
121use DC::Pod; 124use DC::Pod;
122use DC::MapWidget; 125use DC::MapWidget;
123use DC::Macro; 126use DC::Macro;
124 127
125$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 128$SIG{QUIT} = sub { Carp::cluck "QUIT" };
126$SIG{PIPE} = 'IGNORE'; 129$SIG{PIPE} = 'IGNORE';
127 130
128$EV::DIED = sub { 131$EV::DIED = sub {
132 crash "CRASH/EV::DIED: $@" => 0;
129 DC::fatal Carp::longmess $@; 133 DC::fatal Carp::longmess $@;
130}; 134};
131 135
132my $MAX_FPS = 60; 136my $MAX_FPS = 60;
133 137
138our $DEFAULT_SERVER = "gameserver.deliantra.net";
139
134our $META_SERVER = "http://metaserver.schmorp.de/current.json"; 140our $META_SERVER = "http://metaserver.schmorp.de/current.json";
135 141
136our $LAST_REFRESH; 142our $LAST_REFRESH;
137our $NOW; 143our $NOW;
138 144
139our $CFG; 145our $CFG;
140our $CONN;
141our $PROFILE; # current profile 146our $PROFILE; # current profile
142our $FAST; # fast, low-quality mode, possibly useful for software-rendering 147our $FAST; # fast, low-quality mode, possibly useful for software-rendering
143 148
144our $WANT_REFRESH; 149our $WANT_REFRESH;
145 150
154our $FONTSIZE; 159our $FONTSIZE;
155 160
156our $FONT_PROP; 161our $FONT_PROP;
157our $FONT_FIXED; 162our $FONT_FIXED;
158 163
164our $CONN;
165
159our $MAP; 166our $MAP;
160our $MAPMAP; 167our $MAPMAP;
161our $MAPWIDGET; 168our $MAPWIDGET;
162our $COMPLETER; 169our $COMPLETER;
163our $BUTTONBAR; 170our $MENUFRAME; # the rectangle at the top
171our $MENUBAR; # the hbox at the top
172our $MENUPOPUP;
173our $BUTTONBAR; # the menu buttons
164our $METASERVER; 174our $METASERVER;
165our $LOGIN_BUTTON; 175our $LOGIN_BUTTON;
166our $QUIT_DIALOG; 176our $QUIT_DIALOG;
167our $HOST_ENTRY; 177our $HOST_ENTRY;
168our $FULLSCREEN_ENABLE; 178our $FULLSCREEN_ENABLE;
194our $FLOORBOX; 204our $FLOORBOX;
195our $GAUGES; 205our $GAUGES;
196our $STATWIDS; 206our $STATWIDS;
197 207
198our $SDL_ACTIVE; 208our $SDL_ACTIVE;
199our %SDL_CB; 209our @SDL_CB;
200 210
201our $ALT_ENTER_MESSAGE; 211our $ALT_ENTER_MESSAGE;
202our $STATUSBOX; 212our $STATUSBOX;
203our $MODBOX; 213our $MODBOX;
204our $DEBUG_STATUS; 214our $DEBUG_STATUS;
205 215
206our $INV; 216our $INV;
207our $INVR; 217our $INVR;
208our $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}
209 259
210############################################################################# 260#############################################################################
211 261
212sub status { 262sub status {
213 $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]);
295 or return; 345 or return;
296 346
297 $meta->{data} 347 $meta->{data}
298 or return; 348 or return;
299 349
300 # if its a jingle, play it as ambient music 350 # if it's a jingle, play it as ambient music
301 if ($meta->{data}{jingle}) { 351 if ($meta->{data}{jingle}) {
302 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
303 push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue 353 push @MUSIC_JINGLE, $meta; # push it unto the music/jingle queue
304 &audio_music_push ($face); 354 &audio_music_push ($face);
305 } 355 }
306 } else { 356 } else {
307 # fetch from database 357 # fetch from database
308 DC::DB::get res_data => $meta->{name}, sub { 358 DC::DB::get res_data => $meta->{name}, sub {
309 my $rwops = new DC::RW $_[0]; 359 my $rwops = new DC::RW $_[0];
310 my $chunk = new DC::MixChunk $rwops 360 my $chunk = new DC::MixChunk $rwops
311 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;
312 $chunk->volume (($meta->{data}{volume} || 1) * 128); 362 $chunk->volume (($meta->{data}{volume} || 1) * 128);
313 $AUDIO_CHUNK{$face} = $chunk; 363 $AUDIO_CHUNK{$face} = $chunk;
314 364
315 audio_sound_push ($face); 365 audio_sound_push ($face);
316 }; 366 };
363 413
364 audio_music_update_volume; 414 audio_music_update_volume;
365 415
366 $MUSIC_PLAYING_DATA = \$_[0]; 416 $MUSIC_PLAYING_DATA = \$_[0];
367 417
418 $meta->{path} or length $_[0]
419 or return clienterror "empty music face from res_data ($meta->{face})";#d#
420
368 my $rwops = $meta->{path} 421 my $rwops = $meta->{path}
369 ? 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
370 : new DC::RW $$MUSIC_PLAYING_DATA; 423 : new DC::RW $$MUSIC_PLAYING_DATA;
371 424
372 $MUSIC_PLAYER = new DC::MixMusic $rwops 425 $MUSIC_PLAYER = new DC::MixMusic $rwops
373 or Carp::confess "music face $meta->{face} unloadable: " . DC::Mix_GetError; 426 or return clienterror "music face $meta->{face} unloadable: " . DC::Mix_GetError => 1;
374 427
375 my $NOW = time; 428 my $NOW = time;
376 429
377 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) { 430 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
378 my $pos = $MUSIC_PLAYING_META->{stop_pos}; 431 my $pos = $MUSIC_PLAYING_META->{stop_pos};
487 sub audio_tab_update; 540 sub audio_tab_update;
488 audio_tab_update; 541 audio_tab_update;
489} 542}
490 543
491sub audio_shutdown { 544sub audio_shutdown {
545 if ($SDL_MIXER) {
546 DC::MixMusic::halt;
547 DC::Mix_AllocateChannels 0;
548 }
549
492 undef $MUSIC_PLAYER; 550 undef $MUSIC_PLAYER;
493 undef $MUSIC_PLAYING_META; 551 undef $MUSIC_PLAYING_META;
494 undef $MUSIC_PLAYING_DATA; 552 undef $MUSIC_PLAYING_DATA;
495 553
496 $MUSIC_WANT = []; 554 $MUSIC_WANT = [];
736} 794}
737 795
738sub dc_connect { 796sub dc_connect {
739 my ($host, $port) = @_; 797 my ($host, $port) = @_;
740 798
741 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;
742 801
743 $CONN = 802 $CONN =
744 new DC::Protocol 803 new DC::Protocol
745 host => $host, 804 host => $host,
746 port => $port, 805 port => $port,
747 user => $PROFILE->{user}, 806 user => $PROFILE->{user},
748 pass => $PROFILE->{password}, 807 pass => $PROFILE->{password},
749 mapw => $mapsize, 808 mapw => $mapw,
750 maph => $mapsize, 809 maph => $maph,
751 810
811 version => {
812 client => "deliantra",
752 client => "$DC::VERSION $] $^O", 813 clientver => $DC::VERSION,
814 gl_vendor => DC::OpenGL::gl_vendor,
815 gl_version => DC::OpenGL::gl_version,
816 },
753 817
754 map_widget => $MAPWIDGET, 818 map_widget => $MAPWIDGET,
755 statusbox => $STATUSBOX, 819 statusbox => $STATUSBOX,
756 map => $MAP, 820 map => $MAP,
757 mapmap => $MAPMAP, 821 mapmap => $MAPMAP,
763 827
764 on_connect => sub { 828 on_connect => sub {
765 if ($_[0]) { 829 if ($_[0]) {
766 DC::lowdelay fileno $CONN->{fh}; 830 DC::lowdelay fileno $CONN->{fh};
767 831
768 status "login successful"; 832 status "successfully connected to the server";
769 } else { 833 } else {
770 undef $CONN; 834 undef $CONN;
771 status "unable to connect: $!"; 835 status "unable to connect: $!";
772 stop_game(); 836 stop_game();
773 } 837 }
775 ; 839 ;
776} 840}
777 841
778sub start_game { 842sub start_game {
779 status "logging in..."; 843 status "logging in...";
844
845 my $server = $PROFILE->{host} || $DEFAULT_SERVER;
846 my ($host, $port) = AnyEvent::Socket::parse_hostport $server, "deliantra=13327"
847 or return status "$server: unable to parse server address, try an empty field.";
780 848
781 $LOGIN_BUTTON->set_text ("Logout"); 849 $LOGIN_BUTTON->set_text ("Logout");
782 $SETUP_DIALOG->hide; 850 $SETUP_DIALOG->hide;
783
784 my ($host, $port) = AnyEvent::Socket::parse_hostport $PROFILE->{host}, "deliantra=13327";
785 851
786 $MAP = new DC::Map; 852 $MAP = new DC::Map;
787 853
788 # hack to make SURE we find the IP address all right 854 # hack to make SURE we find the IP address all right
789 # can be removed once AnyEvent::DNS is proven stable. 855 # can be removed once AnyEvent::DNS is proven stable.
790 if ($host eq "gameserver.deliantra.net") { 856 if ($host eq "gameserver.deliantra.net") {
791 AnyEvent::DNS::a "dnstest.deliantra.net", sub { 857 AnyEvent::DNS::a "dnstest.deliantra.net", sub {
792 if ($_[0] ne "80.101.114.108") { # Perl 858 if ($_[0] ne "80.101.114.108") { # Perl
859 status "dns failure, trying differently";
860 $host = eval { Socket::inet_ntoa Socket::inet_aton "gameserver.deliantra.net" };
861 unless (defined $host) {
793 status "dns failure, using hardcoded address"; 862 status "dns failure, using hardcoded address";
794 $host = "129.13.162.95"; 863 $host = "129.13.162.95";
864 }
795 } 865 }
796 866
797 dc_connect $host, $port; 867 dc_connect $host, $port;
798 }; 868 };
799 } else { 869 } else {
800 dc_connect $host, $port; 870 dc_connect $host, $port;
801 } 871 }
802} 872}
803 873
804sub stop_game { 874sub stop_game {
875 crash "stop_game";
876
805 $LOGIN_BUTTON->set_text ("Login / Register"); 877 $LOGIN_BUTTON->set_text ("Login / Register");
806 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN); 878 $SETUP_NOTEBOOK->set_current_page ($SETUP_LOGIN);
807 $SETUP_DIALOG->show; 879 $SETUP_DIALOG->show;
808 $PL_WINDOW->hide; 880 $PL_WINDOW->hide;
809 $SPELL_LIST->clear_spells; 881 $SPELL_LIST->clear_spells;
823} 895}
824 896
825sub graphics_setup { 897sub graphics_setup {
826 my $vbox = new DC::UI::VBox; 898 my $vbox = new DC::UI::VBox;
827 899
900 {
901 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Video Mode");
902
828 $vbox->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]); 903 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
829 904
830 my $row = 0; 905 my $row = 0;
831 906
832 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info"); 907 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "OpenGL Info");
833 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version, 908 $table->add_at (1, $row++, new DC::UI::Label fontsize => 0.8, text => DC::OpenGL::gl_vendor . ", " . DC::OpenGL::gl_version,
834 can_events => 1, 909 can_events => 1,
835 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>"); 910 tooltip => "<tt><span size='8192'>" . (DC::OpenGL::gl_extensions) . "</span></tt>");
836 911
837 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats"); 912 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Caveats");
838 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8, 913 $table->add_at (1, $row++, $CAVEAT_LABEL = new DC::UI::Label fontsize => 0.8,
839 can_events => 1, 914 can_events => 1,
840 tooltip => "This field shows any known issues with your config or driver, such as " 915 tooltip => "This field shows any known issues with your config or driver, such as "
841 . "a non-accelerated display format. You can try to work around these issues " 916 . "a non-accelerated display format. You can try to work around these issues "
842 . "by selecting a different video mode, changing the settings below or " 917 . "by selecting a different video mode, changing the settings below or "
843 . "by installing the right driver for your graphics card."); 918 . "by installing the right driver for your graphics card.");
844 919
920 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "UI Theme");
921 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::Selector
922 value => $CFG->{uitheme},
923 options => [
924 [wood => "Wood (the default)"],
925 [plain => "Plain (very)"],
926 [blue => "Blue (dark)"],
927 [metal => "Metal (light)"],
928 ],
929 tooltip => "Choose the User Interface theme that you like most :)",
930 on_changed => sub { my ($self, $value) = @_; $CFG->{uitheme} = $value; 0 }
931 );
932
845 my $vidmode_tooltip = 933 my $vidmode_tooltip =
846 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). " 934 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
847 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>."; 935 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
848 936
849 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode"); 937 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Video Mode");
850 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox); 938 $table->add_at (1, $row++, my $hbox = new DC::UI::HBox);
851 939
852 $hbox->add ($MODE_SLIDER = new DC::UI::Slider 940 $hbox->add ($MODE_SLIDER = new DC::UI::Slider
941 c_rescale => 1,
853 force_w => $WIDTH * 0.1, expand => 1, 942 force_w => $WIDTH * 0.1, expand => 1,
854 range => [ ($CFG->{sdl_mode}) x 3 ], 943 range => [ ($CFG->{sdl_mode}) x 3 ],
855 tooltip => $vidmode_tooltip); 944 tooltip => $vidmode_tooltip);
856 $hbox->add (my $mode_label = new DC::UI::Label 945 $hbox->add (my $mode_label = new DC::UI::Label
857 height => 0.8, template => "9999x9999@9+9", 946 height => 0.8, template => "9999x9999@9+9",
858 can_events => 1, tooltip => $vidmode_tooltip); 947 can_events => 1, tooltip => $vidmode_tooltip);
859 948
860 $MODE_SLIDER->connect (changed => sub { 949 $MODE_SLIDER->connect (changed => sub {
861 my ($self, $value) = @_;
862
863 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
864 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
865 });
866 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
867
868 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
869 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
870 state => $CFG->{fullscreen},
871 tooltip => "Bring the client into fullscreen mode.",
872 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
873 );
874
875 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
876 $table->add_at (1, $row++, new DC::UI::CheckBox
877 state => $CFG->{force_opengl11},
878 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
879 . "higher memory usage and slower performance. It will, however, help tremendously on "
880 . "cards that claim to support a feature but fall back to software rendering. "
881 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
882 . "but cards and drivers from other vendors (ATI) are often just as bad. "
883 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
884 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
885 );
886
887 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
888 $table->add_at (1, $row++, new DC::UI::CheckBox
889 state => $CFG->{disable_alpha},
890 tooltip => "Forbid off the use of the alpha channel. This makes Deliantra look a lot worse "
891 . "by disabling a number of textures and transparency effects. Normally, these "
892 . "effects do not cost a lot of resources, but some graphics cards might fall "
893 . "back to etxremely slow rendering if this is enabled. If disabling this option "
894 . "noticably improves the framerate of the client please report this! "
895 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
896 on_changed => sub {
897 my ($self, $value) = @_; 950 my ($self, $value) = @_;
951
952 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
953 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
954 });
955 $MODE_SLIDER->emit (changed => $MODE_SLIDER->{range}[0]);
956
957 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fullscreen");
958 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new DC::UI::CheckBox
959 state => $CFG->{fullscreen},
960 tooltip => "Bring the client into fullscreen mode.",
961 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
962 );
963
964 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Force OpenGL 1.1");
965 $table->add_at (1, $row++, new DC::UI::CheckBox
966 state => $CFG->{force_opengl11},
967 tooltip => "Limit Deliantra to use OpenGL 1.1 features only. This will normally result in "
968 . "higher memory usage and slower performance. It will, however, help tremendously on "
969 . "cards that claim to support a feature but fall back to software rendering. "
970 . "Nvidia Geforce FX cards are known to claim features the hardware doesn't support, "
971 . "but cards and drivers from other vendors (ATI) are often just as bad. "
972 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
973 on_changed => sub { my ($self, $value) = @_; $CFG->{force_opengl11} = $value; 0 }
974 );
975
976 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Forbid Alpha");
977 $table->add_at (1, $row++, new DC::UI::CheckBox
978 state => $CFG->{disable_alpha},
979 tooltip => "Forbid the use of the alpha channel. This makes Deliantra look a lot worse "
980 . "by disabling a number of textures and transparency effects. Normally, these "
981 . "effects do not cost a lot of resources, but some graphics cards might fall "
982 . "back to extremely slow rendering if this is enabled. If disabling this option "
983 . "noticably improves the framerate of the client please report this! "
984 . "<b>If you experience extremely low framerates and your card should do better, try this option.</b>",
985 on_changed => sub {
986 my ($self, $value) = @_;
898 $CFG->{disable_alpha} = $value; 987 $CFG->{disable_alpha} = $value;
899 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes 988 $SDL_REINIT = 1; # SDL_SetVideoMode ignores GL attr changes
989 0
900 0 990 }
901 } 991 );
902 );
903 992
904 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures"); 993 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Compress Textures");
905 $table->add_at (1, $row++, new DC::UI::CheckBox 994 $table->add_at (1, $row++, new DC::UI::CheckBox
906 state => $CFG->{texture_compression}, 995 state => $CFG->{texture_compression},
907 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but " 996 tooltip => "Use texture compression. Normally this will not reduce visual quality noticable but "
908 . "will save a lot of memory and increase performance. The compression algorithm " 997 . "will save a lot of memory and increase performance (and also fall prey to the ever-buggy Mac OS X software renderer). "
909 . "can differ form card to card, so your mileage may vary. This setting is ignored in " 998 . "The compression algorithm can differ form card to card, so your mileage may vary. This setting is ignored in "
910 . "forced OpenGL 1.1 mode.", 999 . "forced OpenGL 1.1 mode and when using the Apple renderer.",
911 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 } 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{texture_compression} = $value; 0 }
912 ); 1001 );
913 1002
914 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly"); 1003 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fast & Ugly");
915 $table->add_at (1, $row++, new DC::UI::CheckBox 1004 $table->add_at (1, $row++, new DC::UI::CheckBox
916 state => $CFG->{fast}, 1005 state => $CFG->{fast},
917 tooltip => "Lower the visual quality considerably to speed up rendering.", 1006 tooltip => "Lower the visual quality considerably to speed up rendering.",
918 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 1007 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
919 ); 1008 );
920 1009
921 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize"); 1010 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "GUI Fontsize");
922 $table->add_at (1, $row++, new DC::UI::Slider 1011 $table->add_at (1, $row++, new DC::UI::Slider
923 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 1012 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
924 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 1013 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
925 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 1014 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
926 ); 1015 );
927 1016
928 $table->add_at (1, $row++, new DC::UI::Button 1017 $table->add_at (1, $row++, new DC::UI::Button
929 expand => 1, text => "Apply", 1018 expand => 1, text => "Apply",
930 tooltip => "Apply the video settings above.", 1019 tooltip => "Apply the video settings above.",
931 on_activate => sub { 1020 on_activate => sub {
932 video_shutdown (); 1021 video_shutdown ();
933 video_init (); 1022 video_init ();
1023 0
934 0 1024 }
935 } 1025 );
936 ); 1026 }
937 1027
1028 {
1029 $vbox->add (my $frame = new DC::UI::FancyFrame expand => 1, label => "Other Settings");
1030
1031 $frame->add (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]);
1032
1033 my $row = 0;
938 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement"); 1034 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Movement");
939 $table->add_at (1, $row++, new DC::UI::CheckBox 1035 $table->add_at (1, $row++, new DC::UI::CheckBox
940 state => $CFG->{smooth_movement}, 1036 state => $CFG->{smooth_movement},
941 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. " 1037 tooltip => "<b>Smooth Movement</b> tries to make movement, well, smoother, but also increases the framerate. "
942 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, " 1038 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
943 . "then disable this option. Changes take effect immdiately.", 1039 . "then disable this option. Changes take effect immdiately.",
944 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 } 1040 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_movement} = $value; 0 }
945 ); 1041 );
946 1042
1043 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Smooth Transitions");
1044 $table->add_at (1, $row++, new DC::UI::CheckBox
1045 state => $CFG->{smooth_transitions},
1046 tooltip => "<b>Smooth Transitions</b> tries to blend the fog of war and lighting smoothly between updates. "
1047 . "If you have a very slow system, non-accelerated drivers or plain dislike smooth scrolling, "
1048 . "then disable this option. Requires Smooth Movement and OpenGL Multitexturing. Changes take effect immdiately.",
1049 on_changed => sub { my ($self, $value) = @_; $CFG->{smooth_transitions} = $value; 0 }
1050 );
1051
1052
947 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale"); 1053 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Scale");
948 $table->add_at (1, $row++, new DC::UI::Slider 1054 $table->add_at (1, $row++, new DC::UI::Slider
949 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 1055 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
950 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 1056 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
951 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 1057 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
952 ); 1058 );
953 1059
954 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing"); 1060 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Map Smoothing");
955 $table->add_at (1, $row++, new DC::UI::CheckBox 1061 $table->add_at (1, $row++, new DC::UI::CheckBox
956 state => $CFG->{map_smoothing}, 1062 state => $CFG->{map_smoothing},
957 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 1063 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
958 . "This increases load on the graphics subsystem and works only with TRT servers. " 1064 . "This increases load on the graphics subsystem and works only with TRT servers. "
959 . "Changes take effect at next login only.", 1065 . "Changes take effect at next login only.",
960 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 1066 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
961 ); 1067 );
962 1068
963 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War"); 1069 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Fog of War");
964 $table->add_at (1, $row++, new DC::UI::CheckBox 1070 $table->add_at (1, $row++, new DC::UI::CheckBox
965 state => $CFG->{fow_enable}, 1071 state => $CFG->{fow_enable},
966 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 1072 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
967 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 1073 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
968 ); 1074 );
969 1075
1076 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Pattern");
1077 $table->add_at (1, $row++, new DC::UI::ImageButton
1078 tex => $DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}],
1079 bg => [0.3, 0.3, 0.2],
1080 force_w => 64,
1081 force_h => 64,
1082 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.",
1083 on_activate => sub {
1084 my ($self) = @_;
1085 $CFG->{fow_texture} = ($CFG->{fow_texture} + 1) % @DC::MapWidget::TEX_HIDDEN;
1086 $self->set_texture ($DC::MapWidget::TEX_HIDDEN[$CFG->{fow_texture}]);
1087 $MAPWIDGET->update;
1088 }
1089 );
1090
970 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity"); 1091 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "FoW Intensity");
971 $table->add_at (1, $row++, new DC::UI::Slider 1092 $table->add_at (1, $row++, new DC::UI::Slider
972 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 1093 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
973 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 1094 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
974 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 1095 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
975 ); 1096 );
976 1097
977 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize"); 1098 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Fontsize");
978 $table->add_at (1, $row++, new DC::UI::Slider 1099 $table->add_at (1, $row++, new DC::UI::Slider
979 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 1100 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
980 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, " 1101 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant, "
981 . "but you still need to press apply to correctly re-layout the widget.", 1102 . "but you still need to press apply to correctly re-layout the widget.",
982 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 1103 on_changed => sub { $MESSAGE_DIST->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
983 ); 1104 );
984 1105
985 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize"); 1106 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge fontsize");
986 $table->add_at (1, $row++, new DC::UI::Slider 1107 $table->add_at (1, $row++, new DC::UI::Slider
987 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 1108 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
988 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 1109 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
989 on_changed => sub { 1110 on_changed => sub {
990 $CFG->{gauge_fontsize} = $_[1]; 1111 $CFG->{gauge_fontsize} = $_[1];
991 &set_gauge_window_fontsize; 1112 &set_gauge_window_fontsize;
1113 0
992 0 1114 }
993 } 1115 );
994 );
995 1116
996 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size"); 1117 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Gauge size");
997 $table->add_at (1, $row++, new DC::UI::Slider 1118 $table->add_at (1, $row++, new DC::UI::Slider
998 range => [$CFG->{gauge_size}, 0.2, 0.8], 1119 range => [$CFG->{gauge_size}, 0.2, 0.8],
999 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 1120 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
1000 on_changed => sub { 1121 on_changed => sub {
1001 $CFG->{gauge_size} = $_[1]; 1122 $CFG->{gauge_size} = $_[1];
1002 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 1123 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
1124 0
1003 0 1125 }
1004 } 1126 );
1005 ); 1127 }
1006 1128
1007 $vbox 1129 $vbox
1008} 1130}
1009 1131
1010our $AUDIO_HW_CHUNKSIZE; 1132our $AUDIO_HW_CHUNKSIZE;
1023 1145
1024 my $text = !$freq 1146 my $text = !$freq
1025 ? "audio is off" 1147 ? "audio is off"
1026 : "audio is enabled\n" 1148 : "audio is enabled\n"
1027 . "frequency (Hz): $freq\n" 1149 . "frequency (Hz): $freq\n"
1028 . "channels: $chans"; 1150 . "channels: $chans\n"
1151 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1152 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1029 1153
1030 $AUDIO_INFO->set_text ($text); 1154 $AUDIO_INFO->set_text ($text);
1031} 1155}
1032 1156
1033sub audio_setup { 1157sub audio_setup {
1173} 1297}
1174 1298
1175sub make_gauge_window { 1299sub make_gauge_window {
1176 my $gh = int $HEIGHT * $CFG->{gauge_size}; 1300 my $gh = int $HEIGHT * $CFG->{gauge_size};
1177 1301
1178 my $win = new DC::UI::Frame ( 1302 $GAUGES->{win} = my $win = new DC::UI::Frame (
1179 force_x => 0, 1303 force_x => 0,
1180 force_y => "max", 1304 force_y => "max",
1181 force_w => $WIDTH, 1305 force_w => $WIDTH,
1182 force_h => $gh, 1306 force_h => $gh,
1183 ); 1307 );
1199 (new DC::UI::Empty expand => 1), 1323 (new DC::UI::Empty expand => 1),
1200 (my $hb = new DC::UI::HBox), 1324 (my $hb = new DC::UI::HBox),
1201 ], 1325 ],
1202 ); 1326 );
1203 1327
1204 $hb->add (my $hg = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health"); 1328 $hb->add ($GAUGES->{hp} = new DC::UI::Gauge type => 'hp', tooltip => "#stat_health");
1205 $hb->add (my $mg = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana"); 1329 $hb->add ($GAUGES->{mana} = new DC::UI::Gauge type => 'mana', tooltip => "#stat_mana");
1206 $hb->add (my $gg = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace"); 1330 $hb->add ($GAUGES->{grace} = new DC::UI::Gauge type => 'grace', tooltip => "#stat_grace");
1207 $hb->add (my $fg = new DC::UI::Gauge type => 'food', tooltip => "#stat_food"); 1331 $hb->add ($GAUGES->{food} = new DC::UI::Gauge type => 'food', tooltip => "#stat_food");
1208
1209 $vbox->add (my $exp = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
1210 $vbox->add (my $prg = new DC::UI::ExperienceProgress);
1211 $vbox->add (my $sklprg = new DC::UI::ExperienceProgress);
1212 $vbox->add (my $rng = new DC::UI::Label align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
1213
1214 $GAUGES = {
1215 exp => $exp, prg => $prg, sklprg => $sklprg,
1216 win => $win, range => $rng,
1217 hp => $hg, mana => $mg, grace => $gg, food => $fg,
1218 };
1219 1332
1220 &set_gauge_window_fontsize; 1333 &set_gauge_window_fontsize;
1221 1334
1222 $win 1335 $win
1223} 1336}
1564 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]), 1677 child => (my $table = new DC::UI::Table expand => 1, col_expand => [0, 1]),
1565 ); 1678 );
1566 1679
1567 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username"); 1680 $table->add_at (0, 4, new DC::UI::Label align => 1, text => "Username");
1568 $table->add_at (1, 4, new DC::UI::Entry 1681 $table->add_at (1, 4, new DC::UI::Entry
1569 text => $CFG->{profile}{default}{user}, 1682 text => $PROFILE->{user},
1570 tooltip => "The name of your character on the server.", 1683 tooltip => "The name of your character on the server. The name is case-sensitive!",
1571 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 } 1684 on_changed => sub { my ($self, $value) = @_; $PROFILE->{user} = $value; 1 }
1572 ); 1685 );
1573 1686
1574 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password"); 1687 $table->add_at (0, 5, new DC::UI::Label align => 1, text => "Password");
1575 $table->add_at (1, 5, new DC::UI::Entry 1688 $table->add_at (1, 5, new DC::UI::Entry
1576 text => $CFG->{profile}{default}{password}, 1689 text => $PROFILE->{password},
1577 hidden => 1, 1690 hidden => 1,
1578 tooltip => "The password for your character.", 1691 tooltip => "The password for your character.",
1579 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 } 1692 on_changed => sub { my ($self, $value) = @_; $PROFILE->{password} = $value; 1 }
1580 ); 1693 );
1581 1694
1582 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button 1695 $table->add_at (1, 11, $LOGIN_BUTTON = new DC::UI::Button
1583 expand => 1, 1696 expand => 1,
1584 text => "Login / Register", 1697 text => "Login / Register",
1589 1 1702 1
1590 }, 1703 },
1591 ); 1704 );
1592 1705
1593 $vbox->add (new DC::UI::FancyFrame 1706 $vbox->add (new DC::UI::FancyFrame
1594 label => "Registering", 1707 label => "How to Play",
1595 min_h => 200, 1708 min_h => 240,
1596 child => (new DC::UI::Label valign => 0, ellipsise => 0, 1709 child => (new DC::UI::Label valign => 0, ellipsise => 0,
1597 markup => 1710 markup =>
1711 "First select a suitable video resolution in the <b>Graphics</b> tab, above.\n\n"
1712 . "Then register a new account (or use an existing one if you have one). "
1598 "To register a new account, choose a username that hasn't been taken yet and " 1713 . "To register an account, choose a username that hasn't been taken yet (just guess) and "
1599 . "try to log-in. Follow the instructions in the Log tab in the message window.", 1714 . "try to log-in. Follow the instructions in the Log tab in the message window.",
1600 ), 1715 ),
1601 ); 1716 );
1602 1717
1603 $vbox 1718 $vbox
1618 $table->add_at (1, $row, my $vbox = new DC::UI::VBox); 1733 $table->add_at (1, $row, my $vbox = new DC::UI::VBox);
1619 1734
1620 $vbox->add ( 1735 $vbox->add (
1621 $HOST_ENTRY = new DC::UI::Entry 1736 $HOST_ENTRY = new DC::UI::Entry
1622 expand => 1, 1737 expand => 1,
1623 text => $CFG->{profile}{default}{host}, 1738 text => $PROFILE->{host},
1624 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)", 1739 tooltip => "The hostname or ip address of the Deliantra server to connect to (e.g. <b>gameserver.deliantra.net</b>)",
1625 on_changed => sub { 1740 on_changed => sub {
1626 my ($self, $value) = @_; 1741 my ($self, $value) = @_;
1627 $CFG->{profile}{default}{host} = $value; 1742 $PROFILE->{host} = $value;
1628 1 1743 1
1629 } 1744 }
1630 ); 1745 );
1631 1746
1632 if (0) { #d# disabled 1747 if (0) { #d# disabled
1675 1790
1676 my $row = 0; 1791 my $row = 0;
1677 1792
1678 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day"); 1793 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Tip of the day");
1679 $table->add_at (1, $row++, new DC::UI::CheckBox 1794 $table->add_at (1, $row++, new DC::UI::CheckBox
1795 c_colspan => 2,
1680 state => $CFG->{show_tips}, 1796 state => $CFG->{show_tips},
1681 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1797 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1682 on_changed => sub { 1798 on_changed => sub {
1683 my ($self, $value) = @_; 1799 my ($self, $value) = @_;
1684 $CFG->{show_tips} = $value; 1800 $CFG->{show_tips} = $value;
1686 } 1802 }
1687 ); 1803 );
1688 1804
1689 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size"); 1805 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Message Window Size");
1690 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry 1806 $table->add_at (1, $row++, my $saycmd = new DC::UI::Entry
1807 c_colspan => 2,
1691 text => $CFG->{logview_max_par}, 1808 text => $CFG->{logview_max_par},
1692 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server " 1809 tooltip => "This is maximum number of messages remembered in the <b>Message</b> window. If the server "
1693 . "sends more messages than this number, older messages get removed to save memory and " 1810 . "sends more messages than this number, older messages get removed to save memory and "
1694 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1811 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1695 on_changed => sub { 1812 on_changed => sub {
1697 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1); 1814 $MESSAGE_DIST->set_max_par ($CFG->{logview_max_par} = $value*1);
1698 0 1815 0
1699 }, 1816 },
1700 ); 1817 );
1701 1818
1819 $table->add_at (0, $row, new DC::UI::Label align => 1, text => "Config Autosave");
1820 $table->add_at (1, $row, new DC::UI::CheckBox
1821 state => $CFG->{config_autosave},
1822 tooltip => "Normally, configuration settings and the user interface layout "
1823 . "are saved on client exit. You can disable this behaviour by "
1824 . "unchecking this checkbox.",
1825 on_changed => sub {
1826 my ($self, $value) = @_;
1827 $CFG->{config_autosave} = $value;
1828 0
1829 }
1830 );
1831 $table->add_at (2, $row++, new DC::UI::Button
1832 text => "Save Now",
1833 tooltip => "Use this to manually save configuration and UI layout when "
1834 . "autosave is disabled.",
1835 on_activate => sub {
1836 DC::write_cfg;
1837 0
1838 }
1839 );
1840
1702 $table 1841 $table
1703} 1842}
1704 1843
1705sub autopickup_setup { 1844sub autopickup_setup {
1706 my $r = new DC::UI::ScrolledWindow ( 1845 my $r = new DC::UI::ScrolledWindow (
1712 col_expand => [0, 1, 0, 1], 1851 col_expand => [0, 1, 0, 1],
1713 ); 1852 );
1714 1853
1715 for ( 1854 for (
1716 ["General", 0, 0, 1855 ["General", 0, 0,
1717 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1718 ["Inhibit autopickup" => PICKUP_INHIBIT], 1856# ["Inhibit autopickup" => PICKUP_INHIBIT],
1719 ["Stop before pickup" => PICKUP_STOP], 1857 ["Stop before pickup" => PICKUP_STOP],
1720 ["Debug autopickup" => PICKUP_DEBUG], 1858 ["Debug autopickup" => PICKUP_DEBUG],
1721 ], 1859 ],
1722 ["Weapons", 0, 6, 1860 ["Weapons", 0, 6,
1723 ["All weapons" => PICKUP_ALLWEAPON], 1861 ["All weapons" => PICKUP_ALLWEAPON],
1771 $::CFG->{pickup} |= $mask; 1909 $::CFG->{pickup} |= $mask;
1772 } else { 1910 } else {
1773 $::CFG->{pickup} &= ~$mask; 1911 $::CFG->{pickup} &= ~$mask;
1774 } 1912 }
1775 1913
1776 $::CONN->send_command ("pickup $::CFG->{pickup}") 1914 $::CONN->send_pickup ($::CFG->{pickup})
1777 if defined $::CONN; 1915 if defined $::CONN;
1778 1916
1779 0 1917 0
1780 }); 1918 });
1781 1919
1798 }); 1936 });
1799 1937
1800 $table->add_at (3, 18, new DC::UI::Button 1938 $table->add_at (3, 18, new DC::UI::Button
1801 text => "set", 1939 text => "set",
1802 on_activate => sub { 1940 on_activate => sub {
1803 $::CONN->send_command ("pickup $::CFG->{pickup}") 1941 $::CONN->send_pickup ($::CFG->{pickup})
1804 if defined $::CONN; 1942 if defined $::CONN;
1805 0 1943 0
1806 }); 1944 });
1807 1945
1808 $r 1946 $r
1809} 1947}
1810 1948
1811my %SORT_ORDER = ( 1949my %SORT_ORDER = (
1812 type => sub { 1950 type => sub {
1951 use sort 'stable';
1813 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_ 1952 sort { $a->{type} <=> $b->{type} or $a->{name} cmp $b->{name} } @_
1814 }, 1953 },
1815 mtime => sub { 1954 mtime => sub {
1955 use sort 'stable';
1816 my $NOW = time; 1956 my $NOW = time;
1817 sort { 1957 sort {
1818 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6; 1958 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1819 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6; 1959 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1820 1960
1821 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1961 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1822 or $btime <=> $atime 1962 or $btime <=> $atime
1823 or $a->{type} <=> $b->{type} 1963 or $a->{type} <=> $b->{type}
1824 } @_ 1964 } @_
1825 }, 1965 },
1826 weight => sub { sort { 1966 weight => sub {
1967 use sort 'stable';
1968 sort {
1827 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1969 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1828 or $a->{type} <=> $b->{type} 1970 or $a->{type} <=> $b->{type}
1829 } @_ }, 1971 } @_
1972 },
1830); 1973);
1831 1974
1832sub inventory_widget { 1975sub inventory_widget {
1833 my $hb = new DC::UI::HBox homogeneous => 1; 1976 my $hb = new DC::UI::HBox homogeneous => 1;
1834 1977
1921 $PL_NOTEBOOK->set_current_page ($widget); 2064 $PL_NOTEBOOK->set_current_page ($widget);
1922 $PL_WINDOW->show; 2065 $PL_WINDOW->show;
1923 } 2066 }
1924} 2067}
1925 2068
1926sub player_window { 2069sub make_playerbook {
1927 my $plwin = $PL_WINDOW = new DC::UI::Toplevel 2070 my $plwin = $PL_WINDOW = new DC::UI::Toplevel
1928 x => "center", 2071 x => "center",
1929 y => "center", 2072 y => "center",
1930 force_w => $WIDTH * 9/10, 2073 force_w => $WIDTH * 9/10,
1931 force_h => $HEIGHT * 9/10, 2074 force_h => $HEIGHT * 9/10,
1965 "License, Author and Source info for media sent by the server."); 2108 "License, Author and Source info for media sent by the server.");
1966 2109
1967 $ntb->set_current_page ($INVENTORY_PAGE); 2110 $ntb->set_current_page ($INVENTORY_PAGE);
1968 2111
1969 $plwin->add ($ntb); 2112 $plwin->add ($ntb);
1970 $plwin
1971} 2113}
1972 2114
1973sub keyboard_setup { 2115sub keyboard_setup {
1974 DC::Macro::keyboard_setup 2116 DC::Macro::keyboard_setup
1975} 2117}
1976 2118
1977sub help_window { 2119sub make_help_window {
1978 my $win = new DC::UI::Toplevel 2120 my $win = new DC::UI::Toplevel
1979 x => 'center', 2121 x => 'center',
1980 y => 'center', 2122 y => 'center',
1981 z => 4, 2123 z => 4,
1982 name => 'doc_browser', 2124 name => 'doc_browser',
2071 2213
2072 $load_node->((DC::Pod::find @path)[0]); 2214 $load_node->((DC::Pod::find @path)[0]);
2073 $win->show; 2215 $win->show;
2074 }; 2216 };
2075 2217
2076 $win 2218 $HELP_WINDOW = $win;
2077}
2078
2079sub open_string_query {
2080 my ($title, $cb, $txt, $tooltip) = @_;
2081 my $dialog = new DC::UI::Toplevel
2082 x => "center",
2083 y => "center",
2084 z => 50,
2085 force_w => $WIDTH * 4/5,
2086 title => $title;
2087
2088 $dialog->add (
2089 my $e = new DC::UI::Entry
2090 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2091 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2092 tooltip => $tooltip
2093 );
2094
2095 $e->grab_focus;
2096 $e->set_text ($txt) if $txt;
2097 $dialog->show;
2098} 2219}
2099 2220
2100sub open_quit_dialog { 2221sub open_quit_dialog {
2101 unless ($QUIT_DIALOG) { 2222 unless ($QUIT_DIALOG) {
2102 $QUIT_DIALOG = new DC::UI::Toplevel 2223 $QUIT_DIALOG = new DC::UI::Toplevel
2124 on_activate => sub { $QUIT_DIALOG->hide; 0 }, 2245 on_activate => sub { $QUIT_DIALOG->hide; 0 },
2125 ); 2246 );
2126 $hb->add (new DC::UI::Button 2247 $hb->add (new DC::UI::Button
2127 text => "Quit anyway", 2248 text => "Quit anyway",
2128 expand => 1, 2249 expand => 1,
2129 on_activate => sub { EV::unloop EV::UNLOOP_ALL }, 2250 on_activate => sub {
2251 crash "Quit anyway";
2252 EV::unloop EV::UNLOOP_ALL;
2253 },
2130 ); 2254 );
2131 } 2255 }
2132 2256
2133 $QUIT_DIALOG->show; 2257 $QUIT_DIALOG->show;
2134 $QUIT_DIALOG->grab_focus; 2258 $QUIT_DIALOG->grab_focus;
2259}
2260
2261sub make_menubar {
2262 $MENUFRAME = new DC::UI::Toplevel
2263 border => 0,
2264 force_x => 0,
2265 force_y => 0,
2266 force_w => $::WIDTH,
2267 child => ($MENUBAR = new DC::UI::HBox),
2268 ;
2269
2270 $MENUBAR->add ($BUTTONBAR = new DC::UI::Buttonbar);
2271
2272 # 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
2273 make_gauge_window->show;
2274
2275# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2276# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2277
2278 make_playerbook;
2279
2280 $MENUPOPUP = DC::UI::Menu->new (items => [
2281 ["Setup…\tF9" , sub { $SETUP_DIALOG->toggle_visibility }],
2282 ["Playerbook…\tTab" , sub { $PL_WINDOW ->toggle_visibility }],
2283 ["…Statistics\tF2" , sub { toggle_player_page ($::STATS_PAGE) }],
2284 ["…Skills\tF3" , sub { toggle_player_page ($::SKILL_PAGE) }],
2285 ["…Spells\tF4" , sub { toggle_player_page ($::SPELL_PAGE) }],
2286 ["…Inventory\tF5" , sub { toggle_player_page ($::INVENTORY_PAGE) }],
2287 ["Help Browser…\tF1" , sub { $HELP_WINDOW ->toggle_visibility }],
2288 ["Quit…" , sub {
2289 if ($CONN) {
2290 open_quit_dialog;
2291 } else {
2292 EV::unloop EV::UNLOOP_ALL;
2293 }
2294 }],
2295 ]);
2296
2297 $BUTTONBAR->add (new DC::UI::Button text => "Menu…",
2298 tooltip => "Shows the main menu",
2299 on_button_down => sub {
2300 my ($self, $ev) = @_;
2301 local $ev->{x} = 0;
2302 local $ev->{y} = 0;
2303 $MENUPOPUP->popup ($ev);
2304 },
2305 );
2306
2307 $MENUBAR->add ($GAUGES->{exp} = new DC::UI::ExperienceProgress
2308 padding_x => 6,
2309 padding_y => 3,
2310 tooltip => "This progress bar shows your overall experience and your progress towards the next character level.",
2311 template => " Exp: 888,888,888,888 (lvl 188) ",
2312 );
2313
2314 $MENUBAR->add ($PICKUP_ENABLE = new DC::UI::CheckBox # checkbox bad, button better?
2315 tooltip => "Automatic Pickup Enable - when this checkbox is enabled, then your character "
2316 . "will automatically pick up items as defined by your item pickup settings "
2317 . "in the playerbook. Often (e.g. in apartments) you want to temporarily "
2318 . "disable autopickup by disabling this checkbox.",
2319 state => $CFG->{pickup} & PICKUP_INHIBIT ? 0 : 1,
2320 on_changed => sub {
2321 my ($self, $value) = @_;
2322 $CFG->{pickup} &= ~PICKUP_INHIBIT;
2323 $CFG->{pickup} |= PICKUP_INHIBIT unless $_[1];
2324 $CONN->send_pickup ($CFG->{pickup})
2325 if $CONN;
2326 },
2327 );
2328
2329 $MENUBAR->add ($GAUGES->{skillexp} = new DC::UI::ExperienceProgress
2330 c_rescale => 1,
2331 padding_x => 6,
2332 padding_y => 3,
2333 force_w => $::WIDTH * 0.2,
2334 tooltip => "This progress bar shows the currently used skill and your progress towards the next skill level of that skill.",
2335 template => "two handed weapons 99%",
2336 );
2337
2338 $MENUBAR->add ($GAUGES->{range} = new DC::UI::Label
2339 expand => 1,
2340 align => 1, can_hover => 1, can_events => 1,
2341 text => "Range and Combat Slots",
2342 tooltip => "#stat_ranged",
2343 );
2344
2345 $MENUFRAME->show;
2346}
2347
2348sub open_string_query {
2349 my ($title, $cb, $txt, $tooltip) = @_;
2350 my $dialog = new DC::UI::Toplevel
2351 x => "center",
2352 y => "center",
2353 z => 50,
2354 force_w => $WIDTH * 4/5,
2355 title => $title;
2356
2357 $dialog->add (
2358 my $e = new DC::UI::Entry
2359 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
2360 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
2361 tooltip => $tooltip
2362 );
2363
2364 $e->grab_focus;
2365 $e->set_text ($txt) if $txt;
2366 $dialog->show;
2135} 2367}
2136 2368
2137sub show_tip_of_the_day { 2369sub show_tip_of_the_day {
2138 # find all tips 2370 # find all tips
2139 my @tod = DC::Pod::find tip_of_the_day => "*"; 2371 my @tod = DC::Pod::find tip_of_the_day => "*";
2192 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE 2424 DC::SDL_Init DC::SDL_INIT_AUDIO #| DC::SDL_NOPARACHUTE
2193 and die "SDL::Init failed!\n"; 2425 and die "SDL::Init failed!\n";
2194} 2426}
2195 2427
2196sub video_init { 2428sub video_init {
2429 DC::set_theme $CFG->{uitheme};
2430
2197 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT; 2431 DC::SDL_InitSubSystem DC::SDL_INIT_VIDEO if $SDL_REINIT;
2198 $SDL_REINIT = 0; 2432 $SDL_REINIT = 0;
2199 2433
2200 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8; 2434 @SDL_MODES = DC::SDL_ListModes 8, $CFG->{disable_alpha} ? 0 : 8;
2201 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES; 2435 @SDL_MODES = DC::SDL_ListModes 8, 8 unless @SDL_MODES;
2202 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES; 2436 @SDL_MODES = DC::SDL_ListModes 5, 0 unless @SDL_MODES;
2203 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2437 @SDL_MODES or DC::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2204 2438
2205 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES; 2439 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2206 2440
2207 if (!exists $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) { 2441 if (!defined $CFG->{sdl_mode} or $CFG->{sdl_mode} > $#SDL_MODES) {
2208 $CFG->{sdl_mode} = 0; 2442 $CFG->{sdl_mode} = 0; # lowest resolution by default
2443
2444 # now choose biggest mode <= 1024x768
2209 for (reverse 0 .. $#SDL_MODES) { 2445 for (0 .. $#SDL_MODES) {
2210 $CFG->{sdl_mode} = $_ if $SDL_MODES[$_][0] * $SDL_MODES[$_][1] >= 800 * 600; 2446 if ($SDL_MODES[$_][0] * $SDL_MODES[$_][1] <= 1024 * 768) {
2447 $CFG->{sdl_mode} = $_;
2448 }
2211 } 2449 }
2212 } 2450 }
2213 2451
2214 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 2452 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
2215 2453
2216 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 2454 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
2217 $FULLSCREEN = $CFG->{fullscreen}; 2455 $FULLSCREEN = $CFG->{fullscreen};
2218 $FAST = $CFG->{fast}; 2456 $FAST = $CFG->{fast};
2219 2457
2458 # due to mac os x braindamage, we simply retry with !fullscreen in case of an error
2220 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN 2459 DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
2460 or DC::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, !$FULLSCREEN
2221 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n"; 2461 or die "SDL_SetVideoMode failed: " . (DC::SDL_GetError) . "\n";
2222 2462
2223 $SDL_ACTIVE = 1; 2463 $SDL_ACTIVE = 1;
2224 $LAST_REFRESH = time - 0.01; 2464 $LAST_REFRESH = time - 0.01;
2225 2465
2272 2512
2273 (new DC::UI::Frame 2513 (new DC::UI::Frame
2274 bg => [0, 0, 0, 0.4], 2514 bg => [0, 0, 0, 0.4],
2275 force_x => 0, 2515 force_x => 0,
2276 force_y => "max", 2516 force_y => "max",
2277 child => (my $LR = new DC::UI::VBox), 2517 child => (my $LL = new DC::UI::VBox),
2278 )->show; 2518 )->show;
2279 2519
2280 $LR->add ($STATUSBOX); 2520 $LL->add ($STATUSBOX);
2281 $LR->add ($MODBOX); 2521 $LL->add ($MODBOX);
2282 $LR->add (new DC::UI::Label 2522 $LL->add (new DC::UI::Label
2283 align => 0, 2523 align => 0,
2284 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode", 2524 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode",
2285 fontsize => 0.5, 2525 fontsize => 0.5,
2286 fg => [1, 1, 0, 0.7], 2526 fg => [1, 1, 0, 0.7],
2287 ); 2527 );
2288 2528
2289 DC::UI::Toplevel->new ( 2529 DC::UI::Toplevel->new (
2290 title => "Minimap", 2530 title => "Minimap",
2291 name => "mapmap", 2531 name => "mapmap",
2292 x => 0, 2532 x => 0,
2293 y => $FONTSIZE + 8, 2533 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2294 border_bg => [1, 1, 1, 192/255], 2534 border_bg => [1, 1, 1, 192/255],
2295 bg => [1, 1, 1, 0], 2535 bg => [1, 1, 1, 0],
2296 child => ($MAPMAP = new DC::MapWidget::MapMap 2536 child => ($MAPMAP = new DC::MapWidget::MapMap
2297 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 2537 tooltip => "<b>Minimap</b>. This will display an overview of the surrounding areas.",
2298 ), 2538 ),
2299 )->show; 2539 )->show;
2300 2540
2301 $MAPWIDGET = new DC::MapWidget; 2541 $MAPWIDGET = new DC::MapWidget;
2302 $MAPWIDGET->connect (activate_console => sub { 2542 $MAPWIDGET->connect (activate_console => sub {
2327 $METASERVER = metaserver_dialog; 2567 $METASERVER = metaserver_dialog;
2328 # the name is changed to not conflict with the older name as users could have hidden it 2568 # the name is changed to not conflict with the older name as users could have hidden it
2329 $MESSAGE_WINDOW = new DC::UI::Dockbar 2569 $MESSAGE_WINDOW = new DC::UI::Dockbar
2330 name => "message_window2", 2570 name => "message_window2",
2331 title => 'Messages', 2571 title => 'Messages',
2572 y => $::FONTSIZE + 8,#d# hack to move messages window below the menubar
2332 force_w => $::WIDTH * 0.6, 2573 force_w => $::WIDTH * 0.6,
2333 force_h => $::HEIGHT * 0.25, 2574 force_h => $::HEIGHT * 0.25,
2334 ; 2575 ;
2335 2576
2336 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW; 2577 $MESSAGE_DIST = new DC::MessageDistributor dockbar => $MESSAGE_WINDOW;
2356 . "After pressing the combo the binding will be saved automatically and the " 2597 . "After pressing the combo the binding will be saved automatically and the "
2357 . "binding editor closes"); 2598 . "binding editor closes");
2358 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup, 2599 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
2359 "Some debuggin' options. Do not ask."); 2600 "Some debuggin' options. Do not ask.");
2360 2601
2361 $BUTTONBAR = new DC::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 2602 make_help_window;
2603 make_menubar;
2362 2604
2363 $BUTTONBAR->add (new DC::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
2364 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
2365
2366# $BUTTONBAR->add (new DC::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
2367# tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
2368
2369 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
2370
2371 $BUTTONBAR->add (new DC::UI::Flopper text => "Playerbook", other => player_window,
2372 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
2373
2374 $BUTTONBAR->add (new DC::UI::Button
2375 text => "Save Config",
2376 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
2377 on_activate => sub {
2378 $::CFG->{layout} = DC::UI::get_layout;
2379 DC::write_cfg;
2380 status "Configuration Saved";
2381 0
2382 },
2383 );
2384
2385 $BUTTONBAR->add (new DC::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
2386 tooltip => "View Documentation");
2387
2388 $BUTTONBAR->add (new DC::UI::Button
2389 text => "Quit",
2390 tooltip => "Terminates the program",
2391 on_activate => sub {
2392 if ($CONN) {
2393 open_quit_dialog;
2394 } else {
2395 EV::unloop EV::UNLOOP_ALL;
2396 }
2397 0
2398 },
2399 );
2400
2401 $BUTTONBAR->show;
2402 $SETUP_DIALOG->show; 2605 $SETUP_DIALOG->show;
2403 $MESSAGE_WINDOW->show; 2606 $MESSAGE_WINDOW->show;
2404 } 2607 }
2405 2608
2406 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]); 2609 $MODE_SLIDER->set_range ([$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1, 1]);
2407 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode}); 2610 $MODE_SLIDER->emit (changed => $CFG->{sdl_mode});
2408 2611
2409 $CAVEAT_LABEL->set_text ("None :)"); 2612 $CAVEAT_LABEL->set_text ("None :)");
2613 $CAVEAT_LABEL->set_text ("Apple/NVIDIA Texture bug (slow)")
2614 if $DC::OpenGL::APPLE_NVIDIA_BUG;
2410 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)") 2615 $CAVEAT_LABEL->set_text ("Software Rendering (very slow)")
2411 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL; 2616 unless DC::SDL_GL_GetAttribute DC::SDL_GL_ACCELERATED_VISUAL;
2412 2617
2413 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 2618 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
2414} 2619}
2442my $want_refresh = EV::prepare_ns \&force_refresh; 2647my $want_refresh = EV::prepare_ns \&force_refresh;
2443 2648
2444my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub { 2649my $input = EV::periodic 0, 1 / $MAX_FPS, undef, sub {
2445 $NOW = EV::now; 2650 $NOW = EV::now;
2446 2651
2447 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2652 ($SDL_CB[$_->{type}] || sub { warn "unhandled event $_->{type}" })->($_)
2448 for DC::poll_events; 2653 for DC::poll_events;
2449 2654
2450 if (%animate_object) { 2655 if (%animate_object) {
2451 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2656 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2452 $WANT_REFRESH = 1; 2657 $WANT_REFRESH = 1;
2464sub animation_stop { 2669sub animation_stop {
2465 my ($widget) = @_; 2670 my ($widget) = @_;
2466 delete $animate_object{$widget}; 2671 delete $animate_object{$widget};
2467} 2672}
2468 2673
2469%SDL_CB = (
2470 DC::SDL_QUIT => sub { 2674$SDL_CB[DC::SDL_QUIT] = sub {
2675 crash "SDL_QUIT";
2471 EV::unloop EV::UNLOOP_ALL; 2676 EV::unloop EV::UNLOOP_ALL;
2472 }, 2677};
2473 DC::SDL_VIDEORESIZE => sub { 2678$SDL_CB[DC::SDL_VIDEORESIZE] = sub { };
2474 },
2475 DC::SDL_VIDEOEXPOSE => sub { 2679$SDL_CB[DC::SDL_VIDEOEXPOSE] = sub {
2476 DC::UI::full_refresh; 2680 DC::UI::full_refresh;
2477 }, 2681};
2478 DC::SDL_ACTIVEEVENT => sub { 2682$SDL_CB[DC::SDL_ACTIVEEVENT] = sub {
2479# not useful, as APPACTIVE includes only iconified state, not unmapped 2683# not useful, as APPACTIVE includes only iconified state, not unmapped
2480# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d# 2684# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, DC::SDL_GetAppState;#d#
2481# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d# 2685# printf "a %x\n", DC::SDL_GetAppState & DC::SDL_APPACTIVE;#d#
2482# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE; 2686# printf "A\n" if $_[0]{state} & DC::SDL_APPACTIVE;
2483# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS; 2687# printf "K\n" if $_[0]{state} & DC::SDL_APPINPUTFOCUS;
2484# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS; 2688# printf "M\n" if $_[0]{state} & DC::SDL_APPMOUSEFOCUS;
2485 }, 2689};
2486 DC::SDL_KEYDOWN => sub { 2690$SDL_CB[DC::SDL_KEYDOWN] = sub {
2487 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) { 2691 if ($_[0]{mod} & DC::KMOD_ALT && $_[0]{sym} == 13) {
2488 # alt-enter 2692 # alt-enter
2489 video_shutdown; 2693 video_shutdown;
2490 $FULLSCREEN_ENABLE->toggle; 2694 $FULLSCREEN_ENABLE->toggle;
2491 video_init; 2695 video_init;
2492 } else { 2696 } else {
2493 &DC::UI::feed_sdl_key_down_event; 2697 &DC::UI::feed_sdl_key_down_event;
2494 } 2698 }
2495 update_modbox; 2699 update_modbox;
2496 }, 2700};
2497 DC::SDL_KEYUP => sub { 2701$SDL_CB[DC::SDL_KEYUP] = sub {
2498 &DC::UI::feed_sdl_key_up_event; 2702 &DC::UI::feed_sdl_key_up_event;
2499 update_modbox; 2703 update_modbox;
2500 }, 2704};
2501 DC::SDL_MOUSEMOTION => \&DC::UI::feed_sdl_motion_event, 2705$SDL_CB[DC::SDL_MOUSEMOTION] = \&DC::UI::feed_sdl_motion_event,
2502 DC::SDL_MOUSEBUTTONDOWN => \&DC::UI::feed_sdl_button_down_event, 2706$SDL_CB[DC::SDL_MOUSEBUTTONDOWN] = \&DC::UI::feed_sdl_button_down_event,
2503 DC::SDL_MOUSEBUTTONUP => \&DC::UI::feed_sdl_button_up_event, 2707$SDL_CB[DC::SDL_MOUSEBUTTONUP] = \&DC::UI::feed_sdl_button_up_event,
2504 DC::SDL_USEREVENT => sub { 2708$SDL_CB[DC::SDL_USEREVENT] = sub {
2505 if ($_[0]{code} == 1) { 2709 if ($_[0]{code} == 1) {
2506 audio_channel_finished $_[0]{data1}; 2710 audio_channel_finished $_[0]{data1};
2507 } elsif ($_[0]{code} == 0) { 2711 } elsif ($_[0]{code} == 0) {
2508 audio_music_finished; 2712 audio_music_finished;
2509 }
2510 }, 2713 }
2511); 2714};
2512 2715
2513############################################################################# 2716#############################################################################
2514 2717
2515$SIG{INT} = $SIG{TERM} = sub { 2718$SIG{INT} = $SIG{TERM} = sub {
2516 EV::unloop; 2719 EV::unloop;
2517 #d# TODO calling exit here hangs the process in some futex 2720 #d# TODO calling exit here hangs the process in some futex
2518}; 2721};
2519 2722
2520{ 2723# due to mac os x + sdl combined braindamage, we need this contortion
2724sub main {
2725 {
2521 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst"; 2726 DC::Pod::load_docwiki DC::find_rcfile "docwiki.pst";
2522 2727
2523 if (-e "$Deliantra::VARDIR/client.cf") { 2728 if (-e "$Deliantra::VARDIR/client.cf") {
2524 DC::read_cfg "$Deliantra::VARDIR/client.cf"; 2729 DC::read_cfg "$Deliantra::VARDIR/client.cf";
2525 } else { 2730 } else {
2526 #TODO: compatibility cruft 2731 #TODO: compatibility cruft
2527 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc"; 2732 DC::read_cfg "$Deliantra::OLDDIR/cfplusrc";
2528 print STDERR "INFO: used old configuration file\n"; 2733 print STDERR "INFO: used old configuration file\n";
2529 } 2734 }
2530 2735
2531 DC::DB::Server::run; 2736 DC::DB::Server::run;
2532 2737
2533 if ($CFG->{db_schema} < 1) { 2738 if ($CFG->{db_schema} < 1) {
2534 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n"; 2739 warn "INFO: upgrading database schema from 0 to 1, mapcache and tilecache will be lost\n";
2535 DC::DB::nuke_db; 2740 DC::DB::nuke_db;
2536 $CFG->{db_schema} = 1; 2741 $CFG->{db_schema} = 1;
2537 DC::write_cfg; 2742 DC::write_cfg;
2538 } 2743 }
2539 2744
2540 DC::DB::open_db; 2745 DC::DB::open_db;
2541 2746
2542 DC::UI::set_layout ($::CFG->{layout}); 2747 DC::UI::set_layout ($::CFG->{layout});
2543 2748
2544 my %DEF_CFG = ( 2749 my %DEF_CFG = (
2750 config_autosave => 1,
2545 sdl_mode => 0, 2751 sdl_mode => undef,
2546 fullscreen => 1, 2752 fullscreen => 1,
2547 fast => 0, 2753 fast => 0,
2548 force_opengl11 => undef, 2754 force_opengl11 => undef,
2549 disable_alpha => 0, 2755 disable_alpha => 0,
2550 smooth_movement => 1, 2756 smooth_movement => 1,
2757 smooth_transitions => 1,
2551 texture_compression => 1, 2758 texture_compression => 1,
2552 map_scale => 1, 2759 map_scale => 1,
2553 fow_enable => 1, 2760 fow_enable => 1,
2554 fow_intensity => 0, 2761 fow_intensity => 0,
2762 fow_texture => 0,
2555 map_smoothing => 1, 2763 map_smoothing => 1,
2556 gui_fontsize => 1, 2764 gui_fontsize => 1,
2557 log_fontsize => 0.7, 2765 log_fontsize => 0.7,
2558 gauge_fontsize => 1, 2766 gauge_fontsize => 1,
2559 gauge_size => 0.35, 2767 gauge_size => 0.35,
2560 stat_fontsize => 0.7, 2768 stat_fontsize => 0.7,
2561 mapsize => 100, 2769 mapsize => 100,
2562 audio_enable => 1, 2770 audio_enable => 1,
2563 audio_hw_channels => 0, 2771 audio_hw_channels => 0,
2564 audio_hw_frequency => 0, 2772 audio_hw_frequency => 0,
2565 audio_hw_chunksize => 0, 2773 audio_hw_chunksize => 0,
2566 audio_mix_channels => 8, 2774 audio_mix_channels => 8,
2567 effects_enable => 1, 2775 effects_enable => 1,
2568 effects_volume => 1, 2776 effects_volume => 1,
2569 bgm_enable => 1, 2777 bgm_enable => 1,
2570 bgm_volume => 0.5, 2778 bgm_volume => 0.5,
2571 output_rate => "", 2779 output_rate => "",
2572 pickup => 0, 2780 pickup => PICKUP_SPELLBOOK | PICKUP_SKILLSCROLL | PICKUP_VALUABLES,
2573 inv_sort => "mtime", 2781 inv_sort => "mtime",
2574 default => "profile", # default profile 2782 default => "profile", # default profile
2575 show_tips => 1, 2783 show_tips => 1,
2576 logview_max_par => 1000, 2784 logview_max_par => 1000,
2577 shift_fire_stop => 0, 2785 shift_fire_stop => 0,
2786 uitheme => "wood",
2787 map_shift_x => -24, # arbitrary
2788 map_shift_y => +24, # arbitrary
2578 ); 2789 );
2579 2790
2580 while (my ($k, $v) = each %DEF_CFG) { 2791 while (my ($k, $v) = each %DEF_CFG) {
2581 $CFG->{$k} = $v unless exists $CFG->{$k}; 2792 $CFG->{$k} = $v unless exists $CFG->{$k};
2582 } 2793 }
2583 2794
2584 $CFG->{profile}{default}{host} ||= "gameserver.deliantra.net"; 2795 my @args = @ARGV;
2585 $PROFILE = $CFG->{profile}{default};
2586 2796
2587 # convert old bindings (only default profile matters) 2797 my $profile = 'default';
2588 if (my $bindings = delete $PROFILE->{bindings}) { 2798
2589 while (my ($mod, $syms) = each %$bindings) { 2799 for (my $i = 0; $i < @args; $i++) {
2590 while (my ($sym, $cmds) = each %$syms) { 2800 if ($args[$i] =~ /^--?profile$/) {
2591 push @{ $PROFILE->{macro} }, { 2801 $profile = $args[$i + 1];
2592 accelkey => [$mod*1, $sym*1], 2802 splice @args, $i, 2, ();
2593 action => $cmds,
2594 }; 2803 $i = 0;
2804 } elsif ($args[$i] =~ /^--?h/) {
2805 print STDERR "Usage: $0 [--profile name] [host [user [password]]]\n";
2806 exit 0;
2595 } 2807 }
2596 } 2808 }
2597 }
2598 2809
2810 $CFG->{profile}{$profile} ||= {};
2811 $PROFILE = $CFG->{profile}{$profile};
2812 $PROFILE->{host} ||= "gameserver.deliantra.net";
2813
2814 $PROFILE->{host} = $args[0] if @args > 0;
2815 $PROFILE->{user} = $args[1] if @args > 1;
2816 $PROFILE->{password} = $args[2] if @args > 2;
2817
2818 # convert old bindings (only default profile matters)
2819 if (my $bindings = delete $PROFILE->{bindings}) {
2820 while (my ($mod, $syms) = each %$bindings) {
2821 while (my ($sym, $cmds) = each %$syms) {
2822 push @{ $PROFILE->{macro} }, {
2823 accelkey => [$mod*1, $sym*1],
2824 action => $cmds,
2825 };
2826 }
2827 }
2828 }
2829
2599 sdl_init; 2830 sdl_init;
2600 2831
2601 { 2832 $ENV{FONTCONFIG_FILE} = DC::find_rcfile "fonts/fonts.conf";
2833 $ENV{FONTCONFIG_DIR} = DC::find_rcfile "fonts";
2834
2835 {
2602 my @fonts = map DC::find_rcfile "fonts/$_", qw( 2836 my @fonts = map DC::find_rcfile "fonts/$_", qw(
2603 DejaVuSans.ttf 2837 DejaVuSans.ttf
2604 DejaVuSansMono.ttf 2838 DejaVuSansMono.ttf
2605 DejaVuSans-Bold.ttf 2839 DejaVuSans-Bold.ttf
2606 DejaVuSansMono-Bold.ttf 2840 DejaVuSansMono-Bold.ttf
2607 DejaVuSans-Oblique.ttf 2841 DejaVuSans-Oblique.ttf
2608 DejaVuSansMono-Oblique.ttf 2842 DejaVuSansMono-Oblique.ttf
2609 DejaVuSans-BoldOblique.ttf 2843 DejaVuSans-BoldOblique.ttf
2610 DejaVuSansMono-BoldOblique.ttf 2844 DejaVuSansMono-BoldOblique.ttf
2845 mona.ttf
2611 ); 2846 );
2612 2847
2613 DC::add_font $_ for @fonts; 2848 DC::add_font $_ for @fonts;
2614 2849
2615 $FONT_PROP = new_from_file DC::Font $fonts[0]; 2850 $FONT_PROP = new_from_file DC::Font $fonts[0];
2616 $FONT_FIXED = new_from_file DC::Font $fonts[1]; 2851 $FONT_FIXED = new_from_file DC::Font $fonts[1];
2617 2852
2618 $FONT_PROP->make_default; 2853 $FONT_PROP->make_default;
2619 2854
2620 DC::pango_init; 2855 DC::pango_init;
2621 } 2856 }
2622 2857
2623# compare mono (ft) vs. rgba (cairo) 2858# compare mono (ft) vs. rgba (cairo)
2624# ft - 1.8s, cairo 3s, even in alpha-only mode 2859# ft - 1.8s, cairo 3s, even in alpha-only mode
2625# for my $rgba (0..1) { 2860# for my $rgba (0..1) {
2626# my $t1 = Time::HiRes::time; 2861# my $t1 = Time::HiRes::time;
2631# } 2866# }
2632# my $t2 = Time::HiRes::time; 2867# my $t2 = Time::HiRes::time;
2633# warn $t2-$t1; 2868# warn $t2-$t1;
2634# } 2869# }
2635 2870
2636 video_init; 2871 video_init;
2637 audio_init; 2872 audio_init;
2638} 2873 }
2639 2874
2640show_tip_of_the_day if $CFG->{show_tips}; 2875 show_tip_of_the_day if $CFG->{show_tips};
2641 2876
2642our $STARTUP_CANCEL = EV::idle sub { 2877 our $STARTUP_CANCEL = EV::idle sub {
2643 undef $::STARTUP_CANCEL; 2878 undef $::STARTUP_CANCEL;
2644 $startup_done->(); 2879 $startup_done->();
2645}; 2880 };
2646 2881
2647delete $SIG{__DIE__}; 2882 delete $SIG{__DIE__};
2648EV::loop; 2883 EV::loop;
2649 2884
2885 DC::write_cfg if $CFG->{config_autosave};
2886
2650#video_shutdown; 2887 #video_shutdown;
2651#audio_shutdown; 2888 #audio_shutdown;
2889
2652DC::OpenGL::quit; 2890 DC::OpenGL::quit;
2653DC::SDL_Quit; 2891 DC::SDL_Quit;
2654DC::DB::Server::stop; 2892 DC::DB::Server::stop;
2893}
2894
2895DC::SDL_braino; # see sub above
2655 2896
2656=head1 NAME 2897=head1 NAME
2657 2898
2658deliantra - A Deliantra MORPG game client 2899deliantra - A Deliantra MORPG game client
2659 2900
2660=head1 SYNOPSIS 2901=head1 SYNOPSIS
2661 2902
2662Just run it - no commandline arguments are supported. 2903 deliantra [--profile name] [host [user [password]]]
2904 deliantra --help
2663 2905
2664=head1 USAGE 2906=head1 USAGE
2665 2907
2666deliantra utilises OpenGL for all UI elements and the game. It is supposed to 2908The deliantra client utilises OpenGL for all UI elements and the game. It
2667be used in fullscreen mode and interactively. 2909is supposed to be used in fullscreen mode and interactively.
2668 2910
2669=head1 DEBUGGING 2911=head1 DEBUGGING
2670
2671 2912
2672CFPLUS_DEBUG - environment variable 2913CFPLUS_DEBUG - environment variable
2673 2914
2674 1 draw borders around widgets 2915 1 draw borders around widgets
2675 2 add low-level widget info to tooltips 2916 2 add low-level widget info to tooltips

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines